Fixed NC bug, added cancel download

nicoSWD · Nov 7, 2013 · ac9f5d1 · ac9f5d1
1 parent b09f8b5
commit ac9f5d1
Show file tree

Hide file tree

Showing 10 changed files with 382 additions and 259 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,6 +7,3 @@
 [submodule "PutioKit"]
 	path = PutioKit
 	url = git@github.com:PutioKit/PutioKit.git
-[submodule "UIView-Badge"]
-	path = UIView-Badge
-	url = git@github.com:robrasmussen/UIView-Badge.git
diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/Nico.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/Nico.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/put.io adder/PutioHelper.m b/put.io adder/PutioHelper.m
@@ -100,7 +100,9 @@ - (void)updateUserInfo
                     newTransfer = (PKTransfer*)[putioTransfers objectAtIndex:j];
 
                     if ((currentTransfer.id == newTransfer.id) &&
-                         (![currentTransfer.status isEqualToString:@"COMPLETED"] &&
+                         ((![currentTransfer.status isEqualToString:@"COMPLETED"] &&
+                           ![currentTransfer.status isEqualToString:@"SEEDING"])
+                          &&
                           ([newTransfer.status isEqualToString:@"COMPLETED"]
                           || [newTransfer.status isEqualToString:@"SEEDING"])))
                     {
@@ -110,10 +112,12 @@ - (void)updateUserInfo
                         notification.soundName = NSUserNotificationDefaultSoundName;
 
                         [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
-
+                        // [NSImageView alloc] ini
+                         /*
                         NSImage *badge = [[NSImage alloc] initWithSize:NSSizeFromCGSize(CGSizeMake(20, 20))];
                         badge.backgroundColor = [NSColor redColor];
-                        [NSApp setApplicationIconImage: badge];
+                        //[NSApp setApplicationIconImage: badge];
+                          */
                     }
                 }
             }

diff --git a/put.io adder/PutioMainController.h b/put.io adder/PutioMainController.h
@@ -20,6 +20,7 @@
     IBOutlet NSPanel *prefSheet;
     IBOutlet NSTableView *tableView;
     IBOutlet NSButton *toggleShowTransfers;
+    IBOutlet NSButton *cancelTransfer;
 
     PutioBrowser *authWindow;
     NSMutableArray *transfers;
@@ -31,6 +32,7 @@
 - (IBAction)closePreferences:(id)sender;
 - (IBAction)checkForUpdates:(id)sender;
 - (IBAction)toggleShowTransfers:(id)sender;
+- (IBAction)cancelTransfer:(id)sender;
 - (void)openFileOnPutIO;
 
 @property (nonatomic, retain) NSTextField *message;
@@ -41,6 +43,7 @@
 @property (assign) IBOutlet NSWindow *putiowindow;
 @property (nonatomic, retain) IBOutlet NSTableView *tableView;
 @property (nonatomic, retain) IBOutlet NSButton *toggleShowTransfers;
+@property (nonatomic, retain) IBOutlet NSButton *cancelTransfer;
 
 @property (strong) PutioBrowser *authWindow;
 @property (strong) NSMutableArray *transfers;

diff --git a/put.io adder/PutioMainController.m b/put.io adder/PutioMainController.m
@@ -12,16 +12,17 @@
 @implementation PutioMainController
 
 @synthesize
-message,
-activityIndicator,
-authWindow,
-userInfo,
-versionInfo,
-transferInfo,
-putiowindow,
-transfers,
-tableView,
-toggleShowTransfers;
+    message,
+    activityIndicator,
+    authWindow,
+    userInfo,
+    versionInfo,
+    transferInfo,
+    putiowindow,
+    transfers,
+    tableView,
+    toggleShowTransfers,
+    cancelTransfer;
 
 static BOOL transfersAreHidden = YES;
 
