Revision 7c60da08

b/asi-http-request-with-pithos/Classes/Pithos/ASIPithosObjectRequest.h
329 329
                                 bytes:(NSUInteger)bytes 
330 330
                           ifNoneMatch:(NSString *)matchETag;
331 331
// PUT storageURL/container/object (copy from source)
332
+ (id)copyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
332
+ (id)cpyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
333 333
                          contentType:(NSString *)contentType 
334 334
                      contentEncoding:(NSString *)contentEncoding 
335 335
                   contentDisposition:(NSString *)contentDisposition 
......
342 342
                        sourceAccount:(NSString *)sourceAccount
343 343
                        sourceVersion:(NSString *)sourceVersion;
344 344
// PUT storageURL/container/object (copy from source) [If-Match]
345
+ (id)copyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
345
+ (id)cpyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
346 346
                          contentType:(NSString *)contentType 
347 347
                      contentEncoding:(NSString *)contentEncoding 
348 348
                   contentDisposition:(NSString *)contentDisposition 
......
356 356
                        sourceVersion:(NSString *)sourceVersion 
357 357
                              ifMatch:(NSString *)matchETag;
358 358
// PUT storageURL/container/object (copy from source) [If-None-Match]
359
+ (id)copyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
359
+ (id)cpyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
360 360
                          contentType:(NSString *)contentType 
361 361
                      contentEncoding:(NSString *)contentEncoding 
362 362
                   contentDisposition:(NSString *)contentDisposition 
......
370 370
                        sourceVersion:(NSString *)sourceVersion 
371 371
                          ifNoneMatch:(NSString *)matchETag;
372 372
// COPY storageURL/container/object (copy to destination)
373
+ (id)copyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
373
+ (id)cpyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
374 374
                          contentType:(NSString *)contentType 
375 375
                      contentEncoding:(NSString *)contentEncoding 
376 376
                   contentDisposition:(NSString *)contentDisposition 
......
383 383
                   destinationAccount:(NSString *)destinationAccount
384 384
                        sourceVersion:(NSString *)sourceVersion;
385 385
// COPY storageURL/container/object (copy to destination) [If-Match]
386
+ (id)copyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
386
+ (id)cpyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
387 387
                          contentType:(NSString *)contentType 
388 388
                      contentEncoding:(NSString *)contentEncoding 
389 389
                   contentDisposition:(NSString *)contentDisposition 
......
397 397
                        sourceVersion:(NSString *)sourceVersion 
398 398
                              ifMatch:(NSString *)matchETag;
399 399
// COPY storageURL/container/object (copy to destination) [If-None-Match]
400
+ (id)copyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
400
+ (id)cpyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
401 401
                          contentType:(NSString *)contentType 
402 402
                      contentEncoding:(NSString *)contentEncoding 
403 403
                   contentDisposition:(NSString *)contentDisposition 
b/asi-http-request-with-pithos/Classes/Pithos/ASIPithosObjectRequest.m
835 835
}
836 836

  
837 837
// PUT storageURL/container/object (copy from source)
838
+ (id)copyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
838
+ (id)cpyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName
839 839
                          contentType:(NSString *)contentType 
840 840
                      contentEncoding:(NSString *)contentEncoding 
841 841
                   contentDisposition:(NSString *)contentDisposition 
......
868 868
}
869 869

  
870 870
// PUT storageURL/container/object (copy from source) [If-Match]
871
+ (id)copyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
871
+ (id)cpyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
872 872
                          contentType:(NSString *)contentType 
873 873
                      contentEncoding:(NSString *)contentEncoding 
874 874
                   contentDisposition:(NSString *)contentDisposition 
......
881 881
                        sourceAccount:(NSString *)sourceAccount
882 882
                        sourceVersion:(NSString *)sourceVersion 
