implement folder statuses for syncs

Author: virco

pdownload.c

@@ -43,6 +43,7 @@
 #include "plocalscan.h"
 #include "pupload.h"
 #include "pasyncnet.h"
+#include "ppathstatus.h"
 
 typedef struct {
   psync_list list;
@@ -270,14 +271,14 @@ static int call_func_for_folder_name(psync_folderid_t localfolderid, psync_folde
   return res;
 }
 
-static void delete_local_folder_from_db(psync_folderid_t localfolderid){
+static void delete_local_folder_from_db(psync_folderid_t localfolderid, psync_syncid_t syncid){
   psync_sql_res *res;
   psync_uint_row row;
   if (likely(localfolderid)){
-    res=psync_sql_query("SELECT id FROM localfolder WHERE localparentfolderid=?");
+    res=psync_sql_query("SELECT id, syncid FROM localfolder WHERE localparentfolderid=?");
     psync_sql_bind_uint(res, 1, localfolderid);
     while ((row=psync_sql_fetch_rowint(res)))
-      delete_local_folder_from_db(row[0]);
+      delete_local_folder_from_db(row[0], row[1]);
     psync_sql_free_result(res);
     res=psync_sql_query("SELECT id FROM localfile WHERE localparentfolderid=?");
     psync_sql_bind_uint(res, 1, localfolderid);
@@ -291,12 +292,14 @@ static void delete_local_folder_from_db(psync_folderid_t localfolderid){
     psync_sql_bind_uint(res, 1, localfolderid);
     psync_sql_run_free(res);
   }
+  psync_path_status_sync_folder_deleted(syncid, localfolderid);
 }
 
 static int task_renamefolder(psync_syncid_t newsyncid, psync_folderid_t folderid, psync_folderid_t localfolderid,
                              psync_folderid_t newlocalparentfolderid, const char *newname){
   psync_sql_res *res;
   psync_variant_row row;
+  psync_uint_row urow;
   char *oldpath, *newpath;
   psync_syncid_t oldsyncid;
   int ret;
@@ -324,6 +327,15 @@ static int task_renamefolder(psync_syncid_t newsyncid, psync_folderid_t folderid
   }
   psync_sql_start_transaction();
   psync_restart_localscan();
+  res=psync_sql_query_nolock("SELECT syncid, localparentfolderid FROM localfolder WHERE id=?");
+  psync_sql_bind_uint(res, 1, localfolderid);
+  if ((urow=psync_sql_fetch_rowint(res))) {
+    psync_path_status_sync_folder_moved(localfolderid, urow[0], urow[1], newsyncid, newlocalparentfolderid);
+    psync_sql_free_result(res);
+  } else {
+    psync_sql_free_result(res);
+    debug(D_NOTICE, "localfolderid %u not found in localfolder", (unsigned)localfolderid);
+  }
   res=psync_sql_prep_statement("UPDATE localfolder SET syncid=?, localparentfolderid=?, name=? WHERE id=?");
   psync_sql_bind_uint(res, 1, newsyncid);
   psync_sql_bind_uint(res, 2, newlocalparentfolderid);
@@ -1019,8 +1031,10 @@ static void task_run_download_file_thread(void *ptr){
     set_task_inprogress(dt->taskid, 0);
     psync_wake_download();
   }
-  else
+  else{
     delete_task(dt->taskid);
+    psync_path_status_sync_folder_task_completed(dt->dwllist.syncid, dt->localfolderid);
+  }
   free_download_task(dt);
   psync_status_recalc_to_download_async();
 }
@@ -1208,6 +1222,7 @@ static void task_del_folder_rec_do(const char *localpath, psync_folderid_t local
   psync_sql_bind_uint(res, 1, localfolderid);
   psync_sql_bind_uint(res, 2, syncid);
   psync_sql_run_free(res);
+  psync_path_status_sync_folder_deleted(syncid, localfolderid);
 }
 
 static int task_del_folder_rec(psync_folderid_t localfolderid, psync_folderid_t folderid, psync_syncid_t syncid){
@@ -1244,7 +1259,7 @@ static int download_task(uint64_t taskid, uint32_t type, psync_syncid_t syncid,
       res=call_func_for_folder_name(localitemid, itemid, name, syncid, PEVENT_LOCAL_FOLDER_DELETED, task_rmdir, 0, "local folder deleted");
       if (!res){
         psync_sql_start_transaction();
-        delete_local_folder_from_db(localitemid);
+        delete_local_folder_from_db(localitemid, syncid);
         psync_sql_commit_transaction();
       }
       break;
@@ -1292,8 +1307,10 @@ static void download_thread(){
                          psync_get_string_or_null(row[6]),
                          psync_get_number_or_null(row[7]))){
         delete_task(taskid);
-      if (type==PSYNC_DOWNLOAD_FILE)
-        psync_status_recalc_to_download_async();
+        if (type==PSYNC_DOWNLOAD_FILE){
+          psync_status_recalc_to_download_async();
+          psync_path_status_sync_folder_task_completed(psync_get_number(row[2]), psync_get_number(row[4]));
+        }
       }
       else if (type!=PSYNC_DOWNLOAD_FILE)
         psync_milisleep(PSYNC_SLEEP_ON_FAILED_DOWNLOAD);

plocalscan.c

@@ -36,6 +36,7 @@
 #include "pupload.h"
 #include "pfolder.h"
 #include "pcallbacks.h"
+#include "ppathstatus.h"
 #include <string.h>
 
 typedef struct {
@@ -374,14 +375,40 @@ static int compare_inode(const psync_list *l1, const psync_list *l2){
 
 static void scan_rename_file(sync_folderlist *rnfr, sync_folderlist *rnto){
   psync_sql_res *res;
+  psync_uint_row row;
+  psync_folderid_t old_parentfolderid;
+  psync_syncid_t old_syncid;
+  int filetoupload;
   debug(D_NOTICE, "file renamed from %s to %s", rnfr->name, rnto->name);
+  res=psync_sql_query_nolock("SELECT syncid, localparentfolderid FROM localfile WHERE id=?");
+  psync_sql_bind_uint(res, 1, rnfr->localid);
+  if ((row=psync_sql_fetch_rowint(res))) {
+    old_syncid=row[0];
+    old_parentfolderid=row[1];
+    psync_sql_free_result(res);
+    if (rnto->syncid!=old_syncid || rnto->localparentfolderid!=old_parentfolderid) {
+      res=psync_sql_query_nolock("SELECT 1 FROM task WHERE type="NTO_STR(PSYNC_UPLOAD_FILE)" AND localitemid=?");
+      psync_sql_bind_uint(res, 1, rnfr->localid);
+      filetoupload=!!psync_sql_fetch_rowint(res);
+      psync_sql_free_result(res);
+    } else {
+      filetoupload=0;
+    }
+  } else {
+    psync_sql_free_result(res);
+    return;
+  }
   res=psync_sql_prep_statement("UPDATE localfile SET localparentfolderid=?, syncid=?, name=? WHERE id=?");
   psync_sql_bind_uint(res, 1, rnto->localparentfolderid);
   psync_sql_bind_uint(res, 2, rnto->syncid);
   psync_sql_bind_string(res, 3, rnto->name);
   psync_sql_bind_uint(res, 4, rnfr->localid);
   psync_sql_run_free(res);
   psync_task_rename_remote_file(rnfr->syncid, rnto->syncid, rnfr->localid, rnto->localparentfolderid, rnto->name);
+  if (filetoupload) {
+    psync_path_status_sync_folder_task_added_locked(rnto->syncid, rnto->localparentfolderid);
+    psync_path_status_sync_folder_task_completed(old_syncid, old_parentfolderid);
+  }
 }
 
 static void scan_upload_file(sync_folderlist *fl){
@@ -406,6 +433,7 @@ static void scan_upload_file(sync_folderlist *fl){
     return;
   localfileid=psync_sql_insertid();
   psync_task_upload_file_silent(fl->syncid, localfileid, fl->name);
+  psync_path_status_sync_folder_task_added(fl->syncid, fl->localparentfolderid);
 }
 
 static void scan_upload_modified_file(sync_folderlist *fl){
@@ -420,6 +448,7 @@ static void scan_upload_modified_file(sync_folderlist *fl){
   psync_sql_bind_uint(res, 5, fl->localid);
   psync_sql_run_free(res);
   psync_task_upload_file_silent(fl->syncid, fl->localid, fl->name);
+  psync_path_status_sync_folder_task_added(fl->syncid, fl->localparentfolderid);
 }
 
 static void scan_delete_file(sync_folderlist *fl){
@@ -512,8 +541,21 @@ static void scan_created_folder(sync_folderlist *fl){
 
 static void scan_rename_folder(sync_folderlist *rnfr, sync_folderlist *rnto){
   psync_sql_res *res;
-  char *localpath;
+  psync_uint_row row;
+//  char *localpath;
   debug(D_NOTICE, "folder renamed from %s to %s", rnfr->name, rnto->name);
+  res=psync_sql_query_nolock("SELECT syncid, localparentfolderid FROM localfolder WHERE id=?");
+  psync_sql_bind_uint(res, 1, rnfr->localid);
+  if ((row=psync_sql_fetch_rowint(res))) {
+    psync_path_status_sync_folder_moved(rnfr->localid, row[0], row[1], rnto->syncid, rnto->localparentfolderid);
+    psync_sql_free_result(res);
+  } else {
+    psync_sql_free_result(res);
+    debug(D_NOTICE, "localfolderid %u not found in localfolder", (unsigned)rnfr->localid);
+    // This can prorably happen if we race with a task to delete the folder that comes from the download thread.
+    // In any case it is safe not to do anything as we are going to restart the scan anyway
+    return;
+  }
   res=psync_sql_prep_statement("UPDATE localfolder SET localparentfolderid=?, syncid=?, name=? WHERE id=?");
   psync_sql_bind_uint(res, 1, rnto->localparentfolderid);
   psync_sql_bind_uint(res, 2, rnto->syncid);
@@ -527,12 +569,14 @@ static void scan_rename_folder(sync_folderlist *rnfr, sync_folderlist *rnto){
   psync_sql_bind_uint(res, 4, rnfr->syncid);
   psync_sql_run_free(res);
   psync_task_rename_remote_folder(rnfr->syncid, rnto->syncid, rnfr->localid, rnto->localparentfolderid, rnto->name);
+/* remove the scan from here and restart the full scan once we finished with current update makes more sense when we found moved folders
+ *
   localpath=psync_local_path_for_local_folder(rnfr->localid, rnto->syncid, NULL);
   if (likely_log(localpath)){
-    //TODO: this is probably run in transaction, so it may make sense not to run scan_folder here
     scanner_scan_folder(localpath, rnfr->remoteid, rnfr->localid, rnto->syncid, rnto->synctype, rnto->deviceid);
     psync_free(localpath);
   }
+*/
 }
 
 static void delete_local_folder_rec(psync_folderid_t localfolderid){
@@ -551,6 +595,11 @@ static void delete_local_folder_rec(psync_folderid_t localfolderid){
   res=psync_sql_prep_statement("DELETE FROM localfile WHERE localparentfolderid=?");
   psync_sql_bind_uint(res, 1, localfolderid);
   psync_sql_run_free(res);
+  res=psync_sql_query("SELECT syncid FROM localfolder WHERE id=?");
+  psync_sql_bind_uint(res, 1, localfolderid);
+  if (row)
+    psync_path_status_sync_folder_deleted(row[0], localfolderid);
+  psync_sql_free_result(res);
   res=psync_sql_prep_statement("DELETE FROM localfolder WHERE id=?");
   psync_sql_bind_uint(res, 1, localfolderid);
   psync_sql_run_free(res);
@@ -612,6 +661,7 @@ static void scanner_scan(int first){
   sync_folderlist *fl;
   sync_list *l;
   psync_uint_t i, w, trn, restartsleep;
+  int movedfolders;
   if (first)
     localsleepperfolder=0;
   else{
@@ -638,6 +688,7 @@ static void scanner_scan(int first){
     psync_list_init(&scan_lists[i]);
   scanner_set_syncs_to_list(&slist);
   changes=0;
+  movedfolders=0;
   psync_list_for_each_element(l, &slist, sync_list, list)
     scanner_scan_folder(l->localpath, l->folderid, 0, l->syncid, l->synctype, l->deviceid);
   psync_list_for_each_element_call(&slist, sync_list, list, psync_free);
@@ -682,6 +733,7 @@ static void scanner_scan(int first){
         w++;
         check_for_query_cnt();
       }
+      movedfolders=1;
       psync_sql_commit_transaction();
       psync_list_init(&newtmp);
       psync_list_for_each_safe(l1, l2, &scan_lists[SCAN_LIST_NEWFOLDERS]){
@@ -741,13 +793,19 @@ static void scanner_scan(int first){
     w++;
     check_for_query_cnt();
   }
+  psync_path_status_clear_sync_path_cache();
   psync_sql_commit_transaction();
   if (w){
     psync_wake_upload();
     psync_status_recalc_to_upload_async();
   }
   for (i=0; i<SCAN_LIST_CNT; i++)
     psync_list_for_each_element_call(&scan_lists[i], sync_folderlist, list, psync_free);
+  if (movedfolders) {
+    starttime=psync_current_time;
+    restartsleep=1000;
+    goto restart;
+  }
 }
 
 static int scanner_wait(){
@@ -771,7 +829,7 @@ static int scanner_wait(){
 static void scanner_thread(){
   time_t lastscan;
   int w;
-  psync_milisleep(25);
+  psync_milisleep(1500);
   psync_wait_statuses_array(requiredstatuses, ARRAY_SIZE(requiredstatuses));
   psync_wait_status(PSTATUS_TYPE_RUN, PSTATUS_RUN_RUN|PSTATUS_RUN_PAUSE);
   scanner_scan(1);