Compare commits

...

6 Commits
1.9.2 ... 2.1.1

Author SHA1 Message Date
4ead825bad version 2.1.1 2023-02-11 13:42:46 +01:00
f73174216a -corrected bug
- added  warning when selecting a file which is already in download
  queue
2023-02-11 13:40:46 +01:00
0b60543ff3 version 2.1 2023-02-11 01:15:41 +01:00
d52a0663e5 - added verification of already downloaded files 2023-02-11 01:14:14 +01:00
a3933ee1c9 version 2.0 2023-02-10 23:28:52 +01:00
9671a5cea8 completely migrate to QT and some bugs corrected 2023-02-10 23:27:44 +01:00
10 changed files with 205 additions and 104 deletions

View File

@ -6,7 +6,7 @@ Comment=Client for rsync servers
Comment[fr]=Client pour serveur rsync Comment[fr]=Client pour serveur rsync
Version=1.0 Version=1.0
Exec=RsyncUI Exec=RsyncUI
Icon= Icon=/usr/share/icons/RsyncUI.png
Type=Application Type=Application
Terminal=false Terminal=false
StartupNotify=true StartupNotify=true

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.14.2, 2023-02-10T14:36:52. --> <!-- Written by QtCreator 4.14.2, 2023-02-11T01:13:28. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

View File

@ -2,7 +2,7 @@
Name: rsyncui Name: rsyncui
Summary: Client for rsync server Summary: Client for rsync server
Version: 1.9.2 Version: 2.1.1
Release: %mkrel 1 Release: %mkrel 1
License: GPLv3 License: GPLv3
Group: Networking/Remote access Group: Networking/Remote access

View File

@ -168,27 +168,27 @@
<translation>Paramètres</translation> <translation>Paramètres</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="86"/> <location filename="mainwindow.cpp" line="90"/>
<source>KB</source> <source>KB</source>
<translation>Ko</translation> <translation>Ko</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="86"/> <location filename="mainwindow.cpp" line="90"/>
<source>MB</source> <source>MB</source>
<translation>Mo</translation> <translation>Mo</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="86"/> <location filename="mainwindow.cpp" line="90"/>
<source>GB</source> <source>GB</source>
<translation>Go</translation> <translation>Go</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="86"/> <location filename="mainwindow.cpp" line="90"/>
<source>TB</source> <source>TB</source>
<translation>To</translation> <translation>To</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="86"/> <location filename="mainwindow.cpp" line="90"/>
<source>PB</source> <source>PB</source>
<translation>Po</translation> <translation>Po</translation>
</message> </message>
@ -217,95 +217,98 @@ Cliquez sur un fichier pour l&apos;ajouter dans la file de téléchargement</tra
<translation>Type</translation> <translation>Type</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="92"/> <location filename="mainwindow.cpp" line="97"/>
<source>A list of interrupted downloads exists, do you want to continue downloading ? if not the list will be cleared</source> <source>A list of interrupted downloads exists, do you want to continue downloading ? if not the list will be cleared</source>
<translation>Une liste de téléchargement existe, voulez-vous utiliser cette liste ? si non, elle sera effacée</translation> <translation>Une liste de téléchargement existe, voulez-vous utiliser cette liste ? si non, elle sera effacée</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="393"/> <location filename="mainwindow.cpp" line="138"/>
<source>Clicking Save button, You can save the list of downloads
</source>
<translation>Vous pouvez enregistrer la liste des téléchargements en cliquant sur &quot;enregister&quot;
</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="143"/>
<source>Exiting will stop downloading, and will clear the download queue.
Do you want to exit ?</source>
<translation>Si vous sortez, les téléchargements seront arrêter.
Voulez-vous vraiment sortir ?</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="425"/>
<source>server does not exists</source> <source>server does not exists</source>
<translation>Le serveur n&apos;existe pas</translation> <translation>Le serveur n&apos;existe pas</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="421"/> <location filename="mainwindow.cpp" line="452"/>
<location filename="mainwindow.cpp" line="441"/> <location filename="mainwindow.cpp" line="472"/>
<source>Dir</source> <source>Dir</source>
<translation>dossier</translation> <translation>dossier</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="424"/> <location filename="mainwindow.cpp" line="456"/>
<location filename="mainwindow.cpp" line="487"/> <location filename="mainwindow.cpp" line="540"/>
<source>File</source> <source>File</source>
<translation>Doc</translation> <translation>Doc</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="561"/> <location filename="mainwindow.cpp" line="549"/>
<source>File is already downloaded. Do you want to reload it ? The old file will be deleted</source>
<translation>Le document est déjà téléchargé. Voulez-vous le télécharger à nouveau ? L&apos;ancien fichier sera effacé</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="584"/>
<source>File is already downloading</source>
<translation>Le document est déjà en téléchargement</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="628"/>
<source>Rsync process crashed</source> <source>Rsync process crashed</source>
<translation>Le processus rsync à planté</translation> <translation>Le processus rsync à planté</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="699"/> <location filename="mainwindow.cpp" line="784"/>
<source>Version</source> <source>Version</source>
<translation>Version</translation> <translation>Version</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="700"/> <location filename="mainwindow.cpp" line="785"/>
<source>Licence</source> <source>Licence</source>
<translation>License</translation> <translation>License</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="701"/> <location filename="mainwindow.cpp" line="786"/>
<source>Author</source> <source>Author</source>
<translation>Auteur</translation> <translation>Auteur</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="702"/> <location filename="mainwindow.cpp" line="787"/>
<source>EMail</source> <source>EMail</source>
<translation>Courriel</translation> <translation>Courriel</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="703"/> <location filename="mainwindow.cpp" line="788"/>
<source>Source code</source> <source>Source code</source>
<translation>Code source</translation> <translation>Code source</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="725"/> <location filename="mainwindow.cpp" line="811"/>
<source>Since the save path is linked to service, you need to select a service before you can select a folder</source> <source>Since the save path is linked to service, you need to select a service before you can select a folder</source>
<translation>Vous devez sélectionnez un service pour pouvoir sélectionnez un dossier par défaut</translation> <translation>Vous devez sélectionnez un service pour pouvoir sélectionnez un dossier par défaut</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="728"/> <location filename="mainwindow.cpp" line="816"/>
<source>Choose folder where to save file</source> <source>Choose folder where to save file</source>
<translation>Choisissez un dossier enregistrer le document</translation> <translation>Choisissez un dossier enregistrer le document</translation>
</message> </message>
<message> <message>
<source>Choose directory to save file</source> <location filename="mainwindow.cpp" line="702"/>
<translation type="vanished">Choisissez le dossier enregistrer</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="620"/>
<source>Do you want to stop downloading and delete this file from download queue ?</source> <source>Do you want to stop downloading and delete this file from download queue ?</source>
<translation>Voulez-vous arrêter le téléchargement et enlever ce fichier de la file de téléchargement ?</translation> <translation>Voulez-vous arrêter le téléchargement et enlever ce fichier de la file de téléchargement ?</translation>
</message> </message>
<message> <message>
<source>A list of interrupted downloads exists, do you want to continue downloading ? or you can delete the list</source> <location filename="mainwindow.cpp" line="716"/>
<translation type="vanished">Voulez-vous reprendre les téléchargements interrompus la fois précédente? ou vous pouvez supprimer la liste</translation>
</message>
<message>
<source>Remove</source>
<translation type="vanished">Supprimer</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="135"/>
<source>Exiting will stop downloading, and will clear the download queue.
You can save the list of downloads
Do you want to exit ?</source>
<translatorcomment>i</translatorcomment>
<translation>Si vous sortez, les téléchargements seront arrêter, mais vous pouvez enregistrer la liste pour la prochaine fois.
Voulez-vous vraiment sortir ?</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="632"/>
<source>Do you want to delete this file from download queue ?</source> <source>Do you want to delete this file from download queue ?</source>
<translation>Voulez-vous enlever ce fichier de la file de téléchargement ?</translation> <translation>Voulez-vous enlever ce fichier de la file de téléchargement ?</translation>
</message> </message>

