Changeset 2635

Timestamp:

24/02/2010 20:12:00 (2 years ago)

Author:

chris

Message:

Add method to get updated modification time of
BackupClientFileAttributes?.

Add listing of attribute modification time to bbackupquery "list -t"
command.

Location:

box/trunk

Files:

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

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -436 +436 @@
 }
 
+static std::string GetTimeString(BackupStoreDirectory::Entry& en,
+        bool useLocalTime)
+{
+        std::ostringstream out;
+        out << BoxTimeToISO8601String(en.GetModificationTime(), useLocalTime);
+
+        if(en.HasAttributes())
+        {
+                const StreamableMemBlock &storeAttr(en.GetAttributes());
+                BackupClientFileAttributes attr(storeAttr);
+                out << "~" << BoxTimeToISO8601String(attr.GetModificationTime(),
+                        useLocalTime);
+        }
+        
+        return out.str();
+}
 
 // --------------------------------------------------------------------------
@@ -535 +551 @@
                 {
                         // Show UTC times...
-                        std::string time = BoxTimeToISO8601String(
-                                en->GetModificationTime(), false);
-                        printf("%s ", time.c_str());
+                        printf("%s ", GetTimeString(*en, false).c_str());
                 }
 
@@ -543 +557 @@
                 {
                         // Show local times...
-                        std::string time = BoxTimeToISO8601String(
-                                en->GetModificationTime(), true);
-                        printf("%s ", time.c_str());
+                        printf("%s ", GetTimeString(*en, true).c_str());
                 }
                 

box/trunk/lib/backupclient/BackupClientFileAttributes.cpp

@@ -648 +648 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Function
+//              Name:    BackupClientFileAttributes::GetModificationTime()
+//              Purpose: Returns the modification time embedded in the
+//                       attributes.
+//              Created: 2010/02/24
+//
+// --------------------------------------------------------------------------
+box_time_t BackupClientFileAttributes::GetModificationTime() const
+{
+        // Got something loaded
+        if(GetSize() <= 0)
+        {
+                THROW_EXCEPTION(BackupStoreException, AttributesNotLoaded);
+        }
+        
+        // Make sure there are clear attributes to use
+        EnsureClearAvailable();
+        ASSERT(mpClearAttributes != 0);
+
+        // Check if the decrypted attributes are small enough, and the type of attributes stored
+        if(mpClearAttributes->GetSize() < (int)sizeof(int32_t))
+        {
+                THROW_EXCEPTION(BackupStoreException, AttributesNotUnderstood);
+        }
+        int32_t *type = (int32_t*)mpClearAttributes->GetBuffer();
+        ASSERT(type != 0);
+        if(ntohl(*type) != ATTRIBUTETYPE_GENERIC_UNIX)
+        {
+                // Don't know what to do with these
+                THROW_EXCEPTION(BackupStoreException, AttributesNotUnderstood);
+        }
+        
+        // Check there is enough space for an attributes block
+        if(mpClearAttributes->GetSize() < (int)sizeof(attr_StreamFormat))
+        {
+                // Too small
+                THROW_EXCEPTION(BackupStoreException, AttributesNotLoaded);
+        }
+
+        // Get pointer to structure
+        attr_StreamFormat *pattr = (attr_StreamFormat*)mpClearAttributes->GetBuffer();
+
+        return box_ntoh64(pattr->ModificationTime);
+}
 
 // --------------------------------------------------------------------------

box/trunk/lib/backupclient/BackupClientFileAttributes.h

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