From 4ebb914c24ef010e799bc74ad5f3987e3ab5a249 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Wed, 24 Feb 2010 20:28:33 +0000
Subject: Add option to display attribute modification times from additional
 attributes if available in bbackupquery.

---
 bin/bbackupquery/BackupQueries.cpp | 47 ++++++++++++++++++++++++++++++++------
 1 file changed, 40 insertions(+), 7 deletions(-)

(limited to 'bin/bbackupquery/BackupQueries.cpp')

diff --git a/bin/bbackupquery/BackupQueries.cpp b/bin/bbackupquery/BackupQueries.cpp
index f0433ae2..f799ab43 100644
--- a/bin/bbackupquery/BackupQueries.cpp
+++ b/bin/bbackupquery/BackupQueries.cpp
@@ -212,7 +212,7 @@ void BackupQueries::DoCommand(const char *Command, bool isFromCommandLine)
 	{
 		{ "quit", "" },
 		{ "exit", "" },
-		{ "list", "rodIFtTsh", },
+		{ "list", "rodIFtTash", },
 		{ "pwd",  "" },
 		{ "cd",   "od" },
 		{ "lcd",  "" },
@@ -397,6 +397,7 @@ void BackupQueries::CommandList(const std::vector<std::string> &args, const bool
 	#define LIST_OPTION_NOFLAGS		'F'
 	#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,17 +437,47 @@ void BackupQueries::CommandList(const std::vector<std::string> &args, const bool
 }
 
 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())
 	{
 		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 << " ";
 	}
 	
 	return out.str();
@@ -550,13 +581,15 @@ void BackupQueries::List(int64_t DirID, const std::string &rListRoot, const bool
 		if(opts[LIST_OPTION_TIMES_UTC])
 		{
 			// Show UTC times...
-			printf("%s ", GetTimeString(*en, false).c_str());
+			printf("%s ", GetTimeString(*en, false,
+				opts[LIST_OPTION_TIMES_ATTRIBS]).c_str());
 		}
 
 		if(opts[LIST_OPTION_TIMES_LOCAL])
 		{
 			// Show local times...
-			printf("%s ", GetTimeString(*en, true).c_str());
+			printf("%s ", GetTimeString(*en, true,
+				opts[LIST_OPTION_TIMES_ATTRIBS]).c_str());
 		}
 		
 		if(opts[LIST_OPTION_DISPLAY_HASH])
-- 
cgit v1.2.3