mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-20 05:14:44 +00:00
Cleaning up a bit.
This commit is contained in:
Samuel Clay
parent
59bf1577bf
commit
73a6e74b6d
1 changed files with 148 additions and 151 deletions
|
|
@ -422,85 +422,83 @@
|
||||||
|
|
||||||
- (void)fetchFeedDetail:(int)page withCallback:(void(^)())callback {
|
- (void)fetchFeedDetail:(int)page withCallback:(void(^)())callback {
|
||||||
NSString *theFeedDetailURL;
|
NSString *theFeedDetailURL;
|
||||||
NSLog(@"Fetch Feed in view: %@ (%@)", self, storiesCollection);
|
|
||||||
|
|
||||||
if (!storiesCollection.activeFeed) return;
|
if (!storiesCollection.activeFeed) return;
|
||||||
|
|
||||||
if (callback || (!self.pageFetching && !self.pageFinished)) {
|
if (!callback && (self.pageFetching || self.pageFinished)) return;
|
||||||
|
|
||||||
self.feedPage = page;
|
self.feedPage = page;
|
||||||
self.pageFetching = YES;
|
self.pageFetching = YES;
|
||||||
NSInteger storyCount = storiesCollection.storyCount;
|
NSInteger storyCount = storiesCollection.storyCount;
|
||||||
if (storyCount == 0) {
|
if (storyCount == 0) {
|
||||||
[self.storyTitlesTable reloadData];
|
[self.storyTitlesTable reloadData];
|
||||||
[storyTitlesTable scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:YES];
|
[storyTitlesTable scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:YES];
|
||||||
}
|
|
||||||
if (self.feedPage == 1) {
|
|
||||||
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,
|
|
||||||
(unsigned long)NULL), ^(void) {
|
|
||||||
[appDelegate.database inDatabase:^(FMDatabase *db) {
|
|
||||||
[appDelegate prepareActiveCachedImages:db];
|
|
||||||
}];
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (self.isOffline) {
|
|
||||||
[self loadOfflineStories];
|
|
||||||
if (!self.isShowingOffline) {
|
|
||||||
[self showOfflineNotifier];
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (storiesCollection.isSocialView) {
|
|
||||||
theFeedDetailURL = [NSString stringWithFormat:@"%@/social/stories/%@/?page=%d",
|
|
||||||
NEWSBLUR_URL,
|
|
||||||
[storiesCollection.activeFeed objectForKey:@"user_id"],
|
|
||||||
self.feedPage];
|
|
||||||
} else {
|
|
||||||
theFeedDetailURL = [NSString stringWithFormat:@"%@/reader/feed/%@/?page=%d",
|
|
||||||
NEWSBLUR_URL,
|
|
||||||
[storiesCollection.activeFeed objectForKey:@"id"],
|
|
||||||
self.feedPage];
|
|
||||||
}
|
|
||||||
|
|
||||||
theFeedDetailURL = [NSString stringWithFormat:@"%@&order=%@",
|
|
||||||
theFeedDetailURL,
|
|
||||||
[storiesCollection activeOrder]];
|
|
||||||
theFeedDetailURL = [NSString stringWithFormat:@"%@&read_filter=%@",
|
|
||||||
theFeedDetailURL,
|
|
||||||
[storiesCollection activeReadFilter]];
|
|
||||||
|
|
||||||
[self cancelRequests];
|
|
||||||
__weak ASIHTTPRequest *request = [self requestWithURL:theFeedDetailURL];
|
|
||||||
[request setDelegate:self];
|
|
||||||
[request setResponseEncoding:NSUTF8StringEncoding];
|
|
||||||
[request setDefaultResponseEncoding:NSUTF8StringEncoding];
|
|
||||||
[request setFailedBlock:^(void) {
|
|
||||||
NSLog(@"in failed block %@", request);
|
|
||||||
if (request.isCancelled) {
|
|
||||||
NSLog(@"Cancelled");
|
|
||||||
return;
|
|
||||||
} else {
|
|
||||||
self.isOffline = YES;
|
|
||||||
self.feedPage = 1;
|
|
||||||
[self loadOfflineStories];
|
|
||||||
[self showOfflineNotifier];
|
|
||||||
}
|
|
||||||
[self.storyTitlesTable reloadData];
|
|
||||||
}];
|
|
||||||
[request setCompletionBlock:^(void) {
|
|
||||||
if (!storiesCollection.activeFeed) return;
|
|
||||||
[self finishedLoadingFeed:request];
|
|
||||||
if (callback) {
|
|
||||||
callback();
|
|
||||||
}
|
|
||||||
}];
|
|
||||||
[request setTimeOutSeconds:30];
|
|
||||||
[request setTag:[[[storiesCollection activeFeed] objectForKey:@"id"] intValue]];
|
|
||||||
[request startAsynchronous];
|
|
||||||
[requests addObject:request];
|
|
||||||
}
|
}
|
||||||
|
if (self.feedPage == 1) {
|
||||||
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,
|
||||||
|
(unsigned long)NULL), ^(void) {
|
||||||
|
[appDelegate.database inDatabase:^(FMDatabase *db) {
|
||||||
|
[appDelegate prepareActiveCachedImages:db];
|
||||||
|
}];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (self.isOffline) {
|
||||||
|
[self loadOfflineStories];
|
||||||
|
if (!self.isShowingOffline) {
|
||||||
|
[self showOfflineNotifier];
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (storiesCollection.isSocialView) {
|
||||||
|
theFeedDetailURL = [NSString stringWithFormat:@"%@/social/stories/%@/?page=%d",
|
||||||
|
NEWSBLUR_URL,
|
||||||
|
[storiesCollection.activeFeed objectForKey:@"user_id"],
|
||||||
|
self.feedPage];
|
||||||
|
} else {
|
||||||
|
theFeedDetailURL = [NSString stringWithFormat:@"%@/reader/feed/%@/?page=%d",
|
||||||
|
NEWSBLUR_URL,
|
||||||
|
[storiesCollection.activeFeed objectForKey:@"id"],
|
||||||
|
self.feedPage];
|
||||||
|
}
|
||||||
|
|
||||||
|
theFeedDetailURL = [NSString stringWithFormat:@"%@&order=%@",
|
||||||
|
theFeedDetailURL,
|
||||||
|
[storiesCollection activeOrder]];
|
||||||
|
theFeedDetailURL = [NSString stringWithFormat:@"%@&read_filter=%@",
|
||||||
|
theFeedDetailURL,
|
||||||
|
[storiesCollection activeReadFilter]];
|
||||||
|
|
||||||
|
[self cancelRequests];
|
||||||
|
__weak ASIHTTPRequest *request = [self requestWithURL:theFeedDetailURL];
|
||||||
|
[request setDelegate:self];
|
||||||
|
[request setResponseEncoding:NSUTF8StringEncoding];
|
||||||
|
[request setDefaultResponseEncoding:NSUTF8StringEncoding];
|
||||||
|
[request setFailedBlock:^(void) {
|
||||||
|
NSLog(@"in failed block %@", request);
|
||||||
|
if (request.isCancelled) {
|
||||||
|
NSLog(@"Cancelled");
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
self.isOffline = YES;
|
||||||
|
self.feedPage = 1;
|
||||||
|
[self loadOfflineStories];
|
||||||
|
[self showOfflineNotifier];
|
||||||
|
}
|
||||||
|
[self.storyTitlesTable reloadData];
|
||||||
|
}];
|
||||||
|
[request setCompletionBlock:^(void) {
|
||||||
|
if (!storiesCollection.activeFeed) return;
|
||||||
|
[self finishedLoadingFeed:request];
|
||||||
|
if (callback) {
|
||||||
|
callback();
|
||||||
|
}
|
||||||
|
}];
|
||||||
|
[request setTimeOutSeconds:30];
|
||||||
|
[request setTag:[[[storiesCollection activeFeed] objectForKey:@"id"] intValue]];
|
||||||
|
[request startAsynchronous];
|
||||||
|
[requests addObject:request];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)loadOfflineStories {
|
- (void)loadOfflineStories {
|
||||||
|
|
@ -602,94 +600,93 @@
|
||||||
#pragma mark River of News
|
#pragma mark River of News
|
||||||
|
|
||||||
- (void)fetchRiverPage:(int)page withCallback:(void(^)())callback {
|
- (void)fetchRiverPage:(int)page withCallback:(void(^)())callback {
|
||||||
NSLog(@"Fetch River in view: %@ (%@)", self, storiesCollection);
|
if (self.pageFetching || self.pageFinished) return;
|
||||||
if (!self.pageFetching && !self.pageFinished) {
|
|
||||||
self.feedPage = page;
|
self.feedPage = page;
|
||||||
self.pageFetching = YES;
|
self.pageFetching = YES;
|
||||||
NSInteger storyCount = storiesCollection.storyCount;
|
NSInteger storyCount = storiesCollection.storyCount;
|
||||||
if (storyCount == 0) {
|
if (storyCount == 0) {
|
||||||
[self.storyTitlesTable reloadData];
|
[self.storyTitlesTable reloadData];
|
||||||
[storyTitlesTable scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:YES];
|
[storyTitlesTable scrollRectToVisible:CGRectMake(0, 0, 1, 1) animated:YES];
|
||||||
// [self.notifier initWithTitle:@"Loading more..." inView:self.view];
|
// [self.notifier initWithTitle:@"Loading more..." inView:self.view];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (self.feedPage == 1) {
|
if (self.feedPage == 1) {
|
||||||
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,
|
||||||
(unsigned long)NULL), ^(void) {
|
(unsigned long)NULL), ^(void) {
|
||||||
[appDelegate.database inDatabase:^(FMDatabase *db) {
|
[appDelegate.database inDatabase:^(FMDatabase *db) {
|
||||||
[appDelegate prepareActiveCachedImages:db];
|
[appDelegate prepareActiveCachedImages:db];
|
||||||
}];
|
}];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (self.isOffline) {
|
if (self.isOffline) {
|
||||||
[self loadOfflineStories];
|
[self loadOfflineStories];
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NSString *theFeedDetailURL;
|
NSString *theFeedDetailURL;
|
||||||
|
|
||||||
if (storiesCollection.isSocialRiverView) {
|
if (storiesCollection.isSocialRiverView) {
|
||||||
if ([storiesCollection.activeFolder isEqualToString:@"river_global"]) {
|
if ([storiesCollection.activeFolder isEqualToString:@"river_global"]) {
|
||||||
theFeedDetailURL = [NSString stringWithFormat:
|
|
||||||
@"%@/social/river_stories/?global_feed=true&page=%d",
|
|
||||||
NEWSBLUR_URL,
|
|
||||||
self.feedPage];
|
|
||||||
|
|
||||||
} else {
|
|
||||||
theFeedDetailURL = [NSString stringWithFormat:
|
|
||||||
@"%@/social/river_stories/?page=%d",
|
|
||||||
NEWSBLUR_URL,
|
|
||||||
self.feedPage];
|
|
||||||
}
|
|
||||||
} else if ([storiesCollection.activeFolder isEqual:@"saved_stories"]) {
|
|
||||||
theFeedDetailURL = [NSString stringWithFormat:
|
theFeedDetailURL = [NSString stringWithFormat:
|
||||||
@"%@/reader/starred_stories/?page=%d",
|
@"%@/social/river_stories/?global_feed=true&page=%d",
|
||||||
NEWSBLUR_URL,
|
NEWSBLUR_URL,
|
||||||
self.feedPage];
|
self.feedPage];
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
theFeedDetailURL = [NSString stringWithFormat:
|
theFeedDetailURL = [NSString stringWithFormat:
|
||||||
@"%@/reader/river_stories/?f=%@&page=%d",
|
@"%@/social/river_stories/?page=%d",
|
||||||
NEWSBLUR_URL,
|
NEWSBLUR_URL,
|
||||||
[storiesCollection.activeFolderFeeds componentsJoinedByString:@"&f="],
|
|
||||||
self.feedPage];
|
self.feedPage];
|
||||||
}
|
}
|
||||||
|
} else if ([storiesCollection.activeFolder isEqual:@"saved_stories"]) {
|
||||||
|
theFeedDetailURL = [NSString stringWithFormat:
|
||||||
theFeedDetailURL = [NSString stringWithFormat:@"%@&order=%@",
|
@"%@/reader/starred_stories/?page=%d",
|
||||||
theFeedDetailURL,
|
NEWSBLUR_URL,
|
||||||
[storiesCollection activeOrder]];
|
self.feedPage];
|
||||||
theFeedDetailURL = [NSString stringWithFormat:@"%@&read_filter=%@",
|
} else {
|
||||||
theFeedDetailURL,
|
theFeedDetailURL = [NSString stringWithFormat:
|
||||||
[storiesCollection activeReadFilter]];
|
@"%@/reader/river_stories/?f=%@&page=%d",
|
||||||
|
NEWSBLUR_URL,
|
||||||
[self cancelRequests];
|
[storiesCollection.activeFolderFeeds componentsJoinedByString:@"&f="],
|
||||||
__weak ASIHTTPRequest *request = [self requestWithURL:theFeedDetailURL];
|
self.feedPage];
|
||||||
[request setDelegate:self];
|
|
||||||
[request setResponseEncoding:NSUTF8StringEncoding];
|
|
||||||
[request setDefaultResponseEncoding:NSUTF8StringEncoding];
|
|
||||||
[request setFailedBlock:^(void) {
|
|
||||||
if (request.isCancelled) {
|
|
||||||
NSLog(@"Cancelled");
|
|
||||||
return;
|
|
||||||
} else {
|
|
||||||
self.isOffline = YES;
|
|
||||||
self.isShowingOffline = NO;
|
|
||||||
self.feedPage = 1;
|
|
||||||
[self loadOfflineStories];
|
|
||||||
[self showOfflineNotifier];
|
|
||||||
}
|
|
||||||
}];
|
|
||||||
[request setCompletionBlock:^(void) {
|
|
||||||
[self finishedLoadingFeed:request];
|
|
||||||
if (callback) {
|
|
||||||
callback();
|
|
||||||
}
|
|
||||||
}];
|
|
||||||
[request setTimeOutSeconds:30];
|
|
||||||
[request startAsynchronous];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
theFeedDetailURL = [NSString stringWithFormat:@"%@&order=%@",
|
||||||
|
theFeedDetailURL,
|
||||||
|
[storiesCollection activeOrder]];
|
||||||
|
theFeedDetailURL = [NSString stringWithFormat:@"%@&read_filter=%@",
|
||||||
|
theFeedDetailURL,
|
||||||
|
[storiesCollection activeReadFilter]];
|
||||||
|
|
||||||
|
[self cancelRequests];
|
||||||
|
__weak ASIHTTPRequest *request = [self requestWithURL:theFeedDetailURL];
|
||||||
|
[request setDelegate:self];
|
||||||
|
[request setResponseEncoding:NSUTF8StringEncoding];
|
||||||
|
[request setDefaultResponseEncoding:NSUTF8StringEncoding];
|
||||||
|
[request setFailedBlock:^(void) {
|
||||||
|
if (request.isCancelled) {
|
||||||
|
NSLog(@"Cancelled");
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
self.isOffline = YES;
|
||||||
|
self.isShowingOffline = NO;
|
||||||
|
self.feedPage = 1;
|
||||||
|
[self loadOfflineStories];
|
||||||
|
[self showOfflineNotifier];
|
||||||
|
}
|
||||||
|
}];
|
||||||
|
[request setCompletionBlock:^(void) {
|
||||||
|
[self finishedLoadingFeed:request];
|
||||||
|
if (callback) {
|
||||||
|
callback();
|
||||||
|
}
|
||||||
|
}];
|
||||||
|
[request setTimeOutSeconds:30];
|
||||||
|
[request startAsynchronous];
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma mark -
|
#pragma mark -
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue