#include <string>
+#include <vector>
+#include <iostream>
#include "filedata.hpp"
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<string> split( const string &line, char c, int limit = -1 ) {
+ string::size_type start = 0, end = 0;
+
+ vector<string> 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<string> 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;
+}
#include <iostream>
+#include <fstream>
#include <iterator>
#include <algorithm>
#include <cassert>
-#include <sqlite3.h>
-
#include "filedata.hpp"
using namespace std;
-vector<string> split( const string &line, char c, int limit = -1 ) {
- string::size_type start = 0, end = 0;
-
- vector<string> 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<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;
-}
-
-int main() {
- string file_string;
-
- file_set current;
-
- // Parse the list of files on stdin
+template<class ISTREAM, class SET>
+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<string> 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<class SET>
+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(),
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() );
}
}
// 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 );
}
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() ) {
if( blocks <= bytes_available ) {
bytes_available -= blocks;
final_set.insert( *i );
+ } else {
+ finished = false;
}
++i;
}
// 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 ),
}
}
+ // 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; }
projects / backups / .git / commitdiff