Added Version logic, fixed bug not downloading DB

netquick · Jul 21, 2024 · b798cb2 · b798cb2
1 parent e28da19
commit b798cb2
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 19 deletions.
diff --git a/DeFRaG_Helper/App.xaml.cs b/DeFRaG_Helper/App.xaml.cs
@@ -13,20 +13,30 @@ protected override void OnStartup(StartupEventArgs e)
             base.OnStartup(e);
             // Initialize logging
             MessageHelper.Log("Application starting");
-            LoadConfigurationAndStartAsync().ContinueWith(_ =>
+            LoadConfigurationAndStartAsync().ContinueWith(task =>
             {
-                // This ensures the continuation runs on the UI thread
-                Dispatcher.Invoke(() =>
+                if (task.IsFaulted)
                 {
-                    // Now that configuration and resources are loaded, show the main window
-                    MessageHelper.Log("Main window created");
-                    MainWindow mainWindow = new MainWindow();
-                    mainWindow.Show();
-                });
-            }); 
+                    // Log the error or show an error message to the user
+                    MessageHelper.Log($"Error during startup: {task.Exception}");
+                    // Optionally, close the application if critical startup tasks fail
+                    Dispatcher.Invoke(() => Current.Shutdown());
+                }
+                else
+                {
+                    // This ensures the continuation runs on the UI thread
+                    Dispatcher.Invoke(() =>
+                    {
+                        // Now that configuration and resources are loaded, show the main window
+                        MessageHelper.Log("Main window created");
+                        MainWindow mainWindow = new MainWindow();
+                        mainWindow.Show();
+                    });
+                }
+            });
             StartDelayedTasks();
-
         }
+
         private async void StartDelayedTasks()
         {
             // Wait for 1 minute after the application starts
@@ -51,12 +61,16 @@ private async Task LoadConfigurationAndStartAsync()
 
             ApplyThemeColor();
             // Create an instance of MapHistoryManager
+
+
+            await AppConfig.EnsureDatabaseExistsAsync();
+            MessageHelper.Log("Database exists");
+
             MessageHelper.Log("Creating MapHistoryManager");
             var mapHistoryManager = MapHistoryManager.GetInstance("DeFRaG_Helper");
             MessageHelper.Log("MapHistoryManager created");
 
-            await AppConfig.EnsureDatabaseExistsAsync();
-            MessageHelper.Log("Database exists");
+
             // The main window creation and showing is moved to the continuation of this method in OnStartup
         }
         private void ApplyThemeColor()

diff --git a/DeFRaG_Helper/AssemblyInfo.cs b/DeFRaG_Helper/AssemblyInfo.cs
@@ -1,3 +1,4 @@
+using System.Reflection;
 using System.Windows;
 
 [assembly: ThemeInfo(

diff --git a/DeFRaG_Helper/DeFRaG_Helper.csproj b/DeFRaG_Helper/DeFRaG_Helper.csproj
@@ -7,6 +7,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Quake3.ico</ApplicationIcon>
+    <AssemblyVersion>1.0.0</AssemblyVersion>
+    <FileVersion>1.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/DeFRaG_Helper/Helpers/Downloader.cs b/DeFRaG_Helper/Helpers/Downloader.cs
@@ -7,7 +7,6 @@ namespace DeFRaG_Helper
 {
     public static class Downloader
     {
-
         private static readonly HttpClient httpClient = CreateHttpClient();
 
         private static HttpClient CreateHttpClient()

diff --git a/DeFRaG_Helper/MainWindow.xaml b/DeFRaG_Helper/MainWindow.xaml
@@ -32,7 +32,7 @@
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <!-- Application Title Label -->
-                        <Label Grid.Column="0" Content="DeFRaG_Helper" VerticalAlignment="Center" Foreground="{DynamicResource ThemeColor}" FontSize="20" Margin="10,0,0,0"/>
+                        <Label Grid.Column="0" Content="{Binding AppTitleAndVersion}" VerticalAlignment="Center" Foreground="{DynamicResource ThemeColor}" FontSize="20" Margin="10,0,0,0"/>
                         <TextBox x:Name="searchBar" Grid.Column="1" VerticalAlignment="Center" FontSize="20" Margin="306,0,306,0" Height="34" Text="Search..." GotFocus="SearchBox_GotFocus" IsEnabled="False"/>
                         <!-- Spacer to push buttons to the right -->
                         <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">

diff --git a/DeFRaG_Helper/MainWindow.xaml.cs b/DeFRaG_Helper/MainWindow.xaml.cs
@@ -1,5 +1,6 @@
 using DeFRaG_Helper.ViewModels;
 using System.Diagnostics;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Controls;
@@ -69,6 +70,9 @@ public MainWindow()
             hideProgressBarTimer = new System.Timers.Timer(2000);
             hideProgressBarTimer.Elapsed += HideProgressBarTimer_Elapsed;
             hideProgressBarTimer.AutoReset = false; // Ensure the timer runs only once per start
+
+            this.DataContext = this;
+
         }
 
         //Method to apply filters based on the page navigated to in the MainFrame
@@ -77,7 +81,14 @@ private void MainFrame_Navigated(object sender, NavigationEventArgs e)
             ApplyFilterBasedOnPageAsync(e.Content);            //AppConfig.OnRequestGameDirectory += RequestGameDirectoryAsync;
 
         }
-
+        public string AppTitleAndVersion
+        {
+            get
+            {
+                var version = Assembly.GetExecutingAssembly().GetName().Version;
+                return $"DeFRaG_Helper v{version.Major}.{version.Minor}.{version.Build}";
+            }
+        }
         //Method to request game directory
         private async Task<string> RequestGameDirectoryAsync()
         {

diff --git a/DeFRaG_Helper/ToDo.txt b/DeFRaG_Helper/ToDo.txt
@@ -4,10 +4,7 @@
 - Edit maps
 - Config editor
 - Records
-- Versioning
-
-- Own File Browser remove old..
-- Refactor appConfig logic to ask gamepath
+- Versioning and AutoUpdate