Simplify default and support custom notifications for nodes.

[pithos-macos] / pithos-macos / PithosSharingAccountsNode.m

diff --git a/pithos-macos/PithosSharingAccountsNode.m b/pithos-macos/PithosSharingAccountsNode.m
index 029d331..f96b598 100644 (file)
--- a/pithos-macos/PithosSharingAccountsNode.m
+++ b/pithos-macos/PithosSharingAccountsNode.m
@@ -2,7 +2,7 @@
 //  PithosAccountNode.m
 //  pithos-macos
 //
-// Copyright 2011 GRNET S.A. All rights reserved.
+// Copyright 2011-2012 GRNET S.A. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or
 // without modification, are permitted provided that the following
@@ -38,18 +38,21 @@
 #import "PithosSharingAccountsNode.h"
 #import "PithosAccountNode.h"
 #import "ASIPithosRequest.h"
+#import "ASIPithos.h"
 #import "ASIPithosAccount.h"
 #import "ASIDownloadCache.h"
 #import "PithosUtilities.h"
 #import "PithosActivityFacility.h"
 
 @implementation PithosSharingAccountsNode
+@synthesize pithos;
 
 #pragma mark -
 #pragma mark Object Lifecycle
 
-- (id)init {
-    if ((self == [super init])) {
+- (id)initWithPithos:(ASIPithos *)aPithos {
+    if ((self = [super init])) {
+        self.pithos = aPithos;
         self.sharingAccount = @"";
     }
     return self;
@@ -59,15 +62,25 @@
     [sharingAccountsRequest clearDelegatesAndCancel];
     [sharingAccountsRequest release];
     [sharingAccounts release];
+    [pithos release];
     [super dealloc];
 }
 
 #pragma mark -
 #pragma mark Properties
 
+- (void)setPithos:(ASIPithos *)aPithos {
+    if (aPithos && ![aPithos isEqualTo:pithos]) {
+        [pithos release];
+        pithos = [aPithos retain];
+        [url release];
+        url = nil;
+    }
+}
+
 - (NSString *)url {
     if (url == nil) 
-        url = [[ASIPithosRequest storageURLPrefix] copy];
+        url = [pithos.storageURLPrefix copy];
     return url;
 }
 
@@ -78,13 +91,15 @@
                 break;
             case PithosNodeStateRefreshNeeded:
                 freshness = PithosNodeStateRefreshing;
-                sharingAccountsRequest = [[ASIPithosRequest listSharingAccountsRequestWithLimit:0 
-                                                                                         marker:nil] retain];
+                sharingAccountsRequest = [[ASIPithosRequest listSharingAccountsRequestWithPithos:pithos limit:0 marker:nil] retain];
                 sharingAccountsRequest.delegate = self;
-                sharingAccountsRequest.didFinishSelector = @selector(sharingAccountsRequestFinished:);
-                sharingAccountsRequest.didFailSelector = @selector(sharingAccountsRequestFailed:);
+                sharingAccountsRequest.didFinishSelector = @selector(performRequestFinishedDelegateInBackground:);
+                sharingAccountsRequest.didFailSelector = @selector(performRequestFailedDelegateInBackground:);
                 sharingAccountsRequest.userInfo = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                                                   [NSNumber numberWithInteger:NSOperationQueuePriorityVeryHigh], @"priority", 
                                                    [NSNumber numberWithUnsignedInteger:10], @"retries", 
+                                                   NSStringFromSelector(@selector(sharingAccountsRequestFinished:)), @"didFinishSelector", 
+                                                   NSStringFromSelector(@selector(sharingAccountsRequestFailed:)), @"didFailSelector", 
                                                    nil];
                 if (!forcedRefresh)
                     sharingAccountsRequest.downloadCache = [ASIDownloadCache sharedCache];
@@ -116,13 +131,14 @@
 #pragma mark ASIHTTPRequestDelegate
 
 - (void)sharingAccountsRequestFailed:(ASIPithosRequest *)request {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     NSUInteger retries = [[sharingAccountsRequest.userInfo objectForKey:@"retries"] unsignedIntegerValue];
     if (retries > 0) {
         ASIPithosRequest *newSharingAccountsRequest = (ASIPithosRequest *)[PithosUtilities copyRequest:sharingAccountsRequest];
         [(NSMutableDictionary *)(newSharingAccountsRequest.userInfo)setObject:[NSNumber numberWithUnsignedInteger:(--retries)] forKey:@"retries"];
         [sharingAccountsRequest release];
         sharingAccountsRequest = newSharingAccountsRequest;
-        [[PithosUtilities prepareRequest:sharingAccountsRequest priority:NSOperationQueuePriorityVeryHigh] startAsynchronous];
+        [[PithosUtilities prepareRequest:sharingAccountsRequest priority:[[sharingAccountsRequest.userInfo objectForKey:@"priority"] integerValue]] startAsynchronous];
     } else {
         NSString *message;
         NSError *error = [sharingAccountsRequest error];
@@ -131,7 +147,9 @@
         else
             message = [NSString stringWithFormat:@"Sharing accounts listing failed: (%d) %@", 
                        sharingAccountsRequest.responseStatusCode, sharingAccountsRequest.responseStatusMessage];
-        [[PithosActivityFacility defaultPithosActivityFacility] startAndEndActivityWithType:PithosActivityOther message:message];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [[PithosActivityFacility defaultPithosActivityFacility] startAndEndActivityWithType:PithosActivityOther message:message];
+        });
         [newChildren release];
         newChildren = nil;
         [sharingAccountsRequest release];
@@ -143,9 +161,11 @@
             freshness = PithosNodeStateRefreshNeeded;
         }
     }
