mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-09 13:15:18 -05:00
dos2unix files and add a missing line in the header comment.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14014 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling
parent
992ffc83be
commit
31848ac8bd
2 changed files with 100 additions and 98 deletions
|
|
@ -1,4 +1,6 @@
|
|||
/***************************************************************************
|
||||
/***************************************************************************
|
||||
* __________ __ ___.
|
||||
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
||||
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
||||
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
||||
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
||||
|
|
@ -13,29 +15,29 @@
|
|||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
||||
* KIND, either express or implied.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#include "installrb.h"
|
||||
|
||||
****************************************************************************/
|
||||
|
||||
#include "installrb.h"
|
||||
|
||||
#include "zip/zip.h"
|
||||
#include "zip/unzip.h"
|
||||
|
||||
RBInstaller::RBInstaller(QObject* parent): QObject(parent)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
void RBInstaller::install(QString url,QString file,QString mountpoint, QUrl proxy,Ui::InstallProgressFrm* dp)
|
||||
{
|
||||
m_url=url;
|
||||
m_mountpoint = mountpoint;
|
||||
m_file = file;
|
||||
m_dp = dp;
|
||||
|
||||
#include "zip/unzip.h"
|
||||
|
||||
RBInstaller::RBInstaller(QObject* parent): QObject(parent)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
void RBInstaller::install(QString url,QString file,QString mountpoint, QUrl proxy,Ui::InstallProgressFrm* dp)
|
||||
{
|
||||
m_url=url;
|
||||
m_mountpoint = mountpoint;
|
||||
m_file = file;
|
||||
m_dp = dp;
|
||||
|
||||
m_dp->listProgress->addItem(tr("Downloading file %1.%2")
|
||||
.arg(QFileInfo(m_url).baseName(), QFileInfo(m_url).completeSuffix()));
|
||||
|
||||
|
||||
// temporary file needs to be opened to get the filename
|
||||
downloadFile.open();
|
||||
m_file = downloadFile.fileName();
|
||||
|
|
@ -43,28 +45,28 @@ void RBInstaller::install(QString url,QString file,QString mountpoint, QUrl prox
|
|||
// get the real file.
|
||||
getter = new HttpGet(this);
|
||||
getter->setProxy(proxy);
|
||||
getter->setFile(&downloadFile);
|
||||
getter->getFile(QUrl(url));
|
||||
|
||||
connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
|
||||
connect(getter, SIGNAL(downloadDone(int, bool)), this, SLOT(downloadRequestFinished(int, bool)));
|
||||
connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int)));
|
||||
|
||||
}
|
||||
|
||||
void RBInstaller::downloadRequestFinished(int id, bool error)
|
||||
{
|
||||
getter->setFile(&downloadFile);
|
||||
getter->getFile(QUrl(url));
|
||||
|
||||
connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool)));
|
||||
connect(getter, SIGNAL(downloadDone(int, bool)), this, SLOT(downloadRequestFinished(int, bool)));
|
||||
connect(getter, SIGNAL(dataReadProgress(int, int)), this, SLOT(updateDataReadProgress(int, int)));
|
||||
|
||||
}
|
||||
|
||||
void RBInstaller::downloadRequestFinished(int id, bool error)
|
||||
{
|
||||
qDebug() << "Install::downloadRequestFinished" << id << error;
|
||||
qDebug() << "error:" << getter->errorString();
|
||||
|
||||
downloadDone(error);
|
||||
}
|
||||
|
||||
void RBInstaller::downloadDone(bool error)
|
||||
{
|
||||
downloadDone(error);
|
||||
}
|
||||
|
||||
void RBInstaller::downloadDone(bool error)
|
||||
{
|
||||
qDebug() << "Install::downloadDone, error:" << error;
|
||||
|
||||
|
||||
|
||||
|
||||
// update progress bar
|
||||
int max = m_dp->progressBar->maximum();
|
||||
if(max == 0) {
|
||||
|
|
@ -84,13 +86,13 @@ void RBInstaller::downloadDone(bool error)
|
|||
emit done(true);
|
||||
return;
|
||||
}
|
||||
else m_dp->listProgress->addItem(tr("Download finished."));
|
||||
|
||||
else m_dp->listProgress->addItem(tr("Download finished."));
|
||||
|
||||
// unzip downloaded file
|
||||
qDebug() << "about to unzip the downloaded file" << m_file << "to" << m_mountpoint;
|
||||
|
||||
m_dp->listProgress->addItem(tr("Extracting file."));
|
||||
|
||||
m_dp->listProgress->addItem(tr("Extracting file."));
|
||||
|
||||
qDebug() << "file to unzip: " << m_file;
|
||||
UnZip::ErrorCode ec;
|
||||
UnZip uz;
|
||||
|
|
@ -101,8 +103,8 @@ void RBInstaller::downloadDone(bool error)
|
|||
m_dp->buttonAbort->setText(tr("&Ok"));
|
||||
emit done(false);
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
ec = uz.extractAll(m_mountpoint);
|
||||
if(ec != UnZip::Ok) {
|
||||
m_dp->listProgress->addItem(tr("Extracting failed: %1.")
|
||||
|
|
@ -112,8 +114,8 @@ void RBInstaller::downloadDone(bool error)
|
|||
return;
|
||||
}
|
||||
|
||||
m_dp->listProgress->addItem(tr("creating installation log"));
|
||||
|
||||
m_dp->listProgress->addItem(tr("creating installation log"));
|
||||
|
||||
QStringList zipContents = uz.fileList();
|
||||
|
||||
QSettings installlog(m_mountpoint + "/.rockbox/rbutil.log", QSettings::IniFormat, 0);
|
||||
|
|
@ -129,16 +131,16 @@ void RBInstaller::downloadDone(bool error)
|
|||
downloadFile.remove();
|
||||
|
||||
m_dp->listProgress->addItem(tr("Extraction finished successfully."));
|
||||
m_dp->buttonAbort->setText(tr("&Ok"));
|
||||
|
||||
emit done(false);
|
||||
}
|
||||
|
||||
void RBInstaller::updateDataReadProgress(int read, int total)
|
||||
{
|
||||
m_dp->buttonAbort->setText(tr("&Ok"));
|
||||
|
||||
emit done(false);
|
||||
}
|
||||
|
||||
void RBInstaller::updateDataReadProgress(int read, int total)
|
||||
{
|
||||
m_dp->progressBar->setMaximum(total);
|
||||
m_dp->progressBar->setValue(read);
|
||||
qDebug() << "progress:" << read << "/" << total;
|
||||
|
||||
}
|
||||
|
||||
qDebug() << "progress:" << read << "/" << total;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,46 +15,46 @@
|
|||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
||||
* KIND, either express or implied.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
|
||||
#ifndef INSTALLRB_H
|
||||
#define INSTALLRB_H
|
||||
|
||||
|
||||
|
||||
****************************************************************************/
|
||||
|
||||
|
||||
#ifndef INSTALLRB_H
|
||||
#define INSTALLRB_H
|
||||
|
||||
|
||||
|
||||
#include <QtGui>
|
||||
#include <QtNetwork>
|
||||
|
||||
#include "ui_installprogressfrm.h"
|
||||
#include "httpget.h"
|
||||
|
||||
class RBInstaller : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
RBInstaller(QObject* parent) ;
|
||||
~RBInstaller(){}
|
||||
void install(QString url,QString filename,QString mountpoint, QUrl proxy,Ui::InstallProgressFrm* dp);
|
||||
|
||||
signals:
|
||||
void done(bool error);
|
||||
|
||||
private slots:
|
||||
#include <QtNetwork>
|
||||
|
||||
#include "ui_installprogressfrm.h"
|
||||
#include "httpget.h"
|
||||
|
||||
class RBInstaller : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
RBInstaller(QObject* parent) ;
|
||||
~RBInstaller(){}
|
||||
void install(QString url,QString filename,QString mountpoint, QUrl proxy,Ui::InstallProgressFrm* dp);
|
||||
|
||||
signals:
|
||||
void done(bool error);
|
||||
|
||||
private slots:
|
||||
void updateDataReadProgress(int, int);
|
||||
void downloadDone(bool);
|
||||
void downloadRequestFinished(int, bool);
|
||||
|
||||
private:
|
||||
QString m_url,m_file,m_mountpoint;
|
||||
|
||||
HttpGet *getter;
|
||||
QTemporaryFile downloadFile;
|
||||
|
||||
Ui::InstallProgressFrm* m_dp;
|
||||
};
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
void downloadRequestFinished(int, bool);
|
||||
|
||||
private:
|
||||
QString m_url,m_file,m_mountpoint;
|
||||
|
||||
HttpGet *getter;
|
||||
QTemporaryFile downloadFile;
|
||||
|
||||
Ui::InstallProgressFrm* m_dp;
|
||||
};
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue