diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-15 21:06:33 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-15 21:06:33 +0100 |
commit | 9bb60b7d854734475727f7566ae8d8dbb9d46fdb (patch) | |
tree | 78cf94dce69ef588be27d278a52d1670fdaad007 | |
parent | 104ff3433a9f26009751cbd317d0024742d1310b (diff) | |
download | rockbox-9bb60b7d854734475727f7566ae8d8dbb9d46fdb.tar.gz rockbox-9bb60b7d854734475727f7566ae8d8dbb9d46fdb.zip |
rbutil: Rework server info data handling.
Allow extracting release candidate version even if no URL is present.
Avoids a special case for version handling.
Change-Id: If496d30059c3181899ab9337a35a07b39eaef52e
-rw-r--r-- | rbutil/rbutilqt/base/serverinfo.cpp | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/test/test-serverinfo.cpp | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp index c4d51d4431..94c369af72 100644 --- a/rbutil/rbutilqt/base/serverinfo.cpp +++ b/rbutil/rbutilqt/base/serverinfo.cpp | |||
@@ -81,14 +81,8 @@ QVariant ServerInfo::platformValue(enum ServerInfos info, QString platform) | |||
81 | value = ServerInfo::statusToString(value.toInt()); | 81 | value = ServerInfo::statusToString(value.toInt()); |
82 | break; | 82 | break; |
83 | case CurReleaseVersion: | 83 | case CurReleaseVersion: |
84 | value = value.toStringList().at(0); | ||
85 | break; | ||
86 | case RelCandidateVersion: | 84 | case RelCandidateVersion: |
87 | // currently only the <version>,<url> format is supported here. | 85 | value = value.toStringList().at(0); |
88 | if (value.toStringList().size() > 1) | ||
89 | value = value.toStringList().at(0); | ||
90 | else | ||
91 | value.clear(); | ||
92 | break; | 86 | break; |
93 | case CurReleaseUrl: | 87 | case CurReleaseUrl: |
94 | { | 88 | { |
diff --git a/rbutil/rbutilqt/test/test-serverinfo.cpp b/rbutil/rbutilqt/test/test-serverinfo.cpp index 46d9637150..3e71a9763a 100644 --- a/rbutil/rbutilqt/test/test-serverinfo.cpp +++ b/rbutil/rbutilqt/test/test-serverinfo.cpp | |||
@@ -82,9 +82,9 @@ const struct testvector testdata[] = | |||
82 | { "iriverh10", ServerInfo::CurStatus, "Stable (Retired)" }, | 82 | { "iriverh10", ServerInfo::CurStatus, "Stable (Retired)" }, |
83 | { "gigabeatfx", ServerInfo::RelCandidateVersion, "f9dce96" }, | 83 | { "gigabeatfx", ServerInfo::RelCandidateVersion, "f9dce96" }, |
84 | { "gigabeatfx", ServerInfo::RelCandidateUrl, "http://dl.rockbox.org/rc/f9dce96/rockbox-gigabeatfx.zip" }, | 84 | { "gigabeatfx", ServerInfo::RelCandidateUrl, "http://dl.rockbox.org/rc/f9dce96/rockbox-gigabeatfx.zip" }, |
85 | { "archosfmrecorder", ServerInfo::RelCandidateVersion, "" }, | 85 | { "archosfmrecorder", ServerInfo::RelCandidateVersion, "f9dce96" }, |
86 | { "archosfmrecorder", ServerInfo::RelCandidateUrl, "" }, | 86 | { "archosfmrecorder", ServerInfo::RelCandidateUrl, "" }, |
87 | { "archosrecorder", ServerInfo::RelCandidateVersion, "" }, | 87 | { "archosrecorder", ServerInfo::RelCandidateVersion, "f9dce96" }, |
88 | { "archosrecorder", ServerInfo::RelCandidateUrl, "" }, | 88 | { "archosrecorder", ServerInfo::RelCandidateUrl, "" }, |
89 | { "iaudiox5", ServerInfo::RelCandidateVersion, "f9dce96" }, | 89 | { "iaudiox5", ServerInfo::RelCandidateVersion, "f9dce96" }, |
90 | { "iaudiox5", ServerInfo::RelCandidateUrl, "http://dl.rockbox.org/rc/f9dce96/rockbox-iaudiox5.zip" }, | 90 | { "iaudiox5", ServerInfo::RelCandidateUrl, "http://dl.rockbox.org/rc/f9dce96/rockbox-iaudiox5.zip" }, |