[buteo-sync-plugins-social] Split backup plugins. Contributes to JB#4…

…8784 Split Dropbox and OneDrive plugins into separate plugins for each of the backup, backup-query and backup-restore features.
sailfishos · Mar 30, 2020 · cfb7407 · cfb7407
1 parent 569df6c
commit cfb7407
Show file tree

Hide file tree

Showing 65 changed files with 2,714 additions and 1,686 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ Makefile
 *.qm
 *.moc
 *.obj
+*.pro.*
 /RPMS/
 *.list
 *-client

diff --git a/rpm/sociald.spec b/rpm/sociald.spec
@@ -431,17 +431,29 @@ Requires: %{name} = %{version}-%{release}
 %files onedrive-backup
 #out-of-process-plugin form:
 /usr/lib/buteo-plugins-qt5/oopp/onedrive-backup-client
+/usr/lib/buteo-plugins-qt5/oopp/onedrive-backupquery-client
+/usr/lib/buteo-plugins-qt5/oopp/onedrive-backuprestore-client
 #in-process-plugin form:
 #/usr/lib/buteo-plugins-qt5/libonedrive-backup-client.so
+#/usr/lib/buteo-plugins-qt5/libonedrive-backupquery-client.so
+#/usr/lib/buteo-plugins-qt5/libonedrive-backuprestore-client.so
 %config %{_sysconfdir}/buteo/profiles/client/onedrive-backup.xml
+%config %{_sysconfdir}/buteo/profiles/client/onedrive-backupquery.xml
+%config %{_sysconfdir}/buteo/profiles/client/onedrive-backuprestore.xml
 %config %{_sysconfdir}/buteo/profiles/sync/onedrive.Backup.xml
+%config %{_sysconfdir}/buteo/profiles/sync/onedrive.BackupQuery.xml
+%config %{_sysconfdir}/buteo/profiles/sync/onedrive.BackupRestore.xml
 
 %pre onedrive-backup
 USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n")
 for user in $USERS; do
     USERHOME=$(getent passwd ${user} | cut -d ":" -f 6)
     rm -f ${USERHOME}/.cache/msyncd/sync/client/onedrive-backup.xml || :
+    rm -f ${USERHOME}/.cache/msyncd/sync/client/onedrive-backupquery.xml || :
+    rm -f ${USERHOME}/.cache/msyncd/sync/client/onedrive-backuprestore.xml || :
     rm -f ${USERHOME}/.cache/msyncd/sync/onedrive.Backup.xml || :
+    rm -f ${USERHOME}/.cache/msyncd/sync/onedrive.BackupQuery.xml || :
+    rm -f ${USERHOME}/.cache/msyncd/sync/onedrive.BackupRestore.xml || :
 done
 
 %post onedrive-backup
@@ -460,17 +472,29 @@ Requires: %{name} = %{version}-%{release}
 %files dropbox-backup
 #out-of-process-plugin form:
 /usr/lib/buteo-plugins-qt5/oopp/dropbox-backup-client
+/usr/lib/buteo-plugins-qt5/oopp/dropbox-backupquery-client
+/usr/lib/buteo-plugins-qt5/oopp/dropbox-backuprestore-client
 #in-process-plugin form:
 #/usr/lib/buteo-plugins-qt5/libdropbox-backup-client.so
+#/usr/lib/buteo-plugins-qt5/libdropbox-backupquery-client.so
+#/usr/lib/buteo-plugins-qt5/libdropbox-backuprestore-client.so
 %config %{_sysconfdir}/buteo/profiles/client/dropbox-backup.xml
+%config %{_sysconfdir}/buteo/profiles/client/dropbox-backupquery.xml
+%config %{_sysconfdir}/buteo/profiles/client/dropbox-backuprestore.xml
 %config %{_sysconfdir}/buteo/profiles/sync/dropbox.Backup.xml