+    [pool drain];
 }
 
 - (void)sharingAccountsRequestFinished:(ASIPithosRequest *)request {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     NSLog(@"List sharing accounts finished: %@", [sharingAccountsRequest url]);
     NSLog(@"Cached: %d", [sharingAccountsRequest didUseCachedResponse]);
     if (sharingAccountsRequest.responseStatusCode == 200) {
@@ -162,11 +182,12 @@
                 newChildren = [[NSMutableArray alloc] init];
                 NSMutableIndexSet *keptNodes = [NSMutableIndexSet indexSet];
                 for (ASIPithosAccount *account in sharingAccounts) {
-                    if (![account.name isEqualToString:[ASIPithosRequest authUser]]) {
-                        PithosAccountNode *node = [[[PithosAccountNode alloc] init] autorelease];
+                    if (![account.name isEqualToString:pithos.authUser]) {
+                        PithosAccountNode *node = [[[PithosAccountNode alloc] initWithPithos:pithos] autorelease];
                         node.parent = self;
                         node.shared = shared;
                         node.sharingAccount = account.name;
+                        node.inheritChildrenUpdatedNotificationName = inheritChildrenUpdatedNotificationName;
                         if (children) {
                             NSUInteger oldIndex = [children indexOfObject:node];
                             if (oldIndex != NSNotFound) {
@@ -194,18 +215,21 @@
             @synchronized(self) {
                 freshness = PithosNodeStateRefreshFinished;
             }
-            // Notify observers that children are updated
-            [[NSNotificationCenter defaultCenter] postNotificationName:@"PithosSharingAccountsNodeChildrenUpdated" object:self];
+            [self postChildrenUpdatedNotificationName];
         } else {
             [sharingAccountsRequest release];
             // Do an additional request to fetch more objects
-            sharingAccountsRequest = [[ASIPithosRequest listSharingAccountsRequestWithLimit:0 
-                                                                                     marker:[[someSharingAccounts lastObject] name]] retain];
+            sharingAccountsRequest = [[ASIPithosRequest listSharingAccountsRequestWithPithos:pithos 
+                                                                                       limit:0 
+                                                                                      marker:[[someSharingAccounts lastObject] name]] retain];
             sharingAccountsRequest.delegate = self;
-            sharingAccountsRequest.didFinishSelector = @selector(sharingAccountsRequestFinished:);
-            sharingAccountsRequest.didFailSelector = @selector(sharingAccountsRequestFailed:);
+            sharingAccountsRequest.didFinishSelector = @selector(performRequestFinishedDelegateInBackground:);
+            sharingAccountsRequest.didFailSelector = @selector(performRequestFailedDelegateInBackground:);
             sharingAccountsRequest.userInfo = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                                               [NSNumber numberWithInteger:NSOperationQueuePriorityVeryHigh], @"priority", 
                                                [NSNumber numberWithUnsignedInteger:10], @"retries", 
+                                               NSStringFromSelector(@selector(sharingAccountsRequestFinished:)), @"didFinishSelector", 
+                                               NSStringFromSelector(@selector(sharingAccountsRequestFailed:)), @"didFailSelector", 
                                                nil];
             if (!forcedRefresh)
                 sharingAccountsRequest.downloadCache = [ASIDownloadCache sharedCache];
@@ -214,6 +238,7 @@
     } else {
         [self sharingAccountsRequestFailed:sharingAccountsRequest];
     }
+    [pool drain];
 }
 
 @end