Merge pull request #734 from haiwen/fix-transfer-percentage-update

fix repo tranfer percentage updating
haiwen · Oct 16, 2015 · 96b8e97 · 96b8e97
2 parents c735ba1 + e3ef7eb
commit 96b8e97
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/scripts/install-deps-linux.sh b/scripts/install-deps-linux.sh
@@ -40,7 +40,7 @@ sudo apt-get update -qq
 sudo apt-get install -y valac uuid-dev libevent-dev re2c libjansson-dev cmake cmake-data libqt4-dev
 
 if [ ! -z "$USE_QT5" ]; then
-    sudo add-apt-repository -y ppa:beineri/opt-qt541
+    sudo add-apt-repository -y ppa:beineri/opt-qt542
     sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
     sudo apt-get update -qq
     sudo apt-get install -y gcc-4.8 g++-4.8

diff --git a/src/rpc/local-repo.h b/src/rpc/local-repo.h
@@ -39,6 +39,8 @@ class LocalRepo {
     SyncState sync_state;
     QString sync_state_str;
     QString sync_error_str;
+    int transfer_percentage;
+    int transfer_rate;
 
     LocalRepo()
         : encrypted(false),
@@ -61,7 +63,9 @@ class LocalRepo {
             && auto_sync == rhs.auto_sync
             && sync_state == rhs.sync_state
             && sync_state_str == rhs.sync_state_str
-            && sync_error_str == rhs.sync_error_str;
+            && sync_error_str == rhs.sync_error_str
+            && transfer_rate == rhs.transfer_rate
+            && transfer_percentage == rhs.transfer_percentage;
     }
 
     bool operator!=(const LocalRepo& rhs) const {

diff --git a/src/rpc/rpc-client.cpp b/src/rpc/rpc-client.cpp
@@ -364,6 +364,10 @@ void SeafileRpcClient::getSyncStatus(LocalRepo &repo)
     repo.setSyncInfo(state,
                      g_strcmp0(state, "error") == 0 ? err : NULL);
 
+    if (repo.sync_state == LocalRepo::SYNC_STATE_ING) {
+        getRepoTransferInfo(repo.id, &repo.transfer_rate, &repo.transfer_percentage);
+    }
+
     g_free (state);
     g_free (err);
     g_object_unref(task);
@@ -868,7 +872,7 @@ int SeafileRpcClient::markFileLockState(const QString &repo_id,
     return 0;
 }
 
-int SeafileRpcClient::generateMagicAndRandomKey(int enc_version, 
+int SeafileRpcClient::generateMagicAndRandomKey(int enc_version,
                                                 const QString &repo_id,
                                                 const QString &passwd,
                                                 QString *magic,

diff --git a/src/ui/repo-tree-model.cpp b/src/ui/repo-tree-model.cpp
@@ -331,6 +331,9 @@ void RepoTreeModel::refreshRepoItem(RepoItem *item, void *data)
     LocalRepo local_repo;
     seafApplet->rpcClient()->getLocalRepo(item->repo().id, &local_repo);
     if (local_repo != item->localRepo()) {
+        // if (local_repo.isValid()) {
+        //     printf("local repo of %s changed\n", local_repo.name.toUtf8().data());
+        // }
         item->setLocalRepo(local_repo);
         QModelIndex index = indexFromItem(item);
         emit dataChanged(index,index);