version 2.10

added storing password in a secure way
version 2.9.2
2023-03-09 18:14:03 +01:00 · 2023-03-09 18:13:46 +01:00 · 2023-03-08 16:15:18 +01:00 · 2023-03-08 16:09:17 +01:00 · 2023-03-08 16:03:44 +01:00 · 2023-03-08 16:03:24 +01:00
14 changed files with 882 additions and 325 deletions
--- a/RsyncUI.pro
+++ b/RsyncUI.pro
@ -6,11 +6,14 @@ QT	+= KConfigCore KConfigGui
 QT	+= KCoreAddons
 QT	+= KDBusAddons

-#LIBS += -lKF5WindowSystem
+LIBS += -lqt5keychain
+
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

 CONFIG += c++11

+DEFINES += QTKEYCHAIN_NO_EXPORT
+
 # You can make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
@ -19,11 +22,13 @@ SOURCES += \
    downloadfile.cpp \
    main.cpp \
    mainwindow.cpp \
+    password.cpp \
    tools.cpp

 HEADERS += \
    downloadfile.h \
    mainwindow.h \
+    password.h \
    tools.h

 FORMS += \
@ -35,7 +40,8 @@ TRANSLATIONS += \
    RsyncUI_fr_FR.ts

 INCLUDEPATH += \
-    /usr/include/KF5
+    /usr/include/KF5 \
+    /usr/include/qt5keychain/

 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
@ -61,3 +67,4 @@ desktopfile.path = /usr/share/applications
 desktopfile.files = RsyncUI.desktop
 icon.path = /usr/share/icons/
 icon.files = RsyncUI.png
+-lqt5keychain
--- a/RsyncUI.pro.user
+++ b/RsyncUI.pro.user
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.14.2, 2023-02-13T00:55:51. -->
+<!-- Written by QtCreator 4.14.2, 2023-03-09T18:12:22. -->
 <qtcreator>
 <data>
  <variable>EnvironmentId</variable>
--- a/RsyncUI.spec
+++ b/RsyncUI.spec
@ -2,7 +2,7 @@

 Name: rsyncui
 Summary: Client for rsync server
-Version: 2.3.1
+Version: 2.10
 Release: %mkrel 1
 License: GPLv3
 Group: Networking/Remote access
--- a/RsyncUI_fr_FR.ts
+++ b/RsyncUI_fr_FR.ts
@ -66,6 +66,34 @@
        <translation>Enregistrement automatique de la file d&apos;enregistrement</translation>
    </message>
 </context>
+<context>
+    <name>LoginDialog</name>
+    <message>
+        <location filename="login.ui" line="17"/>
+        <source>RsyncUI request</source>
+        <translation>Requête RsyncUI</translation>
+    </message>
+    <message>
+        <location filename="login.ui" line="51"/>
+        <source>Login name</source>
+        <translation>Identifiant</translation>
+    </message>
+    <message>
+        <location filename="login.ui" line="79"/>
+        <source>Enter login</source>
+        <translation>Entrez votre identifiant</translation>
+    </message>
+    <message>
+        <location filename="login.ui" line="86"/>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
+    </message>
+    <message>
+        <location filename="login.ui" line="102"/>
+        <source>Enter password</source>
+        <translation>Entrez votre mot de passe</translation>
+    </message>
+</context>
 <context>
    <name>MainWindow</name>
    <message>
@ -74,141 +102,151 @@
        <translation>Fenêtre principale</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="86"/>
+        <location filename="mainwindow.ui" line="87"/>
        <source>Server</source>
        <oldsource>Serveur</oldsource>
        <translation>Serveur</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="108"/>
+        <location filename="mainwindow.ui" line="109"/>
        <source>Enter server&apos;s URL</source>
        <translation>Entrez l&apos;adresse du serveur</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="124"/>
+        <location filename="mainwindow.ui" line="125"/>
        <source>Port</source>
        <translation>Port</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="152"/>
+        <location filename="mainwindow.ui" line="153"/>
        <source>Enter rsync port on server</source>
        <translation>Entrez le port du serveur rsync</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="189"/>
+        <location filename="mainwindow.ui" line="190"/>
        <source>Press button to connect to rsync server</source>
        <extracomment>Connect to server</extracomment>
        <translation>Cliquez pour se connecter au serveur rsync</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="195"/>
+        <location filename="mainwindow.ui" line="196"/>
        <source>Connection</source>
        <translation>Connexion</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="198"/>
