From d52a0663e5dac1b380825b07937a995864e75a9d Mon Sep 17 00:00:00 2001
From: Daniel Tartavel <dtux@free.fr>
Date: Sat, 11 Feb 2023 01:14:14 +0100
Subject: [PATCH] - added verification of already downloaded files

---
 RsyncUI.pro.user                 |   2 +-
 RsyncUI_fr_FR.ts                 |  82 +++++++++++++++----------------
 languages/fr_FR/RsyncUI_fr_FR.qm | Bin 13980 -> 14403 bytes
 mainwindow.cpp                   |  43 +++++++++++-----
 4 files changed, 72 insertions(+), 55 deletions(-)

diff --git a/RsyncUI.pro.user b/RsyncUI.pro.user
index 7d89b0c..508660c 100644
--- 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-10T23:24:32. -->
+<!-- Written by QtCreator 4.14.2, 2023-02-11T01:13:28. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/RsyncUI_fr_FR.ts b/RsyncUI_fr_FR.ts
index 3cef1ea..722a54d 100644
--- a/RsyncUI_fr_FR.ts
+++ b/RsyncUI_fr_FR.ts
@@ -168,27 +168,27 @@
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="86"/>
+        <location filename="mainwindow.cpp" line="90"/>
         <source>KB</source>
         <translation>Ko</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="86"/>
+        <location filename="mainwindow.cpp" line="90"/>
         <source>MB</source>
         <translation>Mo</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="86"/>
+        <location filename="mainwindow.cpp" line="90"/>
         <source>GB</source>
         <translation>Go</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="86"/>
+        <location filename="mainwindow.cpp" line="90"/>
         <source>TB</source>
         <translation>To</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="86"/>
+        <location filename="mainwindow.cpp" line="90"/>
         <source>PB</source>
         <translation>Po</translation>
     </message>
@@ -217,95 +217,93 @@ Cliquez sur un fichier pour l&apos;ajouter dans la file de téléchargement</tra
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="92"/>
+        <location filename="mainwindow.cpp" line="97"/>
         <source>A list of interrupted downloads exists, do you want to continue downloading ? if not the list will be cleared</source>
         <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="393"/>
+        <location filename="mainwindow.cpp" line="138"/>
+        <source>Clicking Save button, You can save the list of downloads
+</source>
+        <translation>Vous pouvez enregistrer la liste des téléchargements en cliquant sur &quot;enregister&quot;
+</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="143"/>
+        <source>Exiting will stop downloading, and will clear the download queue.
+Do you want to exit ?</source>
+        <translation>Si vous sortez, les téléchargements seront arrêter.
+Voulez-vous vraiment sortir ?</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="425"/>
         <source>server does not exists</source>
         <translation>Le serveur n&apos;existe pas</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="421"/>
-        <location filename="mainwindow.cpp" line="441"/>
+        <location filename="mainwindow.cpp" line="452"/>
+        <location filename="mainwindow.cpp" line="472"/>
         <source>Dir</source>
         <translation>dossier</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="424"/>
-        <location filename="mainwindow.cpp" line="487"/>
+        <location filename="mainwindow.cpp" line="456"/>
+        <location filename="mainwindow.cpp" line="553"/>
         <source>File</source>
         <translation>Doc</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="561"/>
+        <location filename="mainwindow.cpp" line="534"/>
+        <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="615"/>
         <source>Rsync process crashed</source>
         <translation>Le processus rsync à planté</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="699"/>
+        <location filename="mainwindow.cpp" line="770"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="700"/>
+        <location filename="mainwindow.cpp" line="771"/>
         <source>Licence</source>
         <translation>License</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="701"/>
+        <location filename="mainwindow.cpp" line="772"/>
         <source>Author</source>
         <translation>Auteur</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="702"/>
+        <location filename="mainwindow.cpp" line="773"/>
         <source>EMail</source>
         <translation>Courriel</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="703"/>
+        <location filename="mainwindow.cpp" line="774"/>
         <source>Source code</source>
         <translation>Code source</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="725"/>
+        <location filename="mainwindow.cpp" line="797"/>
         <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="728"/>
