X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=main.cc;h=c930155cae77a6ec538d9f90511da1efd0ee3b1d;hb=302830c3b46d571d80b378fe91060a4a29e87d63;hp=dbd96a0c0f56b7fb3b947a3687ff1f43dfe6cb73;hpb=b6878571e12b7d5de53721f12e8fb956d07e44d6;p=backups%2F.git

diff --git a/main.cc b/main.cc
index dbd96a0..c930155 100644
--- a/main.cc
+++ b/main.cc
@@ -1,11 +1,12 @@
 #include <iostream>
 #include <iterator>
-#include <string>
 #include <vector>
 #include <algorithm>
 
 #include <sqlite3.h>
 
+#include "filedata.hpp"
+
 using namespace std;
 
 vector<string> split( const string &line, char c, int limit = -1 ) {
@@ -27,50 +28,88 @@ vector<string> split( const string &line, char c, int limit = -1 ) {
   return out;
 }
 
-int callback( void *NotUsed, int argc, char **argv, char **azColName ) {
-  int i;
-  for( int i = 0; i < argc; ++i ) {
-    cout << azColName[i] << " = " << ( argv[i] ? argv[i] : "NULL" ) << endl;
-  }
-  cout << endl;
+// 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],
+        vals[1],
+        vals[2],
+        vals[3],
+        atoi( vals[4] ),
+        atoi( vals[5] ),
+        vals[6]) );
   return 0;
 }
 
-void sql_experimenting() {
+int main() {
+  string file_string;
+
+  file_set current_files;
+
+  // Parse the list of files on stdin
+  do {
+    file_string.clear();
+    for( int c = cin.get(); 0 != c && ! cin.eof(); c = cin.get() ) {
+      file_string.push_back( c );
+    }
+    if( 0 != file_string.size() ) {
+      // Example entry
+      // 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],
+            vals[1],
+            vals[2],
+            vals[3],
+            atoi( vals[4].c_str() ),
+            atoi( vals[5].c_str() ),
+            vals[6]) );
+    }
+  } while( ! cin.eof() );
+
+  // Get the list of previously backed up files from the database.
   sqlite3 *db;
-  char *sqliteErrMsg = 0;
-  int rc;
 
   const char *dbname = "test.db";
-  rc = sqlite3_open( dbname, &db );
+  int rc = sqlite3_open( dbname, &db );
   if( SQLITE_OK != rc ) {
     cerr << "Cannot open database: " << dbname << ".  Error message is..." << endl;
     cerr << sqlite3_errmsg(db) << endl;
   }
 
-  rc = sqlite3_exec( db, "select * from filedata;", callback, 0, &sqliteErrMsg );
+  char *sqliteErrMsg = 0;
+  file_set previous_files;
+  rc = sqlite3_exec( db, "select * from filedata;", populate_set, &previous_files, &sqliteErrMsg );
   if( SQLITE_OK != rc ) {
     cerr << "Problem with database.  Message is..." << endl;
     cerr << sqliteErrMsg << endl;
   }
 
   sqlite3_close( db );
-}
 
-int main() {
-//   string file_string;
-//   do {
-//     file_string.clear();
-//     for( int c = cin.get(); 0 != c && ! cin.eof(); c = cin.get() ) {
-//       file_string.push_back( c );
-//     }
-//     if( 0 != file_string.size() ) {
-//       // Example entry
-//       // type perms user group size datemodified name (7 total)
-//       // f 0600 cnb cnb 424 20051015205340 ./.git/index
-//       vector<string> values = split( file_string, ' ', 7 );
-//     }
-//   } while( ! cin.eof() );
-
-  sql_experimenting();
+  for( file_set::iterator i = previous_files.begin(); i != previous_files.end(); ++i ) {
+    cout << (*i)->getFileName() << endl;
+  }
+
+  // Now divide the two sets into three sets (union and set differences)
+  FileDataPtrCmp cmp;
+
+  file_set new_set;
+  set_difference( current_files.begin(),  current_files.end(),
+                  previous_files.begin(), previous_files.end(),
+                  inserter( new_set, new_set.begin() ),
+                  cmp );
+
+  file_set deleted_set;
+  set_difference( previous_files.begin(), previous_files.end(),
+                  current_files.begin(),  current_files.end(),
+                  inserter( deleted_set, deleted_set.begin() ),
+                  cmp );
+
+  // previous_files *should* definitely be the first set here
+  file_set common_set;
+  set_difference( previous_files.begin(), previous_files.end(),
+                  current_files.begin(),  current_files.end(),
+                  inserter( common_set, common_set.begin() ),
+                  cmp );
 }