View File

@ -96,6 +96,7 @@ void MainWindow::readRsyncOutput()
); );
}*/ }*/
// process raise error
void MainWindow::downloadProcessStderr() void MainWindow::downloadProcessStderr()
{ {
QByteArray errorLine; QByteArray errorLine;

Binary file not shown.

View File

@ -9,6 +9,7 @@ int main(int argc, char *argv[])
QCoreApplication::setOrganizationName("RsyncUI"); QCoreApplication::setOrganizationName("RsyncUI");
QCoreApplication::setApplicationName("RsyncUI"); QCoreApplication::setApplicationName("RsyncUI");
// Initialization of localization // Initialization of localization
QLocale localeName = QLocale::system(); QLocale localeName = QLocale::system();
QString localeFile = "/usr/share/locale/" + localeName.name() + "/LC_MESSAGES/RsyncUI_" + localeName.name() + ".qm"; QString localeFile = "/usr/share/locale/" + localeName.name() + "/LC_MESSAGES/RsyncUI_" + localeName.name() + ".qm";

View File

@ -40,10 +40,10 @@ MainWindow::MainWindow(QWidget *parent)
QCoreApplication::setOrganizationName("RsyncUI"); QCoreApplication::setOrganizationName("RsyncUI");
QCoreApplication::setApplicationName("RsyncUI"); QCoreApplication::setApplicationName("RsyncUI");
// context menu for treewidget // context menu for treewidget (list of files)
ui->treeWidget->addAction(ui->actionDownload); ui->treeWidget->addAction(ui->actionDownload);
// init shortcut // init configuration window
config.setupUi(&Configuration); config.setupUi(&Configuration);
// init of About // init of About
@ -57,12 +57,14 @@ MainWindow::MainWindow(QWidget *parent)
connect(config.comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &MainWindow::on_comboBox_currentIndexChanged); connect(config.comboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &MainWindow::on_comboBox_currentIndexChanged);
// init of widgets // init of widgets
ui->ktreewidgetsearchline->setTreeWidget(ui->treeWidget); ui->ktreewidgetsearchline->setTreeWidget(ui->treeWidget); // attach search widget to treewidget
ui->ktreewidgetsearchline->setCaseSensitivity(Qt::CaseInsensitive); ui->ktreewidgetsearchline->setCaseSensitivity(Qt::CaseInsensitive); // and set it case insensitive
ui->treeWidget->setHeaderLabels({tr("Path"), tr("Type"), tr("Size")} ); ui->treeWidget->setHeaderLabels({tr("Path"), tr("Type"), tr("Size")} ); // set header of columns of tree widget
// if last server exists in settings
if (this->settings.contains("connexion/lastServer")) if (this->settings.contains("connexion/lastServer"))
{ {
// set window to precedent server/port configuration
ui->portEdit->setText(this->settings.value("connexion/port").toString()); ui->portEdit->setText(this->settings.value("connexion/port").toString());
ui->khistorycombobox->setCurrentText(this->settings.value("connexion/lastServer").toString()); ui->khistorycombobox->setCurrentText(this->settings.value("connexion/lastServer").toString());
}else }else
@ -71,7 +73,7 @@ MainWindow::MainWindow(QWidget *parent)
ui->khistorycombobox->clear(); ui->khistorycombobox->clear();
} }
// setting arrowcursor for treeWidget, listWidget and listDownload // setting arrowcursor for treeWidget, listWidget and listDownload to arrow
ui->treeWidget->setCursor(Qt::ArrowCursor); ui->treeWidget->setCursor(Qt::ArrowCursor);
ui->listWidget->setCursor(Qt::ArrowCursor); ui->listWidget->setCursor(Qt::ArrowCursor);
ui->listDownload->setCursor(Qt::ArrowCursor); ui->listDownload->setCursor(Qt::ArrowCursor);
@ -82,28 +84,32 @@ MainWindow::MainWindow(QWidget *parent)
loadSettings(); loadSettings();
//setting configuration window //setting configuration window
config.comboBox->setCurrentIndex(ui->toolBar->toolButtonStyle()); config.comboBox->setCurrentIndex(ui->toolBar->toolButtonStyle()); // setting combobox to saved settings
//setting unit of bandwidth limit
config.UnitCombobox->addItems({tr("KB"), tr("MB"), tr("GB"), tr("TB"), tr("PB")}); config.UnitCombobox->addItems({tr("KB"), tr("MB"), tr("GB"), tr("TB"), tr("PB")});
//if exists list of donwloads in saved settings
if (this->settings.value("Downloads/rows").toInt() != 0) if (this->settings.value("Downloads/rows").toInt() != 0)
{ {
//this->settings.endArray(); // asking if we load the list and continue downloading
msgBox.setWindowTitle("RsyncUI"); msgBox.setWindowTitle("RsyncUI");
msgBox.setInformativeText(tr("A list of interrupted downloads exists, do you want to continue downloading ? if not the list will be cleared" )); msgBox.setInformativeText(tr("A list of interrupted downloads exists, do you want to continue downloading ? if not the list will be cleared" ));
//QPushButton *remove = msgBox.addButton(tr("Remove"), QMessageBox::ActionRole);
QPushButton *yes = msgBox.addButton(QMessageBox::Yes); QPushButton *yes = msgBox.addButton(QMessageBox::Yes);
msgBox.addButton(QMessageBox::No); msgBox.addButton(QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::Yes); msgBox.setDefaultButton(QMessageBox::Yes);
msgBox.exec(); msgBox.exec();
reply = msgBox.clickedButton(); reply = msgBox.clickedButton();
// if response is yes then loading list
if(reply == yes) if(reply == yes)
{ {
loadDownloadList(); loadDownloadList();
} }
} }
// load list of services
populateList(); populateList();
} }
@ -112,11 +118,12 @@ MainWindow::~MainWindow()
delete ui; delete ui;
} }
// Closing window has been clicked // Close window has been clicked
void MainWindow::closeEvent (QCloseEvent *event) void MainWindow::closeEvent (QCloseEvent *event)
{ {
QMessageBox::StandardButton reply; QMessageBox::StandardButton reply;
QMessageBox::StandardButtons param; QMessageBox::StandardButtons param;
QString displayText;
// saving settings // saving settings
saveSettings(); saveSettings();
@ -128,13 +135,15 @@ void MainWindow::closeEvent (QCloseEvent *event)
if (config.autosaveCheckbox->checkState() != Qt::Checked) if (config.autosaveCheckbox->checkState() != Qt::Checked)
{ {
param |= QMessageBox::Save; param |= QMessageBox::Save;
displayText = tr("Clicking Save button, You can save the list of downloads\n");
} }
reply = QMessageBox::question( reply = QMessageBox::question(
this, this,
"RsyncUI", "RsyncUI",
tr("Exiting will stop downloading, and will clear the download queue.\nYou can save the list of downloads\nDo you want to exit ?"), tr("Exiting will stop downloading, and will clear the download queue.\nDo you want to exit ?") + displayText,
param, param,
QMessageBox::No); QMessageBox::No);
if (reply == QMessageBox::No) if (reply == QMessageBox::No)
{ {
// continuing // continuing
@ -155,7 +164,6 @@ void MainWindow::closeEvent (QCloseEvent *event)
// Populate treeview with list of files // Populate treeview with list of files
void MainWindow::populateTree(QTreeWidgetItem * parent) void MainWindow::populateTree(QTreeWidgetItem * parent)
{ {
stringstream ss;
QString path; QString path;
// Clear treewidget // Clear treewidget
@ -165,6 +173,7 @@ void MainWindow::populateTree(QTreeWidgetItem * parent)
// setting cursor to "Wait" // setting cursor to "Wait"
QGuiApplication::setOverrideCursor(Qt::WaitCursor); QGuiApplication::setOverrideCursor(Qt::WaitCursor);
// validating server's address
if (validateServer(this->connexion.server)) if (validateServer(this->connexion.server))
{ {
// server is validated // server is validated
@ -179,8 +188,6 @@ void MainWindow::populateTree(QTreeWidgetItem * parent)
// Populate Listview with list of services // Populate Listview with list of services
void MainWindow::populateList() void MainWindow::populateList()
{ {
//stringstream ss;
QString str;
QString server; QString server;
int port; int port;
@ -190,9 +197,11 @@ void MainWindow::populateList()
{ {
// clearing listwidget // clearing listwidget
ui->listWidget->clear(); ui->listWidget->clear();
this->connexion.server = server; this->connexion.server = server;
this->connexion.port = port; this->connexion.port = port;
// setting cursor to "Wait"
QGuiApplication::setOverrideCursor(Qt::WaitCursor); QGuiApplication::setOverrideCursor(Qt::WaitCursor);
// verify if server is in history // verify if server is in history
@ -203,6 +212,8 @@ void MainWindow::populateList()
port = this->settings.value(server).toUInt(); port = this->settings.value(server).toUInt();
ui->portEdit->setText(QString::number(port)); ui->portEdit->setText(QString::number(port));
this->connexion.port = port; this->connexion.port = port;
//display list of services
listServices(); listServices();
}else }else
{ {
@ -211,6 +222,7 @@ void MainWindow::populateList()
if (validateServer(server)) if (validateServer(server))
{ {
cout << server.toStdString() << endl; cout << server.toStdString() << endl;
// storing serverURL and port in settings // storing serverURL and port in settings
this->settings.setValue(server, port); this->settings.setValue(server, port);
this->settings.sync(); this->settings.sync();
@ -219,14 +231,13 @@ void MainWindow::populateList()
// storing in history of combobox // storing in history of combobox
ui->khistorycombobox->addToHistory(server); ui->khistorycombobox->addToHistory(server);
// "waiting" cursor
// load and display rsync services of the rsync server // load and display rsync services of the rsync server
listServices(); listServices();
} }
} }
} }
this->settings.endGroup(); this->settings.endGroup();
QGuiApplication::restoreOverrideCursor(); //setOverrideCursor(Qt::ArrowCursor); QGuiApplication::restoreOverrideCursor(); //setting cursor to default
} }
} }
@ -247,26 +258,32 @@ void MainWindow::listServices()
myProcess = new QProcess(this); myProcess = new QProcess(this);
myProcess->start(cmd, param); myProcess->start(cmd, param);
// waiting for response of the server with a timeout of 10 seconds
while(myProcess->waitForReadyRead(10000)) while(myProcess->waitForReadyRead(10000))
{ {
while(!flag) while(!flag)
{ {
line = QString::fromUtf8(myProcess->readLine()); line = QString::fromUtf8(myProcess->readLine());
// line empty then buffer is empty so returning to wait new datas
if (line.isEmpty()) if (line.isEmpty())
{ {
flag = true; flag = true;
break; break;
} }
// extracting name and comment of the service
v = line.split("\t"); v = line.split("\t");
v[0].replace(" ", ""); v[0].replace(" ", "");
v[1].replace("\n", ""); v[1].replace("\n", "");
service = v[0] + "\n\t" + v[1]; service = v[0] + "\n\t" + v[1];
// adding to list of services
ui->listWidget->addItem(service); ui->listWidget->addItem(service);
} }
// buffer empty go to waiting new datas
flag =false; flag =false;
} }
// verifying error code
testRsyncReturn(myProcess); testRsyncReturn(myProcess);
} }
@ -276,10 +293,8 @@ void MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
QString cmd; QString cmd;
QStringList param; QStringList param;
QString line; QString line;
QString errorRsync;
QString size; QString size;
QString filename; QString filename;
QString dir;
QTreeWidgetItem * item; QTreeWidgetItem * item;
QProcess * myProcess; QProcess * myProcess;
bool isDir = false; bool isDir = false;
@ -291,16 +306,19 @@ void MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
myProcess = new QProcess(this); myProcess = new QProcess(this);
myProcess->start(cmd, param); myProcess->start(cmd, param);
// waiting for response of the server with a timeout of 10 seconds
while(myProcess->waitForReadyRead(100000)) while(myProcess->waitForReadyRead(100000))
{ {
while (!flag) while (!flag)
{ {
line = QString::fromUtf8(myProcess->readLine()); line = QString::fromUtf8(myProcess->readLine());
// line empty then buffer is empty so returning to wait new datas
if (line.isEmpty()) if (line.isEmpty())
{ {
flag = true; flag = true;
break; break;
} }
// extracting name, size and is dir/file
line = line.simplified(); line = line.simplified();
size = line.section(" ", 1, 1); size = line.section(" ", 1, 1);
filename = line.section(" ", 4); filename = line.section(" ", 4);
@ -315,16 +333,19 @@ void MainWindow::scanDir(QString server, int portN, QTreeWidgetItem *parent, QSt
} }
if (parent != NULL) if (parent != NULL)
{ {
//adding item to tree
item = addTreeChild(parent, filename, size, isDir); item = addTreeChild(parent, filename, size, isDir);
}else }else
{ {
//adding item to tree (as directory)
item = addTreeRoot(filename, size, isDir); item = addTreeRoot(filename, size, isDir);
} }
} }
} }
flag = false; flag = false;
} }
// buffer empty go to waiting new datas
testRsyncReturn(myProcess); testRsyncReturn(myProcess);
} }
@ -333,7 +354,6 @@ bool MainWindow::isIpAddress(QString server)
{ {
QStringList r; QStringList r;
int elementN; int elementN;
QString qr;
bool ok; bool ok;
r = server.split('.'); r = server.split('.');
@ -360,9 +380,9 @@ bool MainWindow::validateServer(QString server)
QString cmd; QString cmd;
QStringList param; QStringList param;
QString line; QString line;
QString errorDig;
QProcess * myProcess; QProcess * myProcess;
bool flag = false; bool flag = false;
bool bflag = false;
cmd = "dig"; cmd = "dig";
param << server; param << server;
@ -370,23 +390,35 @@ bool MainWindow::validateServer(QString server)
myProcess = new QProcess(this); myProcess = new QProcess(this);
myProcess->start(cmd, param); myProcess->start(cmd, param);
// maiking a dig on the server's address
while(myProcess->waitForReadyRead()) while(myProcess->waitForReadyRead())
{
while (!bflag)
{ {
line = QString::fromUtf8(myProcess->readAllStandardOutput()); line = QString::fromUtf8(myProcess->readAllStandardOutput());
if (line.indexOf(";; ANSWER SECTION:") != -1) // line empty then buffer is empty so returning to wait new datas
if (line.isEmpty())
{
bflag = true;
break;
}else if (line.indexOf(";; ANSWER SECTION:") != -1)
{ {
flag = true; flag = true;
} }
} }
bflag = false;
}
//testRsyncReturn(myProcess); //testRsyncReturn(myProcess);
if ( flag == false) if ( flag == false)
{ {
//server's address is not valid testing if ip address is valid
flag = isIpAddress(server); flag = isIpAddress(server);
} }
if ( flag == false) if ( flag == false)
{ {
// server-s address not valid
QMessageBox::warning( QMessageBox::warning(
this, this,
"RsyncUI", "RsyncUI",
@ -412,15 +444,15 @@ void MainWindow::on_connectButton_clicked()
// add a dir in treeview // add a dir in treeview
QTreeWidgetItem * MainWindow::addTreeRoot(QString name, QString fileSize, bool isDir) QTreeWidgetItem * MainWindow::addTreeRoot(QString name, QString fileSize, bool isDir)
{ {
// QTreeWidgetItem(QTreeWidget * parent, int type = Type)
QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui->treeWidget); QTreeWidgetItem *treeItem = new QTreeWidgetItem(ui->treeWidget);
// QTreeWidgetItem::setText(int column, const QString & text)
if (isDir == true) if (isDir == true)
{ {
// item is a dir
treeItem->setText(1, tr("Dir")); treeItem->setText(1, tr("Dir"));
}else }else
{ {
// item is a file
treeItem->setText(1,tr("File")); treeItem->setText(1,tr("File"));
} }
treeItem->setText(0, name); treeItem->setText(0, name);
@ -432,15 +464,15 @@ QTreeWidgetItem * MainWindow::addTreeRoot(QString name, QString fileSize, bool i
// add a file in treeview // add a file in treeview
QTreeWidgetItem * MainWindow::addTreeChild(QTreeWidgetItem *parent, QString name, QString fileSize, bool isDir) QTreeWidgetItem * MainWindow::addTreeChild(QTreeWidgetItem *parent, QString name, QString fileSize, bool isDir)
{ {
// QTreeWidgetItem(QTreeWidget * parent, int type = Type)
QTreeWidgetItem *treeItem = new QTreeWidgetItem(); QTreeWidgetItem *treeItem = new QTreeWidgetItem();
// QTreeWidgetItem::setText(int column, const QString & text)
if (isDir == true) if (isDir == true)
{ {
// item is a dir
treeItem->setText(1, tr("Dir")); treeItem->setText(1, tr("Dir"));
}else }else
{ {
// item is a file
treeItem->setText(1,("File")); treeItem->setText(1,("File"));
} }
treeItem->setText(0, name); treeItem->setText(0, name);
@ -454,13 +486,14 @@ QTreeWidgetItem * MainWindow::addTreeChild(QTreeWidgetItem *parent, QString name
// Slot acivated when a service in the list is clicked // Slot acivated when a service in the list is clicked
void MainWindow::on_listWidget_clicked() void MainWindow::on_listWidget_clicked()
{ {
QString service;
QString str; QString str;
this->connexion.service = ui->listWidget->currentItem()->text().section("\n", 0 ,0); this->connexion.service = ui->listWidget->currentItem()->text().section("\n", 0 ,0);
str = "Folder/" + this->connexion.server + "/" + this->connexion.service; str = "Folder/" + this->connexion.server + "/" + this->connexion.service;
// if service exists in settings for this server
if (this->settings.contains(str)) if (this->settings.contains(str))
{ {
// setting savePath from settings
this->downloading.savePath = this->settings.value(str).toString(); this->downloading.savePath = this->settings.value(str).toString();
} }
populateTree(NULL); populateTree(NULL);
@ -474,24 +507,15 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
QTreeWidgetItem * itemR; QTreeWidgetItem * itemR;
QString path; QString path;
QString str; QString str;
QMessageBox::StandardButton reply;
itemR = item; itemR = item;
// assembling path from treewidget
path = item->text(0); path = item->text(0);
while(itemR->parent() != NULL)
{
itemR = itemR->parent();
path = itemR->text(0) + "/" + path;
};
if (item->text(1) == tr("File") or downloadDir == true)
{
// Item is a file
if(ui->listDownload->findItems(path, Qt::MatchStartsWith).empty())
{
// exists saving path in settings ? // exists saving path in settings ?
str = "Folder/" + this->connexion.server + "/" + this->downloading.service; str = "Folder/" + this->connexion.server + "/" + this->connexion.service;
if(!this->settings.contains(str)) if(!this->settings.contains(str))
{ {
// saving path do not exists, asking for it // saving path do not exists, asking for it
@ -500,8 +524,43 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
cout << "no directory selectioned, ignoring download request"; cout << "no directory selectioned, ignoring download request";
return; return;
} }
}else
{
this->downloading.savePath = this->settings.value(str).toString();
} }
while(itemR->parent() != NULL)
{
itemR = itemR->parent();
// concatening parent to path
path.prepend(itemR->text(0) + "/");
};
if (item->text(1) == tr("File") or downloadDir == true)
{
// Item is a file
// searching if file exists in savepath
if (QFile::exists(this->downloading.savePath + "/" + path))
{
reply = QMessageBox::question(
this,
"RsyncUI",
tr("File is already downloaded. Do you want to reload it ? The old file will be deleted"),
QMessageBox::Yes|QMessageBox::No,
QMessageBox::No);
if (reply == QMessageBox::No)
{
return;
}else
{
QFile::remove(this->downloading.savePath + "/" + path);
}
}
if(ui->listDownload->findItems(path, Qt::MatchStartsWith).empty())
{
// is there a downloading process ? // is there a downloading process ?
if (this->downloading.process == nullptr) if (this->downloading.process == nullptr)
{ {
@ -517,6 +576,13 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
// Adding download in download list // Adding download in download list
str = path + " => " + this->connexion.server + "/" + this->connexion.service; str = path + " => " + this->connexion.server + "/" + this->connexion.service;
ui->listDownload->addItem(str); ui->listDownload->addItem(str);
}else
{
QMessageBox::warning(
this,
"RsyncUI",
tr("File is already downloading" )
);
} }
}else }else
{ {
@ -550,9 +616,10 @@ void MainWindow::stoppingDownload()
void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus) void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
{ {
QString path; QString path;
int pos;
QString str; QString str;
int pos;
// test if process crashed
if (exitStatus == QProcess::CrashExit) if (exitStatus == QProcess::CrashExit)
{ {
QMessageBox::warning( QMessageBox::warning(
@ -560,25 +627,36 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
"RsyncUI", "RsyncUI",
tr("Rsync process crashed")); tr("Rsync process crashed"));
} }
//test result code of command (if 20 then command stopped by user)
if (exitCode != 0 and exitCode != 20) if (exitCode != 0 and exitCode != 20)
{ {
// displaying warning with exit code
QMessageBox::warning( QMessageBox::warning(
NULL, NULL,
"RsyncUI", "RsyncUI",
rsyncErrorStrings[exitCode]); rsyncErrorStrings[exitCode]);
} }
// disconnecting signals to slots
disconnect(this->downloading.process, 0, 0, 0); disconnect(this->downloading.process, 0, 0, 0);
// reset variables and window
this->downloading.process = nullptr; this->downloading.process = nullptr;
ui->progressBar->hide(); ui->progressBar->hide();
delete ui->listDownload->takeItem(0); delete ui->listDownload->takeItem(0);
this->downloading.clear(); this->downloading.clear();
// Some downloads staying in queue
if (ui->listDownload->count() != 0) if (ui->listDownload->count() != 0)
{ {
// autosave is activated
if (config.autosaveCheckbox->checkState() == Qt::Checked) if (config.autosaveCheckbox->checkState() == Qt::Checked)
{ {
// saving download list
saveDownloadList(); saveDownloadList();
} }
// initializing download
path = ui->listDownload->item(0)->text(); path = ui->listDownload->item(0)->text();
pos = path.lastIndexOf("/"); pos = path.lastIndexOf("/");
this->downloading.service = path.midRef(pos+1).toString(); this->downloading.service = path.midRef(pos+1).toString();
@ -587,12 +665,17 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
this->downloading.server = path.midRef(pos+4).toString(); this->downloading.server = path.midRef(pos+4).toString();
path.resize(pos); path.resize(pos);
this->downloading.path = path; this->downloading.path = path;
// savepath exists in settings ?
str = "Folder/" + this->downloading.server + "/" + this->downloading.service; str = "Folder/" + this->downloading.server + "/" + this->downloading.service;
if (this->settings.contains(str)) if (this->settings.contains(str))
{ {
// setting savepath from saved settings
this->downloading.savePath = this->settings.value(str).toString(); this->downloading.savePath = this->settings.value(str).toString();
startDownloading();
}else }else
{ {
// no save path
if(!on_DefaultSaveFolder_triggered()) if(!on_DefaultSaveFolder_triggered())
{ {
cout << "Error no save path so deleting download"; cout << "Error no save path so deleting download";
@ -600,20 +683,19 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
return; return;
} }
} }
startDownloading();
} }
saveDownloadList();
} }
// Slot activated when a line is clicked in queue list // Slot activated when a line is clicked in queue list
void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item) void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
{ {
QFileDialog dialog;
QMessageBox::StandardButton reply; QMessageBox::StandardButton reply;
//cout << item->text().toStdString() << endl;
if (item->listWidget()->row(item) == 0) if (item->listWidget()->row(item) == 0)
{ {
// first line clicked on download list
reply = QMessageBox::question( reply = QMessageBox::question(
this, this,
"RsyncUI", "RsyncUI",
@ -622,10 +704,12 @@ void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
QMessageBox::No); QMessageBox::No);
if (reply == QMessageBox::Yes) if (reply == QMessageBox::Yes)
{ {
// stopping download
emit (stopDownloading(this->downloading.process)); emit (stopDownloading(this->downloading.process));
} }
}else }else
{ {
// not first line on download list
reply = QMessageBox::question( reply = QMessageBox::question(
this, this,
"RsyncUI", "RsyncUI",
@ -634,10 +718,12 @@ void MainWindow::on_listDownload_itemClicked(QListWidgetItem *item)
QMessageBox::No); QMessageBox::No);
if (reply == QMessageBox::Yes) if (reply == QMessageBox::Yes)
{ {
// removing line from download list
ui->listDownload->removeItemWidget(item); ui->listDownload->removeItemWidget(item);
delete item; delete item;
if (config.autosaveCheckbox->checkState() == Qt::Checked) if (config.autosaveCheckbox->checkState() == Qt::Checked)
{ {
// autosave acivated,so saving download list
saveDownloadList(); saveDownloadList();
} }
} }
@ -694,7 +780,6 @@ void MainWindow::saveSettings()
// About // About
void MainWindow::on_actionAbout_triggered() void MainWindow::on_actionAbout_triggered()
{ {
//TODO => initialisation
QString text = this->about.description + "\n\n" + QString text = this->about.description + "\n\n" +
tr("Version") + ": " + this->about.version + "\n" + tr("Version") + ": " + this->about.version + "\n" +
tr("Licence") + ": " + this->about.licence + "\n" + tr("Licence") + ": " + this->about.licence + "\n" +
@ -717,6 +802,7 @@ bool MainWindow::on_DefaultSaveFolder_triggered()
QString folder; QString folder;
QString path; QString path;
// if service not selected display a message
if (this->connexion.service.isEmpty()) if (this->connexion.service.isEmpty())
{ {
QMessageBox::warning( QMessageBox::warning(
@ -725,12 +811,15 @@ bool MainWindow::on_DefaultSaveFolder_triggered()
tr("Since the save path is linked to service, you need to select a service before you can select a folder")); tr("Since the save path is linked to service, you need to select a service before you can select a folder"));
return false; return false;
} }
// Asking for directory to save files
path = dialog.getExistingDirectory(this, tr("Choose folder where to save file"), QDir::homePath(), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); path = dialog.getExistingDirectory(this, tr("Choose folder where to save file"), QDir::homePath(), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
if (!path.isEmpty()) if (!path.isEmpty())
{ {
this->downloading.savePath = path; this->downloading.savePath = path;
if (!this->connexion.service.isEmpty() and !this->connexion.server.isEmpty()) if (!this->connexion.service.isEmpty() and !this->connexion.server.isEmpty())
{ {
// saving save path in settings
folder = "Folder/" + this->connexion.server + "/" + this->connexion.service; folder = "Folder/" + this->connexion.server + "/" + this->connexion.service;
this->settings.setValue(folder, this->downloading.savePath); this->settings.setValue(folder, this->downloading.savePath);
this->settings.sync(); this->settings.sync();
@ -759,6 +848,7 @@ void MainWindow::on_buttonBox_accepted()
bw = config.spinBox->text(); bw = config.spinBox->text();
if (bw.toInt() == 0) if (bw.toInt() == 0)
{ {
// bandwidth = 0
this->connexion.bandwidthLimit = 0; this->connexion.bandwidthLimit = 0;
this->connexion.bandwidthLimitUnit = 0; this->connexion.bandwidthLimitUnit = 0;
}else }else
@ -780,9 +870,11 @@ void MainWindow::saveDownloadList()
{ {
int nRows; int nRows;
// remove list of downloads
this->settings.remove("Downloads/"); this->settings.remove("Downloads/");
// Saving list of current downloads
nRows = ui->listDownload->count(); nRows = ui->listDownload->count();
//this->settings.beginWriteArray("Downloads/");
this->settings.beginGroup("Downloads"); this->settings.beginGroup("Downloads");
this->settings.setValue("rows", nRows); this->settings.setValue("rows", nRows);
for (int i = 0; i < nRows; i++) for (int i = 0; i < nRows; i++)
@ -793,12 +885,14 @@ void MainWindow::saveDownloadList()
this->settings.sync(); this->settings.sync();
} }
// Loading download list
void MainWindow::loadDownloadList() void MainWindow::loadDownloadList()
{ {
QString path; QString path;
QString str; QString str;
int pos; int pos;
this->settings.sync();
this->settings.beginGroup("Downloads"); this->settings.beginGroup("Downloads");
int size = this->settings.value("rows").toInt(); int size = this->settings.value("rows").toInt();
for (int i = 0; i < size; ++i) for (int i = 0; i < size; ++i)
@ -807,8 +901,6 @@ void MainWindow::loadDownloadList()
} }
this->settings.endGroup(); this->settings.endGroup();
this->settings.sync();
path = ui->listDownload->item(0)->text(); path = ui->listDownload->item(0)->text();
pos = path.lastIndexOf("/"); pos = path.lastIndexOf("/");
this->downloading.service = path.midRef(pos+1).toString(); this->downloading.service = path.midRef(pos+1).toString();
@ -825,6 +917,7 @@ void MainWindow::loadDownloadList()
startDownloading(); startDownloading();
} }
// clear object downloading
void Downloading::clear() void Downloading::clear()
{ {
this->path.clear(); this->path.clear();
@ -833,6 +926,7 @@ void Downloading::clear()
this->service.clear(); this->service.clear();
} }
// Context menu of file list clicked
void MainWindow::on_actionDownload_triggered() void MainWindow::on_actionDownload_triggered()
{ {
// action made in qt-designer and added in init function. // action made in qt-designer and added in init function.
@ -852,6 +946,7 @@ void MainWindow::on_actionDownload_triggered()
} }
*/ */
// Chnage toolbar style
void MainWindow::on_comboBox_currentIndexChanged(int index) void MainWindow::on_comboBox_currentIndexChanged(int index)
{ {
ui->toolBar->setToolButtonStyle((Qt::ToolButtonStyle)index); ui->toolBar->setToolButtonStyle((Qt::ToolButtonStyle)index);

View File

@ -73,7 +73,7 @@ class About
{ {
public: public:
QString title = "RsyncUI"; QString title = "RsyncUI";
QString version = "1.9.2"; QString version = "2.1.1";
QString author = "Daniel TARTAVEL-JEANNOT"; QString author = "Daniel TARTAVEL-JEANNOT";
QString licence = "GPL_V3"; QString licence = "GPL_V3";
QString description; QString description;

View File

@ -43,6 +43,7 @@ const vector<string> explode(const string& s, const char& c, int n = 0)
return v; return v;
} }
// test return code of rsync
bool testRsyncReturn(QProcess * myProcess) bool testRsyncReturn(QProcess * myProcess)
{ {
if (myProcess->exitStatus() != 0) if (myProcess->exitStatus() != 0)