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

Author: Ivan Stoev

plocalscan.c

@@ -638,15 +638,16 @@ static void scan_delete_folder(sync_folderlist *fl){
       psync_sql_bind_uint(res, 1, fl->syncid);
       psync_sql_bind_uint(res, 2, fl->localid);
       psync_sql_run_free(res);
-      return;
     }
-    psync_sql_commit_transaction();
-    if (tries==10)
-      psync_timer_notify_exception();
-    tries++;
-    psync_milisleep(20+tries*20);
-    psync_sql_start_transaction();
-    goto retry;
+    else{
+      psync_sql_commit_transaction();
+      if (tries==10)
+        psync_timer_notify_exception();
+      tries++;
+      psync_milisleep(20+tries*20);
+      psync_sql_start_transaction();
+      goto retry;
+    }
   }
   delete_local_folder_rec(fl->localid);
   if (folderid)

ppathstatus.c

@@ -146,9 +146,9 @@ void psync_path_status_init() {
     psync_list_add_tail(&parent_cache_lru, &parent_cache_entries[i].list_lru);
     psync_list_add_tail(&cache_free, &parent_cache_entries[i].list_hash);
   }
-  psync_tree_for_each_element_call(folder_tasks, folder_tasks_t, tree, psync_free);
+  psync_tree_for_each_element_call_safe(folder_tasks, folder_tasks_t, tree, psync_free);
   folder_tasks=PSYNC_TREE_EMPTY;
-  psync_tree_for_each_element_call(sync_data, sync_data_t, tree, sync_data_free);
+  psync_tree_for_each_element_call_safe(sync_data, sync_data_t, tree, sync_data_free);
   sync_data=PSYNC_TREE_EMPTY;
   psync_path_status_reload_syncs();
   psync_path_status_clear_path_cache();

psynclib.c

@@ -1575,8 +1575,8 @@ int psync_upload_data(psync_folderid_t folderid, const char *remote_filename, co
   return psync_upload_params(params, ARRAY_SIZE(params), data, length, fileid);
 }
 
-int psync_upload_data_as(const char *remote_path, const void *data, size_t length, psync_fileid_t *fileid){
-  binparam params[]={P_STR("auth", psync_my_auth), P_STR("path", remote_path), P_BOOL("nopartial", 1)};
+int psync_upload_data_as(const char *remote_path, const char *remote_filename, const void *data, size_t length, psync_fileid_t *fileid){
+  binparam params[]={P_STR("auth", psync_my_auth), P_STR("path", remote_path), P_STR("filename", remote_filename), P_BOOL("nopartial", 1)};
   return psync_upload_params(params, ARRAY_SIZE(params), data, length, fileid);
 }
 
@@ -1630,13 +1630,13 @@ int psync_upload_file(psync_folderid_t folderid, const char *remote_filename, co
   return ret;
 }
 
-int psync_upload_file_as(const char *remote_path, const char *local_path, psync_fileid_t *fileid){
+int psync_upload_file_as(const char *remote_path, const char *remote_filename, const char *local_path, psync_fileid_t *fileid){
   char *data;
   size_t length;
   int ret;
   if (psync_load_file(local_path, &data, &length))
     return -2;
-  ret=psync_upload_data_as(remote_path, data, length, fileid);
+  ret=psync_upload_data_as(remote_path, remote_filename, data, length, fileid);
   psync_free(data);
   return ret;
 }

psynclib.h

@@ -934,9 +934,9 @@ void psync_run_new_version(psync_new_version_t *ver);
  */
 
 int psync_upload_data(psync_folderid_t folderid, const char *remote_filename, const void *data, size_t length, psync_fileid_t *fileid);
-int psync_upload_data_as(const char *remote_path, const void *data, size_t length, psync_fileid_t *fileid);
+int psync_upload_data_as(const char *remote_path, const char *remote_filename, const void *data, size_t length, psync_fileid_t *fileid);
 int psync_upload_file(psync_folderid_t folderid, const char *remote_filename, const char *local_path, psync_fileid_t *fileid);
-int psync_upload_file_as(const char *remote_path, const char *local_path, psync_fileid_t *fileid);
+int psync_upload_file_as(const char *remote_path, const char *remote_filename, const char *local_path, psync_fileid_t *fileid);
 
 /* Filesystem functions.
  *

ptimer.c

@@ -1,7 +1,7 @@
 /* Copyright (c) 2013-2014 Anton Titov.
  * Copyright (c) 2013-2014 pCloud Ltd.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
@@ -12,7 +12,7 @@
  *     * Neither the name of pCloud Ltd nor the
  *       names of its contributors may be used to endorse or promote products
  *       derived from this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -36,7 +36,7 @@
  * (it is log TIMER_ARRAY_SIZE(timer_seconds_after_now)). So servicing a timer is
  * generally constant time task with a maximum constant of TIMER_LEVELS and increasing
  * TIMER_ARRAY_SIZE will trade memory for less processing for each timer.
- * 
+ *
  * TIMER_ARRAY_SIZE should be a power of two.
  */
 
@@ -139,7 +139,7 @@ static void timer_thread(){
     pthread_mutex_unlock(&timer_mutex);
     if (unlikely(!psync_list_isempty(&timers)))
       timer_process_timers(&timers);
-    if (unlikely(psync_current_time-lt>=20))
+    if (unlikely(psync_current_time-lt>=25))
       timer_sleep_detected(lt);
     else if (unlikely_log(psync_current_time==lt)){
       if (!psync_do_run)