Merge branch 'master' of home:dvl/backup

diff --git a/filedata.hpp b/filedata.hpp
index 629f933493bffcc733a44cfbfc5c89d2bc2bef75..8c2951b5221fe0def7443fd9b4bf786ddc1c2e84 100644 (file)
--- a/filedata.hpp
+++ b/filedata.hpp
@@ -17,9 +17,23 @@ class FileData {
               unsigned long long = 0
               );
 
-    char               getFileType() const { return filetype; }
+    char               getFileType()       const { return filetype; }
+    const std::string &getPermissions()    const { return permissions; }
+    const std::string &getUserName()       const { return username; }
+    const std::string &getGroupName()      const { return groupname; }
+    unsigned long      getFileSize()       const { return filesize; }
+    unsigned long long getModifiedDate()   const { return modified_date; }
+    const std::string &getFileName()       const { return filename; }
+    unsigned long long getLastBackupDate() const { return last_backup_date; }
 
-    const std::string &getFileName() const { return filename; }
+    void setFileType(       char               arg ) { filetype         = arg; }
+    void setPermissions(    const std::string &arg ) { permissions      = arg; }
+    void setUserName(       const std::string &arg ) { username         = arg; }
+    void setGroupName(      const std::string &arg ) { groupname        = arg; }
+    void setFileSize(       unsigned long      arg ) { filesize         = arg; }
+    void setModifiedDate(   unsigned long long arg ) { modified_date    = arg; }
+    void setFileName(       const std::string &arg ) { filename         = arg; }
+    void setLastBackupDate( unsigned long long arg ) { last_backup_date = arg; }
 
   private:
     FileData();

diff --git a/main.cc b/main.cc
index e07c7ee28c3c70fa0cb9fa1d151fda7c43a05a45..89c17429f0338f29891e8c5feb0f0cc4864d678b 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -28,6 +28,7 @@ vector<string> split( const string &line, char c, int limit = -1 ) {
   return out;
 }
 
+// Callback function for getting files from the database
 int populate_set( void *files_v, int, char **vals, char ** ) {
   file_set *files = reinterpret_cast<file_set*>( files_v );
   files->insert( new FileData( vals[0][0],
@@ -43,7 +44,7 @@ int populate_set( void *files_v, int, char **vals, char ** ) {
 int main() {
   string file_string;
 
-  file_set current_files;
+  file_set current;
 
   // Parse the list of files on stdin
   do {
@@ -56,7 +57,7 @@ int main() {
       // type perms user group size datemodified name (7 total)
       // f 0600 cnb cnb 424 20051015205340 ./.git/index
       vector<string> vals = split( file_string, ' ', 7 );
-      current_files.insert( new FileData( vals[0][0],
+      current.insert( new FileData( vals[0][0],
             vals[1],
             vals[2],
             vals[3],
@@ -77,8 +78,8 @@ int main() {
   }
 
   char *sqliteErrMsg = 0;
-  file_set previous_files;
-  rc = sqlite3_exec( db, "select * from filedata;", populate_set, &previous_files, &sqliteErrMsg );
+  file_set backed_up;
+  rc = sqlite3_exec( db, "select * from filedata;", populate_set, &backed_up, &sqliteErrMsg );
   if( SQLITE_OK != rc ) {
     cerr << "Problem with database.  Message is..." << endl;
     cerr << sqliteErrMsg << endl;
@@ -86,7 +87,60 @@ int main() {
 
   sqlite3_close( db );
 
-  for( file_set::iterator i = previous_files.begin(); i != previous_files.end(); ++i ) {
+  for( file_set::iterator i = backed_up.begin(); i != backed_up.end(); ++i ) {
     cout << (*i)->getFileName() << endl;
   }
+
+  // Now divide the two sets into three sets (new, deleted and updated )
+  FileDataPtrCmp cmp;
+
+  file_set new_set;
+  set_difference( current.begin(),  current.end(),
+                  backed_up.begin(), backed_up.end(),
+                  inserter( new_set, new_set.begin() ),
+                  cmp );
+
+  file_set deleted;
+  set_difference( backed_up.begin(), backed_up.end(),
+                  current.begin(),  current.end(),
+                  inserter( deleted, deleted.begin() ),
+                  cmp );
+
+  // backed_up should *definitely* be the first set here
+  file_set updated;
+  set_difference( backed_up.begin(), backed_up.end(),
+                  current.begin(),  current.end(),
+                  inserter( updated, updated.begin() ),
+                  cmp );
+
+  // Now find the list of files to backup.
+  file_set backup_list;
+
+  // backup all new files
+  copy( new_set.begin(), new_set.end(), inserter( backup_list, backup_list.begin() ) );
+
+  // backup all the already backed-up files that have changed since the last
+  // backup date.
+  for( file_set::iterator i = updated.begin(); i != updated.end(); ++i ) {
+    if( (*i)->getLastBackupDate() < (*i)->getModifiedDate() ) {
+      backup_list.insert( *i );
+    }
+  }
+
+  // Now, sort the backup_list by filesize and build a list of up to SIZE
+
+  //
+  // Now, sort the non-backed-up list my last_backup_date and back-fill
+
+  // Remove deleted files from the database.
+
+  // Now, use the current set to update values in the database.  You should copy
+  // last_backup_date dates from the backed_up set first.  This will get all of
+  // the latest permissions but include the last_backup_date.
+
+  // Now, update the last_backup_date for all of the files that are in the list
+
+  // Clean-up
+  for( file_set::iterator i = backed_up.begin(); i != backed_up.end(); ++i ) { delete *i; }
+  for( file_set::iterator i = current.begin();   i != current.end();   ++i ) { delete *i; }
 }