+        <location filename="mainwindow.ui" line="199"/>
        <source>Return</source>
        <translation>Retour</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="224"/>
+        <location filename="mainwindow.ui" line="225"/>
        <source>Click to view the list of files of this folder</source>
        <translation>Cliquez pour afficher la liste des documents</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="259"/>
+        <location filename="mainwindow.ui" line="260"/>
        <source>Click to add to download queue</source>
        <translation>Cliquez pour ajouter à la file de téléchargement</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="337"/>
+        <location filename="mainwindow.ui" line="329"/>
+        <source>Filter...</source>
+        <translation>Filtrer...</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="341"/>
        <source>Click on file to stop downloading</source>
        <translation>Cliquez sur le document pour arrêter le téléchargement et l&apos;enlever de la file</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="360"/>
+        <location filename="mainwindow.ui" line="367"/>
        <source>%p%</source>
        <extracomment>Downloading</extracomment>
        <translation>Téléchargement</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="371"/>
+        <location filename="mainwindow.ui" line="378"/>
        <source>toolBar</source>
        <translation>Barre d&apos;outils</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="444"/>
+        <location filename="mainwindow.ui" line="452"/>
        <source>Download</source>
        <translation>Télécharger</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="447"/>
+        <location filename="mainwindow.ui" line="455"/>
        <source>Click on menu button to download the entire folder</source>
        <translation>Cliquer sur le bouton droit de la souris pour télécharger le dossier entier</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="455"/>
+        <location filename="mainwindow.ui" line="464"/>
        <source>Exit</source>
        <translation>Quitter</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="458"/>
+        <location filename="mainwindow.ui" line="467"/>
        <source>Terminate the program</source>
        <translation>Terminer le programme</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="461"/>
+        <location filename="mainwindow.ui" line="470"/>
        <source>Ctrl+Q</source>
        <translation>Ctrl+Q</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="409"/>
-        <location filename="mainwindow.ui" line="412"/>
+        <location filename="mainwindow.ui" line="479"/>
+        <source>hidden service</source>
+        <translation>Service caché</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="417"/>
+        <location filename="mainwindow.ui" line="420"/>
        <source>Change save folder</source>
        <translation>Changer le dossier de destination</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="421"/>
+        <location filename="mainwindow.ui" line="429"/>
        <source>About</source>
        <translation>À propos</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="430"/>
+        <location filename="mainwindow.ui" line="438"/>
        <source>About Qt</source>
        <translation>À propos de Qt</translation>
    </message>
    <message>
-        <location filename="mainwindow.ui" line="439"/>
+        <location filename="mainwindow.ui" line="447"/>
        <source>Settings</source>
        <translation>Paramètres</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="101"/>
+        <location filename="mainwindow.h" line="123"/>
        <source>KB</source>
        <translation>Ko</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="101"/>
+        <location filename="mainwindow.h" line="124"/>
        <source>MB</source>
        <translation>Mo</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="101"/>
+        <location filename="mainwindow.h" line="125"/>
        <source>GB</source>
        <translation>Go</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="101"/>
+        <location filename="mainwindow.h" line="126"/>
        <source>TB</source>
        <translation>To</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="101"/>
+        <location filename="mainwindow.h" line="127"/>
        <source>PB</source>
        <translation>Po</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="59"/>
+        <location filename="mainwindow.cpp" line="61"/>
        <source>You click on file to enqueue it, and RyncUI Download one file a time</source>
        <oldsource>Client for rsync server&lt;br&gt;&lt;br&gt;You click on file to enqueue it, and RyncUI Download one file a time</oldsource>
        <translation>&lt;h3&gt;Utilisation&lt;/h3&gt;
@ -241,180 +279,240 @@ Cliquez sur un fichier pour le supprimer de la file et une fenêtre de confirmat
    Permet de quitter le programme</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="53"/>
-        <source>&lt;h2&gt;Client for rsync server&lt;2&gt;&lt;br&gt;&lt;br&gt;</source>
-        <translation>&lt;h2&gt;Client pour  serveur rsync&lt;2&gt;&lt;br&gt;&lt;br&gt;éaa</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="73"/>
+        <location filename="mainwindow.cpp" line="78"/>
        <source>Path</source>
        <translation>Chemin</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="73"/>
+        <location filename="mainwindow.cpp" line="78"/>
        <source>Size</source>
        <translation>Taille</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="73"/>
+        <location filename="mainwindow.cpp" line="78"/>
        <source>Type</source>
        <translation>Type</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="108"/>