+%config %{_sysconfdir}/buteo/profiles/sync/dropbox.BackupQuery.xml
+%config %{_sysconfdir}/buteo/profiles/sync/dropbox.BackupRestore.xml
 
 %pre dropbox-backup
 USERS=$(getent group users | cut -d ":" -f 4 | tr "," "\n")
 for user in $USERS; do
     USERHOME=$(getent passwd ${user} | cut -d ":" -f 6)
     rm -f ${USERHOME}/.cache/msyncd/sync/client/dropbox-backup.xml || :
+    rm -f ${USERHOME}/.cache/msyncd/sync/client/dropbox-backupquery.xml || :
+    rm -f ${USERHOME}/.cache/msyncd/sync/client/dropbox-backuprestore.xml || :
     rm -f ${USERHOME}/.cache/msyncd/sync/dropbox.Backup.xml || :
+    rm -f ${USERHOME}/.cache/msyncd/sync/dropbox.BackupQuery.xml || :
+    rm -f ${USERHOME}/.cache/msyncd/sync/dropbox.BackupRestore.xml || :
 done
 
 %post dropbox-backup

diff --git a/src/common/backuprestoreoptions.cpp b/src/common/backuprestoreoptions.cpp
@@ -42,20 +42,6 @@ bool BackupRestoreOptions::copyToProfile(Buteo::SyncProfile *syncProfile)
         return false;
     }
 
-    QString operationValue;
-    switch (operation) {
-    case DirectoryListing:
-        operationValue = "dir-listing";
-        break;
-    case Upload:
-        operationValue = "upload";
-        break;
-    case Download:
-        operationValue = "download";
-        break;
-    };
-
-    clientProfile->setKey("sfos-operation", operationValue);
     clientProfile->setKey("sfos-dir-local", localDirPath);
     clientProfile->setKey("sfos-dir-remote", remoteDirPath);
     clientProfile->setKey("sfos-filename", fileName);
@@ -77,35 +63,16 @@ BackupRestoreOptions BackupRestoreOptions::fromProfile(Buteo::SyncProfile *syncP
     }
 
     BackupRestoreOptions options;
-    QString operation = clientProfile->key("sfos-operation");
     options.localDirPath = clientProfile->key("sfos-dir-local");
     options.remoteDirPath = clientProfile->key("sfos-dir-remote");
     options.fileName = clientProfile->key("sfos-filename");
 
-    if (operation == "dir-listing") {
-        options.operation = BackupRestoreOptions::DirectoryListing;
-    } else if (operation == "upload") {
-        options.operation = BackupRestoreOptions::Upload;
-    } else if (operation == "download") {
-        options.operation = BackupRestoreOptions::Download;
-    } else {
-        qWarning() << "Backup/restore options for sync profile" << syncProfile->name()
-                   << "has invalid operation type:" << operation;
-        return BackupRestoreOptions();
-    }
-
     if (options.localDirPath.isEmpty()) {
         qWarning() << "Backup/restore options for sync profile" << syncProfile->name()
                    << "do not specify a local directory!";
         return BackupRestoreOptions();
     }
 
-    if (options.operation == BackupRestoreOptions::DirectoryListing && options.fileName.isEmpty()) {
-        qWarning() << "Backup/restore options for sync profile" << syncProfile->name()
-                   << "do not specify a file name for directory listing!";
-        return BackupRestoreOptions();
-    }
-
     if (ok) {
         *ok = true;
     }

diff --git a/src/common/backuprestoreoptions_p.h b/src/common/backuprestoreoptions_p.h
@@ -31,13 +31,6 @@ namespace Buteo {
 class BackupRestoreOptions
 {
 public:
-    enum Operation {
-        DirectoryListing,
-        Upload,
-        Download
-    };
-
-    Operation operation = DirectoryListing;
     QString localDirPath;
     QString remoteDirPath;
     QString fileName;

diff --git a/src/common/socialdnetworkaccessmanager_p.h b/src/common/socialdnetworkaccessmanager_p.h
@@ -37,4 +37,4 @@ class SocialdNetworkAccessManager : public QNetworkAccessManager
                                  QIODevice *outgoingData = 0);
 };
 
