Log and try-catch extraction

polusgg · Sep 17, 2021 · 778bde3 · 778bde3
1 parent afcba22
commit 778bde3
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 24 deletions.
diff --git a/ClientLauncher/Context.cs b/ClientLauncher/Context.cs
@@ -19,13 +19,13 @@ public static class Context
 
         public static string BepInExGithubOrg => "NuclearPowered";
         public static string BepInExGithubRepo => "BepInEx";
+
         #if PRIVATE
         public static string BucketUrl => "https://polusgg-mod-client-private.nyc3.digitaloceanspaces.com";
         #elif PUBLIC
         public static string BucketUrl => "https://launcher.asset.polus.gg";
         #endif
-
-        //TODO: hardcode value later
+
         public static string CosmeticsUrl => "http://cosmetics.service.polus.gg:2219";
         public static string AccountServerUrl => "https://account.polus.gg";
 
@@ -49,4 +49,4 @@ public static class Context
 
         public static Configuration Configuration { get; set; } = new();
     }
-}
+}
diff --git a/ClientLauncher/Extensions/GameInstallExtensions.cs b/ClientLauncher/Extensions/GameInstallExtensions.cs
@@ -29,7 +29,7 @@ public static async ValueTask CopyTo(this GameInstall install, string newInstall
                 if (Directory.Exists(filePath) && Path.GetFileName(filePath) != "Among Us_Data")
                     continue;
 
-                var rebasedPath = filePath.Replace(basePath, "").TrimStart('/');
+                var rebasedPath = filePath.Replace(basePath, "").TrimStart('/').TrimStart('\\');
                 rebasedPath = Path.Join(newInstallPath, rebasedPath);
 
                 var baseDir = Path.GetDirectoryName(rebasedPath);

diff --git a/ClientLauncher/Program.cs b/ClientLauncher/Program.cs
@@ -34,11 +34,11 @@ public static void Main(string[] args)
                 Console.Write($"Error initializing Steam API: {e.Message}\n{e.StackTrace}");
             }
 
-            LoggingService.ClearLog();
 
             CreateConfiguration();
+            LoggingService.CreateLogFile();
 
-            LoggingService.LogError(new GameInstall().ModPackageManifestJson);
+            LoggingService.Log(new GameInstall().ModPackageManifestJson);
 
             BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
 