+        <location filename="mainwindow.cpp" line="78"/>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="105"/>
+        <source>KB/s</source>
+        <translation>Ko/s</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="105"/>
+        <source>MB/s</source>
+        <translation>Mo/s</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="105"/>
+        <source>GB/s</source>
+        <translation>Go/s</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="105"/>
+        <source>TB/s</source>
+        <translation>To/s</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="105"/>
+        <source>PB/s</source>
+        <translation>Po/s</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="123"/>
        <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>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="136"/>
+        <location filename="mainwindow.cpp" line="152"/>
        <source>&amp;Quit</source>
        <translation>&amp;Quitter</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="193"/>
+        <location filename="mainwindow.cpp" line="209"/>
        <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="198"/>
+        <location filename="mainwindow.cpp" line="215"/>
        <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="226"/>
+        <location filename="mainwindow.cpp" line="253"/>
        <source>The program will keep running in the system tray. To terminate the program, choose &lt;b&gt;Quit&lt;/b&gt; in the context menu of the system tray entry.</source>
        <translation>Le programme continue dans la boîte à miniatures. Pour quitter le programme cliquez sur l&apos;icône &lt;b&gt;Quitter&lt;/b&gt; ou dans les menu contextuel.</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="511"/>
+        <location filename="mainwindow.cpp" line="513"/>
+        <source>The processus does&apos;nt respond: </source>
+        <translation>Le processus ne répond pas: </translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="599"/>
        <source>server does not exists</source>
        <translation>Le serveur n&apos;existe pas</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="538"/>
-        <location filename="mainwindow.cpp" line="558"/>
+        <location filename="mainwindow.cpp" line="633"/>
+        <location filename="mainwindow.cpp" line="745"/>
        <source>Dir</source>
        <translation>dossier</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="542"/>
-        <location filename="mainwindow.cpp" line="626"/>
        <source>File</source>
-        <translation>Doc</translation>
+        <translation type="vanished">Doc</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="635"/>
+        <location filename="mainwindow.cpp" line="773"/>
+        <source>File is partially downloaded. Do you want to resume download ? if no, the file will be deleted from destination directory</source>
+        <translation>Le document est déjà partiellement téléchargé. Voulez vous continuer le téléchargemnt ? Si non, il sera supprimer du dossier de destination</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="790"/>
        <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="670"/>
+        <location filename="mainwindow.cpp" line="827"/>
        <source>File is already downloading</source>
        <translation>Le document est déjà en téléchargement</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="693"/>
+        <location filename="mainwindow.cpp" line="852"/>
        <source>Starting downloading
 </source>
        <translation>Démarrage du téléchargement
 </translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="708"/>
+        <location filename="mainwindow.cpp" line="867"/>
        <source>finished</source>
        <translation>Terminé</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="716"/>
+        <location filename="mainwindow.cpp" line="877"/>
        <source>Rsync process crashed</source>
        <translation>Le processus rsync à planté</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="728"/>
+        <location filename="mainwindow.cpp" line="884"/>
        <source>stopped by user</source>
        <translation>stoppé par l&apos;utilisateur</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="732"/>
+        <location filename="mainwindow.cpp" line="895"/>
+        <source>
+Do you want to retry?</source>
+        <translation>
+Voulez-vous ré-essayer?</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="904"/>
        <source>Download </source>
        <translation>Téléchargement </translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="54"/>
+        <location filename="mainwindow.cpp" line="1257"/>
+        <source>RsyncUI Request</source>
+        <translation>Requête RsyncUI</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1258"/>
+        <source>Hidden service name</source>
+        <translation>Nom du servcice caché</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="56"/>
        <source>Version</source>
        <translation>Version</translation>
    </message>
    <message>
        <location filename="mainwindow.cpp" line="55"/>
+        <source>&lt;h2&gt;Client for rsync server&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;Client pour serveur rsync&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="57"/>
        <source>Licence</source>
        <translation>License</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="56"/>
+        <location filename="mainwindow.cpp" line="58"/>
        <source>Author</source>
        <translation>Auteur</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="57"/>
+        <location filename="mainwindow.cpp" line="59"/>
        <source>EMail</source>
        <translation>Courriel</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="58"/>
+        <location filename="mainwindow.cpp" line="60"/>
        <source>Source code</source>
        <translation>Code source</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="899"/>
+        <location filename="mainwindow.cpp" line="1073"/>
        <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>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="904"/>
