X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=filedata.hpp;h=b339f05f92b2fcc4c425e13c119b56bbb37a8a5b;hb=2627a2ef3b9a158282133c143a417d99de4b2d66;hp=8c2951b5221fe0def7443fd9b4bf786ddc1c2e84;hpb=8d352159cb90b923e34c879242ed7516418ec827;p=backups%2F.git

diff --git a/filedata.hpp b/filedata.hpp
index 8c2951b..b339f05 100644
--- a/filedata.hpp
+++ b/filedata.hpp
@@ -3,25 +3,19 @@
 
 #include <string>
 #include <set>
+#include <vector>
+#include <cassert>
 
 class FileData {
   public:
     // Construct a FileData object with default values
-    FileData( char,
-              std::string,
-              std::string,
-              std::string,
-              unsigned long,
-              unsigned long long,
-              std::string,
-              unsigned long long = 0
-              );
+    FileData() {}
 
     char               getFileType()       const { return filetype; }
     const std::string &getPermissions()    const { return permissions; }
     const std::string &getUserName()       const { return username; }
     const std::string &getGroupName()      const { return groupname; }
-    unsigned long      getFileSize()       const { return filesize; }
+    unsigned long long getFileSize()       const { return filesize; }
     unsigned long long getModifiedDate()   const { return modified_date; }
     const std::string &getFileName()       const { return filename; }
     unsigned long long getLastBackupDate() const { return last_backup_date; }
@@ -30,36 +24,53 @@ class FileData {
     void setPermissions(    const std::string &arg ) { permissions      = arg; }
     void setUserName(       const std::string &arg ) { username         = arg; }
     void setGroupName(      const std::string &arg ) { groupname        = arg; }
-    void setFileSize(       unsigned long      arg ) { filesize         = arg; }
+    void setFileSize(       unsigned long long arg ) { filesize         = arg; }
     void setModifiedDate(   unsigned long long arg ) { modified_date    = arg; }
     void setFileName(       const std::string &arg ) { filename         = arg; }
     void setLastBackupDate( unsigned long long arg ) { last_backup_date = arg; }
 
   private:
-    FileData();
     FileData( const FileData & );
 
     char               filetype;
     std::string        permissions;
     std::string        username;
     std::string        groupname;
-    unsigned long      filesize;
+    unsigned long long filesize;
     unsigned long long modified_date;
+    unsigned long long last_backup_date;
     std::string        filename;
+};
 
-    unsigned long long last_backup_date;
+std::ostream &operator<<( std::ostream &o, const FileData *d );
+std::istream &operator>>( std::istream &i, FileData *d );
+
+std::ostream &operator<<( std::ostream &o, const FileData &d );
+std::istream &operator>>( std::istream &i, FileData &d );
+
+struct FileDataLastBackupCmp {
+  bool operator()( const FileData *a, const FileData *b ) {
+    return a->getLastBackupDate() < b->getLastBackupDate();
+  }
 };
 
-class FileDataPtrCmp {
-  public:
+struct FileDataSizeCmp {
+  bool operator()( const FileData *a, const FileData *b ) {
+    return a->getFileSize() < b->getFileSize();
+  }
+};
 
+struct FileDataNameCmp {
   bool operator()( const FileData *a, const FileData *b ) {
     return cmp( a->getFileName(), b->getFileName() );
   }
   private:
-  std::less<std::string> cmp;
+    std::less<std::string> cmp;
 };
 
-typedef std::set<FileData*,FileDataPtrCmp> file_set;
+bool needs_backup( const FileData *before, const FileData *after );
+
+typedef std::set<FileData*,FileDataNameCmp> file_set;
+typedef std::vector<FileData*> file_vector;
 
 #endif