diff --git a/ClientLauncher/Services/Api/ApiClient.cs b/ClientLauncher/Services/Api/ApiClient.cs
@@ -26,7 +26,7 @@ public async Task<MemoryStream> DownloadFileAsync(string downloadUrl, string? na
 
         public async Task<ModPackageManifest> GetModPackageManifestAsync(string version)
         {
-            LoggingService.LogError($"{Context.BucketUrl}/{version}/{ModPackageManifest.ManifestFileName}");
+            LoggingService.Log($"{Context.BucketUrl}/{version}/{ModPackageManifest.ManifestFileName}");
             var manifest = await _client.GetFromJsonAsync<ModPackageManifest>($"{Context.BucketUrl}/{version}/{ModPackageManifest.ManifestFileName}");
             if (manifest is null)
                 throw new InvalidOperationException($"Download manifest.json was not found for version {version}");

diff --git a/ClientLauncher/Services/DownloadService.BepInEx.cs b/ClientLauncher/Services/DownloadService.BepInEx.cs
@@ -32,7 +32,23 @@ public static async ValueTask DownloadBepInExAsync(GameInstall install)
                 Directory.CreateDirectory(install.BepInExFolder);
 
                 using var zip = new ZipArchive(zipStream);
-                zip.ExtractToDirectory(install.Location, true);
+                foreach (ZipArchiveEntry entry in zip.Entries)
+                {
+                    var zipEntryPath = Path.GetFullPath(Path.Combine(install.Location, entry.FullName));
+                    try
+                    {
+
+                        var directoryName = Path.GetDirectoryName(zipEntryPath);
+                        if (directoryName is not null)
+                            Directory.CreateDirectory(directoryName);
+                        entry.ExtractToFile(zipEntryPath, true);
+                    }
+                    catch (Exception e)
+                    {
+                        LoggingService.Log($"Couldn't extract file {entry.FullName} to path {zipEntryPath}: {e.Message}\n{e.StackTrace}");   
+                    }
+                }
+
 
                 await File.WriteAllTextAsync(install.BepInExVersionFile, latest.Id.ToString());
             }

diff --git a/ClientLauncher/Services/LoggingService.cs b/ClientLauncher/Services/LoggingService.cs
@@ -3,22 +3,23 @@
 
 namespace ClientLauncher.Services
 {
-    public static class LoggingService {
-        public static string LogFile => Path.Combine(Context.DataPath, "launcher.log");
-        public static void ClearLog() {
-            if (File.Exists(LogFile))
-            {
-                File.Delete(LogFile);
-            }
-        }
-        public static void LogError(string contents)
+    public static class LoggingService
+    {
+        private static string LogFile => Path.Combine(Context.DataPath, "launcher.log");
+
+        public static void Log(string contents)
         {
             try
             {
                 Console.WriteLine(contents);
                 File.AppendAllText(LogFile, $"{contents}\n\n");
             }
             catch (Exception) { /* ignored */ }
-        }   
+        }
+
+        public static void CreateLogFile()
+        {
+            File.WriteAllText(LogFile, $"--- Log file created at {DateTime.Now:G} ---\n");
+        }
     }
-}
+}
diff --git a/ClientLauncher/ViewModels/LandingPage/LandingPageViewModel.cs b/ClientLauncher/ViewModels/LandingPage/LandingPageViewModel.cs
@@ -174,7 +174,7 @@ private async Task InstallGameAsync()
                     catch (Exception e)
                     {
                         IsInstallProgressing = false;
-                        LoggingService.LogError($"Couldn't setup modded install directory: {e.Message}\n{e.StackTrace}");
+                        LoggingService.Log($"Couldn't setup modded install directory: {e.Message}\n{e.StackTrace}");
                         await WarnDialog.Handle("Couldn't setup modded install directory.");
                         return;
                     }
@@ -187,7 +187,7 @@ private async Task InstallGameAsync()
                 catch (Exception e)
                 {
                     IsInstallProgressing = false;
-                    LoggingService.LogError($"Couldn't install BepInEx: {e.Message}\n{e.StackTrace}");
+                    LoggingService.Log($"Couldn't install BepInEx: {e.Message}\n{e.StackTrace}");
                     await WarnDialog.Handle("Couldn't install BepInEx.");
                     return;
                 }
@@ -199,7 +199,7 @@ private async Task InstallGameAsync()
                 catch (Exception e)
                 {
                     IsInstallProgressing = false;
-                    LoggingService.LogError($"Exception installing Polus.gg mod: {e.Message}\n{e.StackTrace}");
+                    LoggingService.Log($"Exception installing Polus.gg mod: {e.Message}\n{e.StackTrace}");
                     await WarnDialog.Handle($"Couldn't install Polusgg mod.");
                     return;
                 }
@@ -211,14 +211,14 @@ private async Task InstallGameAsync()
                 }
                 catch (Exception e)
                 {
-                    LoggingService.LogError($"Exception while launching game: {e.Message}\n{e.StackTrace}");
+                    LoggingService.Log($"Exception while launching game: {e.Message}\n{e.StackTrace}");
                     await WarnDialog.Handle($"Caught exception when launching game.");
                 }
 
             }
             catch (Exception e)
             {
-                LoggingService.LogError($"Exception while launching game: {e.Message}\n{e.StackTrace}");
+                LoggingService.Log($"Exception while launching game: {e.Message}\n{e.StackTrace}");
                 await WarnDialog.Handle($"Unknown error when launching game.");
             }
             finally