for Google drive added option to browse trash (--drive-trashed-only) #82

kapitainsky · Mar 2, 2020 · 9d59787 · 9d59787
1 parent ae18f36
commit 9d59787
Show file tree

Hide file tree

Showing 11 changed files with 475 additions and 256 deletions.
diff --git a/src/job_options.cpp b/src/job_options.cpp
@@ -17,7 +17,7 @@ JobOptions::JobOptions()
       dontUpdateModified(false), maxDepth(0), deleteExcluded(false),
       isFolder(false) {}
 
-const qint32 JobOptions::classVersion = 3;
+const qint32 JobOptions::classVersion = 4;
 
 JobOptions::~JobOptions() {}
 
@@ -145,8 +145,24 @@ QStringList JobOptions::getOptions() const {
     }
   }
 
-  if (DriveSharedWithMe) {
-    list << "--drive-shared-with-me";
+  // get Google Drive mode option
+  if (remoteType == "drive") {
+    if (remoteMode == "shared") {
+      list << "--drive-shared-with-me";
+    } else {
+      if (remoteMode == "trash") {
+        list << "--drive-trashed-only";
+      } else {
+        if (remoteMode == "main") {
+        } else {
+          // older tasks dont't have googleDriveMode
+          // and value from DriveSharedWithMe has to be used
+          if (DriveSharedWithMe) {
+            list << "--drive-shared-with-me";
+          }
+        }
+      }
+    }
   }
 
   list << "--stats"

diff --git a/src/job_options.h b/src/job_options.h
@@ -59,6 +59,8 @@ class JobOptions {
   bool isFolder;
   QUuid uniqueId;
   bool DriveSharedWithMe;
+  QString remoteMode;
+  QString remoteType;
 
   void setJobType(bool isDownload) {
     jobType = (isDownload) ? Download : Upload;

diff --git a/src/list_of_job_options.cpp b/src/list_of_job_options.cpp
@@ -153,7 +153,7 @@ QDataStream &operator<<(QDataStream &stream, JobOptions &jo) {
          << jo.connectTimeout << jo.idleTimeout << jo.retries
          << jo.lowLevelRetries << jo.deleteExcluded << jo.excluded << jo.extra
          << jo.DriveSharedWithMe << jo.source << jo.dest << jo.isFolder
-         << jo.uniqueId;
+         << jo.uniqueId << jo.remoteMode << jo.remoteType;
 
   return stream;
 }
@@ -184,9 +184,14 @@ QDataStream &operator>>(QDataStream &stream, JobOptions &jo) {
   // stream value
   if (actualVersion >= 2) {
     stream >> jo.isFolder;
-    if (actualVersion >= 3) {
-      stream >> jo.uniqueId;
-    }
+  }
+
+  if (actualVersion >= 3) {
+    stream >> jo.uniqueId;
+  }
+  if (actualVersion >= 4) {
+    stream >> jo.remoteMode;
+    stream >> jo.remoteType;
   }
 
   return stream;

diff --git a/src/main.cpp b/src/main.cpp
@@ -115,6 +115,18 @@ int main(int argc, char *argv[]) {
     settings->setValue("Settings/sortTask", "false");
   };
 
+  // during first run the remoteMode key might not exist
+  if (!(settings->contains("Settings/remoteMode"))) {
+    // if remoteMode does not exist create new key
+    settings->setValue("Settings/remoteMode", "main");
+  };
+
+  // during first run the remoteType key might not exist
+  if (!(settings->contains("Settings/remoteType"))) {
+    // if remoteType does not exist create new key
+    settings->setValue("Settings/remoteType", "main");
+  };
+
   // set application font size
   int fontsize = 0;
 

diff --git a/src/main_window.cpp b/src/main_window.cpp
@@ -1427,12 +1427,16 @@ void MainWindow::editSelectedTask() {
 
     JobOptions *jo = item->GetData();
     bool isDownload = (jo->jobType == JobOptions::Download);
+    QString remoteType = (jo->remoteType);
+    QString remoteMode = (jo->remoteMode);
+
     QString remote = isDownload ? jo->source : jo->dest;
     QString path = isDownload ? jo->dest : jo->source;
     // qDebug() << "remote:" + remote;
     // qDebug() << "path:" + path;
-    TransferDialog td(isDownload, false, remote, path, jo->isFolder, this, jo,
-                      true);
+
+    TransferDialog td(isDownload, false, remote, path, jo->isFolder, remoteType,
+                      remoteMode, this, jo, true);
     td.exec();
   }