latest

Author: Ivan Stoev

pCloudCC/pclsync_lib.cpp

@@ -124,18 +124,25 @@ void event_handler(psync_eventtype_t event, psync_eventdata_t eventdata){
     std::cout <<"event" << event << std::endl;
 }
 
-static void  lib_setup_cripto(){ 
-  if (psync_crypto_issetup())
-    std::cout << "crypto is setup, login result=" << psync_crypto_start(clib::pclsync_lib::get_lib().get_crypto_pass().c_str()) << std::endl;
-  else{
+static int lib_setup_cripto(){ 
+  int ret = 0;
+  ret = psync_crypto_issetup();
+  if (ret) {
+    ret = psync_crypto_start(clib::pclsync_lib::get_lib().get_crypto_pass().c_str());
+    std::cout << "crypto is setup, login result=" << ret << std::endl;
+  } else {
     std::cout << "crypto is not setup" << std::endl;
-    if (psync_crypto_setup(clib::pclsync_lib::get_lib().get_crypto_pass().c_str(), "no hint"))
+    ret = psync_crypto_setup(clib::pclsync_lib::get_lib().get_crypto_pass().c_str(), "no hint");
+    if (ret)
       std::cout << "crypto setup failed" << std::endl;
     else{
-      std::cout << "crypto setup successful, start=" << psync_crypto_start(clib::pclsync_lib::get_lib().get_crypto_pass().c_str()) << std::endl;
-      std::cout << "creating folder=" << psync_crypto_mkdir(0, "Crypto", NULL, NULL) << std::endl;
+      ret = psync_crypto_start(clib::pclsync_lib::get_lib().get_crypto_pass().c_str());
+      std::cout << "crypto setup successful, start=" << ret << std::endl;
+      ret =  psync_crypto_mkdir(0, "Crypto", NULL, NULL) ;
+      std::cout << "creating folder=" << ret << std::endl;
     }
   }
+  return ret;
   clib::pclsync_lib::get_lib().crypto_on_ = true;
 }
 
@@ -204,7 +211,7 @@ static void status_change(pstatus_t* status) {
 int clib::pclsync_lib::statrt_crypto (const char* pass, void * rep) {
   std::cout << "calling startcrypto pass: "<<pass << std::endl;
   get_lib().crypto_pass_ = pass;
-  lib_setup_cripto();
+  return lib_setup_cripto();
 }
 int clib::pclsync_lib::stop_crypto (const char* path, void * rep) {
   psync_crypto_stop();
@@ -227,18 +234,22 @@ int clib::pclsync_lib::init()//std::string& username, std::string& password, std
   psync_set_software_string(software_string.append(client_name).c_str());
   if (setup_crypto_ && crypto_pass_.empty() )
     return 3;
-  was_init_ = true;
+ 
 
   if (psync_init()){
     std::cout <<"init failed\n"; 
     return 1;
   }
 
+   was_init_ = true;
    if (!get_mount().empty())
     psync_set_string_setting("fsroot",get_mount().c_str());
 
 // _tunnel  = psync_ssl_tunnel_start("127.0.0.1", 9443, "62.210.116.50", 443);
+   
 
+  int isfsautostart = psync_get_bool_setting("autostartfs");
+
   psync_start_sync(status_change, event_handler);
   char * username_old = psync_get_username();
 
@@ -260,6 +271,27 @@ int clib::pclsync_lib::init()//std::string& username, std::string& password, std
   return 0;
 }
 
+int clib::pclsync_lib::login(const char* user, const char* pass, int save) {
+  set_username(user);
+  set_password(pass);
+  set_savepass(bool(save));
+  psync_set_user_pass(user,pass, save);
+  return 0;
+}
+
+int clib::pclsync_lib::logout () {
+  set_password("");
+  psync_logout();
+  return 0;
+}
+
+int clib::pclsync_lib::unlink () {
+  set_username("");
+  set_password("");
+  psync_unlink();
+  return 0;
+}
+
 clib::pclsync_lib::pclsync_lib() : status_(new pstatus_struct_() ), was_init_(false), setup_crypto_(false)
 {}
 

pCloudCC/pclsync_lib.h

@@ -70,20 +70,24 @@ namespace console_client {
       //Singelton
       static pclsync_lib& get_lib();
       char * get_token();
+      int logout();
+      int unlink();
+      int login(const char* user, const char* pass, int save);
 
       bool crypto_on_;
       bool save_pass_;
       bool setup_crypto_;
       pstatus_struct_* status_;
       bool newuser_;
       status_callback_t status_callback_;
+      bool was_init_;
 
     private:
       std::string username_;
       std::string password_;
       std::string crypto_pass_;
       std::string mount_;
-      bool was_init_; 
+       
       bool to_set_mount_;
       bool daemon_;
 

pCloudCC/pclsync_lib_c.cpp

@@ -8,11 +8,10 @@ extern "C" {
 #endif
  namespace cc = console_client::clibrary;
 
-int init(const char* user, const char* pass, int save) {
-  cc::pclsync_lib::get_lib().set_username(user);
-  cc::pclsync_lib::get_lib().set_password(pass);
-  cc::pclsync_lib::get_lib().set_savepass((bool)save);
-  return cc::pclsync_lib::get_lib().init();
+int init() {
+  if (!cc::pclsync_lib::get_lib().was_init_)
+    return cc::pclsync_lib::get_lib().init();
+  else return 0;
 }
 
  int statrt_crypto (const char* pass) {
@@ -24,14 +23,28 @@ int init(const char* user, const char* pass, int save) {
  int finalize () { 
   cc::pclsync_lib::finalize(NULL, NULL);
 }
-void set_status_callback(status_callback_t c)
-{
+void set_status_callback(status_callback_t c) {
   cc::pclsync_lib::get_lib().set_status_callback(c);
 }
 
 char * get_token(){
   return cc::pclsync_lib::get_lib().get_token();
 }
+
+
+int login(const char* user, const char* pass, int save) {
+  return cc::pclsync_lib::get_lib().login(user, pass, save);
+}
+
+int logout() {
+  return cc::pclsync_lib::get_lib().logout();
+}
+
+int unlinklib() {
+  return cc::pclsync_lib::get_lib().unlink();
+}
+  
+
  #ifdef __cplusplus
 }
 #endif

pCloudCC/pclsync_lib_c.h

@@ -5,21 +5,19 @@ extern "C" {
 
   #include "psynclib.h"
 
-  psync_syncid_t psync_add_sync_by_path(const char *localpath, const char *remotepath, psync_synctype_t synctype);
-  psync_syncid_t psync_add_sync_by_folderid(const char *localpath, psync_folderid_t folderid, psync_synctype_t synctype);
-  int psync_add_sync_by_path_delayed(const char *localpath, const char *remotepath, psync_synctype_t synctype);
-  int psync_change_synctype(psync_syncid_t syncid, psync_synctype_t synctype);
-  int psync_delete_sync(psync_syncid_t syncid);
-  psync_folder_list_t *psync_get_sync_list();
+  void psync_fs_pause_until_login();
 
   typedef void (*status_callback_t)(int status,  const char * stat_string); 
 
-  int init(const char* user, const char* pass, int save);
+  int init();
   int statrt_crypto (const char* pass);
   int stop_crypto ();
   int finalize ();
   char * get_token();
   void set_status_callback(status_callback_t); 
+  int logout();
+  int unlinklib();
+  int login(const char* user, const char* pass, int save);
 
 #ifdef __cplusplus
 };