Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup and un-gui ZipInstaller class:

Browse source 
- Use signals for updating the progress logger from  ZipInstaller class.
- Move ZipInstaller class to base folder as it doesn't rely on QtGui anymore.
- cleanup debugging output a bit.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20845 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2009-05-02 18:50:31 +00:00
parent 7cfdd47587
commit d5f7dab230
6 changed files with 90 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
rbutil/rbutilqt/zipinstaller.cpp → rbutil/rbutilqt/base/zipinstaller.cpp
View file

@ -17,6 +17,7 @@
* *
****************************************************************************/ ****************************************************************************/
#include <QtCore>
#include "zipinstaller.h" #include "zipinstaller.h"
#include "rbunzip.h" #include "rbunzip.h"
#include "utils.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*)"; qDebug() << "[ZipInstall] install()";
m_dp = dp;
runner = 0; runner = 0;
connect(this, SIGNAL(cont()), this, SLOT(installContinue())); connect(this, SIGNAL(cont()), this, SLOT(installContinue()));
m_url = m_urllist.at(runner); m_url = m_urllist.at(runner);
m_logsection = m_loglist.at(runner); m_logsection = m_loglist.at(runner);
m_logver = m_verlist.at(runner); m_logver = m_verlist.at(runner);
installStart(); installStart();
}
void ZipInstaller::abort()
{
qDebug() << "[ZipInstall] Aborted";
emit internalAborted();
} }
void ZipInstaller::installContinue() void ZipInstaller::installContinue()
{ {
qDebug() << "installContinue()"; qDebug() << "[ZipInstall] installContinue";
runner++; // this gets called when a install finished, so increase first. 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()) { if(runner < m_urllist.size()) {
qDebug() << "==> runner at" << runner; emit logItem(tr("done."), LOGOK);
m_dp->addItem(tr("done."), LOGOK);
m_url = m_urllist.at(runner); m_url = m_urllist.at(runner);
m_logsection = m_loglist.at(runner); m_logsection = m_loglist.at(runner);
if(runner < m_verlist.size()) m_logver = m_verlist.at(runner); if(runner < m_verlist.size()) m_logver = m_verlist.at(runner);
@ -58,8 +64,7 @@ void ZipInstaller::installContinue()
installStart(); installStart();
} }
else { else {
m_dp->addItem(tr("Installation finished successfully."),LOGOK); emit logItem(tr("Installation finished successfully."), LOGOK);
m_dp->setFinished();
emit done(false); emit done(false);
return; return;
@ -70,10 +75,10 @@ void ZipInstaller::installContinue()
void ZipInstaller::installStart() void ZipInstaller::installStart()
{ {
qDebug() << "installStart()"; qDebug() << "[ZipInstall] installStart";
m_dp->addItem(tr("Downloading file %1.%2") emit logItem(tr("Downloading file %1.%2").arg(QFileInfo(m_url).baseName(),
.arg(QFileInfo(m_url).baseName(), QFileInfo(m_url).completeSuffix()),LOGINFO); QFileInfo(m_url).completeSuffix()),LOGINFO);
// temporary file needs to be opened to get the filename // temporary file needs to be opened to get the filename
// make sure to get a fresh one on each run. // make sure to get a fresh one on each run.
@ -91,8 +96,8 @@ void ZipInstaller::installStart()
getter->setFile(downloadFile); getter->setFile(downloadFile);
connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
connect(getter, SIGNAL(dataReadProgress(int, int)), m_dp, SLOT(setProgress(int, int))); connect(getter, SIGNAL(dataReadProgress(int, int)), this, SIGNAL(logProgress(int, int)));
connect(m_dp, SIGNAL(aborted()), getter, SLOT(abort())); connect(this, SIGNAL(internalAborted()), getter, SLOT(abort()));
getter->getFile(QUrl(m_url)); getter->getFile(QUrl(m_url));
} }
@ -100,50 +105,42 @@ void ZipInstaller::installStart()
void ZipInstaller::downloadDone(bool error) void ZipInstaller::downloadDone(bool error)
{ {
qDebug() << "Install::downloadDone, error:" << error; qDebug() << "[ZipInstall] downloadDone, error:" << error;
QStringList zipContents; // needed later QStringList zipContents; // needed later
// update progress bar // update progress bar
int max = m_dp->getProgressMax(); emit logProgress(1, 1);
if(max == 0) {
max = 100;
m_dp->setProgressMax(max);
}
m_dp->setProgressValue(max);
if(getter->httpResponse() != 200 && !getter->isCached()) { if(getter->httpResponse() != 200 && !getter->isCached()) {
m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR); emit logItem(tr("Download error: received HTTP error %1.")
m_dp->setFinished(); .arg(getter->httpResponse()),LOGERROR);
emit done(true); emit done(true);
return; return;
} }
if(getter->isCached()) m_dp->addItem(tr("Cached file used."), LOGINFO); if(getter->isCached())
emit logItem(tr("Cached file used."), LOGINFO);
if(error) { if(error) {
m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); emit logItem(tr("Download error: %1").arg(getter->errorString()), LOGERROR);
m_dp->setFinished();
emit done(true); emit done(true);
return; return;
} }
else m_dp->addItem(tr("Download finished."),LOGOK); else emit logItem(tr("Download finished."),LOGOK);
QCoreApplication::processEvents(); QCoreApplication::processEvents();
if(m_unzip) { if(m_unzip) {
// unzip downloaded file // 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(); QCoreApplication::processEvents();
qDebug() << "file to unzip: " << m_file;
UnZip::ErrorCode ec; UnZip::ErrorCode ec;
RbUnZip uz; RbUnZip uz;
connect(&uz, SIGNAL(unzipProgress(int, int)), m_dp, SLOT(setProgress(int, int))); connect(&uz, SIGNAL(unzipProgress(int, int)), this, SIGNAL(logProgress(int, int)));
connect(m_dp, SIGNAL(aborted()), &uz, SLOT(abortUnzip())); connect(this, SIGNAL(internalAborted()), &uz, SLOT(abortUnzip()));
ec = uz.openArchive(m_file); ec = uz.openArchive(m_file);
if(ec != UnZip::Ok) { if(ec != UnZip::Ok) {
m_dp->addItem(tr("Opening archive failed: %1.") emit logItem(tr("Opening archive failed: %1.")
.arg(uz.formatError(ec)),LOGERROR); .arg(uz.formatError(ec)),LOGERROR);
m_dp->setProgressMax(1); emit logProgress(1, 1);
m_dp->setProgressValue(1);
m_dp->setFinished();
emit done(true); emit done(true);
return; return;
} }
@ -152,22 +149,17 @@ void ZipInstaller::downloadDone(bool error)
// some room for operating (also includes calculation mistakes due to // some room for operating (also includes calculation mistakes due to
// cluster sizes on the player). // cluster sizes on the player).
if(filesystemFree(m_mountpoint) < (uz.totalSize() + 1000000)) { if(filesystemFree(m_mountpoint) < (uz.totalSize() + 1000000)) {
m_dp->addItem(tr("Not enough disk space! Aborting."), LOGERROR); emit logItem(tr("Not enough disk space! Aborting."), LOGERROR);
m_dp->setFinished(); emit logProgress(1, 1);
m_dp->setProgressMax(1);
m_dp->setProgressValue(1);
emit done(true); emit done(true);
return; return;
} }
ec = uz.extractArchive(m_mountpoint); ec = uz.extractArchive(m_mountpoint);
// TODO: better handling of aborted unzip operation. // TODO: better handling of aborted unzip operation.
if(ec != UnZip::Ok) { if(ec != UnZip::Ok) {
m_dp->addItem(tr("Extracting failed: %1.") emit logItem(tr("Extracting failed: %1.")
.arg(uz.formatError(ec)),LOGERROR); .arg(uz.formatError(ec)),LOGERROR);
m_dp->setFinished(); emit logProgress(1, 1);
m_dp->setProgressMax(1);
m_dp->setProgressValue(1);
emit done(true); emit done(true);
return; return;
} }
@ -176,8 +168,8 @@ void ZipInstaller::downloadDone(bool error)
} }
else { else {
// only copy the downloaded file to the output location / name // only copy the downloaded file to the output location / name
m_dp->addItem(tr("Installing file."), LOGINFO); emit logItem(tr("Installing file."), LOGINFO);
qDebug() << "saving downloaded file (no extraction)"; qDebug() << "[ZipInstall] saving downloaded file (no extraction)";
downloadFile->open(); // copy fails if file is not opened (filename issue?) downloadFile->open(); // copy fails if file is not opened (filename issue?)
// make sure the required path is existing // 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::copy() doesn't overwrite files, so remove old one first
QFile(m_mountpoint + m_target).remove(); QFile(m_mountpoint + m_target).remove();
if(!downloadFile->copy(m_mountpoint + m_target)) { if(!downloadFile->copy(m_mountpoint + m_target)) {
m_dp->addItem(tr("Installing file failed."), LOGERROR); emit logItem(tr("Installing file failed."), LOGERROR);
m_dp->setFinished();
emit done(true); emit done(true);
return; return;
} }
@ -197,7 +188,7 @@ void ZipInstaller::downloadDone(bool error)
zipContents.append( m_target); 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); QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0);
installlog.beginGroup(m_logsection); installlog.beginGroup(m_logsection);

18
rbutil/rbutilqt/zipinstaller.h → rbutil/rbutilqt/base/zipinstaller.h
View file

@ -26,7 +26,6 @@
#include <QtCore> #include <QtCore>
#include <QtNetwork>
#include "progressloggerinterface.h" #include "progressloggerinterface.h"
#include "httpget.h" #include "httpget.h"
@ -37,7 +36,7 @@ class ZipInstaller : public QObject
public: public:
ZipInstaller(QObject* parent) ; ZipInstaller(QObject* parent) ;
~ZipInstaller(){} ~ZipInstaller(){}
void install(ProgressloggerInterface* dp); void install(void);
void setMountPoint(QString mountpoint) {m_mountpoint = mountpoint;} void setMountPoint(QString mountpoint) {m_mountpoint = mountpoint;}
void setUrl(QString url){m_urllist = QStringList(url);} void setUrl(QString url){m_urllist = QStringList(url);}
void setUrl(QStringList url) { m_urllist = url; } void setUrl(QStringList url) { m_urllist = url; }
@ -51,17 +50,22 @@ public:
void setCache(bool c) { m_usecache = c; }; void setCache(bool c) { m_usecache = c; };
void setCache(QString c) { m_cache = QDir(c); m_usecache = true; } void setCache(QString c) { m_cache = QDir(c); m_usecache = true; }
signals: public slots:
void done(bool error); void abort(void);
void cont();
private slots: private slots:
void downloadDone(bool); void downloadDone(bool);
void installStart(void); void installStart(void);
void installContinue(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: private:
void installSingle(ProgressloggerInterface *dp);
QString m_url, m_file, m_mountpoint, m_logsection, m_logver; QString m_url, m_file, m_mountpoint, m_logsection, m_logver;
QStringList m_urllist, m_loglist, m_verlist; QStringList m_urllist, m_loglist, m_verlist;
bool m_unzip; bool m_unzip;
@ -72,8 +76,6 @@ private:
HttpGet *getter; HttpGet *getter;
QTemporaryFile *downloadFile; QTemporaryFile *downloadFile;
ProgressloggerInterface* m_dp;
}; };

6
rbutil/rbutilqt/install.cpp
View file

@ -189,7 +189,11 @@ void Install::accept()
connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); 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();
} }

