fixes

Author: virco

pbusinessaccount.c

@@ -532,7 +532,7 @@ void cache_account_emails() {
   psync_sql_res *q;
 
   psync_sql_lock();
-  q=psync_sql_prep_statement("DELETE FROM baccountemail ");
+  q=psync_sql_prep_statement("DELETE FROM baccountemail");
   psync_sql_run_free(q);
 
   do_psync_account_users(userids, 0, &insert_cache_email, params);

plocalscan.c

@@ -455,12 +455,17 @@ static void scan_delete_file(sync_folderlist *fl){
   psync_sql_res *res;
   psync_uint_row row;
   psync_fileid_t fileid;
+  psync_folderid_t localparentfolderid;
+  psync_syncid_t syncid;
   debug(D_NOTICE, "file deleted %s", fl->name);
   // it is also possible to use fl->remoteid, but the file might have just been uploaded by the upload thread
-  res=psync_sql_query("SELECT fileid FROM localfile WHERE id=?");
+  res=psync_sql_query("SELECT fileid, syncid, localparentfolderid FROM localfile WHERE id=?");
   psync_sql_bind_uint(res, 1, fl->localid);
-  if (likely_log(row=psync_sql_fetch_rowint(res)))
+  if (likely_log(row=psync_sql_fetch_rowint(res))){
     fileid=row[0];
+    syncid=row[1];
+    localparentfolderid=row[2];
+  }
   else{
     psync_sql_free_result(res);
     return;
@@ -472,6 +477,7 @@ static void scan_delete_file(sync_folderlist *fl){
   psync_sql_run_free(res);
   if (fileid)
     psync_task_delete_remote_file(fl->syncid, fileid);
+  psync_path_status_sync_folder_task_completed(syncid, localparentfolderid);
 }
 
 static void scan_create_folder(sync_folderlist *fl){

pupload.c

@@ -443,21 +443,13 @@ static int check_file_if_exists(const unsigned char *hashhex, uint64_t fsize, ps
 
 static int copy_file_if_exists(const unsigned char *hashhex, uint64_t fsize, psync_folderid_t folderid, const char *name, psync_fileid_t localfileid){
   binparam params[]={P_STR("auth", psync_my_auth), P_NUM("size", fsize), P_LSTR(PSYNC_CHECKSUM, hashhex, PSYNC_HASH_DIGEST_HEXLEN)};
-  psync_socket *api;
   binresult *res;
   const binresult *metas, *meta;
   uint64_t result;
   int ret;
-  api=psync_apipool_get();
-  if (unlikely(!api))
+  res=psync_api_run_command("getfilesbychecksum", params);
+  if (!res)
     return -1;
-  res=send_command(api, "getfilesbychecksum", params);
-  if (likely(res))
-    psync_apipool_release(api);
-  else{
-    psync_apipool_release_bad(api);
-    return -1;
-  }
   result=psync_find_result(res, "result", PARAM_NUM)->num;
   if (unlikely(result)){
     psync_free(res);