Changeset 2636

Timestamp:

24/02/2010 20:28:33 (2 years ago)

Author:

chris

Message:

Add option to display attribute modification times from additional
attributes if available in bbackupquery.

Location:

box/trunk

Files:

• bin/bbackupquery/BackupQueries.cpp (modified) (6 diffs)
• lib/backupclient/BackupClientFileAttributes.cpp (modified) (3 diffs)
• lib/backupclient/BackupClientFileAttributes.h (modified) (1 diff)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -213 +213 @@
                 { "quit", "" },
                 { "exit", "" },
-                { "list", "rodIFtTsh", },
+                { "list", "rodIFtTash", },
                 { "pwd",  "" },
                 { "cd",   "od" },
@@ -398 +398 @@
         #define LIST_OPTION_TIMES_LOCAL         't'
         #define LIST_OPTION_TIMES_UTC           'T'
+        #define LIST_OPTION_TIMES_ATTRIBS       'a'
         #define LIST_OPTION_SIZEINBLOCKS        's'
         #define LIST_OPTION_DISPLAY_HASH        'h'
@@ -437 +438 @@
 
 static std::string GetTimeString(BackupStoreDirectory::Entry& en,
-        bool useLocalTime)
+        bool useLocalTime, bool showAttrModificationTimes)
 {
         std::ostringstream out;
-        out << BoxTimeToISO8601String(en.GetModificationTime(), useLocalTime);
+        box_time_t originalTime, newAttributesTime;
+
+        // there is no attribute modification time in the directory
+        // entry, unfortunately, so we can't display it.
+        originalTime = en.GetModificationTime();
+        out << BoxTimeToISO8601String(originalTime, useLocalTime);
 
         if(en.HasAttributes())
@@ -446 +452 @@
                 const StreamableMemBlock &storeAttr(en.GetAttributes());
                 BackupClientFileAttributes attr(storeAttr);
-                out << "~" << BoxTimeToISO8601String(attr.GetModificationTime(),
-                        useLocalTime);
+                
+                box_time_t NewModificationTime, NewAttrModificationTime;
+                attr.GetModificationTimes(&NewModificationTime,
+                        &NewAttrModificationTime);
+                
+                if (showAttrModificationTimes)
+                {
+                        newAttributesTime = NewAttrModificationTime;
+                }
+                else
+                {
+                        newAttributesTime = NewModificationTime;
+                }
+                
+                if (newAttributesTime == originalTime)
+                {
+                        out << "*";
+                }
+                else
+                {
+                        out << "~" << BoxTimeToISO8601String(newAttributesTime,
+                                useLocalTime);
+                }
+        }
+        else
+        {
+                out << " ";
         }
         
@@ -551 +582 @@
                 {
                         // Show UTC times...
-                        printf("%s ", GetTimeString(*en, false).c_str());
+                        printf("%s ", GetTimeString(*en, false,
+                                opts[LIST_OPTION_TIMES_ATTRIBS]).c_str());
                 }
 
@@ -557 +589 @@
                 {
                         // Show local times...
-                        printf("%s ", GetTimeString(*en, true).c_str());
+                        printf("%s ", GetTimeString(*en, true,
+                                opts[LIST_OPTION_TIMES_ATTRIBS]).c_str());
                 }
                 

box/trunk/lib/backupclient/BackupClientFileAttributes.cpp

@@ -651 +651 @@
 //
 // Function
-//              Name:    BackupClientFileAttributes::GetModificationTime()
+//              Name:    BackupClientFileAttributes::GetModificationTimes()
 //              Purpose: Returns the modification time embedded in the
 //                       attributes.
@@ -657 +657 @@
 //
 // --------------------------------------------------------------------------
-box_time_t BackupClientFileAttributes::GetModificationTime() const
+void BackupClientFileAttributes::GetModificationTimes(
+        box_time_t *pModificationTime,
+        box_time_t *pAttrModificationTime) const
 {
         // Got something loaded
@@ -692 +694 @@
         attr_StreamFormat *pattr = (attr_StreamFormat*)mpClearAttributes->GetBuffer();
 
-        return box_ntoh64(pattr->ModificationTime);
+        if(pModificationTime)
+        {
+                *pModificationTime = box_ntoh64(pattr->ModificationTime);
+        }
+        
+        if(pAttrModificationTime)
+        {
+                *pAttrModificationTime = box_ntoh64(pattr->AttrModificationTime);
+        }
 }
 

box/trunk/lib/backupclient/BackupClientFileAttributes.h

@@ -48 +48 @@
         void WriteAttributes(const char *Filename, 
                 bool MakeUserWritable = false) const;
-        box_time_t GetModificationTime() const;
+        void GetModificationTimes(box_time_t *pModificationTime,
+                box_time_t *pAttrModificationTime) const;
         
         bool IsSymLink() const;