+        <location filename="mainwindow.cpp" line="802"/>
         <source>Choose folder where to save file</source>
         <translation>Choisissez un dossier où enregistrer le document</translation>
     </message>
     <message>
-        <source>Choose directory to save file</source>
-        <translation type="vanished">Choisissez le dossier où enregistrer</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="620"/>
+        <location filename="mainwindow.cpp" line="688"/>
         <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>
-        <source>A list of interrupted downloads exists, do you want to continue downloading ? or you can delete the list</source>
-        <translation type="vanished">Voulez-vous reprendre les téléchargements interrompus la fois précédente? ou vous pouvez supprimer la liste</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="vanished">Supprimer</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="135"/>
-        <source>Exiting will stop downloading, and will clear the download queue.
-You can save the list of downloads
-Do you want to exit ?</source>
-        <translatorcomment>i</translatorcomment>
-        <translation>Si vous sortez, les téléchargements seront arrêter, mais vous pouvez enregistrer la liste pour la prochaine fois.
-Voulez-vous vraiment sortir ?</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="632"/>
+        <location filename="mainwindow.cpp" line="702"/>
         <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>
diff --git a/languages/fr_FR/RsyncUI_fr_FR.qm b/languages/fr_FR/RsyncUI_fr_FR.qm
index ff2cc562d645165496e479ef92a0b77c15faf2e9..829bc007402634da6d43e975440aa7b0dd039d4e 100644
GIT binary patch
delta 989
zcmX|9ZD?C%6n>K2d-KsI*M22!+GcOkc9GacyUlj~u!SfNYA9|U>O|{qdT-LyyJSn!
z)+#ijA_x{8x6Tb)(4kCmZmbiAA8d0@s8#1SQBYwHWN4vI=dTUM=936=dGB-1d%m9Y
zo-@Dmi(RjU%FhAPBGBw2{zF^`$o0gRhza5~;`2b;QJ}kv@)N*=cA&lk(mCq>cOj3x
z2eh<9o}42lA-^rtKLPoa0f-d*ef>bZ3!C?z0hHe{*mnbHeAaelItPqL9<`5rJOZqD
z+s|g+VSzX8KeVp_nr7|S&wNP&TODB+6G-1Ue!4Kk#6LQIDQ0;8f%N!+8NjncdgVw8
zs2P_IZDRrdS?Pqw2h{x`o&NSo5*?Q97Z@MCW6v#rIanvp&z}Z@hvefn()aC>Pbyb{
zwGqYHy&tfbmF-_QkoM=wW6K4=`?B)l_a}hZE#-0#vp4oDtJ+P#_PTQ8Y0}@=>+}>u
zKu9=KpRj7I*E!Zp>}Yj<HonR();iCBRIy)nNwFDNbGDYqZHHY~SBHSxUvS+_GRIv@
z?v5p5_xtX3ZgOhdZGC6+ms^81fmb(>(y5xXi<1d=)~ueVTW4Qw>%s`&I9L0rt;kk>
zt^MjPA1Tjz>)z-G?p*XP3^5JKFZ*YJu72;&3+p+VDes>rIZ4&)z53y1K6KcZ3Q=!7
z;`?h$CtKR6MmNzvoL09q&EZ}I6KZD7b-w(py7Qo$4j0v8h?8jutIwpDnP^d6POy*^
zSFb(H!W%MK;O>16RyM5x$KbKw>>1T+ZL75o1~%DrD;bDxH;{wCC`@Fr8xzo|mv~d8
zTp&hJ@hI@0p+}K6gIWY0t|ym==brn_?C4Y3Tt*CQlZHr5luG$rx3K1#JFFhH@z`Mf
zMahl>RxDsR;_z61H?&yM=9ujfYio1DI?i=kLekoy22`V(UqHtS#&OAdsHsU_K^&qQ
zvque<D~vAj<d7%7NpjJM0s}lrM62va$@9Oi(v(IqR@Ez!#VU7=l7Tcojn<X_`xt&8
zYZ@Y36q;EuG<{m=`Kg?l*K|XVi~I9pIzQ1PrnFp1l=7lrR4gJ}5(8q}m?83}F4C3w
WsjO*=lp%D(G)jhEeF1li)&4IXYw^$k

delta 706
zcmW+zTS!z<6kYeuJ@?*u-ki~KoY5JdS!&j(s6Q#qk6|%kA4ZW=V~mdCV{%B$z=4uL
zGAphbrJ_BcK%#JpD8<Z-N_(h%We^cWKZDYPC=hAa*V^Ztz1Cjq?5Clj=JU=-2oS~r
z>ruk*gaZIG6Rr|^fJ8sxNx)$T^0KI|0e0~~TsDLSI$L*w1#eN`X|VQw!uw!X8DJj+
zn+^cZd00!zh}(yXfmuNOipr8Tz!KqBj<*1j)F-^}p%2*B#=oh*K?4T)KeNwBctVpV
z6H$1jdB5Z(1Lc|z;d&YnFC4tq1?Ub7y?1H>eWNg?GXWc7!p!SKWNaVfmx!0u&upa>
zBK`s^O#jz6$T|$q0mE(9JJ|==I@!?B3?fKMU=KJ-VhXXx;tG&?MwId{1AIi>KW_nC
zIpTr2Ho({;cE6hfHV4HoZc1YDh%x^<z+DvAI$D5&5lI(z0?9p6?ISX@X+#PZ6Q*@b
zlZ`Plk|QnNqxTfAEaY?nl26|538>dOb3_@Jzs0=3#+bamo20h7wHYr6bIsZ<TC!$e
z))u*Glsuws^8X~NLw6!fOG!GVPdryhR;TrKGA++_Rv%j=UizrPG3*003x)|UOno~I
zFGo$Zj9<pMOJzX5!#M0ET?#d4?SdW|H;v1~1@yU})N<Zxw?s{=Rhbm6NXafGtFE_7
zRRS&7Hm0`n)?{;*GUp+>kgxo%COP*)15m_iNUurVqp6Jk;OmuWwdJG0b56C`7Etn#
zie~uHfG}0<YK?hEZV0V7hBi7k(Mu{qRJY;?g8%zk5TLs{x*?8w#a6*}s-JBh)n&<0
MGn4j4@7mRrzesqh3;+NC

diff --git a/mainwindow.cpp b/mainwindow.cpp
index d5e67cf..e5a1d8b 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -507,11 +507,42 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
     QTreeWidgetItem * itemR;
     QString path;
     QString str;
+    QMessageBox::StandardButton reply;
 
     itemR = item;
 
     // assembling path from treewidget
     path = item->text(0);
+
+    // exists saving path in settings ?
+    str = "Folder/" + this->connexion.server + "/" + this->connexion.service;
+    if(!this->settings.contains(str))
+    {
+        // saving path do not exists, asking for it
+        if(!on_DefaultSaveFolder_triggered())
+        {
+            cout << "no directory selectioned, ignoring download request";
+            return;
+        }
+    }
+
+    if (QFile::exists(this->downloading.savePath + "/" + path))
+    {
+        reply = QMessageBox::question(
+                this,
+                "RsyncUI",
+                tr("File is already downloaded. Do you want to reload it ? The old file will be deleted"),
+                QMessageBox::Yes|QMessageBox::No,
+                QMessageBox::No);
+
+        if (reply == QMessageBox::No)
+        {
+            return;
+        }else
+        {
+            QFile::remove(this->downloading.savePath + "/" + path);
+        }
+    }
     while(itemR->parent() != NULL)
     {
         itemR = itemR->parent();
@@ -524,18 +555,6 @@ void MainWindow::on_treeWidget_itemClicked(QTreeWidgetItem *item, bool downloadD
         // Item is a file
         if(ui->listDownload->findItems(path, Qt::MatchStartsWith).empty())
         {
-            // exists saving path in settings ?
-            str = "Folder/" + this->connexion.server + "/" + this->downloading.service;
-            if(!this->settings.contains(str))
-            {
-                // saving path do not exists, asking for it
-                if(!on_DefaultSaveFolder_triggered())
-                {
-                    cout << "no directory selectioned, ignoring download request";
-                    return;
-                }
-            }
-
             // is there a downloading process ?
             if (this->downloading.process == nullptr)
             {