added an option to specify a path within the folder to restore

Author: sreitshamer

ArqRestoreCommand.m

@@ -431,7 +431,7 @@ - (BOOL)printTree:(Tree *)theTree repo:(Repo *)theRepo relativePath:(NSString *)
 }
 
 - (BOOL)restore:(NSArray *)args error:(NSError **)error {
-    if ([args count] != 5) {
+    if ([args count] != 5 && [args count] != 6) {
         SETNSERROR([self errorDomain], ERROR_USAGE, @"invalid arguments");
         return NO;
     }
@@ -489,8 +489,41 @@ - (BOOL)restore:(NSArray *)args error:(NSError **)error {
     if (commit == nil) {
         return NO;
     }
-    
-    NSString *destinationPath = [[[NSFileManager defaultManager] currentDirectoryPath] stringByAppendingPathComponent:[[matchingBucket localPath] lastPathComponent]];
+
+    BlobKey *treeBlobKey = [commit treeBlobKey];
+    NSString *nodeName = nil;
+    if ([args count] == 6) {
+        NSString *path = [args objectAtIndex:5];
+        if ([path hasPrefix:@"/"]) {
+            path = [path substringFromIndex:1];
+        }
+        NSArray *pathComponents = [path pathComponents];
+        for (NSUInteger index = 0; index < [pathComponents count]; index++) {
+            NSString *component = [pathComponents objectAtIndex:index];
+            Tree *childTree = [repo treeForBlobKey:treeBlobKey error:error];
+            if (childTree == nil) {
+                return NO;
+            }
+            Node *childNode = [childTree childNodeWithName:component];
+            if (childNode == nil) {
+                SETNSERROR([self errorDomain], ERROR_NOT_FOUND, @"path component '%@' not found", component);
+                return NO;
+            }
+            if (![childNode isTree] && index < ([pathComponents count] - 1)) {
+                // If it's a directory and we're not at the end of the path, fail.
+                SETNSERROR([self errorDomain], -1, @"'%@' is not a directory", component);
+                return NO;
+            }
+            if ([childNode isTree]) {
+                treeBlobKey = [childNode treeBlobKey];
+            } else {
+                nodeName = component;
+            }
+        }
+    }
+
+    NSString *restoreFileName = [args count] == 6 ? [[args objectAtIndex:5] lastPathComponent] : [[matchingBucket localPath] lastPathComponent];
+    NSString *destinationPath = [[[NSFileManager defaultManager] currentDirectoryPath] stringByAppendingPathComponent:restoreFileName];
     if ([[NSFileManager defaultManager] fileExistsAtPath:destinationPath]) {
         SETNSERROR([self errorDomain], -1, @"%@ already exists", destinationPath);
         return NO;
@@ -511,8 +544,9 @@ - (BOOL)restore:(NSArray *)args error:(NSError **)error {
                                                                                commitBlobKey:commitBlobKey
                                                                                 rootItemName:[[matchingBucket localPath] lastPathComponent]
                                                                                  treeVersion:CURRENT_TREE_VERSION
-                                                                                 treeBlobKey:[commit treeBlobKey]
-                                                                                    nodeName:nil targetUID:getuid()
+                                                                                 treeBlobKey:treeBlobKey
+                                                                                    nodeName:nodeName
+                                                                                   targetUID:getuid()
                                                                                    targetGID:getgid()
                                                                           useTargetUIDAndGID:YES
                                                                              destinationPath:destinationPath
@@ -527,8 +561,8 @@ - (BOOL)restore:(NSArray *)args error:(NSError **)error {
                                                                                    commitBlobKey:commitBlobKey
                                                                                     rootItemName:[[matchingBucket localPath] lastPathComponent]
                                                                                      treeVersion:CURRENT_TREE_VERSION
-                                                                                     treeBlobKey:[commit treeBlobKey]
-                                                                                        nodeName:nil
+                                                                                     treeBlobKey:treeBlobKey
+                                                                                        nodeName:nodeName
                                                                                        targetUID:getuid()
                                                                                        targetGID:getgid()
                                                                               useTargetUIDAndGID:YES
@@ -542,8 +576,8 @@ - (BOOL)restore:(NSArray *)args error:(NSError **)error {
                                                                                  commitBlobKey:commitBlobKey
                                                                                   rootItemName:[[matchingBucket localPath] lastPathComponent]
                                                                                    treeVersion:CURRENT_TREE_VERSION
-                                                                                   treeBlobKey:[commit treeBlobKey]
-                                                                                      nodeName:nil
+                                                                                   treeBlobKey:treeBlobKey
+                                                                                      nodeName:nodeName
                                                                                      targetUID:getuid()
                                                                                      targetGID:getgid()
                                                                             useTargetUIDAndGID:YES

arq_restore.m

@@ -48,7 +48,7 @@ static void printUsage(const char *exeName) {
     fprintf(stderr, "\t%s [-l loglevel] listfolders <target_nickname> <computer_uuid>\n", exeName);
     fprintf(stderr, "\t%s [-l loglevel] printplist <target_nickname> <computer_uuid> <folder_uuid>\n", exeName);
     fprintf(stderr, "\t%s [-l loglevel] listtree <target_nickname> <computer_uuid> <folder_uuid>\n", exeName);
-    fprintf(stderr, "\t%s [-l loglevel] restore <target_nickname> <computer_uuid> <folder_uuid>\n", exeName);
+    fprintf(stderr, "\t%s [-l loglevel] restore <target_nickname> <computer_uuid> <folder_uuid> [relative_path]\n", exeName);
     fprintf(stderr, "\t%s [-l loglevel] clearcache <target_nickname>\n", exeName);
     fprintf(stderr, "\n");
     fprintf(stderr, "log levels: none, error, warn, info, and debug\n");