diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-06-18 23:16:17 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-06-18 23:18:32 +0200 |
commit | 4f4e1d1f0ea3dd23dc2571716a5959ca4fe3273a (patch) | |
tree | fab150784747872e0afa20faa499b47e55c9fdf1 /rbutil/rbutilqt/base | |
parent | beb61a93c58a2f97bc3f297ffdf3026b846fccca (diff) | |
download | rockbox-4f4e1d1f0ea3dd23dc2571716a5959ca4fe3273a.tar.gz rockbox-4f4e1d1f0ea3dd23dc2571716a5959ca4fe3273a.zip |
Move constructing manual URL to ServerInfo class.
Change-Id: I4d2605b2389b4378e8311fc82057974e0eb238e6
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r-- | rbutil/rbutilqt/base/serverinfo.cpp | 29 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/serverinfo.h | 3 |
2 files changed, 32 insertions, 0 deletions
diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp index fd46f13a8b..8d91309e66 100644 --- a/rbutil/rbutilqt/base/serverinfo.cpp +++ b/rbutil/rbutilqt/base/serverinfo.cpp | |||
@@ -35,6 +35,9 @@ const static struct { | |||
35 | { ServerInfo::RelCandidateVersion, ":platform:/rcversion", "" }, | 35 | { ServerInfo::RelCandidateVersion, ":platform:/rcversion", "" }, |
36 | { ServerInfo::RelCandidateUrl, ":platform:/rcurl", "" }, | 36 | { ServerInfo::RelCandidateUrl, ":platform:/rcurl", "" }, |
37 | { ServerInfo::CurStatus, ":platform:/status", "Unknown" }, | 37 | { ServerInfo::CurStatus, ":platform:/status", "Unknown" }, |
38 | { ServerInfo::ManualPdfUrl, ":platform:/manual_pdf", "" }, | ||
39 | { ServerInfo::ManualHtmlUrl, ":platform:/manual_html", "" }, | ||
40 | { ServerInfo::ManualZipUrl, ":platform:/manual_zip", "" }, | ||
38 | { ServerInfo::BleedingRevision, "bleedingrev", "" }, | 41 | { ServerInfo::BleedingRevision, "bleedingrev", "" }, |
39 | { ServerInfo::BleedingDate, "bleedingdate", "" }, | 42 | { ServerInfo::BleedingDate, "bleedingdate", "" }, |
40 | { ServerInfo::CurDevelUrl, ":platform:/develurl", "" }, | 43 | { ServerInfo::CurDevelUrl, ":platform:/develurl", "" }, |
@@ -126,6 +129,28 @@ void ServerInfo::readBuildInfo(QString file) | |||
126 | break; | 129 | break; |
127 | } | 130 | } |
128 | info.endGroup(); | 131 | info.endGroup(); |
132 | |||
133 | // manual URLs | ||
134 | QString manualPdfUrl = manualBaseUrl; | ||
135 | QString manualHtmlUrl = manualBaseUrl; | ||
136 | QString manualZipUrl = manualBaseUrl; | ||
137 | |||
138 | QString buildservermodel = SystemInfo::platformValue(platforms.at(i), | ||
139 | SystemInfo::CurBuildserverModel).toString(); | ||
140 | QString modelman = SystemInfo::platformValue(platforms.at(i), | ||
141 | SystemInfo::CurManual).toString(); | ||
142 | QString manualBaseName = "rockbox-"; | ||
143 | |||
144 | if(modelman.isEmpty()) manualBaseName += buildservermodel; | ||
145 | else manualBaseName += modelman; | ||
146 | |||
147 | manualPdfUrl.replace("%EXTENSION%", "pdf"); | ||
148 | manualPdfUrl.replace("%MANUALBASENAME%", manualBaseName); | ||
149 | manualHtmlUrl.replace("%EXTENSION%", "html"); | ||
150 | manualHtmlUrl.replace("%MANUALBASENAME%", manualBaseName + "/rockbox-build"); | ||
151 | manualZipUrl.replace("%EXTENSION%", "zip"); | ||
152 | manualZipUrl.replace("%MANUALBASENAME%", manualBaseName + "-html"); | ||
153 | |||
129 | // set variants (if any) | 154 | // set variants (if any) |
130 | for(int j = 0; j < variants.size(); ++j) { | 155 | for(int j = 0; j < variants.size(); ++j) { |
131 | setPlatformValue(variants.at(j), ServerInfo::CurStatus, status); | 156 | setPlatformValue(variants.at(j), ServerInfo::CurStatus, status); |
@@ -138,6 +163,10 @@ void ServerInfo::readBuildInfo(QString file) | |||
138 | setPlatformValue(variants.at(j), ServerInfo::RelCandidateUrl, relCandidateUrl); | 163 | setPlatformValue(variants.at(j), ServerInfo::RelCandidateUrl, relCandidateUrl); |
139 | } | 164 | } |
140 | setPlatformValue(variants.at(j), ServerInfo::CurDevelUrl, develUrl); | 165 | setPlatformValue(variants.at(j), ServerInfo::CurDevelUrl, develUrl); |
166 | |||
167 | setPlatformValue(variants.at(j), ServerInfo::ManualPdfUrl, manualPdfUrl); | ||
168 | setPlatformValue(variants.at(j), ServerInfo::ManualHtmlUrl, manualHtmlUrl); | ||
169 | setPlatformValue(variants.at(j), ServerInfo::ManualZipUrl, manualZipUrl); | ||
141 | } | 170 | } |
142 | } | 171 | } |
143 | } | 172 | } |
diff --git a/rbutil/rbutilqt/base/serverinfo.h b/rbutil/rbutilqt/base/serverinfo.h index ea68fd7fc4..94b2818f73 100644 --- a/rbutil/rbutilqt/base/serverinfo.h +++ b/rbutil/rbutilqt/base/serverinfo.h | |||
@@ -34,6 +34,9 @@ class ServerInfo : public QObject | |||
34 | CurStatus, | 34 | CurStatus, |
35 | CurReleaseUrl, | 35 | CurReleaseUrl, |
36 | CurDevelUrl, | 36 | CurDevelUrl, |
37 | ManualPdfUrl, | ||
38 | ManualHtmlUrl, | ||
39 | ManualZipUrl, | ||
37 | BleedingRevision, | 40 | BleedingRevision, |
38 | BleedingDate, | 41 | BleedingDate, |
39 | RelCandidateVersion, | 42 | RelCandidateVersion, |