From c83f25fed5d8449454d17aa725dad08355ec1708 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Sun, 18 Nov 2007 00:28:37 +0000 Subject: [PATCH] have the info controller format the peer status string, for efficiency sakes --- macosx/InfoWindowController.m | 20 +++++++++++++++++++- macosx/Torrent.m | 30 +----------------------------- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 0994cac0a..e000517eb 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -800,7 +800,25 @@ typedef enum return (rate = [peer objectForKey: @"DL From Rate"]) ? [NSString stringForSpeedAbbrev: [rate floatValue]] : @""; } else if ([ident isEqualToString: @"Status"]) - return [peer objectForKey: @"Status"]; + { + switch ([[peer objectForKey: @"Status"] intValue]) + { + case TR_PEER_STATUS_HANDSHAKE: + return NSLocalizedString(@"Handshaking", "peer -> status"); + case TR_PEER_STATUS_PEER_IS_CHOKED: + return NSLocalizedString(@"Peer is Choked", "peer -> status"); + case TR_PEER_STATUS_CLIENT_IS_CHOKED: + return NSLocalizedString(@"Choked", "peer -> status"); + case TR_PEER_STATUS_CLIENT_IS_INTERESTED: + return NSLocalizedString(@"Choked and Interested", "peer -> status"); + case TR_PEER_STATUS_READY: + return NSLocalizedString(@"Ready", "peer -> status"); + case TR_PEER_STATUS_REQUEST_SENT: + return NSLocalizedString(@"Request Sent", "peer -> status"); + case TR_PEER_STATUS_ACTIVE: + return NSLocalizedString(@"Active", "peer -> status"); + } + } else return [peer objectForKey: @"IP"]; } diff --git a/macosx/Torrent.m b/macosx/Torrent.m index ec2069c53..1c0f30c23 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -808,34 +808,6 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void * { peer = &peers[i]; - NSString * statusString; - switch (peer->status) - { - case TR_PEER_STATUS_HANDSHAKE: - statusString = NSLocalizedString(@"Handshaking", "peer -> status"); - break; - case TR_PEER_STATUS_PEER_IS_CHOKED: - statusString = NSLocalizedString(@"Peer is Choked", "peer -> status"); - break; - case TR_PEER_STATUS_CLIENT_IS_CHOKED: - statusString = NSLocalizedString(@"Choked", "peer -> status"); - break; - case TR_PEER_STATUS_CLIENT_IS_INTERESTED: - statusString = NSLocalizedString(@"Choked and Interested", "peer -> status"); - break; - case TR_PEER_STATUS_READY: - statusString = NSLocalizedString(@"Ready", "peer -> status"); - break; - case TR_PEER_STATUS_REQUEST_SENT: - statusString = NSLocalizedString(@"Request Sent", "peer -> status"); - break; - case TR_PEER_STATUS_ACTIVE: - statusString = NSLocalizedString(@"Active", "peer -> status"); - break; - default: - statusString = @""; - } - dic = [NSMutableDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithInt: peer->from], @"From", [NSString stringWithCString: (char *)peer->addr encoding: NSUTF8StringEncoding], @"IP", @@ -843,7 +815,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void * [NSNumber numberWithFloat: peer->progress], @"Progress", [NSNumber numberWithBool: peer->isEncrypted], @"Encryption", [NSString stringWithCString: (char *)peer->client encoding: NSUTF8StringEncoding], @"Client", - statusString, @"Status", nil]; + [NSNumber numberWithInt: peer->status], @"Status", nil]; if (peer->isDownloading) [dic setObject: [NSNumber numberWithFloat: peer->uploadToRate] forKey: @"UL To Rate"];