diff options
Diffstat (limited to 'rbutil/rbutilqt/installzip.cpp')
-rw-r--r-- | rbutil/rbutilqt/installzip.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/rbutil/rbutilqt/installzip.cpp b/rbutil/rbutilqt/installzip.cpp index 41f88171c5..874417dc9a 100644 --- a/rbutil/rbutilqt/installzip.cpp +++ b/rbutil/rbutilqt/installzip.cpp | |||
@@ -62,7 +62,7 @@ void ZipInstaller::installContinue() | |||
62 | m_dp->addItem(tr("Installation finished successfully."),LOGOK); | 62 | m_dp->addItem(tr("Installation finished successfully."),LOGOK); |
63 | m_dp->abort(); | 63 | m_dp->abort(); |
64 | 64 | ||
65 | emit done(false); | 65 | emit done(true); |
66 | return; | 66 | return; |
67 | } | 67 | } |
68 | 68 | ||
@@ -89,27 +89,17 @@ void ZipInstaller::installStart() | |||
89 | getter->setProxy(m_proxy); | 89 | getter->setProxy(m_proxy); |
90 | if(m_cache.exists()) { | 90 | if(m_cache.exists()) { |
91 | getter->setCache(m_cache); | 91 | getter->setCache(m_cache); |
92 | qDebug() << "installzip: setting cache to" << m_cache; | 92 | |
93 | } | 93 | } |
94 | getter->setFile(downloadFile); | 94 | getter->setFile(downloadFile); |
95 | getter->getFile(QUrl(m_url)); | 95 | getter->getFile(QUrl(m_url)); |
96 | 96 | ||
97 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 97 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
98 | connect(getter, SIGNAL(downloadDone(int, bool)), this, SLOT(downloadRequestFinished(int, bool))); | ||
99 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); | 98 | connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int))); |
100 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); | 99 | connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); |
101 | } | 100 | } |
102 | 101 | ||
103 | 102 | ||
104 | void ZipInstaller::downloadRequestFinished(int id, bool error) | ||
105 | { | ||
106 | qDebug() << "Install::downloadRequestFinished" << id << error; | ||
107 | qDebug() << "error:" << getter->errorString(); | ||
108 | |||
109 | downloadDone(error); | ||
110 | } | ||
111 | |||
112 | |||
113 | void ZipInstaller::downloadDone(bool error) | 103 | void ZipInstaller::downloadDone(bool error) |
114 | { | 104 | { |
115 | qDebug() << "Install::downloadDone, error:" << error; | 105 | qDebug() << "Install::downloadDone, error:" << error; |
@@ -125,14 +115,14 @@ void ZipInstaller::downloadDone(bool error) | |||
125 | if(getter->httpResponse() != 200 && !getter->isCached()) { | 115 | if(getter->httpResponse() != 200 && !getter->isCached()) { |
126 | m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR); | 116 | m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR); |
127 | m_dp->abort(); | 117 | m_dp->abort(); |
128 | emit done(true); | 118 | emit done(false); |
129 | return; | 119 | return; |
130 | } | 120 | } |
131 | if(getter->isCached()) m_dp->addItem(tr("Cached file used."), LOGINFO); | 121 | if(getter->isCached()) m_dp->addItem(tr("Cached file used."), LOGINFO); |
132 | if(error) { | 122 | if(error) { |
133 | m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); | 123 | m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); |
134 | m_dp->abort(); | 124 | m_dp->abort(); |
135 | emit done(true); | 125 | emit done(false); |
136 | return; | 126 | return; |
137 | } | 127 | } |
138 | else m_dp->addItem(tr("Download finished."),LOGOK); | 128 | else m_dp->addItem(tr("Download finished."),LOGOK); |