Changeset 7484

Timestamp:

Dec 24, 2008, 1:55:33 AM (12 years ago)

Author:

livings124

Message:

(Mac client) #1029: When removing local data only remove data from the torrent

File:

• trunk/macosx/Torrent.m (modified) (6 diffs)

trunk/macosx/Torrent.m

@@ -56 +56 @@
 - (void) updateAllTrackers: (NSMutableArray *) trackers;
 
-- (void) trashFile: (NSString *) path;
++ (void) trashFile: (NSString *) path;
 
 - (void) setTimeMachineExclude: (BOOL) exclude forPath: (NSString *) path;
@@ -66 +66 @@
     [(Torrent *)torrentData performSelectorOnMainThread: @selector(completenessChange:)
                 withObject: [[NSNumber alloc] initWithInt: status] waitUntilDone: NO];
+}
+
+int trashDataFile(const char * filename)
+{
+    [Torrent trashFile: [NSString stringWithUTF8String: filename]];
+    return 0;
 }
 
@@ -90 +96 @@
         }
         else if (!fPublicTorrent)
-            [self trashFile: path];
+            [Torrent trashFile: path];
         else;
     }
@@ -454 +460 @@
 - (void) trashData
 {
-    [self trashFile: [self dataLocation]];
+    tr_torrentDeleteLocalData(fHandle, trashDataFile);
 }
 
@@ -461 +467 @@
     if (fPublicTorrent)
     {
-        [self trashFile: fPublicTorrentLocation];
+        [Torrent trashFile: fPublicTorrentLocation];
         [fPublicTorrentLocation release];
         fPublicTorrentLocation = nil;
@@ -1969 +1975 @@
 }
 
-- (void) trashFile: (NSString *) path
++ (void) trashFile: (NSString *) path
 {
     //attempt to move to trash