Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 20:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

#2794 Don't apply auto-grouping until torrent is demagnetized

Browse Source
This commit is contained in:
Mitchell Livingston
2012-10-30 00:22:10 +00:00
parent 7e2f344ff6
commit 1e0f36fda0
7 changed files with 91 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
macosx/Controller.m
View File

@@ -532,6 +532,9 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[nc addObserver: self selector: @selector(torrentFinishedSeeding:)
name: @"TorrentFinishedSeeding" object: nil];
[nc addObserver: self selector: @selector(applyFilter)
name: kTorrentDidChangeGroupNotification object: nil];
//avoids need of setting delegate
[nc addObserver: self selector: @selector(torrentTableViewSelectionDidChange:)
name: NSOutlineViewSelectionDidChangeNotification object: fTableView];
@@ -946,7 +949,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
if (!lockDestination && [[GroupsController groups] usesCustomDownloadLocationForIndex: [torrent groupValue]])
{
location = [[GroupsController groups] customDownloadLocationForIndex: [torrent groupValue]];
[torrent changeDownloadFolderBeforeUsing: location];
[torrent changeDownloadFolderBeforeUsing: location determinationType: TorrentDeterminationAutomatic];
}
//verify the data right away if it was newly created
@@ -1043,7 +1046,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
if ([[GroupsController groups] usesCustomDownloadLocationForIndex: [torrent groupValue]])
{
location = [[GroupsController groups] customDownloadLocationForIndex: [torrent groupValue]];
[torrent changeDownloadFolderBeforeUsing: location];
[torrent changeDownloadFolderBeforeUsing: location determinationType: TorrentDeterminationAutomatic];
}
if ([fDefaults boolForKey: @"MagnetOpenAsk"] || !location)
@@ -2847,7 +2850,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
{
[fTableView removeCollapsedGroup: [torrent groupValue]]; //remove old collapsed group
[torrent setGroupValue: [(NSMenuItem *)sender tag]];
[torrent setGroupValue: [(NSMenuItem *)sender tag] determinationType: TorrentDeterminationUserSpecified];
}
[self applyFilter];
@@ -3196,7 +3199,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
//change groups
if (item)
[torrent setGroupValue: [item groupIndex]];
[torrent setGroupValue: [item groupIndex] determinationType: TorrentDeterminationUserSpecified];
}
//reorder queue order
@@ -4786,7 +4789,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
if ([[GroupsController groups] usesCustomDownloadLocationForIndex: [torrent groupValue]])
{
location = [[GroupsController groups] customDownloadLocationForIndex: [torrent groupValue]];
[torrent changeDownloadFolderBeforeUsing: location];
[torrent changeDownloadFolderBeforeUsing: location determinationType: TorrentDeterminationAutomatic];
}
[torrent update];