devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

rbutilqt: reworked and renamed the installrb class/files to generic installzip, so it can be used for things like Fonts.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14027 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2007-07-27 17:42:49 +00:00
parent cebd767224
commit 092c178784
5 changed files with 36 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rbutil/rbutilqt/install.cpp
View file

@ -145,8 +145,13 @@ void Install::accept()
} }
userSettings->sync(); userSettings->sync();
installer = new RBInstaller(this); installer = new ZipInstaller(this);
installer->install(file,fileName,mountPoint,proxy, &dp); installer->setFilename(fileName);
installer->setUrl(file);
installer->setProxy(proxy);
installer->setLogSection("rockboxbase");
installer->setMountPoint(mountPoint);
installer->install(&dp);
connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool)));

4
rbutil/rbutilqt/install.h
View file

@ -26,7 +26,7 @@
#include "ui_installfrm.h" #include "ui_installfrm.h"
#include "ui_installprogressfrm.h" #include "ui_installprogressfrm.h"
#include "installrb.h" #include "installzip.h"
class Install : public QDialog class Install : public QDialog
{ {
@ -58,7 +58,7 @@ class Install : public QDialog
QString fileName; QString fileName;
QString mountPoint; QString mountPoint;
QString archived; QString archived;
RBInstaller* installer; ZipInstaller* installer;
private slots: private slots:
void setCached(bool); void setCached(bool);

26
rbutil/rbutilqt/installrb.cpp → rbutil/rbutilqt/installzip.cpp
View file

@ -6,8 +6,8 @@
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* *
* Copyright (C) 2007 by Dominik Riebeling * Copyright (C) 2007 by Dominik Wenger
* $Id: installrb.cpp 13990 2007-07-25 22:26:10Z Dominik Wenger $ * $Id: installzip.cpp 13990 2007-07-25 22:26:10Z Dominik Wenger $
* *
* All files in this archive are subject to the GNU General Public License. * All files in this archive are subject to the GNU General Public License.
* See the file COPYING in the source tree root for full license agreement. * See the file COPYING in the source tree root for full license agreement.
@ -17,22 +17,19 @@
* *
****************************************************************************/ ****************************************************************************/
#include "installrb.h" #include "installzip.h"
#include "zip/zip.h" #include "zip/zip.h"
#include "zip/unzip.h" #include "zip/unzip.h"
RBInstaller::RBInstaller(QObject* parent): QObject(parent) ZipInstaller::ZipInstaller(QObject* parent): QObject(parent)
{ {
} }
void RBInstaller::install(QString url,QString file,QString mountpoint, QUrl proxy,Ui::InstallProgressFrm* dp) void ZipInstaller::install(Ui::InstallProgressFrm* dp)
{ {
m_url=url;
m_mountpoint = mountpoint;
m_file = file;
m_dp = dp; m_dp = dp;
m_dp->listProgress->addItem(tr("Downloading file %1.%2") m_dp->listProgress->addItem(tr("Downloading file %1.%2")
@ -44,9 +41,9 @@ void RBInstaller::install(QString url,QString file,QString mountpoint, QUrl prox
downloadFile.close(); downloadFile.close();
// get the real file. // get the real file.
getter = new HttpGet(this); getter = new HttpGet(this);
getter->setProxy(proxy); getter->setProxy(m_proxy);
getter->setFile(&downloadFile); getter->setFile(&downloadFile);
getter->getFile(QUrl(url)); getter->getFile(QUrl(m_url));
connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
connect(getter, SIGNAL(downloadDone(int, bool)), this, SLOT(downloadRequestFinished(int, bool))); connect(getter, SIGNAL(downloadDone(int, bool)), this, SLOT(downloadRequestFinished(int, bool)));
@ -54,7 +51,7 @@ void RBInstaller::install(QString url,QString file,QString mountpoint, QUrl prox
} }
void RBInstaller::downloadRequestFinished(int id, bool error) void ZipInstaller::downloadRequestFinished(int id, bool error)
{ {
qDebug() << "Install::downloadRequestFinished" << id << error; qDebug() << "Install::downloadRequestFinished" << id << error;
qDebug() << "error:" << getter->errorString(); qDebug() << "error:" << getter->errorString();
@ -62,12 +59,13 @@ void RBInstaller::downloadRequestFinished(int id, bool error)
downloadDone(error); downloadDone(error);
} }
void RBInstaller::downloadDone(bool error) void ZipInstaller::downloadDone(bool error)
{ {
qDebug() << "Install::downloadDone, error:" << error; qDebug() << "Install::downloadDone, error:" << error;
// update progress bar // update progress bar
int max = m_dp->progressBar->maximum(); int max = m_dp->progressBar->maximum();
if(max == 0) { if(max == 0) {
max = 100; max = 100;
@ -120,7 +118,7 @@ void RBInstaller::downloadDone(bool error)
QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0); QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0);
installlog.beginGroup("rockboxbase"); installlog.beginGroup(m_logsection);
for(int i = 0; i < zipContents.size(); i++) for(int i = 0; i < zipContents.size(); i++)
{ {
installlog.setValue(zipContents.at(i),installlog.value(zipContents.at(i),0).toInt()+1); installlog.setValue(zipContents.at(i),installlog.value(zipContents.at(i),0).toInt()+1);
@ -136,7 +134,7 @@ void RBInstaller::downloadDone(bool error)
emit done(false); emit done(false);
} }
void RBInstaller::updateDataReadProgress(int read, int total) void ZipInstaller::updateDataReadProgress(int read, int total)
{ {
m_dp->progressBar->setMaximum(total); m_dp->progressBar->setMaximum(total);
m_dp->progressBar->setValue(read); m_dp->progressBar->setValue(read);

20
rbutil/rbutilqt/installrb.h → rbutil/rbutilqt/installzip.h
View file

@ -6,8 +6,8 @@
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* *
* Copyright (C) 2007 by Dominik Riebeling * Copyright (C) 2007 by Dominik Wenger
* $Id: installrb.h 13990 2007-07-25 22:26:10Z Dominik Wenger $ * $Id: installzip.h 13990 2007-07-25 22:26:10Z Dominik Wenger $
* *
* All files in this archive are subject to the GNU General Public License. * All files in this archive are subject to the GNU General Public License.
* See the file COPYING in the source tree root for full license agreement. * See the file COPYING in the source tree root for full license agreement.
@ -29,13 +29,18 @@
#include "ui_installprogressfrm.h" #include "ui_installprogressfrm.h"
#include "httpget.h" #include "httpget.h"
class RBInstaller : public QObject class ZipInstaller : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
RBInstaller(QObject* parent) ; ZipInstaller(QObject* parent) ;
~RBInstaller(){} ~ZipInstaller(){}
void install(QString url,QString filename,QString mountpoint, QUrl proxy,Ui::InstallProgressFrm* dp); void install(Ui::InstallProgressFrm* dp);
void setMountPoint(QString mountpoint) {m_mountpoint = mountpoint;}
void setFilename(QString filename){m_file = filename;}
void setUrl(QString url){m_url = url;}
void setProxy(QUrl proxy) {m_proxy= proxy;}
void setLogSection(QString name) {m_logsection = name;}
signals: signals:
void done(bool error); void done(bool error);
@ -46,7 +51,8 @@ private slots:
void downloadRequestFinished(int, bool); void downloadRequestFinished(int, bool);
private: private:
QString m_url,m_file,m_mountpoint; QString m_url,m_file,m_mountpoint,m_logsection;
QUrl m_proxy;
HttpGet *getter; HttpGet *getter;
QTemporaryFile downloadFile; QTemporaryFile downloadFile;

4
rbutil/rbutilqt/rbutilqt.pro
View file

@ -5,7 +5,7 @@ SOURCES += rbutilqt.cpp \
configure.cpp \ configure.cpp \
zip/zip.cpp \ zip/zip.cpp \
zip/unzip.cpp \ zip/unzip.cpp \
installrb.cpp installzip.cpp
HEADERS += rbutilqt.h \ HEADERS += rbutilqt.h \
settings.h \ settings.h \
@ -18,7 +18,7 @@ HEADERS += rbutilqt.h \
zip/unzip_p.h \ zip/unzip_p.h \
zip/zip_p.h \ zip/zip_p.h \
version.h \ version.h \
installrb.h installzip.h
TEMPLATE = app TEMPLATE = app
CONFIG += release \ CONFIG += release \