10 changed files with 117 additions and 291 deletions
--- a/RsyncUI.pro
+++ b/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/
--- a/RsyncUI.spec
+++ b/RsyncUI.spec
@ -2,7 +2,7 @@

 Name: rsyncui
 Summary: Client for rsync server
-Version: 2.13.2
+Version: 2.12.7
 Release: %mkrel 1
 License: GPLv3
 Group: Networking/Remote access
--- a/downloadfile.cpp
+++ b/downloadfile.cpp
@ -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(" "));

--- a/main.cpp
+++ b/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();
 }
--- a/mainwindow.cpp
+++ b/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;
@ -404,7 +403,7 @@ void MainWindow::populateList(QString server, uint port)
 	{
 		if (this->connexion.ipversion == 0)
 		{
-			this->connexion.ipversion = validateServer(&server);
+			this->connexion.ipversion = validateServer(server);
 			info(DEBUGMACRO, "IP version : " + QString::number(this->connexion.ipversion));
 		}

@ -487,7 +486,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);
@ -624,12 +623,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);

@ -658,7 +654,7 @@ bool MainWindow::scanDir(Connexion * connexion, QTreeWidgetItem *parent, QString
 			user = "anonymous@";
 			env.insert("RSYNC_PASSWORD", "anonymous"); // Add an environment variable
 		}
-		param << "--contimeout=20" << "--port=" + QString::number(connexion->port) << user + "[" + server + "]::" + preparePath(path) ;
+		param << "--contimeout=20" << "--port=" + QString::number(connexion->port) << user + "[" + server + "]::" + path;

 		info(DEBUGMACRO, cmd + " " + param.join(" "));

@ -759,129 +755,102 @@ bool MainWindow::scanDir(Connexion * connexion, QTreeWidgetItem *parent, QString
 		}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 << server.trimmed() ;
+		param << "A";				// IP V4 query
+		param << server.trimmed() ;
+		param << "AAAA";				// IP V6 query
+
+		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
 	{
@ -1054,13 +1023,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;
 	}

@ -1177,20 +1144,13 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
 		if (item->isExpanded() == false)
 		{
 			info(DEBUGMACRO, "Item is not expanded");
-			//if (this->rescan)
-			//{
+			if (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)
@ -1649,66 +1609,12 @@ void MainWindow::on_actionHiddenService_triggered()

 void MainWindow::on_treeWidget_itemDoubleClicked(QTreeWidgetItem *item, int column)
 {
-	(void) item;
-	(void) column;
+	void();
 }


 void MainWindow::on_treeWidget_doubleClicked(const QModelIndex &index)
 {
-	(void) index;
+	void();
 }

-
-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;
-	}
-}
--- a/mainwindow.h
+++ b/mainwindow.h
@ -56,17 +56,16 @@ class Connexion
 	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
@ -76,15 +75,13 @@ class Downloading
 	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
@ -120,8 +117,8 @@ 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;

@ -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();
@ -226,8 +223,6 @@ class MainWindow : public QMainWindow

 		void on_treeWidget_doubleClicked(const QModelIndex &index);

-		void on_actionPause_downloads_triggered();
-
 	signals:
 		void stopDownloading(QProcess *);
 		void progressSignal(int);
--- a/mainwindow.ui
+++ b/mainwindow.ui
@ -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>
--- a/tools.cpp
+++ b/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)
--- a/tools.h
+++ b/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
--- a/version.h
+++ b/version.h
@ -3,6 +3,6 @@

 #include <QString>

-QString version = "2.13.2";
+QString version = "2.12.7";

 #endif // VERSION_H