+        <location filename="mainwindow.cpp" line="1078"/>
        <source>Choose folder where to save file</source>
        <translation>Choisissez un dossier où enregistrer le document</translation>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="969"/>
        <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>
    </message>
    <message>
-        <location filename="mainwindow.cpp" line="810"/>
+        <location filename="mainwindow.cpp" line="983"/>
        <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>
    </message>
    <message>
-        <location filename="mainwindow.h" line="125"/>
+        <location filename="mainwindow.h" line="122"/>
+        <source>B</source>
+        <translation>o</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.h" line="139"/>
        <source>The process failed to start. Either the invoked program is missing, or you may have insufficient permissions or resources to invoke the program.</source>
        <translation>Le processus échoué, soit le programme est manquant, soit vous n&apos;avez pas l&apos;autorisation de l&apos;exécuter.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="126"/>
+        <location filename="mainwindow.h" line="140"/>
        <source>The process crashed some time after starting successfully.</source>
        <translation>Le processus à planté après avoir démarré avec succès.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="127"/>
+        <location filename="mainwindow.h" line="141"/>
        <source>The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again.</source>
        <translation>La fonction waitFor...() a dépassé la limite de temps, you pouvez essayer de la relancer.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="128"/>
+        <location filename="mainwindow.h" line="142"/>
        <source>An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel.</source>
        <translation>Une erreur est survenue lors de l&apos;envoi des données vers le processus. Le processus est peut être arrté ou il a fermé son canal d&apos;entrée.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="129"/>
+        <location filename="mainwindow.h" line="143"/>
        <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
        <translation>Une erreur est survenue lors de la lecturee de données, le processus est probablement arrêté.</translation>
    </message>
    <message>
-        <location filename="mainwindow.h" line="130"/>
+        <location filename="mainwindow.h" line="144"/>
        <source>An unknown error occurred. This is the default return value of error().</source>
        <translation>Une erreur inconnue est survenue. C&apos;est la valeur de retour par défaut de error().</translation>
    </message>
--- a/downloadfile.cpp
+++ b/downloadfile.cpp
@ -27,7 +27,14 @@ downloadFile::downloadFile()
 //Slot activated when download is cancelled
 void MainWindow::cancelled(QProcess * process)
 {
+    bool n = 0;
+
    process->terminate();
+    n = process->waitForFinished(30000);
+    if (n == false)
+    {
+        process->close();
+    }
 }

 // launch a rsync processus downloading a file
@ -35,18 +42,26 @@ void MainWindow::download()
 {
    QString cmd;
    QStringList param;
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();

+    this->downloading.process = new QProcess(this);
+    if (!this->downloading.user.isEmpty())
+    {
+        this->downloading.server.prepend(this->connexion.user + "@");
+        env.insert("RSYNC_PASSWORD", this->downloading.password); // Add an environment variable
+        this->downloading.process->setProcessEnvironment(env);
+    }
    // Populating array with command and parameters for popen2
    cmd = "rsync";
    if (this->connexion.bandwidthLimit != 0)
    {
        param << "--bwlimit=" + QString::number(this->connexion.bandwidthLimit) + bwUnitChar[this->connexion.bandwidthLimitUnit];
    }
-    param << "--port=" + QString::number(this->connexion.port);
+    param << "--port=" + QString::number(this->downloading.port);
    param << "-aXP";
    param << this->downloading.server + "::" + this->downloading.service + "/" + this->downloading.path << this->downloading.savePath + "/";

-    this->downloading.process = new QProcess(this);
+

    connect(this->downloading.process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(downloadFinished(int, QProcess::ExitStatus)));
    //connect(this->downloading.process, SIGNAL(errorOccurred(QProcess::ProcessError error)), this, SLOT(downloadProcessError(QProcess::ProcessError error)));
@ -62,50 +77,51 @@ void MainWindow::readRsyncOutput()
    bool flag = false;
    int value;
    int pos;
+    static QString dlSpeed;
+    QStringList list;
+    static QString filename;
+    int i;
+    int listSize;

    while(!flag)
    {
+        list.clear();
        line = QString::fromUtf8(this->downloading.process->readLine());
        if (line.isEmpty())
        {
            flag = true;
            break;
-        }
-        pos = line.indexOf("%");
-        if (pos != -1)
+        }else
        {
-            line.resize(pos);
-            pos = line.lastIndexOf(' ');
+            pos = line.indexOf("%");
            if (pos != -1)
            {
-                line.remove(0, pos);
-                value = line.toInt();
-                // sending progress to Main window
-                emit progressSignal(value);
+                line = line.simplified();
+                list = line.split(" ");
+                listSize = list.count() / 4;
+                for (i = 0; i < listSize; i++)
+                {
+                    value = list.at(i *4 + 1).chopped(1).toInt();
+                    dlSpeed = list.at(i * 4 + 2);
+
+                    /*line.resize(pos);
+                    pos = line.lastIndexOf(' ');
+                    if (pos != -1)
+                    {
+                        line.remove(0, pos);
+                        value = line.toInt();*/
+                        // sending progress to Main window
+                    emit progressSignal(value);
+                    emit fileName(filename + "   %p%" + "\t " + dlSpeed);
+                }
+            }else
+            {
+                if (!line.contains("receiving"))
+                {
+                    filename = line.remove(QChar('\n'), Qt::CaseInsensitive);
+                    emit fileName(filename + "   %p%\t " + dlSpeed);
+                }
            }
        }
    }
 }
