Changeset 9352

Timestamp:

Oct 22, 2009, 12:10:41 AM (13 years ago)

Author:

livings124

Message:

fix Quick Look from the file inspector

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• InfoWindowController.m (modified) (2 diffs)
• Torrent.m (modified) (6 diffs)

trunk/macosx/Controller.m

@@ -319 +319 @@
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_RATIO_ENABLED, [fDefaults boolForKey: @"RatioCheck"]);
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_RPC_ENABLED,  [fDefaults boolForKey: @"RPC"]);
-        tr_bencDictAddInt(&settings, TR_PREFS_KEY_RPC_PORT,  [fDefaults integerForKey: @"RPCPort"]);
+        tr_bencDictAddInt(&settings, TR_PREFS_KEY_RPC_PORT, [fDefaults integerForKey: @"RPCPort"]);
         tr_bencDictAddStr(&settings, TR_PREFS_KEY_RPC_USERNAME,  [[fDefaults stringForKey: @"RPCUsername"] UTF8String]);
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_RPC_WHITELIST_ENABLED,  [fDefaults boolForKey: @"RPCUseWhitelist"]);

trunk/macosx/InfoWindowController.m

@@ -1137 +1137 @@
         FileListNode * item = [fileOutlineView itemAtRow: i];
         if ([self canQuickLookFile: item])
-            [urlArray addObject: [torrent fileLocation: item]];
+            [urlArray addObject: [NSURL fileURLWithPath: [torrent fileLocation: item]]];
     }
     
@@ -1666 +1666 @@
 {
     Torrent * torrent = [fTorrents objectAtIndex: 0];
-    return [torrent fileLocation: item] != nil && ([item isFolder] || [torrent fileProgress: item] >= 1.0);
+    return ([item isFolder] || [torrent fileProgress: item] >= 1.0) && [torrent fileLocation: item];
 }
 

trunk/macosx/Torrent.m

@@ -33 +33 @@
 
 - (id) initWithPath: (NSString *) path hash: (NSString *) hashString torrentStruct: (tr_torrent *) torrentStruct lib: (tr_session *) lib
-        downloadFolder: (NSString *) downloadFolder incompleteFolder: (NSString *) incompleteFolder
         waitToStart: (NSNumber *) waitToStart
-        groupValue: (NSNumber *) groupValue;
+        groupValue: (NSNumber *) groupValue
+        legacyDownloadFolder: (NSString *) downloadFolder legacyIncompleteFolder: (NSString *) incompleteFolder;
 
 - (void) createFileList;
@@ -74 +74 @@
 {
     self = [self initWithPath: path hash: nil torrentStruct: NULL lib: lib
-            downloadFolder: location incompleteFolder: nil
-            waitToStart: nil groupValue: nil];
+            waitToStart: nil groupValue: nil
+            legacyDownloadFolder: location legacyIncompleteFolder: nil];
     
     if (self)
@@ -88 +88 @@
 {
     self = [self initWithPath: nil hash: nil torrentStruct: torrentStruct lib: lib
-            downloadFolder: location incompleteFolder: nil
-            waitToStart: nil groupValue: nil];
+            waitToStart: nil groupValue: nil
+            legacyDownloadFolder: location legacyIncompleteFolder: nil];
     
     return self;
@@ -99 +99 @@
                 hash: [history objectForKey: @"TorrentHash"]
                 torrentStruct: NULL lib: lib
-                downloadFolder: [history objectForKey: @"DownloadFolder"] //upgrading from versions < 1.80
-                incompleteFolder: [[history objectForKey: @"UseIncompleteFolder"] boolValue] //upgrading from versions < 1.80
-                                    ? [history objectForKey: @"IncompleteFolder"] : nil
                 waitToStart: [history objectForKey: @"WaitToStart"]
-                groupValue: [history objectForKey: @"GroupValue"]];
+                groupValue: [history objectForKey: @"GroupValue"]
+                legacyDownloadFolder: [history objectForKey: @"DownloadFolder"] //upgrading from versions < 1.80
+                legacyIncompleteFolder: [[history objectForKey: @"UseIncompleteFolder"] boolValue] //upgrading from versions < 1.80
+                                        ? [history objectForKey: @"IncompleteFolder"] : nil];
     
     if (self)
@@ -1547 +1547 @@
 
 - (id) initWithPath: (NSString *) path hash: (NSString *) hashString torrentStruct: (tr_torrent *) torrentStruct lib: (tr_session *) lib
-        downloadFolder: (NSString *) downloadFolder incompleteFolder: (NSString *) incompleteFolder
         waitToStart: (NSNumber *) waitToStart
         groupValue: (NSNumber *) groupValue
+        legacyDownloadFolder: (NSString *) downloadFolder legacyIncompleteFolder: (NSString *) incompleteFolder
 {
     if (!(self = [super init]))
@@ -1566 +1566 @@
         tr_ctor * ctor = tr_ctorNew(lib);
         tr_ctorSetPaused(ctor, TR_FORCE, YES);
-        tr_ctorSetPeerLimit(ctor, TR_FALLBACK, [fDefaults integerForKey: @"PeersTorrent"]);
         
         int result = TR_PARSE_ERR;