Changeset 2754

Timestamp:

22/09/2010 22:12:02 (20 months ago)

Author:

chris

Message:

Allow restoring directories with a single argument, using the remote name
as the local destination name also.

Location:

box/trunk

Files:

• bin/bbackupquery/BackupQueries.cpp (modified) (3 diffs)
• bin/bbackupquery/documentation.txt (modified) (1 diff)
• test/bbackupd/testbbackupd.cpp (modified) (2 diffs)

box/trunk/bin/bbackupquery/BackupQueries.cpp

@@ -1952 +1952 @@
 {
         // Check arguments
-        if(args.size() != 2)
-        {
-                BOX_ERROR("Incorrect usage. restore [-drif] <remote-name> <local-name>");
+        if(args.size() < 1 || args.size() > 2)
+        {
+                BOX_ERROR("Incorrect usage. restore [-drif] <remote-name> "
+                        "[<local-name>]");
                 return;
         }
@@ -1995 +1996 @@
                 return;
         }
+
         if(dirID == BackupProtocolClientListDirectory::RootDirectory)
         {
@@ -2000 +2002 @@
                 return;
         }
-        
-#ifdef WIN32
+
         std::string localName;
-        if(!ConvertConsoleToUtf8(args[1].c_str(), localName)) return;
-#else
-        std::string localName(args[1]);
-#endif
+
+        if(args.size() == 2)
+        {
+                #ifdef WIN32
+                        if(!ConvertConsoleToUtf8(args[1].c_str(), localName))
+                        {
+                                return;
+                        }
+                #else
+                        localName = args[1];
+                #endif
+        }
+        else
+        {
+                localName = args[0];
+        }
 
         // Go and restore...

box/trunk/bin/bbackupquery/documentation.txt

@@ -120 +120 @@
 <
 
-> restore [-drif] <directory-name> <local-directory-name>
+> restore [-drif] <directory-name> [<local-directory-name>]
 
         Restores a directory to the local disc. The local directory specified
-        must not exist (unless a previous restore is being restarted).
+        must not exist (unless a previous restore is being restarted). If the
+        local directory is omitted, the default is to restore to the same
+        directory name and path, relative to the current local directory,
+        as set with the "lcd" command.
 
         The root cannot be restored -- restore locations individually.

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -2071 +2071 @@
                         TestRemoteProcessMemLeaks("bbackupquery.memleaks");
 
+                        // Try a restore with just the remote directory name,
+                        // check that it uses the same name in the local
+                        // directory.
+                        TEST_THAT(::mkdir("testfiles/restore-test", 0700) == 0);
+
+                        compareReturnValue = ::system(BBACKUPQUERY " "
+                                "-Wwarning "
+                                "-c testfiles/bbackupd.conf "
+                                "\"lcd testfiles/restore-test\" "
+                                "\"restore Test1\" "
+                                "quit");
+                        TEST_RETURN(compareReturnValue,
+                                BackupQueries::ReturnCode::Command_OK);
+                        TestRemoteProcessMemLeaks("bbackupquery.memleaks");
+
+                        // check that it restored properly
+                        compareReturnValue = ::system(BBACKUPQUERY " "
+                                "-Wwarning "
+                                "-c testfiles/bbackupd.conf "
+                                "\"compare -cEQ Test1 testfiles/restore-test/Test1\" " 
+                                "quit");
+                        TEST_RETURN(compareReturnValue,
+                                BackupQueries::ReturnCode::Compare_Same);
+                        TestRemoteProcessMemLeaks("bbackupquery.memleaks");
+
                         // put the permissions back to sensible values
                         #ifdef WIN32
@@ -2083 +2108 @@
                                         0755) == 0);
                         #endif
-
                 }