Changeset 11539

Timestamp:

Dec 16, 2010, 3:39:11 AM (12 years ago)

Author:

livings124

Message:

#3675 "Not all .part files are removed" - Mac patch

Location:

trunk/macosx

Files:

• Controller.m (modified) (3 diffs)
• Torrent.h (modified) (2 diffs)
• Torrent.m (modified) (3 diffs)

trunk/macosx/Controller.m

@@ -987 +987 @@
     else
     {
-        [torrent closeRemoveTorrent];
+        [torrent closeRemoveTorrent: NO];
         [torrent release];
     }
@@ -1055 +1055 @@
     else
     {
-        [torrent closeRemoveTorrent];
+        [torrent closeRemoveTorrent: NO];
         [torrent release];
     }
@@ -1458 +1458 @@
         [fTableView removeCollapsedGroup: [torrent groupValue]];
         
-        if (deleteData)
-            [torrent trashData];
-        
-        [torrent closeRemoveTorrent];
+        [torrent closeRemoveTorrent: deleteData];
     }
     

trunk/macosx/Torrent.h

@@ -65 +65 @@
 - (NSDictionary *) history;
 
-- (void) closeRemoveTorrent;
+- (void) closeRemoveTorrent: (BOOL) trashFiles;
 
 - (void) changeDownloadFolderBeforeUsing: (NSString *) folder;
@@ -120 +120 @@
 
 + (void) trashFile: (NSString *) path;
-- (void) trashData;
 - (void) moveTorrentDataFileTo: (NSString *) folder;
 - (void) copyTorrentFileTo: (NSString *) path;

trunk/macosx/Torrent.m

@@ -228 +228 @@
 }
 
-- (void) closeRemoveTorrent
+- (void) closeRemoveTorrent: (BOOL) trashFiles
 {
     //allow the file to be indexed by Time Machine
@@ -238 +238 @@
     }
     
-    tr_torrentRemove(fHandle);
+    tr_torrentRemove(fHandle, trashFiles, trashDataFile);
 }
 
@@ -502 +502 @@
             NSLog(@"Could not trash %@: %@", path, [error localizedDescription]);
     }
-}
-
-- (void) trashData
-{
-    tr_torrentDeleteLocalData(fHandle, trashDataFile);
 }