X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOTreeHandlerImageAdder.h;h=53cff0b7b325d8ec8ac4fe1dc688014e7b4bc651;hb=595926ac27740a8822b6de9579e2e148c59f469c;hp=48158530e295d3ae626cc0b1ffc25d7fc43a65c2;hpb=f2585049438c3630362b07e6029ddb0130a03818;p=creaImageIO.git

diff --git a/src2/creaImageIOTreeHandlerImageAdder.h b/src2/creaImageIOTreeHandlerImageAdder.h
index 4815853..53cff0b 100644
--- a/src2/creaImageIOTreeHandlerImageAdder.h
+++ b/src2/creaImageIOTreeHandlerImageAdder.h
@@ -2,9 +2,12 @@
 #define __creaImageIOTreeHandlerImageAdder_h_INCLUDED__
 
 #include <creaImageIOTreeHandler.h>
+#include <creaImageIOTimestampDatabaseHandler.h>
+#include <creaImageIOSynchron.h>
 #include <creaImageIOImageReader.h>
 #include <wx/wx.h>
 #include <wx/progdlg.h>
+#include <creaWx.h>
 // Signal/slot mechanism for progress events
 #include <boost/signal.hpp>
 #include <boost/bind.hpp>
@@ -21,6 +24,7 @@ namespace creaImageIO
 
   class TreeHandlerImageAdder
   {
+	  
   public:
     //====================================================================
     /// Ctor
@@ -29,6 +33,12 @@ namespace creaImageIO
     ~TreeHandlerImageAdder();
     /// Sets the TreeHandler
     void SetTreeHandler(TreeHandler* tree) { mTreeHandler = tree;}
+	/// Sets the TimestampDatabaseHandler
+    void SetTimestampHandler(TimestampDatabaseHandler* tdh) { mTimestampHandler = tdh;}
+	/// Sets the synchronizer
+	void SetSynchronizer(Synchronizer* s){mSynchronizer=s;}
+	/// Sets the synchronizer
+	void SetCurrentDatabase(std::string cur){mCurrentDB=cur;}
     //====================================================================
 
     //====================================================================
@@ -98,33 +108,85 @@ namespace creaImageIO
     void AddFiles( const std::vector<std::string>& filename );
     /// (Recursively) adds the files of a directory to the TreeHandler 
     void AddDirectory( const std::string& directory, 
-		       bool recurse );
+		       bool recurse);
+	/// Removes a file from the databases
+	void RemoveFile(tree::Node* node);
+	/// Removes files from the databases
+	void RemoveFiles(const std::vector<tree::Node*>& nodes);
+	/// Synchronizes the DB and disk by repeating the operations the user has done and returns a report
+	std::string Synchronize(bool repair, bool checkAttributes);
+	///Recursively checks if the directory is synchronized and optionally the state of the attributes
+	void CheckSyncDirectory(const std::string &dirpath, 
+							bool recursive, 
+							bool repair,
+							bool checkAttributes,
+							std::vector<std::string> &i_ignorefiles,
+							std::vector<std::string> & attsModified,
+							std::vector<std::string> & newfiles);
+	///Copies the files indicated in the vector and updates all databases
+	void CopyFiles(const std::vector<std::string>& filenames, const std::string directory  );
+	///Finds the node that matches the specified parameters
+	void FindNode(tree::Node* parent, int level, 
+		const std::string& searchParam, 
+		const std::string& searchVal, 
+		tree::Node*& node);
+
+	///Finds the nodes that partially match the searchVal
+	void FindNodePartial(tree::Node* parent, int level, const std::string& searchParam, const std::string& searchVal, tree::Node*& node);
+ 
+	///Checks the attributes of the database against the ones in disk
+	void CheckAttributes(bool repair, std::string& file, std::vector<std::string>& attsModified);
+	///Deletes the drive with the given name (use for all databases except maintenance and timestamp)
+	void DeleteDriveFromMainDB(const std::string& drive);
+	///Deletes the drive with the given name (use for maintenance and timestamp databases)
+	void DeleteDriveFromOtherDB(const std::string& drive);
+  
+ 
     //====================================================================
 
   private:
 
     /// Adds a single file to the TreeHandler 
-    /// **WITHOUT** testing werther it is handled or not 
+    /// **WITHOUT** testing wether it is handled or not 
     /// hence you have to call IsHandledFile before using AddFile!
     void AddFile( const std::string& filename );
 
     /// Recursive method which does the main job for AddDirectory
     void AddDirectoryRecursor( const std::string& directory, 
-			       bool recurse );
-    
+			       bool recurse,
+			   const std::string &addKey);
 
     TreeHandler* mTreeHandler;
+	TimestampDatabaseHandler* mTimestampHandler;
+	Synchronizer* mSynchronizer;
     ImageReader mReader;
+	std::string mCurrentDB;
     
     Progress mProgress;
     ProgressSignalType mProgressSignal;
+
+
   };
   // EO class TreeHandlerImageAdder
   //=======================================================================
 
 
+ 
+
+
 } // EO namespace creaImageIO
 
+#include <iostream>
+inline std::ostream& operator << ( std::ostream& o, 
+			    const creaImageIO::TreeHandlerImageAdder::Progress& p)
+{
+  o << p.GetNumberScannedFiles() << " files - "
+    << p.GetNumberScannedDirs() << " dirs - "
+    << p.GetNumberHandledFiles() << " handled -"
+    << p.GetNumberAddedFiles() << " added";
+  return o;
+}
+
 // EOF
 #endif