refactor: remove tr_isDirection() (#8213)

This commit is contained in:
Yat Ho
2026-01-27 00:00:02 +08:00
committed by GitHub
parent dda5dc7ec3
commit 2362afd113
25 changed files with 237 additions and 273 deletions

View File

@@ -52,7 +52,7 @@
- (IBAction)setDownSpeedSetting:(id)sender
{
tr_sessionLimitSpeed(self.fHandle, TR_DOWN, [self.fDefaults boolForKey:@"CheckDownload"]);
tr_sessionLimitSpeed(self.fHandle, tr_direction::Down, [self.fDefaults boolForKey:@"CheckDownload"]);
[NSNotificationCenter.defaultCenter postNotificationName:@"SpeedLimitUpdate" object:nil];
}
@@ -61,7 +61,7 @@
{
NSInteger const limit = [sender integerValue];
[self.fDefaults setInteger:limit forKey:@"DownloadLimit"];
tr_sessionSetSpeedLimit_KBps(self.fHandle, TR_DOWN, limit);
tr_sessionSetSpeedLimit_KBps(self.fHandle, tr_direction::Down, limit);
[NSNotificationCenter.defaultCenter postNotificationName:@"UpdateSpeedLimitValuesOutsidePrefs" object:nil];
[NSNotificationCenter.defaultCenter postNotificationName:@"SpeedLimitUpdate" object:nil];
@@ -69,7 +69,7 @@
- (IBAction)setUpSpeedSetting:(id)sender
{
tr_sessionLimitSpeed(self.fHandle, TR_UP, [self.fDefaults boolForKey:@"CheckUpload"]);
tr_sessionLimitSpeed(self.fHandle, tr_direction::Up, [self.fDefaults boolForKey:@"CheckUpload"]);
[NSNotificationCenter.defaultCenter postNotificationName:@"UpdateSpeedLimitValuesOutsidePrefs" object:nil];
[NSNotificationCenter.defaultCenter postNotificationName:@"SpeedLimitUpdate" object:nil];
@@ -79,7 +79,7 @@
{
NSInteger const limit = [sender integerValue];
[self.fDefaults setInteger:limit forKey:@"UploadLimit"];
tr_sessionSetSpeedLimit_KBps(self.fHandle, TR_UP, limit);
tr_sessionSetSpeedLimit_KBps(self.fHandle, tr_direction::Up, limit);
[NSNotificationCenter.defaultCenter postNotificationName:@"SpeedLimitUpdate" object:nil];
}

View File

@@ -656,19 +656,19 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/";
- (void)applySpeedSettings:(id)sender
{
tr_sessionLimitSpeed(self.fHandle, TR_UP, [self.fDefaults boolForKey:@"CheckUpload"]);
tr_sessionSetSpeedLimit_KBps(self.fHandle, TR_UP, [self.fDefaults integerForKey:@"UploadLimit"]);
tr_sessionLimitSpeed(self.fHandle, tr_direction::Up, [self.fDefaults boolForKey:@"CheckUpload"]);
tr_sessionSetSpeedLimit_KBps(self.fHandle, tr_direction::Up, [self.fDefaults integerForKey:@"UploadLimit"]);
tr_sessionLimitSpeed(self.fHandle, TR_DOWN, [self.fDefaults boolForKey:@"CheckDownload"]);
tr_sessionSetSpeedLimit_KBps(self.fHandle, TR_DOWN, [self.fDefaults integerForKey:@"DownloadLimit"]);
tr_sessionLimitSpeed(self.fHandle, tr_direction::Down, [self.fDefaults boolForKey:@"CheckDownload"]);
tr_sessionSetSpeedLimit_KBps(self.fHandle, tr_direction::Down, [self.fDefaults integerForKey:@"DownloadLimit"]);
[NSNotificationCenter.defaultCenter postNotificationName:@"SpeedLimitUpdate" object:nil];
}
- (void)applyAltSpeedSettings
{
tr_sessionSetAltSpeed_KBps(self.fHandle, TR_UP, [self.fDefaults integerForKey:@"SpeedLimitUploadLimit"]);
tr_sessionSetAltSpeed_KBps(self.fHandle, TR_DOWN, [self.fDefaults integerForKey:@"SpeedLimitDownloadLimit"]);
tr_sessionSetAltSpeed_KBps(self.fHandle, tr_direction::Up, [self.fDefaults integerForKey:@"SpeedLimitUploadLimit"]);
tr_sessionSetAltSpeed_KBps(self.fHandle, tr_direction::Down, [self.fDefaults integerForKey:@"SpeedLimitDownloadLimit"]);
[NSNotificationCenter.defaultCenter postNotificationName:@"SpeedLimitUpdate" object:nil];
}
@@ -878,8 +878,8 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/";
- (void)setQueue:(id)sender
{
//let's just do both - easier that way
tr_sessionSetQueueEnabled(self.fHandle, TR_DOWN, [self.fDefaults boolForKey:@"Queue"]);
tr_sessionSetQueueEnabled(self.fHandle, TR_UP, [self.fDefaults boolForKey:@"QueueSeed"]);
tr_sessionSetQueueEnabled(self.fHandle, tr_direction::Down, [self.fDefaults boolForKey:@"Queue"]);
tr_sessionSetQueueEnabled(self.fHandle, tr_direction::Up, [self.fDefaults boolForKey:@"QueueSeed"]);
//handle if any transfers switch from queued to paused
[NSNotificationCenter.defaultCenter postNotificationName:@"UpdateTorrentsState" object:nil];
@@ -892,7 +892,7 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/";
[self.fDefaults setInteger:number forKey:seed ? @"QueueSeedNumber" : @"QueueDownloadNumber"];
tr_sessionSetQueueSize(self.fHandle, seed ? TR_UP : TR_DOWN, number);
tr_sessionSetQueueSize(self.fHandle, seed ? tr_direction::Up : tr_direction::Down, number);
}
- (void)setStalled:(id)sender
@@ -1375,17 +1375,17 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/";
[self.fDefaults setBool:randomPort forKey:@"RandomPort"];
//speed limit - down
BOOL const downLimitEnabled = tr_sessionIsSpeedLimited(self.fHandle, TR_DOWN);
BOOL const downLimitEnabled = tr_sessionIsSpeedLimited(self.fHandle, tr_direction::Down);
[self.fDefaults setBool:downLimitEnabled forKey:@"CheckDownload"];
auto const downLimit = tr_sessionGetSpeedLimit_KBps(self.fHandle, TR_DOWN);
auto const downLimit = tr_sessionGetSpeedLimit_KBps(self.fHandle, tr_direction::Down);
[self.fDefaults setInteger:downLimit forKey:@"DownloadLimit"];
//speed limit - up
BOOL const upLimitEnabled = tr_sessionIsSpeedLimited(self.fHandle, TR_UP);
BOOL const upLimitEnabled = tr_sessionIsSpeedLimited(self.fHandle, tr_direction::Up);
[self.fDefaults setBool:upLimitEnabled forKey:@"CheckUpload"];
auto const upLimit = tr_sessionGetSpeedLimit_KBps(self.fHandle, TR_UP);
auto const upLimit = tr_sessionGetSpeedLimit_KBps(self.fHandle, tr_direction::Up);
[self.fDefaults setInteger:upLimit forKey:@"UploadLimit"];
//alt speed limit enabled
@@ -1393,11 +1393,11 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/";
[self.fDefaults setBool:useAltSpeed forKey:@"SpeedLimit"];
//alt speed limit - down
auto const downLimitAlt = tr_sessionGetAltSpeed_KBps(self.fHandle, TR_DOWN);
auto const downLimitAlt = tr_sessionGetAltSpeed_KBps(self.fHandle, tr_direction::Down);
[self.fDefaults setInteger:downLimitAlt forKey:@"SpeedLimitDownloadLimit"];
//alt speed limit - up
auto const upLimitAlt = tr_sessionGetAltSpeed_KBps(self.fHandle, TR_UP);
auto const upLimitAlt = tr_sessionGetAltSpeed_KBps(self.fHandle, tr_direction::Up);
[self.fDefaults setInteger:upLimitAlt forKey:@"SpeedLimitUploadLimit"];
//alt speed limit schedule
@@ -1435,16 +1435,16 @@ static NSString* const kWebUIURLFormat = @"http://localhost:%ld/";
[self.fDefaults setInteger:idleLimitMin forKey:@"IdleLimitMinutes"];
//queue
BOOL const downloadQueue = tr_sessionGetQueueEnabled(self.fHandle, TR_DOWN);
BOOL const downloadQueue = tr_sessionGetQueueEnabled(self.fHandle, tr_direction::Down);
[self.fDefaults setBool:downloadQueue forKey:@"Queue"];
size_t const downloadQueueNum = tr_sessionGetQueueSize(self.fHandle, TR_DOWN);
size_t const downloadQueueNum = tr_sessionGetQueueSize(self.fHandle, tr_direction::Down);
[self.fDefaults setInteger:downloadQueueNum forKey:@"QueueDownloadNumber"];
BOOL const seedQueue = tr_sessionGetQueueEnabled(self.fHandle, TR_UP);
BOOL const seedQueue = tr_sessionGetQueueEnabled(self.fHandle, tr_direction::Up);
[self.fDefaults setBool:seedQueue forKey:@"QueueSeed"];
size_t const seedQueueNum = tr_sessionGetQueueSize(self.fHandle, TR_UP);
size_t const seedQueueNum = tr_sessionGetQueueSize(self.fHandle, tr_direction::Up);
[self.fDefaults setInteger:seedQueueNum forKey:@"QueueSeedNumber"];
BOOL const checkStalled = tr_sessionGetQueueStalledEnabled(self.fHandle);

View File

@@ -448,22 +448,22 @@ bool trashDataFile(char const* filename, void* /*user_data*/, tr_error* error)
- (BOOL)usesSpeedLimit:(BOOL)upload
{
return tr_torrentUsesSpeedLimit(self.fHandle, upload ? TR_UP : TR_DOWN);
return tr_torrentUsesSpeedLimit(self.fHandle, upload ? tr_direction::Up : tr_direction::Down);
}
- (void)setUseSpeedLimit:(BOOL)use upload:(BOOL)upload
{
tr_torrentUseSpeedLimit(self.fHandle, upload ? TR_UP : TR_DOWN, use);
tr_torrentUseSpeedLimit(self.fHandle, upload ? tr_direction::Up : tr_direction::Down, use);
}
- (NSUInteger)speedLimit:(BOOL)upload
{
return tr_torrentGetSpeedLimit_KBps(self.fHandle, upload ? TR_UP : TR_DOWN);
return tr_torrentGetSpeedLimit_KBps(self.fHandle, upload ? tr_direction::Up : tr_direction::Down);
}
- (void)setSpeedLimit:(NSUInteger)limit upload:(BOOL)upload
{
tr_torrentSetSpeedLimit_KBps(self.fHandle, upload ? TR_UP : TR_DOWN, limit);
tr_torrentSetSpeedLimit_KBps(self.fHandle, upload ? tr_direction::Up : tr_direction::Down, limit);
}
- (BOOL)usesGlobalSpeedLimit