Retry failed browser or node service requests that may have an updated URL in the...
[pithos-macos] / pithos-macos / PithosSubdirNode.m
index ba3e492..6181da7 100644 (file)
@@ -2,7 +2,7 @@
 //  PithosSubdirNode.m
 //  pithos-macos
 //
-// Copyright 2011-2012 GRNET S.A. All rights reserved.
+// Copyright 2011-2013 GRNET S.A. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or
 // without modification, are permitted provided that the following
@@ -51,7 +51,7 @@
 static NSImage *sharedIcon = nil;
 
 @implementation PithosSubdirNode
-@synthesize pithosObject, versions;
+@synthesize pithosObject, versions, applyMetadataObjectRequest, refreshMetadataObjectRequest, refreshVersionsObjectRequest;
 @synthesize isPublic, translatedModifiedBy, translatedPermissions;
 
 + (void)initialize {
@@ -62,14 +62,13 @@ static NSImage *sharedIcon = nil;
 #pragma mark -
 #pragma mark Object Lifecycle
 
-- (id)initWithPithos:(ASIPithos *)aPithos 
-     pithosContainer:(ASIPithosContainer *)aPithosContainer 
-        pithosObject:(ASIPithosObject *)aPithosObject {
-    if ((self = [super init])) {
-        self.pithos = aPithos;
+- (id)initWithPithosAccountManager:(PithosAccount *)aPithosAccountManager
+                   pithosContainer:(ASIPithosContainer *)aPithosContainer
+                      pithosObject:(ASIPithosObject *)aPithosObject {
+    if ((self = [super initWithPithosAccountManager:aPithosAccountManager])) {
+        refreshParent = NO;
         self.pithosContainer = aPithosContainer;
         self.pithosObject = aPithosObject;
-        refreshParent = NO;
     }
     return self;
 }
@@ -91,7 +90,7 @@ static NSImage *sharedIcon = nil;
         if (displayname) {
             self.translatedModifiedBy = displayname;
         } else {
-            [pithosAccountManager updateUserCatalogForForDisplaynames:nil UUIDs:[NSArray arrayWithObject:pithosObject.modifiedBy]];
+            [pithosAccountManager updateUserCatalogForDisplaynames:nil UUIDs:[NSArray arrayWithObject:pithosObject.modifiedBy]];
             self.translatedModifiedBy = [pithosAccountManager displaynameForUUID:pithosObject.modifiedBy safe:YES];
         }
     } else {
@@ -110,7 +109,7 @@ static NSImage *sharedIcon = nil;
         [UUIDs removeObject:@""];
         [UUIDs removeObject:@"*"];
         if (UUIDs.count) {
-            [pithosAccountManager updateUserCatalogForForDisplaynames:nil UUIDs:[UUIDs allObjects]];
+            [pithosAccountManager updateUserCatalogForDisplaynames:nil UUIDs:[UUIDs allObjects]];
         }
         
         NSMutableArray *newTranslatedPermissions = [NSMutableArray arrayWithCapacity:pithosObject.permissions.count];
@@ -128,21 +127,13 @@ static NSImage *sharedIcon = nil;
 #pragma mark -
 #pragma mark Properties
 
-- (void)setPithos:(ASIPithos *)aPithos {
-    if (aPithos && ![aPithos isEqualTo:pithos]) {
-        pithos = aPithos;
-        url = nil;
-    }
-}
 
 - (NSString *)url {
-    if (url == nil)
-        url = [[NSString alloc] initWithFormat:@"subdir %@/%@/%@%@", 
-               (sharingAccount ? [pithos storageURLWithAuthUser:sharingAccount] : pithos.storageURL), 
-               pithosContainer.name, 
-               prefix, 
-               (shared ? @"?shared" : @"")];
-    return url;
+    return [NSString stringWithFormat:@"@subdir@%@/%@/%@%@",
+            (sharingAccount ? sharingAccount : pithosAccountManager.pithos.authUser),
+            pithosContainer.name,
+            prefix,
+            (shared ? @"?shared" : @"")];
 }
 
 - (NSString *)displayName {
@@ -220,7 +211,7 @@ static NSImage *sharedIcon = nil;
             if ((responseStatusCode != 201) && (responseStatusCode != 202))
                 [PithosUtilities unexpectedResponseStatusAlertWithRequest:applyMetadataObjectRequest];
             @synchronized(self) {
-                applyMetadataObjectRequest = nil;
+                self.applyMetadataObjectRequest = nil;
             }
             if ((responseStatusCode == 201) || (responseStatusCode == 202))
                 [self refreshInfo];
@@ -234,13 +225,13 @@ static NSImage *sharedIcon = nil;
                 refreshParent = NO;
             }
             @synchronized(self) {
-                refreshMetadataObjectRequest = nil;
+                self.refreshMetadataObjectRequest = nil;
             }
         } else if ([request isEqualTo:refreshVersionsObjectRequest]) {
             [[pithosNodeInfoController window] makeFirstResponder:nil];
             self.versions = [refreshVersionsObjectRequest versions];
             @synchronized(self) {
-                refreshVersionsObjectRequest = nil;
+                self.refreshVersionsObjectRequest = nil;
             }
         }
     }
@@ -250,19 +241,20 @@ static NSImage *sharedIcon = nil;
     @autoreleasepool {
         NSUInteger retries = [[request.userInfo objectForKey:@"retries"] unsignedIntegerValue];
         if (retries > 0) {
-            ASIPithosObjectRequest *newRequest = (ASIPithosObjectRequest *)[PithosUtilities copyRequest:request];
+            ASIPithosObjectRequest *newRequest = (ASIPithosObjectRequest *)[PithosUtilities retryWithUpdatedURLRequest:request
+                                                                                               andPithosAccountManager:pithosAccountManager];
             [(NSMutableDictionary *)(newRequest.userInfo)setObject:[NSNumber numberWithUnsignedInteger:(--retries)] forKey:@"retries"];
             if ([request isEqualTo:applyMetadataObjectRequest]) {
                 @synchronized(self) {
-                    applyMetadataObjectRequest = newRequest;
+                    self.applyMetadataObjectRequest = newRequest;
                 }
             } else if ([request isEqualTo:refreshMetadataObjectRequest]) {
                 @synchronized(self) {
-                    refreshMetadataObjectRequest = newRequest;
+                    self.refreshMetadataObjectRequest = newRequest;
                 }
             } else if ([request isEqualTo:refreshVersionsObjectRequest]) {
                 @synchronized(self) {
-                    refreshVersionsObjectRequest = newRequest;
+                    self.refreshVersionsObjectRequest = newRequest;
                 }
             }
             [[PithosUtilities prepareRequest:newRequest priority:[[newRequest.userInfo objectForKey:@"priority"] integerValue]] startAsynchronous];
@@ -270,17 +262,17 @@ static NSImage *sharedIcon = nil;
             if ([request isEqualTo:applyMetadataObjectRequest]) {
                 [PithosUtilities httpRequestErrorAlertWithRequest:applyMetadataObjectRequest];
                 @synchronized(self) {
-                    applyMetadataObjectRequest = nil;
+                    self.applyMetadataObjectRequest = nil;
                 }
             } else if ([request isEqualTo:refreshMetadataObjectRequest]) {
                 [PithosUtilities httpRequestErrorAlertWithRequest:refreshMetadataObjectRequest];
                 @synchronized(self) {
-                    refreshMetadataObjectRequest = nil;
+                    self.refreshMetadataObjectRequest = nil;
                 }
             } else if ([request isEqualTo:refreshVersionsObjectRequest]) {
                 [PithosUtilities httpRequestErrorAlertWithRequest:refreshVersionsObjectRequest];
                 @synchronized(self) {
-                    refreshVersionsObjectRequest = nil;
+                    self.refreshVersionsObjectRequest = nil;
                 }
             }
         }
@@ -296,7 +288,7 @@ static NSImage *sharedIcon = nil;
             if (pithosObject.subdir) {
                 BOOL createObject = NO;
                 NSAlert *alert;
-                ASIPithosObjectRequest *request = [ASIPithosObjectRequest objectMetadataRequestWithPithos:pithos 
+                ASIPithosObjectRequest *request = [ASIPithosObjectRequest objectMetadataRequestWithPithos:pithosAccountManager.pithos 
                                                                                             containerName:pithosContainer.name 
                                                                                                objectName:prefix];
                 [PithosUtilities startAndWaitForRequest:request];
@@ -311,7 +303,7 @@ static NSImage *sharedIcon = nil;
                     [alert addButtonWithTitle:@"Cancel"];
                     NSInteger choice = [alert runModal];
                     if (choice == NSAlertFirstButtonReturn) {
-                        request = [ASIPithosObjectRequest deleteObjectRequestWithPithos:pithos 
+                        request = [ASIPithosObjectRequest deleteObjectRequestWithPithos:pithosAccountManager.pithos 
                                                                           containerName:pithosContainer.name 
                                                                              objectName:prefix];
                         [PithosUtilities startAndWaitForRequest:request];
@@ -358,7 +350,7 @@ static NSImage *sharedIcon = nil;
                             [allUsers removeObject:@""];
                             [allUsers removeObject:@"*"];
                             if (allUsers.count) {
-                                ASIPithosRequest *userCatalogRequest = [pithosAccountManager updateUserCatalogForForDisplaynames:[allUsers allObjects]
+                                ASIPithosRequest *userCatalogRequest = [pithosAccountManager updateUserCatalogForDisplaynames:[allUsers allObjects]
                                                                                                                            UUIDs:nil];
                                 if (userCatalogRequest.error || ((userCatalogRequest.responseStatusCode != 200) && (userCatalogRequest.responseStatusCode != 404))) {
                                     return;
@@ -453,18 +445,18 @@ static NSImage *sharedIcon = nil;
                     }
                     pithosObject.permissions = permissions;
                     
-                    applyMetadataObjectRequest = [ASIPithosObjectRequest writeObjectDataRequestWithPithos:pithos 
-                                                                                             containerName:pithosContainer.name 
-                                                                                                objectName:prefix 
-                                                                                                      eTag:nil
-                                                                                               contentType:@"application/directory"
-                                                                                           contentEncoding:pithosObject.contentEncoding 
-                                                                                        contentDisposition:pithosObject.contentDisposition 
-                                                                                                  manifest:pithosObject.manifest 
-                                                                                                   sharing:(pithosObject.sharing ? pithosObject.sharing : @"")
-                                                                                                  isPublic:(isPublic ? ASIPithosObjectRequestPublicTrue : ASIPithosObjectRequestPublicFalse) 
-                                                                                                  metadata:pithosObject.metadata 
-                                                                                                      data:[NSData data]];
+                    self.applyMetadataObjectRequest = [ASIPithosObjectRequest writeObjectDataRequestWithPithos:pithosAccountManager.pithos
+                                                                                                 containerName:pithosContainer.name
+                                                                                                    objectName:prefix
+                                                                                                          eTag:nil
+                                                                                                   contentType:@"application/directory"
+                                                                                               contentEncoding:pithosObject.contentEncoding
+                                                                                            contentDisposition:pithosObject.contentDisposition
+                                                                                                      manifest:pithosObject.manifest
+                                                                                                       sharing:(pithosObject.sharing ? pithosObject.sharing : @"")
+                                                                                                      isPublic:(isPublic ? ASIPithosObjectRequestPublicTrue : ASIPithosObjectRequestPublicFalse)
+                                                                                                      metadata:pithosObject.metadata
+                                                                                                          data:[NSData data]];
                     pithosObject.subdir = NO;
                     applyMetadataObjectRequest.delegate = self;
                     applyMetadataObjectRequest.didFinishSelector = @selector(performRequestFinishedDelegateInBackground:);
@@ -480,17 +472,17 @@ static NSImage *sharedIcon = nil;
             } else {
                 [[pithosNodeInfoController window] makeFirstResponder:nil];
                 if (sharingAccount) {
-                    applyMetadataObjectRequest = [ASIPithosObjectRequest updateObjectMetadataRequestWithPithos:pithos 
-                                                                                                  containerName:pithosContainer.name 
-                                                                                                     objectName:pithosObject.name 
-                                                                                                contentEncoding:nil
-                                                                                             contentDisposition:nil
-                                                                                                       manifest:nil 
-                                                                                                        sharing:nil 
-                                                                                                       isPublic:(isPublic ? ASIPithosObjectRequestPublicTrue : ASIPithosObjectRequestPublicFalse) 
-                                                                                                       metadata:pithosObject.metadata
-                                                                                                         update:NO];
-                    [applyMetadataObjectRequest setRequestUserFromDefaultTo:sharingAccount withPithos:pithos];
+                    self.applyMetadataObjectRequest = [ASIPithosObjectRequest updateObjectMetadataRequestWithPithos:pithosAccountManager.pithos
+                                                                                                      containerName:pithosContainer.name
+                                                                                                         objectName:pithosObject.name
+                                                                                                    contentEncoding:nil
+                                                                                                 contentDisposition:nil
+                                                                                                           manifest:nil
+                                                                                                            sharing:nil
+                                                                                                           isPublic:(isPublic ? ASIPithosObjectRequestPublicTrue : ASIPithosObjectRequestPublicFalse)
+                                                                                                           metadata:pithosObject.metadata
+                                                                                                             update:NO];
+                    [applyMetadataObjectRequest setRequestUserFromDefaultTo:sharingAccount withPithos:pithosAccountManager.pithos];
                 } else {
                     NSMutableArray *permissions = [NSMutableArray array];
                     if (translatedPermissions.count) {
@@ -515,7 +507,7 @@ static NSImage *sharedIcon = nil;
                             [allUsers removeObject:@""];
                             [allUsers removeObject:@"*"];
                             if (allUsers.count) {
-                                ASIPithosRequest *userCatalogRequest = [pithosAccountManager updateUserCatalogForForDisplaynames:[allUsers allObjects]
+                                ASIPithosRequest *userCatalogRequest = [pithosAccountManager updateUserCatalogForDisplaynames:[allUsers allObjects]
                                                                                                                            UUIDs:nil];
                                 if (userCatalogRequest.error || ((userCatalogRequest.responseStatusCode != 200) && (userCatalogRequest.responseStatusCode != 404))) {
                                     return;
@@ -610,16 +602,16 @@ static NSImage *sharedIcon = nil;
                     }
                     pithosObject.permissions = permissions;
 
-                    applyMetadataObjectRequest = [ASIPithosObjectRequest updateObjectMetadataRequestWithPithos:pithos 
-                                                                                                  containerName:pithosContainer.name 
-                                                                                                     objectName:pithosObject.name 
-                                                                                                contentEncoding:pithosObject.contentEncoding
-                                                                                             contentDisposition:pithosObject.contentDisposition 
-                                                                                                       manifest:pithosObject.manifest 
-                                                                                                        sharing:(pithosObject.sharing ? pithosObject.sharing : @"") 
-                                                                                                       isPublic:(isPublic ? ASIPithosObjectRequestPublicTrue : ASIPithosObjectRequestPublicFalse) 
-                                                                                                       metadata:pithosObject.metadata
-                                                                                                         update:NO];
+                    self.applyMetadataObjectRequest = [ASIPithosObjectRequest updateObjectMetadataRequestWithPithos:pithosAccountManager.pithos
+                                                                                                      containerName:pithosContainer.name
+                                                                                                         objectName:pithosObject.name
+                                                                                                    contentEncoding:pithosObject.contentEncoding
+                                                                                                 contentDisposition:pithosObject.contentDisposition
+                                                                                                           manifest:pithosObject.manifest
+                                                                                                            sharing:(pithosObject.sharing ? pithosObject.sharing : @"")
+                                                                                                           isPublic:(isPublic ? ASIPithosObjectRequestPublicTrue : ASIPithosObjectRequestPublicFalse)
+                                                                                                           metadata:pithosObject.metadata
+                                                                                                             update:NO];
                 }
                 applyMetadataObjectRequest.delegate = self;
                 applyMetadataObjectRequest.didFinishSelector = @selector(performRequestFinishedDelegateInBackground:);
@@ -642,11 +634,11 @@ static NSImage *sharedIcon = nil;
             self.pithosObject = [ASIPithosObject subdirWithName:pithosObject.name];
             return;
         } else if (refreshMetadataObjectRequest == nil) {
-            refreshMetadataObjectRequest = [ASIPithosObjectRequest objectMetadataRequestWithPithos:pithos 
-                                                                                      containerName:pithosContainer.name 
-                                                                                         objectName:prefix];
+            self.refreshMetadataObjectRequest = [ASIPithosObjectRequest objectMetadataRequestWithPithos:pithosAccountManager.pithos
+                                                                                          containerName:pithosContainer.name
+                                                                                             objectName:prefix];
             if (sharingAccount)
-                [refreshMetadataObjectRequest setRequestUserFromDefaultTo:sharingAccount withPithos:pithos];
+                [refreshMetadataObjectRequest setRequestUserFromDefaultTo:sharingAccount withPithos:pithosAccountManager.pithos];
             refreshMetadataObjectRequest.delegate = self;
             refreshMetadataObjectRequest.didFinishSelector = @selector(performRequestFinishedDelegateInBackground:);
             refreshMetadataObjectRequest.didFailSelector = @selector(performRequestFailedDelegateInBackground:);
@@ -672,11 +664,11 @@ static NSImage *sharedIcon = nil;
         if (pithosObject.subdir) {
             return;
         } else if (refreshVersionsObjectRequest == nil) {
-            refreshVersionsObjectRequest = [ASIPithosObjectRequest objectVersionsRequestWithPithos:pithos 
-                                                                                      containerName:pithosContainer.name 
-                                                                                         objectName:pithosObject.name];
+            self.refreshVersionsObjectRequest = [ASIPithosObjectRequest objectVersionsRequestWithPithos:pithosAccountManager.pithos
+                                                                                          containerName:pithosContainer.name
+                                                                                             objectName:pithosObject.name];
             if (sharingAccount)
-                [refreshVersionsObjectRequest setRequestUserFromDefaultTo:sharingAccount withPithos:pithos];
+                [refreshVersionsObjectRequest setRequestUserFromDefaultTo:sharingAccount withPithos:pithosAccountManager.pithos];
             refreshVersionsObjectRequest.delegate = self;
             refreshVersionsObjectRequest.didFinishSelector = @selector(performRequestFinishedDelegateInBackground:);
             refreshVersionsObjectRequest.didFailSelector = @selector(performRequestFailedDelegateInBackground:);