-
-/*void MainWindow::downloadProcessError(QProcess::ProcessError error)
-{
-    QMessageBox::warning(
-                this,
-                "RsyncUI",
-                downloadProcessErrorString[error].toStdString().c_str()
-            );
-}*/
-
-// process raise error
-void MainWindow::downloadProcessStderr()
-{
-    QByteArray errorLine;
-
-    errorLine = this->downloading.process->readAllStandardError();
-    QMessageBox::warning(
-                this,
-                "RsyncUI",
-                errorLine
-            );
-}
-
--- a/languages/fr_FR/LC_MESSAGES/RsyncUI_fr_FR.qm
+++ b/languages/fr_FR/LC_MESSAGES/RsyncUI_fr_FR.qm
--- a/main.cpp
+++ b/main.cpp
@ -21,7 +21,11 @@ int main(int argc, char *argv[])
          a.installTranslator(&myappTranslator);
    }

+    static const QString appName = "RsyncUI";
+
+    //Password passwdJob;
    MainWindow w;
    w.show();
+    w.init();
    return a.exec();
 }
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
--- a/mainwindow.h
+++ b/mainwindow.h
@ -7,9 +7,11 @@
 #include "ui_about.h"
 #include "downloadfile.h"
 #include "tools.h"
+#include "password.h"
 #include <QMainWindow>
 #include <string>
 #include <QTreeWidgetItem>
+#include <QList>
 #include <QListWidgetItem>
 #include <QProgressDialog>
 #include <QSettings>
@ -42,7 +44,8 @@
 #include <QDir>
 #include <QSystemTrayIcon>
 #include <QMenu>
-#include<QTranslator>
+#include <QTranslator>
+#include <QInputDialog>

 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
@ -55,10 +58,18 @@ class Connexion
    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 port = 873;
        bool comboboxChanged;
+        bool quit = false;
+        void clear();
 };

 class Downloading
@ -68,16 +79,18 @@ class Downloading
        QString service;
        QString path;
        QString savePath;
+        QString user;
+        QString password;
+        int port = 873;
        QProcess * process = nullptr;
