impl #1334

DGP-Studio · Feb 2, 2024 · 974afa8 · 974afa8
1 parent 7baf125
commit 974afa8
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 41 deletions.
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Database/ObservableReorderableDbCollection.cs b/src/Snap.Hutao/Snap.Hutao/Core/Database/ObservableReorderableDbCollection.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.EntityFrameworkCore;
+using Snap.Hutao.Model.Entity.Database;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Runtime.InteropServices;
@@ -11,13 +12,12 @@ namespace Snap.Hutao.Core.Database;
 internal sealed class ObservableReorderableDbCollection<T> : ObservableCollection<T>
     where T : class, IReorderable
 {
-    private readonly DbContext dbContext;
-    private bool previousChangeIsRemoved;
+    private readonly IServiceProvider serviceProvider;
 
-    public ObservableReorderableDbCollection(List<T> items, DbContext dbContext)
+    public ObservableReorderableDbCollection(List<T> items, IServiceProvider serviceProvider)
         : base(AdjustIndex(items))
     {
-        this.dbContext = dbContext;
+        this.serviceProvider = serviceProvider;
     }
 
     protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
@@ -27,16 +27,8 @@ protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
         switch (e.Action)
         {
             case NotifyCollectionChangedAction.Remove:
-                previousChangeIsRemoved = true;
-                break;
             case NotifyCollectionChangedAction.Add:
-                if (!previousChangeIsRemoved)
-                {
-                    return;
-                }
-
                 OnReorder();
-                previousChangeIsRemoved = false;
                 break;
         }
     }
@@ -57,10 +49,15 @@ private void OnReorder()
     {
         AdjustIndex((List<T>)Items);
 
-        DbSet<T> dbSet = dbContext.Set<T>();
-        foreach (ref readonly T item in CollectionsMarshal.AsSpan((List<T>)Items))
+        using (IServiceScope scope = serviceProvider.CreateScope())
         {
-            dbSet.UpdateAndSave(item);
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+
+            DbSet<T> dbSet = appDbContext.Set<T>();
+            foreach (ref readonly T item in CollectionsMarshal.AsSpan((List<T>)Items))
+            {
+                dbSet.UpdateAndSave(item);
+            }
         }
     }
 }
diff --git a/src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.cs b/src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.cs
@@ -1,6 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Core.Database;
 using System.Collections.ObjectModel;
 using System.Runtime.CompilerServices;
 using System.Text;
