summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/base/zipinstaller.cpp6
-rw-r--r--rbutil/rbutilqt/base/zipinstaller.h6
-rw-r--r--rbutil/rbutilqt/gui/manualwidget.cpp2
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp2
4 files changed, 11 insertions, 5 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);
diff --git a/rbutil/rbutilqt/base/zipinstaller.h b/rbutil/rbutilqt/base/zipinstaller.h
index cb154c03a8..e15bbcf783 100644
--- a/rbutil/rbutilqt/base/zipinstaller.h
+++ b/rbutil/rbutilqt/base/zipinstaller.h
@@ -41,8 +41,10 @@ public:
41 void setUrl(QStringList url) { m_urllist = url; } 41 void setUrl(QStringList url) { m_urllist = url; }
42 void setLogSection(QString name) {m_loglist = QStringList(name);} 42 void setLogSection(QString name) {m_loglist = QStringList(name);}
43 void setLogSection(QStringList name) { m_loglist = name; } 43 void setLogSection(QStringList name) { m_loglist = name; }
44 void setLogVersion(QString v) { m_verlist = QStringList(v); qDebug() << m_verlist;} 44 void setLogVersion(QString v = "")
45 void setLogVersion(QStringList v) { m_verlist = v; qDebug() << m_verlist;} 45 { m_verlist = QStringList(v); qDebug() << m_verlist;}
46 void setLogVersion(QStringList v)
47 { m_verlist = v; qDebug() << m_verlist;}
46 void setUnzip(bool i) { m_unzip = i; } 48 void setUnzip(bool i) { m_unzip = i; }
47 void setTarget(QString t) { m_target = t; } 49 void setTarget(QString t) { m_target = t; }
48 void setCache(QDir c) { m_cache = c; m_usecache = true; }; 50 void setCache(QDir c) { m_cache = c; m_usecache = true; };
diff --git a/rbutil/rbutilqt/gui/manualwidget.cpp b/rbutil/rbutilqt/gui/manualwidget.cpp
index 3bc795f098..ae38980479 100644
--- a/rbutil/rbutilqt/gui/manualwidget.cpp
+++ b/rbutil/rbutilqt/gui/manualwidget.cpp
@@ -127,7 +127,7 @@ void ManualWidget::downloadManual(void)
127 } 127 }
128 qDebug() << "[ManualWidget] Manual URL:" << manualurl; 128 qDebug() << "[ManualWidget] Manual URL:" << manualurl;
129 129
130 installer->setLogVersion(ServerInfo::value(ServerInfo::DailyDate).toString()); 130 installer->setLogVersion();
131 installer->setUrl(manualurl); 131 installer->setUrl(manualurl);
132 installer->setUnzip(false); 132 installer->setUnzip(false);
133 133
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 5c496585ec..ae45068bde 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -994,7 +994,7 @@ void RbUtilQt::installDoom()
994 994
995 installer->setUrl(SystemInfo::value(SystemInfo::DoomUrl).toString()); 995 installer->setUrl(SystemInfo::value(SystemInfo::DoomUrl).toString());
996 installer->setLogSection("Game Addons"); 996 installer->setLogSection("Game Addons");
997 installer->setLogVersion(ServerInfo::value(ServerInfo::DailyDate).toString()); 997 installer->setLogVersion();
998 installer->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString()); 998 installer->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString());
999 if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) 999 if(!RbSettings::value(RbSettings::CacheDisabled).toBool())
1000 installer->setCache(true); 1000 installer->setCache(true);