zach/z-bar-qt
1
1
Fork 0
Code Issues 23 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

fix: define declared method + insert new bar entries to config file list + rename Hyprsunset -> Nightlight
C++ / fmt (pull_request) Failing after 5s
Details
C++ / build (pull_request) Failing after 10s
Details
JS/TS / fmt (pull_request) Successful in 6s
Details
C++ / clang-tidy (pull_request) Failing after 21s
Details
JS/TS / lint (pull_request) Successful in 10s
Details
Python / static (pull_request) Successful in 26s
Details
Rust / build (pull_request) Successful in 47s
Details
Rust / fmt (pull_request) Successful in 28s
Details
Python / verify (pull_request) Successful in 1m39s
Details
Rust / clippy (pull_request) Successful in 46s
Details

Browse Source
This commit is contained in:
zach
2026-09-28 13:11:31 +02:00
parent 5618ba9e6b
commit 4c3d38f023
23 changed files with 1443 additions and 1182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plugins/ZShell/Settings/codecs.hpp
+54 -48
View File
@@ -13,43 +13,46 @@
namespace ZShell::settings {
struct DecodeResult {
QVariant value;
std::optional<Diagnostic> error;
QList<qsizetype> indexPath; // Index path of the failing element, outermost list first
QVariant value;
std::optional<Diagnostic> error;
QList<qsizetype>
indexPath; // Index path of the failing element, outermost list first
};
class ValueCodec {
public:
explicit ValueCodec(const QMetaType& type, ExpectedType expected);
virtual ~ValueCodec() = default;
public:
explicit ValueCodec(const QMetaType& type, ExpectedType expected);
virtual ~ValueCodec() = default;
// Returns the shared codec for a type, or nullptr if the type is unsupported
static ValueCodec* codecFor(const QMetaType& type);
// Returns the shared codec for a type, or nullptr if the type is unsupported
static ValueCodec* codecFor(const QMetaType& type);
// Returns the shared codec for a union of types, or nullptr if any of them is unsupported
static ValueCodec* unionFor(const QList<QMetaType>& types);
// Returns the shared codec for a union of types, or nullptr if any of them is unsupported
static ValueCodec* unionFor(const QList<QMetaType>& types);
[[nodiscard]] QMetaType type() const;
[[nodiscard]] ExpectedType expected() const; // The JSON type this decodes from
[[nodiscard]] virtual QJsonValue encode(const QVariant& value) const = 0;
[[nodiscard]] virtual DecodeResult decode(const QJsonValue& value) const = 0;
[[nodiscard]] QMetaType type() const;
[[nodiscard]] ExpectedType expected()
const; // The JSON type this decodes from
[[nodiscard]] virtual QJsonValue encode(const QVariant& value) const = 0;
[[nodiscard]] virtual DecodeResult decode(const QJsonValue& value) const = 0;
protected:
const QMetaType m_type;
const ExpectedType m_expected;
protected:
const QMetaType m_type;
const ExpectedType m_expected;
Q_DISABLE_COPY_MOVE(ValueCodec)
Q_DISABLE_COPY_MOVE(ValueCodec)
};
#define CODEC(Type, Expected) \
class Type##Codec : public ValueCodec { \
public: \
explicit Type##Codec(const QMetaType& type) \
: ValueCodec(type, ExpectedType::Expected) {} \
\
[[nodiscard]] QJsonValue encode(const QVariant& value) const override; \
[[nodiscard]] DecodeResult decode(const QJsonValue& value) const override; \
};
#define CODEC(Type, Expected) \
class Type##Codec : public ValueCodec { \
public: \
explicit Type##Codec(const QMetaType& type) \
: ValueCodec(type, ExpectedType::Expected) {} \
\
[[nodiscard]] QJsonValue encode(const QVariant& value) const override; \
[[nodiscard]] DecodeResult decode( \
const QJsonValue& value) const override; \
};
CODEC(Bool, Bool)
CODEC(Int, Int)
@@ -61,41 +64,44 @@ CODEC(VariantMap, Object)
#undef CODEC
class EnumCodec : public ValueCodec {
public:
explicit EnumCodec(const QMetaType& type, const QMetaEnum& metaEnum);
public:
explicit EnumCodec(const QMetaType& type, const QMetaEnum& metaEnum);
[[nodiscard]] QJsonValue encode(const QVariant& value) const override;
[[nodiscard]] DecodeResult decode(const QJsonValue& value) const override;
[[nodiscard]] QJsonValue encode(const QVariant& value) const override;
[[nodiscard]] DecodeResult decode(const QJsonValue& value) const override;
private:
const QMetaEnum m_metaEnum;
private:
const QMetaEnum m_metaEnum;
};
template <typename Container> class ListCodec : public ValueCodec {
using Value = Container::value_type;
using Value = Container::value_type;
public:
explicit ListCodec(const QMetaType& type, const ValueCodec* elementCodec);
public:
explicit ListCodec(const QMetaType& type, const ValueCodec* elementCodec);
[[nodiscard]] QJsonValue encode(const QVariant& value) const override;
[[nodiscard]] DecodeResult decode(const QJsonValue& value) const override;
[[nodiscard]] QJsonValue encode(const QVariant& value) const override;
[[nodiscard]] DecodeResult decode(const QJsonValue& value) const override;
private:
const ValueCodec* m_elementCodec;
private:
const ValueCodec* m_elementCodec;
};
// Decodes any one of several types, for options that accept more than one shape
class UnionCodec : public ValueCodec {
public:
explicit UnionCodec(const QList<const ValueCodec*>& alternatives);
public:
explicit UnionCodec(const QList<const ValueCodec*>& alternatives);
[[nodiscard]] QJsonValue encode(const QVariant& value) const override;
[[nodiscard]] DecodeResult decode(const QJsonValue& value) const override;
[[nodiscard]] QJsonValue encode(const QVariant& value) const override;
[[nodiscard]] DecodeResult decode(const QJsonValue& value) const override;
private:
const QList<const ValueCodec*> m_alternatives; // Tried in order, so the first to accept a value wins
const QList<ExpectedType> m_expectedTypes; // Types of the alternatives, for diagnostics
QHash<int, const ValueCodec*> m_byType; // Type id to alternative, for encoding
private:
const QList<const ValueCodec*>
m_alternatives; // Tried in order, so the first to accept a value wins
const QList<ExpectedType>
m_expectedTypes; // Types of the alternatives, for diagnostics
QHash<int, const ValueCodec*>
m_byType; // Type id to alternative, for encoding
};
} // namespace ZShell::settings