From 06a7d099ba57aab9f9dfb5bd8514f5a99658e54e Mon Sep 17 00:00:00 2001 From: Ryan Kistner Date: Tue, 5 Jul 2016 19:31:16 -0600 Subject: [PATCH] Style fixes for CDNClientPool --- DepotDownloader/CDNClientPool.cs | 30 ++++++++++++++-------------- DepotDownloader/ContentDownloader.cs | 16 +++++++-------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/DepotDownloader/CDNClientPool.cs b/DepotDownloader/CDNClientPool.cs index 843118ee..8b48dc5b 100644 --- a/DepotDownloader/CDNClientPool.cs +++ b/DepotDownloader/CDNClientPool.cs @@ -16,7 +16,7 @@ namespace DepotDownloader /// class CDNClientPool { - private static int ServerEndpointMinimumSize = 8; + private const int ServerEndpointMinimumSize = 8; private Steam3Session steamSession; @@ -43,7 +43,7 @@ namespace DepotDownloader monitorThread.Start(); } - private List fetchBootstrapServerList() + private List FetchBootstrapServerList() { CDNClient bootstrap = new CDNClient(steamSession.steamClient); @@ -75,7 +75,7 @@ namespace DepotDownloader steamSession.steamClient.IsConnected && steamSession.steamClient.GetServersOfType(EServerType.CS).Count > 0) { - var servers = fetchBootstrapServerList(); + var servers = FetchBootstrapServerList(); var weightedCdnServers = servers.Select(x => { @@ -95,13 +95,13 @@ namespace DepotDownloader } } - private void releaseConnection(CDNClient client) + private void ReleaseConnection(CDNClient client) { Tuple authData; activeClientAuthed.TryRemove(client, out authData); } - private CDNClient buildConnection(uint depotId, byte[] depotKey, CDNClient.Server serverSeed, CancellationToken token) + private CDNClient BuildConnection(uint depotId, byte[] depotKey, CDNClient.Server serverSeed, CancellationToken token) { CDNClient.Server server = null; CDNClient client = null; @@ -157,7 +157,7 @@ namespace DepotDownloader return client; } - private bool reauthConnection(CDNClient client, CDNClient.Server server, uint depotId, byte[] depotKey) + private bool ReauthConnection(CDNClient client, CDNClient.Server server, uint depotId, byte[] depotKey) { DebugLog.Assert(server.Type == "CDN" || steamSession.AppTickets[depotId] == null, "CDNClientPool", "Re-authing a CDN or anonymous connection"); @@ -183,7 +183,7 @@ namespace DepotDownloader return false; } - public CDNClient getConnectionForDepot(uint depotId, byte[] depotKey, CancellationToken token) + public CDNClient GetConnectionForDepot(uint depotId, byte[] depotKey, CancellationToken token) { CDNClient client = null; @@ -194,42 +194,42 @@ namespace DepotDownloader // if we couldn't find a connection, make one now if (client == null) { - client = buildConnection(depotId, depotKey, null, token); + client = BuildConnection(depotId, depotKey, null, token); } // if we couldn't find the authorization data or it's not authed to this depotid, re-initialize if (!activeClientAuthed.TryGetValue(client, out authData) || authData.Item1 != depotId) { - if (authData.Item2.Type == "CDN" && reauthConnection(client, authData.Item2, depotId, depotKey)) + if (authData.Item2.Type == "CDN" && ReauthConnection(client, authData.Item2, depotId, depotKey)) { Console.WriteLine("Re-authed CDN connection to content server {0} from {1} to {2}", authData.Item2, authData.Item1, depotId); } - else if (authData.Item2.Type == "CS" && steamSession.AppTickets[depotId] == null && reauthConnection(client, authData.Item2, depotId, depotKey)) + else if (authData.Item2.Type == "CS" && steamSession.AppTickets[depotId] == null && ReauthConnection(client, authData.Item2, depotId, depotKey)) { Console.WriteLine("Re-authed anonymous connection to content server {0} from {1} to {2}", authData.Item2, authData.Item1, depotId); } else { - releaseConnection(client); - client = buildConnection(depotId, depotKey, authData.Item2, token); + ReleaseConnection(client); + client = BuildConnection(depotId, depotKey, authData.Item2, token); } } return client; } - public void returnConnection(CDNClient client) + public void ReturnConnection(CDNClient client) { if (client == null) return; activeClientPool.Add(client); } - public void returnBrokenConnection(CDNClient client) + public void ReturnBrokenConnection(CDNClient client) { if (client == null) return; - releaseConnection(client); + ReleaseConnection(client); } } } diff --git a/DepotDownloader/ContentDownloader.cs b/DepotDownloader/ContentDownloader.cs index d82835f0..b69bc926 100644 --- a/DepotDownloader/ContentDownloader.cs +++ b/DepotDownloader/ContentDownloader.cs @@ -528,15 +528,15 @@ namespace DepotDownloader { CDNClient client = null; try { - client = cdnPool.getConnectionForDepot(depot.id, depot.depotKey, CancellationToken.None); + client = cdnPool.GetConnectionForDepot(depot.id, depot.depotKey, CancellationToken.None); depotManifest = client.DownloadManifest(depot.id, depot.manifestId); - cdnPool.returnConnection(client); + cdnPool.ReturnConnection(client); } catch (WebException e) { - cdnPool.returnBrokenConnection(client); + cdnPool.ReturnBrokenConnection(client); if (e.Status == WebExceptionStatus.ProtocolError) { @@ -558,7 +558,7 @@ namespace DepotDownloader } catch (Exception e) { - cdnPool.returnBrokenConnection(client); + cdnPool.ReturnBrokenConnection(client); Console.WriteLine("Encountered error downloading manifest for depot {0} {1}: {2}", depot.id, depot.manifestId, e.Message); } } @@ -746,7 +746,7 @@ namespace DepotDownloader CDNClient client; try { - client = cdnPool.getConnectionForDepot(depot.id, depot.depotKey, cts.Token); + client = cdnPool.GetConnectionForDepot(depot.id, depot.depotKey, cts.Token); } catch (OperationCanceledException) { @@ -763,12 +763,12 @@ namespace DepotDownloader try { chunkData = client.DownloadDepotChunk(depot.id, data); - cdnPool.returnConnection(client); + cdnPool.ReturnConnection(client); break; } catch (WebException e) { - cdnPool.returnBrokenConnection(client); + cdnPool.ReturnBrokenConnection(client); if (e.Status == WebExceptionStatus.ProtocolError) { @@ -791,7 +791,7 @@ namespace DepotDownloader } catch (Exception e) { - cdnPool.returnBrokenConnection(client); + cdnPool.ReturnBrokenConnection(client); Console.WriteLine("Encountered unexpected error downloading chunk {0}: {1}", chunkID, e.Message); } }