diff options
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r-- | rbutil/rbutilqt/base/serverinfo.cpp | 23 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/serverinfo.h | 9 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.cpp | 3 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.h | 3 |
4 files changed, 12 insertions, 26 deletions
diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp index e288bbfe34..b60245c3d5 100644 --- a/rbutil/rbutilqt/base/serverinfo.cpp +++ b/rbutil/rbutilqt/base/serverinfo.cpp | |||
@@ -32,20 +32,20 @@ const static struct { | |||
32 | } ServerInfoList[] = { | 32 | } ServerInfoList[] = { |
33 | { ServerInfo::CurReleaseVersion, ":platform:/releaseversion", "" }, | 33 | { ServerInfo::CurReleaseVersion, ":platform:/releaseversion", "" }, |
34 | { ServerInfo::CurStatus, ":platform:/status", "Unknown" }, | 34 | { ServerInfo::CurStatus, ":platform:/status", "Unknown" }, |
35 | { ServerInfo::DailyDate, "dailydate", "" }, | ||
36 | { ServerInfo::BleedingRevision, "bleedingrev", "" }, | 35 | { ServerInfo::BleedingRevision, "bleedingrev", "" }, |
37 | { ServerInfo::BleedingDate, "bleedingdate", "" }, | 36 | { ServerInfo::BleedingDate, "bleedingdate", "" }, |
38 | }; | 37 | }; |
39 | 38 | ||
40 | QMap<QString, QVariant> ServerInfo::serverInfos; | 39 | QMap<QString, QVariant> ServerInfo::serverInfos; |
41 | 40 | ||
42 | void ServerInfo::readBuildInfo(QString file) | 41 | void ServerInfo::readBuildInfo(QString file) |
43 | { | 42 | { |
44 | QSettings info(file, QSettings::IniFormat); | 43 | QSettings info(file, QSettings::IniFormat); |
45 | 44 | ||
46 | QDate date = QDate::fromString(info.value("dailies/date").toString(), "yyyyMMdd"); | 45 | setValue(ServerInfo::BleedingRevision,info.value("bleeding/rev")); |
47 | setValue(ServerInfo::DailyDate,date.toString(Qt::ISODate)); | 46 | QDateTime date = QDateTime::fromString(info.value("bleeding/timestamp").toString(), "yyyyMMddThhmmssZ"); |
48 | 47 | setValue(ServerInfo::BleedingDate,date.toString(Qt::ISODate)); | |
48 | |||
49 | info.beginGroup("release"); | 49 | info.beginGroup("release"); |
50 | QStringList keys = info.allKeys(); | 50 | QStringList keys = info.allKeys(); |
51 | info.endGroup(); | 51 | info.endGroup(); |
@@ -87,19 +87,10 @@ void ServerInfo::readBuildInfo(QString file) | |||
87 | setPlatformValue(variants.at(j), ServerInfo::CurStatus, status); | 87 | setPlatformValue(variants.at(j), ServerInfo::CurStatus, status); |
88 | setPlatformValue(variants.at(j), ServerInfo::CurReleaseVersion, release); | 88 | setPlatformValue(variants.at(j), ServerInfo::CurReleaseVersion, release); |
89 | } | 89 | } |
90 | |||
91 | } | 90 | } |
92 | } | 91 | } |
93 | 92 | ||
94 | void ServerInfo::readBleedingInfo(QString file) | 93 | |
95 | { | ||
96 | QSettings info(file, QSettings::IniFormat); | ||
97 | |||
98 | setValue(ServerInfo::BleedingRevision,info.value("bleeding/rev")); | ||
99 | QDateTime date = QDateTime::fromString(info.value("bleeding/timestamp").toString(), "yyyyMMddThhmmssZ"); | ||
100 | setValue(ServerInfo::BleedingDate,date.toString(Qt::ISODate)); | ||
101 | } | ||
102 | |||
103 | QVariant ServerInfo::value(enum ServerInfos info) | 94 | QVariant ServerInfo::value(enum ServerInfos info) |
104 | { | 95 | { |
105 | // locate info item | 96 | // locate info item |
diff --git a/rbutil/rbutilqt/base/serverinfo.h b/rbutil/rbutilqt/base/serverinfo.h index 37a0953e3d..69aa26f3e6 100644 --- a/rbutil/rbutilqt/base/serverinfo.h +++ b/rbutil/rbutilqt/base/serverinfo.h | |||
@@ -27,25 +27,22 @@ class ServerInfo : public QObject | |||
27 | { | 27 | { |
28 | Q_OBJECT | 28 | Q_OBJECT |
29 | public: | 29 | public: |
30 | 30 | ||
31 | //! All Server infos | 31 | //! All Server infos |
32 | enum ServerInfos { | 32 | enum ServerInfos { |
33 | CurReleaseVersion, | 33 | CurReleaseVersion, |
34 | CurStatus, | 34 | CurStatus, |
35 | DailyDate, | ||
36 | BleedingRevision, | 35 | BleedingRevision, |
37 | BleedingDate, | 36 | BleedingDate, |
38 | }; | 37 | }; |
39 | 38 | ||
40 | //! read in buildinfo file | 39 | //! read in buildinfo file |
41 | static void readBuildInfo(QString file); | 40 | static void readBuildInfo(QString file); |
42 | //! read in bleeding info file | ||
43 | static void readBleedingInfo(QString file); | ||
44 | //! get a value from server info | 41 | //! get a value from server info |
45 | static QVariant value(enum ServerInfos setting); | 42 | static QVariant value(enum ServerInfos setting); |
46 | //! get a value from server info for a named platform. | 43 | //! get a value from server info for a named platform. |
47 | static QVariant platformValue(QString platform, enum ServerInfos setting); | 44 | static QVariant platformValue(QString platform, enum ServerInfos setting); |
48 | 45 | ||
49 | private: | 46 | private: |
50 | //! set a server info value | 47 | //! set a server info value |
51 | static void setValue(enum ServerInfos setting , QVariant value); | 48 | static void setValue(enum ServerInfos setting , QVariant value); |
diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp index 44bcf3c84d..eddfb26b34 100644 --- a/rbutil/rbutilqt/base/systeminfo.cpp +++ b/rbutil/rbutilqt/base/systeminfo.cpp | |||
@@ -43,12 +43,11 @@ const static struct { | |||
43 | { SystemInfo::DoomUrl, "doom_url", "" }, | 43 | { SystemInfo::DoomUrl, "doom_url", "" }, |
44 | { SystemInfo::ReleaseUrl, "release_url", "" }, | 44 | { SystemInfo::ReleaseUrl, "release_url", "" }, |
45 | { SystemInfo::DailyUrl, "daily_url", "" }, | 45 | { SystemInfo::DailyUrl, "daily_url", "" }, |
46 | { SystemInfo::ServerConfUrl, "server_conf_url", "" }, | 46 | { SystemInfo::BuildInfoUrl, "build_info_url", "" }, |
47 | { SystemInfo::GenlangUrl, "genlang_url", "" }, | 47 | { SystemInfo::GenlangUrl, "genlang_url", "" }, |
48 | { SystemInfo::ThemesUrl, "themes_url", "" }, | 48 | { SystemInfo::ThemesUrl, "themes_url", "" }, |
49 | { SystemInfo::ThemesInfoUrl, "themes_info_url", "" }, | 49 | { SystemInfo::ThemesInfoUrl, "themes_info_url", "" }, |
50 | { SystemInfo::RbutilUrl, "rbutil_url", "" }, | 50 | { SystemInfo::RbutilUrl, "rbutil_url", "" }, |
51 | { SystemInfo::BleedingInfo, "bleeding_info", "" }, | ||
52 | { SystemInfo::CurPlatformName, ":platform:/name", "" }, | 51 | { SystemInfo::CurPlatformName, ":platform:/name", "" }, |
53 | { SystemInfo::CurManual, ":platform:/manualname","rockbox-:platform:" }, | 52 | { SystemInfo::CurManual, ":platform:/manualname","rockbox-:platform:" }, |
54 | { SystemInfo::CurBootloaderMethod, ":platform:/bootloadermethod", "none" }, | 53 | { SystemInfo::CurBootloaderMethod, ":platform:/bootloadermethod", "none" }, |
diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h index 420dbf3c80..9eddd5ed38 100644 --- a/rbutil/rbutilqt/base/systeminfo.h +++ b/rbutil/rbutilqt/base/systeminfo.h | |||
@@ -47,12 +47,11 @@ class SystemInfo : public QObject | |||
47 | ReleaseUrl, | 47 | ReleaseUrl, |
48 | ReleaseVoiceUrl, | 48 | ReleaseVoiceUrl, |
49 | ReleaseFontUrl, | 49 | ReleaseFontUrl, |
50 | ServerConfUrl, | 50 | BuildInfoUrl, |
51 | GenlangUrl, | 51 | GenlangUrl, |
52 | ThemesUrl, | 52 | ThemesUrl, |
53 | ThemesInfoUrl, | 53 | ThemesInfoUrl, |
54 | RbutilUrl, | 54 | RbutilUrl, |
55 | BleedingInfo, | ||
56 | CurPlatformName, | 55 | CurPlatformName, |
57 | CurManual, | 56 | CurManual, |
58 | CurBootloaderMethod, | 57 | CurBootloaderMethod, |