/ - Diff - Pithos iOS Client - Greek Research and Technology Network's projects

+                }
                 success(request);
                 [request notify];
             } else if (request.retryWithUpdatedURL && ((request.responseStatusCode == 401) || (request.responseStatusCode == 404))) {
             } else if (request.retryWithUpdatedURL &&
                        ((request.responseStatusCode == 401) || (request.responseStatusCode == 404) || (request.responseStatusCode == 0))) {
                 [self retryWithUpdatedURL:request success:success failure:failure];
             } else {
                 failure(request);
-...
+            }
         }];
         [request setFailedBlock:^{
             if (request.retryWithUpdatedURL && ((request.responseStatusCode == 401) || (request.responseStatusCode == 404))) {
             if (request.retryWithUpdatedURL &&
                 ((request.responseStatusCode == 401) || (request.responseStatusCode == 404) || (request.responseStatusCode == 0))) {
                 [self retryWithUpdatedURL:request success:success failure:failure];
             } else {
                 failure(request);
-...
     - (void)retryWithUpdatedURL:(OpenStackRequest *)request success:(APIResponseBlock)success failure:(APIResponseBlock)failure {
         [[self serviceCatalog] success:^(OpenStackRequest *serviceRequest) {
             OpenStackRequest *newRequest = [[request copy] autorelease];
             if (newRequest.retryType == OpenStackRequestTypeAuthEndpoint) {
                 NSString *urlPrefix = [account.provider.authEndpointURL description];
                 if (![urlPrefix hasSuffix:@"/"])
                     urlPrefix = [urlPrefix stringByAppendingString:@"/"];
                 NSString *urlSuffix = [[newRequest.url description] substringFromIndex:[[newRequest.retryBaseURL description] length]];
                 while ([urlSuffix hasPrefix:@"/"])
                     urlSuffix = [urlSuffix substringFromIndex:1];
                 newRequest.url = [NSURL URLWithString:[NSString stringWithFormat:@"%@%@", urlPrefix, urlSuffix]];
             } else if (newRequest.retryType == OpenStackRequestTypeUserCatalog) {
                 NSString *urlPrefix = [account.provider.userCatalogURL description];
                 if (![urlPrefix hasSuffix:@"/"])
                     urlPrefix = [urlPrefix stringByAppendingString:@"/"];
                 NSString *urlSuffix = [[newRequest.url description] substringFromIndex:[[newRequest.retryBaseURL description] length]];
                 while ([urlSuffix hasPrefix:@"/"])
                     urlSuffix = [urlSuffix substringFromIndex:1];
                 newRequest.url = [NSURL URLWithString:[NSString stringWithFormat:@"%@%@", urlPrefix, urlSuffix]];
+            }
             newRequest.retryWithUpdatedURL = NO;
             [self start:newRequest success:success failure:failure];
         } failure:^(OpenStackRequest *serviceRequest) {

b/Classes/OpenStackAccount.h
18	18	@property (nonatomic, retain) NSString *username;
19	19	@property (nonatomic, retain) NSString *apiKey;
20	20	@property (nonatomic, retain) NSString *authToken;
21		@property (nonatomic, readonly) NSURL *filesURL;
22	21	@property (nonatomic, retain) AccountManager *manager;
23	22	@property (nonatomic, retain) NSNumber *bytesUsed;
24	23	@property (nonatomic, retain) NSNumber *policyQuota;

     @implementation OpenStackAccount
     @synthesize uuid, provider, username, filesURL, manager,
     @synthesize uuid, provider, username, manager,
                 bytesUsed, policyQuota, containers, hasBeenRefreshed, flaggedForDelete,
                 shared, sharingAccount, userCatalog, ignoreSSLErrors;
-...
     #pragma mark - Properties
     - (NSURL *)filesURL {
         return [self.provider.authEndpointURL URLByAppendingPathComponent:self.username];
+    }
     - (void)setShared:(BOOL)aShared {
         if (shared != aShared) {
             self.containers = nil;

     @class OpenStackAccount, Container, StorageObject, APICallback, ErrorAlerter;
     enum {
         OpenStackRequestTypeUserCatalog = 0,
         OpenStackRequestTypeAuthEndpoint = 1
     };
     typedef NSInteger OpenStackRequestType;
     @interface OpenStackRequest : ASIHTTPRequest <NSCopying> {
         OpenStackAccount *account;
         ASIBasicBlock backupCompletionBlock;
         ASIBasicBlock backupFailureBlock;
         APICallback *callback;
         BOOL retryWithUpdatedURL;
         NSURL *retryBaseURL;
         OpenStackRequestType retryType;
         NSString *followUpSelectorString;
         NSURL *notificationURL;
+    }
-...
     @property (nonatomic, retain) APICallback *callback;
     @property (nonatomic, retain) ErrorAlerter *errorAlerter;
     @property (nonatomic, assign) BOOL retryWithUpdatedURL;
     @property (nonatomic, retain) NSURL *retryBaseURL;
     @property (nonatomic, assign) OpenStackRequestType retryType;
     @property (nonatomic, retain) NSString *followUpSelectorString;
     @property (nonatomic, retain) NSURL *notificationURL;

     @implementation OpenStackRequest
     @synthesize account, callback, errorAlerter, retryWithUpdatedURL, followUpSelectorString, notificationURL;
     @synthesize account, callback, errorAlerter, retryWithUpdatedURL, retryBaseURL, retryType, followUpSelectorString, notificationURL;
     #pragma mark - Constructors
     #pragma mark Generic
-...
         request.timeOutSeconds = 60;
         request.numberOfTimesToRetryOnTimeout = 5;
         request.validatesSecureCertificate = !account.ignoreSSLErrors;
         request.retryWithUpdatedURL = (account.provider.manual ? NO : YES);
         request.retryWithUpdatedURL = NO;
     	return request;
+    }
     + (id)request:(OpenStackAccount *)account method:(NSString *)method url:(NSURL *)url {
     	OpenStackRequest *request = [self requestWithoutToken:account method:method url:url];
         request.retryWithUpdatedURL = (account.provider.manual ? NO : YES);
     	[request addRequestHeader:@"X-Auth-Token" value:account.authToken];
     	return request;
+    }
     + (id)filesRequest:(OpenStackAccount *)account method:(NSString *)method path:(NSString *)path {
         NSString *urlString = [account.filesURL description];
         if (account.sharingAccount) {
             urlString = [NSString stringWithFormat:@"%@%@",
                          [urlString substringToIndex:[urlString rangeOfString:account.username].location],
                          account.sharingAccount];
+        }
         NSString *urlString = [[account.provider.authEndpointURL
                                 URLByAppendingPathComponent:(account.sharingAccount ? account.sharingAccount : account.username)] description];
     	NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@%@?format=json%@",
                                            urlString,
                                            path,
                                            (account.shared ? @"&shared=" : @"")]];
         return [self request:account method:method url:url];
         OpenStackRequest *request = [self request:account method:method url:url];
         request.retryBaseURL = account.provider.authEndpointURL;
         request.retryType = OpenStackRequestTypeAuthEndpoint;
         return request;
+    }
     #pragma mark NSCopying
-...
         newRequest.callback = self.callback;
         newRequest.errorAlerter = self.errorAlerter;
         newRequest.retryWithUpdatedURL = self.retryWithUpdatedURL;
         newRequest.retryBaseURL = self.retryBaseURL;
         newRequest.retryType = self.retryType;
         newRequest.followUpSelectorString = self.followUpSelectorString;
         newRequest.notificationURL = self.notificationURL;
         return newRequest;
-...
     #pragma mark User Catalog
     + (id)userCatalogRequest:(OpenStackAccount *)account displaynames:(NSArray *)displaynames UUIDs:(NSArray *)UUIDs {
         OpenStackRequest *request = [self request:account method:@"POST" url:account.provider.userCatalogURL];
         request.retryBaseURL = account.provider.userCatalogURL;
         request.retryType = OpenStackRequestTypeUserCatalog;
         NSMutableString *dataString = [NSMutableString stringWithString:@"{\"displaynames\":["];
         if (displaynames) {
             for (NSUInteger index = 0 ; index < displaynames.count ; index++) {
-...
         request.numberOfTimesToRetryOnTimeout = 5;
         request.validatesSecureCertificate = !account.ignoreSSLErrors;
         request.retryWithUpdatedURL = (account.provider.manual ? NO : YES);
         request.retryBaseURL = account.provider.authEndpointURL;
         request.retryType = OpenStackRequestTypeAuthEndpoint;
     	return request;
+    }
-...
         OpenStackRequest *request = [self request:account method:@"GET"
                                               url:[NSURL URLWithString:[NSString stringWithFormat:@"%@?format=json",
                                                                         account.provider.authEndpointURL]]];
         request.retryBaseURL = account.provider.authEndpointURL;
         request.retryType = OpenStackRequestTypeAuthEndpoint;
         if (marker)
             request.url = [NSURL URLWithString:[NSString stringWithFormat:@"%@&marker=%@", request.url.description, [NSString encodeToPercentEscape:marker]]];
         if (!sharingAccountsBuffer)
-...
     - (void)dealloc {
         [account release];
         [errorAlerter release];
         [retryBaseURL release];
         [followUpSelectorString release];
         [notificationURL release];
         [self releaseBackupBlocksOnMainThread];

     		</dict>
     	</array>
     	<key>CFBundleVersion</key>
     	<string>20130702.0</string>
     	<string>20130704.0</string>
     	<key>LSRequiresIPhoneOS</key>
     	<true/>
     	<key>NSMainNibFile</key>

Synnefo » Pithos iOS Client

Revision 62ea6d49