Merge branch 'development'

src/Artemis.Core/Utilities/Utilities.cs

@@ -13,6 +13,8 @@ namespace Artemis.Core;
 /// </summary>
 public static class Utilities
 {
+    private static bool _shuttingDown;
+
     /// <summary>
     ///     Call this before even initializing the Core to make sure the folders required for operation are in place
     /// </summary>
@@ -33,7 +35,11 @@ public static void PrepareFirstLaunch()
     /// </summary>
     public static void Shutdown()
     {
+        if (_shuttingDown)
+            return;
+
         // Request a graceful shutdown, whatever UI we're running can pick this up
+        _shuttingDown = true;
         OnShutdownRequested();
     }
 
@@ -45,9 +51,13 @@ public static void Shutdown()
     /// <param name="extraArgs">A list of extra arguments to pass to Artemis when restarting</param>
     public static void Restart(bool elevate, TimeSpan delay, params string[] extraArgs)
     {
+        if (_shuttingDown)
+            return;
+
         if (!OperatingSystem.IsWindows() && elevate)
             throw new ArtemisCoreException("Elevation on non-Windows platforms is not supported.");
 
+        _shuttingDown = true;
         OnRestartRequested(new RestartEventArgs(elevate, delay, extraArgs.ToList()));
     }
 
@@ -106,12 +116,12 @@ public static void CreateAccessibleDirectory(string path)
     ///     Occurs when the core has requested an application shutdown
     /// </summary>
     public static event EventHandler? ShutdownRequested;
-    
+
     /// <summary>
     ///     Occurs when the core has requested an application restart
     /// </summary>
     public static event EventHandler<RestartEventArgs>? RestartRequested;
-    
+
     /// <summary>
     ///     Occurs when the core has requested a pending application update to be applied
     /// </summary>
@@ -151,7 +161,7 @@ private static void OnShutdownRequested()
     {
         ShutdownRequested?.Invoke(null, EventArgs.Empty);
     }
-    
+
     private static void OnUpdateRequested(UpdateEventArgs e)
     {
         UpdateRequested?.Invoke(null, e);

src/Artemis.Storage/StorageManager.cs

@@ -9,6 +9,7 @@ public static class StorageManager
 {
     private static bool _ranMigrations;
     private static bool _inUse;
+    private static object _factoryLock = new();
 
     /// <summary>
     ///     Creates a backup of the database if the last backup is older than 10 minutes
@@ -39,19 +40,22 @@ public static void CreateBackup(string dataFolder)
 
         File.Copy(database, Path.Combine(backupFolder, $"artemis-{DateTime.Now:yyyy-dd-M--HH-mm-ss}.db"));
     }
-    
+
     public static ArtemisDbContext CreateDbContext(string dataFolder)
     {
-        _inUse = true;
+        lock (_factoryLock)
+        {
+            _inUse = true;
 
-        ArtemisDbContext dbContext = new() {DataFolder = dataFolder};
-        if (_ranMigrations)
-            return dbContext;
+            ArtemisDbContext dbContext = new() {DataFolder = dataFolder};
+            if (_ranMigrations)
+                return dbContext;
 
-        dbContext.Database.Migrate();
-        dbContext.Database.ExecuteSqlRaw("PRAGMA optimize");
-        _ranMigrations = true;
+            dbContext.Database.Migrate();
+            dbContext.Database.ExecuteSqlRaw("PRAGMA optimize");
+            _ranMigrations = true;
 
-        return dbContext;
+            return dbContext;
+        }
     }
 }

src/Artemis.UI/Routing/Routes.cs

@@ -20,57 +20,64 @@ namespace Artemis.UI.Routing;
 
 public static class Routes
 {
-    public static List<IRouterRegistration> ArtemisRoutes = new()
-    {
+    public static List<IRouterRegistration> ArtemisRoutes =
+    [
         new RouteRegistration<BlankViewModel>("blank"),
         new RouteRegistration<HomeViewModel>("home"),
         new RouteRegistration<WorkshopViewModel>("workshop")
         {
-            Children = new List<IRouterRegistration>
-            {
+            Children =
+            [
                 new RouteRegistration<WorkshopOfflineViewModel>("offline/{message:string}"),
                 new RouteRegistration<EntriesViewModel>("entries")
                 {
-                    Children = new List<IRouterRegistration>
-                    {
-                        new RouteRegistration<PluginListViewModel>("plugins/{page:int}"),
-                        new RouteRegistration<PluginDetailsViewModel>("plugins/details/{entryId:long}"),
-                        new RouteRegistration<ProfileListViewModel>("profiles/{page:int}"),
-                        new RouteRegistration<ProfileDetailsViewModel>("profiles/details/{entryId:long}"),
-                        new RouteRegistration<LayoutListViewModel>("layouts/{page:int}"),
-                        new RouteRegistration<LayoutDetailsViewModel>("layouts/details/{entryId:long}"),
-                    }
+                    Children =
+                    [
+                        new RouteRegistration<PluginListViewModel>("plugins")
+                        {
+                            Children = [new RouteRegistration<PluginDetailsViewModel>("details/{entryId:long}")]
+                        },
+                        new RouteRegistration<ProfileListViewModel>("profiles")
+                        {
+                            Children = [new RouteRegistration<ProfileDetailsViewModel>("details/{entryId:long}")]
+                        },
+                        new RouteRegistration<LayoutListViewModel>("layouts")
+                        {
+                            Children = [new RouteRegistration<LayoutDetailsViewModel>("details/{entryId:long}")]
+                        },
+                    ]
                 },
+
                 new RouteRegistration<WorkshopLibraryViewModel>("library")
                 {
-                    Children = new List<IRouterRegistration>
-                    {
+                    Children =
+                    [
                         new RouteRegistration<InstalledTabViewModel>("installed"),
                         new RouteRegistration<SubmissionsTabViewModel>("submissions"),
-                        new RouteRegistration<SubmissionDetailViewModel>("submissions/{entryId:long}"),
-                    }
+                        new RouteRegistration<SubmissionDetailViewModel>("submissions/{entryId:long}")
+                    ]
                 }
-            }
+            ]
         },
+
         new RouteRegistration<SurfaceEditorViewModel>("surface-editor"),
         new RouteRegistration<SettingsViewModel>("settings")
         {
-            Children = new List<IRouterRegistration>
-            {
+            Children =
+            [
                 new RouteRegistration<GeneralTabViewModel>("general"),
                 new RouteRegistration<PluginsTabViewModel>("plugins"),
                 new RouteRegistration<DevicesTabViewModel>("devices"),
                 new RouteRegistration<ReleasesTabViewModel>("releases")
                 {
-                    Children = new List<IRouterRegistration>
-                    {
-                        new RouteRegistration<ReleaseDetailsViewModel>("{releaseId:guid}")
-                    }
+                    Children = [new RouteRegistration<ReleaseDetailsViewModel>("{releaseId:guid}")]
                 },
+
                 new RouteRegistration<AccountTabViewModel>("account"),
                 new RouteRegistration<AboutTabViewModel>("about")
-            }
+            ]
         },
+
         new RouteRegistration<ProfileEditorViewModel>("profile-editor/{profileConfigurationId:guid}")
-    };
+    ];
 }

src/Artemis.UI/Screens/Device/Tabs/Layout/LayoutProviders/WorkshopLayoutViewModel.cs

@@ -64,7 +64,7 @@ public async Task<bool> BrowseLayouts()
         if (!await _windowService.ShowConfirmContentDialog("Open workshop", "Do you want to close this window and view the workshop?"))
             return false;
 
-        await _router.Navigate("workshop/entries/layouts/1");
+        await _router.Navigate("workshop/entries/layouts");
         return true;
     }
 

