From 1770fa78d6af68ddb9945944782b6a66a970f79b Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 1 Oct 2007 21:52:31 +0000 Subject: [PATCH] "switch-ify" some code --- macosx/InfoWindowController.m | 21 +++++---- macosx/MessageWindowController.m | 80 ++++++++++++++++++++------------ macosx/Torrent.m | 8 ---- 3 files changed, 64 insertions(+), 45 deletions(-) diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 0f41a26e5..7a82039c6 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -334,7 +334,7 @@ - (Torrent *) selectedTorrent { - return fTorrents && [fTorrents count] > 0 ? [fTorrents objectAtIndex: 0] : nil; + return fTorrents && [fTorrents count] == 1 ? [fTorrents objectAtIndex: 0] : nil; } - (void) updateInfoStats @@ -430,10 +430,10 @@ return; Torrent * torrent = [fTorrents objectAtIndex: 0]; - int seeders = [torrent seeders], leechers = [torrent leechers], downloaded = [torrent completedFromTracker]; - [fSeedersField setStringValue: seeders < 0 ? @"" : [NSString stringWithFormat: @"%d", seeders]]; - [fLeechersField setStringValue: leechers < 0 ? @"" : [NSString stringWithFormat: @"%d", leechers]]; - [fCompletedFromTrackerField setStringValue: downloaded < 0 ? @"" : [NSString stringWithFormat: @"%d", downloaded]]; + int seeders = [torrent seeders], leechers = [torrent leechers], completed = [torrent completedFromTracker]; + [fSeedersField setStringValue: seeders > 0 ? [NSString stringWithFormat: @"%d", seeders] : @""]; + [fLeechersField setStringValue: leechers > 0 ? [NSString stringWithFormat: @"%d", leechers] : @""]; + [fCompletedFromTrackerField setStringValue: completed > 0 ? [NSString stringWithFormat: @"%d", completed] : @""]; BOOL active = [torrent isActive]; @@ -460,16 +460,21 @@ [components addObject: [NSString stringWithFormat: NSLocalizedString(@"%d cache", "Inspector -> Peers tab -> peers"), count]]; - connected = [NSString stringWithFormat: @"%@: %@", connected, [components componentsJoinedByString: @", "]]; + connected = [connected stringByAppendingFormat: @": %@", [components componentsJoinedByString: @", "]]; } [fConnectedPeersField setStringValue: connected]; + + [fDownloadingFromField setIntValue: [torrent peersSendingToUs]]; + [fUploadingToField setIntValue: [torrent peersGettingFromUs]]; } else + { [fConnectedPeersField setStringValue: NSLocalizedString(@"info not available", "Inspector -> Peers tab -> peers")]; + [fDownloadingFromField setStringValue: @""]; + [fUploadingToField setStringValue: @""]; + } - [fDownloadingFromField setStringValue: active ? [NSString stringWithFormat: @"%d", [torrent peersSendingToUs]] : @""]; - [fUploadingToField setStringValue: active ? [NSString stringWithFormat: @"%d", [torrent peersGettingFromUs]] : @""]; [fKnownField setIntValue: [torrent totalPeersKnown]]; [fPeers release]; diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m index 4734ce4fa..6e1c80009 100644 --- a/macosx/MessageWindowController.m +++ b/macosx/MessageWindowController.m @@ -89,12 +89,17 @@ //select proper level in popup button int level = tr_getMessageLevel(); - if (level == TR_MSG_ERR) - [fLevelButton selectItemAtIndex: LEVEL_ERROR]; - else if (level == TR_MSG_INF) - [fLevelButton selectItemAtIndex: LEVEL_INFO]; - else - [fLevelButton selectItemAtIndex: LEVEL_DEBUG]; + switch (level) + { + case TR_MSG_ERR: + [fLevelButton selectItemAtIndex: LEVEL_ERROR]; + break; + case TR_MSG_INF: + [fLevelButton selectItemAtIndex: LEVEL_INFO]; + break; + case TR_MSG_DBG: + [fLevelButton selectItemAtIndex: LEVEL_DEBUG]; + } [self setDebugWarningHidden: level != TR_MSG_DBG]; } @@ -144,13 +149,17 @@ return [message objectForKey: @"Date"]; else if ([ident isEqualToString: @"Level"]) { - int level = [[message objectForKey: @"Level"] intValue]; - if (level == TR_MSG_ERR) - return fErrorImage; - else if (level == TR_MSG_INF) - return fInfoImage; - else - return fDebugImage; + switch ([[message objectForKey: @"Level"] intValue]) + { + case TR_MSG_ERR: + return fErrorImage; + case TR_MSG_INF: + return fInfoImage; + case TR_MSG_DBG: + return fDebugImage; + default: + return nil; + } } else return [message objectForKey: @"Message"]; @@ -197,13 +206,19 @@ { [self updateLog: nil]; - int selection = [fLevelButton indexOfSelectedItem], level; - if (selection == LEVEL_INFO) - level = TR_MSG_INF; - else if (selection == LEVEL_DEBUG) - level = TR_MSG_DBG; - else - level = TR_MSG_ERR; + int level; + switch ([fLevelButton indexOfSelectedItem]) + { + case LEVEL_ERROR: + level = TR_MSG_ERR; + break; + case LEVEL_INFO: + level = TR_MSG_INF; + break; + case LEVEL_DEBUG: + level = TR_MSG_DBG; + break; + } [self setDebugWarningHidden: level != TR_MSG_DBG]; @@ -272,16 +287,23 @@ - (NSString *) stringForMessage: (NSDictionary *) message { - int level = [[message objectForKey: @"Level"] intValue]; - NSString * levelString; - if (level == TR_MSG_ERR) - levelString = @"Error"; - else if (level == TR_MSG_INF) - levelString = @"Info"; - else - levelString = @"Debug"; + NSString * level; + switch ([[message objectForKey: @"Level"] intValue]) + { + case TR_MSG_ERR: + level = @"Error"; + break; + case TR_MSG_INF: + level = @"Info"; + break; + case TR_MSG_DBG: + level = @"Debug"; + break; + default: + level = @""; + } - return [NSString stringWithFormat: @"%@ [%@] %@", [message objectForKey: @"Date"], levelString, [message objectForKey: @"Message"]]; + return [NSString stringWithFormat: @"%@ [%@] %@", [message objectForKey: @"Date"], level, [message objectForKey: @"Message"]]; } - (void) setDebugWarningHidden: (BOOL) hide diff --git a/macosx/Torrent.m b/macosx/Torrent.m index d1c4c239b..a6c3634dc 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -1007,13 +1007,11 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void * { case TR_STATUS_DOWNLOAD: return [self eta] >= 0 ? [self etaString] : NSLocalizedString(@"Unknown", "Torrent -> remaining time"); - break; case TR_STATUS_SEED: case TR_STATUS_DONE: return [NSLocalizedString(@"Ratio: ", "Torrent -> status string") stringByAppendingString: [NSString stringForRatio: [self ratio]]]; - break; default: return [self shortStatusString]; @@ -1026,29 +1024,23 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void * { case TR_STATUS_STOPPED: return NSLocalizedString(@"Paused", "Torrent -> status string"); - break; case TR_STATUS_STOPPING: return [NSLocalizedString(@"Stopping", "Torrent -> status string") stringByAppendingEllipsis]; - break; case TR_STATUS_CHECK: return [NSString stringWithFormat: NSLocalizedString(@"Checking existing data (%.2f%%)", "Torrent -> status string"), 100.0 * fStat->recheckProgress]; - break; case TR_STATUS_CHECK_WAIT: return [NSLocalizedString(@"Waiting to check existing data", "Torrent -> status string") stringByAppendingEllipsis]; - break; case TR_STATUS_DOWNLOAD: return NSLocalizedString(@"Downloading", "Torrent -> status string"); - break; case TR_STATUS_SEED: case TR_STATUS_DONE: return NSLocalizedString(@"Seeding", "Torrent -> status string"); - break; default: return NSLocalizedString(@"N/A", "Torrent -> status string");