31
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -584,8 +584,11 @@ bool RbUtilQt::installAuto()
installer->setMountPoint(settings->value(RbSettings::Mountpoint).toString()); installer->setMountPoint(settings->value(RbSettings::Mountpoint).toString());
connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool))); connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool)));
connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int)));
installer->install(logger); 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; return true;
} }
@ -827,7 +830,11 @@ void RbUtilQt::installFonts()
installer->setCache(true); installer->setCache(true);
connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool))); 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()); installer->setMountPoint(settings->value(RbSettings::Mountpoint).toString());
if(!settings->value(RbSettings::CacheDisabled).toBool()) if(!settings->value(RbSettings::CacheDisabled).toBool())
installer->setCache(true); 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()) if(!settings->value(RbSettings::CacheDisabled).toBool())
installer->setCache(true); installer->setCache(true);
connect(installer, SIGNAL(done(bool)), this, SLOT(installdone(bool))); 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->setUrl(manualurl);
installer->setUnzip(false); installer->setUnzip(false);
installer->setTarget(target); 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();
} }

4
rbutil/rbutilqt/rbutilqt.pro
View file

@ -50,7 +50,7 @@ SOURCES += rbutilqt.cpp \
configure.cpp \ configure.cpp \
zip/zip.cpp \ zip/zip.cpp \
zip/unzip.cpp \ zip/unzip.cpp \
zipinstaller.cpp \ base/zipinstaller.cpp \
progressloggergui.cpp \ progressloggergui.cpp \
installtalkwindow.cpp \ installtalkwindow.cpp \
talkfile.cpp \ talkfile.cpp \
@ -95,7 +95,7 @@ HEADERS += rbutilqt.h \
zip/unzip_p.h \ zip/unzip_p.h \
zip/zip_p.h \ zip/zip_p.h \
version.h \ version.h \
zipinstaller.h \ base/zipinstaller.h \
installtalkwindow.h \ installtalkwindow.h \
talkfile.h \ talkfile.h \
base/autodetection.h \ base/autodetection.h \

6
rbutil/rbutilqt/themesinstallwindow.cpp
View file

@ -339,7 +339,11 @@ void ThemesInstallWindow::accept()
installer->setCache(true); installer->setCache(true);
connect(logger, SIGNAL(closed()), this, SLOT(close())); 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();
} }