Merge branch 'master' of gitlab.pcloud.com:pcloud/synclib

Author: Ivan Stoev

Makefile

@@ -37,7 +37,7 @@ endif
 OBJ=pcompat.o psynclib.o plocks.o plibs.o pcallbacks.o pdiff.o pstatus.o papi.o ptimer.o pupload.o pdownload.o pfolder.o\
      psyncer.o ptasks.o psettings.o pnetlibs.o pcache.o pscanner.o plist.o plocalscan.o plocalnotify.o pp2p.o\
      pcrypto.o pssl.o pfileops.o ptree.o ppassword.o prunratelimit.o pmemlock.o pnotifications.o pexternalstatus.o publiclinks.o\
-     pbusinessaccount.o pcontacts.o poverlay.o poverlay_lin.o poverlay_mac.o poverlay_win.o pcompression.o pasyncnet.o
+     pbusinessaccount.o pcontacts.o poverlay.o poverlay_lin.o poverlay_mac.o poverlay_win.o pcompression.o pasyncnet.o ppathstatus.o
 
 OBJFS=pfs.o ppagecache.o pfsfolder.o pfstasks.o pfsupload.o pintervaltree.o pfsxattr.o pcloudcrypto.o pfscrypto.o pcrc32c.o pfsstatic.o plocks.o
 

pdiff.c

@@ -48,6 +48,7 @@
 #include "publiclinks.h"
 #include "pcontacts.h"
 #include "pcloudcrypto.h"
+#include "ppathstatus.h"
 #include <ctype.h>
 
 
