Clean Code

RiversideValley · May 9, 2023 · c59e3db · c59e3db
1 parent 652c845
commit c59e3db
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 66 deletions.
diff --git a/CmlLib/Core/Auth/MSession.cs b/CmlLib/Core/Auth/MSession.cs
@@ -6,7 +6,7 @@ public class MSession
     {
         public MSession() { }
 
-        public MSession(string? username, string? accessToken, string? uuid,string? clientToken = null)
+        public MSession(string? username, string? accessToken, string? uuid, string? clientToken = null)
         {
             Username = username;
             AccessToken = accessToken;

diff --git a/CmlLib/Core/Files/AssetChecker.cs b/CmlLib/Core/Files/AssetChecker.cs
@@ -56,10 +56,8 @@ private void checkIndex(MinecraftPath path, MVersion version)
                     if (!string.IsNullOrEmpty(directoryName))
                         Directory.CreateDirectory(directoryName);
 
-                    using (var wc = new WebClient())
-                    {
-                        wc.DownloadFile(version.AssetUrl, index);
-                    }
+                    using var wc = new WebClient();
+                    wc.DownloadFile(version.AssetUrl, index);
                 }
         }
 

diff --git a/CmlLib/Core/Installer/MJava.cs b/CmlLib/Core/Installer/MJava.cs
@@ -95,21 +95,17 @@ public async Task<string> CheckJavaAsync(IProgress<ProgressChangedEventArgs>? pr
 
         public string GetJavaUrl()
         {
-            using (var wc = new WebClient())
-            {
-                string json = wc.DownloadString(MojangServer.LauncherMeta);
-                return parseLauncherMetadata(json);
-            }
+            using var wc = new WebClient();
+            string json = wc.DownloadString(MojangServer.LauncherMeta);
+            return parseLauncherMetadata(json);
         }
 
         public async Task<string> GetJavaUrlAsync()
         {
-            using (var wc = new WebClient())
-            {
-                string json = await wc.DownloadStringTaskAsync(MojangServer.LauncherMeta)
-                    .ConfigureAwait(false);
-                return parseLauncherMetadata(json);
-            }
+            using var wc = new WebClient();
+            string json = await wc.DownloadStringTaskAsync(MojangServer.LauncherMeta)
+                .ConfigureAwait(false);
+            return parseLauncherMetadata(json);
         }
 
         private string parseLauncherMetadata(string json)

diff --git a/CmlLib/Utils/GameOptionsFile.cs b/CmlLib/Utils/GameOptionsFile.cs
@@ -195,18 +195,16 @@ public void Save(Encoding encoding)
 
         public void Save(string path, Encoding encoding)
         {
-            using (var fs = File.OpenWrite(path))
-            using (var writer = new StreamWriter(fs, encoding))
+            using var fs = File.OpenWrite(path);
+            using var writer = new StreamWriter(fs, encoding);
+            foreach (KeyValuePair<string, string?> keyvalue in options)
             {
-                foreach (KeyValuePair<string, string?> keyvalue in options)
+                if (keyvalue.Value == null)
+                    writer.WriteLine(keyvalue.Key);
+                else
                 {
-                    if (keyvalue.Value == null)
-                        writer.WriteLine(keyvalue.Key);
-                    else
-                    {
-                        var line = ToKeyValueString(keyvalue.Key, keyvalue.Value);
-                        writer.WriteLine(line);
-                    }
+                    var line = ToKeyValueString(keyvalue.Key, keyvalue.Value);
+                    writer.WriteLine(line);
                 }
             }
         }

diff --git a/CmlLib/Utils/SharpZip.cs b/CmlLib/Utils/SharpZip.cs
@@ -14,31 +14,27 @@ public SharpZip(string path)
 
         public void Unzip(string path)
         {
-            using (var fs = File.OpenRead(ZipPath))
-            using (var s = new ZipInputStream(fs))
+            using var fs = File.OpenRead(ZipPath);
+            using var s = new ZipInputStream(fs);
+            long length = fs.Length;
+            ZipEntry e;
+            while ((e = s.GetNextEntry()) != null)
             {
-                long length = fs.Length;
-                ZipEntry e;
-                while ((e = s.GetNextEntry()) != null)
-                {
-                    var zfile = Path.Combine(path, e.Name);
-
-                    var dirName = Path.GetDirectoryName(zfile);
-                    var fileName = Path.GetFileName(zfile);
+                var zfile = Path.Combine(path, e.Name);
 
-                    if (!string.IsNullOrWhiteSpace(dirName))
-                        Directory.CreateDirectory(dirName);
+                var dirName = Path.GetDirectoryName(zfile);
+                var fileName = Path.GetFileName(zfile);
 
-                    if (!string.IsNullOrWhiteSpace(fileName))
-                    {
-                        using (var zFileStream = File.OpenWrite(zfile))
-                        {
-                            s.CopyTo(zFileStream);
-                        }
-                    }
+                if (!string.IsNullOrWhiteSpace(dirName))
+                    Directory.CreateDirectory(dirName);
 
-                    ev(s.Position, length);
+                if (!string.IsNullOrWhiteSpace(fileName))
+                {
+                    using var zFileStream = File.OpenWrite(zfile);
+                    s.CopyTo(zFileStream);
                 }
+
+                ev(s.Position, length);
             }
         }
 

diff --git a/CmlLib/Utils/WebDownload.cs b/CmlLib/Utils/WebDownload.cs
@@ -78,28 +78,26 @@ internal async Task DownloadFileAsync(DownloadFile file)
             if (!string.IsNullOrEmpty(directoryName))
                 Directory.CreateDirectory(directoryName);
 
-            using (var wc = new TimeoutWebClient())
-            {
-                long lastBytes = 0;
+            using var wc = new TimeoutWebClient();
+            long lastBytes = 0;
 
-                wc.DownloadProgressChanged += (s, e) =>
+            wc.DownloadProgressChanged += (s, e) =>
+            {
+                lock (locker)
                 {
-                    lock (locker)
-                    {
-                        var progressedBytes = e.BytesReceived - lastBytes;
-                        if (progressedBytes < 0)
-                            return;
-
-                        lastBytes = e.BytesReceived;
-
-                        var progress = new DownloadFileProgress(
-                            file, e.TotalBytesToReceive, progressedBytes, e.BytesReceived, e.ProgressPercentage);
-                        FileDownloadProgressChanged?.Invoke(this, progress);
-                    }
-                };
-                await wc.DownloadFileTaskAsync(file.Url, file.Path)
-                    .ConfigureAwait(false);
-            }
+                    var progressedBytes = e.BytesReceived - lastBytes;
+                    if (progressedBytes < 0)
+                        return;
+
+                    lastBytes = e.BytesReceived;
+
+                    var progress = new DownloadFileProgress(
+                        file, e.TotalBytesToReceive, progressedBytes, e.BytesReceived, e.ProgressPercentage);
+                    FileDownloadProgressChanged?.Invoke(this, progress);
+                }
+            };
+            await wc.DownloadFileTaskAsync(file.Url, file.Path)
+                .ConfigureAwait(false);
         }
 
         internal void DownloadFileLimit(string url, string path)