PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

format ContentPackVersion

Browse Source
This commit is contained in:
MihailRis
2025-09-14 12:57:19 +03:00
parent 94989ce292
commit f44747587f
2 changed files with 52 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/content/ContentPackVersion.cpp
+2 -1
View File
@@ -37,7 +37,8 @@ DependencyVersionOperator Version::string_to_operator(const std::string& op) {
return DependencyVersionOperator::more_or_equal; return DependencyVersionOperator::more_or_equal;
else if (op == "<=" || op == "=<") else if (op == "<=" || op == "=<")
return DependencyVersionOperator::less_or_equal; return DependencyVersionOperator::less_or_equal;
else return DependencyVersionOperator::equal; else
return DependencyVersionOperator::equal;
} }
bool isNumber(const std::string& s) { bool isNumber(const std::string& s) {
src/content/ContentPackVersion.hpp
+16 -10
View File
@@ -3,7 +3,7 @@
#include "content/ContentPack.hpp" #include "content/ContentPack.hpp"
class Version { class Version {
public: public:
int major; int major;
int minor; int minor;
int patch; int patch;
@@ -11,7 +11,8 @@ class Version {
Version(const std::string& version); Version(const std::string& version);
bool operator==(const Version& other) const { bool operator==(const Version& other) const {
return major == other.major && minor == other.minor && patch == other.patch; return major == other.major && minor == other.minor &&
patch == other.patch;
} }
bool operator<(const Version& other) const { bool operator<(const Version& other) const {
@@ -20,7 +21,6 @@ class Version {
return patch < other.patch; return patch < other.patch;
} }
bool operator>(const Version& other) const { bool operator>(const Version& other) const {
return other < *this; return other < *this;
} }
@@ -36,13 +36,19 @@ class Version {
bool process_operator(const std::string& op, const Version& other) const { bool process_operator(const std::string& op, const Version& other) const {
auto dep_op = Version::string_to_operator(op); auto dep_op = Version::string_to_operator(op);
switch(dep_op) { switch (dep_op) {
case DependencyVersionOperator::equal: return *this == other; case DependencyVersionOperator::equal:
case DependencyVersionOperator::more: return *this > other; return *this == other;
case DependencyVersionOperator::less: return *this < other; case DependencyVersionOperator::more:
case DependencyVersionOperator::less_or_equal: return *this <= other; return *this > other;
case DependencyVersionOperator::more_or_equal: return *this >= other; case DependencyVersionOperator::less:
default: return false; return *this < other;
case DependencyVersionOperator::less_or_equal:
return *this <= other;
case DependencyVersionOperator::more_or_equal:
return *this >= other;
default:
return false;
} }
} }