@@ -170,7 +171,7 @@ static psync_socket *get_connected_socket(){
   auth=user=pass=NULL;
   psync_is_business = 0;
   int digest = 1;
-  while (1){    
+  while (1){
     psync_free(auth);
     psync_free(user);
     psync_free(pass);
@@ -255,7 +256,7 @@ static psync_socket *get_connected_socket(){
         digest = 0;
         continue;
       }
-        
+
       else
         psync_milisleep(PSYNC_SLEEP_BEFORE_RECONNECT);
       continue;
@@ -632,6 +633,7 @@ static void process_modifyfolder(const binresult *entry){
     psync_sql_bind_uint(res, 1, mtime);
     psync_sql_bind_uint(res, 2, parentfolderid);
     psync_sql_run_free(res);
+    psync_path_status_folder_moved(folderid, oldparentfolderid, parentfolderid);
   }
   /* We should check if oldparentfolderid is in downloadlist, not folderid. If parentfolderid is not in and
    * folderid is in, it means that folder that is a "root" of a syncid is modified, we do not care about that.
@@ -745,6 +747,7 @@ static void process_deletefolder(const binresult *entry){
   }
   meta=psync_find_result(entry, "metadata", PARAM_HASH);
   folderid=psync_find_result(meta, "folderid", PARAM_NUM)->num;
+  psync_path_status_folder_deleted(folderid);
   if (psync_is_folder_in_downloadlist(folderid)){
     psync_del_folder_from_downloadlist(folderid);
     res=psync_sql_query("SELECT syncid, localfolderid FROM syncedfolder WHERE folderid=?");
@@ -1966,6 +1969,7 @@ static uint64_t process_entries(const binresult *entries, uint64_t newdiffid){
   psync_set_uint_value("usedquota", used_quota);
   //update_ba_emails();
   //update_ba_teams();
+  psync_path_status_clear_path_cache();
   psync_sql_commit_transaction();
   psync_diff_unlock();
   if (needdownload){

pfstasks.c

@@ -35,6 +35,7 @@
 #include "pfolder.h"
 #include "pfs.h"
 #include "pcloudcrypto.h"
+#include "ppathstatus.h"
 #include <string.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -386,6 +387,8 @@ int psync_fstask_mkdir(psync_fsfolderid_t folderid, const char *name, uint32_t f
   psync_fstask_release_folder_tasks_locked(folder);
   if (!depend)
     psync_fsupload_wake();
+  if (folderid>=0)
+    psync_path_status_drive_folder_changed(folderid);
   return 0;
 }
 
@@ -609,6 +612,8 @@ psync_fstask_creat_t *psync_fstask_add_creat(psync_fstask_folder_t *folder, cons
   memcpy(task->name, name, len);
   psync_fstask_insert_into_tree(&folder->creats, offsetof(psync_fstask_creat_t, name), &task->tree);
   folder->taskscnt+=2;
+  if (folder->folderid>=0)
+    psync_path_status_drive_folder_changed(folder->folderid);
   return task;
 }
 
@@ -667,6 +672,8 @@ psync_fstask_creat_t *psync_fstask_add_modified_file(psync_fstask_folder_t *fold
   task->fileid=-(psync_fsfileid_t)taskid;
   memcpy(task->name, name, len);
   psync_fstask_insert_into_tree(&folder->creats, offsetof(psync_fstask_creat_t, name), &task->tree);
+  if (folder->folderid>=0)
+    psync_path_status_drive_folder_changed(folder->folderid);
   folder->taskscnt+=2;
   return task;
 }
@@ -1007,6 +1014,8 @@ int psync_fstask_rename_file(psync_fsfileid_t fileid, psync_fsfolderid_t parentf
   psync_fsupload_wake();
   if (fileid>0 && parentfolderid>=0)
     add_history_record(fileid, parentfolderid, name);
+  if (folder->folderid>=0)
+    psync_path_status_drive_folder_changed(folder->folderid);
   return 0;
 }
 
@@ -1173,6 +1182,8 @@ int psync_fstask_rename_folder(psync_fsfolderid_t folderid, psync_fsfolderid_t p
   folder->taskscnt+=2;
   psync_fstask_release_folder_tasks_locked(folder);
   psync_fsupload_wake();
+  if (to_folderid>=0)
+    psync_path_status_drive_folder_changed(to_folderid);
   return 0;
 }
 
@@ -1189,13 +1200,16 @@ static int folder_cmp(const psync_tree *t1, const psync_tree *t2){
 void psync_fstask_folder_created(psync_folderid_t parentfolderid, uint64_t taskid, psync_folderid_t folderid, const char *name){
   psync_fstask_folder_t *folder;
   psync_fstask_mkdir_t *mk;
+  int pchg;
+  pchg=0;
   folder=psync_fstask_get_folder_tasks_locked(parentfolderid);
   if (folder){
     mk=psync_fstask_find_mkdir(folder, name, taskid);
     if (mk){
       psync_tree_del(&folder->mkdirs, &mk->tree);
       psync_free(mk);
       folder->taskscnt--;
+      pchg=1;
     }
     psync_fstask_release_folder_tasks_locked(folder);
   }
@@ -1230,7 +1244,10 @@ void psync_fstask_folder_created(psync_folderid_t parentfolderid, uint64_t taski
     folder->folderid=folderid;
     psync_tree_add(&folders, &folder->tree, folder_cmp);
     psync_fstask_release_folder_tasks_locked(folder);
+    psync_path_status_drive_folder_changed(folderid);
   }
+  if (pchg)
+    psync_path_status_drive_folder_changed(parentfolderid);
 }
 
 void psync_fstask_folder_deleted(psync_folderid_t parentfolderid, uint64_t taskid, const char *name){
@@ -1298,6 +1315,8 @@ void psync_fstask_file_created(psync_folderid_t parentfolderid, uint64_t taskid,
     else
       debug(D_NOTICE, "could not find unlink for file %s in folderid %lu", name, (unsigned long)parentfolderid);
     psync_fstask_release_folder_tasks_locked(folder);
+    if (cr)
+      psync_path_status_drive_folder_changed(parentfolderid);
   }
   else
     debug(D_NOTICE, "could not find unlink for file %s in folderid %lu", name, (unsigned long)parentfolderid);
@@ -1324,6 +1343,8 @@ void psync_fstask_file_modified(psync_folderid_t parentfolderid, uint64_t taskid
       folder->taskscnt--;
     }
     psync_fstask_release_folder_tasks_locked(folder);
+    if (cr)
+      psync_path_status_drive_folder_changed(parentfolderid);
   }
   if (!folder || !cr)
     psync_fstask_look_for_creat_in_db(parentfolderid, taskid, name, fileid);
@@ -1365,6 +1386,8 @@ void psync_fstask_file_renamed(psync_folderid_t folderid, uint64_t taskid, const
       folder->taskscnt--;
     }
     psync_fstask_release_folder_tasks_locked(folder);
+    if (cr)
+      psync_path_status_drive_folder_changed(folderid);
   }
   res=psync_sql_query("SELECT id, folderid, text1 FROM fstask WHERE id=?");
   psync_sql_bind_uint(res, 1, frtaskid);
@@ -1412,6 +1435,8 @@ void psync_fstask_folder_renamed(psync_folderid_t parentfolderid, uint64_t taski
       folder->taskscnt--;
     }
     psync_fstask_release_folder_tasks_locked(folder);
+    if (mk)
+      psync_path_status_drive_folder_changed(parentfolderid);
   }
   res=psync_sql_query("SELECT id, folderid, text1 FROM fstask WHERE id=?");
   psync_sql_bind_uint(res, 1, frtaskid);
@@ -1462,6 +1487,8 @@ static void psync_init_task_mkdir(psync_variant_row row){
   psync_fstask_insert_into_tree(&folder->mkdirs, offsetof(psync_fstask_mkdir_t, name), &task->tree);
   folder->taskscnt++;
   psync_fstask_release_folder_tasks_locked(folder);
+  if (folderid>=0)
+    psync_path_status_drive_folder_changed(folderid);
 }
 
 static void psync_init_task_rmdir(psync_variant_row row){
@@ -1518,6 +1545,8 @@ static void psync_init_task_creat(psync_variant_row row){
   psync_fstask_insert_into_tree(&folder->creats, offsetof(psync_fstask_creat_t, name), &task->tree);
   folder->taskscnt+=2;
   psync_fstask_release_folder_tasks_locked(folder);
+  if (folderid>=0)
+    psync_path_status_drive_folder_changed(folderid);
 }
 
 
@@ -1613,6 +1642,8 @@ static void psync_init_task_renfile_to(psync_variant_row row){
   folder->taskscnt+=2;
   psync_fstask_release_folder_tasks_locked(folder);
   psync_fs_rename_openfile_locked(cr->fileid, folderid, name);
+  if (folderid>=0)
+    psync_path_status_drive_folder_changed(folderid);
 }
 
 static void psync_init_task_renfolder_from(psync_variant_row row){
@@ -1665,6 +1696,8 @@ static void psync_init_task_renfolder_to(psync_variant_row row){
   psync_fstask_insert_into_tree(&folder->mkdirs, offsetof(psync_fstask_mkdir_t, name), &mk->tree);
   folder->taskscnt+=2;
   psync_fstask_release_folder_tasks_locked(folder);
+  if (folderid>=0)
+    psync_path_status_drive_folder_changed(folderid);
 }
 
 static void psync_init_task_modify(psync_variant_row row){
@@ -1695,6 +1728,8 @@ static void psync_init_task_modify(psync_variant_row row){
   memcpy(cr->name, name, len);
   psync_fstask_insert_into_tree(&folder->creats, offsetof(psync_fstask_creat_t, name), &cr->tree);
   folder->taskscnt+=2;
+  if (folder->folderid>=0)
+    psync_path_status_drive_folder_changed(folder->folderid);
   psync_fstask_release_folder_tasks_locked(folder);
 }
 

pfsupload.c

@@ -40,6 +40,7 @@
 #include "pupload.h"
 #include "pfscrypto.h"
 #include "pcache.h"
+#include "ppathstatus.h"
 #include <string.h>
 
 typedef struct {
@@ -390,7 +391,7 @@ static int save_meta(const binresult *meta, psync_folderid_t folderid, const cha
     return -1;
   }
   psync_sql_commit_transaction();
-  debug(D_NOTICE, "file %lu/%s uploaded (mtime=%lu, size=%lu)", (unsigned long)folderid, name, 
+  debug(D_NOTICE, "file %lu/%s uploaded (mtime=%lu, size=%lu)", (unsigned long)folderid, name,
     (unsigned long)psync_find_result(meta, "modified", PARAM_NUM)->num,
     (unsigned long)psync_find_result(meta, "size", PARAM_NUM)->num);
   psync_status_recalc_to_upload_async();