Merge pull request #474 from SteamRE/cleanup

Cleanup
SteamRE · Feb 9, 2024 · 9d24464 · 9d24464
2 parents 93318f2 + 0f00ea5
commit 9d24464
Show file tree

Hide file tree

Showing 8 changed files with 203 additions and 291 deletions.
diff --git a/DepotDownloader/AccountSettingsStore.cs b/DepotDownloader/AccountSettingsStore.cs
@@ -29,8 +29,8 @@ class AccountSettingsStore
         AccountSettingsStore()
         {
             ContentServerPenalty = new ConcurrentDictionary<string, int>();
-            LoginTokens = new Dictionary<string, string>();
-            GuardData = new Dictionary<string, string>();
+            LoginTokens = [];
+            GuardData = [];
         }
 
         static bool Loaded
@@ -50,11 +50,9 @@ public static void LoadFromFile(string filename)
             {
                 try
                 {
-                    using (var fs = IsolatedStorage.OpenFile(filename, FileMode.Open, FileAccess.Read))
-                    using (var ds = new DeflateStream(fs, CompressionMode.Decompress))
-                    {
-                        Instance = Serializer.Deserialize<AccountSettingsStore>(ds);
-                    }
+                    using var fs = IsolatedStorage.OpenFile(filename, FileMode.Open, FileAccess.Read);
+                    using var ds = new DeflateStream(fs, CompressionMode.Decompress);
+                    Instance = Serializer.Deserialize<AccountSettingsStore>(ds);
                 }
                 catch (IOException ex)
                 {
@@ -77,11 +75,9 @@ public static void Save()
 
             try
             {
-                using (var fs = IsolatedStorage.OpenFile(Instance.FileName, FileMode.Create, FileAccess.Write))
-                using (var ds = new DeflateStream(fs, CompressionMode.Compress))
-                {
-                    Serializer.Serialize(ds, Instance);
-                }
+                using var fs = IsolatedStorage.OpenFile(Instance.FileName, FileMode.Create, FileAccess.Write);
+                using var ds = new DeflateStream(fs, CompressionMode.Compress);
+                Serializer.Serialize(ds, Instance);
             }
             catch (IOException ex)
             {

diff --git a/DepotDownloader/CDNClientPool.cs b/DepotDownloader/CDNClientPool.cs
@@ -20,12 +20,12 @@ class CDNClientPool
         public Client CDNClient { get; }
         public Server ProxyServer { get; private set; }
 
-        private readonly ConcurrentStack<Server> activeConnectionPool;
-        private readonly BlockingCollection<Server> availableServerEndpoints;
+        private readonly ConcurrentStack<Server> activeConnectionPool = [];
+        private readonly BlockingCollection<Server> availableServerEndpoints = [];
 
-        private readonly AutoResetEvent populatePoolEvent;
+        private readonly AutoResetEvent populatePoolEvent = new(true);
         private readonly Task monitorTask;
-        private readonly CancellationTokenSource shutdownToken;
+        private readonly CancellationTokenSource shutdownToken = new();
         public CancellationTokenSource ExhaustedToken { get; set; }
 
         public CDNClientPool(Steam3Session steamSession, uint appId)
@@ -34,12 +34,6 @@ public CDNClientPool(Steam3Session steamSession, uint appId)
             this.appId = appId;
             CDNClient = new Client(steamSession.steamClient);
 
-            activeConnectionPool = new ConcurrentStack<Server>();
-            availableServerEndpoints = new BlockingCollection<Server>();
-
-            populatePoolEvent = new AutoResetEvent(true);
-            shutdownToken = new CancellationTokenSource();
-
             monitorTask = Task.Factory.StartNew(ConnectionPoolMonitorAsync).Unwrap();
         }