Changeset 2139

Timestamp:

Jun 17, 2007, 5:50:33 PM (15 years ago)

Author:

livings124

Message:

open newly created files when created

Location:

branches/file_selection/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (10 diffs)
• CreatorWindowController.m (modified) (1 diff)

branches/file_selection/macosx/Controller.h

@@ -105 +105 @@
 
 - (void) openFiles:             (NSArray *) filenames;
-- (void) openFiles:             (NSArray *) filenames ignoreDownloadFolder: (BOOL) ignore forceDeleteTorrent: (BOOL) delete;
+- (void) openFiles:             (NSArray *) filenames forcePath: (NSString *) path ignoreDownloadFolder: (BOOL) ignore
+                                            forceDeleteTorrent: (BOOL) delete;
+- (void) openCreatedFile:       (NSNotification *) notification;
 - (void) openFilesWithDict:     (NSDictionary *) dictionary;
 - (void) openFilesAsk:          (NSMutableArray *) files forceDeleteTorrent: (BOOL) delete;

branches/file_selection/macosx/Controller.m

@@ -416 +416 @@
     [nc addObserver: self selector: @selector(updateDockBadge:)
                     name: @"DockBadgeChange" object: nil];
+    
+    //open newly created torrent file
+    [nc addObserver: self selector: @selector(openCreatedFile:)
+                    name: @"OpenCreatedTorrentFile" object: nil];
 
     //timer to update the interface every second
@@ -634 +638 @@
     NSString * path = [[fPendingTorrentDownloads objectForKey: [[download request] URL]] objectForKey: @"Path"];
     
-    [self openFiles: [NSArray arrayWithObject: path] ignoreDownloadFolder:
+    [self openFiles: [NSArray arrayWithObject: path] forcePath: nil ignoreDownloadFolder:
         ![[fDefaults stringForKey: @"DownloadChoice"] isEqualToString: @"Constant"] forceDeleteTorrent: YES];
     
@@ -646 +650 @@
 - (void) application: (NSApplication *) app openFiles: (NSArray *) filenames
 {
-    [self openFiles: filenames ignoreDownloadFolder: NO forceDeleteTorrent: NO];
-}
-
-- (void) openFiles: (NSArray *) filenames ignoreDownloadFolder: (BOOL) ignore forceDeleteTorrent: (BOOL) delete
+    [self openFiles: filenames forcePath: nil ignoreDownloadFolder: NO forceDeleteTorrent: NO];
+}
+
+- (void) openFiles: (NSArray *) filenames forcePath: (NSString *) path ignoreDownloadFolder: (BOOL) ignore
+        forceDeleteTorrent: (BOOL) delete
 {
     NSString * downloadChoice = [fDefaults stringForKey: @"DownloadChoice"];
-    if (ignore || [downloadChoice isEqualToString: @"Ask"])
+    if (ignore || (!path && [downloadChoice isEqualToString: @"Ask"]))
     {
         [self openFilesAsk: [filenames mutableCopy] forceDeleteTorrent: delete];
@@ -658 +663 @@
     }
     
-    if ([fDefaults boolForKey: @"UseIncompleteDownloadFolder"]
+    if (!path && [fDefaults boolForKey: @"UseIncompleteDownloadFolder"]
         && access([[[fDefaults stringForKey: @"IncompleteDownloadFolder"] stringByExpandingTildeInPath] UTF8String], 0))
     {
@@ -682 +687 @@
         return;
     }
-    if ([downloadChoice isEqualToString: @"Constant"]
+    if (!path && [downloadChoice isEqualToString: @"Constant"]
         && access([[[fDefaults stringForKey: @"DownloadFolder"] stringByExpandingTildeInPath] UTF8String], 0))
     {
@@ -713 +718 @@
         if (!(torrent = [[Torrent alloc] initWithPath: torrentPath forceDeleteTorrent: delete lib: fLib]))
             continue;
-
+        
         //add it to the "File > Open Recent" menu
         [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL: [NSURL fileURLWithPath: torrentPath]];
-
-        NSString * folder = [downloadChoice isEqualToString: @"Constant"]
-            ? [[fDefaults stringForKey: @"DownloadFolder"] stringByExpandingTildeInPath]
-            : [torrentPath stringByDeletingLastPathComponent];
+        
+        NSString * folder;
+        if (path)
+            folder = path;
+        else if ([downloadChoice isEqualToString: @"Constant"])
+            folder = [[fDefaults stringForKey: @"DownloadFolder"] stringByExpandingTildeInPath];
+        else
+            folder = [torrentPath stringByDeletingLastPathComponent];
         
         [torrent setDownloadFolder: folder];
@@ -729 +738 @@
 
     [self updateTorrentsInQueue];
+}
+
+- (void) openCreatedFile: (NSNotification *) notification
+{
+    NSDictionary * dict = [notification userInfo];
+    [self openFiles: [NSArray arrayWithObject: [dict objectForKey: @"File"]] forcePath: [dict objectForKey: @"Path"]
+            ignoreDownloadFolder: NO forceDeleteTorrent: NO];
+    [dict release];
 }
 
@@ -754 +771 @@
 - (void) openFilesWithDict: (NSDictionary *) dictionary
 {
-    [self openFiles: [dictionary objectForKey: @"Filenames"]
+    [self openFiles: [dictionary objectForKey: @"Filenames"] forcePath: nil
         ignoreDownloadFolder: [[dictionary objectForKey: @"Ignore"] boolValue]
         forceDeleteTorrent: [[dictionary objectForKey: @"Delete"] boolValue]];
@@ -844 +861 @@
 - (void) openFiles: (NSArray *) filenames
 {
-    [self openFiles: filenames ignoreDownloadFolder: NO forceDeleteTorrent: NO];
+    [self openFiles: filenames forcePath: nil ignoreDownloadFolder: NO forceDeleteTorrent: NO];
 }
 
@@ -872 +889 @@
 - (void) openFromSheet: (NSDictionary *) dictionary
 {
-    [self openFiles: [dictionary objectForKey: @"Files"]
+    [self openFiles: [dictionary objectForKey: @"Files"] forcePath: nil
         ignoreDownloadFolder: [[dictionary objectForKey: @"Ignore"] boolValue] forceDeleteTorrent: NO];
     

branches/file_selection/macosx/CreatorWindowController.m

@@ -260 +260 @@
         else
         {
-            #warning add to T
+            #warning make optional
+            NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys: fLocation, @"File",
+                                    [fPath stringByDeletingLastPathComponent], @"Path", nil];
+            [[NSNotificationCenter defaultCenter] postNotificationName: @"OpenCreatedTorrentFile" object: self userInfo: dict];
         }