883 883
                              ifMatch:(NSString *)matchETag {
884
    ASIPithosObjectRequest *request = [self copyObjectDataRequestWithPithos:pithos containerName:containerName objectName:objectName 
884
    ASIPithosObjectRequest *request = [self cpyObjectDataRequestWithPithos:pithos containerName:containerName objectName:objectName 
885 885
                                                                       contentType:contentType 
886 886
                                                                   contentEncoding:contentEncoding 
887 887
                                                                contentDisposition:contentDisposition 
......
898 898
}
899 899

  
900 900
// PUT storageURL/container/object (copy from source) [If-None-Match]
901
+ (id)copyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
901
+ (id)cpyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
902 902
                          contentType:(NSString *)contentType 
903 903
                      contentEncoding:(NSString *)contentEncoding 
904 904
                   contentDisposition:(NSString *)contentDisposition 
......
911 911
                        sourceAccount:(NSString *)sourceAccount
912 912
                        sourceVersion:(NSString *)sourceVersion 
913 913
                          ifNoneMatch:(NSString *)matchETag {
914
    ASIPithosObjectRequest *request = [self copyObjectDataRequestWithPithos:pithos containerName:containerName objectName:objectName 
914
    ASIPithosObjectRequest *request = [self cpyObjectDataRequestWithPithos:pithos containerName:containerName objectName:objectName 
915 915
                                                                       contentType:contentType 
916 916
                                                                   contentEncoding:contentEncoding 
917 917
                                                                contentDisposition:contentDisposition 
......
928 928
}
929 929

  
930 930
// COPY storageURL/container/object (copy to destination)
931
+ (id)copyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
931
+ (id)cpyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
932 932
                          contentType:(NSString *)contentType 
933 933
                      contentEncoding:(NSString *)contentEncoding 
934 934
                   contentDisposition:(NSString *)contentDisposition 
......
963 963
}
964 964

  
965 965
// COPY storageURL/container/object (copy to destination) [If-Match]
966
+ (id)copyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
966
+ (id)cpyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
967 967
                          contentType:(NSString *)contentType 
968 968
                      contentEncoding:(NSString *)contentEncoding 
969 969
                   contentDisposition:(NSString *)contentDisposition 
......
976 976
                   destinationAccount:(NSString *)destinationAccount
977 977
                        sourceVersion:(NSString *)sourceVersion 
978 978
                              ifMatch:(NSString *)matchETag {
979
    ASIPithosObjectRequest *request = [self copyObjectDataRequestWithPithos:pithos containerName:containerName objectName:objectName 
979
    ASIPithosObjectRequest *request = [self cpyObjectDataRequestWithPithos:pithos containerName:containerName objectName:objectName 
980 980
                                                                       contentType:contentType 
981 981
                                                                   contentEncoding:contentEncoding 
982 982
                                                                contentDisposition:contentDisposition 
......
993 993
}
994 994

  
995 995
// COPY storageURL/container/object (copy to destination) [If-None-Match]
996
+ (id)copyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
996
+ (id)cpyObjectDataRequestWithPithos:(ASIPithos *)pithos containerName:(NSString *)containerName objectName:(NSString *)objectName 
997 997
                          contentType:(NSString *)contentType 
998 998
                      contentEncoding:(NSString *)contentEncoding 
999 999
                   contentDisposition:(NSString *)contentDisposition 
......
1006 1006
                   destinationAccount:(NSString *)destinationAccount
1007 1007
                        sourceVersion:(NSString *)sourceVersion 
1008 1008
                          ifNoneMatch:(NSString *)matchETag {
1009
    ASIPithosObjectRequest *request = [self copyObjectDataRequestWithPithos:pithos containerName:containerName objectName:objectName 
1009
    ASIPithosObjectRequest *request = [self cpyObjectDataRequestWithPithos:pithos containerName:containerName objectName:objectName 
1010 1010
                                                                       contentType:contentType 
1011 1011
                                                                   contentEncoding:contentEncoding 
1012 1012
                                                                contentDisposition:contentDisposition 
b/asi-http-request-with-pithos/Classes/Pithos/ASIPithosRequest.m
87 87
	[request startSynchronous];
88 88
	// XXX start asynchronous with polling loop?
89 89
    
90
    *error = [request error];
91
	if (!*error) {
92
		NSDictionary *responseHeaders = [request responseHeaders];
93
        pithos.authToken = [responseHeaders objectForKey:@"X-Auth-Token"];
94
        pithos.storageURL = [responseHeaders objectForKey:@"X-Storage-Url"];
95
        return pithos;
96
	}    
90
    if (error != NULL) {
91
        *error = [request error];
92
        if (!*error) {
93
            NSDictionary *responseHeaders = [request responseHeaders];
94
            pithos.authToken = [responseHeaders objectForKey:@"X-Auth-Token"];
95
            pithos.storageURL = [responseHeaders objectForKey:@"X-Storage-Url"];
96
            return pithos;
97
        }
98
    }
97 99
	return nil;
98 100
}
99 101

  

Also available in: Unified diff