summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/base/zipinstaller.cpp
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2012-05-23 21:05:28 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2012-05-23 21:10:38 +0200
commit968448c9cdd2583225cff015b43aeeb9d1c304da (patch)
treea540f5733d60a649c1534a4c4ba00c2d8be619a3 /rbutil/rbutilqt/base/zipinstaller.cpp
parent5c36e2f21c13196cc0b6b34c8ee8149b0595bd82 (diff)
downloadrockbox-968448c9cdd2583225cff015b43aeeb9d1c304da.tar.gz
rockbox-968448c9cdd2583225cff015b43aeeb9d1c304da.zip
ZipIntaller: use file timestamp if version string is missing.
Instead of using some arbitrary and not really useful string use the timestamp of the downloaded file if version string is provided by the caller. This also makes it possible to check if the downloaded file is actually a different one. Use it for manual and game file downloads, as this gives more reasonable values than using the date transmitted for daily (archived) build and as support for archived builds will be removed shortly. Change-Id: I0c751fabe7bb516edca93a5f73f077a611d4ef87
Diffstat (limited to 'rbutil/rbutilqt/base/zipinstaller.cpp')
-rw-r--r--rbutil/rbutilqt/base/zipinstaller.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/base/zipinstaller.cpp b/rbutil/rbutilqt/base/zipinstaller.cpp
index 3f3179f5f2..117fa2dae9 100644
--- a/rbutil/rbutilqt/base/zipinstaller.cpp
+++ b/rbutil/rbutilqt/base/zipinstaller.cpp
@@ -59,7 +59,7 @@ void ZipInstaller::installContinue()
59 m_url = m_urllist.at(runner); 59 m_url = m_urllist.at(runner);
60 m_logsection = m_loglist.at(runner); 60 m_logsection = m_loglist.at(runner);
61 if(runner < m_verlist.size()) m_logver = m_verlist.at(runner); 61 if(runner < m_verlist.size()) m_logver = m_verlist.at(runner);
62 else m_logver = "0"; 62 else m_logver = "";
63 installStart(); 63 installStart();
64 } 64 }
65 else { 65 else {
@@ -176,6 +176,10 @@ void ZipInstaller::downloadDone(bool error)
176 // add file to log 176 // add file to log
177 zipContents.append(m_target); 177 zipContents.append(m_target);
178 } 178 }
179 if(m_logver.isEmpty()) {
180 // if no version info is set use the timestamp of the server file.
181 m_logver = getter->timestamp().toString(Qt::ISODate);
182 }
179 183
180 emit logItem(tr("Creating installation log"),LOGINFO); 184 emit logItem(tr("Creating installation log"),LOGINFO);
181 QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); 185 QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0);