From f44747587f95b872758de8c5e64a389a3b68d5a2 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sun, 14 Sep 2025 12:57:19 +0300 Subject: [PATCH] format ContentPackVersion --- src/content/ContentPackVersion.cpp | 5 +- src/content/ContentPackVersion.hpp | 92 ++++++++++++++++-------------- 2 files changed, 52 insertions(+), 45 deletions(-) diff --git a/src/content/ContentPackVersion.cpp b/src/content/ContentPackVersion.cpp index b8a0564b..d8d46dce 100644 --- a/src/content/ContentPackVersion.cpp +++ b/src/content/ContentPackVersion.cpp @@ -37,7 +37,8 @@ DependencyVersionOperator Version::string_to_operator(const std::string& op) { return DependencyVersionOperator::more_or_equal; else if (op == "<=" || op == "=<") return DependencyVersionOperator::less_or_equal; - else return DependencyVersionOperator::equal; + else + return DependencyVersionOperator::equal; } bool isNumber(const std::string& s) { @@ -63,4 +64,4 @@ bool Version::matches_pattern(const std::string& version) { } return parts.size() == 2 || parts.size() == 3; -} \ No newline at end of file +} diff --git a/src/content/ContentPackVersion.hpp b/src/content/ContentPackVersion.hpp index ef298b9e..5d30c1e7 100644 --- a/src/content/ContentPackVersion.hpp +++ b/src/content/ContentPackVersion.hpp @@ -3,49 +3,55 @@ #include "content/ContentPack.hpp" class Version { - public: - int major; - int minor; - int patch; +public: + int major; + int minor; + int patch; - Version(const std::string& version); - - bool operator==(const Version& other) const { - return major == other.major && minor == other.minor && patch == other.patch; + Version(const std::string& version); + + bool operator==(const Version& other) const { + return major == other.major && minor == other.minor && + patch == other.patch; + } + + bool operator<(const Version& other) const { + if (major != other.major) return major < other.major; + if (minor != other.minor) return minor < other.minor; + return patch < other.patch; + } + + bool operator>(const Version& other) const { + return other < *this; + } + + bool operator>=(const Version& other) const { + return !(*this < other); + } + + bool operator<=(const Version& other) const { + return !(*this > other); + } + + bool process_operator(const std::string& op, const Version& other) const { + auto dep_op = Version::string_to_operator(op); + + switch (dep_op) { + case DependencyVersionOperator::equal: + return *this == other; + case DependencyVersionOperator::more: + return *this > other; + case DependencyVersionOperator::less: + return *this < other; + case DependencyVersionOperator::less_or_equal: + return *this <= other; + case DependencyVersionOperator::more_or_equal: + return *this >= other; + default: + return false; } + } - bool operator<(const Version& other) const { - if (major != other.major) return major < other.major; - if (minor != other.minor) return minor < other.minor; - return patch < other.patch; - } - - - bool operator>(const Version& other) const { - return other < *this; - } - - bool operator>=(const Version& other) const { - return !(*this < other); - } - - bool operator<=(const Version& other) const { - return !(*this > other); - } - - bool process_operator(const std::string& op, const Version& other) const { - auto dep_op = Version::string_to_operator(op); - - switch(dep_op) { - case DependencyVersionOperator::equal: return *this == other; - case DependencyVersionOperator::more: return *this > other; - case DependencyVersionOperator::less: return *this < other; - case DependencyVersionOperator::less_or_equal: return *this <= other; - case DependencyVersionOperator::more_or_equal: return *this >= other; - default: return false; - } - } - - static DependencyVersionOperator string_to_operator(const std::string& op); - static bool matches_pattern(const std::string& version); -}; \ No newline at end of file + static DependencyVersionOperator string_to_operator(const std::string& op); + static bool matches_pattern(const std::string& version); +};