X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=main.cpp;h=fb7d522798909ef1d6c90533fed9fec48157adcc;hb=dd824ff649e2701137a975e4c6be067a7a972a60;hp=b630ec8e78f42649351b3c66f2d3cdaa198c6fb3;hpb=fc9ecb5d043146618676cd79fe0a6659f98a3970;p=backups%2F.git diff --git a/main.cpp b/main.cpp index b630ec8..fb7d522 100644 --- a/main.cpp +++ b/main.cpp @@ -12,38 +12,36 @@ 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; - time_t now_tt = time( 0 ); - tm *now = localtime( &now_tt ); - rc += ( now->tm_year + 1900ULL ) * 10000000000ULL; - rc += ( now->tm_mon + 1ULL ) * 100000000ULL; - rc += now->tm_mday * 1000000ULL; - rc += now->tm_hour * 10000ULL; - rc += now->tm_min * 100ULL; - rc += now->tm_sec; - - return rc; +unsigned long long read_time( istream &i ) { + string date_string; + + int c; + // Todo, don't use char_traits directly here + for( c = i.get(); 0 != c && char_traits::eof() != c; c = i.get() ) { + date_string.push_back( c ); + } + if( char_traits::eof() == c ) { i.setstate( ios_base::eofbit ); } + + return atoll( date_string.c_str() ); } template bool copy_until_full( I begin, I end, O out, INT &space ) { bool complete = true; - I i = begin; - while( 0 != space && i != end ) { - INT size = (*i)->getFileSize(); + while( 0 != space && begin != end ) { + INT size = (*begin)->getFileSize(); INT blocksize = blocks( size ) * bytes_in_block; if( blocksize <= space ) { space -= blocksize; - out = *i; + out = *begin; ++out; } else { // We missed a file that should be included so the backup is not complete complete = false; } - ++i; + ++begin; } return complete; } @@ -66,25 +64,25 @@ void partition_sets( const SET ¤t, const SET &old, SET &added, SET &common, SET &old_common, SET &deleted ) { FileDataNameCmp cmp; - set_difference( current.begin(), current.end(), - old.begin(), old.end(), - inserter( added, added.begin() ), - cmp ); - - set_difference( old.begin(), old.end(), - current.begin(), current.end(), - inserter( deleted, deleted.begin() ), - cmp ); - - set_union( current.begin(), current.end(), - old.begin(), old.end(), - inserter( common, common.begin() ), - cmp ); - - set_union( old.begin(), old.end(), - common.begin(), common.end(), - inserter( old_common, old_common.begin() ), - cmp ); + set_difference( current.begin(), current.end(), + old.begin(), old.end(), + inserter( added, added.begin() ), + cmp ); + + set_difference( old.begin(), old.end(), + current.begin(), current.end(), + inserter( deleted, deleted.begin() ), + cmp ); + + set_intersection( current.begin(), current.end(), + old.begin(), old.end(), + inserter( common, common.begin() ), + cmp ); + + set_intersection( old.begin(), old.end(), + common.begin(), common.end(), + inserter( old_common, old_common.begin() ), + cmp ); } template @@ -105,7 +103,7 @@ void sizes( ITER begin, const ITER &end, INT &numblocks, INT &numbytes ) { numbytes += filesize; numblocks += blocks( filesize ); - begin++; + ++begin; } } @@ -120,7 +118,26 @@ void copy_filenames( I begin, const I &end, O out ) { } } +template +void updateLastBackupDate( ITER begin, const ITER &end, unsigned long long date ) { + while( begin != end ) { + (*begin)->setLastBackupDate( date ); + ++begin; + } +} + +template +void delete_objects( ITER begin, const ITER &end ) { + while( begin != end ) { + delete *begin; + ++begin; + } +} + int main() { + // Get the date on stdin + unsigned long long now = read_time( cin ); + // Parse the list of current files on stdin file_set current; populate_set( cin, current ); @@ -137,29 +154,28 @@ int main() { // Now find the list of files to backup. file_set backups; - insert_iterator backups_i( backups, backups.begin() ); // backup all added files - copy( added.begin(), added.end(), backups_i ); + copy( added.begin(), added.end(), inserter( backups, backups.begin() ) ); // 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; + file_vector modified_v; // Backup files that have been modified file_set::iterator i = common.begin(), j = old_common.begin(); for( ; i != common.end(); ++i, ++j ) { (*i)->setLastBackupDate( (*j)->getLastBackupDate() ); - if( needs_backup( *j, *i ) ) modified_files.push_back( *i ); + if( needs_backup( *j, *i ) ) modified_v.push_back( *i ); } - copy( modified_files.begin(), modified_files.end(), backups_i ); + copy( modified_v.begin(), modified_v.end(), inserter( backups, backups.begin() ) ); // Track the total size of modified files unsigned long long modified_blocks, modified_bytes; - sizes( modified_files.begin(), modified_files.end(), modified_blocks, modified_bytes ); + sizes( modified_v.begin(), modified_v.end(), modified_blocks, modified_bytes ); // Now, sort the backups by filesize and build a list that'll fit on a DVD file_vector backups_s; @@ -169,15 +185,13 @@ int main() { sort( backups_s.begin(), backups_s.end(), sizecmp ); file_set final; - 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 + unsigned long long space = 0x100000000ULL; insert_iterator 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; @@ -202,17 +216,16 @@ int main() { unsigned long long total_blocks, total_bytes; 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( dbname ); - copy( current.begin(), current.end(), ostream_iterator( dbout, "" ) ); + copy( current.begin(), current.end(), ostream_iterator( dbout ) ); // Write the 'final' list to stdout - copy_filenames( final.begin(), final.end(), ostream_iterator( cout, "" ) ); + copy_filenames( final.begin(), final.end(), ostream_iterator( cout ) ); + + cerr << now << endl << endl; cerr << "Need backing up..." << endl; cerr << " Added Bytes: " << added_bytes << endl; @@ -229,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() ); }