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

feat: add sort-by-ETA for macOS (#4169)

Browse Source
This commit is contained in:
Cœur
2023-04-15 01:19:06 +08:00
committed by GitHub
parent ebfba686b0
commit 1851b80d8c
4 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
macosx/Base.lproj/MainMenu.xib
View File

@@ -454,6 +454,11 @@
<action selector="setSort:" target="206" id="1906"/>
</connections>
</menuItem>
<menuItem title="ETA" tag="8" id="zLF-YR-Oq6">
<connections>
<action selector="setSort:" target="206" id="fEQ-9j-ALl"/>
</connections>
</menuItem>
<menuItem title="Size" tag="7" id="3430">
<connections>
<action selector="setSort:" target="206" id="3431"/>

20
macosx/Controller.mm
View File

@@ -87,6 +87,7 @@ static SortType const SortTypeTracker = @"Tracker";
static SortType const SortTypeOrder = @"Order";
static SortType const SortTypeActivity = @"Activity";
static SortType const SortTypeSize = @"Size";
static SortType const SortTypeETA = @"ETA";
typedef NS_ENUM(unsigned int, sortTag) {
SORT_ORDER_TAG = 0,
@@ -96,7 +97,8 @@ typedef NS_ENUM(unsigned int, sortTag) {
SORT_STATE_TAG = 4,
SORT_TRACKER_TAG = 5,
SORT_ACTIVITY_TAG = 6,
SORT_SIZE_TAG = 7
SORT_SIZE_TAG = 7,
SORT_ETA_TAG = 8
};
typedef NS_ENUM(unsigned int, sortOrderTag) { //
@@ -2712,6 +2714,9 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool
case SORT_SIZE_TAG:
sortType = SortTypeSize;
break;
case SORT_ETA_TAG:
sortType = SortTypeETA;
break;
default:
NSAssert1(NO, @"Unknown sort tag received: %ld", senderMenuItem.tag);
return;
@@ -2772,6 +2777,16 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool
descriptors = @[ progressDescriptor, ratioProgressDescriptor, ratioDescriptor, nameDescriptor ];
}
else if ([sortType isEqualToString:SortTypeETA])
{
NSSortDescriptor* etaDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"eta" ascending:asc];
// falling back on sort by progress
NSSortDescriptor* progressDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"progress" ascending:asc];
NSSortDescriptor* ratioProgressDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"progressStopRatio" ascending:asc];
NSSortDescriptor* ratioDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"ratio" ascending:asc];
descriptors = @[ etaDescriptor, progressDescriptor, ratioProgressDescriptor, ratioDescriptor, nameDescriptor ];
}
else if ([sortType isEqualToString:SortTypeTracker])
{
NSSortDescriptor* trackerDescriptor = [NSSortDescriptor sortDescriptorWithKey:@"trackerSortKey" ascending:asc
@@ -4715,6 +4730,9 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool
case SORT_SIZE_TAG:
sortType = SortTypeSize;
break;
case SORT_ETA_TAG:
sortType = SortTypeETA;
break;
default:
NSAssert1(NO, @"Unknown sort tag received: %ld", [menuItem tag]);
sortType = SortTypeOrder;

1
macosx/Torrent.h
View File

@@ -121,6 +121,7 @@ extern NSString* const kTorrentDidChangeGroupNotification;
withName:(NSString*)newName
completionHandler:(void (^)(BOOL didRename))completionHandler;
@property(nonatomic, readonly) time_t eta;
@property(nonatomic, readonly) CGFloat progress;
@property(nonatomic, readonly) CGFloat progressDone;
@property(nonatomic, readonly) CGFloat progressLeft;

27
macosx/Torrent.mm
View File

@@ -814,6 +814,27 @@ bool trashDataFile(char const* filename, void* /*user_data*/, tr_error** error)
tr_torrentRenamePath(self.fHandle, oldPath.UTF8String, newName.UTF8String, renameCallback, (__bridge_retained void*)(contextInfo));
}
- (time_t)eta
{
time_t eta = self.fStat->eta;
if (eta >= 0)
{
return eta;
}
time_t etaIdle = self.fStat->etaIdle;
if (etaIdle >= 0 && etaIdle < kETAIdleDisplaySec)
{
return etaIdle;
}
if (self.fStat->leftUntilDone <= 0)
{
// We return smallest amount of time remaining for simpliest compliance with sorting.
return 0;
}
// We return highest amount of time remaining for simpliest compliance with sorting.
return LONG_MAX;
}
- (CGFloat)progress
{
return self.fStat->percentComplete;
@@ -2069,13 +2090,13 @@ bool trashDataFile(char const* filename, void* /*user_data*/, tr_error** error)
time_t eta = self.fStat->eta;
// if there's a regular ETA, the torrent isn't idle
BOOL fromIdle = NO;
if (eta == TR_ETA_NOT_AVAIL || eta == TR_ETA_UNKNOWN)
if (eta < 0)
{
eta = self.fStat->etaIdle;
fromIdle = YES;
}
// Foundation undocumented behavior: values above INT_MAX (68 years) are interpreted as negative values by `stringFromTimeInterval` (#3451)
if (eta < 0 || eta > INT_MAX || (fromIdle && eta >= kETAIdleDisplaySec))
// Foundation undocumented behavior: values above INT32_MAX (68 years) are interpreted as negative values by `stringFromTimeInterval` (#3451)
if (eta < 0 || eta > INT32_MAX || (fromIdle && eta >= kETAIdleDisplaySec))
{
return NSLocalizedString(@"remaining time unknown", "Torrent -> eta string");
}