mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-25 17:17:31 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Mitchell Livingston 2010-12-16 03:39:11 +00:00
parent 821d315453
commit 3f20d52371
3 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
macosx/Controller.m
View file

@ -986,7 +986,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
} }
else else
{ {
[torrent closeRemoveTorrent]; [torrent closeRemoveTorrent: NO];
[torrent release]; [torrent release];
} }
} }
@ -1054,7 +1054,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
} }
else else
{ {
[torrent closeRemoveTorrent]; [torrent closeRemoveTorrent: NO];
[torrent release]; [torrent release];
} }
} }
@ -1457,10 +1457,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
//let's expand all groups that have removed items - they either don't exist anymore, are already expanded, or are collapsed (rpc) //let's expand all groups that have removed items - they either don't exist anymore, are already expanded, or are collapsed (rpc)
[fTableView removeCollapsedGroup: [torrent groupValue]]; [fTableView removeCollapsedGroup: [torrent groupValue]];
if (deleteData) [torrent closeRemoveTorrent: deleteData];
[torrent trashData];
[torrent closeRemoveTorrent];
} }
[torrents release]; [torrents release];

3
macosx/Torrent.h
View file

@ -64,7 +64,7 @@
- (NSDictionary *) history; - (NSDictionary *) history;
- (void) closeRemoveTorrent; - (void) closeRemoveTorrent: (BOOL) trashFiles;
- (void) changeDownloadFolderBeforeUsing: (NSString *) folder; - (void) changeDownloadFolderBeforeUsing: (NSString *) folder;
@ -119,7 +119,6 @@
- (void) setPriority: (tr_priority_t) priority; - (void) setPriority: (tr_priority_t) priority;
+ (void) trashFile: (NSString *) path; + (void) trashFile: (NSString *) path;
- (void) trashData;
- (void) moveTorrentDataFileTo: (NSString *) folder; - (void) moveTorrentDataFileTo: (NSString *) folder;
- (void) copyTorrentFileTo: (NSString *) path; - (void) copyTorrentFileTo: (NSString *) path;

9
macosx/Torrent.m
View file

@ -227,7 +227,7 @@ int trashDataFile(const char * filename)
return [self retain]; return [self retain];
} }
- (void) closeRemoveTorrent - (void) closeRemoveTorrent: (BOOL) trashFiles
{ {
//allow the file to be indexed by Time Machine //allow the file to be indexed by Time Machine
if (fTimeMachineExclude) if (fTimeMachineExclude)
@ -237,7 +237,7 @@ int trashDataFile(const char * filename)
fTimeMachineExclude = nil; fTimeMachineExclude = nil;
} }
tr_torrentRemove(fHandle); tr_torrentRemove(fHandle, trashFiles, trashDataFile);
} }
- (void) changeDownloadFolderBeforeUsing: (NSString *) folder - (void) changeDownloadFolderBeforeUsing: (NSString *) folder
@ -503,11 +503,6 @@ int trashDataFile(const char * filename)
} }
} }
- (void) trashData
{
tr_torrentDeleteLocalData(fHandle, trashDataFile);
}
- (void) moveTorrentDataFileTo: (NSString *) folder - (void) moveTorrentDataFileTo: (NSString *) folder
{ {
NSString * oldFolder = [self currentDirectory]; NSString * oldFolder = [self currentDirectory];