summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/installzip.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/installzip.cpp')
-rw-r--r--rbutil/rbutilqt/installzip.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/installzip.cpp b/rbutil/rbutilqt/installzip.cpp
index 2c7eac6451..154cc9665b 100644
--- a/rbutil/rbutilqt/installzip.cpp
+++ b/rbutil/rbutilqt/installzip.cpp
@@ -25,6 +25,7 @@
25ZipInstaller::ZipInstaller(QObject* parent): QObject(parent) 25ZipInstaller::ZipInstaller(QObject* parent): QObject(parent)
26{ 26{
27 m_unzip = true; 27 m_unzip = true;
28 m_cache = "";
28} 29}
29 30
30 31
@@ -86,6 +87,10 @@ void ZipInstaller::installStart()
86 // get the real file. 87 // get the real file.
87 getter = new HttpGet(this); 88 getter = new HttpGet(this);
88 getter->setProxy(m_proxy); 89 getter->setProxy(m_proxy);
90 if(m_cache.exists()) {
91 getter->setCache(m_cache);
92 qDebug() << "installzip: setting cache to" << m_cache;
93 }
89 getter->setFile(downloadFile); 94 getter->setFile(downloadFile);
90 getter->getFile(QUrl(m_url)); 95 getter->getFile(QUrl(m_url));
91 96
@@ -117,12 +122,13 @@ void ZipInstaller::downloadDone(bool error)
117 m_dp->setProgressMax(max); 122 m_dp->setProgressMax(max);
118 } 123 }
119 m_dp->setProgressValue(max); 124 m_dp->setProgressValue(max);
120 if(getter->httpResponse() != 200) { 125 if(getter->httpResponse() != 200 && !getter->isCached()) {
121 m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR); 126 m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR);
122 m_dp->abort(); 127 m_dp->abort();
123 emit done(true); 128 emit done(true);
124 return; 129 return;
125 } 130 }
131 if(getter->isCached()) m_dp->addItem(tr("Cached file used."), LOGINFO);
126 if(error) { 132 if(error) {
127 m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); 133 m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR);
128 m_dp->abort(); 134 m_dp->abort();
@@ -205,3 +211,4 @@ void ZipInstaller::updateDataReadProgress(int read, int total)
205 211
206} 212}
207 213
214