fix crash on single-file app because of wrong assembly location

jakobharder · Oct 9, 2023 · 95c3e61 · 95c3e61
1 parent b0731e1
commit 95c3e61
Show file tree

Hide file tree

Showing 6 changed files with 106 additions and 15 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,8 +1,6 @@
 name: main
 
 on:
-  push:
-    branches: [ main ]
   pull_request:
     branches: [ main ]
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
         fetch-depth: 0
 
     - name: Build
-      run: (cd source && dotnet build Burntime.MonoGl -c Release /p:DebugSymbols=false /p:PublishReadyToRun=false /p:TieredCompilation=false --self-contained /p:PublishSingleFile=true && cd ..)
+      run: (cd source && dotnet publish Burntime.MonoGl -c Release /p:DebugSymbols=false /p:PublishReadyToRun=false /p:TieredCompilation=false --self-contained /p:PublishSingleFile=true && cd ..)
 
     - name: Package
       run: |

diff --git a/source/Burntime.Core/Log.cs b/source/Burntime.Core/Log.cs
@@ -2,41 +2,41 @@
 
 public class Log
 {
-    static StreamWriter file;
+    public static StreamWriter? File { get; private set; }
     public static bool DebugOut;
 
     public static string FormatPercentage(float factor) => System.Math.Round(factor * 100) + "%";
     public static string FormatPercentage(Vector2f factor) => System.Math.Round(factor.x * 100) + "% x " + System.Math.Round(factor.y * 100) + "%";
 
     static public void Initialize(String file)
     {
-        Log.file = new StreamWriter(file, false);
+        Log.File = new StreamWriter(file, false);
     }
 
     static public void Info(String str)
     {
-        if (file != null)
+        if (File != null)
         {
-            file.WriteLine("[info] " + str);
-            file.Flush();
+            File.WriteLine("[info] " + str);
+            File.Flush();
         }
     }
 
     static public void Warning(String str)
     {
-        if (file != null)
+        if (File != null)
         {
-            file.WriteLine("[warning] " + str);
-            file.Flush();
+            File.WriteLine("[warning] " + str);
+            File.Flush();
         }
     }
 
     static public void Debug(String str)
     {
-        if (file != null && DebugOut)
+        if (File != null && DebugOut)
         {
-            file.WriteLine("[debug] " + str);
-            file.Flush();
+            File.WriteLine("[debug] " + str);
+            File.Flush();
         }
     }
 }
diff --git a/source/Burntime.MonoGl/BurntimeGame.cs b/source/Burntime.MonoGl/BurntimeGame.cs
@@ -75,8 +75,11 @@ public BurntimeGame()
         protected override void Initialize()
         {
             Log.Initialize("log.txt");
+            Log.Info(System.DateTime.Now.ToLocalTime().ToString());
+            string version = FileVersionInfo.GetVersionInfo(System.IO.Path.Combine(System.AppContext.BaseDirectory, "burntime.exe")).ProductVersion ?? "?";
+            Log.Info("Burntime version " + version);
 
-            Window.Title = "Burntime " + FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).ProductVersion ?? "?";
+            Window.Title = "Burntime " + version;
 
             FileSystem.BasePath = "";
             FileSystem.AddPackage("system", "system");

diff --git a/source/Burntime.MonoGl/CustomExceptionHandler.cs b/source/Burntime.MonoGl/CustomExceptionHandler.cs
@@ -0,0 +1,72 @@
+using System;
+//using System.Windows.Forms;
+using System.IO;
+using System.Threading;
+
+namespace Burntime
+{
+    //public class CustomExceptionHandler
+    //{
+    //    public void OnThreadException(object sender, UnhandledExceptionEventArgs args)
+    //    {
+    //        Exception e = args.ExceptionObject as Exception;
+    //        if (e == null)
+    //        {
+    //            MessageBox.Show("Error: Unknown", "Error", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+    //        }
+    //        else
+    //        {
+    //            ErrorMsg.LogException(e);
+
+    //            MessageBox.Show("Error: " + e.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+    //        }
+
+    //        // close
+    //        Environment.Exit(1);
+    //    }
+    //};
+
+    static class ErrorMsg
+    {
+        //public static void ShowError(string msg)
+        //{
+        //    MessageBox.Show("Error: " + msg, "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+        //}
+
+        //public static void ShowError(string msg, Exception e)
+        //{
+        //    MessageBox.Show("Error: " + msg, "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+        //    LogException(e);
+        //}
+
+        // add exception to errorlog.txt
+        public static void LogException(Exception exception)
+        {
+            var log = (StreamWriter writer, Exception e) =>
+            {
+                writer.WriteLine();
+                writer.WriteLine("----------------------------------------------------------------------");
+                writer.WriteLine(System.DateTime.Now.ToLocalTime().ToString());
+                writer.WriteLine("exception: " + e.Message);
+                writer.WriteLine("trace:");
+                writer.Write(e.StackTrace);
+                writer.WriteLine();
+
+                writer.Flush();
+                writer.Close();
+            };
+
+            try
+            {
+                if (Platform.Log.File is not null)
+                    log(Platform.Log.File, exception);
+            }
+            catch { }
+
+            using StreamWriter writer = new("crash.txt", true);
+            log(writer, exception);
+
+#warning TODO message box?
+        }
+    }
+}
diff --git a/source/Burntime.MonoGl/Program.cs b/source/Burntime.MonoGl/Program.cs
@@ -1,3 +1,21 @@
 
+using Burntime;
+
+#if (DEBUG)
+
 using var game = new Burntime.MonoGl.BurntimeGame();
 game.Run();
+
+#else
+
+try
+{
+    using var game = new Burntime.MonoGl.BurntimeGame();
+    game.Run();
+}
+catch (System.Exception exception)
+{
+    ErrorMsg.LogException(exception);
+}
+
+#endif