Changeset 2663 for box/RELEASE/0.11rc7/bin/bbackupquery/BackupQueries.cpp

Timestamp:

08/03/2010 22:00:55 (2 years ago)

Author:

chris

Message:

Merge [2604] [2612] [2613] [2614] [2618] [2633] [2634] [2635] [2636]
from trunk into 0.11rc7. Fix updating of changed file attributes
(creation time) on Windows, fixes #64 in 0.11rc7.

File:

• box/RELEASE/0.11rc7/bin/bbackupquery/BackupQueries.cpp (modified) (5 diffs)

box/RELEASE/0.11rc7/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'
@@ -436 +437 @@
 }
 
+static std::string GetTimeString(BackupStoreDirectory::Entry& en,
+        bool useLocalTime, bool showAttrModificationTimes)
+{
+        std::ostringstream out;
+        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())
+        {
+                const StreamableMemBlock &storeAttr(en.GetAttributes());
+                BackupClientFileAttributes attr(storeAttr);
+                
+                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 << " ";
+        }
+        
+        return out.str();
+}
 
 // --------------------------------------------------------------------------
@@ -535 +582 @@
                 {
                         // Show UTC times...
-                        std::string time = BoxTimeToISO8601String(
-                                en->GetModificationTime(), false);
-                        printf("%s ", time.c_str());
+                        printf("%s ", GetTimeString(*en, false,
+                                opts[LIST_OPTION_TIMES_ATTRIBS]).c_str());
                 }
 
@@ -543 +589 @@
                 {
                         // Show local times...
-                        std::string time = BoxTimeToISO8601String(
-                                en->GetModificationTime(), true);
-                        printf("%s ", time.c_str());
+                        printf("%s ", GetTimeString(*en, true,
+                                opts[LIST_OPTION_TIMES_ATTRIBS]).c_str());
                 }