diff --git a/rbutil/rbutilqt/zipinstaller.cpp b/rbutil/rbutilqt/base/zipinstaller.cpp similarity index 65% rename from rbutil/rbutilqt/zipinstaller.cpp rename to rbutil/rbutilqt/base/zipinstaller.cpp index deff52768a..268ae49935 100644 --- a/rbutil/rbutilqt/zipinstaller.cpp +++ b/rbutil/rbutilqt/base/zipinstaller.cpp @@ -17,6 +17,7 @@ * ****************************************************************************/ +#include #include "zipinstaller.h" #include "rbunzip.h" #include "utils.h" @@ -28,29 +29,34 @@ ZipInstaller::ZipInstaller(QObject* parent): QObject(parent) } -void ZipInstaller::install(ProgressloggerInterface *dp) +void ZipInstaller::install() { - qDebug() << "install(ProgressloggerInterface*)"; - m_dp = dp; + qDebug() << "[ZipInstall] install()"; + runner = 0; connect(this, SIGNAL(cont()), this, SLOT(installContinue())); m_url = m_urllist.at(runner); m_logsection = m_loglist.at(runner); m_logver = m_verlist.at(runner); installStart(); +} + +void ZipInstaller::abort() +{ + qDebug() << "[ZipInstall] Aborted"; + emit internalAborted(); } void ZipInstaller::installContinue() { - qDebug() << "installContinue()"; + qDebug() << "[ZipInstall] installContinue"; runner++; // this gets called when a install finished, so increase first. - qDebug() << "runner is now at" << runner << "size is" << m_urllist.size(); + qDebug() << "[ZipInstall] runner done:" << runner << "/" << m_urllist.size(); if(runner < m_urllist.size()) { - qDebug() << "==> runner at" << runner; - m_dp->addItem(tr("done."), LOGOK); + emit logItem(tr("done."), LOGOK); m_url = m_urllist.at(runner); m_logsection = m_loglist.at(runner); if(runner < m_verlist.size()) m_logver = m_verlist.at(runner); @@ -58,8 +64,7 @@ void ZipInstaller::installContinue() installStart(); } else { - m_dp->addItem(tr("Installation finished successfully."),LOGOK); - m_dp->setFinished(); + emit logItem(tr("Installation finished successfully."), LOGOK); emit done(false); return; @@ -70,10 +75,10 @@ void ZipInstaller::installContinue() void ZipInstaller::installStart() { - qDebug() << "installStart()"; + qDebug() << "[ZipInstall] installStart"; - m_dp->addItem(tr("Downloading file %1.%2") - .arg(QFileInfo(m_url).baseName(), QFileInfo(m_url).completeSuffix()),LOGINFO); + emit logItem(tr("Downloading file %1.%2").arg(QFileInfo(m_url).baseName(), + QFileInfo(m_url).completeSuffix()),LOGINFO); // temporary file needs to be opened to get the filename // make sure to get a fresh one on each run. @@ -89,61 +94,53 @@ void ZipInstaller::installStart() getter->setCache(true); } getter->setFile(downloadFile); - + connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); - connect(getter, SIGNAL(dataReadProgress(int, int)), m_dp, SLOT(setProgress(int, int))); - connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); - + connect(getter, SIGNAL(dataReadProgress(int, int)), this, SIGNAL(logProgress(int, int))); + connect(this, SIGNAL(internalAborted()), getter, SLOT(abort())); + getter->getFile(QUrl(m_url)); } void ZipInstaller::downloadDone(bool error) { - qDebug() << "Install::downloadDone, error:" << error; + qDebug() << "[ZipInstall] downloadDone, error:" << error; QStringList zipContents; // needed later // update progress bar - int max = m_dp->getProgressMax(); - if(max == 0) { - max = 100; - m_dp->setProgressMax(max); - } - m_dp->setProgressValue(max); + emit logProgress(1, 1); if(getter->httpResponse() != 200 && !getter->isCached()) { - m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR); - m_dp->setFinished(); + emit logItem(tr("Download error: received HTTP error %1.") + .arg(getter->httpResponse()),LOGERROR); emit done(true); return; } - if(getter->isCached()) m_dp->addItem(tr("Cached file used."), LOGINFO); + if(getter->isCached()) + emit logItem(tr("Cached file used."), LOGINFO); if(error) { - m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); - m_dp->setFinished(); + emit logItem(tr("Download error: %1").arg(getter->errorString()), LOGERROR); emit done(true); return; } - else m_dp->addItem(tr("Download finished."),LOGOK); + else emit logItem(tr("Download finished."),LOGOK); QCoreApplication::processEvents(); if(m_unzip) { // unzip downloaded file - qDebug() << "about to unzip the downloaded file" << m_file << "to" << m_mountpoint; + qDebug() << "[ZipInstall] about to unzip " << m_file << "to" << m_mountpoint; - m_dp->addItem(tr("Extracting file."),LOGINFO); + emit logItem(tr("Extracting file."), LOGINFO); QCoreApplication::processEvents(); - qDebug() << "file to unzip: " << m_file; UnZip::ErrorCode ec; RbUnZip uz; - connect(&uz, SIGNAL(unzipProgress(int, int)), m_dp, SLOT(setProgress(int, int))); - connect(m_dp, SIGNAL(aborted()), &uz, SLOT(abortUnzip())); + connect(&uz, SIGNAL(unzipProgress(int, int)), this, SIGNAL(logProgress(int, int))); + connect(this, SIGNAL(internalAborted()), &uz, SLOT(abortUnzip())); ec = uz.openArchive(m_file); if(ec != UnZip::Ok) { - m_dp->addItem(tr("Opening archive failed: %1.") + emit logItem(tr("Opening archive failed: %1.") .arg(uz.formatError(ec)),LOGERROR); - m_dp->setProgressMax(1); - m_dp->setProgressValue(1); - m_dp->setFinished(); + emit logProgress(1, 1); emit done(true); return; } @@ -152,22 +149,17 @@ void ZipInstaller::downloadDone(bool error) // some room for operating (also includes calculation mistakes due to // cluster sizes on the player). if(filesystemFree(m_mountpoint) < (uz.totalSize() + 1000000)) { - m_dp->addItem(tr("Not enough disk space! Aborting."), LOGERROR); - m_dp->setFinished(); - m_dp->setProgressMax(1); - m_dp->setProgressValue(1); + emit logItem(tr("Not enough disk space! Aborting."), LOGERROR); + emit logProgress(1, 1); emit done(true); return; } ec = uz.extractArchive(m_mountpoint); // TODO: better handling of aborted unzip operation. if(ec != UnZip::Ok) { - m_dp->addItem(tr("Extracting failed: %1.") + emit logItem(tr("Extracting failed: %1.") .arg(uz.formatError(ec)),LOGERROR); - m_dp->setFinished(); - m_dp->setProgressMax(1); - m_dp->setProgressValue(1); - + emit logProgress(1, 1); emit done(true); return; } @@ -176,8 +168,8 @@ void ZipInstaller::downloadDone(bool error) } else { // only copy the downloaded file to the output location / name - m_dp->addItem(tr("Installing file."), LOGINFO); - qDebug() << "saving downloaded file (no extraction)"; + emit logItem(tr("Installing file."), LOGINFO); + qDebug() << "[ZipInstall] saving downloaded file (no extraction)"; downloadFile->open(); // copy fails if file is not opened (filename issue?) // make sure the required path is existing @@ -187,8 +179,7 @@ void ZipInstaller::downloadDone(bool error) // QFile::copy() doesn't overwrite files, so remove old one first QFile(m_mountpoint + m_target).remove(); if(!downloadFile->copy(m_mountpoint + m_target)) { - m_dp->addItem(tr("Installing file failed."), LOGERROR); - m_dp->setFinished(); + emit logItem(tr("Installing file failed."), LOGERROR); emit done(true); return; } @@ -197,7 +188,7 @@ void ZipInstaller::downloadDone(bool error) zipContents.append( m_target); } - m_dp->addItem(tr("Creating installation log"),LOGINFO); + emit logItem(tr("Creating installation log"),LOGINFO); QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); installlog.beginGroup(m_logsection); diff --git a/rbutil/rbutilqt/zipinstaller.h b/rbutil/rbutilqt/base/zipinstaller.h similarity index 92% rename from rbutil/rbutilqt/zipinstaller.h rename to rbutil/rbutilqt/base/zipinstaller.h index b9cf9b4616..c0e13efa20 100644 --- a/rbutil/rbutilqt/zipinstaller.h +++ b/rbutil/rbutilqt/base/zipinstaller.h @@ -26,7 +26,6 @@ #include -#include #include "progressloggerinterface.h" #include "httpget.h" @@ -37,7 +36,7 @@ class ZipInstaller : public QObject public: ZipInstaller(QObject* parent) ; ~ZipInstaller(){} - void install(ProgressloggerInterface* dp); + void install(void); void setMountPoint(QString mountpoint) {m_mountpoint = mountpoint;} void setUrl(QString url){m_urllist = QStringList(url);} void setUrl(QStringList url) { m_urllist = url; } @@ -51,17 +50,22 @@ public: void setCache(bool c) { m_usecache = c; }; void setCache(QString c) { m_cache = QDir(c); m_usecache = true; } -signals: - void done(bool error); - void cont(); +public slots: + void abort(void); private slots: void downloadDone(bool); void installStart(void); void installContinue(void); +signals: + void done(bool error); + void cont(); + void logItem(QString, int); //! set logger item + void logProgress(int, int); //! set progress bar. + void internalAborted(void); + private: - void installSingle(ProgressloggerInterface *dp); QString m_url, m_file, m_mountpoint, m_logsection, m_logver; QStringList m_urllist, m_loglist, m_verlist; bool m_unzip; @@ -72,8 +76,6 @@ private: HttpGet *getter; QTemporaryFile *downloadFile; - - ProgressloggerInterface* m_dp; }; diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index 946c7013fa..69d5823258 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp @@ -189,7 +189,11 @@ void Install::accept() connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); - installer->install(logger); + connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); + connect(installer, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); + connect(installer, SIGNAL(done(bool)), logger, SLOT(setFinished())); + connect(logger, SIGNAL(aborted()), installer, SLOT(abort())); + installer->install(); } diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index d36f9637c0..3412b47ff9 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -584,8 +584,11 @@ bool RbUtilQt::installAuto() installer->setMountPoint(settings->value(RbSettings::Mountpoint).toString()); connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool))); - - installer->install(logger); + connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); + connect(installer, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); + connect(installer, SIGNAL(done(bool)), logger, SLOT(setFinished())); + connect(logger, SIGNAL(aborted()), installer, SLOT(abort())); + installer->install(); return true; } @@ -827,7 +830,11 @@ void RbUtilQt::installFonts() installer->setCache(true); connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool))); - installer->install(logger); + connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); + connect(installer, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); + connect(installer, SIGNAL(done(bool)), logger, SLOT(setFinished())); + connect(logger, SIGNAL(aborted()), installer, SLOT(abort())); + installer->install(); } @@ -865,7 +872,11 @@ void RbUtilQt::installVoice() installer->setMountPoint(settings->value(RbSettings::Mountpoint).toString()); if(!settings->value(RbSettings::CacheDisabled).toBool()) installer->setCache(true); - installer->install(logger); + connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); + connect(installer, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); + connect(installer, SIGNAL(done(bool)), logger, SLOT(setFinished())); + connect(logger, SIGNAL(aborted()), installer, SLOT(abort())); + installer->install(); } @@ -912,7 +923,11 @@ void RbUtilQt::installDoom() if(!settings->value(RbSettings::CacheDisabled).toBool()) installer->setCache(true); connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool))); - installer->install(logger); + connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); + connect(installer, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); + connect(installer, SIGNAL(done(bool)), logger, SLOT(setFinished())); + connect(logger, SIGNAL(aborted()), installer, SLOT(abort())); + installer->install(); } @@ -1058,7 +1073,11 @@ void RbUtilQt::downloadManual(void) installer->setUrl(manualurl); installer->setUnzip(false); installer->setTarget(target); - installer->install(logger); + connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); + connect(installer, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); + connect(installer, SIGNAL(done(bool)), logger, SLOT(setFinished())); + connect(logger, SIGNAL(aborted()), installer, SLOT(abort())); + installer->install(); } diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 0723e2b4f9..3edcbdc11b 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -50,7 +50,7 @@ SOURCES += rbutilqt.cpp \ configure.cpp \ zip/zip.cpp \ zip/unzip.cpp \ - zipinstaller.cpp \ + base/zipinstaller.cpp \ progressloggergui.cpp \ installtalkwindow.cpp \ talkfile.cpp \ @@ -95,7 +95,7 @@ HEADERS += rbutilqt.h \ zip/unzip_p.h \ zip/zip_p.h \ version.h \ - zipinstaller.h \ + base/zipinstaller.h \ installtalkwindow.h \ talkfile.h \ base/autodetection.h \ diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp index 56a917cfc6..a112e6d748 100644 --- a/rbutil/rbutilqt/themesinstallwindow.cpp +++ b/rbutil/rbutilqt/themesinstallwindow.cpp @@ -339,7 +339,11 @@ void ThemesInstallWindow::accept() installer->setCache(true); connect(logger, SIGNAL(closed()), this, SLOT(close())); - installer->install(logger); + connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); + connect(installer, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); + connect(installer, SIGNAL(done(bool)), logger, SLOT(setFinished())); + connect(logger, SIGNAL(aborted()), installer, SLOT(abort())); + installer->install(); }