X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=main.cpp;h=d8a1214192108082e96fe2b78dd11a91e50065de;hb=de6a3235b4d319401d00db0e7975e2a57ed344b2;hp=d00d8de3aa1f089710890acd71180eb0dff470da;hpb=87ba58c6b74ea8452da0eea77edf3afe0392a53b;p=backups%2F.git

diff --git a/main.cpp b/main.cpp
index d00d8de..d8a1214 100644
--- a/main.cpp
+++ b/main.cpp
@@ -10,6 +10,7 @@
 using namespace std;
 
 static const unsigned int bytes_in_block = 0x800;
+static const char * dbname = "/var/lib/backups/backups.db";
 
 unsigned long long current_time() {
   unsigned long long rc = 0;
@@ -108,13 +109,39 @@ void sizes( ITER begin, const ITER &end, INT &numblocks, INT &numbytes ) {
   }
 }
 
+template<class I, class O>
+void copy_filenames( I begin, const I &end, O out ) {
+  while( begin != end ) {
+    string output = (*begin)->getFileName();
+    output.push_back( 0 );
+    *out = output;
+    ++out;
+    ++begin;
+  }
+}
+
+template<class ITER>
+void updateLastBackupDate( ITER begin, const ITER &end, unsigned long long date ) {
+  while( begin != end ) {
+    (*begin)->setLastBackupDate( date );
+  }
+}
+
+template<class ITER>
+void delete_objects( ITER begin, const ITER &end ) {
+  while( begin != end ) {
+    delete *begin;
+    ++begin;
+  }
+}
+
 int main() {
   // Parse the list of current files on stdin
   file_set current;
   populate_set( cin, current );
 
   file_set backed_up;
-  ifstream db( "test.db" );
+  ifstream db( dbname );
   if( db && db.good() ) {
     populate_set( db, backed_up );
   }
@@ -132,7 +159,7 @@ int main() {
 
   // Track the total size of added files
   unsigned long long added_blocks, added_bytes;
-  sizes( backups.begin(), backups.end(), added_blocks, added_bytes );
+  sizes( added.begin(), added.end(), added_blocks, added_bytes );
 
   file_vector modified_files;
   // Backup files that have been modified
@@ -157,15 +184,13 @@ int main() {
   sort( backups_s.begin(), backups_s.end(), sizecmp );
 
   file_set final;
-  unsigned long long space = 0x102800000ULL;  // about 98% of 4220 MBytes
+  unsigned long long space = 0x100000000ULL; // After looking at how big the ISO can be and how many 1K blocks are left after formatting the filesystem I decided on an even 4GB target
 
   insert_iterator<file_set> final_i( final, final.begin() );
 
   // Copy files over until full or out of files
-  bool complete = copy_until_full( backups_s.rbegin(),
-                                   backups_s.rend(),
-                                   final_i,
-                                   space );
+  bool complete
+    = copy_until_full( backups_s.rbegin(), backups_s.rend(), final_i, space );
 
   // Track the size filled up by essential backups
   unsigned long long essential_blocks, essential_bytes;
@@ -191,16 +216,16 @@ int main() {
   sizes( final.begin(), final.end(), total_blocks, total_bytes );
 
   unsigned long long now = current_time();
-  for( file_set::iterator k = final.begin(); k != final.end(); ++k ) {
-    (*k)->setLastBackupDate( now );
-  }
+  updateLastBackupDate( final.begin(), final.end(), now );
 
   // Write the 'current' list to the dbfile
-  ofstream dbout( "test.db" );
-  copy( current.begin(), current.end(), ostream_iterator<FileData*>( dbout, "" ) );
+  ofstream dbout( dbname );
+  copy( current.begin(), current.end(), ostream_iterator<FileData*>( dbout ) );
 
   // Write the 'final' list to stdout
-  copy( final.begin(), final.end(), ostream_iterator<FileData*>( cout, "" ) );
+  copy_filenames( final.begin(), final.end(), ostream_iterator<string>( cout ) );
+
+  cerr << now << endl << endl;
 
   cerr << "Need backing up..." << endl;
   cerr << "	Added Bytes:		" << added_bytes << endl;
@@ -217,6 +242,6 @@ int main() {
   if( ! complete ) { cerr << "Backup is incomplete!" << endl; }
 
   // 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; }
+  delete_objects( backed_up.begin(), backed_up.end() );
+  delete_objects( current.begin(),   current.end() );
 }