From: Carl N Baldwin Date: Thu, 20 Oct 2005 04:14:18 +0000 (-0600) Subject: Regular commit X-Git-Tag: release-0.4~96 X-Git-Url: http://git.pippins.net/embedvideo/.git/%22%22.%24thumbnail.%22/%7Bupdate_day%7D?a=commitdiff_plain;h=7ddfd60aef5e67058e1e6cb70debd3da01317825;p=backups%2F.git Regular commit --- diff --git a/configure.ac b/configure.ac index af47932..3c21c10 100644 --- a/configure.ac +++ b/configure.ac @@ -4,8 +4,6 @@ AC_COPYRIGHT([(c) Carl Baldwin. All Rights Reserved. ]) AM_INIT_AUTOMAKE([foreign -Wall]) -PKG_CHECK_MODULES([SQLITE3], [sqlite3]) - AC_PROG_CXX() AC_PROG_INSTALL() AC_PROG_RANLIB() diff --git a/filedata.cpp b/filedata.cpp index cd82b54..2a9840a 100644 --- a/filedata.cpp +++ b/filedata.cpp @@ -1,4 +1,6 @@ #include +#include +#include #include "filedata.hpp" @@ -10,14 +12,71 @@ FileData::FileData( char _type, string _group, unsigned long long _size, unsigned long long _modified_date, - string _name, - unsigned long long _last_backup ) + unsigned long long _last_backup, + string _name ) : filetype( _type ), permissions( _permissions ), username( _user ), groupname( _group ), filesize( _size ), modified_date( _modified_date ), - filename( _name ), - last_backup_date( _last_backup ) + last_backup_date( _last_backup ), + filename( _name ) {} + +vector split( const string &line, char c, int limit = -1 ) { + string::size_type start = 0, end = 0; + + vector out; + while( 0 != limit-- && end != line.size() ) { + if( 0 == limit ) { + end = line.size(); + } else { + end = line.find( c, start ); + if( end == string::npos ) { + end = line.size(); + } + } + out.push_back( line.substr( start, end-start ) ); + start = end + 1; + } + return out; +} + +ostream &operator<<( const FileData &d, ostream &o ) { + o << d.getFileType() << ' '; + o << d.getPermissions() << ' '; + o << d.getUserName() << ' '; + o << d.getGroupName() << ' '; + o << d.getFileSize() << ' '; + o << d.getModifiedDate() << ' '; + o << d.getLastBackupDate() << ' '; + o << d.getFileName() << '\0'; + + return o; +} + +istream &operator>>( istream &i, FileData &d ) { + string file_string; + + for( int c = i.get(); 0 != c && ! i.eof(); c = i.get() ) { + file_string.push_back( c ); + } + + if( 0 != file_string.size() ) { + // Example entry + // type perms user group size datemodified name (8 total) + // f 0600 cnb cnb 424 20051015205340 0 ./.git/index + vector vals = split( file_string, ' ', 8 ); + d.setFileType( vals[0][0] ); + d.setPermissions( vals[1] ); + d.setUserName( vals[2] ); + d.setGroupName( vals[3] ); + d.setFileSize( atoi( vals[4].c_str() ) ); + d.setModifiedDate( atoi( vals[5].c_str() ) ); + d.setLastBackupDate( atoi( vals[6].c_str() ) ); + d.setFileName( vals[7] ); + } + + return i; +} diff --git a/filedata.hpp b/filedata.hpp index 3df81d9..47a2690 100644 --- a/filedata.hpp +++ b/filedata.hpp @@ -8,14 +8,15 @@ class FileData { public: // Construct a FileData object with default values + FileData() {} FileData( char, std::string, std::string, std::string, unsigned long long, unsigned long long, - std::string, - unsigned long long = 0 + unsigned long long, + std::string ); char getFileType() const { return filetype; } @@ -37,7 +38,6 @@ class FileData { void setLastBackupDate( unsigned long long arg ) { last_backup_date = arg; } private: - FileData(); FileData( const FileData & ); char filetype; @@ -46,11 +46,14 @@ class FileData { std::string groupname; unsigned long long filesize; unsigned long long modified_date; - std::string filename; - unsigned long long last_backup_date; + std::string filename; }; +std::ostream &operator<<( const FileData &d, std::ostream &o ); + +std::istream &operator>>( std::istream &i, FileData &d ); + struct FileDataLastBackupCmp { bool operator()( const FileData *a, const FileData *b ) { return a->getLastBackupDate() < b->getLastBackupDate(); diff --git a/find-cmd.sh b/find-cmd.sh index 71972b6..006531c 100755 --- a/find-cmd.sh +++ b/find-cmd.sh @@ -2,6 +2,6 @@ { for type in d f l; do - find . -type $type -printf "$type %#m %g %u %s %CY%Cm%Cd%CH%CM%CS %p\0" + find . -type $type -printf "$type %#m %g %u %s %CY%Cm%Cd%CH%CM%CS 0 %p\0" done -} > list +} diff --git a/main.cc b/main.cc index 1a1b9e7..50bf703 100644 --- a/main.cc +++ b/main.cc @@ -1,109 +1,59 @@ #include +#include #include #include #include -#include - #include "filedata.hpp" using namespace std; -vector split( const string &line, char c, int limit = -1 ) { - string::size_type start = 0, end = 0; - - vector out; - while( 0 != limit-- && end != line.size() ) { - if( 0 == limit ) { - end = line.size(); - } else { - end = line.find( c, start ); - if( end == string::npos ) { - end = line.size(); - } - } - out.push_back( line.substr( start, end-start ) ); - start = end + 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( 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; -} - -int main() { - string file_string; - - file_set current; - - // Parse the list of files on stdin +template +void populate_set( ISTREAM &in, SET &files ) { 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 vals = split( file_string, ' ', 7 ); - current.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; - - const char *dbname = "test.db"; - int rc = sqlite3_open( dbname, &db ); - assert( SQLITE_OK == rc ); - - char *sqliteErrMsg = 0; - file_set backed_up; - rc = sqlite3_exec( db, "select * from filedata;", populate_set, &backed_up, &sqliteErrMsg ); - assert( SQLITE_OK == rc ); - - rc = sqlite3_close( db ); - assert( SQLITE_OK == rc ); + FileData *data = new FileData(); + in >> (*data); + files.insert( data ); + } while( ! in.eof() ); +} - // Now divide the two sets into three sets (new, deleted and updated ) +template +void partition_sets( const SET ¤t, const SET &old, + SET &added, SET &common, SET &deleted ) { FileDataNameCmp cmp; - file_set added; - set_difference( current.begin(), current.end(), - backed_up.begin(), backed_up.end(), + set_difference( current.begin(), current.end(), + old.begin(), old.end(), inserter( added, added.begin() ), cmp ); - file_set deleted; - set_difference( backed_up.begin(), backed_up.end(), - current.begin(), current.end(), + set_difference( old.begin(), old.end(), + current.begin(), current.end(), inserter( deleted, deleted.begin() ), cmp ); - file_set updated; - set_union( current.begin(), current.end(), - backed_up.begin(), backed_up.end(), - inserter( updated, updated.begin() ), - cmp ); + set_union( current.begin(), current.end(), + old.begin(), old.end(), + inserter( common, common.begin() ), + cmp ); +} + +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" ); + populate_set( db, backed_up); + + // Now divide the two sets into three sets (added, deleted and common ) + file_set added, deleted, common; + partition_sets( current, backed_up, added, common, deleted ); { // This little block will copy the last_backup_date from the second set to the first + FileDataNameCmp cmp; + file_set updated_mirror; set_union( current.begin(), current.end(), backed_up.begin(), backed_up.end(), @@ -111,8 +61,8 @@ int main() { 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 ) { + file_set::iterator i = common.begin(), j = updated_mirror.begin(); + for( ; i != common.end(); ++i, ++j ) { (*i)->setLastBackupDate( (*j)->getLastBackupDate() ); } } @@ -120,11 +70,11 @@ int main() { // Now find the list of files to backup. file_set backup_set; - // backup all new files + // backup all added files 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 ) { + // backup common files that have changed since the last backup date. + for( file_set::iterator i = common.begin(); i != common.end(); ++i ) { if( (*i)->getLastBackupDate() < (*i)->getModifiedDate() ) { backup_set.insert( *i ); } @@ -141,6 +91,8 @@ int main() { unsigned long long block_size = 512ULL; + bool finished = true; + // 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() ) { @@ -150,6 +102,8 @@ int main() { if( blocks <= bytes_available ) { bytes_available -= blocks; final_set.insert( *i ); + } else { + finished = false; } ++i; } @@ -157,6 +111,7 @@ int main() { // Now, sort the non-backed-up list by last_backup_date and back-fill if( 0 != bytes_available ) { file_vector leftovers; + FileDataNameCmp cmp; set_difference( current.begin(), current.end(), final_set.begin(), final_set.end(), back_inserter( leftovers ), @@ -181,16 +136,16 @@ int main() { } } + // TODO Get 'now' from time clock unsigned long long now = 20051019211200ULL; for( file_set::iterator k = final_set.begin(); k != final_set.end(); ++k ) { (*k)->setLastBackupDate( now ); } - // 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 ); + // Write the 'current' list to the dbfile + // Write the 'final_set' list to stdout + + // If ! finished then write a flag to /tmp // Clean-up for( file_set::iterator i = backed_up.begin(); i != backed_up.end(); ++i ) { delete *i; }