src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs

@@ -41,9 +41,9 @@ public SidebarViewModel(IRouter router, IProfileService profileService, IWindowS
             new(MaterialIconKind.HomeOutline, "Home", "home"),
             new(MaterialIconKind.TestTube, "Workshop", "workshop", null, new ObservableCollection<SidebarScreenViewModel>
             {
-                new(MaterialIconKind.FolderVideo, "Profiles", "workshop/entries/profiles/1", "workshop/entries/profiles"),
-                new(MaterialIconKind.KeyboardVariant, "Layouts", "workshop/entries/layouts/1", "workshop/entries/layouts"),
-                new(MaterialIconKind.Connection, "Plugins", "workshop/entries/plugins/1", "workshop/entries/plugins"),
+                new(MaterialIconKind.FolderVideo, "Profiles", "workshop/entries/profiles", "workshop/entries/profiles"),
+                new(MaterialIconKind.KeyboardVariant, "Layouts", "workshop/entries/layouts", "workshop/entries/layouts"),
+                new(MaterialIconKind.Connection, "Plugins", "workshop/entries/plugins", "workshop/entries/plugins"),
                 new(MaterialIconKind.Bookshelf, "Library", "workshop/library"),
             }),
 

src/Artemis.UI/Screens/Workshop/Entries/EntriesViewModel.cs

@@ -24,9 +24,9 @@ public EntriesViewModel(IRouter router)
 
         Tabs = new ObservableCollection<RouteViewModel>
         {
-            new("Profiles", "workshop/entries/profiles/1", "workshop/entries/profiles"),
-            new("Layouts", "workshop/entries/layouts/1", "workshop/entries/layouts"),
-            new("Plugins", "workshop/entries/plugins/1", "workshop/entries/plugins"),
+            new("Profiles", "workshop/entries/profiles", "workshop/entries/profiles"),
+            new("Layouts", "workshop/entries/layouts", "workshop/entries/layouts"),
+            new("Plugins", "workshop/entries/plugins", "workshop/entries/plugins"),
         };
 
         this.WhenActivated(d =>

src/Artemis.UI/Screens/Workshop/Entries/List/EntryListInputView.axaml

@@ -2,8 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:entries="clr-namespace:Artemis.UI.Screens.Workshop.Entries"
-             xmlns:system="clr-namespace:System;assembly=System.Runtime"
              xmlns:list="clr-namespace:Artemis.UI.Screens.Workshop.Entries.List"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.Workshop.Entries.List.EntryListInputView"
@@ -25,15 +23,6 @@
                 <ComboBoxItem>Download count</ComboBoxItem>
             </ComboBox>
         </StackPanel>
-        <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="5">
-            <TextBlock VerticalAlignment="Center">Show per page</TextBlock>
-            <ComboBox Width="65" SelectedItem="{CompiledBinding EntriesPerPage}">
-                <system:Int32>10</system:Int32>
-                <system:Int32>20</system:Int32>
-                <system:Int32>50</system:Int32>
-                <system:Int32>100</system:Int32>
-            </ComboBox>
-        </StackPanel>
         <TextBlock Grid.Column="3" VerticalAlignment="Center" Margin="5 0 0 0" MinWidth="75" TextAlignment="Right">
             <Run Text="{CompiledBinding TotalCount}"/>
             <Run Text="total"/>

src/Artemis.UI/Screens/Workshop/Entries/List/EntryListInputViewModel.cs

@@ -9,7 +9,6 @@ namespace Artemis.UI.Screens.Workshop.Entries.List;
 public partial class EntryListInputViewModel : ViewModelBase
 {
     private static string? _lastSearch;
-    private readonly PluginSetting<int> _entriesPerPage;
     private readonly PluginSetting<int> _sortBy;
     private string? _search;
     [Notify] private string _searchWatermark = "Search";
@@ -18,9 +17,7 @@ public partial class EntryListInputViewModel : ViewModelBase
     public EntryListInputViewModel(ISettingsService settingsService)
     {
         _search = _lastSearch;
-        _entriesPerPage = settingsService.GetSetting("Workshop.EntriesPerPage", 10);
         _sortBy = settingsService.GetSetting("Workshop.SortBy", 10);
-        _entriesPerPage.AutoSave = true;
         _sortBy.AutoSave = true;
     }
 
@@ -33,17 +30,7 @@ public string? Search
             _lastSearch = value;
         }
     }
-
-    public int EntriesPerPage
-    {
-        get => _entriesPerPage.Value;
-        set
-        {
-            _entriesPerPage.Value = value;
-            this.RaisePropertyChanged();
-        }
-    }
-
+
     public int SortBy
     {
         get => _sortBy.Value;