Changeset 8667

Timestamp:

Jun 10, 2009, 10:56:24 PM (13 years ago)

Author:

livings124

Message:

potentially (hopefully) fix bug where some users couldn't add torrents

Location:

trunk/macosx

Files:

• Controller.m (modified) (3 diffs)
• DragOverlayWindow.m (modified) (1 diff)
• Torrent.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -2457 +2457 @@
         NSString * fullFile = [path stringByAppendingPathComponent: file];
         
-        if (![[[NSWorkspace sharedWorkspace] typeOfFile: fullFile error: NULL] isEqualToString: @"org.bittorrent.torrent"])
+        if (![[[NSWorkspace sharedWorkspace] typeOfFile: fullFile error: NULL] isEqualToString: @"org.bittorrent.torrent"]
+            || [[fullFile pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
             continue;
         
@@ -2699 +2700 @@
         for (NSString * file in files)
         {
-            if ([[[NSWorkspace sharedWorkspace] typeOfFile: file error: NULL] isEqualToString: @"org.bittorrent.torrent"])
+            if ([[[NSWorkspace sharedWorkspace] typeOfFile: file error: NULL] isEqualToString: @"org.bittorrent.torrent"]
+                    || [[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
             {
                 torrent = YES;
@@ -2760 +2762 @@
         for (NSString * file in files)
         {
-            if ([[[NSWorkspace sharedWorkspace] typeOfFile: file error: NULL] isEqualToString: @"org.bittorrent.torrent"])
+            if ([[[NSWorkspace sharedWorkspace] typeOfFile: file error: NULL] isEqualToString: @"org.bittorrent.torrent"]
+                    || [[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
             {
                 torrent = YES;

trunk/macosx/DragOverlayWindow.m

@@ -84 +84 @@
     for (NSString * file in files)
     {
-        if ([[[NSWorkspace sharedWorkspace] typeOfFile: file error: NULL] isEqualToString: @"org.bittorrent.torrent"])
+        if ([[[NSWorkspace sharedWorkspace] typeOfFile: file error: NULL] isEqualToString: @"org.bittorrent.torrent"]
+            || [[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
         {
             tr_ctor * ctor = tr_ctorNew(fLib);

trunk/macosx/Torrent.m

@@ -1642 +1642 @@
             result = tr_ctorSetMetainfoFromFile(ctor, [path UTF8String]);
         
-        //backup - shouldn't be needed after upgrade to 1.62
+        //backup - shouldn't be needed after upgrade to 1.70
         if (result != TR_OK && hashString)
             result = tr_ctorSetMetainfoFromHash(ctor, [hashString UTF8String]);