Support multiple accounts on linux

src/account-mgr.cpp

@@ -413,6 +413,8 @@ int AccountManager::resyncAccount(const Account& account)
 
 #if defined(Q_OS_WIN32)
     setAccountSyncRoot(updated_account);
+#elif defined(Q_OS_LINUX)
+    setAccountDisplayName(updated_account);
 #endif
 
     SeafileRpcClient *rpc_client = gui->rpcClient(updated_account.domainID());
@@ -631,6 +633,10 @@ void AccountManager::addAccountToDaemon(const Account& account)
         gui->fileProviderManager()->registerDomain(added_account);
         gui->fileProviderManager()->askUserToEnable();
     }
+#elif defined(Q_OS_LINUX)
+    if (added_account.isValid()) {
+        setAccountDisplayName(added_account);
+    }
 #endif
 
 #ifndef Q_OS_MAC
@@ -852,6 +858,26 @@ void AccountManager::setAccountSyncRoot(Account &account)
 }
 #endif
 
+#if defined(Q_OS_LINUX)
+void AccountManager::setAccountDisplayName(Account &account)
+{
+    QString name = account.accountInfo.name;
+    if (name.isEmpty()) {
+        name = account.username;
+    }
+    QString displayName = name + "(" + account.serverUrl.host() + ")";
+    account.displayName = displayName;
+
+    QMutexLocker locker(&accounts_mutex_);
+    for (size_t i = 0; i < accounts_.size(); i++) {
+        if (accounts_.at(i) == account) {
+            accounts_[i].displayName = displayName;
+            break;
+        }
+    }
+}
+#endif
+
 void AccountManager::reloginAccount(const Account &account)
 {
     if (account.isShibboleth) {

src/account-mgr.h

@@ -129,6 +129,9 @@ private slots:
     const QString getOldSyncRootDir(const Account& account);
     const QString genSyncRootName(const Account& account);
     void setAccountSyncRoot(Account &account);
+#endif
+#if defined(Q_OS_LINUX)
+    void setAccountDisplayName(Account &account);
 #endif
     static bool loadAccountsCB(struct sqlite3_stmt *stmt, void *data);
     static bool loadServerInfoCB(struct sqlite3_stmt *stmt, void *data);

src/account.h

@@ -26,6 +26,8 @@ class Account {
     QString token;
 #if defined(Q_OS_WIN32)
     QString syncRoot;
+#elif defined (Q_OS_LINUX)
+    QString displayName;
 #endif
     qint64 lastVisited;
     bool isShibboleth;
@@ -68,6 +70,8 @@ class Account {
         token(rhs.token),
 #if defined(Q_OS_WIN32)
         syncRoot(rhs.syncRoot),
+#elif defined(Q_OS_LINUX)
+        displayName(rhs.displayName),
 #endif
         lastVisited(rhs.lastVisited),
         isShibboleth(rhs.isShibboleth),
@@ -87,6 +91,8 @@ class Account {
         token = rhs.token;
 #if defined(Q_OS_WIN32)
         syncRoot = rhs.syncRoot;
+#elif defined(Q_OS_LINUX)
+        displayName = rhs.displayName;
 #endif
         lastVisited = rhs.lastVisited;
         isShibboleth = rhs.isShibboleth;

src/daemon-mgr.cpp

@@ -176,6 +176,21 @@ QStringList DaemonManager::collectSeaDriveArgs()
     args << sync_root_path;
 #endif
 
+#if defined(Q_OS_LINUX)
+      args << "-f";
+
+      QString fuse_opts = qgetenv("SEADRIVE_FUSE_OPTS");
+      if (fuse_opts.isEmpty()) {
+          QStringList umount_arguments;
+          umount_arguments << "-u" << gui->seadriveRoot();
+          QProcess::execute("fusermount", umount_arguments);
+          QString mount_dir = gui->seadriveRoot();
+          args << mount_dir;
+      } else {
+          args << fuse_opts.split(" ");
+      }
+#endif
+
     auto stream = qWarning() << "starting seadrive daemon:" << kSeadriveExecutable;
     foreach (const QString& arg, args) {
         stream << arg;

src/rpc/rpc-client.cpp

@@ -619,6 +619,33 @@ bool SeafileRpcClient::addAccount(const Account& account)
 
     return true;
 }
+#elif defined(Q_OS_LINUX)
+bool SeafileRpcClient::addAccount(const Account& account)
+{
+    GError *error = NULL;
+    QString serverAddr = account.serverUrl.toEncoded().data();
+    if (serverAddr.endsWith("/")) {
+        serverAddr = serverAddr.left(serverAddr.size() - 1);
+    }
+
+    searpc_client_call__int(seadrive_rpc_client_, "seafile_add_account", &error,
+                            6,
+                            "string", toCStr(serverAddr),
+                            "string", toCStr(account.username),
+                            "string", toCStr(account.accountInfo.name),
+                            "string", toCStr(account.token),
+                            "string", toCStr(account.displayName),
+                            "int", account.isPro() ? 1 : 0);
+    if (error) {
+        qWarning() << "Unable to add account" << account << ":"
+                   << (error->message ? error->message : "");
+        g_error_free(error);
+        return false;
+    }
+    qWarning() << "Add account" << account;
+
+    return true;
+}
 #endif
 
 bool SeafileRpcClient::deleteAccount(const Account& account, bool remove_cache)

src/seadrive-gui.cpp

@@ -482,6 +482,17 @@ void SeadriveGui::start()
 
     RemoteWipeService::instance()->start();
     AccountInfoService::instance()->start();
+#elif defined(Q_OS_LINUX)
+    settings_mgr_->loadProxySettings();
+    settings_mgr_->applyProxySettings();
+
+    loginAccounts();
+
+    connect(daemon_mgr_, SIGNAL(daemonStarted()),
+            this, SLOT(onDaemonStarted()));
+    connect(daemon_mgr_, SIGNAL(daemonRestarted()),
+            this, SLOT(onDaemonRestarted()));
+    daemon_mgr_->startSeadriveDaemon();
 #endif
 }
 
@@ -543,7 +554,7 @@ void SeadriveGui::onDaemonStarted()
         message_poller->start();
         message_pollers_.insert(EMPTY_DOMAIN_ID, message_poller);
     }
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_LINUX)
     rpc_client->connectDaemon();
 #endif
 
@@ -800,6 +811,22 @@ bool SeadriveGui::initLog()
     }
 #endif
 
+  // On linux we must unmount the mount point dir before trying to create it,
+  // otherwise checkdir_with_mkdir would think it doesn't exist and try to
+  // create it, but the creation operation would fail.
+#if defined(Q_OS_LINUX)
+      QStringList umount_arguments;
+      umount_arguments << "-u" << seadriveRoot();
+      QProcess::execute("fusermount", umount_arguments);
+#endif
+
+#if defined(Q_OS_LINUX)
+  if (checkdir_with_mkdir(toCStr(seadriveRoot())) < 0) {
+      errorAndExit(tr("Failed to initialize: failed to create seadrive mount folder"));
+      return false;
+  }
+#endif
+
     if (applet_log_init(toCStr(seadrive_dir.absolutePath())) < 0) {
         errorAndExit(tr("Failed to initialize log: %1").arg(g_strerror(errno)));
         return false;
@@ -1023,6 +1050,11 @@ QString SeadriveGui::seadriveRoot() const
 {
     return seadrive_root_;
 }
+#elif defined(Q_OS_LINUX)
+QString SeadriveGui::seadriveRoot() const
+{
+    return QDir::home().absoluteFilePath(getBrand());
+}
 #endif
 
 QString SeadriveGui::getUniqueClientId()

src/seadrive-gui.h

@@ -67,7 +67,7 @@ class SeadriveGui : public QObject {
 
     void migrateOldConfig(const QString& data_dir);
 
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_LINUX)
     QString seadriveRoot() const;
 #endif
 
@@ -107,6 +107,7 @@ private slots:
     void onDaemonStarted();
     void onDaemonRestarted();
     void onDaemonRestarted(const QString& domain_id);
+
     void connectDaemon();
 
 private:

src/ui/search-dialog.cpp

@@ -519,6 +519,9 @@ void SearchItemsTableView::openDirectory(bool open_file)
 #endif
 #ifdef Q_OS_WIN32
     QString root = search_model_->account_.syncRoot;
+#endif
+#ifdef Q_OS_LINUX
+    QString root = gui->seadriveRoot();
 #endif
     if (root.isEmpty()) {
         qWarning() << "failed to get root path";
@@ -561,6 +564,9 @@ void SearchItemsTableView::onItemDoubleClick(const QModelIndex& index)
 #endif
 #ifdef Q_OS_WIN32
     QString root = search_model_->account_.syncRoot;
+#endif
+#ifdef Q_OS_LINUX
+    QString root = gui->seadriveRoot();
 #endif
     if (root.isEmpty()) {
         qWarning() << "failed to get root path";

src/ui/transfer-progress-dialog.cpp

@@ -189,7 +189,7 @@ TransferItemsTableModel::TransferItemsTableModel(QObject* parent)
 
 }
 
-#if defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN32) || defined(Q_OS_LINUX)
 void TransferItemsTableModel::setTransferItems()
 {
     TransferProgress transfer_progress;

src/ui/tray-icon.cpp

@@ -709,12 +709,14 @@ void SeafileTrayIcon::deleteAccount()
     }
 #endif
 
+#ifndef Q_OS_LINUX
     if (rpc_client && rpc_client->isAccountUploading(account)) {
         gui->warningBox(tr("There are changes being uploaded under the account, please try again later"));
         return;
     }
+#endif
 
-#ifdef Q_OS_WIN32
+#if defined(Q_OS_WIN32) || defined(Q_OS_LINUX)
     QString question = tr("Are you sure to remove account from \"%1\"?").arg(account.serverUrl.toString());
 #else
     QString question = tr("Are you sure to remove account from \"%1\"? After removing account, you can still find downloaded files at ~/Library/CloudStorage.").arg(account.serverUrl.toString());
@@ -739,11 +741,13 @@ void SeafileTrayIcon::resyncAccount()
         return;
     }
 
+#ifndef Q_OS_LINUX
     bool is_uploading = rpc_client->isAccountUploading (account);
     if (is_uploading) {
         gui->warningBox (tr("There are changes being uploaded under the account, please try again later"));
         return;
     }
+#endif
 
     QString question = tr("The account will be synced to a new sync root folder. Are you sure to resync account from \"%1\"?").arg(account.serverUrl.toString());