diff options
-rw-r--r-- | rbutil/rbutilqt/base/rockboxinfo.cpp | 9 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/rockboxinfo.h | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/themesinstallwindow.cpp | 14 |
3 files changed, 15 insertions, 12 deletions
diff --git a/rbutil/rbutilqt/base/rockboxinfo.cpp b/rbutil/rbutilqt/base/rockboxinfo.cpp index f85c23b669..6bfffc1b23 100644 --- a/rbutil/rbutilqt/base/rockboxinfo.cpp +++ b/rbutil/rbutilqt/base/rockboxinfo.cpp | |||
@@ -41,6 +41,15 @@ RockboxInfo::RockboxInfo(QString mountpoint) | |||
41 | if(line.contains("Version:")) | 41 | if(line.contains("Version:")) |
42 | { | 42 | { |
43 | m_version = line.remove("Version:").trimmed(); | 43 | m_version = line.remove("Version:").trimmed(); |
44 | if(m_version.startsWith("r")) { | ||
45 | m_revision = m_version; | ||
46 | m_revision.remove("r").replace(QRegExp("-.+$"), ""); | ||
47 | m_release = ""; | ||
48 | } | ||
49 | else { | ||
50 | m_release = m_version; | ||
51 | m_revision = ""; | ||
52 | } | ||
44 | } | 53 | } |
45 | else if(line.contains("Target: ")) | 54 | else if(line.contains("Target: ")) |
46 | { | 55 | { |
diff --git a/rbutil/rbutilqt/base/rockboxinfo.h b/rbutil/rbutilqt/base/rockboxinfo.h index 4d704f8f72..906da635a9 100644 --- a/rbutil/rbutilqt/base/rockboxinfo.h +++ b/rbutil/rbutilqt/base/rockboxinfo.h | |||
@@ -36,8 +36,12 @@ public: | |||
36 | QString target() {return m_target;} | 36 | QString target() {return m_target;} |
37 | int ram() { return m_ram; } | 37 | int ram() { return m_ram; } |
38 | bool success() { return m_success; } | 38 | bool success() { return m_success; } |
39 | QString revision(void) { return m_revision; } | ||
40 | QString release(void) { return m_release; } | ||
39 | private: | 41 | private: |
40 | QString m_version; | 42 | QString m_version; |
43 | QString m_revision; | ||
44 | QString m_release; | ||
41 | QString m_features; | 45 | QString m_features; |
42 | QString m_targetid; | 46 | QString m_targetid; |
43 | QString m_target; | 47 | QString m_target; |
diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp index 935c703193..cb06b47b1f 100644 --- a/rbutil/rbutilqt/themesinstallwindow.cpp +++ b/rbutil/rbutilqt/themesinstallwindow.cpp | |||
@@ -62,16 +62,6 @@ void ThemesInstallWindow::downloadInfo() | |||
62 | getter = new HttpGet(this); | 62 | getter = new HttpGet(this); |
63 | RockboxInfo installInfo | 63 | RockboxInfo installInfo |
64 | = RockboxInfo(RbSettings::value(RbSettings::Mountpoint).toString()); | 64 | = RockboxInfo(RbSettings::value(RbSettings::Mountpoint).toString()); |
65 | QString revision; | ||
66 | QString release; | ||
67 | // installInfo.version() holds either the revision (as r<revision>-<date>) | ||
68 | // or the release version number. | ||
69 | if(installInfo.version().startsWith("r")) { | ||
70 | revision = installInfo.version().remove("r").replace(QRegExp("-.+$"), ""); | ||
71 | } | ||
72 | else { | ||
73 | release = installInfo.version(); | ||
74 | } | ||
75 | 65 | ||
76 | themesInfo.open(); | 66 | themesInfo.open(); |
77 | qDebug() << "[Themes] downloading info to" << themesInfo.fileName(); | 67 | qDebug() << "[Themes] downloading info to" << themesInfo.fileName(); |
@@ -80,8 +70,8 @@ void ThemesInstallWindow::downloadInfo() | |||
80 | QString infoUrl = SystemInfo::value(SystemInfo::ThemesInfoUrl).toString(); | 70 | QString infoUrl = SystemInfo::value(SystemInfo::ThemesInfoUrl).toString(); |
81 | infoUrl.replace("%TARGET%", | 71 | infoUrl.replace("%TARGET%", |
82 | SystemInfo::value(SystemInfo::CurConfigureModel).toString()); | 72 | SystemInfo::value(SystemInfo::CurConfigureModel).toString()); |
83 | infoUrl.replace("%REVISION%", revision); | 73 | infoUrl.replace("%REVISION%", installInfo.revision()); |
84 | infoUrl.replace("%RELEASE%", release); | 74 | infoUrl.replace("%RELEASE%", installInfo.release()); |
85 | infoUrl.replace("%RBUTILVER%", VERSION); | 75 | infoUrl.replace("%RBUTILVER%", VERSION); |
86 | QUrl url = QUrl(infoUrl); | 76 | QUrl url = QUrl(infoUrl); |
87 | qDebug() << "[Themes] Info URL:" << url << "Query:" << url.queryItems(); | 77 | qDebug() << "[Themes] Info URL:" << url << "Query:" << url.queryItems(); |