-
+        bool quit = false;
        void clear();
 };

 class About
 {
    public:
-        QString title = "RsyncUI";
-        QString version = "2.3.1";
+        QString version = "2.10";
        QString author = "Daniel TARTAVEL-JEANNOT";
        QString licence = "GPL_V3";
        QString description;
@ -93,10 +106,10 @@ class MainWindow : public QMainWindow
        Ui::MainWindow *ui;
        MainWindow(QWidget *parent = nullptr);
        ~MainWindow();
+        // passwdManager;
        QProgressDialog *progress;
        Connexion connexion;
-        Downloading downloading;
-        //downloadFile downloadO;
+        Connexion downloading;
        QSettings settings;
        About about;
        QDialog Configuration;
@ -105,12 +118,16 @@ class MainWindow : public QMainWindow
        Ui::windowAbout AboutW;
        std::vector <QString> serversList;
        QSystemTrayIcon * trayIcon;
-        QList<QString> bwUnitText {
-            "KB",
-            "MB",
-            "TB",
-            "GB",
-            "PB"
+        QString icon = "/usr/share/icons/RsyncUI.png";
+        bool rescan = false;
+
+        QList<QString> UnitText {
+            tr("B"),
+            tr("KB"),
+            tr("MB"),
+            tr("GB"),
+            tr("TB"),
+            tr("PB")
            };
        QList<QChar> bwUnitChar{
            'K',
@ -131,14 +148,13 @@ class MainWindow : public QMainWindow
        };

        void displayTree();
-        void populateTree(QTreeWidgetItem * parent);
-        void populateList();
+        void populateTree();
+        void populateList(int);
        void listServices();
        bool validateServer(QString server);
        bool isIpAddress(QString server);
-        QTreeWidgetItem * addTreeRoot(QString name, QString description, bool isDir);
-        QTreeWidgetItem * addTreeChild(QTreeWidgetItem *parent, QString name, QString size, bool isDir);
-        void scanDir(QString server, int portN, QTreeWidgetItem *parent = NULL, QString path = "" );
+        void addTreeItem(QString name, QString fileSize, QString fullsize, QString type, QString date, bool isDir, QTreeWidgetItem *parent);
+        bool scanDir(QString server, int portN, QTreeWidgetItem *parent = NULL, QString path = "" );
        void startDownloading();
        void loadSettings();
        void saveSettings();
@ -149,6 +165,12 @@ class MainWindow : public QMainWindow
        void initSystemTrayIcon();
        void hideWindow();
        void showWindow();
+        void init();
+        bool getUserPassword(Connexion *);
+        void preparePopulateTree();
+        bool testServicePresence(QString, bool=false);
+        void passwordStore (QString account, QString password);
+        QString passwordGet (QString account);

    private slots:

@ -158,10 +180,6 @@ class MainWindow : public QMainWindow

        void downloadFinished(int exitCode, QProcess::ExitStatus exitStatus);

-//       void downloadProcessError(QProcess::ProcessError error);
-
-        void downloadProcessStderr();
-
        void readRsyncOutput();

        void stoppingDownload();
@ -196,12 +214,17 @@ class MainWindow : public QMainWindow

        void on_actionExit_triggered();

+        void setDlSpeed(QString speed);
+
+        void on_actionHiddenService_triggered();
+
 signals:
        void stopDownloading(QProcess *);
        void progressSignal(int);
+        void speed(QString);
        void finishedSignal(bool = true);
-        //void errorSignal(QString);
-
+        void fileName(QString);
+        void passwordReady();
 };

 #endif // MAINWINDOW_H
--- a/mainwindow.ui
+++ b/mainwindow.ui
@ -21,7 +21,8 @@
   <string>MainWindow</string>
  </property>
  <property name="windowIcon">
-   <iconset theme="/usr/share/icons/RsyncUI.png"/>
+   <iconset theme="/usr/share/icons/RsyncUI.png">
+    <normaloff>.</normaloff>.</iconset>
  </property>
  <property name="toolButtonStyle">
   <enum>Qt::ToolButtonTextUnderIcon</enum>
@ -274,10 +275,10 @@
            <bool>false</bool>
           </property>
           <property name="dragEnabled">
-            <bool>true</bool>
+            <bool>false</bool>
           </property>
           <property name="dragDropMode">
-            <enum>QAbstractItemView::DragOnly</enum>
+            <enum>QAbstractItemView::NoDragDrop</enum>
           </property>
           <property name="alternatingRowColors">
            <bool>true</bool>
@ -324,6 +325,9 @@
           <property name="inputMethodHints">
            <set>Qt::ImhNoAutoUppercase</set>
           </property>
+           <property name="placeholderText">
+            <string>Filter...</string>
+           </property>
          </widget>
         </item>
        </layout>
@ -356,6 +360,9 @@
      <property name="value">
       <number>0</number>
      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
      <property name="format">
       <string extracomment="Downloading">%p%</string>
      </property>
@ -395,6 +402,7 @@
    <bool>false</bool>
   </attribute>
   <addaction name="DefaultSaveFolder"/>
+   <addaction name="actionHiddenService"/>
   <addaction name="action_Settings"/>
   <addaction name="actionAbout"/>
   <addaction name="actionAbout_Qt"/>
@ -449,7 +457,8 @@
  </action>
  <action name="actionExit">
   <property name="icon">
-    <iconset theme="application-exit"/>
+    <iconset theme="application-exit">
+     <normaloff>.</normaloff>.</iconset>
   </property>
   <property name="text">
    <string>Exit</string>
@ -461,6 +470,15 @@
    <string>Ctrl+Q</string>
   </property>
  </action>
+  <action name="actionHiddenService">
+   <property name="icon">
+    <iconset theme="folder-open">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string>hidden service</string>
+   </property>
+  </action>
 </widget>
 <customwidgets>
  <customwidget>
--- a/password.cpp
+++ b/password.cpp
@ -0,0 +1,55 @@
+#include "mainwindow.h"
+#include "password.h"
+#include <qt5keychain/keychain.h>
+#include <qt5keychain/qkeychain_export.h>
+#include <QSettings>
+
+using namespace std;
+extern QApplication a;
+
+QString appName = "RsyncUI";
+
+static QSettings sett{appName, appName};
+
+void setPassword(QString account, QString pass)
+{
+    QKeychain::WritePasswordJob write(appName);
+    write.setSettings(&sett);
+   // write.setAutoDelete(false);
+    write.setKey(account);
+    write.setTextData(pass);
+
+    QEventLoop loop;
+    write.connect(&write, &QKeychain::WritePasswordJob::finished, &loop, &QEventLoop::quit);
+
+    write.start();
+    loop.exec();
+
+    if(write.error())
+        cout << "Error writing key1. Error: " << write.errorString().toStdString();
+}
+
+QString getPassword(const QString& name)
+{
+    QKeychain::ReadPasswordJob readPass(appName);
+    readPass.setSettings(&sett);
+   // readPass.setAutoDelete(false);
+    readPass.setKey(name);
+
+    QEventLoop loop;
+    readPass.connect(&readPass, &QKeychain::ReadPasswordJob::finished, &loop, &QEventLoop::quit);
+
+    readPass.start();
+    loop.exec();
+
+    if(readPass.error())
+    {
+        qDebug()<<"KeyHandler~Error reading decrypt Pass. Error: " + readPass.errorString();
+        return "";
+    }
+    else
+    {
+        QString data = readPass.textData();
+        return data;
+    }
+}
--- a/password.h
+++ b/password.h
@ -0,0 +1,35 @@
+#ifndef PASSWORD_H
+#define PASSWORD_H
+
+#include "mainwindow.h"
+#include <qt5keychain/keychain.h>
+#include <qt5keychain/qkeychain_export.h>
+
+extern QApplication a;
+
+void setPassword(QString account, QString pass);
+QString getPassword(const QString& name);
+
+/*class Password : QObject
+{
+    public:
+        QString appName;
+        QKeychain::WritePasswordJob * passwdJob;
+        QKeychain::ReadPasswordJob * readPass;
+        MainWindow * mw;
+        QString password;
+        QSettings passwdSettings{a.applicationName(),a.applicationName()};
+
+        Password();
+        ~Password();
+
+        void store(QString, QString);
+        QString read(QString);
+        bool remove(QString);
+
+    private slots:
+        void storeFinished();
+        void readFinished();
+};*/
+
+#endif // PASSWORD_H
--- a/tools.cpp
+++ b/tools.cpp
@ -6,6 +6,7 @@ using namespace std;
 #define WRITE  1

 extern QMap<int, QString> rsyncErrorStrings;
+extern QApplication a;

 //Take a string and explode it in array
 // s => string to explode
@ -44,26 +45,27 @@ const vector<string> explode(const string& s, const char& c, int n = 0)
 }

 // test return code of rsync