-#endif
+#endif
diff --git a/src/common/socialnetworksyncadaptor.cpp b/src/common/socialnetworksyncadaptor.cpp
@@ -56,7 +56,10 @@ namespace {
                 << QStringLiteral("Posts")
                 << QStringLiteral("Messages")
                 << QStringLiteral("Emails")
-                << QStringLiteral("Signon");
+                << QStringLiteral("Signon")
+                << QStringLiteral("Backup")
+                << QStringLiteral("BackupQuery")
+                << QStringLiteral("BackupRestore");
     }
 }
 
@@ -425,6 +428,8 @@ QString SocialNetworkSyncAdaptor::dataTypeName(SocialNetworkSyncAdaptor::DataTyp
         case SocialNetworkSyncAdaptor::Emails:        return QStringLiteral("Emails");
         case SocialNetworkSyncAdaptor::Signon:        return QStringLiteral("Signon");
         case SocialNetworkSyncAdaptor::Backup:        return QStringLiteral("Backup");
+        case SocialNetworkSyncAdaptor::BackupQuery:   return QStringLiteral("BackupQuery");
+        case SocialNetworkSyncAdaptor::BackupRestore: return QStringLiteral("BackupRestore");
         default: break;
     }
 

diff --git a/src/common/socialnetworksyncadaptor.h b/src/common/socialnetworksyncadaptor.h
@@ -74,7 +74,9 @@ class SocialNetworkSyncAdaptor : public QObject
         Messages,       // "Messages"
         Emails,         // "Emails"
         Signon,         // "Signon" -- for refreshing AccessTokens etc.
-        Backup          // "Backup" -- for storing backup/restore blobs
+        Backup,         // "Backup"
+        BackupQuery,    // "BackupQuery"
+        BackupRestore   // "BackupRestore"
     };
     static QStringList validDataTypes();
     static QString dataTypeName(DataType t);

diff --git a/src/dropbox/dropbox-backup/dropbox-backup.pro b/src/dropbox/dropbox-backup/dropbox-backup.pro
@@ -4,6 +4,7 @@ DEFINES += "CLASSNAME=DropboxBackupPlugin"
 DEFINES += CLASSNAME_H=\\\"dropboxbackupplugin.h\\\"
 include($$PWD/../../common.pri)
 include($$PWD/../dropbox-common.pri)
+include($$PWD/../dropbox-backupoperation.pri)
 include($$PWD/dropbox-backup.pri)
 
 dropbox_backup_sync_profile.path = /etc/buteo/profiles/sync

diff --git a/src/dropbox/dropbox-backup/dropboxbackupplugin.cpp b/src/dropbox/dropbox-backup/dropboxbackupplugin.cpp
@@ -1,8 +1,6 @@
 /****************************************************************************
  **
- ** Copyright (C) 2015-2019 Jolla Ltd.
- ** Copyright (C) 2019 Open Mobile Platform LLC
- ** Contact: Chris Adams <chris.adams@jolla.com>
+ ** Copyright (c) 2020 Open Mobile Platform LLC.
  **
  ** This program/library is free software; you can redistribute it and/or
  ** modify it under the terms of the GNU Lesser General Public License
@@ -51,5 +49,5 @@ DropboxBackupPlugin::~DropboxBackupPlugin()
 
 SocialNetworkSyncAdaptor *DropboxBackupPlugin::createSocialNetworkSyncAdaptor()
 {
-    return new DropboxBackupSyncAdaptor(profile().name(), this);
+    return new DropboxBackupSyncAdaptor(this);
 }
diff --git a/src/dropbox/dropbox-backup/dropboxbackupplugin.h b/src/dropbox/dropbox-backup/dropboxbackupplugin.h
@@ -1,7 +1,6 @@
 /****************************************************************************
  **
- ** Copyright (C) 2015 Jolla Ltd.
- ** Contact: Chris Adams <chris.adams@jolla.com>
+ ** Copyright (c) 2020 Open Mobile Platform LLC.
  **
  ** This program/library is free software; you can redistribute it and/or
  ** modify it under the terms of the GNU Lesser General Public License