X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=main.cc;h=1a1b9e7314cf73f0a01ff75ca50ed8efd0736e91;hb=e2cc1e337cc5461d93a94931097ceb34e325c7ac;hp=9224f00747b7318796c13829ad0504751d79e33e;hpb=e0c6c331bc17ad8b85fd9db1be947a5c89064906;p=backups%2F.git

diff --git a/main.cc b/main.cc
index 9224f00..1a1b9e7 100644
--- a/main.cc
+++ b/main.cc
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <iterator>
-#include <vector>
 #include <algorithm>
+#include <cassert>
 
 #include <sqlite3.h>
 
@@ -83,68 +83,114 @@ int main() {
   assert( SQLITE_OK == rc );
 
   // Now divide the two sets into three sets (new, deleted and updated )
-  FileDataPtrCmp cmp;
+  FileDataNameCmp cmp;
 
-  file_set new_set;
-  set_difference( current.begin(),  current.end(),
+  file_set added;
+  set_difference( current.begin(),   current.end(),
                   backed_up.begin(), backed_up.end(),
-                  inserter( new_set, new_set.begin() ),
+                  inserter( added, added.begin() ),
                   cmp );
 
   file_set deleted;
   set_difference( backed_up.begin(), backed_up.end(),
-                  current.begin(),  current.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 );
+  set_union( current.begin(),   current.end(),
+             backed_up.begin(), backed_up.end(),
+             inserter( updated, updated.begin() ),
+             cmp );
+
+  { // This little block will copy the last_backup_date from the second set to the first
+    file_set updated_mirror;
+    set_union( current.begin(),   current.end(),
+               backed_up.begin(), backed_up.end(),
+               inserter( updated_mirror, updated_mirror.begin() ),
+               cmp );
+
+    // TODO Now we need to copy the last_backup_date from 
+    file_set::iterator i = updated.begin(), j = updated_mirror.begin();
+    for( ; i != updated.end(); ++i, ++j ) {
+      (*i)->setLastBackupDate( (*j)->getLastBackupDate() );
+    }
+  }
 
   // Now find the list of files to backup.
-  file_set backup_list;
+  file_set backup_set;
 
   // backup all new files
-  copy( new_set.begin(), new_set.end(), inserter( backup_list, backup_list.begin() ) );
+  copy( added.begin(), added.end(), inserter( backup_set, backup_set.begin() ) );
 
   // backup 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 );
+      backup_set.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
+  // Now, sort the backup_set by filesize and build a list of up to SIZE
+  file_vector backups_bysize;
+  copy( backup_set.begin(), backup_set.end(), back_inserter( backups_bysize ) );
+  FileDataSizeCmp sizecmp;
+  sort( backups_bysize.begin(), backups_bysize.end(), sizecmp );
+
+  file_set final_set;
+  unsigned long long bytes_available = 4700000000ULL;  // 4.3 GBytes
+
+  unsigned long long block_size = 512ULL;
+
+  // Copy files over until full or out of files
+  file_vector::reverse_iterator i = backups_bysize.rbegin();
+  while( 0 != bytes_available && i != backups_bysize.rend() ) {
+    unsigned long long size = (*i)->getFileSize();
+    unsigned long long blocks = size & ( ~(block_size-1) );
+    if( blocks < size ) blocks += block_size;
+    if( blocks <= bytes_available ) {
+      bytes_available -= blocks;
+      final_set.insert( *i );
+    }
+    ++i;
+  }
 
-  // Remove deleted files from the database.
-  const char *delete_sql = "delete from filedata where filename = :filename";
-  sqlite3_stmt *ppStmt;
+  // Now, sort the non-backed-up list by last_backup_date and back-fill
+  if( 0 != bytes_available ) {
+    file_vector leftovers;
+    set_difference( current.begin(),   current.end(),
+                    final_set.begin(), final_set.end(),
+                    back_inserter( leftovers ),
+                    cmp );
 
-  sqlite3_prepare( db, delete_sql, -1, &ppStmt, NULL );
-  assert( NULL != ppStmt );
+    FileDataLastBackupCmp lastbackupcmp;
+    sort( leftovers.begin(), leftovers.end(), lastbackupcmp );
 
-  for( file_set::iterator i = deleted.begin(); i != deleted.end(); ++i ) {
-    const string &name = (*i)->getFileName();
+    // Copy files over until full or out of files
+    file_vector::const_iterator j = leftovers.begin();
+    while( 0 != bytes_available && j != leftovers.end() ) {
+      unsigned long long size   = (*j)->getFileSize();
+      unsigned long long blocks = size & ( ~(block_size-1) );
 
-    rc = sqlite3_bind_text( ppStmt, 1, name.data(), name.size(), SQLITE_TRANSIENT );
-    assert( SQLITE_OK == rc );
+      if( blocks < size ) blocks += block_size;
 
-    rc = sqlite3_step( ppStmt );
-    assert( SQLITE_OK == rc );
+      if( blocks <= bytes_available ) {
+        bytes_available -= blocks;
+        final_set.insert( *j );
+      }
+      ++j;
+    }
   }
-  rc = sqlite3_finalize( ppStmt );
-  assert( SQLITE_OK == rc );
 
-  // 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.
+  unsigned long long now = 20051019211200ULL;
+  for( file_set::iterator k = final_set.begin(); k != final_set.end(); ++k ) {
+    (*k)->setLastBackupDate( now );
+  }
 
-  // Now, update the last_backup_date for all of the files that are in the list
+  // Clean out the database
+  rc = sqlite3_exec( db, "delete from filedata;", NULL, NULL, &sqliteErrMsg );
+  assert( SQLITE_OK == rc );
+  rc = sqlite3_exec( db, "vacuum;", NULL, NULL, &sqliteErrMsg );
+  assert( SQLITE_OK == rc );
 
   // Clean-up
   for( file_set::iterator i = backed_up.begin(); i != backed_up.end(); ++i ) { delete *i; }