-bool testRsyncReturn(QProcess * myProcess)
+// return true in case of error
+bool testRsyncReturn(MainWindow * w, QProcess * myProcess)
 {
    if (myProcess->exitStatus() != 0)
    {
        QMessageBox::warning(
-                   NULL,
-                   "RsyncUI",
+                   w,
+                   a.applicationName(),
                   myProcess->errorString(),
                   QMessageBox::Ok,
                   QMessageBox::Ok);
        return true;
-    }else if (myProcess->exitCode() != 0)
-    {
-        QMessageBox::warning(
-                   NULL,
-                   "RsyncUI",
-                   rsyncErrorStrings[myProcess->exitCode()],
-                   QMessageBox::Ok,
-                   QMessageBox::Ok);
-        return true;
    }
    return false;
 }
+
+QString getFileType(QString filename)
+{
+    QMimeDatabase db;
+    QMimeType mime = db.mimeTypeForFile(filename);
+    QString returnValue = mime.name().section('/',0 ,0);
+    return returnValue;
+}
+
--- a/tools.h
+++ b/tools.h
@ -1,6 +1,7 @@
 #ifndef TOOLS_H
 #define TOOLS_H

+#include "mainwindow.h"
 #include <string>
 #include <vector>
 #include <array>
@ -8,6 +9,8 @@
 #include <QMap>
 #include <QTranslator>
 #include <QProcess>
