Changeset 9577

Timestamp:

Nov 26, 2009, 2:11:00 AM (13 years ago)

Author:

livings124

Message:

some more tweaks for magnet links

Location:

trunk/macosx

Files:

• Controller.m (modified) (2 diffs)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (4 diffs)

trunk/macosx/Controller.m

@@ -1131 +1131 @@
     NSString * urlString = [fURLSheetTextField stringValue];
     
-    if ([urlString compare: @"magnet:" options: (NSAnchoredSearch | NSCaseInsensitiveSearch)])
+    if ([urlString rangeOfString: @"magnet:" options: (NSAnchoredSearch | NSCaseInsensitiveSearch)].location != NSNotFound)
         [self openMagnet: urlString];
     else
@@ -1151 +1151 @@
         }
         
-        
-        else
-        {
-            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];
     }
 }

trunk/macosx/Torrent.h

@@ -40 +40 @@
     NSImage * fIcon;
     
-    NSString * fNameString, * fHashString;
+    NSString * fHashString;
     
     tr_file_stat * fFileStat;

trunk/macosx/Torrent.m

@@ -188 +188 @@
     [fPreviousFinishedIndexesDate release];
     
-    [fNameString release];
     [fHashString release];
     
@@ -565 +564 @@
 - (NSString *) name
 {
-    return fNameString;
+    return [NSString stringWithUTF8String: fInfo->name];
 }
 
@@ -697 +696 @@
 - (NSString *) torrentLocation
 {
-    return [NSString stringWithUTF8String: fInfo->torrent];
+    return fInfo->torrent ? [NSString stringWithUTF8String: fInfo->torrent] : @"";
 }
 
@@ -1562 +1561 @@
     tr_torrentSetRatioLimitHitCallback(fHandle, ratioLimitHitCallback, self);
     
-    fNameString = [[NSString alloc] initWithUTF8String: fInfo->name];
     fHashString = [[NSString alloc] initWithUTF8String: fInfo->hashString];