@@ -40,6 +41,7 @@ - (void)awakeFromNib
     self.toggleShowTransfers.title = NSLocalizedString(@"HELPER_TRANSFERS_SHOW", nil);
     self.userInfo.stringValue = NSLocalizedString(@"HELPER_FETCHING_USERINFO", nil);
     self.message.stringValue = NSLocalizedString(@"HELPER_MSG_READY", nil);
+    self.cancelTransfer.stringValue = NSLocalizedString(@"HELPER_CANCEL", nil);
 
     PutioHelper *helper = [PutioHelper sharedHelper];
     [helper authenticateUser];
@@ -183,6 +185,56 @@ - (void)tableView:(NSTableView *)_tableView sortDescriptorsDidChange: (NSArray *
 }
 
 
+- (void)tableViewSelectionDidChange:(NSNotification *)notification
+{
+    [self.cancelTransfer setHidden: (self.tableView.selectedRow > -1 ? NO : YES)];
+}
+
+
+- (IBAction)cancelTransfer:(id)sender
+{
+    if (self.tableView.selectedRow == -1)
+    {
+        return;
+    }
+
+    PKTransfer *transfer;
+
+    @try
+    {
+        transfer = [self.transfers objectAtIndex: [self.tableView selectedRow]];
+    }
+    @catch (NSException *exception)
+    {
+        return;
+    }
+    @finally {}
+
+    self.message.stringValue = NSLocalizedString(@"HELPER_CANCELING_DOWNLOAD", nil);
+    [self.activityIndicator startAnimation:nil];
+    [self.cancelTransfer setEnabled:NO];
+
+    PutioHelper *helper = [PutioHelper sharedHelper];
+
+    [[helper putioAPI] cancelTransfer:transfer:^
+    {
+        self.message.stringValue = NSLocalizedString(@"HELPER_DOWNLOAD_CANCELED", nil);
+        [self.activityIndicator stopAnimation:nil];
+        [self.cancelTransfer setEnabled:YES];
+        [self.cancelTransfer setHidden:YES];
+
+        [helper updateUserInfo];
+    }
+    failure:^(NSError *error)
+    {
+        self.message.stringValue = NSLocalizedString(@"HELPER_CANCEL_FAILED", nil);
+        [self.activityIndicator stopAnimation:nil];
+        [self.cancelTransfer setEnabled:YES];
+        [self.cancelTransfer setHidden:YES];
+    }];
+}
+
+
 - (void)openFileOnPutIO
 {
     // Table header was clicked

diff --git a/put.io adder/de.lproj/Localizable.strings b/put.io adder/de.lproj/Localizable.strings
@@ -47,4 +47,11 @@ HELPER_STATE_SEEDING="Fertig/Seeding...";
 HELPER_STATE_QUEDED="In Warteschlange";
 
 HELPER_TRANSFERS_SHOW="Transfers Anzeigen";
-HELPER_TRANSFERS_HIDE="Transfers Verbergen";
+HELPER_TRANSFERS_HIDE="Transfers Verbergen";
+
+HELPER_CANCELING_DOWNLOAD="Download wird Abgebrochen...";
+HELPER_DOWNLOAD_CANCELED="Download Abgebrochen";
+HELPER_CANCEL_FAILED="Download konnte nicht abgrbrochen werden";
+
+NOTIFICATION_TITLE="Erfolgreicher Download";
+NOTIFICATION_MSG="\"%@\" Wurde Erfolgreich Heruntergeladen";
diff --git a/put.io adder/en.lproj/Localizable.strings b/put.io adder/en.lproj/Localizable.strings
@@ -49,5 +49,9 @@ HELPER_STATE_QUEDED="In Queue";
 HELPER_TRANSFERS_SHOW="Show Transfers";
 HELPER_TRANSFERS_HIDE="Hide Transfers";
 
+HELPER_CANCELING_DOWNLOAD="Canceling Download...";
+HELPER_DOWNLOAD_CANCELED="Download Canceled";
+HELPER_CANCEL_FAILED="Error Canceling Download";
+
 NOTIFICATION_TITLE="Finished Download";
 NOTIFICATION_MSG="\"%@\" finished downloading";