Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Experimental #33

Merged
merged 4 commits into from

2 participants

@barijaona
Owner

Allow moving and sorting your Google Reader feeds to user's taste.

@mstroeck mstroeck merged commit f235c24 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 26, 2012
  1. @barijaona
  2. @barijaona
  3. @barijaona
  4. @barijaona

    Upgrade build number to 2802.

    barijaona authored
    Note : 2801 was not publicly available.
This page is out of date. Refresh to see the latest.
View
16 FoldersTree.m
@@ -29,6 +29,7 @@
#import "PopupButton.h"
#import "ViennaApp.h"
#import "BrowserView.h"
+#import "GoogleReader.h"
// Private functions
@interface FoldersTree (Private)
@@ -1156,13 +1157,13 @@ -(BOOL)copyTableSelection:(NSArray *)items toPasteboard:(NSPasteboard *)pboard
TreeNode * node = [items objectAtIndex:index];
Folder * folder = [node folder];
- if (IsRSSFolder(folder) || IsSmartFolder(folder) || IsGroupFolder(folder) || IsSearchFolder(folder) || IsTrashFolder(folder))
+ if (IsRSSFolder(folder) || IsGoogleReaderFolder(folder) || IsSmartFolder(folder) || IsGroupFolder(folder) || IsSearchFolder(folder) || IsTrashFolder(folder))
{
[internalDragData addObject:[NSNumber numberWithInt:[node nodeId]]];
++countOfItems;
}
- if (IsRSSFolder(folder))
+ if (IsRSSFolder(folder)||IsGoogleReaderFolder(folder))
{
NSString * feedURL = [folder feedURL];
@@ -1274,7 +1275,16 @@ -(BOOL)moveFolders:(NSArray *)array withGoogleSync:(BOOL)sync
{
if (![newParent canHaveChildren])
[newParent setCanHaveChildren:YES];
- if (![db setParent:newParentId forFolder:folderId])
+ if ([db setParent:newParentId forFolder:folderId])
+ {
+ if (IsGoogleReaderFolder(folder))
+ {
+ GoogleReader * myGoogle = [GoogleReader sharedManager];
+ NSString * folderName = [[db folderFromID:newParentId] name];
+ [myGoogle setFolder:folderName forFeed:[folder feedURL] folderFlag:TRUE];
+ }
+ }
+ else
continue;
}
View
3  GoogleReader.m
@@ -243,7 +243,7 @@ -(ASIHTTPRequest*)refreshFeed:(Folder*)thisFolder withLog:(ActivityItem *)aItem
[dict release];
} else {
- ALog(@"Error code non gestito! %d",[request responseStatusCode]);
+ ALog(@"Unhandled error code: %d",[request responseStatusCode]);
}
[[NSNotificationCenter defaultCenter] postNotificationName:@"MA_Notify_FoldersUpdated" object:[NSNumber numberWithInt:[refreshedFolder itemId]]];
@@ -515,6 +515,7 @@ -(void)completeLoadSubscriptions {
NSMutableArray * params = [NSMutableArray arrayWithObjects:[folderNames mutableCopy], [NSNumber numberWithInt:MA_Root_Folder], nil];
[self performSelectorOnMainThread:@selector(createFolders:) withObject:params waitUntilDone:YES];
+ break; //In case of multiple labels, we retain only the first one
}
}
View
16 RefreshManager.m
@@ -575,17 +575,17 @@ -(void)refreshFeed:(Folder *)folder fromURL:(NSURL *)url withLog:(ActivityItem *
[myRequest setUserInfo:[NSDictionary dictionaryWithObjectsAndKeys:folder, @"folder", aItem, @"log", nil]];
[myRequest setDelegate:self];
[myRequest setDidFinishSelector:@selector(folderRefreshCompleted:)];
- [myRequest setFailedBlock:^{
- LOG_EXPR([myRequest error]);
- Folder * folder = (Folder *)[[myRequest userInfo] objectForKey:@"folder"];
- [self setFolderErrorFlag:folder flag:YES];
- [aItem appendDetail:[NSString stringWithFormat:@"%@ %@",NSLocalizedString(@"Error retrieving RSS feed:", nil),[[myRequest error] localizedDescription ]]];
- [aItem setStatus:NSLocalizedString(@"Error",nil)];
- [self syncFinishedForFolder:folder];
- }];
} else if (IsGoogleReaderFolder(folder)) {
myRequest = [[GoogleReader sharedManager] refreshFeed:folder withLog:(ActivityItem *)aItem shouldIgnoreArticleLimit:force];
}
+ [myRequest setFailedBlock:^{
+ LOG_EXPR([myRequest error]);
+ Folder * folder = (Folder *)[[myRequest userInfo] objectForKey:@"folder"];
+ [self setFolderErrorFlag:folder flag:YES];
+ [aItem appendDetail:[NSString stringWithFormat:@"%@ %@",NSLocalizedString(@"Error retrieving RSS feed:", nil),[[myRequest error] localizedDescription ]]];
+ [aItem setStatus:NSLocalizedString(@"Error",nil)];
+ [self syncFinishedForFolder:folder];
+ }];
[self addConnection:myRequest];
}
View
8 Vienna.xcodeproj/project.pbxproj
@@ -4011,7 +4011,7 @@
EAE98F8814BEFBD700D6A3DC /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- BUILD_NUMBER = 9;
+ BUILD_NUMBER = "";
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)",
"$(BUILT_PRODUCTS_DIR)",
@@ -4033,7 +4033,7 @@
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = ViennaBeta;
SDKROOT = macosx;
- VIENNA_VERSION_NUMBER = 2800;
+ VIENNA_VERSION_NUMBER = 2802;
WRAPPER_EXTENSION = app;
};
name = Development;
@@ -4041,7 +4041,7 @@
EAE98F8914BEFBD700D6A3DC /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- BUILD_NUMBER = 9;
+ BUILD_NUMBER = "";
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)",
"$(BUILT_PRODUCTS_DIR)",
@@ -4061,7 +4061,7 @@
PRODUCT_NAME = ViennaBeta;
SDKROOT = macosx;
STRIP_INSTALLED_PRODUCT = YES;
- VIENNA_VERSION_NUMBER = 2800;
+ VIENNA_VERSION_NUMBER = 2802;
WRAPPER_EXTENSION = app;
};
name = Deployment;
Something went wrong with that request. Please try again.