Compare commits
No commits in common. "master" and "2.12.5" have entirely different histories.
19
RsyncUI.pro
19
RsyncUI.pro
@ -2,7 +2,6 @@ QT += core gui
|
||||
QT += KItemViews
|
||||
QT += KCompletion
|
||||
QT += widgets
|
||||
QT += network
|
||||
|
||||
LIBS += -lqt5keychain
|
||||
|
||||
@ -15,29 +14,29 @@ CONFIG += c++17
|
||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||
|
||||
SOURCES += \
|
||||
downloadfile.cpp \
|
||||
main.cpp \
|
||||
downloadfile.cpp \
|
||||
main.cpp \
|
||||
mainwindow.cpp \
|
||||
password.cpp \
|
||||
tools.cpp
|
||||
|
||||
HEADERS += \
|
||||
version.h\
|
||||
downloadfile.h \
|
||||
version.h\
|
||||
downloadfile.h \
|
||||
mainwindow.h \
|
||||
password.h \
|
||||
tools.h
|
||||
|
||||
FORMS += \
|
||||
about.ui \
|
||||
configuration.ui \
|
||||
about.ui \
|
||||
configuration.ui \
|
||||
mainwindow.ui
|
||||
|
||||
TRANSLATIONS += \
|
||||
RsyncUI_fr_FR.ts
|
||||
RsyncUI_fr_FR.ts
|
||||
|
||||
INCLUDEPATH += \
|
||||
/usr/include/KF5 \
|
||||
/usr/include/KF5 \
|
||||
/usr/include/qt5keychain \
|
||||
|
||||
# Default rules for deployment.
|
||||
@ -53,7 +52,7 @@ INSTALLS += icon
|
||||
#RESOURCES +=
|
||||
|
||||
DISTFILES += \
|
||||
RsyncUI.desktop
|
||||
RsyncUI.desktop
|
||||
|
||||
lang.path = /languages/fr_FR/LC_MESSAGES/
|
||||
lang.path = /usr/share/locale/
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
Name: rsyncui
|
||||
Summary: Client for rsync server
|
||||
Version: 2.13.2
|
||||
Version: 2.12.5
|
||||
Release: %mkrel 1
|
||||
License: GPLv3
|
||||
Group: Networking/Remote access
|
||||
|
||||
@ -52,7 +52,7 @@ void MainWindow::download()
|
||||
{
|
||||
info(DEBUGMACRO, "Adding user to server (user@server");
|
||||
this->downloading.user = this->connexion.user;
|
||||
server = this->connexion.user + "@" + "[" + this->downloading.server + "]";
|
||||
server = this->connexion.user + "@" + this->downloading.server;
|
||||
env.insert("RSYNC_PASSWORD", this->downloading.password); // Add an environment variable
|
||||
this->downloading.process->setProcessEnvironment(env);
|
||||
}
|
||||
@ -64,7 +64,7 @@ void MainWindow::download()
|
||||
param << "--bwlimit=" + QString::number(this->connexion.bandwidthLimit) + bwUnitChar[this->connexion.bandwidthLimitUnit];
|
||||
}
|
||||
|
||||
ipversion = validateServer(&server);
|
||||
ipversion = validateServer(server);
|
||||
|
||||
if (downloading.ipversion == 4 || downloading.ipversion == 6)
|
||||
{
|
||||
@ -74,7 +74,7 @@ void MainWindow::download()
|
||||
|
||||
param << "--port" << QString::number(this->downloading.port).trimmed();
|
||||
param << "-aXP";
|
||||
param << "[" + server + "]::" + this->downloading.service.trimmed() + "/" + preparePath(this->downloading.path) << preparePath(this->downloading.savePath) + "/";
|
||||
param << "[" + server + "]::" + this->downloading.service.trimmed() + "/" + this->downloading.path.trimmed() << this->downloading.savePath.trimmed() + "/";
|
||||
|
||||
info(DEBUGMACRO, cmd + " " + param.join(" "));
|
||||
|
||||
@ -102,7 +102,6 @@ void MainWindow::readRsyncOutput()
|
||||
{
|
||||
list.clear();
|
||||
line = QString::fromUtf8(this->downloading.process->readLine());
|
||||
info(DEBUGMACRO, "downloading progress : " + line);
|
||||
if (line.isEmpty())
|
||||
{
|
||||
break;
|
||||
|
||||
2
main.cpp
2
main.cpp
@ -1,7 +1,6 @@
|
||||
#include "mainwindow.h"
|
||||
#include "tools.h"
|
||||
#include <QTranslator>
|
||||
#include <QHostInfo>
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
@ -30,6 +29,5 @@ int main(int argc, char *argv[])
|
||||
MainWindow w;
|
||||
info(DEBUGMACRO, "RsyncUI begining");
|
||||
w.show();
|
||||
|
||||
return a.exec();
|
||||
}
|
||||
|
||||
528
mainwindow.cpp
528
mainwindow.cpp
@ -7,9 +7,12 @@
|
||||
#include "tools.h"
|
||||
#include "password.h"
|
||||
#include <kcombobox.h>
|
||||
#include <signal.h>
|
||||
#include <QTextStream>
|
||||
#include <QHostInfo>
|
||||
|
||||
/*
|
||||
#include <klineedit.h>
|
||||
#include <khistorycombobox.h>
|
||||
#include <kcompletion.h>
|
||||
*/
|
||||
|
||||
using namespace std;
|
||||
|
||||
@ -101,15 +104,15 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
// if last server exists in settings
|
||||
if (this->settings.contains("connexion/lastServer"))
|
||||
{
|
||||
info(DEBUGMACRO, "Setting previous server");
|
||||
// set window to previous server/port configuration
|
||||
ui->portEdit->setText(this->settings.value("connexion/lastPort").toString());
|
||||
ui->khistorycombobox->setCurrentText(this->settings.value("connexion/lastServer").toString());
|
||||
info(DEBUGMACRO, "Setting previous server");
|
||||
// set window to previous server/port configuration
|
||||
ui->portEdit->setText(this->settings.value("connexion/lastPort").toString());
|
||||
ui->khistorycombobox->setCurrentText(this->settings.value("connexion/lastServer").toString());
|
||||
}else
|
||||
{
|
||||
info(DEBUGMACRO, "No previous server, so setting only default port");
|
||||
ui->portEdit->setText(QString::number(this->connexion.port));
|
||||
ui->khistorycombobox->clear();
|
||||
info(DEBUGMACRO, "No previous server, so setting only default port");
|
||||
ui->portEdit->setText(QString::number(this->connexion.port));
|
||||
ui->khistorycombobox->clear();
|
||||
}
|
||||
|
||||
// connectors
|
||||
@ -146,11 +149,11 @@ void MainWindow::init()
|
||||
info(DEBUGMACRO, "reply text is : " + reply->text());
|
||||
if(reply == yes)
|
||||
{
|
||||
loadDownloadList();
|
||||
loadDownloadList();
|
||||
}else if (reply == deleteButton)
|
||||
{
|
||||
// delete saved download list
|
||||
deleteDownloadList();
|
||||
// delete saved download list
|
||||
deleteDownloadList();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -320,7 +323,7 @@ void MainWindow::populateTree()
|
||||
|
||||
info(DEBUGMACRO, "Validating server");
|
||||
// validating server's address
|
||||
this->connexion.ipversion = validateServer(&this->connexion.server);
|
||||
this->connexion.ipversion = validateServer(this->connexion.server);
|
||||
if (this->connexion.ipversion != 0)
|
||||
{
|
||||
// server is validated, scanning directory
|
||||
@ -347,22 +350,18 @@ void MainWindow::populateList(QString server, uint port)
|
||||
info(DEBUGMACRO, "populateList() => Populating list of services");
|
||||
|
||||
info(DEBUGMACRO, "port: " + QString::number(port) + " - server: " + server);
|
||||
|
||||
if (server.isEmpty())
|
||||
{
|
||||
ui->listWidget->clear();
|
||||
ui->treeWidget->clear();
|
||||
return;
|
||||
ui->listWidget->clear();
|
||||
ui->treeWidget->clear();
|
||||
return;
|
||||
}
|
||||
|
||||
if (server != this->connexion.server)
|
||||
if ((server != this->connexion.server))
|
||||
{
|
||||
// Determine version of Ip Protocol
|
||||
info(DEBUGMACRO, "Server changed");
|
||||
|
||||
this->connexion.ipversion = validateServer(&server);
|
||||
this->connexion.server = server;
|
||||
|
||||
if (port != false)
|
||||
{
|
||||
this->connexion.port = port;
|
||||
@ -371,14 +370,13 @@ void MainWindow::populateList(QString server, uint port)
|
||||
QGuiApplication::setOverrideCursor(Qt::WaitCursor);
|
||||
|
||||
// verify if server is in history
|
||||
this->settings.beginGroup("connexion/Servers");
|
||||
this->settings.beginGroup("connexion/server");
|
||||
if (this->settings.contains(server))
|
||||
{
|
||||
this->settings.beginGroup(server);
|
||||
info(DEBUGMACRO, "Server configuration exists in settings");
|
||||
|
||||
// server is in history => setting port value
|
||||
port = this->settings.value("port").toUInt();
|
||||
port = this->settings.value(server).toUInt();
|
||||
this->connexion.ipversion = this->settings.value("ipversion").toUInt();
|
||||
ui->portEdit->setText(QString::number(port));
|
||||
this->connexion.port = port;
|
||||
@ -386,10 +384,8 @@ void MainWindow::populateList(QString server, uint port)
|
||||
ok = true;
|
||||
//display list of services
|
||||
//listServices(); // TODO clear in listServices
|
||||
this->settings.endGroup();
|
||||
}
|
||||
this->settings.endGroup();
|
||||
this->settings.endGroup();
|
||||
}
|
||||
if (port != this->connexion.port)
|
||||
{
|
||||
@ -404,8 +400,8 @@ void MainWindow::populateList(QString server, uint port)
|
||||
{
|
||||
if (this->connexion.ipversion == 0)
|
||||
{
|
||||
this->connexion.ipversion = validateServer(&server);
|
||||
info(DEBUGMACRO, "IP version : " + QString::number(this->connexion.ipversion));
|
||||
this->connexion.ipversion = validateServer(server);
|
||||
info(DEBUGMACRO, QString::number(this->connexion.ipversion));
|
||||
}
|
||||
|
||||
if (this->connexion.ipversion != 0)
|
||||
@ -415,27 +411,17 @@ void MainWindow::populateList(QString server, uint port)
|
||||
info(DEBUGMACRO,"Saving server configuration in settings");
|
||||
|
||||
// storing serverURL and port in settings
|
||||
this->settings.beginGroup("connnexion");
|
||||
this->settings.beginGroup("Servers");
|
||||
this->settings.beginGroup(server);
|
||||
this->settings.setValue("port", port);
|
||||
this->settings.setValue("ipversion", this->connexion.ipversion);
|
||||
this->settings.endGroup();
|
||||
this->settings.endGroup();
|
||||
this->settings.endGroup();
|
||||
|
||||
this->settings.setValue(server, port);
|
||||
this->settings.setValue(server, this->connexion.ipversion);
|
||||
this->settings.sync();
|
||||
this->downloading.server = server;
|
||||
this->downloading.port = port;
|
||||
this->downloading.ipversion = this->connexion.ipversion;
|
||||
|
||||
// storing in history of combobox
|
||||
ui->khistorycombobox->addToHistory(server);
|
||||
|
||||
// load and display rsync services of the rsync server
|
||||
}else
|
||||
{
|
||||
info(DEBUGMACRO, "ERROR : Unknown IP version");
|
||||
|
||||
}
|
||||
}else
|
||||
{
|
||||
@ -443,8 +429,7 @@ void MainWindow::populateList(QString server, uint port)
|
||||
}
|
||||
listServices();
|
||||
|
||||
this->settings.beginGroup("Hidden");
|
||||
this->settings.beginGroup(server);
|
||||
this->settings.beginGroup("Hidden/" + server);
|
||||
hidden = this->settings.allKeys();
|
||||
if (hidden.count() > 0)
|
||||
{
|
||||
@ -459,7 +444,6 @@ void MainWindow::populateList(QString server, uint port)
|
||||
}
|
||||
}
|
||||
this->settings.endGroup();
|
||||
this->settings.endGroup();
|
||||
// clearing listview
|
||||
ui->treeWidget->clear();
|
||||
QGuiApplication::restoreOverrideCursor(); //setting cursor to default
|
||||
@ -487,7 +471,7 @@ bool MainWindow::testServerPresence(QString service, bool askPassword)
|
||||
{
|
||||
param << "-" + QString::number(this->connexion.ipversion);
|
||||
}
|
||||
param << "--contimeout=10" << "-nq" << "--port=" + QString::number(this->connexion.port) << + "[" + this->connexion.server + "]::" + preparePath(service);
|
||||
param << "--contimeout=10" << "-nq" << "--port=" + QString::number(this->connexion.port) << + "[" + this->connexion.server + "]::" + service;
|
||||
myProcess = new QProcess(this);
|
||||
myProcess->setProcessChannelMode(QProcess::MergedChannels);
|
||||
myProcess->start(cmd, param);
|
||||
@ -525,7 +509,7 @@ bool MainWindow::testServerPresence(QString service, bool askPassword)
|
||||
//list services of the rsync server
|
||||
void MainWindow::listServices()
|
||||
{
|
||||
QString cmd = "/usr/bin/rsync";
|
||||
QString cmd;
|
||||
QStringList param;
|
||||
QString line;
|
||||
QString errorRsync;
|
||||
@ -540,6 +524,7 @@ void MainWindow::listServices()
|
||||
// clearing listwidget
|
||||
ui->listWidget->clear();
|
||||
|
||||
cmd = "/usr/bin/rsync";
|
||||
if (this->connexion.ipversion == 0)
|
||||
{
|
||||
this->connexion.ipversion = whatIpVersion(this->connexion.server);
|
||||
@ -553,12 +538,7 @@ void MainWindow::listServices()
|
||||
{
|
||||
param << "-" + QString::number(this->connexion.ipversion).trimmed();
|
||||
server = "[" + this->connexion.server + "]";
|
||||
}else
|
||||
{
|
||||
error(tr("Error : Unknown IP version"));
|
||||
return;
|
||||
}
|
||||
|
||||
param << "--contimeout=20" << "--port=" + QString::number(this->connexion.port) << server + "::";
|
||||
myProcess = new QProcess(this);
|
||||
|
||||
@ -603,7 +583,7 @@ void MainWindow::listServices()
|
||||
// connect to rsync server to get list of files
|
||||
bool MainWindow::scanDir(Connexion * connexion, QTreeWidgetItem *parent, QString path)
|
||||
{
|
||||
QString cmd = "rsync";
|
||||
QString cmd;
|
||||
QStringList param;
|
||||
QStringList sizeA;
|
||||
QString line;
|
||||
@ -613,7 +593,6 @@ bool MainWindow::scanDir(Connexion * connexion, QTreeWidgetItem *parent, QString
|
||||
QString fileType;
|
||||
QString date;
|
||||
QString dirName = "";
|
||||
QString user;
|
||||
QProcess * myProcess;
|
||||
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
|
||||
bool isDir = false;
|
||||
@ -624,12 +603,9 @@ bool MainWindow::scanDir(Connexion * connexion, QTreeWidgetItem *parent, QString
|
||||
static uint looping;
|
||||
QStringList dirs;
|
||||
QString server = connexion->server;
|
||||
bool ret = false;
|
||||
|
||||
info(DEBUGMACRO, "scandir() => connect to rsync server to get list of files");
|
||||
|
||||
ui->listWidget->setCursor(Qt::WaitCursor);
|
||||
|
||||
myProcess = new QProcess(this);
|
||||
myProcess->setProcessChannelMode(QProcess::MergedChannels);
|
||||
|
||||
@ -639,249 +615,219 @@ bool MainWindow::scanDir(Connexion * connexion, QTreeWidgetItem *parent, QString
|
||||
}
|
||||
if (nChild == 0)
|
||||
{
|
||||
if (!connexion->user.isEmpty())
|
||||
{
|
||||
server.prepend(connexion->user + "@");
|
||||
env.insert("RSYNC_PASSWORD", connexion->password); // Add an environment variable
|
||||
}else
|
||||
{
|
||||
server.prepend("anonymous@");
|
||||
env.insert("RSYNC_PASSWORD", "anonymous"); // Add an environment variable
|
||||
}
|
||||
myProcess->setProcessEnvironment(env);
|
||||
|
||||
myProcess->setProcessEnvironment(env);
|
||||
info(DEBUGMACRO, "ipversion => " + QString::number(connexion->ipversion));
|
||||
cmd = "rsync";
|
||||
if(this->connexion.ipversion == 4 || this->connexion.ipversion == 6)
|
||||
{
|
||||
param << "-" + QString::number(connexion->ipversion).trimmed();
|
||||
}
|
||||
param << "--contimeout=20" << "--port=" + QString::number(connexion->port) << "[" + server + "]::" + path;
|
||||
|
||||
info(DEBUGMACRO, "ipversion => " + QString::number(connexion->ipversion));
|
||||
if(this->connexion.ipversion == 4 || this->connexion.ipversion == 6)
|
||||
info(DEBUGMACRO, cmd + " " + param.join(" "));
|
||||
|
||||
myProcess->start(cmd, param);
|
||||
this->rescan = true;
|
||||
|
||||
info(DEBUGMACRO, "Waiting server response");
|
||||
// waiting for response of the server with a timeout of 10 seconds
|
||||
do
|
||||
{
|
||||
readOk = myProcess->waitForReadyRead(10000);
|
||||
if (readOk)
|
||||
{
|
||||
param << "-" + QString::number(connexion->ipversion).trimmed();
|
||||
}
|
||||
|
||||
|
||||
if (!connexion->user.isEmpty())
|
||||
while (!flag)
|
||||
{
|
||||
user = connexion->user + "@";
|
||||
env.insert("RSYNC_PASSWORD", connexion->password); // Add an environment variable
|
||||
}else
|
||||
{
|
||||
user = "anonymous@";
|
||||
env.insert("RSYNC_PASSWORD", "anonymous"); // Add an environment variable
|
||||
}
|
||||
param << "--contimeout=20" << "--port=" + QString::number(connexion->port) << user + "[" + server + "]::" + preparePath(path) ;
|
||||
|
||||
info(DEBUGMACRO, cmd + " " + param.join(" "));
|
||||
|
||||
myProcess->start(cmd, param);
|
||||
this->rescan = true;
|
||||
|
||||
info(DEBUGMACRO, "Waiting server response");
|
||||
// waiting for response of the server with a timeout of 10 seconds
|
||||
do
|
||||
{
|
||||
readOk = myProcess->waitForReadyRead(10000);
|
||||
if (readOk)
|
||||
line = QString::fromUtf8(myProcess->readLine());
|
||||
// line empty then buffer is empty so returning to wait new datas
|
||||
if (line.isEmpty())
|
||||
{
|
||||
while (!flag)
|
||||
{
|
||||
line = QString::fromUtf8(myProcess->readLine());
|
||||
// line empty then buffer is empty so returning to wait new datas
|
||||
if (line.isEmpty())
|
||||
{
|
||||
flag = true;
|
||||
break;
|
||||
}
|
||||
if (line.contains("auth failed"))
|
||||
{
|
||||
myProcess->readAllStandardOutput();
|
||||
getUserPassword(connexion);
|
||||
if (looping <= 1)
|
||||
{
|
||||
this->rescan = true;
|
||||
looping++;
|
||||
}else
|
||||
{
|
||||
this->rescan = false;
|
||||
looping = 0;
|
||||
warning(tr("Authentication failed" ));
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// extracting name, size and is dir/file
|
||||
line = line.simplified();
|
||||
filename = line.section(" ", 4);
|
||||
if (filename != '.')
|
||||
{
|
||||
size = line.section(" ", 1, 1);
|
||||
fullsize = size;
|
||||
fullsize.remove(",");
|
||||
sizeA = size.split(',');
|
||||
if (sizeA.count() <= 1)
|
||||
{
|
||||
size = sizeA.at(0) + " " + UnitText[0] + " ";
|
||||
}else
|
||||
{
|
||||
myProcess->setProcessEnvironment(env);
|
||||
size = sizeA.at(0) + "," + sizeA.at(1).left(2) + " " + UnitText[sizeA.count()-1] + " ";
|
||||
}
|
||||
|
||||
if (line[0] == "d")
|
||||
{
|
||||
isDir = true;
|
||||
}else
|
||||
{
|
||||
isDir = false;
|
||||
}
|
||||
|
||||
date = line.section(' ', 2, 2);
|
||||
fileType = getFileType(filename);
|
||||
if (!path.isEmpty())
|
||||
{
|
||||
if (path.endsWith('/'))
|
||||
{
|
||||
path.chop(1);
|
||||
}
|
||||
dirs = path.split('/');
|
||||
dirName = dirs[dirs.size()-1];
|
||||
}
|
||||
addTreeItem(filename, size, fullsize, fileType, date, isDir, dirName, parent);
|
||||
if (passwdOk == false and !connexion->password.isEmpty())
|
||||
{
|
||||
this->settings.setValue("Passwords/" + connexion->server + "/" + connexion->service + "/" + connexion->user, true);
|
||||
setPassword(connexion->user, connexion->password);
|
||||
this->settings.sync();
|
||||
}
|
||||
this->rescan = false;
|
||||
}
|
||||
}
|
||||
flag = false;
|
||||
flag = true;
|
||||
break;
|
||||
}
|
||||
if (line.contains("auth failed"))
|
||||
{
|
||||
myProcess->readAllStandardOutput();
|
||||
getUserPassword(connexion);
|
||||
if (looping <= 1)
|
||||
{
|
||||
this->rescan = true;
|
||||
looping++;
|
||||
}else
|
||||
{
|
||||
if (myProcess->state() == QProcess::Running)
|
||||
{
|
||||
if (myProcess->waitForFinished(10000) == 0)
|
||||
{
|
||||
warning(tr("The processus does'nt respond: ") + myProcess->errorString());
|
||||
}
|
||||
}
|
||||
this->rescan = false;
|
||||
looping = 0;
|
||||
warning(tr("Authentication failed" ));
|
||||
}
|
||||
}while(readOk);
|
||||
return false;
|
||||
}
|
||||
|
||||
// extracting name, size and is dir/file
|
||||
line = line.simplified();
|
||||
filename = line.section(" ", 4);
|
||||
if (filename != '.')
|
||||
{
|
||||
size = line.section(" ", 1, 1);
|
||||
fullsize = size;
|
||||
fullsize.remove(",");
|
||||
sizeA = size.split(',');
|
||||
if (sizeA.count() <= 1)
|
||||
{
|
||||
size = sizeA.at(0) + " " + UnitText[0] + " ";
|
||||
}else
|
||||
{
|
||||
myProcess->setProcessEnvironment(env);
|
||||
size = sizeA.at(0) + "," + sizeA.at(1).left(2) + " " + UnitText[sizeA.count()-1] + " ";
|
||||
}
|
||||
|
||||
if (line[0] == "d")
|
||||
{
|
||||
isDir = true;
|
||||
}else
|
||||
{
|
||||
isDir = false;
|
||||
}
|
||||
|
||||
date = line.section(' ', 2, 2);
|
||||
fileType = getFileType(filename);
|
||||
if (!path.isEmpty())
|
||||
{
|
||||
if (path.endsWith('/'))
|
||||
{
|
||||
path.chop(1);
|
||||
}
|
||||
dirs = path.split('/');
|
||||
dirName = dirs[dirs.size()-1];
|
||||
}
|
||||
addTreeItem(filename, size, fullsize, fileType, date, isDir, dirName, parent);
|
||||
if (passwdOk == false and !connexion->password.isEmpty())
|
||||
{
|
||||
this->settings.setValue("Passwords/" + connexion->server + "/" + connexion->service + "/" + connexion->user, true);
|
||||
setPassword(connexion->user, connexion->password);
|
||||
this->settings.sync();
|
||||
}
|
||||
this->rescan = false;
|
||||
}
|
||||
}
|
||||
flag = false;
|
||||
}else
|
||||
{
|
||||
if (myProcess->state() == QProcess::Running)
|
||||
{
|
||||
if (myProcess->waitForFinished(10000) == 0)
|
||||
{
|
||||
warning(tr("The processus does'nt respond: ") + myProcess->errorString());
|
||||
}
|
||||
}
|
||||
}
|
||||
}while(readOk);
|
||||
// buffer empty go to waiting new datas
|
||||
|
||||
ret = testRsyncReturn(this, myProcess);
|
||||
testRsyncReturn(this, myProcess);
|
||||
myProcess->close();
|
||||
}
|
||||
ui->listWidget->setCursor(Qt::ArrowCursor);
|
||||
|
||||
return ret;
|
||||
return false;
|
||||
}
|
||||
|
||||
// validate address server
|
||||
uint MainWindow::validateServer(QString *server)
|
||||
uint MainWindow::validateServer(QString server)
|
||||
{
|
||||
QString cmd;
|
||||
QStringList param;
|
||||
QString line;
|
||||
QProcess * myProcess;
|
||||
QStringList responseList;
|
||||
QFile fileHandle("/etc/hosts");
|
||||
|
||||
uint ipversion = 0;
|
||||
uint ipversion;
|
||||
int answerFound = 0;
|
||||
int queryPos = 0;
|
||||
QHostAddress serverAddress;
|
||||
|
||||
info(DEBUGMACRO, "ValidateServer() => Validating server address");
|
||||
|
||||
//if (ipversion == 0) // not an Ip address, perhaps a server name
|
||||
//{
|
||||
ipversion = whatIpVersion(server);
|
||||
|
||||
serverAddress = searchHosts(*server);
|
||||
if (!serverAddress.isNull())
|
||||
if (ipversion == 0) // not an Ip address, perhaps a server name
|
||||
{
|
||||
server->clear();
|
||||
server->append(serverAddress.toString());
|
||||
info(DEBUGMACRO, "Server address : " + *server);
|
||||
}else
|
||||
{
|
||||
if (!serverAddress.setAddress(*server))
|
||||
info(DEBUGMACRO, "Digging server name");
|
||||
|
||||
cmd = "dig";
|
||||
param << "-t A"; // IP V4 query
|
||||
param << "-t AAAA"; // IP V6 query
|
||||
param << server.trimmed() ;
|
||||
|
||||
info(DEBUGMACRO, cmd + " " + param.join(" "));
|
||||
|
||||
myProcess = new QProcess(this);
|
||||
myProcess->start(cmd, param);
|
||||
|
||||
// making a dig on the server's address
|
||||
while(myProcess->waitForReadyRead())
|
||||
{
|
||||
|
||||
info(DEBUGMACRO, "Digging server name");
|
||||
|
||||
cmd = "dig";
|
||||
param << server->trimmed() ;
|
||||
if (ipversion == IPV4)
|
||||
while (1) //!bflag)
|
||||
{
|
||||
param << "A"; // IP V4 query
|
||||
}else if (ipversion == IPV6)
|
||||
{
|
||||
param << "AAAA"; // IP V6 query
|
||||
}else
|
||||
{
|
||||
error("Protocol is not IPV4 or IPV6 !!");
|
||||
}
|
||||
|
||||
info(DEBUGMACRO, cmd + " " + param.join(" "));
|
||||
|
||||
myProcess = new QProcess(this);
|
||||
myProcess->start(cmd, param);
|
||||
|
||||
// making a dig on the server's address
|
||||
while(myProcess->waitForReadyRead())
|
||||
{
|
||||
while (1) //!bflag)
|
||||
line = QString::fromUtf8(myProcess->readAllStandardOutput());
|
||||
info(DEBUGMACRO, line);
|
||||
// line empty then buffer is empty so returning to wait new datas
|
||||
if (line.isEmpty())
|
||||
{
|
||||
line = QString::fromUtf8(myProcess->readAllStandardOutput());
|
||||
info(DEBUGMACRO, line);
|
||||
// line empty then buffer is empty so returning to wait new datas
|
||||
if (line.isEmpty())
|
||||
{
|
||||
break;
|
||||
}else
|
||||
{
|
||||
answerFound = line.indexOf(";; ANSWER SECTION:") + 19;
|
||||
info(DEBUGMACRO, "Position of answer line is : " + QString::number(answerFound));
|
||||
break;
|
||||
}else
|
||||
{
|
||||
answerFound = line.indexOf(";; ANSWER SECTION:") +19;
|
||||
info(DEBUGMACRO, "Position of answer line is : " + QString::number(answerFound));
|
||||
|
||||
if (answerFound != -1)
|
||||
if (answerFound != -1)
|
||||
{
|
||||
info(DEBUGMACRO, "Serching IP address");
|
||||
queryPos = line.indexOf(";; Query");
|
||||
info(DEBUGMACRO, "Position of Query line is : " + QString::number(queryPos));
|
||||
if (answerFound < queryPos)
|
||||
{
|
||||
info(DEBUGMACRO, "Serching IP address");
|
||||
queryPos = line.indexOf(";; Query");
|
||||
info(DEBUGMACRO, "Position of Query line is : " + QString::number(queryPos));
|
||||
if (answerFound < queryPos)
|
||||
line = line.mid(answerFound, queryPos - answerFound);
|
||||
info(DEBUGMACRO, "line is:\n" + line);
|
||||
responseList = line.split(QRegExp("\\s+"));
|
||||
info(DEBUGMACRO, "ip Address is => " + responseList.at(4));
|
||||
if(responseList.at(3) == "A")
|
||||
{
|
||||
line = line.mid(answerFound, queryPos - answerFound);
|
||||
info(DEBUGMACRO, "line is:\n" + line);
|
||||
responseList = line.split(QRegExp("\\s+"));
|
||||
info(DEBUGMACRO, "ip Address is => " + responseList.at(4));
|
||||
if (serverAddress.setAddress(responseList.at(4)))
|
||||
{
|
||||
//error ("Address " + responseList.at(4) + " is bad");
|
||||
server->clear();
|
||||
server->append(serverAddress.toString());
|
||||
}
|
||||
return 4;
|
||||
}else if(responseList.at(3) == "AAAA")
|
||||
{
|
||||
return 6;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
myProcess->close();
|
||||
}
|
||||
myProcess->close();
|
||||
}
|
||||
|
||||
info(DEBUGMACRO, "Returning ip version: " + QString::number(ipversion));
|
||||
//ipversion = whatIpVersion(*server);
|
||||
return ipversion;
|
||||
|
||||
ipversion = serverAddress.protocol();
|
||||
|
||||
return (ipversion==IPV4?4:6);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
// slot activated when button connection is clicked
|
||||
void MainWindow::on_connectButton_clicked()
|
||||
{
|
||||
QString server;
|
||||
uint port;
|
||||
//uint ipversion;
|
||||
|
||||
info(DEBUGMACRO, "on_connectButton_clicked() => Connexion button clicked");
|
||||
port = ui->portEdit->text().toUInt();
|
||||
if (port > 0 and port < 65535)
|
||||
{
|
||||
server = ui->khistorycombobox->currentText();
|
||||
//ipversion = validateServer(&server);
|
||||
populateList(server, port);
|
||||
}else
|
||||
{
|
||||
@ -928,8 +874,7 @@ void MainWindow::addTreeItem(QString name, QString fileSize, QString fullsize, Q
|
||||
}else
|
||||
{
|
||||
// item is a file
|
||||
this->settings.beginGroup("Downloaded");
|
||||
//TODO add to settings
|
||||
this->settings.beginGroup("Downloaded/");
|
||||
this->settings.endGroup();
|
||||
treeItem->setText(1,type);
|
||||
}
|
||||
@ -1054,13 +999,11 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
|
||||
QString str;
|
||||
QMessageBox::StandardButton reply;
|
||||
int sizeFromRsync;
|
||||
bool ret = false;
|
||||
|
||||
info(DEBUGMACRO, "on_treeWidget_itemClicked() => Slot activated when a file is clicked in the treeview");
|
||||
|
||||
if (this->treeviewClicked == true)
|
||||
{
|
||||
info(DEBUGMACRO, "double click ignored");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1097,7 +1040,7 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
|
||||
}else
|
||||
{
|
||||
this->downloading.savePath = this->settings.value(str).toString();
|
||||
info(DEBUGMACRO, "saving folder : " + this->downloading.savePath);
|
||||
info(DEBUGMACRO, "saving folder" + this->downloading.savePath);
|
||||
}
|
||||
|
||||
// Item is a file
|
||||
@ -1177,20 +1120,13 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
|
||||
if (item->isExpanded() == false)
|
||||
{
|
||||
info(DEBUGMACRO, "Item is not expanded");
|
||||
//if (this->rescan)
|
||||
//{
|
||||
while (this->rescan)
|
||||
{
|
||||
info(DEBUGMACRO, "Re-scanning path: " + this->connexion.service + "/" + path +"/");
|
||||
ret = scanDir(&this->connexion, item, this->connexion.service + "/" + path +"/");
|
||||
if(!ret)
|
||||
{
|
||||
item->setExpanded(true);
|
||||
}
|
||||
//}
|
||||
}else
|
||||
{
|
||||
item->setExpanded(false);
|
||||
scanDir(&this->connexion, item, this->connexion.service + "/" + path +"/");
|
||||
item->setExpanded(true);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (config.autosaveCheckbox->checkState() == Qt::Checked)
|
||||
@ -1301,7 +1237,7 @@ void MainWindow::downloadFinished(int exitCode, QProcess::ExitStatus exitStatus)
|
||||
pos = path.lastIndexOf(" => ");
|
||||
this->downloading.server = path.midRef(pos+4).toString();
|
||||
path.resize(pos);
|
||||
this->downloading.port = this->settings.value("connexion/Servers/" + this->downloading.server + "/port").toInt();
|
||||
this->downloading.port = this->settings.value("connexion/server/" + this->downloading.server).toInt();
|
||||
this->downloading.path = path;
|
||||
|
||||
//getUserPassword(true);
|
||||
@ -1395,7 +1331,7 @@ void MainWindow::loadSettings()
|
||||
// loading connexion settings
|
||||
// loading servers history
|
||||
info(DEBUGMACRO, "Restoring server combobox history");
|
||||
this->settings.beginGroup("connexion/Servers");
|
||||
this->settings.beginGroup("connexion/server");
|
||||
QStringList servers = this->settings.allKeys();
|
||||
this->settings.endGroup();
|
||||
ui->khistorycombobox->insertItems(1,this->settings.value("kHistoryComboBox").toStringList());
|
||||
@ -1562,7 +1498,7 @@ void MainWindow::loadDownloadList()
|
||||
path.resize(pos);
|
||||
pos = path.lastIndexOf(" => ");
|
||||
this->downloading.server = path.midRef(pos+4).toString();
|
||||
this->downloading.port = this->settings.value("connexion/Servers/" + this->downloading.server+ "/port").toInt();
|
||||
this->downloading.port = this->settings.value("connexion/server/" + this->downloading.server).toInt();
|
||||
path.resize(pos);
|
||||
this->downloading.path = path;
|
||||
str = "Folder/" + this->downloading.server + "/" + this->downloading.service;
|
||||
@ -1646,69 +1582,3 @@ void MainWindow::on_actionHiddenService_triggered()
|
||||
preparePopulateTree();
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::on_treeWidget_itemDoubleClicked(QTreeWidgetItem *item, int column)
|
||||
{
|
||||
(void) item;
|
||||
(void) column;
|
||||
}
|
||||
|
||||
|
||||
void MainWindow::on_treeWidget_doubleClicked(const QModelIndex &index)
|
||||
{
|
||||
(void) index;
|
||||
}
|
||||
|
||||
|
||||
void MainWindow::on_actionPause_downloads_triggered()
|
||||
{
|
||||
quint64 processID = this->downloading.process->processId();
|
||||
QString fileStr = "/proc/" + QString::number(processID) + "/task/" + QString::number(processID) + "/children";
|
||||
static QMessageBox msgBox;
|
||||
|
||||
//msgBox = new QMessageBox(this);
|
||||
msgBox.setIcon( QMessageBox::Warning );
|
||||
msgBox.setText("Download suspended");
|
||||
//QPushButton *btnCancel = msgBox->addButton( "Cancel", QMessageBox::RejectRole );
|
||||
//msgBox.setAttribute(Qt::WA_DeleteOnClose); // delete pointer after close
|
||||
msgBox.setModal(false);
|
||||
|
||||
info (DEBUGMACRO, "downloading state : " + QString::fromUtf8((this->downloading.paused==0)?"running":"paused"));
|
||||
info (DEBUGMACRO, "Downloading process ID : " + QString::number(processID));
|
||||
info (DEBUGMACRO, fileStr);
|
||||
|
||||
QFile file(fileStr);
|
||||
if(!file.open(QIODevice::ReadOnly))
|
||||
{
|
||||
QMessageBox::information(0, "error", file.errorString());
|
||||
}
|
||||
|
||||
QTextStream in(&file);
|
||||
QString children = in.readLine();
|
||||
info (DEBUGMACRO, "Child process is : " + children);
|
||||
if (this->downloading.paused)
|
||||
{
|
||||
info(DEBUGMACRO, "resuming Download");
|
||||
if (kill(children.toLongLong(), SIGCONT))
|
||||
{
|
||||
info(DEBUGMACRO, "resuming failed : " + QString::number(errno));
|
||||
}
|
||||
|
||||
if (msgBox.isVisible())
|
||||
{
|
||||
msgBox.close();
|
||||
}
|
||||
this->downloading.paused = false;
|
||||
}else
|
||||
{
|
||||
info(DEBUGMACRO, "pausing Download");
|
||||
if (kill(children.toLongLong(), SIGTSTP))
|
||||
{
|
||||
info(DEBUGMACRO, "resuming failed : " + QString::number(errno));
|
||||
}
|
||||
|
||||
msgBox.show();
|
||||
|
||||
this->downloading.paused = true;
|
||||
}
|
||||
}
|
||||
|
||||
83
mainwindow.h
83
mainwindow.h
@ -51,45 +51,42 @@ extern QMap<int, QString> rsyncErrorStrings;
|
||||
|
||||
class Connexion
|
||||
{
|
||||
public:
|
||||
public:
|
||||
int bandwidthLimit = 0;
|
||||
int bandwidthLimitUnit;
|
||||
int contimeout = 20;
|
||||
QString server;
|
||||
QString service;
|
||||
QString path;
|
||||
QString savePath;
|
||||
QString user;
|
||||
QString password;
|
||||
QProcess * process = nullptr;
|
||||
int ipversion = 4;
|
||||
uint port = 873;
|
||||
bool quit = false;
|
||||
void clear();
|
||||
bool paused = false;
|
||||
QString service;
|
||||
QString path;
|
||||
QString savePath;
|
||||
QString user;
|
||||
QString password;
|
||||
QProcess * process = nullptr;
|
||||
int ipversion = 4;
|
||||
uint port = 873;
|
||||
bool quit = false;
|
||||
void clear();
|
||||
};
|
||||
|
||||
class Downloading
|
||||
{
|
||||
public:
|
||||
public:
|
||||
QString server;
|
||||
QString service;
|
||||
QString path;
|
||||
QString savePath;
|
||||
QString user;
|
||||
QString password;
|
||||
int ipversion = 4;
|
||||
int port = 873;
|
||||
QProcess * process = nullptr;
|
||||
bool quit = false;
|
||||
bool paused = false;
|
||||
|
||||
void clear();
|
||||
QString user;
|
||||
QString password;
|
||||
int ipversion = 4;
|
||||
int port = 873;
|
||||
QProcess * process = nullptr;
|
||||
bool quit = false;
|
||||
void clear();
|
||||
};
|
||||
|
||||
class About
|
||||
{
|
||||
public:
|
||||
public:
|
||||
QString version;
|
||||
QString author = "Daniel TARTAVEL-JEANNOT";
|
||||
QString licence = "GPL_V3";
|
||||
@ -102,7 +99,7 @@ class MainWindow : public QMainWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
public:
|
||||
Ui::MainWindow *ui;
|
||||
MainWindow(QWidget *parent = nullptr);
|
||||
~MainWindow();
|
||||
@ -120,27 +117,27 @@ class MainWindow : public QMainWindow
|
||||
QSystemTrayIcon * trayIcon;
|
||||
QString icon = "/usr/share/icons/RsyncUI.png";
|
||||
bool rescan = false;
|
||||
bool stopDlAsked = false;
|
||||
bool treeviewClicked = false;
|
||||
bool stopDlAsked;
|
||||
bool treeviewClicked;
|
||||
bool initialization = true;
|
||||
bool exiting = false;
|
||||
|
||||
QList<QString> UnitText
|
||||
{
|
||||
tr("B"),
|
||||
tr("KB"),
|
||||
tr("MB"),
|
||||
tr("GB"),
|
||||
tr("TB"),
|
||||
tr("PB")
|
||||
tr("B"),
|
||||
tr("KB"),
|
||||
tr("MB"),
|
||||
tr("GB"),
|
||||
tr("TB"),
|
||||
tr("PB")
|
||||
};
|
||||
QList<QChar> bwUnitChar
|
||||
{
|
||||
'K',
|
||||
'M',
|
||||
'T',
|
||||
'G',
|
||||
'P'
|
||||
'K',
|
||||
'M',
|
||||
'T',
|
||||
'G',
|
||||
'P'
|
||||
};
|
||||
|
||||
QVector<QString> downloadProcessErrorString =
|
||||
@ -157,7 +154,7 @@ class MainWindow : public QMainWindow
|
||||
void populateTree();
|
||||
void populateList(QString server, uint port);
|
||||
void listServices();
|
||||
uint validateServer(QString * server);
|
||||
uint validateServer(QString server);
|
||||
void addTreeItem(QString name, QString fileSize, QString fullsize, QString type, QString date, bool isDir, QString dirName, QTreeWidgetItem *parent);
|
||||
bool scanDir(Connexion * connexion, QTreeWidgetItem *parent = NULL, QString path = "" );
|
||||
void startDownloading();
|
||||
@ -178,7 +175,7 @@ class MainWindow : public QMainWindow
|
||||
void passwordStore (QString account, QString password);
|
||||
QString passwordGet (QString account);
|
||||
|
||||
private slots:
|
||||
private slots:
|
||||
|
||||
void on_listWidget_clicked();
|
||||
|
||||
@ -222,13 +219,7 @@ class MainWindow : public QMainWindow
|
||||
|
||||
//void on_treeWidget_itemDoubleClicked(QTreeWidgetItem *item, int column);
|
||||
|
||||
void on_treeWidget_itemDoubleClicked(QTreeWidgetItem *item, int column);
|
||||
|
||||
void on_treeWidget_doubleClicked(const QModelIndex &index);
|
||||
|
||||
void on_actionPause_downloads_triggered();
|
||||
|
||||
signals:
|
||||
signals:
|
||||
void stopDownloading(QProcess *);
|
||||
void progressSignal(int);
|
||||
void speed(QString);
|
||||
|
||||
@ -407,7 +407,6 @@
|
||||
<addaction name="actionAbout"/>
|
||||
<addaction name="actionAbout_Qt"/>
|
||||
<addaction name="actionExit"/>
|
||||
<addaction name="actionPause_downloads"/>
|
||||
</widget>
|
||||
<action name="DefaultSaveFolder">
|
||||
<property name="icon">
|
||||
@ -480,20 +479,6 @@
|
||||
<string>hidden service</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionPause_downloads">
|
||||
<property name="icon">
|
||||
<iconset theme="media-playback-pause"/>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Stop/resume downloads</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Stop/resume downloading </string>
|
||||
</property>
|
||||
<property name="shortcut">
|
||||
<string>P</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
|
||||
59
tools.cpp
59
tools.cpp
@ -1,8 +1,6 @@
|
||||
#include "mainwindow.h"
|
||||
#include "tools.h"
|
||||
#include "password.h"
|
||||
#include <QTextStream>
|
||||
#include <QHostAddress>
|
||||
|
||||
using namespace std;
|
||||
|
||||
@ -55,31 +53,15 @@ QString getFileType(QString filename)
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
QString preparePath(QString path)
|
||||
{
|
||||
return path.trimmed().replace(' ', "\ ");
|
||||
}
|
||||
|
||||
int whatIpVersion(QString ipAddress)
|
||||
{
|
||||
QStringList fieldList;
|
||||
// ulong field;
|
||||
// uint i;
|
||||
uint ipversion;
|
||||
QHostAddress serverAddress;
|
||||
ulong field;
|
||||
uint i;
|
||||
|
||||
info(DEBUGMACRO, "ipVersion of server at " + ipAddress);
|
||||
|
||||
if (!serverAddress.setAddress(ipAddress))
|
||||
{
|
||||
error ("Address " + ipAddress + " is bad");
|
||||
}
|
||||
ipversion = serverAddress.protocol();
|
||||
|
||||
return (ipversion==IPV4?4:6);
|
||||
|
||||
|
||||
/*fieldList = ipAddress.split(":");
|
||||
fieldList = ipAddress.split(":");
|
||||
if (fieldList.count() == 8)
|
||||
{
|
||||
for (i=0;i<8;i++)
|
||||
@ -106,41 +88,8 @@ int whatIpVersion(QString ipAddress)
|
||||
}
|
||||
info(DEBUGMACRO, "Address is ip V4");
|
||||
return 4;
|
||||
}*/
|
||||
}
|
||||
|
||||
QHostAddress searchHosts(QString server)
|
||||
{
|
||||
QString line = "";
|
||||
QStringList hosts;
|
||||
QFile fileHandle("/etc/hosts");
|
||||
QHostAddress serverAddress;
|
||||
|
||||
info(DEBUGMACRO, "reading /etc/hosts");
|
||||
if (!fileHandle.open(QIODevice::ReadOnly))
|
||||
{
|
||||
QMessageBox::information(0,MainWindow::tr("Error"), fileHandle.errorString());
|
||||
}else
|
||||
{
|
||||
QTextStream in(&fileHandle);
|
||||
|
||||
while(!in.atEnd())
|
||||
{
|
||||
line = in.readLine();
|
||||
hosts = line.split(QRegularExpression("\\s+"));
|
||||
if (hosts.contains(server))
|
||||
{
|
||||
//if (!serverAddress.isNull()) // and serverAddress.protocol() == QAbstractSocket::IPv4Protocol)
|
||||
//{
|
||||
if (!serverAddress.setAddress(hosts.first()))
|
||||
{
|
||||
error("Error setting address " + hosts.first());
|
||||
}
|
||||
//}
|
||||
}
|
||||
}
|
||||
}
|
||||
return serverAddress;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void warning(QString message)
|
||||
|
||||
6
tools.h
6
tools.h
@ -3,10 +3,6 @@
|
||||
|
||||
#define DEBUGMACRO QString(__FILE__) + "->" + QString(Q_FUNC_INFO) + ": " + QString::number(__LINE__) + " -"
|
||||
|
||||
#define IPV4 0
|
||||
#define IPV6 1
|
||||
|
||||
#include <QHostAddress>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <array>
|
||||
@ -26,7 +22,5 @@ int whatIpVersion(QString server);
|
||||
void warning(QString message);
|
||||
void error(QString message);
|
||||
void info(QString debugHeader, QString message);
|
||||
QString preparePath(QString path);
|
||||
QHostAddress searchHosts(QString server);
|
||||
|
||||
#endif // TOOLS_H
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user