aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--launcher/Version.cpp92
-rw-r--r--launcher/Version.h50
-rw-r--r--tests/Version_test.cpp16
3 files changed, 97 insertions, 61 deletions
diff --git a/launcher/Version.cpp b/launcher/Version.cpp
index 9307aab3..e4311f31 100644
--- a/launcher/Version.cpp
+++ b/launcher/Version.cpp
@@ -10,49 +10,63 @@ Version::Version(QString str) : m_string(std::move(str))
parse();
}
+#define VERSION_OPERATOR(return_on_different) \
+ bool exclude_our_sections = false; \
+ bool exclude_their_sections = false; \
+ \
+ const auto size = qMax(m_sections.size(), other.m_sections.size()); \
+ for (int i = 0; i < size; ++i) { \
+ Section sec1 = (i >= m_sections.size()) ? Section() : m_sections.at(i); \
+ Section sec2 = (i >= other.m_sections.size()) ? Section() : other.m_sections.at(i); \
+ \
+ { /* Don't include appendixes in the comparison */ \
+ if (sec1.isAppendix()) \
+ exclude_our_sections = true; \
+ if (sec2.isAppendix()) \
+ exclude_their_sections = true; \
+ \
+ if (exclude_our_sections) { \
+ sec1 = Section(); \
+ if (sec2.m_isNull) \
+ break; \
+ } \
+ \
+ if (exclude_their_sections) { \
+ sec2 = Section(); \
+ if (sec1.m_isNull) \
+ break; \
+ } \
+ } \
+ \
+ if (sec1 != sec2) \
+ return return_on_different; \
+ }
+
bool Version::operator<(const Version& other) const
{
- const auto size = qMax(m_sections.size(), other.m_sections.size());
- for (int i = 0; i < size; ++i) {
- const Section sec1 =
- (i >= m_sections.size()) ? Section("") : m_sections.at(i);
- const Section sec2 =
- (i >= other.m_sections.size()) ? Section("") : other.m_sections.at(i);
-
- if (sec1 != sec2)
- return sec1 < sec2;
- }
+ VERSION_OPERATOR(sec1 < sec2)
return false;
}
bool Version::operator==(const Version& other) const
{
- const auto size = qMax(m_sections.size(), other.m_sections.size());
- for (int i = 0; i < size; ++i) {
- const Section sec1 =
- (i >= m_sections.size()) ? Section("") : m_sections.at(i);
- const Section sec2 =
- (i >= other.m_sections.size()) ? Section("") : other.m_sections.at(i);
-
- if (sec1 != sec2)
- return false;
- }
+ VERSION_OPERATOR(false)
return true;
}
-bool Version::operator!=(const Version &other) const
+bool Version::operator!=(const Version& other) const
{
return !operator==(other);
}
-bool Version::operator<=(const Version &other) const
+bool Version::operator<=(const Version& other) const
{
return *this < other || *this == other;
}
-bool Version::operator>(const Version &other) const
+bool Version::operator>(const Version& other) const
{
return !(*this <= other);
}
-bool Version::operator>=(const Version &other) const
+bool Version::operator>=(const Version& other) const
{
return !(*this < other);
}
@@ -62,26 +76,38 @@ void Version::parse()
m_sections.clear();
QString currentSection;
- auto classChange = [](QChar lastChar, QChar currentChar) {
- return !lastChar.isNull() && ((!lastChar.isDigit() && currentChar.isDigit()) || (lastChar.isDigit() && !currentChar.isDigit()));
+ if (m_string.isEmpty())
+ return;
+
+ auto classChange = [&](QChar lastChar, QChar currentChar) {
+ if (lastChar.isNull())
+ return false;
+ if (lastChar.isDigit() != currentChar.isDigit())
+ return true;
+
+ const QList<QChar> s_separators{ '.', '-', '+' };
+ if (s_separators.contains(currentChar) && currentSection.at(0) != currentChar)
+ return true;
+
+ return false;
};
- for (int i = 0; i < m_string.size(); ++i) {
+ currentSection += m_string.at(0);
+ for (int i = 1; i < m_string.size(); ++i) {
const auto& current_char = m_string.at(i);
- if ((i > 0 && classChange(m_string.at(i - 1), current_char)) || current_char == '.' || current_char == '-' || current_char == '+') {
- if (!currentSection.isEmpty()) {
+ if (classChange(m_string.at(i - 1), current_char)) {
+ if (!currentSection.isEmpty())
m_sections.append(Section(currentSection));
- }
currentSection = "";
}
+
currentSection += current_char;
}
- if (!currentSection.isEmpty()) {
+
+ if (!currentSection.isEmpty())
m_sections.append(Section(currentSection));
- }
}
-
/// qDebug print support for the Version class
QDebug operator<<(QDebug debug, const Version& v)
{
diff --git a/launcher/Version.h b/launcher/Version.h
index 23481c29..659f8e54 100644
--- a/launcher/Version.h
+++ b/launcher/Version.h
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
* PolyMC - Minecraft Launcher
+ * Copyright (C) 2023 flowln <flowlnlnln@gmail.com>
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
*
* This program is free software: you can redistribute it and/or modify
@@ -60,7 +61,7 @@ class Version {
private:
struct Section {
- explicit Section(QString fullString) : m_isNull(true), m_fullString(std::move(fullString))
+ explicit Section(QString fullString) : m_fullString(std::move(fullString))
{
int cutoff = m_fullString.size();
for (int i = 0; i < m_fullString.size(); i++) {
@@ -95,45 +96,54 @@ class Version {
explicit Section() = default;
- bool m_isNull = false;
- int m_numPart = 0;
+ bool m_isNull = true;
+ int m_numPart = 0;
QString m_stringPart;
+
QString m_fullString;
+ [[nodiscard]] inline bool isAppendix() const { return m_stringPart.startsWith('+'); }
+ [[nodiscard]] inline bool isPreRelease() const { return m_stringPart.startsWith('-') && m_stringPart.length() > 1; }
+
inline bool operator==(const Section& other) const
{
if (m_isNull && !other.m_isNull)
- return other.m_numPart == 0;
-
+ return false;
if (!m_isNull && other.m_isNull)
- return m_numPart == 0;
-
- if (m_isNull || other.m_isNull)
- return (m_stringPart == ".") || (other.m_stringPart == ".");
+ return false;
- if (!m_isNull && !other.m_isNull)
+ if (!m_isNull && !other.m_isNull) {
return (m_numPart == other.m_numPart) && (m_stringPart == other.m_stringPart);
+ }
- return m_fullString == other.m_fullString;
+ return true;
}
- inline bool operator<(const Section &other) const
+ inline bool operator<(const Section& other) const
{
- if (m_isNull && !other.m_isNull)
- return other.m_numPart > 0;
+ static auto unequal_is_less = [](Section const& non_null) -> bool {
+ if (non_null.m_stringPart.isEmpty())
+ return non_null.m_numPart == 0;
+ return (non_null.m_stringPart != QLatin1Char('.')) && non_null.isPreRelease();
+ };
if (!m_isNull && other.m_isNull)
- return m_numPart < 0;
-
- if (m_isNull || other.m_isNull)
- return true;
+ return unequal_is_less(*this);
+ if (m_isNull && !other.m_isNull)
+ return !unequal_is_less(other);
if (!m_isNull && !other.m_isNull) {
- if(m_numPart < other.m_numPart)
+ if (m_numPart < other.m_numPart)
+ return true;
+ if (m_numPart == other.m_numPart && m_stringPart < other.m_stringPart)
return true;
- if(m_numPart == other.m_numPart && m_stringPart < other.m_stringPart)
+
+ if (!m_stringPart.isEmpty() && other.m_stringPart.isEmpty())
+ return false;
+ if (m_stringPart.isEmpty() && !other.m_stringPart.isEmpty())
return true;
+
return false;
}
diff --git a/tests/Version_test.cpp b/tests/Version_test.cpp
index bb0a7f5a..afb4c610 100644
--- a/tests/Version_test.cpp
+++ b/tests/Version_test.cpp
@@ -33,24 +33,24 @@ class VersionTest : public QObject {
addDataColumns();
QTest::newRow("equal, explicit") << "1.2.0" << "1.2.0" << false << true;
- QTest::newRow("equal, implicit 1") << "1.2" << "1.2.0" << false << true;
- QTest::newRow("equal, implicit 2") << "1.2.0" << "1.2" << false << true;
QTest::newRow("equal, two-digit") << "1.42" << "1.42" << false << true;
QTest::newRow("lessThan, explicit 1") << "1.2.0" << "1.2.1" << true << false;
QTest::newRow("lessThan, explicit 2") << "1.2.0" << "1.3.0" << true << false;
QTest::newRow("lessThan, explicit 3") << "1.2.0" << "2.2.0" << true << false;
- QTest::newRow("lessThan, implicit 1") << "1.2" << "1.2.1" << true << false;
- QTest::newRow("lessThan, implicit 2") << "1.2" << "1.3.0" << true << false;
- QTest::newRow("lessThan, implicit 3") << "1.2" << "2.2.0" << true << false;
+ QTest::newRow("lessThan, implicit 1") << "1.2" << "1.2.0" << true << false;
+ QTest::newRow("lessThan, implicit 2") << "1.2" << "1.2.1" << true << false;
+ QTest::newRow("lessThan, implicit 3") << "1.2" << "1.3.0" << true << false;
+ QTest::newRow("lessThan, implicit 4") << "1.2" << "2.2.0" << true << false;
QTest::newRow("lessThan, two-digit") << "1.41" << "1.42" << true << false;
QTest::newRow("greaterThan, explicit 1") << "1.2.1" << "1.2.0" << false << false;
QTest::newRow("greaterThan, explicit 2") << "1.3.0" << "1.2.0" << false << false;
QTest::newRow("greaterThan, explicit 3") << "2.2.0" << "1.2.0" << false << false;
- QTest::newRow("greaterThan, implicit 1") << "1.2.1" << "1.2" << false << false;
- QTest::newRow("greaterThan, implicit 2") << "1.3.0" << "1.2" << false << false;
- QTest::newRow("greaterThan, implicit 3") << "2.2.0" << "1.2" << false << false;
+ QTest::newRow("greaterThan, implicit 1") << "1.2.0" << "1.2" << false << false;
+ QTest::newRow("greaterThan, implicit 2") << "1.2.1" << "1.2" << false << false;
+ QTest::newRow("greaterThan, implicit 3") << "1.3.0" << "1.2" << false << false;
+ QTest::newRow("greaterThan, implicit 4") << "2.2.0" << "1.2" << false << false;
QTest::newRow("greaterThan, two-digit") << "1.42" << "1.41" << false << false;
}
generated by cgit (git 2.46.0) at 2025-02-02 17:00:20 +0000