This commit is contained in:
Bertrand Songis
2015-08-17 13:37:26 +02:00
parent 23c985ffd6
commit f5f1a052ca
7 changed files with 148 additions and 122 deletions
+22 -16
View File
@@ -667,41 +667,47 @@ void MainWindow::contributors()
void MainWindow::sdsync() void MainWindow::sdsync()
{ {
QString sdPath = g.profile[g.id()].sdPath();
if (sdPath.isEmpty()) {
QMessageBox::warning(this, QObject::tr("Synchronization error"), QObject::tr("No SD directory configured!"));
return;
}
QString massstoragePath = findMassstoragePath("SOUNDS"); QString massstoragePath = findMassstoragePath("SOUNDS");
if (massstoragePath.isEmpty()) { if (massstoragePath.isEmpty()) {
QMessageBox::warning(this, QObject::tr("Synchronization error"), QObject::tr("No Radio connected!")); QMessageBox::warning(this, QObject::tr("Synchronization error"), QObject::tr("No Radio connected!"));
return; return;
} }
massstoragePath += "/.."; massstoragePath = massstoragePath.left(massstoragePath.length() - 7);
ProgressDialog progressDialog(this, tr("Synchronize SD"), CompanionIcon("sdsync.png")); ProgressDialog progressDialog(this, tr("Synchronize SD"), CompanionIcon("sdsync.png"));
SyncProcess syncProcess(massstoragePath, g.profile[g.id()].sdPath(), progressDialog.progress()); SyncProcess syncProcess(massstoragePath, g.profile[g.id()].sdPath(), progressDialog.progress());
syncProcess.run(); if (!syncProcess.run()) {
progressDialog.exec(); progressDialog.exec();
}
} }
void MainWindow::changelog() void MainWindow::changelog()
{ {
ReleaseNotesDialog * dialog = new ReleaseNotesDialog(this); ReleaseNotesDialog * dialog = new ReleaseNotesDialog(this);
dialog->exec(); dialog->exec();
} }
void MainWindow::fwchangelog() void MainWindow::fwchangelog()
{ {
Firmware *currfirm = GetCurrentFirmware(); Firmware * firmware = GetCurrentFirmware();
QString rn=currfirm->getReleaseNotesUrl(); QString url = firmware->getReleaseNotesUrl();
if (rn.isEmpty()) { if (url.isEmpty()) {
QMessageBox::information(this, tr("Firmware updates"), tr("Current firmware does not provide release notes informations.")); QMessageBox::information(this, tr("Firmware updates"), tr("Current firmware does not provide release notes informations."));
} }
else { else {
ReleaseNotesFirmwareDialog * dialog = new ReleaseNotesFirmwareDialog(this, rn); ReleaseNotesFirmwareDialog * dialog = new ReleaseNotesFirmwareDialog(this, url);
dialog->exec(); dialog->exec();
} }
} }
void MainWindow::customizeSplash() void MainWindow::customizeSplash()
{ {
customizeSplashDialog *cd = new customizeSplashDialog(this); customizeSplashDialog * dialog = new customizeSplashDialog(this);
cd->exec(); dialog->exec();
} }
void MainWindow::cut() void MainWindow::cut()
+98 -90
View File
@@ -5,119 +5,127 @@
#include <QMessageBox> #include <QMessageBox>
#include <QTextStream> #include <QTextStream>
#include <QDebug> #include <QDebug>
#include <QEventLoop>
#include <QTimer>
SyncProcess::SyncProcess(const QString &folder1, const QString &folder2, ProgressWidget *progress): SyncProcess::SyncProcess(const QString & folder1, const QString & folder2, ProgressWidget * progress):
folder1(folder1), folder1(folder1),
folder2(folder2), folder2(folder2),
progress(progress), progress(progress),
simulation(false), index(0),
index(0) count(0),
closed(false)
{ {
connect(progress, SIGNAL(stopped()),this, SLOT(onClosed()));
} }
void SyncProcess::run() void SyncProcess::onClosed()
{ {
simulation = true; closed = true;
index = 0;
if (synchronize()) {
int count = index;
progress->setMaximum(count);
simulation = false;
index = 0;
synchronize();
progress->setValue(count);
}
} }
bool SyncProcess::synchronize() bool SyncProcess::run()
{ {
if (!QFile::exists(folder1)) { if (!QFile::exists(folder1)) {
QMessageBox::warning(NULL, QObject::tr("Synchronization error"), QObject::tr("The directory '%1' doesn't exist!").arg(folder1)); QMessageBox::warning(NULL, QObject::tr("Synchronization error"), QObject::tr("The directory '%1' doesn't exist!").arg(folder1));
return false; return true;
} }
if (!QFile::exists(folder2)) { if (!QFile::exists(folder2)) {
QMessageBox::warning(NULL, QObject::tr("Synchronization error"), QObject::tr("The directory '%1' doesn't exist!").arg(folder2)); QMessageBox::warning(NULL, QObject::tr("Synchronization error"), QObject::tr("The directory '%1' doesn't exist!").arg(folder2));
return false; return true;
} }
count = getFilesCount(folder1) + getFilesCount(folder2);
progress->setMaximum(count);
QStringList errors = updateDir(folder1, folder2) + updateDir(folder2, folder1); QStringList errors = updateDir(folder1, folder2) + updateDir(folder2, folder1);
if (errors.count() > 0) { if (errors.count() > 0) {
QMessageBox::warning(NULL, QObject::tr("Synchronization error"), errors.join("\n")); QMessageBox::warning(NULL, QObject::tr("Synchronization error"), errors.join("\n"));
return false;
} }
return true;
// don't close the window unless the user wanted
return closed;
} }
QStringList SyncProcess::updateDir(const QDir &source, const QDir &destination) int SyncProcess::getFilesCount(const QString & directory)
{
int result = 0;
QDirIterator it(directory, QDirIterator::Subdirectories);
while (it.hasNext()) {
it.next();
result++;
}
return result;
}
QStringList SyncProcess::updateDir(const QString & source, const QString & destination)
{ {
QDirIterator it(source, QDirIterator::Subdirectories); QDirIterator it(source, QDirIterator::Subdirectories);
while (it.hasNext()) { while (!closed && it.hasNext()) {
if (!simulation) { QEventLoop loop;
progress->setValue(index); QTimer::singleShot(10, &loop, SLOT(quit()));
} loop.exec();
QString path = it.next(); index++;
// qDebug() << path; progress->setInfo(tr("%1/%2 files").arg(index).arg(count));
QFileInfo sourceInfo(path); progress->setValue(index);
QString relativePath = source.relativeFilePath(path); QString result = updateEntry(it.next(), source, destination);
QString destinationPath = destination.absoluteFilePath(relativePath); if (!result.isEmpty()) {
QFileInfo destinationInfo(destinationPath); errors << result;
if (sourceInfo.isDir()) {
if (!destinationInfo.exists()) {
++index;
if (!simulation) {
progress->addText(tr("Create directory %1\n").arg(destinationPath));
if (!destination.mkdir(relativePath)) {
errors << QObject::tr("Create '%1' failed").arg(destinationPath);
continue;
}
}
}
}
else {
if (!destinationInfo.exists()) {
// qDebug() << "Copy" << path << "to" << destinationPath;
++index;
if (!simulation) {
progress->addText(tr("Copy %1 to %2\n").arg(path).arg(destinationPath));
if (!QFile::copy(path, destinationPath)) {
errors << QObject::tr("Copy '%1' to '%2' failed").arg(path).arg(destinationPath);
continue;
}
}
}
else if (sourceInfo.lastModified() > destinationInfo.lastModified()) {
++index;
if (!simulation) {
progress->addText(tr("Read %1\n").arg(path));
// retrieve source contents
QFile sourceFile(path);
if (!sourceFile.open(QFile::ReadOnly)) {
errors << QObject::tr("Open '%1' failed").arg(path);
continue;
}
QString sourceContents = sourceFile.readAll();
sourceFile.close();
// try to retrieve destination contents
QFile destinationFile(path);
if (destinationFile.open(QFile::ReadOnly)) {
QString destinationContents = destinationFile.readAll();
destinationFile.close();
if (sourceContents == destinationContents) {
// qDebug() << "Skip" << path;
continue;
}
}
if (!destinationFile.open(QFile::WriteOnly)) {
errors << QObject::tr("Write '%1' failed").arg(destinationPath);
continue;
}
progress->addText(tr("Write %1\n").arg(destinationPath));
// qDebug() << "Write" << destinationPath;
QTextStream destinationStream(&destinationFile);
destinationStream << sourceContents;
destinationFile.close();
}
}
} }
} }
return errors; return errors;
} }
QString SyncProcess::updateEntry(const QString & path, const QDir & source, const QDir & destination)
{
QFileInfo sourceInfo(path);
QString relativePath = source.relativeFilePath(path);
QString destinationPath = destination.absoluteFilePath(relativePath);
QFileInfo destinationInfo(destinationPath);
if (sourceInfo.isDir()) {
if (!destinationInfo.exists()) {
progress->addText(tr("Create directory %1\n").arg(destinationPath));
if (!destination.mkdir(relativePath)) {
return QObject::tr("Create '%1' failed").arg(destinationPath);
}
}
}
else {
if (!destinationInfo.exists()) {
// qDebug() << "Copy" << path << "to" << destinationPath;
progress->addText(tr("Copy %1 to %2\n").arg(path).arg(destinationPath));
if (!QFile::copy(path, destinationPath)) {
return QObject::tr("Copy '%1' to '%2' failed").arg(path).arg(destinationPath);
}
}
else if (sourceInfo.lastModified() > destinationInfo.lastModified()) {
// retrieve source contents
QFile sourceFile(path);
if (!sourceFile.open(QFile::ReadOnly)) {
return QObject::tr("Open '%1' failed").arg(path);
}
QString sourceContents = sourceFile.readAll();
sourceFile.close();
// try to retrieve destination contents
QFile destinationFile(path);
if (destinationFile.open(QFile::ReadOnly)) {
QString destinationContents = destinationFile.readAll();
destinationFile.close();
if (sourceContents == destinationContents) {
// qDebug() << "Skip" << path;
return QString();
}
}
if (!destinationFile.open(QFile::WriteOnly)) {
return QObject::tr("Write '%1' failed").arg(destinationPath);
}
progress->addText(tr("Write %1\n").arg(destinationPath));
// qDebug() << "Write" << destinationPath;
QTextStream destinationStream(&destinationFile);
destinationStream << sourceContents;
destinationFile.close();
}
}
return QString();
}
+18 -14
View File
@@ -1,7 +1,6 @@
#ifndef SYNCPROCESS_H_ #ifndef SYNCPROCESS_H_
#define SYNCPROCESS_H_ #define SYNCPROCESS_H_
#include <QObject>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
@@ -10,21 +9,26 @@ class ProgressWidget;
class SyncProcess : public QObject class SyncProcess : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
SyncProcess(const QString &folder1, const QString &folder2, ProgressWidget *progress); SyncProcess(const QString & folder1, const QString & folder2, ProgressWidget * progress);
void run(); bool run();
protected: protected slots:
bool synchronize(); void onClosed();
QStringList updateDir(const QDir &source, const QDir &destination);
QString folder1; protected:
QString folder2; int getFilesCount(const QString & directory);
ProgressWidget *progress; QStringList updateDir(const QString & source, const QString & destination);
QStringList errors; QString updateEntry(const QString & path, const QDir & source, const QDir & destination);
bool simulation; QString folder1;
int index; QString folder2;
ProgressWidget * progress;
QStringList errors;
int index;
int count;
bool closed;
}; };
#endif /* SYNCPROCESS_H_ */ #endif /* SYNCPROCESS_H_ */
+2 -1
View File
@@ -23,7 +23,7 @@ ProgressDialog::~ProgressDialog()
delete ui; delete ui;
} }
ProgressWidget *ProgressDialog::progress() ProgressWidget * ProgressDialog::progress()
{ {
return ui->outputProgress; return ui->outputProgress;
} }
@@ -31,6 +31,7 @@ ProgressWidget *ProgressDialog::progress()
void ProgressDialog::on_closeButton_clicked() void ProgressDialog::on_closeButton_clicked()
{ {
if (!locked) { if (!locked) {
ui->outputProgress->stop();
close(); close();
} }
} }
+1 -1
View File
@@ -18,7 +18,7 @@ public:
ProgressDialog(QWidget *parent, const QString &label, const QIcon &icon, bool forceOpen=false); ProgressDialog(QWidget *parent, const QString &label, const QIcon &icon, bool forceOpen=false);
~ProgressDialog(); ~ProgressDialog();
ProgressWidget *progress(); ProgressWidget * progress();
private slots: private slots:
void on_closeButton_clicked(); void on_closeButton_clicked();
+5
View File
@@ -29,6 +29,11 @@ ProgressWidget::~ProgressWidget()
delete ui; delete ui;
} }
void ProgressWidget::stop()
{
emit stopped();
}
void ProgressWidget::forceOpen() void ProgressWidget::forceOpen()
{ {
ui->checkBox->hide(); ui->checkBox->hide();
+2
View File
@@ -24,10 +24,12 @@ class ProgressWidget : public QWidget
void setProgressColor(const QColor &color); void setProgressColor(const QColor &color);
void addSeparator(); void addSeparator();
void forceOpen(); void forceOpen();
void stop();
signals: signals:
void detailsToggled(); void detailsToggled();
void locked(bool); void locked(bool);
void stopped();
protected slots: protected slots:
void on_checkBox_toggled(bool checked); void on_checkBox_toggled(bool checked);