Fixed a bug on destroying Gimmick

[creaImageIO.git] / src2 / creaImageIOGimmick.cpp

diff --git a/src2/creaImageIOGimmick.cpp b/src2/creaImageIOGimmick.cpp
index e38db81ff628e90f987f3ef3296925a079665bf7..2ed5b0c72f115c9e4bbdb593b93e67cf57220c58 100644 (file)
--- a/src2/creaImageIOGimmick.cpp
+++ b/src2/creaImageIOGimmick.cpp
@@ -1,7 +1,6 @@
 #include <creaImageIOGimmick.h>
 
 #include <creaImageIOSystem.h>
-
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 
@@ -14,6 +13,8 @@ namespace creaImageIO
     : mImageAdder(0)
   {    
     RegisterGimmickMessageTypes();
+       mSettings=0;
+       mSynchronizer=0;
   }
   //==============================================================
 
@@ -22,7 +23,15 @@ namespace creaImageIO
   //==============================================================
   Gimmick::~Gimmick()
   {
-    
+        if(mSettings!=0)
+         {
+         mSettings->writeSettingsFile();
+      delete mSettings;
+         }
+         if(mSynchronizer!=0)
+         {
+         delete mSynchronizer;
+         }
   }
   //==============================================================
   
@@ -37,12 +46,18 @@ namespace creaImageIO
     mCurrentDirectory =  GetHomeDirectory();
        mSynchronizer= new Synchronizer(GetUserSettingsDirectory());
 
+       mSettings  = new Settings(mCurrentDirectory);
+       
+
        std::string dbpath = GetLocalDatabasePath();
     // Create or open local database
        mLocalDatabase = createDB(i_nameDB, mCurrentDirectory + "\\.gimmick\\localdatabase_Descriptor.txt", dbpath);
     // Add it to the TreeHandlerMap
     mTreeHandlerMap[i_nameDB] = mLocalDatabase;
     
+       //Add additional DB from user Settings
+       addDBSettings();
+
        // Creates files and directories database
     mTimestampDatabase = new TimestampDatabaseHandler(GetTimestampDatabasePath());
     // Create or open local database
@@ -87,6 +102,7 @@ namespace creaImageIO
                {
                        mTreeHandlerMap[i_name] = new SQLiteTreeHandler(i_location);
                        mTreeHandlerMap[i_name]->Open(true);
+                       mSettings->addDB(i_location);
                }
        }
 
@@ -277,6 +293,7 @@ namespace creaImageIO
   {
     GimmickMessage(2,"Adding files to '"<<d<<"'"<<std::endl);
  
+       mImageAdder.SetCurrentDatabase(d);
     mImageAdder.SetTreeHandler(GetTreeHandler(d));
        mImageAdder.SetTimestampHandler(mTimestampDatabase);
        mImageAdder.SetSynchronizer(mSynchronizer);
@@ -294,6 +311,7 @@ namespace creaImageIO
                   <<recurse<<std::endl);
 
        TreeHandler * handler=GetTreeHandler(d);
+       mImageAdder.SetCurrentDatabase(d);
     mImageAdder.SetTreeHandler(handler);
        mImageAdder.SetTimestampHandler(mTimestampDatabase);
        mImageAdder.SetSynchronizer(mSynchronizer);
@@ -306,17 +324,31 @@ namespace creaImageIO
   void Gimmick::RemoveFile(const std::string& d, 
                           tree::Node* node)
   {
+         mImageAdder.SetCurrentDatabase(d);
          mImageAdder.SetSynchronizer(mSynchronizer);
-         mTimestampDatabase->RemoveNode("PATH",node);
+         mTimestampDatabase->RemoveNode("PATH",node,d);
          mImageAdder.RemoveFile(node);
   }
   //========================================================================
 
   //========================================================================
  
-  std::string Gimmick::Synchronize(bool repair, bool checkAttributes)
+  void Gimmick::CopyFiles(const std::vector<std::string>& filenames, const std::string& d )
+  {
+         TreeHandler * handler=GetTreeHandler(d);
+         mImageAdder.SetCurrentDatabase(d);
+         mImageAdder.SetTreeHandler(handler);
+         mImageAdder.SetTimestampHandler(mTimestampDatabase);
+         mImageAdder.SetSynchronizer(mSynchronizer);
+         mImageAdder.CopyFiles(filenames, mSettings->getValue(SETTINGS_COPY_PATH));
+  }
+
+  //========================================================================
+ 
+  std::string Gimmick::Synchronize(const std::string& d, bool repair, bool checkAttributes)
   {
-         TreeHandler * handler=GetTreeHandler("Local database");
+         TreeHandler * handler=GetTreeHandler(d);
+         mImageAdder.SetCurrentDatabase(d);
          mImageAdder.SetTreeHandler(handler);
          mImageAdder.SetTimestampHandler(mTimestampDatabase);
          mImageAdder.SetSynchronizer(mSynchronizer);
@@ -330,6 +362,38 @@ namespace creaImageIO
     GetTreeHandler(d)->GetTree().Print();
   }
   //========================================================================
+  /////////////////////////////////////////////////////////////////////////
+  // add DB from Settings file                                                                              //
+  // @param : -                                                                                                                         //
+  // return : -                                                                                                                         //
+  /////////////////////////////////////////////////////////////////////////
+  void Gimmick::addDBSettings()
+  {
 
+        std::string pathSettings = mSettings->getValue(SETTINGS_DBPATH);
+        
+        // split to find all paths
+        std::vector<std::string> paths;
+        std::string separator = ";";
+        std::string::size_type last_pos = pathSettings.find_first_not_of(separator);
+        //find first separator
+        std::string::size_type pos = pathSettings.find_first_of(separator, last_pos);
+        while(std::string::npos != pos || std::string::npos != last_pos)
+        {
+               paths.push_back(pathSettings.substr(last_pos, pos - last_pos));
+               last_pos = pathSettings.find_first_not_of(separator, pos);
+               pos = pathSettings.find_first_of(separator, last_pos);
+        }
+
+        std::vector<std::string>::iterator it_path = paths.begin();
+        for(; it_path != paths.end(); ++it_path)
+        {
+                pos = it_path->find_last_of("\\");
+                last_pos = it_path->find_last_of(".");
+                std::string name = it_path->substr(pos +1, last_pos -pos-1 );
+                addDB(name, it_path->c_str());
+        }
 
+  }
+       
 }