@@ -113,6 +114,13 @@ public static ObservableCollection<T> ToObservableCollection<T>(this IEnumerable
         return new ObservableCollection<T>(source);
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static ObservableReorderableDbCollection<T> ToObservableReorderableDbCollection<T>(this IEnumerable<T> source, IServiceProvider serviceProvider)
+        where T : class, IReorderable
+    {
+        return new ObservableReorderableDbCollection<T>([.. source], serviceProvider);
+    }
+
     /// <summary>
     /// Concatenates each element from the collection into single string.
     /// </summary>

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/Account/GameAccountService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/Account/GameAccountService.cs
@@ -1,6 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Core.Database;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Factory.ContentDialog;
 using Snap.Hutao.Model.Entity;
@@ -18,9 +19,9 @@ internal sealed partial class GameAccountService : IGameAccountService
     private readonly IGameDbService gameDbService;
     private readonly ITaskContext taskContext;
 
-    private ObservableCollection<GameAccount>? gameAccounts;
+    private ObservableReorderableDbCollection<GameAccount>? gameAccounts;
 
-    public ObservableCollection<GameAccount> GameAccountCollection
+    public ObservableReorderableDbCollection<GameAccount> GameAccountCollection
     {
         get => gameAccounts ??= gameDbService.GetGameAccountCollection();
     }

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/Account/IGameAccountService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/Account/IGameAccountService.cs
@@ -1,15 +1,15 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Core.Database;
 using Snap.Hutao.Model.Entity;
 using Snap.Hutao.Model.Entity.Primitive;
-using System.Collections.ObjectModel;
 
 namespace Snap.Hutao.Service.Game.Account;
 
 internal interface IGameAccountService
 {
-    ObservableCollection<GameAccount> GameAccountCollection { get; }
+    ObservableReorderableDbCollection<GameAccount> GameAccountCollection { get; }
 
     void AttachGameAccountToUid(GameAccount gameAccount, string uid);
 

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/GameDbService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/GameDbService.cs
@@ -5,7 +5,6 @@
 using Snap.Hutao.Core.Database;
 using Snap.Hutao.Model.Entity;
 using Snap.Hutao.Model.Entity.Database;
-using System.Collections.ObjectModel;
 
 namespace Snap.Hutao.Service.Game;
 
@@ -15,12 +14,12 @@ internal sealed partial class GameDbService : IGameDbService
 {
     private readonly IServiceProvider serviceProvider;
 
-    public ObservableCollection<GameAccount> GetGameAccountCollection()
+    public ObservableReorderableDbCollection<GameAccount> GetGameAccountCollection()
     {
         using (IServiceScope scope = serviceProvider.CreateScope())
         {
             AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
-            return appDbContext.GameAccounts.AsNoTracking().ToObservableCollection();
+            return appDbContext.GameAccounts.AsNoTracking().OrderBy(account => account.Index).ToObservableReorderableDbCollection(serviceProvider);
         }
     }
 

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/GameServiceFacade.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/GameServiceFacade.cs
@@ -1,13 +1,13 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Core.Database;
 using Snap.Hutao.Model.Entity;
 using Snap.Hutao.Model.Entity.Primitive;
 using Snap.Hutao.Service.Game.Account;
 using Snap.Hutao.Service.Game.Configuration;
 using Snap.Hutao.Service.Game.Launching.Handler;
 using Snap.Hutao.Service.Game.PathAbstraction;
-using System.Collections.ObjectModel;
 
 namespace Snap.Hutao.Service.Game;
 
@@ -24,7 +24,7 @@ internal sealed partial class GameServiceFacade : IGameServiceFacade
     private readonly IGamePathService gamePathService;
 
     /// <inheritdoc/>
-    public ObservableCollection<GameAccount> GameAccountCollection
+    public ObservableReorderableDbCollection<GameAccount> GameAccountCollection
     {
         get => gameAccountService.GameAccountCollection;
     }

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/IGameDbService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/IGameDbService.cs
@@ -1,8 +1,8 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Core.Database;
 using Snap.Hutao.Model.Entity;
-using System.Collections.ObjectModel;
 
 namespace Snap.Hutao.Service.Game;
 
@@ -12,7 +12,7 @@ internal interface IGameDbService
 
     ValueTask RemoveGameAccountByIdAsync(Guid id);
 
-    ObservableCollection<GameAccount> GetGameAccountCollection();
+    ObservableReorderableDbCollection<GameAccount> GetGameAccountCollection();
 
     void UpdateGameAccount(GameAccount gameAccount);
 

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/IGameServiceFacade.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/IGameServiceFacade.cs
@@ -1,10 +1,10 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Core.Database;
 using Snap.Hutao.Model.Entity;
 using Snap.Hutao.Model.Entity.Primitive;
 using Snap.Hutao.Service.Game.Configuration;
-using System.Collections.ObjectModel;
 
 namespace Snap.Hutao.Service.Game;
 
@@ -17,7 +17,7 @@ internal interface IGameServiceFacade
     /// <summary>
     /// 游戏内账号集合
     /// </summary>
-    ObservableCollection<GameAccount> GameAccountCollection { get; }
+    ObservableReorderableDbCollection<GameAccount> GameAccountCollection { get; }
 
     /// <summary>
     /// 将账号绑定到对应的Uid

diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
@@ -202,6 +202,8 @@
                                             IsClickEnabled="True"/>
                                         <Border Padding="0,1" Style="{StaticResource BorderCardStyle}">
                                             <ListView
+                                                AllowDrop="True"
+                                                CanReorderItems="True"
                                                 ItemTemplate="{StaticResource GameAccountListTemplate}"
                                                 ItemsSource="{Binding GameAccountsView}"
                                                 SelectedItem="{Binding SelectedGameAccount, Mode=TwoWay}"/>

diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModel.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.UI.Windowing;
 using Snap.Hutao.Core;
+using Snap.Hutao.Core.Database;
 using Snap.Hutao.Core.Diagnostics.CodeAnalysis;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Model.Entity;
@@ -18,7 +19,6 @@
 using Snap.Hutao.Service.User;
 using Snap.Hutao.Web.Hoyolab.SdkStatic.Hk4e.Launcher;
 using System.Collections.Immutable;
-using System.Collections.ObjectModel;
 using System.IO;
 
 namespace Snap.Hutao.ViewModel.Game;
@@ -241,6 +241,8 @@ private async Task DetectGameAccountAsync()
             {
                 await taskContext.SwitchToMainThreadAsync();
                 SelectedGameAccount = account;
+
+                await UpdateGameAccountsViewAsync().ConfigureAwait(false);
             }
         }
         catch (UserdataCorruptedException ex)
@@ -326,18 +328,6 @@ async ValueTask UpdateGameResourceAsync(LaunchScheme? scheme)
                 GameResource = response.Data;
             }
         }
-
-        async ValueTask UpdateGameAccountsViewAsync()
-        {
-            gameAccountFilter = new(SelectedScheme?.GetSchemeType());
-            ObservableCollection<GameAccount> accounts = gameService.GameAccountCollection;
-
-            await taskContext.SwitchToMainThreadAsync();
-            GameAccountsView = new(accounts, true)
-            {
-                Filter = gameAccountFilter.Filter,
-            };
-        }
     }
 
     [Command("IdentifyMonitorsCommand")]
@@ -363,4 +353,16 @@ private async Task IdentifyMonitorsAsync()
             window.Close();
         }
     }
+
+    private async ValueTask UpdateGameAccountsViewAsync()
+    {
+        gameAccountFilter = new(SelectedScheme?.GetSchemeType());
+        ObservableReorderableDbCollection<GameAccount> accounts = gameService.GameAccountCollection;
+
+        await taskContext.SwitchToMainThreadAsync();
+        GameAccountsView = new(accounts, true)
+        {
+            Filter = gameAccountFilter.Filter,
+        };
+    }
 }