+#include <QMimeDatabase>
+#include <QMimeType>

 using namespace std;

@ -17,7 +20,7 @@ FILE * popen2(array<string,8> argv, string type, int & pid);

 int pclose2(FILE * fp, pid_t pid);

-bool testRsyncReturn(QProcess *);
-
+bool testRsyncReturn(MainWindow *, QProcess *);
+QString getFileType(QString finename);

 #endif // TOOLS_H
Author	SHA1	Message	Date
Daniel Tartavel	1739b0adf3	version 2.10	2023-03-09 18:14:03 +01:00
Daniel Tartavel	fada0ebeb0	added storing password in a secure way	2023-03-09 18:13:46 +01:00
Daniel Tartavel	bc90ce2269	version 2.9.2	2023-03-08 16:15:18 +01:00
Daniel Tartavel	0a1aa6c4fd	code cleaning	2023-03-08 16:09:17 +01:00
Daniel Tartavel	8df2a651a3	version 2.9.1	2023-03-08 16:03:44 +01:00
Daniel Tartavel	5f5277199a	correction of password managment	2023-03-08 16:03:24 +01:00
Daniel Tartavel	63bcc965b5	added selecting user for password protected services	2023-03-05 14:18:43 +01:00
Daniel Tartavel	42a7376f58	version 2.9	2023-03-05 13:39:39 +01:00
Daniel Tartavel	83ef43fab1	testing password encryption	2023-03-05 13:39:16 +01:00
Daniel Tartavel	9d305b0b3b	added date in qtreeview\nadded retry in case of download error	2023-03-05 13:38:28 +01:00
Daniel Tartavel	711ca7d1cd	added mime filetype in qtreeview	2023-03-04 19:12:13 +01:00
Daniel Tartavel	927c4a932a	some code cleaning\nSize in treeview is now hulan readable\nbegin of password encryption	2023-03-04 17:33:18 +01:00
Daniel Tartavel	8227c76a88	version 2.8	2023-03-02 20:20:08 +01:00
Daniel Tartavel	d326e63a2f	added icon to directory in qtreeview	2023-03-02 20:19:20 +01:00
Daniel Tartavel	85dc65fc9e	version 2.7	2023-03-02 17:06:46 +01:00
Daniel Tartavel	04b46b1b86	added access to gidden services	2023-03-02 17:06:15 +01:00
Daniel Tartavel	6bfbfe1c78	version 2.6.1	2023-03-01 15:50:55 +01:00
Daniel Tartavel	7e736b524e	bug correction in making treeview	2023-03-01 15:50:37 +01:00
Daniel Tartavel	3345a65b28	version 2.6	2023-03-01 14:25:31 +01:00
Daniel Tartavel	63f7aafc68	translation	2023-03-01 14:25:06 +01:00
Daniel Tartavel	f47160622c	Added support for password protected services	2023-03-01 14:12:38 +01:00
Daniel Tartavel	e7eafb3117	added password protected connexion correction bug on detection of already downloaded file	2023-02-27 23:48:05 +01:00
Daniel Tartavel	10060ee2c4	version 2.5	2023-02-22 00:57:07 +01:00
Daniel Tartavel	e14d1539fe	Merge branch 'master' of git.labolyon.fr:dtux/RsyncUI	2023-02-22 00:53:29 +01:00
Daniel Tartavel	a8e888e20d	corrected regression: resuming downloadlist download did not start\n added downloading speed in progress bar	2023-02-22 00:52:53 +01:00
Daniel Tartavel	f3c361f155	corrected regression: resuming downloadlist download did not start\n added downloading speed in progress bar	2023-02-22 00:48:16 +01:00
Daniel Tartavel	e8743ff802	version 2.4.1	2023-02-16 21:33:53 +01:00
Daniel Tartavel	1145c74440	- resolved regression: no icon on menutray.	2023-02-16 21:28:58 +01:00
Daniel Tartavel	c42baaa2c8	changed qtcreator config	2023-02-15 14:25:21 +01:00
Daniel Tartavel	8419f8ad90	- resolved a bug in filelist: when clicking again on a directory add again files - resolved bug: at startup relaoding download do not start downloading - added downloading filename in progress bar	2023-02-15 13:49:31 +01:00
Daniel Tartavel	623ad81c6b	version 2.4	2023-02-15 13:48:38 +01:00