@@ -12,17 +12,17 @@ * access to RTM Web API. */ @interface RTMAPI : NSObject { - enum { - TIMELINES_CREATE - } method_; + enum { + TIMELINES_CREATE + } method_; - NSString *timeline; //!< for parser + NSString *timeline; //!< for parser } + (void) setApiKey:(NSString *)key; + (void) setSecret:(NSString *)sec; + (void) setToken:(NSString *)tok; - + /** * call RTM API method with args. * api/RTMAPI.h @@ -56,11 +56,11 @@ static NSString *s_token; NSData *ret = [NSURLConnection sendSynchronousRequest:req returningResponse:&res error:&err]; - if (NULL == ret) { + if (NULL == ret) { LOG(@"failed in API call: %@, url=%@", [err localizedDescription], url); - } else { + } else { LOG(@"API call succeeded for url=%@", url); - } + } #ifdef DUMP_API_RESPONSE if (ret) { api/RTMAPI.m @@ -15,14 +15,14 @@ * ListGetCallback */ @interface ListGetCallback : RTMAPIXMLParserCallback { - enum { - LIST, - FILTER - } mode; - - NSMutableDictionary *params; - NSMutableArray *lists; - BOOL skip; + enum { + LIST, + FILTER + } mode; + + NSMutableDictionary *params; + NSMutableArray *lists; + BOOL skip; } - (NSArray *)lists; @@ -33,30 +33,30 @@ - (NSArray *)lists { - return lists; + return lists; } - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName attributes:(NSDictionary *)attributeDict { - [super parser:parser didStartElement:elementName namespaceURI:namespaceURI qualifiedName:qualifiedName attributes:attributeDict]; - - if ([elementName isEqualToString:@"lists"]) { - lists = [NSMutableArray array]; - skip = NO; - } else if ([elementName isEqualToString:@"list"]) { - mode = LIST; - // some filtering - if ( - [[attributeDict valueForKey:@"name"] isEqualToString:@"Sent"] || - [[attributeDict valueForKey:@"smart"] isEqualToString:@"1"]) { - skip = YES; - } else { + [super parser:parser didStartElement:elementName namespaceURI:namespaceURI qualifiedName:qualifiedName attributes:attributeDict]; + + if ([elementName isEqualToString:@"lists"]) { + lists = [NSMutableArray array]; skip = NO; - params = [NSMutableDictionary dictionaryWithDictionary:attributeDict]; - } - } else if ([elementName isEqualToString:@"filter"]) { - mode = FILTER; - } + } else if ([elementName isEqualToString:@"list"]) { + mode = LIST; + // some filtering + if ( + [[attributeDict valueForKey:@"name"] isEqualToString:@"Sent"] || + [[attributeDict valueForKey:@"smart"] isEqualToString:@"1"]) { + skip = YES; + } else { + skip = NO; + params = [NSMutableDictionary dictionaryWithDictionary:attributeDict]; + } + } else if ([elementName isEqualToString:@"filter"]) { + mode = FILTER; + } } - (void)parser:(NSXMLParser *)parser foundCharacters:(NSString *)chars @@ -69,18 +69,18 @@ if (i == len) return; - if (FILTER != mode) - @throw @"characters should be found in <filter>"; - [params setObject:chars forKey:@"filter"]; + if (FILTER != mode) + @throw @"characters should be found in <filter>"; + [params setObject:chars forKey:@"filter"]; } - (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName { - if ([elementName isEqualToString:@"list"] && !skip) { - [lists addObject:params]; - } else if ([elementName isEqualToString:@"filter"]) { - mode = LIST; - } + if ([elementName isEqualToString:@"list"] && !skip) { + [lists addObject:params]; + } else if ([elementName isEqualToString:@"filter"]) { + mode = LIST; + } } @end @@ -88,7 +88,7 @@ * ListAddCallback */ @interface ListAddCallback : RTMAPIXMLParserCallback { - NSString * iD; + NSString * iD; } @property (nonatomic, readonly) NSString * iD; @end @@ -98,12 +98,12 @@ - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName attributes:(NSDictionary *)attributeDict { - [super parser:parser didStartElement:elementName namespaceURI:namespaceURI qualifiedName:qualifiedName attributes:attributeDict]; - - if ([elementName isEqualToString:@"list"]) { - iD = [attributeDict valueForKey:@"id"]; - // [parser abortParsing]; // shortcut - } + [super parser:parser didStartElement:elementName namespaceURI:namespaceURI qualifiedName:qualifiedName attributes:attributeDict]; + + if ([elementName isEqualToString:@"list"]) { + iD = [attributeDict valueForKey:@"id"]; + // [parser abortParsing]; // shortcut + } } @end @@ -118,12 +118,12 @@ - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName attributes:(NSDictionary *)attributeDict { - [super parser:parser didStartElement:elementName namespaceURI:namespaceURI qualifiedName:qualifiedName attributes:attributeDict]; - - if ([elementName isEqualToString:@"list"]) { - if (1 != [[attributeDict valueForKey:@"deleted"] integerValue]) - @throw @"failed in deleting a list."; - } + [super parser:parser didStartElement:elementName namespaceURI:namespaceURI qualifiedName:qualifiedName attributes:attributeDict]; + + if ([elementName isEqualToString:@"list"]) { + if (1 != [[attributeDict valueForKey:@"deleted"] integerValue]) + @throw @"failed in deleting a list."; + } } @end @@ -139,66 +139,66 @@ NSString *path = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"rtm.lists.getList.xml"]; NSData *response = [NSData dataWithContentsOfFile:path]; #else // LOCAL_DEBUG - RTMAPI *api = [[[RTMAPI alloc] init] autorelease]; - NSData *response = [api call:@"rtm.lists.getList" withArgs:nil]; + RTMAPI *api = [[[RTMAPI alloc] init] autorelease]; + NSData *response = [api call:@"rtm.lists.getList" withArgs:nil]; #endif // LOCAL_DEBUG - if (! response) return nil; - - method = LISTS_GETLIST; - NSXMLParser *parser = [[[NSXMLParser alloc] initWithData:response] autorelease]; - ListGetCallback *cb = [[[ListGetCallback alloc] init] autorelease]; - [parser setDelegate:cb]; - if (! [parser parse]) - @throw @"failed in parsing rtm.lists.getList response."; - return [cb lists]; + if (! response) return nil; + + method = LISTS_GETLIST; + NSXMLParser *parser = [[[NSXMLParser alloc] initWithData:response] autorelease]; + ListGetCallback *cb = [[[ListGetCallback alloc] init] autorelease]; + [parser setDelegate:cb]; + if (! [parser parse]) + @throw @"failed in parsing rtm.lists.getList response."; + return [cb lists]; } - (NSString *) add:(NSString *)name withFilter:(NSString *)filter { - RTMAPI *api = [[[RTMAPI alloc] init] autorelease]; - NSString *timeline = [api createTimeline]; - if (! timeline) return nil; - NSArray *keys = [NSArray arrayWithObjects:@"name", @"timeline", nil]; - NSArray *vals = [NSArray arrayWithObjects:name, timeline, nil]; - - NSMutableDictionary *args = [NSDictionary dictionaryWithObjects:vals - forKeys:keys]; - if (filter) - [args setObject:filter forKey:@"filter"]; - - NSData *response = [api call:@"rtm.lists.add" withArgs:args]; - if (! response) return nil; - - NSXMLParser *parser = [[[NSXMLParser alloc] initWithData:response] autorelease]; - ListAddCallback *cb = [[[ListAddCallback alloc] init] autorelease]; - [parser setDelegate:cb]; - if (! [parser parse]) - @throw @"failed in parsing rtm.lists.add response."; - return cb.iD; + RTMAPI *api = [[[RTMAPI alloc] init] autorelease]; + NSString *timeline = [api createTimeline]; + if (! timeline) return nil; + NSArray *keys = [NSArray arrayWithObjects:@"name", @"timeline", nil]; + NSArray *vals = [NSArray arrayWithObjects:name, timeline, nil]; + + NSMutableDictionary *args = [NSDictionary dictionaryWithObjects:vals + forKeys:keys]; + if (filter) + [args setObject:filter forKey:@"filter"]; + + NSData *response = [api call:@"rtm.lists.add" withArgs:args]; + if (! response) return nil; + + NSXMLParser *parser = [[[NSXMLParser alloc] initWithData:response] autorelease]; + ListAddCallback *cb = [[[ListAddCallback alloc] init] autorelease]; + [parser setDelegate:cb]; + if (! [parser parse]) + @throw @"failed in parsing rtm.lists.add response."; + return cb.iD; } - (BOOL) delete:(NSString *)list_id { - RTMAPI *api = [[[RTMAPI alloc] init] autorelease]; - NSString *timeline = [api createTimeline]; - if (! timeline) return NO; - NSArray *keys = [NSArray arrayWithObjects:@"list_id", @"timeline", nil]; - NSArray *vals = [NSArray arrayWithObjects:list_id, timeline, nil]; - - NSDictionary *args = [NSDictionary dictionaryWithObjects:vals - forKeys:keys]; - - NSData *response = [api call:@"rtm.lists.delete" withArgs:args]; - if (! response) return NO; - - method = LISTS_DELETE; - NSXMLParser *parser = [[[NSXMLParser alloc] initWithData:response] autorelease]; - ListDeleteCallback *cb = [[[ListAddCallback alloc] init] autorelease]; - [parser setDelegate:cb]; - if (! [parser parse]) - @throw @"failed in parsing rtm.lists.add response."; - - return YES; + RTMAPI *api = [[[RTMAPI alloc] init] autorelease]; + NSString *timeline = [api createTimeline]; + if (! timeline) return NO; + NSArray *keys = [NSArray arrayWithObjects:@"list_id", @"timeline", nil]; + NSArray *vals = [NSArray arrayWithObjects:list_id, timeline, nil]; + + NSDictionary *args = [NSDictionary dictionaryWithObjects:vals + forKeys:keys]; + + NSData *response = [api call:@"rtm.lists.delete" withArgs:args]; + if (! response) return NO; + + method = LISTS_DELETE; + NSXMLParser *parser = [[[NSXMLParser alloc] initWithData:response] autorelease]; + ListDeleteCallback *cb = [[[ListAddCallback alloc] init] autorelease]; + [parser setDelegate:cb]; + if (! [parser parse]) + @throw @"failed in parsing rtm.lists.add response."; + + return YES; } @end api/RTMAPIList.m @@ -14,16 +14,17 @@ - (void)parser:(NSXMLParser *)parser didStartElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qualifiedName attributes:(NSDictionary *)attributeDict { - if ([elementName isEqualToString:@"rsp"]) { - succeeded = [[attributeDict valueForKey:@"stat"] isEqualToString:@"ok"]; - } else if ([elementName isEqualToString:@"err"]) { - NSAssert(!succeeded, @"stat should be 'fail'"); - NSDictionary *user_info = [NSDictionary dictionaryWithObject:[attributeDict valueForKey:@"msg"] - forKey:NSLocalizedDescriptionKey]; - error = [NSError errorWithDomain:RTMAPIErrorDomain - code:[[attributeDict valueForKey:@"code"] integerValue] - userInfo:user_info]; - } + if ([elementName isEqualToString:@"rsp"]) { + succeeded = [[attributeDict valueForKey:@"stat"] isEqualToString:@"ok"]; + } else if ([elementName isEqualToString:@"err"]) { + NSAssert(!succeeded, @"stat should be 'fail'"); + NSDictionary *user_info = [NSDictionary + dictionaryWithObject:[attributeDict valueForKey:@"msg"] + forKey:NSLocalizedDescriptionKey]; + error = [NSError errorWithDomain:RTMAPIErrorDomain + code:[[attributeDict valueForKey:@"code"] integerValue] + userInfo:user_info]; + } } @end api/RTMAPIXMLParserCallback.m @@ -30,8 +30,7 @@ static NSArray *s_priorityColors; - (void) prepareForReuse { - if (task) - [task release]; + if (task) [task release]; task = nil; } view/RTMTaskCell.m 8144d11ae7a41bc572672c732280e2069ca5d0a0 mootoh mootoh@gmail.com http://github.com/mootoh/milpon/commit/b3198eecbe80288b03f0504822eac702c433b66a b3198eecbe80288b03f0504822eac702c433b66a 2008-11-24T02:41:39-08:00 2008-11-24T02:41:39-08:00 indented a bit. a989cfd128281c4aaee73d391115952e59f4ea14 mootoh mootoh@gmail.com