Changeset 9561 for trunk/macosx/Controller.m

Timestamp:

Nov 25, 2009, 4:11:52 AM (13 years ago)

Author:

livings124

Message:

start laying a little magnet link groundwork, and remove redundant torrent parse when creating torrent objects

File:

• trunk/macosx/Controller.m (modified) (2 diffs)

trunk/macosx/Controller.m

@@ -934 +934 @@
 }
 
+- (void) openMagnet: (NSString *) address
+{
+    Torrent * torrent;
+    if (!(torrent = [[Torrent alloc] initWithMagnetAddress: address location: nil lib: fLib]))
+    {
+        #warning should we do something here?
+        return;
+    }
+    
+    #warning should we do this?
+    [torrent setWaitToStart: [fDefaults boolForKey: @"AutoStartDownload"]];
+    
+    [torrent update];
+    [fTorrents addObject: torrent];
+    [torrent release];
+
+    [self updateTorrentsInQueue];
+}
+
 - (void) askOpenConfirmed: (AddWindowController *) addController add: (BOOL) add
 {
@@ -1111 +1130 @@
     
     NSString * urlString = [fURLSheetTextField stringValue];
-    if ([urlString rangeOfString: @"://"].location == NSNotFound)
-    {
-        if ([urlString rangeOfString: @"."].location == NSNotFound)
-        {
-            NSInteger beforeCom;
-            if ((beforeCom = [urlString rangeOfString: @"/"].location) != NSNotFound)
-                urlString = [NSString stringWithFormat: @"http://www.%@.com/%@",
-                                [urlString substringToIndex: beforeCom],
-                                [urlString substringFromIndex: beforeCom + 1]];
+    
+    if ([urlString compare: @"magnet:" options: (NSAnchoredSearch | NSCaseInsensitiveSearch)])
+        [self openMagnet: urlString];
+    else
+    {
+        if ([urlString rangeOfString: @"://"].location == NSNotFound)
+        {
+            if ([urlString rangeOfString: @"."].location == NSNotFound)
+            {
+                NSInteger beforeCom;
+                if ((beforeCom = [urlString rangeOfString: @"/"].location) != NSNotFound)
+                    urlString = [NSString stringWithFormat: @"http://www.%@.com/%@",
+                                    [urlString substringToIndex: beforeCom],
+                                    [urlString substringFromIndex: beforeCom + 1]];
+                else
+                    urlString = [NSString stringWithFormat: @"http://www.%@.com/", urlString];
+            }
             else
-                urlString = [NSString stringWithFormat: @"http://www.%@.com/", urlString];
-        }
+                urlString = [@"http://" stringByAppendingString: urlString];
+        }
+        
+        
         else
-            urlString = [@"http://" stringByAppendingString: urlString];
-    }
-    
-    NSURL * url = [NSURL URLWithString: urlString];
-    [self performSelectorOnMainThread: @selector(openURL:) withObject: url waitUntilDone: NO];
+        {
+            NSURL * url = [NSURL URLWithString: urlString];
+            [self performSelectorOnMainThread: @selector(openURL:) withObject: url waitUntilDone: NO];
+        }
+    }
 }