Merge branch 'dev' of https://github.com/jayfunc/BetterLyrics into dev

New Crowdin updates

BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj

@@ -53,27 +53,27 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <AppxBundle>Always</AppxBundle>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
     <AppxBundle>Always</AppxBundle>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
     <AppxBundle>Always</AppxBundle>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <AppxBundle>Always</AppxBundle>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <AppxBundle>Always</AppxBundle>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <AppxBundle>Always</AppxBundle>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <DefaultLanguage>en</DefaultLanguage>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">

BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest

@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.1.194.0" />
+	  Version="1.2.236.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
@@ -28,11 +28,22 @@
 	</Dependencies>
 
 	<Resources>
-		<Resource Language="en-US"/>
-		<Resource Language="zh-CN"/>
-		<Resource Language="zh-TW"/>
-		<Resource Language="ja-JP"/>
-		<Resource Language="ko-KR"/>
+		<Resource Language="ar"/>
+		<Resource Language="de"/>
+		<Resource Language="en"/>
+		<Resource Language="es"/>
+		<Resource Language="fr"/>
+		<Resource Language="hi"/>
+		<Resource Language="id"/>
+		<Resource Language="ja"/>
+		<Resource Language="ko"/>
+		<Resource Language="ms"/>
+		<Resource Language="pt"/>
+		<Resource Language="ru"/>
+		<Resource Language="th"/>
+		<Resource Language="vi"/>
+		<Resource Language="zh-Hans"/>
+		<Resource Language="zh-Hant"/>
 	</Resources>
 
 	<Applications>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml

@@ -65,7 +65,6 @@
             <converter:ByteArrayToImageConverter x:Key="ByteArrayToImageConverter" />
             <converter:DisplayLanguageCodeToIndexConverter x:Key="DisplayLanguageCodeToIndexConverter" />
             <converter:PathToParentFolderConverter x:Key="PathToParentFolderConverter" />
-            <converter:TrackToLyricsConverter x:Key="TrackToLyricsConverter" />
             <converter:IntToBoolConverter x:Key="IntToBoolConverter" />
             <converter:IndexToDisplayConverter x:Key="IndexToDisplayConverter" />
             <converter:IntToDoubleConverter x:Key="IntToDoubleConverter" />
@@ -75,6 +74,9 @@
             <converter:TextAlignmentTypeToHorizontalAlignmentConverter x:Key="TextAlignmentTypeToHorizontalAlignmentConverter" />
             <converter:LyricsLayoutOrientationToOrientationConverter x:Key="LyricsLayoutOrientationToOrientationConverter" />
             <converter:LyricsLayoutOrientationNegationToOrientationConverter x:Key="LyricsLayoutOrientationNegationToOrientationConverter" />
+            <converter:FileSourceTypeToIconConverter x:Key="FileSourceTypeToIconConverter" />
+            <converter:PathToImageConverter x:Key="PathToImageConverter" />
+            <converter:DoubleToDecimalConverter x:Key="DoubleToDecimalConverter" />
 
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
@@ -96,7 +98,7 @@
                 <Setter Property="VerticalAlignment" Value="Top" />
                 <Setter Property="CornerRadius" Value="4" />
                 <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Padding" Value="14,6,14,9" />
+                <Setter Property="Padding" Value="16,9,16,9" />
                 <Setter Property="Background" Value="Transparent" />
             </Style>
             <Style x:Key="GhostButtonStyle" TargetType="Button">

BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs

@@ -1,48 +1,56 @@
-// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Hooks;
+using BetterLyrics.WinUI3.Models.Db;
 using BetterLyrics.WinUI3.Services.AlbumArtSearchService;
 using BetterLyrics.WinUI3.Services.DiscordService;
+using BetterLyrics.WinUI3.Services.FileSystemService;
 using BetterLyrics.WinUI3.Services.LastFMService;
-using BetterLyrics.WinUI3.Services.LibWatcherService;
+using BetterLyrics.WinUI3.Services.LocalizationService;
 using BetterLyrics.WinUI3.Services.LyricsSearchService;
 using BetterLyrics.WinUI3.Services.MediaSessionsService;
-using BetterLyrics.WinUI3.Services.ResourceService;
+using BetterLyrics.WinUI3.Services.PlayHistoryService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.Services.TranslationService;
 using BetterLyrics.WinUI3.Services.TransliterationService;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.UI.Dispatching; // 关键：用于线程调度
 using Microsoft.UI.Xaml;
-using Microsoft.Windows.ApplicationModel.Resources;
+using Microsoft.Windows.AppLifecycle; // 关键：App生命周期管理
 using Serilog;
 using System;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Vanara.PInvoke;
 
 namespace BetterLyrics.WinUI3
 {
     public partial class App : Application
     {
-
+        private Window? m_window;
         private readonly ILogger<App> _logger;
-
         public static new App Current => (App)Application.Current;
 
-        private static Mutex? _instanceMutex;
+        private readonly string _appKey = Windows.ApplicationModel.Package.Current.Id.FamilyName;
 
         public App()
         {
-            this.InitializeComponent();
+            // Must be done before InitializeComponent
+            if (!TryHandleSingleInstance())
+            {
+                // 如果移交成功直接退出当前进程
+                Environment.Exit(0);
+                return;
+            }
 
-            EnsureSingleInstance();
+            this.InitializeComponent();
 
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             PathHelper.EnsureDirectories();
@@ -50,29 +58,94 @@ namespace BetterLyrics.WinUI3
 
             _logger = Ioc.Default.GetRequiredService<ILogger<App>>();
 
+            // 注册全局异常捕获
             UnhandledException += App_UnhandledException;
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
             AppDomain.CurrentDomain.FirstChanceException += CurrentDomain_FirstChanceException;
             TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
         }
 
-        private void EnsureSingleInstance()
+        /// <summary>
+        /// 处理单实例逻辑。
+        /// 返回 true 表示我是主实例，继续运行。
+        /// 返回 false 表示我是第二个实例，已通知主实例，我应该退出。
+        /// </summary>
+        private bool TryHandleSingleInstance()
         {
-            _instanceMutex = new Mutex(true, Constants.App.AppName, out bool createdNew);
+            // 尝试查找或注册当前实例
+            var mainInstance = AppInstance.FindOrRegisterForKey(_appKey);
 
-            if (!createdNew)
+            // 如果当前实例就是注册的那个主实例
+            if (mainInstance.IsCurrent)
             {
-                User32.MessageBox(HWND.NULL, new ResourceLoader().GetString("TryRunMultipleInstance"), null, User32.MB_FLAGS.MB_APPLMODAL);
-                Environment.Exit(0);
+                // 监听 "Activated" 事件。
+                // 当第二个实例启动并重定向过来时，这个事件会被触发。
+                mainInstance.Activated += OnMainInstanceActivated;
+                return true;
+            }
+            else
+            {
+                // 我不是主实例，我是后来者。
+                // 获取当前实例的激活参数（比如是通过文件双击打开的，这里能拿到文件路径）
+                var args = AppInstance.GetCurrent().GetActivatedEventArgs();
+
+                // 将激活请求重定向给主实例
+                // 注意：这里是同步等待，确保发送成功后再退出
+                try
+                {
+                    mainInstance.RedirectActivationToAsync(args).AsTask().Wait();
+                }
+                catch (Exception)
+                {
+                    // 即使重定向失败，作为第二个实例也应该退出
+                }
+
+                return false;
             }
         }
 
-        protected override void OnLaunched(LaunchActivatedEventArgs args)
+        /// <summary>
+        /// 当第二个实例试图启动时，主实例会收到此回调
+        /// </summary>
+        private void OnMainInstanceActivated(object? sender, AppActivationArguments e)
         {
+            // 这个事件是在后台线程触发的，必须切回 UI 线程操作窗口
+            m_window?.DispatcherQueue.TryEnqueue(() =>
+            {
+                HandleActivation();
+            });
+        }
+
+        /// <summary>
+        /// 唤醒逻辑
+        /// </summary>
+        private void HandleActivation()
+        {
+            WindowHook.OpenOrShowWindow<LyricsWindowSwitchWindow>();
+        }
+
+        protected override async void OnLaunched(LaunchActivatedEventArgs args)
+        {
+            // 初始化数据库
+            await EnsureDatabasesAsync();
+
             var settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+            var fileSystemService = Ioc.Default.GetRequiredService<IFileSystemService>();
 
-            WindowHook.OpenOrShowWindow<SystemTrayWindow>();
+            // 开始后台扫描任务
+            foreach (var item in settingsService.AppSettings.LocalMediaFolders)
+            {
+                if (item.LastSyncTime == null)
+                {
+                    _ = Task.Run(async () => await fileSystemService.ScanMediaFolderAsync(item, CancellationToken.None));
+                }
+            }
+            fileSystemService.StartAllFolderTimers();
 
+            // 初始化托盘
+            m_window = WindowHook.OpenOrShowWindow<SystemTrayWindow>();
+
+            // 根据设置打开歌词窗口
             if (settingsService.AppSettings.GeneralSettings.AutoStartLyricsWindow)
             {
                 var defaultStatus = settingsService.AppSettings.WindowBoundsRecords.Where(x => x.IsDefault);
@@ -88,12 +161,101 @@ namespace BetterLyrics.WinUI3
                     }
                 }
             }
+
+            // 根据设置自动打开主界面
             if (settingsService.AppSettings.MusicGallerySettings.AutoOpen)
             {
                 WindowHook.OpenOrShowWindow<MusicGalleryWindow>();
             }
         }
 
+        private async Task EnsureDatabasesAsync()
+        {
+            var playHistoryFactory = Ioc.Default.GetRequiredService<IDbContextFactory<PlayHistoryDbContext>>();
+            var fileCacheFactory = Ioc.Default.GetRequiredService<IDbContextFactory<FilesIndexDbContext>>();
+
+            await SafeInitDatabaseAsync(
+                "PlayHistory",
+                PathHelper.PlayHistoryPath,
+                async () =>
+                {
+                    using var db = await playHistoryFactory.CreateDbContextAsync();
+                    await db.Database.EnsureCreatedAsync();
+                },
+                isCritical: true
+            );
+
+            await SafeInitDatabaseAsync(
+                "FileCache",
+                PathHelper.FilesIndexPath,
+                async () =>
+                {
+                    using var db = await fileCacheFactory.CreateDbContextAsync();
+                    await db.Database.EnsureCreatedAsync();
+                },
+                isCritical: false
+            );
+        }
+
+        private async Task SafeInitDatabaseAsync(string dbName, string dbPath, Func<Task> initAction, bool isCritical)
+        {
+            try
+            {
+                await initAction();
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[DB Error] {dbName} init failed: {ex.Message}");
+
+                try
+                {
+                    if (File.Exists(dbPath))
+                    {
+                        // 尝试清理连接池
+                        SqliteConnection.ClearAllPools();
+
+                        if (isCritical)
+                        {
+                            var backupPath = dbPath + ".bak_" + DateTime.Now.ToString("yyyyMMddHHmmss");
+                            File.Move(dbPath, backupPath, true);
+                            await ShowErrorDialogAsync("Database Recovery", $"Database {dbName} is damaged, the old database has been backed up to {backupPath}, and the program will create a new database.");
+                        }
+                        else
+                        {
+                            File.Delete(dbPath);
+                        }
+                    }
+                    await initAction();
+                    System.Diagnostics.Debug.WriteLine($"[DB Info] {dbName} recovered successfully.");
+                }
+                catch (Exception fatalEx)
+                {
+                    System.Diagnostics.Debug.WriteLine($"[] : {fatalEx.Message}");
+                    await ShowErrorDialogAsync("Fatal Error", $"{dbName} recovery failed, please delete the file at {dbPath} and try again by restarting the program. ({fatalEx.Message})");
+                }
+            }
+        }
+
+        private async Task ShowErrorDialogAsync(string title, string content)
+        {
+            // 这里假设 m_window 已经存在。如果没有显示主窗口，这个弹窗可能无法显示。
+            // 在 App 启动极早期的错误，可能需要退化为 Log 或者 System.Diagnostics.Process.Start 打开记事本报错
+            if (m_window != null)
+            {
+                m_window.DispatcherQueue.TryEnqueue(async () =>
+                {
+                    var dialog = new Microsoft.UI.Xaml.Controls.ContentDialog
+                    {
+                        Title = title,
+                        Content = content,
+                        CloseButtonText = "OK",
+                        XamlRoot = m_window.Content?.XamlRoot // 确保 Content 不为空
+                    };
+                    if (dialog.XamlRoot != null) await dialog.ShowAsync();
+                });
+            }
+        }
+
         private static void ConfigureServices()
         {
             Log.Logger = new LoggerConfiguration()
@@ -101,25 +263,32 @@ namespace BetterLyrics.WinUI3
                 .WriteTo.File(PathHelper.LogFilePattern, rollingInterval: RollingInterval.Day)
                 .CreateLogger();
 
-            // Register services
             Ioc.Default.ConfigureServices(
                 new ServiceCollection()
+                    // 数据库工厂
+                    .AddDbContextFactory<PlayHistoryDbContext>(options => options.UseSqlite($"Data Source={PathHelper.PlayHistoryPath}"))
+                    .AddDbContextFactory<FilesIndexDbContext>(options => options.UseSqlite($"Data Source={PathHelper.FilesIndexPath}"))
+
+                    // 日志
                     .AddLogging(loggingBuilder =>
                     {
                         loggingBuilder.ClearProviders();
                         loggingBuilder.AddSerilog();
                     })
+
                     // Services
                     .AddSingleton<ISettingsService, SettingsService>()
                     .AddSingleton<IMediaSessionsService, MediaSessionsService>()
                     .AddSingleton<IAlbumArtSearchService, AlbumArtSearchService>()
                     .AddSingleton<ILyricsSearchService, LyricsSearchService>()
-                    .AddSingleton<ILibWatcherService, LibWatcherService>()
                     .AddSingleton<ITranslationService, TranslationService>()
                     .AddSingleton<ITransliterationService, TransliterationService>()
                     .AddSingleton<ILastFMService, LastFMService>()
-                    .AddSingleton<IResourceService, ResourceService>()
                     .AddSingleton<IDiscordService, DiscordService>()
+                    .AddSingleton<ILocalizationService, LocalizationService>()
+                    .AddSingleton<IFileSystemService, FileSystemService>()
+                    .AddSingleton<IPlayHistoryService, PlayHistoryService>()
+
                     // ViewModels
                     .AddSingleton<AppSettingsControlViewModel>()
                     .AddSingleton<PlaybackSettingsControlViewModel>()
@@ -134,6 +303,7 @@ namespace BetterLyrics.WinUI3
                     .AddSingleton<MusicGalleryPageViewModel>()
                     .AddSingleton<AboutControlViewModel>()
                     .AddSingleton<MusicGalleryWindowViewModel>()
+                    .AddSingleton<StatsDashboardControlViewModel>()
 
                     .AddTransient<NowPlayingWindowViewModel>()
                     .AddTransient<NowPlayingPageViewModel>()
@@ -151,7 +321,8 @@ namespace BetterLyrics.WinUI3
 
         private void CurrentDomain_FirstChanceException(object? sender, System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs e)
         {
-            _logger.LogError(e.Exception, "CurrentDomain_FirstChanceException");
+            // FirstChance 异常非常多（比如内部 try-catch 也会触发），通常建议只在 Debug 模式记录，或者过滤特定类型
+            // _logger.LogError(e.Exception, "CurrentDomain_FirstChanceException"); 
         }
 
         private void CurrentDomain_UnhandledException(object sender, System.UnhandledExceptionEventArgs e)
@@ -164,4 +335,4 @@ namespace BetterLyrics.WinUI3
             _logger.LogError(e.Exception, "TaskScheduler_UnobservedTaskException");
         }
     }
-}
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj

@@ -10,13 +10,20 @@
 		<Nullable>enable</Nullable>
 		<LangVersion>preview</LangVersion>
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+		<AppxDefaultResourceQualifiers>Language=ar;de;en;es;fr;hi;id;ja;ko;ms;pt;ru;th;vi;zh-Hans;zh-Hant;</AppxDefaultResourceQualifiers>
 	</PropertyGroup>
 	<ItemGroup>
+		<Compile Remove="TemplateSelector\**" />
 		<Compile Remove="ViewModels\Lyrics\**" />
+		<Content Remove="TemplateSelector\**" />
 		<Content Remove="ViewModels\Lyrics\**" />
+		<EmbeddedResource Remove="TemplateSelector\**" />
 		<EmbeddedResource Remove="ViewModels\Lyrics\**" />
+		<None Remove="TemplateSelector\**" />
 		<None Remove="ViewModels\Lyrics\**" />
+		<Page Remove="TemplateSelector\**" />
 		<Page Remove="ViewModels\Lyrics\**" />
+		<PRIResource Remove="TemplateSelector\**" />
 		<PRIResource Remove="ViewModels\Lyrics\**" />
 	</ItemGroup>
 	<ItemGroup>
@@ -37,7 +44,9 @@
 		<None Remove="Controls\NowPlayingBar.xaml" />
 		<None Remove="Controls\PlaybackSettingsControl.xaml" />
 		<None Remove="Controls\PropertyRow.xaml" />
+		<None Remove="Controls\RemoteServerConfigControl.xaml" />
 		<None Remove="Controls\ShortcutTextBox.xaml" />
+		<None Remove="Controls\StatsDashboardControl.xaml" />
 		<None Remove="Controls\SystemTray.xaml" />
 		<None Remove="Controls\WindowSettingsControl.xaml" />
 		<None Remove="Views\LyricsSearchWindow.xaml" />
@@ -58,24 +67,31 @@
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" Version="0.1.251021-build.2365" />
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.250703-build.2173" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-		<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.2.250402" />
+		<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.2.251219" />
 		<PackageReference Include="ComputeSharp.D2D1.WinUI" Version="3.2.0" />
 		<PackageReference Include="csharp-pinyin" Version="1.0.1" />
-		<PackageReference Include="DevWinUI.Controls" Version="9.7.1" />
+		<PackageReference Include="DevWinUI.Controls" Version="9.8.1" />
 		<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.6" />
 		<PackageReference Include="F23.StringSimilarity" Version="7.0.1" />
 		<PackageReference Include="FlaUI.UIA3" Version="5.0.0" />
+		<PackageReference Include="FluentFTP" Version="53.0.2" />
 		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.4.1" />
 		<PackageReference Include="Hqub.Last.fm" Version="2.5.1" />
 		<PackageReference Include="Interop.UIAutomationClient" Version="10.19041.0" />
+		<PackageReference Include="LiveChartsCore.SkiaSharpView.WinUI" Version="2.0.0-rc6.1" />
 		<PackageReference Include="Lyricify.Lyrics.Helper-NativeAot" Version="0.1.4-alpha.5" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="10.0.1" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.1" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.1" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.1" />
 		<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
@@ -85,6 +101,7 @@
 		<PackageReference Include="NTextCat" Version="0.3.65" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="10.0.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
+		<PackageReference Include="SMBLibrary" Version="1.5.5.1" />
 		<PackageReference Include="System.Drawing.Common" Version="10.0.1" />
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.1" />
 		<PackageReference Include="TagLibSharp" Version="2.3.0" />
@@ -95,6 +112,7 @@
 		<PackageReference Include="Vanara.PInvoke.User32" Version="4.2.1" />
 		<PackageReference Include="Vanara.Windows.Shell" Version="4.2.1" />
 		<PackageReference Include="VCollab.DiscordRichPresence" Version="1.7.0" />
+		<PackageReference Include="WebDav.Client" Version="2.9.0" />
 		<PackageReference Include="WinUIEx" Version="2.9.0" />
 		<PackageReference Include="z440.atl.core" Version="7.9.0" />
 	</ItemGroup>
@@ -116,6 +134,10 @@
 	<ItemGroup>
 		<TrimmerRootAssembly Include="FlaUI.UIA3" />
 		<TrimmerRootAssembly Include="Interop.UIAutomationClient" />
+		<TrimmerRootAssembly Include="Microsoft.EntityFrameworkCore" />
+		<TrimmerRootAssembly Include="Microsoft.EntityFrameworkCore.Abstractions" />
+		<TrimmerRootAssembly Include="Microsoft.EntityFrameworkCore.Relational" />
+		<TrimmerRootAssembly Include="Microsoft.EntityFrameworkCore.Sqlite" />
 		<TrimmerRootAssembly Include="NAudio.Wasapi" />
 		<TrimmerRootAssembly Include="TagLibSharp" />
 		<TrimmerRootAssembly Include="Vanara.PInvoke.DwmApi" />
@@ -158,6 +180,9 @@
 	  <Content Update="Assets\EmptyState.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Assets\Folder.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\foobar2000.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
@@ -200,6 +225,9 @@
 	  <Content Update="Assets\NetEaseCloudMusic.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
+	  <Content Update="Assets\OriginalSoundHQPlayer.png">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </Content>
 	  <Content Update="Assets\Page.png">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
@@ -231,6 +259,11 @@
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </Content>
 	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\StatsDashboardControl.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
 	<ItemGroup>
 	  <Page Update="Controls\FontFamilyAutoSuggestBox.xaml">
 	    <Generator>MSBuild:Compile</Generator>
@@ -332,12 +365,9 @@
 		</Page>
 	</ItemGroup>
 	<ItemGroup>
-	  <PRIResource Update="Strings\en-US\Resources.resw">
-	    <Generator></Generator>
-	  </PRIResource>
-	</ItemGroup>
-	<ItemGroup>
-	  <Folder Include="TemplateSelector\" />
+	  <Page Update="Controls\RemoteServerConfigControl.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
 	</ItemGroup>
 	<ItemGroup>
 	  <Page Update="Controls\NowPlayingBar.xaml">

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/Link.cs

@@ -6,6 +6,8 @@
 
         public const string AuthorGitHub = "https://github.com/jayfunc";
 
+        public const string Crowdin = "https://crowdin.com/project/betterlyrics/invite?h=413bb0df7afa420247a98fefdae5e12c2647410";
+
         public const string BetterLyricsGitHub = $"{AuthorGitHub}/BetterLyrics";
 
         public const string ShareHub = $"{BetterLyricsGitHub}/blob/dev/ShareHub/index.md";

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerID.cs

@@ -1,6 +1,6 @@
 namespace BetterLyrics.WinUI3.Constants
 {
-    public static class PlayerID
+    public static class PlayerId
     {
         public const string LXMusic = "cn.toside.music.desktop";
         public const string LXMusicPortable = "lx-music-desktop.exe";
@@ -25,5 +25,6 @@
         public const string MoeKoeMusic = "cn.MoeKoe.Music";
         public const string MoeKoeMusicAlternative = "electron.app.MoeKoe Music";
         public const string Listen1 = "com.listen1.listen1";
+        public const string OriginalSoundHQPlayer = "SennpaiStudio.528762A6196EF_z79ft30j24epr!App";
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Constants/PlayerName.cs

@@ -24,5 +24,6 @@
         public const string SaltPlayerForWindowsSteam = "Salt Player for Windows (Steam)";
         public const string MoeKoeMusic = "MoeKoe Music";
         public const string Listen1 = "Listen 1";
+        public const string OriginalSoundHQPlayer = "Original Sound HQ Player";
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AboutControl.xaml

@@ -71,9 +71,9 @@
                                 <StackPanel Spacing="6">
                                     <TextBlock x:Uid="SetingsPageFeedback" />
                                     <StackPanel Margin="-12,0,0,0" Orientation="Horizontal">
-                                        <HyperlinkButton x:Uid="SettingsPageQQGroup" NavigateUri="{x:Bind const:Link.QQGroup}" />
-                                        <HyperlinkButton x:Uid="SettingsPageDiscord" NavigateUri="{x:Bind const:Link.Discord}" />
-                                        <HyperlinkButton x:Uid="SettingsPageTelegram" NavigateUri="{x:Bind const:Link.Telegram}" />
+                                        <HyperlinkButton Content="QQ 反馈交流群" NavigateUri="{x:Bind const:Link.QQGroup}" />
+                                        <HyperlinkButton Content="Discord" NavigateUri="{x:Bind const:Link.Discord}" />
+                                        <HyperlinkButton Content="Telegram" NavigateUri="{x:Bind const:Link.Telegram}" />
                                     </StackPanel>
                                 </StackPanel>
                             </dev:SettingsCard>
@@ -118,13 +118,21 @@
                                         </HyperlinkButton>
                                         <HyperlinkButton Content="爱发电" NavigateUri="{x:Bind const:Link.Afdian}" />
                                     </StackPanel>
-                                    <StackPanel Orientation="Horizontal" Spacing="6">
-                                        <TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}" Text="*" />
+                                    <Grid ColumnSpacing="6">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock
+                                            Grid.Column="0"
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                            Text="*" />
                                         <TextBlock
                                             x:Uid="SetingsPageThanks"
+                                            Grid.Column="1"
                                             Foreground="{ThemeResource TextFillColorSecondaryBrush}"
                                             TextWrapping="Wrap" />
-                                    </StackPanel>
+                                    </Grid>
                                 </StackPanel>
                             </dev:SettingsCard>
 
@@ -182,6 +190,12 @@
                         </dev:SettingsExpander.ItemsHeader>
                     </dev:SettingsExpander>
 
+                    <dev:SettingsCard x:Uid="SettingsPageSettingsPlayHistory" Visibility="Collapsed">
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <Button x:Uid="SettingsPageExportPlayHistoryButton" Command="{x:Bind ViewModel.ExportPlayHistoryCommand}" />
+                        </StackPanel>
+                    </dev:SettingsCard>
+
                     <dev:SettingsCard x:Uid="SettingsPageFixedTimeStep" Visibility="Collapsed">
                         <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.AdvancedSettings.IsFixedTimeStep, Mode=TwoWay}" />
                     </dev:SettingsCard>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/AppSettingsControl.xaml

@@ -3,6 +3,7 @@
     x:Class="BetterLyrics.WinUI3.Controls.AppSettingsControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:consts="using:BetterLyrics.WinUI3.Constants"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dev="using:DevWinUI"
@@ -42,6 +43,14 @@
                                 <Button x:Uid="SettingsPageRestart" Command="{x:Bind ViewModel.RestartAppCommand}" />
                             </dev:SettingsCard>
                         </dev:SettingsExpander.Items>
+                        <dev:SettingsExpander.ItemsFooter>
+                            <InfoBar IsClosable="False" IsOpen="True">
+                                <HyperlinkButton
+                                    x:Uid="SettingsPageHelpUsTranslate"
+                                    Padding="0"
+                                    NavigateUri="{x:Bind consts:Link.Crowdin}" />
+                            </InfoBar>
+                        </dev:SettingsExpander.ItemsFooter>
                     </dev:SettingsExpander>
 
                     <!--  Startup  -->

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml

@@ -7,6 +7,7 @@
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:local="using:BetterLyrics.WinUI3.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
     <Grid
@@ -91,6 +92,47 @@
                 Text="{x:Bind LyricsWindowStatus.Name, Mode=OneWay}"
                 TextWrapping="Wrap" />
         </Grid>
+
+        <Grid Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}" Opacity="0">
+            <Grid.OpacityTransition>
+                <ScalarTransition />
+            </Grid.OpacityTransition>
+            <interactivity:Interaction.Behaviors>
+                <interactivity:EventTriggerBehavior EventName="PointerEntered">
+                    <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                </interactivity:EventTriggerBehavior>
+                <interactivity:EventTriggerBehavior EventName="PointerExited">
+                    <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                </interactivity:EventTriggerBehavior>
+            </interactivity:Interaction.Behaviors>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Button
+                Grid.Column="0"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                Click="OpenButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      Glyph=&#xE78B;}">
+                <ToolTipService.ToolTip>
+                    <TextBlock x:Uid="SystemTrayLyrics" />
+                </ToolTipService.ToolTip>
+            </Button>
+            <Button
+                Grid.Column="1"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                Click="CloseButton_Click"
+                Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                      Glyph=&#xE711;}"
+                IsEnabled="{x:Bind LyricsWindowStatus.IsOpened, Mode=OneWay}">
+                <ToolTipService.ToolTip>
+                    <TextBlock x:Uid="SettingsPageCloseStatus" />
+                </ToolTipService.ToolTip>
+            </Button>
+        </Grid>
     </Grid>
 
 </UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/DemoWindowGrid.xaml.cs

@@ -1,6 +1,11 @@
+using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.SettingsService;
+using BetterLyrics.WinUI3.Views;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using System.Linq;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -9,6 +14,8 @@ namespace BetterLyrics.WinUI3.Controls;
 
 public sealed partial class DemoWindowGrid : UserControl
 {
+    private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
+
     public DemoWindowGrid()
     {
         InitializeComponent();
@@ -22,4 +29,32 @@ public sealed partial class DemoWindowGrid : UserControl
         get => (LyricsWindowStatus)GetValue(LyricsWindowStatusProperty);
         set => SetValue(LyricsWindowStatusProperty, value);
     }
+
+    private void CloseButton_Click(object sender, RoutedEventArgs e)
+    {
+        var data = (LyricsWindowStatus)(((FrameworkElement)sender).DataContext);
+        var window = WindowHook.GetWindows<NowPlayingWindow>().FirstOrDefault(x => x.LyricsWindowStatus == data);
+        window?.CloseWindow();
+    }
+
+    private void OpenButton_Click(object sender, RoutedEventArgs e)
+    {
+        var status = (LyricsWindowStatus)(((FrameworkElement)sender).DataContext);
+        // <20>࿪ģʽ
+        if (_settingsService.AppSettings.GeneralSettings.MultiNowPlayingWindowMode)
+        {
+            WindowHook.OpenOrShowWindow<NowPlayingWindow>(status);
+        }
+        // <20><><EFBFBD><EFBFBD>ģʽ
+        else
+        {
+            var openedWindows = WindowHook.GetWindows<NowPlayingWindow>();
+            foreach (var item in openedWindows.Where(x => x.LyricsWindowStatus != status))
+            {
+                item.CloseWindow();
+            }
+            WindowHook.OpenOrShowWindow<NowPlayingWindow>(status);
+        }
+    }
+
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsBackgroundSettingsControl.xaml

@@ -81,14 +81,6 @@
                                     Value="{x:Bind LyricsBackgroundSettings.CoverOverlayBlurAmount, Mode=TwoWay}" />
                             </dev:SettingsCard>
 
-                            <!--<dev:SettingsCard x:Uid="SettingsPageBackgroundAcrylicEffectAmount" IsEnabled="{x:Bind LyricsBackgroundSettings.IsCoverOverlayEnabled, Mode=OneWay}">
-                                <uc:ExtendedSlider
-                                    Default="0"
-                                    Maximum="10"
-                                    Minimum="0"
-                                    Value="{x:Bind LyricsBackgroundSettings.CoverAcrylicEffectAmount, Mode=TwoWay}" />
-                            </dev:SettingsCard>-->
-
                         </dev:SettingsExpander.Items>
                     </dev:SettingsExpander>
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsCanvas.xaml.cs

@@ -13,7 +13,6 @@ using BetterLyrics.WinUI3.Services.SettingsService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.Mvvm.Messaging.Messages;
-using Lyricify.Lyrics.Providers.Web.Netease;
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.UI.Xaml;
 using Microsoft.UI;
@@ -21,13 +20,11 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Windows.Foundation;
 using Windows.Storage.Streams;
 using Windows.UI;
-using static Vanara.PInvoke.Ole32;
 
 namespace BetterLyrics.WinUI3.Controls
 {
@@ -45,7 +42,6 @@ namespace BetterLyrics.WinUI3.Controls
     {
         private readonly ISettingsService _settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
         private readonly IMediaSessionsService _mediaSessionsService = Ioc.Default.GetRequiredService<IMediaSessionsService>();
-        private readonly ILastFMService _lastFMService = Ioc.Default.GetRequiredService<ILastFMService>();
 
         private readonly LyricsRenderer _lyricsRenderer = new();
         private readonly FluidBackgroundRenderer _fluidRenderer = new();
@@ -548,11 +544,12 @@ namespace BetterLyrics.WinUI3.Controls
             _isMouseScrollingChanged = false;
 
             _lyricsRenderer.CalculateLyrics3DMatrix(
+                lyricsStyle: lyricsStyle,
                 lyricsEffect: lyricsEffect,
                 lyricsX: _renderLyricsStartX,
                 lyricsY: _renderLyricsStartY,
                 lyricsWidth: _renderLyricsWidth,
-                canvasHeight: sender.Size.Height
+                lyricsHeight: _renderLyricsHeight
             );
 
             _isLayoutChanged = false;
@@ -662,22 +659,6 @@ namespace BetterLyrics.WinUI3.Controls
                 _songPosition += elapsedTime;
                 _totalPlayedTime += elapsedTime;
                 _songPositionWithOffset = _songPosition + TimeSpan.FromMilliseconds(_mediaSessionsService.CurrentMediaSourceProviderInfo?.PositionOffset ?? 0);
-                CheckAndScrobbleLastFM();
-            }
-        }
-
-        private void CheckAndScrobbleLastFM()
-        {
-            bool isEnabled = _mediaSessionsService.CurrentMediaSourceProviderInfo?.IsLastFMTrackEnabled ?? false;
-            if (!isEnabled || _isLastFMTracked) return;
-
-            var songInfo = _mediaSessionsService.CurrentSongInfo;
-            if (songInfo == null || songInfo.Duration <= 0) return;
-
-            if (_totalPlayedTime.TotalSeconds >= songInfo.Duration * 0.5)
-            {
-                _isLastFMTracked = true;
-                _lastFMService.TrackAsync(songInfo);
             }
         }
 
@@ -857,6 +838,14 @@ namespace BetterLyrics.WinUI3.Controls
                 {
                     _isLayoutChanged = true;
                 }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.IsLyricsFadeOutEffectEnabled))
+                {
+                    _isLayoutChanged = true;
+                }
+                else if (message.PropertyName == nameof(LyricsEffectSettings.IsLyricsOutOfSightEffectEnabled))
+                {
+                    _isLayoutChanged = true;
+                }
             }
             else if (message.Sender == LyricsWindowStatus?.LyricsStyleSettings)
             {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsEffectSettingsControl.xaml

@@ -28,6 +28,16 @@
                         <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsBlurEffectEnabled, Mode=TwoWay}" />
                     </dev:SettingsCard>
 
+                    <!--  淡出效果  -->
+                    <dev:SettingsCard x:Uid="SettingsPageLyricsFadeOutEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE89F;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsFadeOutEffectEnabled, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
+                    <!--  远离视野  -->
+                    <dev:SettingsCard x:Uid="SettingsPageLyricsOutOfSightEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xF19D;}">
+                        <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsOutOfSightEffectEnabled, Mode=TwoWay}" />
+                    </dev:SettingsCard>
+
                     <!--  辉光效果  -->
                     <dev:SettingsExpander x:Uid="SettingsPageLyricsGlowEffect" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE9A9;}">
                         <ToggleSwitch IsOn="{x:Bind LyricsEffectSettings.IsLyricsGlowEffectEnabled, Mode=TwoWay}" />

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml

@@ -25,7 +25,7 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
             <Grid Grid.Column="0">
-                <ScrollViewer>
+                <ScrollViewer Padding="8,0">
                     <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
 
                         <TextBlock x:Uid="LyricsSearchControlSongInfoMapping" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
@@ -153,12 +153,11 @@
                             <CheckBox x:Uid="LyricsSearchControlMarkAsPureMusic" IsChecked="{x:Bind ViewModel.MappedSongSearchQuery.IsMarkedAsPureMusic, Mode=TwoWay}" />
                         </dev:SettingsCard>
 
-                        <dev:SettingsCard x:Uid="LyricsSearchControlTargetSearchProvider">
-                            <Button
-                                x:Uid="LyricsSearchControlSearch"
-                                Command="{x:Bind ViewModel.SearchCommand}"
-                                Style="{StaticResource AccentButtonStyle}" />
-                        </dev:SettingsCard>
+                        <Button
+                            x:Uid="LyricsSearchControlSearch"
+                            HorizontalAlignment="Stretch"
+                            Command="{x:Bind ViewModel.SearchCommand}"
+                            Style="{StaticResource AccentButtonStyle}" />
 
                         <dev:SettingsCard x:Uid="LyricsSearchControlIgnoreCache">
                             <ToggleSwitch IsOn="{x:Bind ViewModel.AppSettings.GeneralSettings.IgnoreCacheWhenSearching, Mode=TwoWay}" />
@@ -183,10 +182,7 @@
                                         <local:PropertyRow x:Uid="SettingsPageSongTitle" Value="{x:Bind Title, TargetNullValue=N/A, Mode=OneWay}" />
                                         <local:PropertyRow x:Uid="SettingsPageArtist" Value="{x:Bind DisplayArtists, TargetNullValue=N/A, Mode=OneWay}" />
                                         <local:PropertyRow x:Uid="SettingsPageAlbum" Value="{x:Bind Album, TargetNullValue=N/A, Mode=OneWay}" />
-                                        <local:PropertyRow
-                                            x:Uid="LyricsSearchControlDurauion"
-                                            Unit="s"
-                                            Value="{x:Bind Duration, TargetNullValue=N/A, Mode=OneWay}" />
+                                        <local:PropertyRow x:Uid="LyricsSearchControlDurauion" Value="{x:Bind Duration, Converter={StaticResource SecondsToFormattedTimeConverter}, TargetNullValue=N/A, Mode=OneWay}" />
                                         <local:PropertyRow
                                             x:Uid="LyricsPageMatchPercentage"
                                             Unit="%"
@@ -244,8 +240,6 @@
                 <ProgressBar
                     VerticalAlignment="Top"
                     IsIndeterminate="True"
-                    ShowError="False"
-                    ShowPaused="False"
                     Visibility="{x:Bind ViewModel.IsSearching, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
             </Grid>
             <Grid Grid.Column="2">
@@ -278,18 +272,43 @@
                     </Pivot.HeaderTemplate>
                     <Pivot.ItemTemplate>
                         <DataTemplate x:DataType="models:LyricsData">
-                            <ListView ItemsSource="{x:Bind LyricsLines, Mode=OneWay}" SelectionChanged="ListView_SelectionChanged">
+                            <ListView
+                                ItemContainerStyle="{StaticResource ListViewStretchedItemContainerStyle}"
+                                ItemsSource="{x:Bind LyricsLines, Mode=OneWay}"
+                                SelectionMode="None">
                                 <ListView.ItemTemplate>
                                     <DataTemplate x:DataType="models:LyricsLine">
-                                        <StackPanel Orientation="Horizontal">
-                                            <TextBlock Foreground="{ThemeResource SystemFillColorNeutralBrush}" Text="{x:Bind StartMs, Mode=OneWay, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
-                                            <TextBlock
-                                                Margin="1,0"
-                                                Foreground="{ThemeResource SystemFillColorNeutralBrush}"
-                                                Text="-" />
-                                            <TextBlock Foreground="{ThemeResource SystemFillColorNeutralBrush}" Text="{x:Bind EndMs, Mode=OneWay, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
-                                            <TextBlock Margin="6,0" Text="{x:Bind OriginalText, Mode=OneWay}" />
-                                        </StackPanel>
+                                        <Grid Margin="0,6" ColumnSpacing="6">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="Auto" />
+                                                <ColumnDefinition Width="*" />
+                                            </Grid.ColumnDefinitions>
+                                            <Grid Grid.Column="0">
+                                                <TextBlock Foreground="{ThemeResource SystemFillColorNeutralBrush}" Text="{x:Bind StartMs, Mode=OneWay, Converter={StaticResource MillisecondsToFormattedTimeConverter}}" />
+                                                <Button
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    Click="PlayLyricsLineButton_Click"
+                                                    Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                                          FontSize=16,
+                                                                          Glyph=&#xE768;}"
+                                                    Opacity="0"
+                                                    Style="{StaticResource AccentButtonStyle}">
+                                                    <Button.OpacityTransition>
+                                                        <ScalarTransition />
+                                                    </Button.OpacityTransition>
+                                                    <interactivity:Interaction.Behaviors>
+                                                        <interactivity:EventTriggerBehavior EventName="PointerEntered">
+                                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="1" />
+                                                        </interactivity:EventTriggerBehavior>
+                                                        <interactivity:EventTriggerBehavior EventName="PointerExited">
+                                                            <interactivity:ChangePropertyAction PropertyName="Opacity" Value="0" />
+                                                        </interactivity:EventTriggerBehavior>
+                                                    </interactivity:Interaction.Behaviors>
+                                                </Button>
+                                            </Grid>
+                                            <local:PropertyRow Grid.Column="1" Value="{x:Bind OriginalText, Mode=OneWay}" />
+                                        </Grid>
                                     </DataTemplate>
                                 </ListView.ItemTemplate>
                             </ListView>
@@ -321,8 +340,8 @@
         </Grid>
         <Grid Grid.Row="1" ColumnSpacing="6">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml.cs

@@ -18,10 +18,10 @@ namespace BetterLyrics.WinUI3.Controls
             DataContext = Ioc.Default.GetRequiredService<LyricsSearchControlViewModel>();
         }
 
-        private void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void PlayLyricsLineButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
         {
-            ViewModel.SelectedLyricsLine = e.OriginalSource as LyricsLine;
+            var lyricsLine = (LyricsLine)((Button)sender).DataContext;
+            ViewModel.PlayLyricsLine(lyricsLine);
         }
-
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml

@@ -100,10 +100,7 @@
                                                     BorderThickness="4"
                                                     CornerRadius="4"
                                                     Visibility="{Binding IsOpened, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-                                                <uc:DemoWindowGrid
-                                                    Margin="4"
-                                                    LyricsWindowStatus="{Binding}"
-                                                    Tapped="DemoWindowGrid_Tapped" />
+                                                <uc:DemoWindowGrid Margin="4" LyricsWindowStatus="{Binding}" />
                                             </Grid>
                                             <Grid>
                                                 <ToggleButton
@@ -117,7 +114,6 @@
                                             <Grid ColumnSpacing="4">
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="*" />
-                                                    <ColumnDefinition Width="*" />
                                                 </Grid.ColumnDefinitions>
                                                 <Button
                                                     Grid.Column="0"
@@ -125,13 +121,6 @@
                                                     Click="ConfigButton_Click">
                                                     <TextBlock x:Uid="LyricsWindowSettingsControlLyricsWindowConfig" />
                                                 </Button>
-                                                <Button
-                                                    Grid.Column="1"
-                                                    HorizontalAlignment="Stretch"
-                                                    Click="CloseStatusButton_Click"
-                                                    IsEnabled="{Binding IsOpened, Mode=OneWay}">
-                                                    <TextBlock x:Uid="SettingsPageCloseStatus" />
-                                                </Button>
                                             </Grid>
                                         </StackPanel>
                                     </DataTemplate>
@@ -198,29 +187,51 @@
 
                     <controls:Segmented
                         x:Name="ConfigSegmented"
+                        HorizontalAlignment="Stretch"
                         SelectionChanged="ConfigSegmented_SelectionChanged"
                         Style="{StaticResource PivotSegmentedStyle}">
 
                         <controls:SegmentedItem x:Name="WindowSegmentedItem" Tag="Window">
-                            <TextBlock x:Uid="AppSettingsControlGeneral" />
+                            <TextBlock
+                                x:Uid="AppSettingsControlGeneral"
+                                MaxWidth="120"
+                                TextWrapping="Wrap" />
                         </controls:SegmentedItem>
                         <controls:SegmentedItem x:Name="LayoutSegmentedItem" Tag="Layout">
-                            <TextBlock x:Uid="SettingsPageLayout" />
+                            <TextBlock
+                                x:Uid="SettingsPageLayout"
+                                MaxWidth="120"
+                                TextWrapping="Wrap" />
                         </controls:SegmentedItem>
                         <controls:SegmentedItem x:Name="AlbumArtStyleSegmentedItem" Tag="AlbumArtStyle">
-                            <TextBlock x:Uid="SettingsPageAlbumStyle" />
+                            <TextBlock
+                                x:Uid="SettingsPageAlbumStyle"
+                                MaxWidth="120"
+                                TextWrapping="Wrap" />
                         </controls:SegmentedItem>
                         <controls:SegmentedItem Tag="AlbumArtEffect">
-                            <TextBlock x:Uid="SettingsPageAlbumEffect" />
+                            <TextBlock
+                                x:Uid="SettingsPageAlbumEffect"
+                                MaxWidth="120"
+                                TextWrapping="Wrap" />
                         </controls:SegmentedItem>
                         <controls:SegmentedItem Tag="LyricsStyle">
-                            <TextBlock x:Uid="SettingsPageLyricsStyle" />
+                            <TextBlock
+                                x:Uid="SettingsPageLyricsStyle"
+                                MaxWidth="120"
+                                TextWrapping="Wrap" />
                         </controls:SegmentedItem>
                         <controls:SegmentedItem Tag="LyricsEffect">
-                            <TextBlock x:Uid="SettingsPageLyricsEffect" />
+                            <TextBlock
+                                x:Uid="SettingsPageLyricsEffect"
+                                MaxWidth="120"
+                                TextWrapping="Wrap" />
                         </controls:SegmentedItem>
                         <controls:SegmentedItem Tag="LyricsBackground">
-                            <TextBlock x:Uid="SettingsPageBackgroundOverlay" />
+                            <TextBlock
+                                x:Uid="SettingsPageBackgroundOverlay"
+                                MaxWidth="120"
+                                TextWrapping="Wrap" />
                         </controls:SegmentedItem>
 
                     </controls:Segmented>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSettingsControl.xaml.cs

@@ -10,7 +10,6 @@ using CommunityToolkit.WinUI.Controls;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -167,38 +166,6 @@ namespace BetterLyrics.WinUI3.Controls
             ViewModel.OpenConfigPanel();
         }
 
-        private void DemoWindowGrid_Tapped(object sender, TappedRoutedEventArgs e)
-        {
-            var status = (LyricsWindowStatus)(((FrameworkElement)sender).DataContext);
-            // <20>࿪ģʽ
-            if (_settingsService.AppSettings.GeneralSettings.MultiNowPlayingWindowMode)
-            {
-                WindowHook.OpenOrShowWindow<NowPlayingWindow>(status);
-            }
-            // <20><><EFBFBD><EFBFBD>ģʽ
-            else
-            {
-                var openedWindows = WindowHook.GetWindows<NowPlayingWindow>();
-                foreach (var item in openedWindows.Where(x => x.LyricsWindowStatus != status))
-                {
-                    item.CloseWindow();
-                }
-                WindowHook.OpenOrShowWindow<NowPlayingWindow>(status);
-            }
-        }
-
-        private void CloseStatusButton_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is FrameworkElement element)
-            {
-                if (element.DataContext is LyricsWindowStatus data)
-                {
-                    var window = WindowHook.GetWindows<NowPlayingWindow>().FirstOrDefault(x => x.LyricsWindowStatus == data);
-                    window?.CloseWindow();
-                }
-            }
-        }
-
         private void ConfigSegmented_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             ViewModel.SelectorBarSelectedItemTag = (string)((SegmentedItem)((Segmented)sender).SelectedItem).Tag;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsWindowSwitchControl.xaml.cs

@@ -1,5 +1,4 @@
 using BetterLyrics.WinUI3.Hooks;
-using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
@@ -7,7 +6,6 @@ using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
-using System.Linq;
 using System.Threading.Tasks;
 
 // To learn more about WinUI, the WinUI project structure,
@@ -29,22 +27,6 @@ namespace BetterLyrics.WinUI3.Controls
 
         private async void Grid_Tapped(object sender, TappedRoutedEventArgs e)
         {
-            var status = (LyricsWindowStatus)(((FrameworkElement)sender).DataContext);
-            // <20>࿪ģʽ
-            if (_settingsService.AppSettings.GeneralSettings.MultiNowPlayingWindowMode)
-            {
-                WindowHook.OpenOrShowWindow<NowPlayingWindow>(status);
-            }
-            // <20><><EFBFBD><EFBFBD>ģʽ
-            else
-            {
-                var openedWindows = WindowHook.GetWindows<NowPlayingWindow>();
-                foreach (var item in openedWindows.Where(x => x.LyricsWindowStatus != status))
-                {
-                    item.CloseWindow();
-                }
-                WindowHook.OpenOrShowWindow<NowPlayingWindow>(status);
-            }
             await HideAsync();
         }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <UserControl
     x:Class="BetterLyrics.WinUI3.Controls.MediaSettingsControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -6,9 +5,11 @@
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dev="using:DevWinUI"
+    xmlns:enums="using:BetterLyrics.WinUI3.Enums"
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:local="using:BetterLyrics.WinUI3.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="using:BetterLyrics.WinUI3.Models"
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
@@ -49,42 +50,136 @@
                         ItemsSource="{x:Bind ViewModel.AppSettings.LocalMediaFolders, Mode=OneWay}"
                         SelectionMode="None">
                         <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <dev:SettingsExpander>
+                            <DataTemplate x:DataType="models:MediaFolder">
+                                <dev:SettingsExpander IsExpanded="True">
+
+                                    <dev:SettingsExpander.HeaderIcon>
+                                        <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="{x:Bind SourceType, Converter={StaticResource FileSourceTypeToIconConverter}, Mode=OneWay}" />
+                                    </dev:SettingsExpander.HeaderIcon>
                                     <dev:SettingsExpander.Header>
-                                        <HyperlinkButton
-                                            Click="LocalFolderHyperlinkButton_Click"
-                                            Content="{Binding Path, Mode=OneWay}"
-                                            Tag="{Binding Path, Mode=OneWay}" />
+                                        <TextBlock IsTextSelectionEnabled="True" Text="{x:Bind Name, Mode=OneWay}" />
                                     </dev:SettingsExpander.Header>
-                                    <ToggleSwitch IsOn="{Binding IsEnabled, Mode=TwoWay}" />
+                                    <dev:SettingsExpander.Description>
+                                        <TextBlock IsTextSelectionEnabled="True" Text="{x:Bind ConnectionSummary, Mode=OneWay}" />
+                                    </dev:SettingsExpander.Description>
+
+                                    <ToggleSwitch IsOn="{x:Bind IsEnabled, Mode=TwoWay}" />
+
                                     <dev:SettingsExpander.Items>
-                                        <dev:SettingsCard>
-                                            <dev:SettingsCard.Header>
-                                                <HyperlinkButton
-                                                    x:Uid="SettingsPageRemovePath"
-                                                    Click="SettingsPageRemovePathButton_Click"
-                                                    Tag="{Binding}" />
-                                            </dev:SettingsCard.Header>
+                                        <dev:SettingsCard x:Uid="MediaSettingsControlNameSetting">
+                                            <TextBox VerticalAlignment="Center" Text="{x:Bind Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                                         </dev:SettingsCard>
-                                        <dev:SettingsCard x:Uid="SettingsPageMusicLibRealTimeWatch">
-                                            <ToggleSwitch IsOn="{Binding IsRealTimeWatchEnabled, Mode=TwoWay}" />
+                                        <dev:SettingsCard x:Uid="MediaSettingsControlLastSyncTime" Description="{x:Bind LastSyncTime.ToString(), Mode=OneWay, TargetNullValue=N/A}">
+                                            <Button
+                                                x:Uid="MediaSettingsControlSyncNow"
+                                                Click="SyncNowButton_Click"
+                                                IsEnabled="{x:Bind IsEnabled, Mode=OneWay}" />
+                                        </dev:SettingsCard>
+                                        <dev:SettingsCard x:Uid="MusicSettingsControlAutoSyncInterval">
+                                            <ComboBox IsEnabled="{x:Bind IsEnabled, Mode=OneWay}" SelectedIndex="{x:Bind ScanInterval, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                                                <ComboBoxItem x:Uid="MusicSettingsControlAutoSyncIntervalDisabled" />
+                                                <ComboBoxItem x:Uid="MusicSettingsControlAutoSyncIntervalEveryFifteenMin" />
+                                                <ComboBoxItem x:Uid="MusicSettingsControlAutoSyncIntervalEveryHour" />
+                                                <ComboBoxItem x:Uid="MusicSettingsControlAutoSyncIntervalEverySixHrs" />
+                                                <ComboBoxItem x:Uid="MusicSettingsControlAutoSyncIntervalEveryDay" />
+                                            </ComboBox>
+                                        </dev:SettingsCard>
+                                        <dev:SettingsCard>
+                                            <Button x:Uid="SettingsPageRemovePath" Click="SettingsPageRemovePathButton_Click" />
                                         </dev:SettingsCard>
                                     </dev:SettingsExpander.Items>
+
+                                    <dev:SettingsExpander.ItemsHeader>
+                                        <StackPanel>
+                                            <!--  Index info  -->
+                                            <InfoBar
+                                                IsClosable="False"
+                                                IsOpen="True"
+                                                Message="{x:Bind StatusText, Mode=OneWay}"
+                                                Severity="{x:Bind StatusSeverity, Mode=OneWay}" />
+                                            <ProgressBar
+                                                Background="Transparent"
+                                                Visibility="{x:Bind IsProcessing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                                Value="{x:Bind IndexingProgress, Mode=OneWay}">
+                                                <interactivity:Interaction.Behaviors>
+                                                    <interactivity:DataTriggerBehavior
+                                                        Binding="{x:Bind IndexingProgress, Mode=OneWay}"
+                                                        ComparisonCondition="Equal"
+                                                        Value="0">
+                                                        <interactivity:ChangePropertyAction PropertyName="IsIndeterminate" Value="True" />
+                                                    </interactivity:DataTriggerBehavior>
+                                                    <interactivity:DataTriggerBehavior
+                                                        Binding="{x:Bind IndexingProgress, Mode=OneWay}"
+                                                        ComparisonCondition="NotEqual"
+                                                        Value="0">
+                                                        <interactivity:ChangePropertyAction PropertyName="IsIndeterminate" Value="False" />
+                                                    </interactivity:DataTriggerBehavior>
+                                                </interactivity:Interaction.Behaviors>
+                                            </ProgressBar>
+                                        </StackPanel>
+                                    </dev:SettingsExpander.ItemsHeader>
+
                                 </dev:SettingsExpander>
                             </DataTemplate>
                         </ListView.ItemTemplate>
                     </ListView>
 
-                    <dev:SettingsCard x:Uid="SettingsPageAddFolder" Style="{StaticResource DefaultSettingsExpanderItemStyle}">
-                        <Button
-                            x:Uid="SettingsPageAddFolderButton"
-                            Command="{x:Bind ViewModel.SelectAndAddFolderCommand}"
-                            CommandParameter="{Binding ElementName=RootGrid}" />
-                    </dev:SettingsCard>
+                    <StackPanel
+                        Margin="0,6,0,0"
+                        HorizontalAlignment="Right"
+                        Orientation="Horizontal"
+                        Spacing="6">
+                        <Button Command="{x:Bind ViewModel.OpenMusicGalleryWindowCommand}">
+                            <TextBlock x:Uid="SystemTrayMusicGallery" />
+                        </Button>
+                        <DropDownButton x:Uid="SettingsPageAddFolderButton">
+                            <DropDownButton.Flyout>
+                                <MenuFlyout>
+                                    <MenuFlyoutItem
+                                        x:Uid="SettingsPageLocalFolder"
+                                        Command="{x:Bind ViewModel.AddMediaSourceCommand}"
+                                        CommandParameter="Local">
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE8B7;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+
+                                    <MenuFlyoutSeparator />
+
+                                    <MenuFlyoutItem
+                                        Command="{x:Bind ViewModel.AddMediaSourceCommand}"
+                                        CommandParameter="SMB"
+                                        Text="SMB">
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE839;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+
+                                    <MenuFlyoutItem
+                                        Command="{x:Bind ViewModel.AddMediaSourceCommand}"
+                                        CommandParameter="FTP"
+                                        Text="FTP">
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE838;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+
+                                    <MenuFlyoutItem
+                                        Command="{x:Bind ViewModel.AddMediaSourceCommand}"
+                                        CommandParameter="WebDAV"
+                                        Text="WebDAV">
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE774;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+
+                                </MenuFlyout>
+                            </DropDownButton.Flyout>
+                        </DropDownButton>
+                    </StackPanel>
 
                 </StackPanel>
             </Grid>
         </ScrollViewer>
     </Grid>
-</UserControl>
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs

@@ -4,6 +4,7 @@ using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System;
+using System.Threading.Tasks;
 using Windows.System;
 
 // To learn more about WinUI, the WinUI project structure,
@@ -22,18 +23,14 @@ namespace BetterLyrics.WinUI3.Controls
 
         private void SettingsPageRemovePathButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
         {
-            ViewModel.RemoveFolderAsync((LocalMediaFolder)(sender as HyperlinkButton)!.Tag);
+            var folder = (MediaFolder)((FrameworkElement)sender).DataContext;
+            ViewModel.RemoveFolder(folder);
         }
 
-        private async void LocalFolderHyperlinkButton_Click(object sender, RoutedEventArgs e)
+        private void SyncNowButton_Click(object sender, RoutedEventArgs e)
         {
-            if (sender is HyperlinkButton button && button.Tag is string uriStr)
-            {
-                if (Uri.TryCreate(uriStr, UriKind.Absolute, out var uri))
-                {
-                    await Launcher.LaunchUriAsync(uri);
-                }
-            }
+            var folder = (MediaFolder)((FrameworkElement)sender).DataContext;
+            ViewModel.SyncFolder(folder);
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml

@@ -11,7 +11,6 @@
     mc:Ignorable="d">
 
     <Grid x:Name="RootGrid">
-
         <Grid
             x:Name="BottomCommandGrid"
             Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}"
@@ -113,7 +112,58 @@
                         x:Name="BottomCenterCommandStackPanel"
                         Padding="16"
                         Orientation="Horizontal"
-                        Spacing="3">
+                        Spacing="12">
+                        <!--  Playback order  -->
+                        <Button
+                            Grid.Column="2"
+                            Click="PlaybackOrderButton_Click"
+                            Style="{StaticResource GhostButtonStyle}"
+                            Visibility="{x:Bind ShowPlaybackOrderButton, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                            <ToolTipService.ToolTip>
+                                <ToolTip>
+                                    <Grid>
+                                        <TextBlock x:Name="PlaybackRepeatAllHint" x:Uid="MusicGalleryPageQueueLoop" />
+                                        <TextBlock x:Name="PlaybackRepeatOneHint" x:Uid="MusicGalleryPageSingleLoop" />
+                                        <TextBlock x:Name="PlaybackShuffleHint" x:Uid="MusicGalleryPageQueueRandom" />
+                                    </Grid>
+                                </ToolTip>
+                            </ToolTipService.ToolTip>
+                            <Button.Content>
+                                <Grid>
+                                    <!--  Repeat all  -->
+                                    <FontIcon
+                                        x:Name="PlaybackRepeatAll"
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xE8EE;">
+                                        <FontIcon.OpacityTransition>
+                                            <ScalarTransition />
+                                        </FontIcon.OpacityTransition>
+                                    </FontIcon>
+                                    <!--  Repeat one  -->
+                                    <FontIcon
+                                        x:Name="PlaybackRepeatOne"
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xE8ED;">
+                                        <FontIcon.OpacityTransition>
+                                            <ScalarTransition />
+                                        </FontIcon.OpacityTransition>
+                                    </FontIcon>
+                                    <!--  Shuffle  -->
+                                    <FontIcon
+                                        x:Name="PlaybackShuffle"
+                                        FontFamily="{StaticResource IconFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xE8B1;">
+                                        <FontIcon.OpacityTransition>
+                                            <ScalarTransition />
+                                        </FontIcon.OpacityTransition>
+                                    </FontIcon>
+                                </Grid>
+                            </Button.Content>
+                        </Button>
+                        <!--  上一曲目  -->
                         <Button
                             Command="{x:Bind ViewModel.PreviousSongCommand}"
                             Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
@@ -164,6 +214,13 @@
                             Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
                                                   Glyph=&#xE623;}"
                             Style="{StaticResource GhostButtonStyle}" />
+                        <!--  播放队列按钮  -->
+                        <ToggleButton
+                            Click="PlayingQueueButton_Click"
+                            Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily},
+                                                  Glyph=&#xE8FD;}"
+                            Style="{StaticResource GhostToggleButtonStyle}"
+                            Visibility="{x:Bind ShowPlayingQueueButton, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
                     </StackPanel>
                 </Grid>
 
@@ -356,7 +413,7 @@
                     Padding="8,4"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
-                    Background="{ThemeResource AcrylicInAppFillColorDefaultBrush}"
+                    Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}"
                     CornerRadius="6"
                     Opacity="{x:Bind ViewModel.TimelineSliderThumbOpacity, Mode=OneWay}">
                     <Grid.OpacityTransition>
@@ -427,7 +484,58 @@
             </Grid.ContextFlyout>
         </Grid>
 
-
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="PlaybackOrderState">
+                <VisualState x:Name="RepeatAll">
+                    <VisualState.StateTriggers>
+                        <ui:CompareStateTrigger
+                            Comparison="Equal"
+                            Value="{x:Bind PlaybackOrder, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
+                            To="0" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="PlaybackRepeatAll.Opacity" Value="1" />
+                        <Setter Target="PlaybackRepeatOne.Opacity" Value="0" />
+                        <Setter Target="PlaybackShuffle.Opacity" Value="0" />
+                        <Setter Target="PlaybackRepeatAllHint.Visibility" Value="Visible" />
+                        <Setter Target="PlaybackRepeatOneHint.Visibility" Value="Collapsed" />
+                        <Setter Target="PlaybackShuffleHint.Visibility" Value="Collapsed" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="RepeatOne">
+                    <VisualState.StateTriggers>
+                        <ui:CompareStateTrigger
+                            Comparison="Equal"
+                            Value="{x:Bind PlaybackOrder, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
+                            To="1" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="PlaybackRepeatAll.Opacity" Value="0" />
+                        <Setter Target="PlaybackRepeatOne.Opacity" Value="1" />
+                        <Setter Target="PlaybackShuffle.Opacity" Value="0" />
+                        <Setter Target="PlaybackRepeatAllHint.Visibility" Value="Collapsed" />
+                        <Setter Target="PlaybackRepeatOneHint.Visibility" Value="Visible" />
+                        <Setter Target="PlaybackShuffleHint.Visibility" Value="Collapsed" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="Shuffle">
+                    <VisualState.StateTriggers>
+                        <ui:CompareStateTrigger
+                            Comparison="Equal"
+                            Value="{x:Bind PlaybackOrder, Mode=OneWay, Converter={StaticResource EnumToIntConverter}}"
+                            To="2" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="PlaybackRepeatAll.Opacity" Value="0" />
+                        <Setter Target="PlaybackRepeatOne.Opacity" Value="0" />
+                        <Setter Target="PlaybackShuffle.Opacity" Value="1" />
+                        <Setter Target="PlaybackRepeatAllHint.Visibility" Value="Collapsed" />
+                        <Setter Target="PlaybackRepeatOneHint.Visibility" Value="Collapsed" />
+                        <Setter Target="PlaybackShuffleHint.Visibility" Value="Visible" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
     </Grid>
 
 </UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/NowPlayingBar.xaml.cs

@@ -1,5 +1,7 @@
+using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.MediaSessionsService;
 using BetterLyrics.WinUI3.ViewModels;
 using BetterLyrics.WinUI3.Views;
@@ -12,6 +14,7 @@ using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System;
 using System.Numerics;
+using BetterLyrics.WinUI3.Extensions;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -46,6 +49,42 @@ public sealed partial class NowPlayingBar : UserControl,
     public static readonly DependencyProperty ShowSongInfoProperty =
         DependencyProperty.Register(nameof(ShowSongInfo), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false));
 
+    public bool ShowPlayingQueueButton
+    {
+        get { return (bool)GetValue(ShowPlayingQueueButtonProperty); }
+        set { SetValue(ShowPlayingQueueButtonProperty, value); }
+    }
+
+    public static readonly DependencyProperty ShowPlayingQueueButtonProperty =
+        DependencyProperty.Register(nameof(ShowPlayingQueueButton), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false));
+
+    public bool ShowPlaybackOrderButton
+    {
+        get { return (bool)GetValue(ShowPlaybackOrderButtonProperty); }
+        set { SetValue(ShowPlaybackOrderButtonProperty, value); }
+    }
+
+    public static readonly DependencyProperty ShowPlaybackOrderButtonProperty =
+        DependencyProperty.Register(nameof(ShowPlaybackOrderButton), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false));
+
+    public PlaybackOrder PlaybackOrder
+    {
+        get { return (PlaybackOrder)GetValue(PlaybackOrderProperty); }
+        set { SetValue(PlaybackOrderProperty, value); }
+    }
+
+    public static readonly DependencyProperty PlaybackOrderProperty =
+        DependencyProperty.Register(nameof(PlaybackOrder), typeof(PlaybackOrder), typeof(NowPlayingBar), new PropertyMetadata(PlaybackOrder.RepeatAll));
+
+    public bool IsPlayingQueueOpened
+    {
+        get { return (bool)GetValue(IsPlayingQueueOpenedProperty); }
+        set { SetValue(IsPlayingQueueOpenedProperty, value); }
+    }
+
+    public static readonly DependencyProperty IsPlayingQueueOpenedProperty =
+        DependencyProperty.Register(nameof(IsPlayingQueueOpened), typeof(bool), typeof(NowPlayingBar), new PropertyMetadata(false));
+
     public bool IsCompactMode
     {
         get { return (bool)GetValue(IsCompactModeProperty); }
@@ -190,7 +229,7 @@ public sealed partial class NowPlayingBar : UserControl,
 
     private void TimelineSliderOverlay_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
     {
-        ViewModel.TimelineSliderThumbOpacity = 0.7f;
+        ViewModel.TimelineSliderThumbOpacity = 1f;
     }
 
     private void TimelineSliderOverlay_PointerExited(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
@@ -210,12 +249,12 @@ public sealed partial class NowPlayingBar : UserControl,
 
     private void SongInfoStackPanel_Tapped(object sender, TappedRoutedEventArgs e)
     {
-        SongInfoTapped?.Invoke(this, EventArgs.Empty);
+        SongInfoTapped?.Invoke(sender, EventArgs.Empty);
     }
 
     private void TimeStackPanel_Tapped(object sender, TappedRoutedEventArgs e)
     {
-        TimeTapped?.Invoke(this, EventArgs.Empty);
+        TimeTapped?.Invoke(sender, EventArgs.Empty);
     }
 
     private void BottomCommandGrid_PointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
@@ -262,6 +301,16 @@ public sealed partial class NowPlayingBar : UserControl,
         }
     }
 
+    private void PlayingQueueButton_Click(object sender, RoutedEventArgs e)
+    {
+        IsPlayingQueueOpened = !IsPlayingQueueOpened;
+    }
+
+    private void PlaybackOrderButton_Click(object sender, RoutedEventArgs e)
+    {
+        PlaybackOrder = PlaybackOrder.GetNext();
+    }
+
     public void Receive(PropertyChangedMessage<SongInfo?> message)
     {
         if (message.Sender is IMediaSessionsService)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/PlaybackSettingsControl.xaml

@@ -44,10 +44,10 @@
             </interactivity:Interaction.Behaviors>
 
             <InfoBar
+                x:Uid="SettingsPageMusicGalleryOpened"
                 Grid.Row="0"
                 IsClosable="False"
                 IsOpen="{x:Bind ViewModel.AppSettings.MusicGallerySettings.LyricsWindowStatus.IsOpened, Mode=OneWay}"
-                Message="音乐库窗口已打开，将忽略对其他播放源的监听"
                 Severity="Informational" />
 
             <!--  播放源列表  -->
@@ -328,10 +328,7 @@
                                 <local:PropertyRow x:Uid="SettingsPageSongTitle" Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.Title, TargetNullValue=N/A, Mode=OneWay}" />
                                 <local:PropertyRow x:Uid="SettingsPageArtist" Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.DisplayArtists, TargetNullValue=N/A, Mode=OneWay}" />
                                 <local:PropertyRow x:Uid="SettingsPageAlbum" Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.Album, TargetNullValue=N/A, Mode=OneWay}" />
-                                <local:PropertyRow
-                                    x:Uid="LyricsSearchControlDurauion"
-                                    Unit="s"
-                                    Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.Duration, TargetNullValue=N/A, Mode=OneWay}" />
+                                <local:PropertyRow x:Uid="LyricsSearchControlDurauion" Value="{x:Bind ViewModel.MediaSessionsService.CurrentSongInfo.DurationMs, TargetNullValue=N/A, Converter={StaticResource MillisecondsToFormattedTimeConverter}, Mode=OneWay}" />
                             </StackPanel>
                         </Expander>
 
@@ -344,10 +341,8 @@
                                 <local:PropertyRow x:Uid="SettingsPageSongTitle" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Title, TargetNullValue=N/A, Mode=OneWay}" />
                                 <local:PropertyRow x:Uid="SettingsPageArtist" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.DisplayArtists, TargetNullValue=N/A, Mode=OneWay}" />
                                 <local:PropertyRow x:Uid="SettingsPageAlbum" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Album, TargetNullValue=N/A, Mode=OneWay}" />
-                                <local:PropertyRow
-                                    x:Uid="LyricsSearchControlDurauion"
-                                    Unit="s"
-                                    Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Duration, TargetNullValue=N/A, Mode=OneWay}" />
+                                <local:PropertyRow x:Uid="LyricsSearchControlDurauion" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Duration, Converter={StaticResource SecondsToFormattedTimeConverter}, TargetNullValue=N/A, Mode=OneWay}" />
+                                <local:PropertyRow x:Uid="LyricsPageLanguageCode" Value="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsData.LanguageCode, TargetNullValue=N/A, Mode=OneWay, Converter={StaticResource LanguageCodeToDisplayedNameConverter}}" />
                                 <local:PropertyRow
                                     x:Uid="LyricsPageLyricsProviderPrefix"
                                     Link="{x:Bind ViewModel.MediaSessionsService.CurrentLyricsSearchResult.Reference, Mode=OneWay}"
@@ -466,9 +461,9 @@
                         </dev:SettingsCard>
 
                         <!--  Last.fm  -->
-                        <TextBlock x:Uid="SettingsPageLastFM" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+                        <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="Last.fm" />
                         <dev:SettingsExpander
-                            x:Uid="SettingsPageLastFMManager"
+                            Header="Last.fm"
                             HeaderIcon="{ui:BitmapIcon Source=ms-appx:///Assets/LastFM.png}"
                             IsExpanded="{x:Bind ViewModel.IsLastFMAuthenticated, Mode=OneWay}">
                             <StackPanel Orientation="Horizontal" Spacing="6">

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.RemoteServerConfigControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid>
+        <ScrollViewer>
+            <StackPanel Width="400" Spacing="16">
+                <ProgressBar
+                    x:Name="ProgressBar"
+                    IsIndeterminate="True"
+                    Visibility="Collapsed" />
+                <InfoBar
+                    x:Name="ErrorInfoBar"
+                    IsClosable="True"
+                    IsOpen="False"
+                    Severity="Error" />
+
+                <TextBox
+                    x:Name="NameBox"
+                    x:Uid="RemoteServerConfigControlName"
+                    TextWrapping="Wrap" />
+
+                <StackPanel x:Name="RemoteFieldsPanel" Spacing="16">
+                    <Grid ColumnDefinitions="*, Auto" ColumnSpacing="12">
+                        <TextBox
+                            x:Name="HostBox"
+                            x:Uid="RemoteServerConfigControlServerAddress"
+                            Grid.Column="0"
+                            InputScope="Url"
+                            PlaceholderText="192.168.1.x"
+                            TextWrapping="Wrap" />
+
+                        <NumberBox
+                            x:Name="PortBox"
+                            x:Uid="RemoteServerConfigControlPort"
+                            Grid.Column="1"
+                            MinWidth="100"
+                            LargeChange="10"
+                            SmallChange="1"
+                            SpinButtonPlacementMode="Inline"
+                            ToolTipService.ToolTip="80"
+                            Value="80" />
+                    </Grid>
+                </StackPanel>
+
+                <Grid ColumnDefinitions="*, Auto" ColumnSpacing="8">
+                    <TextBox
+                        x:Name="PathBox"
+                        x:Uid="RemoteServerConfigControlPath"
+                        Grid.Column="0"
+                        TextChanged="PathBox_TextChanged"
+                        TextWrapping="Wrap" />
+
+                    <Button
+                        x:Name="BrowseButton"
+                        x:Uid="RemoteServerConfigControlBrowse"
+                        Grid.Column="1"
+                        VerticalAlignment="Bottom"
+                        Click="BrowseButton_Click"
+                        Visibility="Collapsed" />
+                </Grid>
+
+                <InfoBar
+                    x:Name="PathWarningBar"
+                    IsClosable="False"
+                    IsOpen="False"
+                    Severity="Warning" />
+
+                <StackPanel x:Name="AuthFieldsPanel" Spacing="16">
+                    <Grid ColumnDefinitions="*, *" ColumnSpacing="12">
+                        <TextBox
+                            x:Name="UserBox"
+                            x:Uid="RemoteServerConfigControlUsername"
+                            Grid.Column="0"
+                            TextWrapping="Wrap" />
+
+                        <PasswordBox
+                            x:Name="PwdBox"
+                            x:Uid="RemoteServerConfigControlPassword"
+                            Grid.Column="1"
+                            PasswordRevealMode="Peek" />
+                    </Grid>
+                </StackPanel>
+            </StackPanel>
+        </ScrollViewer>
+    </Grid>
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs

@@ -0,0 +1,195 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.LocalizationService;
+using BetterLyrics.WinUI3.Views;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using System;
+
+namespace BetterLyrics.WinUI3.Controls
+{
+    public sealed partial class RemoteServerConfigControl : UserControl
+    {
+        private readonly FileSourceType _fileSourceType;
+        private readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
+
+        public RemoteServerConfigControl(FileSourceType fileSourceType)
+        {
+            this.InitializeComponent();
+            _fileSourceType = fileSourceType;
+
+            SetupDefaults();
+            CheckPathForWarning();
+        }
+
+        private void SetupDefaults()
+        {
+            if (_fileSourceType == FileSourceType.Local)
+            {
+                RemoteFieldsPanel.Visibility = Visibility.Collapsed;
+                AuthFieldsPanel.Visibility = Visibility.Collapsed;
+
+                BrowseButton.Visibility = Visibility.Visible;
+
+                PathBox.PlaceholderText = @"D:\Music";
+            }
+            else
+            {
+                BrowseButton.Visibility = Visibility.Collapsed;
+                RemoteFieldsPanel.Visibility = Visibility.Visible;
+                AuthFieldsPanel.Visibility = Visibility.Visible;
+
+                switch (_fileSourceType)
+                {
+                    case FileSourceType.SMB:
+                        PortBox.Value = 445;
+                        PathBox.PlaceholderText = "SharedMusic";
+                        break;
+                    case FileSourceType.FTP:
+                        PortBox.Value = 21;
+                        PathBox.PlaceholderText = "/pub/music";
+                        break;
+                    case FileSourceType.WebDAV:
+                        PortBox.Value = 80;
+                        PathBox.PlaceholderText = "/dav/music";
+                        break;
+                }
+            }
+        }
+
+        private string GetScheme()
+        {
+            string scheme = string.Empty;
+            switch (_fileSourceType)
+            {
+                case FileSourceType.SMB:
+                    scheme = "smb";
+                    break;
+                case FileSourceType.FTP:
+                    scheme = "ftp";
+                    break;
+                case FileSourceType.WebDAV:
+                    scheme = "https";
+                    break;
+            }
+            return scheme;
+        }
+
+        public MediaFolder GetConfig()
+        {
+            string finalName = HostBox.Text.Trim();
+
+            if (_fileSourceType == FileSourceType.Local)
+            {
+                if (string.IsNullOrWhiteSpace(PathBox.Text))
+                    throw new ArgumentException(_localizationService.GetLocalizedString("RemoteServerConfigControlPathRequired"));
+
+                if (!string.IsNullOrWhiteSpace(NameBox.Text))
+                    finalName = NameBox.Text.Trim();
+                else
+                    finalName = PathBox.Text.TrimEnd(System.IO.Path.DirectorySeparatorChar);
+
+                return new MediaFolder
+                {
+                    Name = finalName,
+                    SourceType = FileSourceType.Local,
+                    UriScheme = "file",
+                    UriPath = PathBox.Text.Trim(),
+                };
+            }
+
+            if (string.IsNullOrWhiteSpace(HostBox.Text))
+                throw new ArgumentException(_localizationService.GetLocalizedString("RemoteServerConfigControlServerAddressRequired"));
+
+            if (!string.IsNullOrWhiteSpace(NameBox.Text))
+            {
+                finalName = NameBox.Text.Trim();
+            }
+            else
+            {
+                finalName = $"{_fileSourceType} - {HostBox.Text}";
+            }
+
+            string scheme = GetScheme();
+
+            var folder = new MediaFolder
+            {
+                Name = finalName,
+                SourceType = _fileSourceType,
+
+                UriScheme = scheme,
+                UriHost = HostBox.Text.Trim(), // ȥ<><C8A5><EFBFBD><EFBFBD>β<EFBFBD>ո<EFBFBD>
+                UriPort = (int)PortBox.Value,
+
+                UriPath = PathBox.Text.Trim(),
+
+                UserName = UserBox.Text.Trim(),
+                Password = PwdBox.Password,
+            };
+
+            return folder;
+        }
+
+        public void ShowError(string? message)
+        {
+            ErrorInfoBar.Message = message;
+            ErrorInfoBar.IsOpen = !string.IsNullOrWhiteSpace(message);
+        }
+
+        public void SetProgressBarVisibility(Visibility visibility)
+        {
+            ProgressBar.Visibility = visibility;
+        }
+        
+        private void CheckPathForWarning()
+        {
+            string? path = PathBox.Text?.Trim();
+
+            bool isSymbolRoot = string.IsNullOrEmpty(path) ||
+                                path == "/" ||
+                                path == "\\";
+
+            bool isDriveRoot = false;
+            if (!string.IsNullOrEmpty(path))
+            {
+                var normalized = path.TrimEnd('\\', '/');
+                isDriveRoot = normalized.EndsWith(":") && normalized.Length == 2;
+            }
+
+            bool isRoot = isSymbolRoot || isDriveRoot;
+
+            if (isRoot)
+            {
+                PathWarningBar.Message = _localizationService.GetLocalizedString("FileSystemServiceRootDirectoryWarning");
+                PathWarningBar.IsOpen = true;
+            }
+            else
+            {
+                PathWarningBar.IsOpen = false;
+            }
+        }
+
+        private void PathBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            CheckPathForWarning();
+        }
+
+        private async void BrowseButton_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                var folder = await PickerHelper.PickSingleFolderAsync<SettingsWindow>();
+                if (folder != null)
+                {
+                    PathBox.Text = folder.Path;
+                }
+            }
+            catch (Exception ex)
+            {
+                ShowError(ex.Message);
+            }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/ShortcutTextBox.xaml.cs

@@ -1,6 +1,6 @@
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Hooks;
-using BetterLyrics.WinUI3.Services.ResourceService;
+using BetterLyrics.WinUI3.Services.LocalizationService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
@@ -16,7 +16,7 @@ namespace BetterLyrics.WinUI3.Controls
 {
     public sealed partial class ShortcutTextBox : UserControl
     {
-        private readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
+        private readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
 
         public ShortcutTextBox()
         {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/StatsDashboardControl.xaml

@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.StatsDashboardControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:converters="using:BetterLyrics.WinUI3.Converter"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dev="using:DevWinUI"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:lvc="using:LiveChartsCore.SkiaSharpView.WinUI"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="using:BetterLyrics.WinUI3.Models"
+    xmlns:statsmodels="using:BetterLyrics.WinUI3.Models.Stats"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <Style x:Key="StatsCardStyle" TargetType="Border">
+            <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+            <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="CornerRadius" Value="8" />
+            <Setter Property="Padding" Value="16" />
+            <Setter Property="Margin" Value="0,0,12,12" />
+        </Style>
+    </UserControl.Resources>
+
+    <Grid Margin="0,20,0,0">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <Grid Grid.Row="0" Margin="36,12">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <StackPanel Orientation="Horizontal" Spacing="12">
+                <ComboBox
+                    x:Uid="StatsDashboardControlTimeRange"
+                    Header="Time Range"
+                    SelectedIndex="{x:Bind ViewModel.SelectedTimeRange, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
+                    <ComboBoxItem x:Uid="StatsDashboardControlToday" />
+                    <ComboBoxItem x:Uid="StatsDashboardControlThisWeek" />
+                    <ComboBoxItem x:Uid="StatsDashboardControlThisMonth" />
+                    <ComboBoxItem x:Uid="StatsDashboardControlThisQuarter" />
+                    <ComboBoxItem x:Uid="StatsDashboardControlThisYear" />
+                    <ComboBoxItem x:Uid="StatsDashboardControlCustom" />
+                </ComboBox>
+
+                <StackPanel
+                    Margin="0,0,0,5"
+                    VerticalAlignment="Bottom"
+                    Orientation="Horizontal"
+                    Spacing="8"
+                    Visibility="{x:Bind ViewModel.IsCustomRangeSelected, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                    <CalendarDatePicker x:Uid="StatsDashboardControlStart" Date="{x:Bind ViewModel.CustomStartDate, Mode=TwoWay}" />
+                    <TextBlock
+                        Margin="0,26,0,0"
+                        VerticalAlignment="Center"
+                        Text="-" />
+                    <CalendarDatePicker x:Uid="StatsDashboardControlEnd" Date="{x:Bind ViewModel.CustomEndDate, Mode=TwoWay}" />
+                </StackPanel>
+            </StackPanel>
+        </Grid>
+
+        <ScrollViewer Grid.Row="1" Padding="36,0">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+
+                <Grid Grid.Row="0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+
+                    <Border Grid.Column="0" Style="{StaticResource StatsCardStyle}">
+                        <StackPanel>
+                            <StackPanel
+                                Opacity="0.8"
+                                Orientation="Horizontal"
+                                Spacing="8">
+                                <FontIcon FontSize="14" Glyph="&#xE916;" />
+                                <TextBlock x:Uid="StatsDashboardControlTotalDuration" Style="{ThemeResource CaptionTextBlockStyle}" />
+                            </StackPanel>
+                            <StackPanel
+                                Margin="0,8,0,0"
+                                Orientation="Horizontal"
+                                Spacing="4">
+                                <TextBlock
+                                    Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
+                                    Style="{ThemeResource SubtitleTextBlockStyle}"
+                                    Text="{x:Bind ViewModel.TotalDuration.TotalHours, Mode=OneWay, Converter={StaticResource DoubleToDecimalConverter}}" />
+                                <TextBlock
+                                    Margin="0,0,0,2"
+                                    VerticalAlignment="Bottom"
+                                    Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
+                                    Opacity="0.8"
+                                    Style="{ThemeResource CaptionTextBlockStyle}"
+                                    Text="Hrs" />
+                            </StackPanel>
+                        </StackPanel>
+                    </Border>
+
+                    <Border Grid.Column="1" Style="{StaticResource StatsCardStyle}">
+                        <StackPanel>
+                            <StackPanel
+                                Opacity="0.8"
+                                Orientation="Horizontal"
+                                Spacing="8">
+                                <FontIcon FontSize="14" Glyph="&#xE8D6;" />
+                                <TextBlock x:Uid="StatsDashboardControlTracksPlayed" Style="{ThemeResource CaptionTextBlockStyle}" />
+                            </StackPanel>
+                            <TextBlock
+                                Margin="0,8,0,0"
+                                Style="{ThemeResource SubtitleTextBlockStyle}"
+                                Text="{x:Bind ViewModel.TotalTracksPlayed, Mode=OneWay}" />
+                        </StackPanel>
+                    </Border>
+
+                    <Border
+                        Grid.Column="2"
+                        Margin="0,0,0,12"
+                        Style="{StaticResource StatsCardStyle}">
+                        <StackPanel>
+                            <StackPanel
+                                Opacity="0.8"
+                                Orientation="Horizontal"
+                                Spacing="8">
+                                <FontIcon FontSize="14" Glyph="&#xEC4A;" />
+                                <TextBlock x:Uid="StatsDashboardControlTopSource" Style="{ThemeResource CaptionTextBlockStyle}" />
+                            </StackPanel>
+                            <TextBlock
+                                Margin="0,8,0,0"
+                                Style="{ThemeResource SubtitleTextBlockStyle}"
+                                Text="{x:Bind ViewModel.TopPlayerName, Mode=OneWay}" />
+                        </StackPanel>
+                    </Border>
+                </Grid>
+
+                <!--  Activity by hour  -->
+                <Border
+                    Grid.Row="1"
+                    Margin="0,0,0,12"
+                    Style="{StaticResource StatsCardStyle}">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <StackPanel
+                            Margin="0,0,0,12"
+                            Orientation="Horizontal"
+                            Spacing="8">
+                            <TextBlock x:Uid="StatsDashboardControlActivityByHour" Style="{ThemeResource SubtitleTextBlockStyle}" />
+                        </StackPanel>
+
+                        <Grid Grid.Row="1" Margin="0,0,0,16">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <StackPanel>
+                                <TextBlock
+                                    x:Uid="StatsDashboardControlMostActive"
+                                    FontSize="12"
+                                    Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                                <TextBlock FontWeight="SemiBold" Text="{x:Bind ViewModel.PeakHourText, Mode=OneWay}" />
+                            </StackPanel>
+                            <StackPanel Grid.Column="1">
+                                <TextBlock
+                                    x:Uid="StatsDashboardControlLeastActive"
+                                    FontSize="12"
+                                    Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                                <TextBlock FontWeight="SemiBold" Text="{x:Bind ViewModel.QuietHourText, Mode=OneWay}" />
+                            </StackPanel>
+                        </Grid>
+
+                        <lvc:CartesianChart
+                            Grid.Row="2"
+                            Height="180"
+                            Margin="0,8,0,0"
+                            Background="Transparent"
+                            TooltipPosition="Top">
+
+                            <lvc:CartesianChart.XAxes>
+                                <lvc:AxesCollection>
+                                    <lvc:XamlAxis Labels="{x:Bind ViewModel.HourlyXAxisLabels, Mode=OneWay}" TextSize="{StaticResource BodyTextBlockFontSize}" />
+                                </lvc:AxesCollection>
+                            </lvc:CartesianChart.XAxes>
+
+                            <lvc:CartesianChart.YAxes>
+                                <lvc:AxesCollection>
+                                    <lvc:XamlAxis
+                                        x:Uid="StatsDashboardControlTrackCountAxis"
+                                        NameTextSize="{StaticResource BodyTextBlockFontSize}"
+                                        ShowSeparatorLines="False"
+                                        TextSize="{StaticResource BodyTextBlockFontSize}" />
+                                </lvc:AxesCollection>
+                            </lvc:CartesianChart.YAxes>
+
+                            <lvc:CartesianChart.Series>
+                                <lvc:SeriesCollection>
+                                    <lvc:XamlColumnSeries
+                                        x:Name="HourlySeries"
+                                        Rx="4"
+                                        Ry="4"
+                                        Values="{x:Bind ViewModel.HourlySeriesValues, Mode=OneWay}" />
+                                </lvc:SeriesCollection>
+                            </lvc:CartesianChart.Series>
+
+                        </lvc:CartesianChart>
+                    </Grid>
+                </Border>
+
+                <!--  Top artists and sources  -->
+                <Grid Grid.Row="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+
+                    <!--  Top artists  -->
+                    <Border Grid.Column="0" Style="{StaticResource StatsCardStyle}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition MinHeight="250" />
+                            </Grid.RowDefinitions>
+                            <TextBlock
+                                x:Uid="StatsDashboardControlTopArtists"
+                                Margin="0,0,0,12"
+                                Style="{ThemeResource SubtitleTextBlockStyle}" />
+
+                            <lvc:CartesianChart
+                                Grid.Row="1"
+                                Margin="0,8,0,0"
+                                Background="Transparent">
+
+                                <lvc:CartesianChart.XAxes>
+                                    <lvc:AxesCollection>
+                                        <lvc:XamlAxis x:Uid="StatsDashboardControlTrackCountAxis" NameTextSize="{StaticResource BodyTextBlockFontSize}" />
+                                    </lvc:AxesCollection>
+                                </lvc:CartesianChart.XAxes>
+
+                                <lvc:CartesianChart.YAxes>
+                                    <lvc:AxesCollection>
+                                        <lvc:XamlAxis IsInverted="True" IsVisible="False" />
+                                    </lvc:AxesCollection>
+                                </lvc:CartesianChart.YAxes>
+
+                                <lvc:CartesianChart.Series>
+                                    <lvc:SeriesCollection>
+                                        <lvc:XamlRowSeries
+                                            Padding="4"
+                                            DataLabelsFormatter="{x:Bind ViewModel.ArtistsLabelsFormatter}"
+                                            DataLabelsSize="{StaticResource BodyTextBlockFontSize}"
+                                            Rx="4"
+                                            Ry="4"
+                                            ShowDataLabels="True"
+                                            Values="{x:Bind ViewModel.ArtistSeriesValues, Mode=OneWay}" />
+                                    </lvc:SeriesCollection>
+                                </lvc:CartesianChart.Series>
+
+                            </lvc:CartesianChart>
+
+                        </Grid>
+                    </Border>
+
+                    <!--  播放源分布  -->
+                    <Border
+                        Grid.Column="1"
+                        Margin="0,0,0,12"
+                        Style="{StaticResource StatsCardStyle}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <TextBlock
+                                x:Uid="StatsDashboardControlSources"
+                                Margin="0,0,0,12"
+                                Style="{ThemeResource SubtitleTextBlockStyle}" />
+
+                            <lvc:PieChart
+                                Grid.Row="1"
+                                MinHeight="160"
+                                Background="Transparent"
+                                LegendPosition="Right"
+                                LegendTextSize="{StaticResource BodyTextBlockFontSize}"
+                                Series="{x:Bind ViewModel.SourceSeries, Mode=OneWay}"
+                                TooltipPosition="Center" />
+
+                        </Grid>
+                    </Border>
+                </Grid>
+
+                <!--  Top tracks  -->
+                <Border
+                    Grid.Row="3"
+                    Margin="0,0,0,20"
+                    Style="{StaticResource StatsCardStyle}">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <TextBlock
+                            x:Uid="StatsDashboardControlTopSongs"
+                            Margin="0,0,0,18"
+                            Style="{ThemeResource SubtitleTextBlockStyle}" />
+                        <dev:OpacityMaskView Grid.Row="1" Margin="-20,0">
+                            <dev:OpacityMaskView.OpacityMask>
+                                <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
+                                    <GradientStop Offset="0" Color="Transparent" />
+                                    <GradientStop Offset="0.02" Color="#FFFFFFFF" />
+                                    <GradientStop Offset="0.98" Color="#FFFFFFFF" />
+                                    <GradientStop Offset="1" Color="Transparent" />
+                                </LinearGradientBrush>
+                            </dev:OpacityMaskView.OpacityMask>
+                            <ListView
+                                Padding="20,0"
+                                ItemContainerStyle="{StaticResource ListViewStretchedItemContainerStyle}"
+                                ItemsSource="{x:Bind ViewModel.TopSongs, Mode=OneWay}"
+                                ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                                ScrollViewer.HorizontalScrollMode="Enabled"
+                                ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                                ScrollViewer.VerticalScrollMode="Disabled"
+                                SelectionMode="None">
+                                <ListView.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <ItemsStackPanel Orientation="Horizontal" />
+                                    </ItemsPanelTemplate>
+                                </ListView.ItemsPanel>
+                                <ListView.ItemTemplate>
+                                    <DataTemplate x:DataType="statsmodels:SongPlayCount">
+                                        <Grid
+                                            MinWidth="200"
+                                            Margin="6,0"
+                                            Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
+                                            BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                                            BorderThickness="1"
+                                            CornerRadius="4">
+                                            <StackPanel Margin="20">
+                                                <TextBlock
+                                                    Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
+                                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                                    Text="{x:Bind Title}"
+                                                    TextWrapping="Wrap" />
+                                                <RichTextBlock>
+                                                    <Paragraph>
+                                                        <Run Text="{x:Bind Artist}" />
+                                                        <Run Text="·" />
+                                                        <Run Text="{x:Bind PlayCount}" />
+                                                        <Run x:Uid="StatsDashboardControlTrackCountText" />
+                                                    </Paragraph>
+                                                </RichTextBlock>
+                                            </StackPanel>
+                                        </Grid>
+                                    </DataTemplate>
+                                </ListView.ItemTemplate>
+                            </ListView>
+                        </dev:OpacityMaskView>
+                    </Grid>
+                </Border>
+
+            </Grid>
+        </ScrollViewer>
+
+        <Button
+            Grid.Row="1"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Bottom"
+            Command="{x:Bind ViewModel.GenerateTestDataCommand}"
+            Content="Generate test data"
+            Visibility="Collapsed" />
+    </Grid>
+</UserControl>

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/StatsDashboardControl.xaml.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using BetterLyrics.WinUI3.ViewModels;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using BetterLyrics.WinUI3.Enums;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace BetterLyrics.WinUI3.Controls;
+
+public sealed partial class StatsDashboardControl : UserControl
+{
+    public StatsDashboardControlViewModel ViewModel => (StatsDashboardControlViewModel)DataContext;
+
+    public StatsDashboardControl()
+    {
+        InitializeComponent();
+        DataContext = Ioc.Default.GetRequiredService<StatsDashboardControlViewModel>();
+    }
+
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/WindowSettingsControl.xaml

@@ -18,13 +18,7 @@
                     <TextBlock x:Uid="AppSettingsControlGeneral" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 
                     <dev:SettingsCard x:Uid="SettingsPageConfigName" HeaderIcon="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, Glyph=&#xE8AC;}">
-                        <StackPanel
-                            Margin="0,6,0,0"
-                            Orientation="Horizontal"
-                            Spacing="6">
-                            <TextBox Text="{x:Bind LyricsWindowStatus.Name, Mode=TwoWay}" TextWrapping="Wrap" />
-                            <Button Content="{ui:FontIcon FontFamily={StaticResource IconFontFamily}, FontSize=12, Glyph=&#xE8FB;}" Style="{StaticResource GhostButtonStyle}" />
-                        </StackPanel>
+                        <TextBox Text="{x:Bind LyricsWindowStatus.Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" />
                     </dev:SettingsCard>
 
                     <dev:SettingsExpander

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/AlbumArtSearchProviderToDisplayNameConverter.cs

@@ -1,5 +1,5 @@
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Services.ResourceService;
+using BetterLyrics.WinUI3.Services.LocalizationService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml.Data;
 using System;
@@ -8,7 +8,7 @@ namespace BetterLyrics.WinUI3.Converter
 {
     public partial class AlbumArtSearchProviderToDisplayNameConverter : IValueConverter
     {
-        private readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
+        private readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
 
         public object Convert(object value, Type targetType, object parameter, string language)
         {
@@ -16,8 +16,8 @@ namespace BetterLyrics.WinUI3.Converter
             {
                 return provider switch
                 {
-                    AlbumArtSearchProvider.Local => _resourceService.GetLocalizedString("AlbumArtSearchLocalProvider"),
-                    AlbumArtSearchProvider.SMTC => _resourceService.GetLocalizedString("AlbumArtSearchSMTCProvider"),
+                    AlbumArtSearchProvider.Local => _localizationService.GetLocalizedString("AlbumArtSearchLocalProvider"),
+                    AlbumArtSearchProvider.SMTC => _localizationService.GetLocalizedString("AlbumArtSearchSMTCProvider"),
                     AlbumArtSearchProvider.iTunes => "iTunes",
                     _ => throw new Exception($"Unknown AlbumArtSearchProvider: {provider}"),
                 };

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ByteArrayToImageConverter.cs

@@ -17,20 +17,16 @@ namespace BetterLyrics.WinUI3.Converter
                     using (var ms = new MemoryStream(byteArray))
                     {
                         var stream = ms.AsRandomAccessStream();
+
                         var bitmapImage = new BitmapImage();
-
                         bitmapImage.SetSource(stream);
-
                         return bitmapImage;
                     }
                 }
-                catch
-                {
-                    return PathHelper.AlbumArtPlaceholderPath;
-                }
+                catch { }
             }
 
-            return PathHelper.AlbumArtPlaceholderPath;
+            return new BitmapImage(new Uri(PathHelper.AlbumArtPlaceholderPath));
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, string language)

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/DisplayLanguageCodeToIndexConverter.cs

@@ -11,7 +11,8 @@ namespace BetterLyrics.WinUI3.Converter
         {
             if (value is string langCode)
             {
-                return LanguageHelper.SupportedDisplayLanguages.FindIndex(x => x.LanguageCode == langCode);
+                var found = LanguageHelper.SupportedDisplayLanguages.FindIndex(x => x.LanguageCode == langCode);
+                return found == -1 ? 0 : found;
             }
             return 0;
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/DoubleToDecimalConverter.cs

@@ -0,0 +1,33 @@
+using Microsoft.UI.Xaml.Data;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class DoubleToDecimalConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value == null) return string.Empty;
+
+            if (double.TryParse(value.ToString(), out double number))
+            {
+                int decimalPlaces = 2;
+                if (parameter != null && int.TryParse(parameter.ToString(), out int parsedParams))
+                {
+                    decimalPlaces = parsedParams;
+                }
+
+                return number.ToString($"F{decimalPlaces}");
+            }
+
+            return value.ToString() ?? "";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FileSourceTypeToIconConverter.cs

@@ -0,0 +1,27 @@
+using BetterLyrics.WinUI3.Enums;
+using Microsoft.UI.Xaml.Data;
+using System;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class FileSourceTypeToIconConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is FileSourceType type)
+            {
+                return type switch
+                {
+                    FileSourceType.Local => "\uE8B7", // Folder
+                    FileSourceType.SMB => "\uE839",   // Network
+                    FileSourceType.FTP => "\uE838",   // Globe
+                    FileSourceType.WebDAV => "\uE753", // Cloud
+                    _ => "\uE8B7"
+                };
+            }
+            return "\uE8B7";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language) => throw new NotImplementedException();
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/LanguageCodeToDisplayedNameConverter.cs

@@ -11,7 +11,11 @@ namespace BetterLyrics.WinUI3.Converter
         {
             if (value is string langCode)
             {
-                if (PhoneticHelper.IsPhoneticCode(langCode))
+                if (langCode == "N/A")
+                {
+                    return langCode;
+                }
+                else if (PhoneticHelper.IsPhoneticCode(langCode))
                 {
                     return PhoneticHelper.GetDisplayName(langCode);
                 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/LyricsSearchProviderToDisplayNameConverter.cs

@@ -1,7 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Services.ResourceService;
+using BetterLyrics.WinUI3.Services.LocalizationService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml.Data;
 using System;
@@ -10,7 +10,7 @@ namespace BetterLyrics.WinUI3.Converter
 {
     public partial class LyricsSearchProviderToDisplayNameConverter : IValueConverter
     {
-        private readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
+        private readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
 
         public object Convert(object value, Type targetType, object parameter, string language)
         {
@@ -24,10 +24,10 @@ namespace BetterLyrics.WinUI3.Converter
                     LyricsSearchProvider.Kugou => "酷狗音乐",
                     LyricsSearchProvider.AmllTtmlDb => "amll-ttml-db",
                     LyricsSearchProvider.AppleMusic => "Apple Music",
-                    LyricsSearchProvider.LocalLrcFile => _resourceService.GetLocalizedString("LyricsSearchProviderLocalLrcFile"),
-                    LyricsSearchProvider.LocalMusicFile => _resourceService.GetLocalizedString("LyricsSearchProviderLocalMusicFile"),
-                    LyricsSearchProvider.LocalEslrcFile => _resourceService.GetLocalizedString("LyricsSearchProviderEslrcFile"),
-                    LyricsSearchProvider.LocalTtmlFile => _resourceService.GetLocalizedString("LyricsSearchProviderTtmlFile"),
+                    LyricsSearchProvider.LocalLrcFile => _localizationService.GetLocalizedString("LyricsSearchProviderLocalLrcFile"),
+                    LyricsSearchProvider.LocalMusicFile => _localizationService.GetLocalizedString("LyricsSearchProviderLocalMusicFile"),
+                    LyricsSearchProvider.LocalEslrcFile => _localizationService.GetLocalizedString("LyricsSearchProviderEslrcFile"),
+                    LyricsSearchProvider.LocalTtmlFile => _localizationService.GetLocalizedString("LyricsSearchProviderTtmlFile"),
                     _ => "N/A",
                 };
             }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MatchedLocalFilesPathToVisibilityConverter.cs

@@ -1,6 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
-using BetterLyrics.WinUI3.Services.ResourceService;
+
+using BetterLyrics.WinUI3.Services.LocalizationService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
@@ -10,13 +11,13 @@ namespace BetterLyrics.WinUI3.Converter
 {
     public partial class MatchedLocalFilesPathToVisibilityConverter : IValueConverter
     {
-        private readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
+        private readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
 
         public object Convert(object value, Type targetType, object parameter, string language)
         {
             if (value is string path)
             {
-                if (path == _resourceService.GetLocalizedString("MainPageNoLocalFilesMatched"))
+                if (path == _localizationService.GetLocalizedString("MainPageNoLocalFilesMatched"))
                 {
                     return Visibility.Collapsed;
                 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MillisecondsToFormattedTimeConverter.cs

@@ -3,18 +3,37 @@ using System;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    public class MillisecondsToFormattedTimeConverter : IValueConverter
+    public partial class MillisecondsToFormattedTimeConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {
-            if (value is int milliseconds)
+            double? milliseconds = null;
+
+            if (value is int iVal) milliseconds = iVal;
+            else if (value is double dVal) milliseconds = dVal;
+            else if (value is long lVal) milliseconds = lVal;
+
+            if (milliseconds.HasValue)
             {
-                return TimeSpan.FromMilliseconds(milliseconds).ToString(@"mm\:ss\.fff");
-            }
-            else if (value is double doubleMilliseconds)
-            {
-                return TimeSpan.FromMilliseconds(doubleMilliseconds).ToString(@"mm\:ss\.fff");
+                var ts = TimeSpan.FromMilliseconds(milliseconds.Value);
+
+                string? format = parameter?.ToString();
+
+                if (string.IsNullOrEmpty(format))
+                {
+                    format = @"mm\:ss\.fff";
+                }
+
+                try
+                {
+                    return ts.ToString(format);
+                }
+                catch (FormatException)
+                {
+                    return ts.ToString();
+                }
             }
+
             return value?.ToString() ?? "";
         }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/MillisecondsToSecondsConverter.cs

@@ -3,7 +3,7 @@ using System;
 
 namespace BetterLyrics.WinUI3.Converter
 {
-    public class MillisecondsToSecondsConverter : IValueConverter
+    public partial class MillisecondsToSecondsConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, string language)
         {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToImageConverter.cs

@@ -0,0 +1,31 @@
+using BetterLyrics.WinUI3.Helper;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media.Imaging;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class PathToImageConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            string targetPath = PathHelper.AlbumArtPlaceholderPath;
+            if (value is string path)
+            {
+                if (File.Exists(path))
+                {
+                    targetPath = path;
+                }
+            }
+            return new BitmapImage(new Uri(targetPath));
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TrackToLyricsConverter.cs

@@ -1,24 +0,0 @@
-using ATL;
-using BetterLyrics.WinUI3.Extensions;
-using Microsoft.UI.Xaml.Data;
-using System;
-
-namespace BetterLyrics.WinUI3.Converter
-{
-    public partial class TrackToLyricsConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is Track track)
-            {
-                return track.GetRawLyrics();
-            }
-            return "";
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TranslationSearchProviderToDisplayNameConverter.cs

@@ -1,7 +1,7 @@
 // 2025/6/23 by Zhe Fang
 
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Services.ResourceService;
+using BetterLyrics.WinUI3.Services.LocalizationService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml.Data;
 using System;
@@ -10,7 +10,7 @@ namespace BetterLyrics.WinUI3.Converter
 {
     public partial class TranslationSearchProviderToDisplayNameConverter : IValueConverter
     {
-        private readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
+        private readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
 
         public object Convert(object value, Type targetType, object parameter, string language)
         {
@@ -24,10 +24,10 @@ namespace BetterLyrics.WinUI3.Converter
                     TranslationSearchProvider.Kugou => "酷狗音乐",
                     TranslationSearchProvider.AmllTtmlDb => "amll-ttml-db",
                     TranslationSearchProvider.AppleMusic => "Apple Music",
-                    TranslationSearchProvider.LocalLrcFile => _resourceService.GetLocalizedString("LyricsSearchProviderLocalLrcFile"),
-                    TranslationSearchProvider.LocalMusicFile => _resourceService.GetLocalizedString("LyricsSearchProviderLocalMusicFile"),
-                    TranslationSearchProvider.LocalEslrcFile => _resourceService.GetLocalizedString("LyricsSearchProviderEslrcFile"),
-                    TranslationSearchProvider.LocalTtmlFile => _resourceService.GetLocalizedString("LyricsSearchProviderTtmlFile"),
+                    TranslationSearchProvider.LocalLrcFile => _localizationService.GetLocalizedString("LyricsSearchProviderLocalLrcFile"),
+                    TranslationSearchProvider.LocalMusicFile => _localizationService.GetLocalizedString("LyricsSearchProviderLocalMusicFile"),
+                    TranslationSearchProvider.LocalEslrcFile => _localizationService.GetLocalizedString("LyricsSearchProviderEslrcFile"),
+                    TranslationSearchProvider.LocalTtmlFile => _localizationService.GetLocalizedString("LyricsSearchProviderTtmlFile"),
                     TranslationSearchProvider.LibreTranslate => "LibreTranslate",
                     _ => "N/A",
                 };

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TransliterationSearchProviderToDisplayNameConverter.cs

@@ -1,5 +1,5 @@
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Services.ResourceService;
+using BetterLyrics.WinUI3.Services.LocalizationService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml.Data;
 using System;
@@ -8,7 +8,7 @@ namespace BetterLyrics.WinUI3.Converter
 {
     public partial class TransliterationSearchProviderToDisplayNameConverter : IValueConverter
     {
-        private readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
+        private readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
 
         public object Convert(object value, Type targetType, object parameter, string language)
         {
@@ -22,10 +22,10 @@ namespace BetterLyrics.WinUI3.Converter
                     TransliterationSearchProvider.Kugou => "酷狗音乐",
                     TransliterationSearchProvider.AmllTtmlDb => "amll-ttml-db",
                     TransliterationSearchProvider.AppleMusic => "Apple Music",
-                    TransliterationSearchProvider.LocalLrcFile => _resourceService.GetLocalizedString("LyricsSearchProviderLocalLrcFile"),
-                    TransliterationSearchProvider.LocalMusicFile => _resourceService.GetLocalizedString("LyricsSearchProviderLocalMusicFile"),
-                    TransliterationSearchProvider.LocalEslrcFile => _resourceService.GetLocalizedString("LyricsSearchProviderEslrcFile"),
-                    TransliterationSearchProvider.LocalTtmlFile => _resourceService.GetLocalizedString("LyricsSearchProviderTtmlFile"),
+                    TransliterationSearchProvider.LocalLrcFile => _localizationService.GetLocalizedString("LyricsSearchProviderLocalLrcFile"),
+                    TransliterationSearchProvider.LocalMusicFile => _localizationService.GetLocalizedString("LyricsSearchProviderLocalMusicFile"),
+                    TransliterationSearchProvider.LocalEslrcFile => _localizationService.GetLocalizedString("LyricsSearchProviderEslrcFile"),
+                    TransliterationSearchProvider.LocalTtmlFile => _localizationService.GetLocalizedString("LyricsSearchProviderTtmlFile"),
                     TransliterationSearchProvider.BetterLyrics => "BetterLyrics",
                     TransliterationSearchProvider.CutletDocker => "cutlet-docker",
                     _ => "N/A",

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AutoScanInterval.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum AutoScanInterval
+    {
+        Disabled,
+        Every15Minutes,
+        EveryHour,
+        Every6Hours,
+        Daily
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/FileSourceType.cs

@@ -0,0 +1,10 @@
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum FileSourceType
+    {
+        Local,
+        SMB,
+        FTP,
+        WebDAV
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/StatsRange.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum StatsRange
+    {
+        Today,
+        ThisWeek,
+        ThisMonth,
+        ThisQuarter,
+        ThisYear,
+        Custom
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsDataExtensions.cs

@@ -0,0 +1,123 @@
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Extensions
+{
+    public static class LyricsDataExtensions
+    {
+        extension(LyricsData lyricsData)
+        {
+            public static LyricsData GetLoadingPlaceholder()
+            {
+                return new LyricsData()
+                {
+                    LyricsLines = [
+                        new LyricsLine
+                        {
+                            StartMs = 0,
+                            EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds,
+                            OriginalText = "● ● ●",
+                        },
+                    ],
+                    LanguageCode = "N/A",
+                };
+            }
+
+            public void SetTranslatedText(LyricsData translationData, int toleranceMs = 50)
+            {
+                foreach (var line in lyricsData.LyricsLines)
+                {
+                    // 在翻译歌词中查找与当前行开始时间最接近且在容忍范围内的行
+                    var transLine = translationData.LyricsLines
+                        .FirstOrDefault(t => Math.Abs(t.StartMs - line.StartMs) <= toleranceMs);
+
+                    if (transLine != null)
+                    {
+                        // 此处 transLine.OriginalText 指翻译中的“原文”属性
+                        line.TranslatedText = transLine.OriginalText;
+                    }
+                    else
+                    {
+                        // 没有匹配的翻译
+                        line.TranslatedText = "";
+                    }
+                }
+            }
+
+            public void SetPhoneticText(LyricsData phoneticData, int toleranceMs = 50)
+            {
+                foreach (var line in lyricsData.LyricsLines)
+                {
+                    // 在音译歌词中查找与当前行开始时间最接近且在容忍范围内的行
+                    var transLine = phoneticData.LyricsLines
+                        .FirstOrDefault(t => Math.Abs(t.StartMs - line.StartMs) <= toleranceMs);
+
+                    if (transLine != null)
+                    {
+                        // 此处 transLine.OriginalText 指音译中的“原文”属性
+                        line.PhoneticText = transLine.OriginalText;
+                    }
+                    else
+                    {
+                        // 没有匹配的音译
+                        line.PhoneticText = "";
+                    }
+                }
+            }
+
+            public void SetTranslation(string translation)
+            {
+                List<string> translationArr = translation.Split(StringHelper.NewLine).ToList();
+                int i = 0;
+                foreach (var line in lyricsData.LyricsLines)
+                {
+                    if (i >= translationArr.Count)
+                    {
+                        line.TranslatedText = ""; // No translation available, keep empty
+                    }
+                    else
+                    {
+                        line.TranslatedText = translationArr[i];
+                    }
+                    i++;
+                }
+            }
+
+            public void SetTransliteration(string transliteration)
+            {
+                List<string> transliterationArr = transliteration.Split(StringHelper.NewLine).ToList();
+                int i = 0;
+                foreach (var line in lyricsData.LyricsLines)
+                {
+                    if (i >= transliterationArr.Count)
+                    {
+                        line.PhoneticText = ""; // No transliteration available, keep empty
+                    }
+                    else
+                    {
+                        line.PhoneticText = transliterationArr[i];
+                    }
+                    i++;
+                }
+            }
+
+            public LyricsLine? GetLyricsLine(double sec)
+            {
+                for (int i = 0; i < lyricsData.LyricsLines.Count; i++)
+                {
+                    var line = lyricsData.LyricsLines[i];
+                    if (line.StartMs > sec * 1000)
+                    {
+                        return lyricsData.LyricsLines.ElementAtOrDefault(i - 1);
+                    }
+                }
+                return null;
+            }
+
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/LyricsWindowStatusExtensions.cs

@@ -2,7 +2,7 @@
 using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
-using BetterLyrics.WinUI3.Services.ResourceService;
+using BetterLyrics.WinUI3.Services.LocalizationService;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml;
@@ -12,14 +12,14 @@ namespace BetterLyrics.WinUI3.Extensions
 {
     public static class LyricsWindowStatusExtensions
     {
-        private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
+        private static readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
 
         public static LyricsWindowStatus DesktopMode(Window? window = null)
         {
             window ??= WindowHook.GetWindow<SystemTrayWindow>();
             return new LyricsWindowStatus(window)
             {
-                Name = _resourceService.GetLocalizedString("DesktopMode"),
+                Name = _localizationService.GetLocalizedString("DesktopMode"),
                 LyricsDisplayType = LyricsDisplayType.LyricsOnly,
                 WindowBounds = new Rect(100, 100, 600, 250),
                 IsLocked = true,
@@ -44,7 +44,7 @@ namespace BetterLyrics.WinUI3.Extensions
             window ??= WindowHook.GetWindow<SystemTrayWindow>();
             var status = new LyricsWindowStatus(window)
             {
-                Name = _resourceService.GetLocalizedString("DockedMode"),
+                Name = _localizationService.GetLocalizedString("DockedMode"),
                 IsWorkArea = true,
                 IsAlwaysOnTop = true,
                 IsAlwaysOnTopPolling = true,
@@ -71,7 +71,7 @@ namespace BetterLyrics.WinUI3.Extensions
             window ??= WindowHook.GetWindow<SystemTrayWindow>();
             var status = new LyricsWindowStatus(window)
             {
-                Name = _resourceService.GetLocalizedString("FullscreenMode"),
+                Name = _localizationService.GetLocalizedString("FullscreenMode"),
                 LyricsLayoutOrientation = LyricsLayoutOrientation.Vertical,
                 LyricsStyleSettings = new LyricsStyleSettings
                 {
@@ -93,7 +93,7 @@ namespace BetterLyrics.WinUI3.Extensions
             window ??= WindowHook.GetWindow<SystemTrayWindow>();
             return new LyricsWindowStatus(window)
             {
-                Name = _resourceService.GetLocalizedString("StandardMode"),
+                Name = _localizationService.GetLocalizedString("StandardMode"),
             };
         }
 
@@ -102,7 +102,7 @@ namespace BetterLyrics.WinUI3.Extensions
             window ??= WindowHook.GetWindow<SystemTrayWindow>();
             return new LyricsWindowStatus(window)
             {
-                Name = _resourceService.GetLocalizedString("NarrowMode"),
+                Name = _localizationService.GetLocalizedString("NarrowMode"),
                 WindowBounds = new Rect(100, 100, 400, 800),
                 LyricsLayoutOrientation = LyricsLayoutOrientation.Vertical,
             };
@@ -113,7 +113,7 @@ namespace BetterLyrics.WinUI3.Extensions
             window ??= WindowHook.GetWindow<SystemTrayWindow>();
             return new LyricsWindowStatus(window)
             {
-                Name = _resourceService.GetLocalizedString("TaskbarMode"),
+                Name = _localizationService.GetLocalizedString("TaskbarMode"),
                 LyricsDisplayType = LyricsDisplayType.LyricsOnly,
                 IsPinToTaskbar = true,
                 IsLocked = true,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/SongInfoExtensions.cs

@@ -1,4 +1,5 @@
 using BetterLyrics.WinUI3.Models;
+using System;
 
 namespace BetterLyrics.WinUI3.Extensions
 {
@@ -30,6 +31,22 @@ namespace BetterLyrics.WinUI3.Extensions
                 songInfo.Album = value;
                 return songInfo;
             }
+
+            public PlayHistoryItem? ToPlayHistoryItem(double actualPlayedMs)
+            {
+                if (songInfo == null) return null;
+
+                return new PlayHistoryItem
+                {
+                    Title = songInfo.Title,
+                    Artist = songInfo.DisplayArtists,
+                    Album = songInfo.Album,
+                    PlayerId = songInfo.PlayerId ?? "N/A",
+                    TotalDurationMs = songInfo.DurationMs,
+                    DurationPlayedMs = actualPlayedMs,
+                    StartedAt = DateTime.Now.AddMilliseconds(-actualPlayedMs)
+                };
+            }
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/TrackExtensions.cs

@@ -1,33 +0,0 @@
-using ATL;
-using System.IO;
-
-namespace BetterLyrics.WinUI3.Extensions
-{
-    public static class TrackExtensions
-    {
-        extension(Track track)
-        {
-            public string GetParentFolderName() => Directory.GetParent(track.Path)?.Name ?? "";
-
-            public string GetParentFolderPath() => Directory.GetParent(track.Path)?.FullName ?? "";
-
-            public string GetRawLyrics()
-            {
-                if (track.Path is string path)
-                {
-                    try
-                    {
-                        return TagLib.File.Create(path).Tag.Lyrics;
-                    }
-                    catch (System.Exception)
-                    {
-                        return "";
-                    }
-                }
-                return "";
-            }
-
-            public string GetFileName() => Path.GetFileName(track.Path);
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/WindowExtensions.cs

@@ -1,6 +1,6 @@
 using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Services.ResourceService;
+using BetterLyrics.WinUI3.Services.LocalizationService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
@@ -9,16 +9,24 @@ namespace BetterLyrics.WinUI3.Extensions
 {
     public static class WindowExtensions
     {
-        private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
+        private static readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
 
         extension(Window window)
         {
             public void Init(
-                string titleKey,
+                string titleKey = "",
+                string title = "",
                 TitleBarHeightOption titleBarHeightOption = TitleBarHeightOption.Standard,
                 BackdropType backdropType = BackdropType.DesktopAcrylic)
             {
-                window.Title = _resourceService.GetLocalizedString(titleKey);
+                if (titleKey != "")
+                {
+                    window.Title = _localizationService.GetLocalizedString(titleKey);
+                }
+                if (title != "")
+                {
+                    window.Title = title;
+                }
                 window.AppWindow.TitleBar.PreferredTheme = TitleBarTheme.UseDefaultAppMode;
                 window.AppWindow.SetIcons();
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ColorHelper.cs

@@ -4,6 +4,7 @@ using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Hooks;
 using Microsoft.UI;
 using Microsoft.UI.Xaml;
+using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.Drawing.Imaging;
@@ -15,6 +16,16 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public static class ColorHelper
     {
+        public static Color GetSystemAccentColor()
+        {
+            if (Application.Current.Resources.TryGetValue("SystemAccentColor", out var resource) &&
+                resource is Color uiColor)
+            {
+                return uiColor;
+            }
+            return Color.FromArgb(255, 0, 120, 215);
+        }
+
         public static ElementTheme GetElementThemeFromBackgroundColor(Color backgroundColor)
         {
             // 计算亮度（YIQ公式）

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs

@@ -5,8 +5,11 @@ using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Serialization;
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 using Ude;
 
 namespace BetterLyrics.WinUI3.Helper
@@ -27,6 +30,18 @@ namespace BetterLyrics.WinUI3.Helper
             return Encoding.GetEncoding(encoding);
         }
 
+        public static async Task CopyFileAsync(string sourcePath, string destinationPath)
+        {
+            var dir = Path.GetDirectoryName(destinationPath);
+            if (!Directory.Exists(dir)) Directory.CreateDirectory(dir);
+
+            using (var sourceStream = new FileStream(sourcePath, FileMode.Open, FileAccess.Read, FileShare.Read))
+            using (var destinationStream = new FileStream(destinationPath, FileMode.Create, FileAccess.Write, FileShare.None))
+            {
+                await sourceStream.CopyToAsync(destinationStream);
+            }
+        }
+
         public static string SanitizeFileName(string fileName, char replacement = '_')
         {
             var invalidChars = Path.GetInvalidFileNameChars();
@@ -86,5 +101,15 @@ namespace BetterLyrics.WinUI3.Helper
             ".wav", ".aiff", ".aif", ".pcm", ".cda", ".dsf", ".dff", ".au", ".snd",
             ".mid", ".midi", ".mod", ".xm", ".it", ".s3m"
         };
+
+        public static readonly string[] LyricExtensions =
+            Enum.GetValues(typeof(LyricsSearchProvider)).Cast<LyricsSearchProvider>()
+            .Where(x => x.IsLocal())
+            .Select(x => x.GetLyricsFormat())
+            .Where(x => x != LyricsFormat.NotSpecified)
+            .Select(x => x.ToFileExtension())
+            .ToArray();
+
+        public static readonly HashSet<string> AllSupportedExtensions = new(MusicExtensions.Union(LyricExtensions));
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FolderTreeBuilder.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Collections.ObjectModel;
+using BetterLyrics.WinUI3.Models;
+
+public static class FolderTreeBuilder
+{
+    public static ObservableCollection<FolderNode> Build(List<ExtendedTrack> tracks, List<MediaFolder> folderConfigs)
+    {
+        var rootNodes = new ObservableCollection<FolderNode>();
+
+        // 按 MediaFolderId 分组
+        var folderGroups = tracks.GroupBy(t => t.MediaFolderId);
+
+        foreach (var group in folderGroups)
+        {
+            var config = folderConfigs.FirstOrDefault(f => f.Id == group.Key);
+            if (config == null) continue;
+
+            string baseUri = config.GetStandardUri().AbsoluteUri.TrimEnd('/');
+
+            var rootNode = new FolderNode
+            {
+                SourceType = config.SourceType,
+                FolderName = config.Name ?? config.ConnectionSummary, // 显示用户自定义的名字
+                MediaFolderId = group.Key,
+                FolderPath = baseUri,
+                IsExpanded = true
+            };
+
+            foreach (var track in group)
+            {
+                try
+                {
+                    if (!track.Uri.StartsWith(baseUri)) continue; // 防御性编程
+
+                    string relativePart = track.Uri.Substring(baseUri.Length);
+
+                    var segments = relativePart
+                        .Split('/', StringSplitOptions.RemoveEmptyEntries)
+                        .Select(s => System.Net.WebUtility.UrlDecode(s))
+                        .ToArray();
+
+                    if (segments.Length > 1) // 长度大于1说明在子文件夹里
+                    {
+                        var folderSegments = segments.Take(segments.Length - 1).ToArray();
+                        CreateFolderStructure(rootNode, folderSegments, baseUri);
+                    }
+                }
+                catch { }
+            }
+
+            rootNodes.Add(rootNode);
+        }
+
+        return rootNodes;
+    }
+
+    private static void CreateFolderStructure(FolderNode parent, string[] segments, string rootBaseUri)
+    {
+        var current = parent;
+        string currentFullPath = parent.FolderPath;
+
+        foreach (var segmentName in segments)
+        {
+            var existingChild = current.SubFolders.FirstOrDefault(f => f.FolderName == segmentName);
+
+            currentFullPath += "/" + System.Net.WebUtility.UrlEncode(segmentName);
+
+            if (existingChild == null)
+            {
+                var newFolder = new FolderNode
+                {
+                    FolderName = segmentName,
+                    FolderPath = currentFullPath, // 存完整的 URI
+                    MediaFolderId = parent.MediaFolderId
+                };
+                current.SubFolders.Add(newFolder);
+                current = newFolder;
+            }
+            else
+            {
+                current = existingChild;
+                currentFullPath = existingChild.FolderPath;
+            }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FontHelper.cs

@@ -1,8 +1,6 @@
-using Microsoft.Graphics.Canvas.Text;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Windows.Documents;
 using System.Windows.Markup;
 using System.Windows.Media;
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/LanguageHelper.cs

@@ -1,8 +1,10 @@
 using BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Services.ResourceService;
+using BetterLyrics.WinUI3.Services.LocalizationService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using NTextCat;
 using System.Collections.Generic;
+using System.ComponentModel.Design;
+using System.Globalization;
 using System.Linq;
 using Windows.Globalization;
 
@@ -10,9 +12,9 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public class LanguageHelper
     {
+        private static readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
         private static readonly RankedLanguageIdentifierFactory _factory = new();
         private static readonly RankedLanguageIdentifier _identifier;
-        private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
 
         public const string ChineseCode = "zh";
         public const string JapaneseCode = "ja";
@@ -92,12 +94,23 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static List<ExtendedLanguage> SupportedDisplayLanguages { get; set; } =
         [
-            new ExtendedLanguage("", _resourceService.GetLocalizedString("SettingsPageSystemLanguage")),
-            new ExtendedLanguage("en-US", "English"),
-            new ExtendedLanguage("ja-JP"),
-            new ExtendedLanguage("ko-KR"),
-            new ExtendedLanguage("zh-CN", "简体中文"),
-            new ExtendedLanguage("zh-TW", "繁體中文"),
+            new ExtendedLanguage(CultureInfo.CurrentUICulture.Name, _localizationService.GetLocalizedString("SettingsPageSystemLanguage")),
+            new ExtendedLanguage("ar"),
+            new ExtendedLanguage("de"),
+            new ExtendedLanguage("en"),
+            new ExtendedLanguage("es"),
+            new ExtendedLanguage("fr"),
+            new ExtendedLanguage("hi"),
+            new ExtendedLanguage("id"),
+            new ExtendedLanguage("ja"),
+            new ExtendedLanguage("ko"),
+            new ExtendedLanguage("ms"),
+            new ExtendedLanguage("pt"),
+            new ExtendedLanguage("ru"),
+            new ExtendedLanguage("th"),
+            new ExtendedLanguage("vi"),
+            new ExtendedLanguage("zh-Hans"),
+            new ExtendedLanguage("zh-Hant"),
         ];
 
         static LanguageHelper()
@@ -107,7 +120,7 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static string? DetectLanguageCode(string? text)
         {
-            if (text == null) return null;
+            if (string.IsNullOrWhiteSpace(text)) return null;
             var guessList = _identifier.Identify(text);
             string? code = guessList?.FirstOrDefault()?.Item1.Iso639_2T;
             code = code switch

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PaletteHelper.cs

@@ -1,4 +1,5 @@
 using ColorThiefDotNet;
+using CommunityToolkit.WinUI.Helpers;
 using Impressionist.Abstractions;
 using Impressionist.Implementations;
 using System;
@@ -50,7 +51,29 @@ namespace BetterLyrics.WinUI3.Helper
             return paletteResult;
         }
 
-        public static async Task<Dictionary<Vector3, int>> GetPixelColor(BitmapDecoder bitmapDecoder)
+        public static List<Windows.UI.Color> GenerateChartColors(Windows.UI.Color baseColor, int count)
+        {
+            List<Windows.UI.Color> results = [];
+
+            var baseHsl = baseColor.ToHsl();
+            double baseHue = baseHsl.H;
+            double baseSaturation = baseHsl.S;
+            double baseBrightness = baseHsl.L;
+
+            double step = 360.0 / count;
+
+            for (int i = 0; i < count; i++)
+            {
+                double newHue = (baseHue + (step * i)) % 360;
+
+                Windows.UI.Color newColor = CommunityToolkit.WinUI.Helpers.ColorHelper.FromHsl(newHue, baseSaturation, baseBrightness);
+                results.Add(newColor);
+            }
+
+            return results;
+        }
+
+        private static async Task<Dictionary<Vector3, int>> GetPixelColor(BitmapDecoder bitmapDecoder)
         {
             var pixelDataProvider = await bitmapDecoder.GetPixelDataAsync();
             var pixels = pixelDataProvider.DetachPixelData();

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PasswordVaultHelper.cs

@@ -1,4 +1,5 @@
-using Windows.Security.Credentials;
+using System;
+using Windows.Security.Credentials;
 
 namespace BetterLyrics.WinUI3.Helper
 {
@@ -12,23 +13,13 @@ namespace BetterLyrics.WinUI3.Helper
         /// <param name="value">要保存的值</param>
         public static void Save(string resource, string key, string value)
         {
-            // 删除旧值（避免重复存储）
             try
             {
                 var vault = new PasswordVault();
 
-                var oldCredential = vault.Retrieve(resource, key);
-                if (oldCredential != null)
-                {
-                    vault.Remove(oldCredential);
-                }
-
                 vault.Add(new PasswordCredential(resource, key, value));
             }
-            catch
-            {
-                // 没有旧值就忽略
-            }
+            catch (Exception) { }
         }
 
         /// <summary>
@@ -47,7 +38,7 @@ namespace BetterLyrics.WinUI3.Helper
                 credential.RetrievePassword();
                 return credential.Password;
             }
-            catch
+            catch (Exception)
             {
                 return null;
             }
@@ -65,10 +56,7 @@ namespace BetterLyrics.WinUI3.Helper
                 var credential = vault.Retrieve(resource, key);
                 vault.Remove(credential);
             }
-            catch
-            {
-                // 不存在就忽略
-            }
+            catch (Exception) { }
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PathHelper.cs

@@ -33,6 +33,7 @@ namespace BetterLyrics.WinUI3.Helper
         public static string SaltPlayerForWindowsLogoPath => Path.Combine(AssetsFolder, "SaltPlayerForWindows.png");
         public static string MoeKoeMusicLogoPath => Path.Combine(AssetsFolder, "MoeKoeMusic.png");
         public static string Listen1LogoPath => Path.Combine(AssetsFolder, "Listen1.png");
+        public static string OriginalSoundHQPlayerLogoPath => Path.Combine(AssetsFolder, "OriginalSoundHQPlayer.png");
         public static string UnknownPlayerLogoPath => Path.Combine(AssetsFolder, "Question.png");
 
         public static string LogDirectory => Path.Combine(CacheFolder, "logs");
@@ -54,8 +55,11 @@ namespace BetterLyrics.WinUI3.Helper
 
         public static string AlbumArtCacheDirectory => Path.Combine(CacheFolder, "album-art");
         public static string iTunesAlbumArtCacheDirectory => Path.Combine(AlbumArtCacheDirectory, "itunes");
+        public static string LocalAlbumArtCacheDirectory => Path.Combine(AlbumArtCacheDirectory, "local");
 
-        public static string PlayQueuePath => Path.Combine(CacheFolder, "play-queue.m3u");
+        public static string PlayQueuePath => Path.Combine(LocalFolder, "play-queue.m3u");
+        public static string PlayHistoryPath => Path.Combine(LocalFolder, "play-history.db");
+        public static string FilesIndexPath => Path.Combine(LocalFolder, "files-index.db");
 
         public static void EnsureDirectories()
         {
@@ -75,6 +79,7 @@ namespace BetterLyrics.WinUI3.Helper
             Directory.CreateDirectory(LocalTtmlCacheDirectory);
 
             Directory.CreateDirectory(iTunesAlbumArtCacheDirectory);
+            Directory.CreateDirectory(LocalAlbumArtCacheDirectory);
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PhoneticHelper.cs

@@ -1,4 +1,4 @@
-using BetterLyrics.WinUI3.Services.ResourceService;
+using BetterLyrics.WinUI3.Services.LocalizationService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using System;
 
@@ -6,7 +6,7 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public static class PhoneticHelper
     {
-        private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
+        private static readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
 
         public const string PinyinCode = "zh-cmn-pinyin";
         public const string JyutpingCode = "zh-yue-jyutping";
@@ -22,11 +22,11 @@ namespace BetterLyrics.WinUI3.Helper
             switch (code)
             {
                 case PinyinCode:
-                    return _resourceService.GetLocalizedString("Pinyin");
+                    return _localizationService.GetLocalizedString("Pinyin");
                 case JyutpingCode:
-                    return _resourceService.GetLocalizedString("Jyutping");
+                    return _localizationService.GetLocalizedString("Jyutping");
                 case RomanCode:
-                    return _resourceService.GetLocalizedString("Romaji");
+                    return _localizationService.GetLocalizedString("Romaji");
                 default:
                     throw new ArgumentOutOfRangeException(nameof(code));
             }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PickerHelper.cs

@@ -45,6 +45,12 @@ namespace BetterLyrics.WinUI3.Helper
         public static async Task<StorageFile?> PickSaveFileAsync<T>(IDictionary<string, IList<string>> fileTypeChoices)
         {
             var window = WindowHook.GetWindow<T>();
+
+            return await PickSaveFileAsync(window, fileTypeChoices);
+        }
+
+        public static async Task<StorageFile?> PickSaveFileAsync<T>(T? window, IDictionary<string, IList<string>> fileTypeChoices)
+        {
             if (window == null) return null;
 
             var picker = new Windows.Storage.Pickers.FileSavePicker();

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PlayerIDHelper.cs

@@ -4,7 +4,7 @@ using System.Text.RegularExpressions;
 
 namespace BetterLyrics.WinUI3.Helper
 {
-    public static class PlayerIDHelper
+    public static class PlayerIdHelper
     {
         private static readonly List<string> neteaseFamilyRegex =
         [
@@ -25,64 +25,66 @@ namespace BetterLyrics.WinUI3.Helper
             return false;
         }
 
-        public static bool IsLXMusic(string? id) => id is PlayerID.LXMusic or PlayerID.LXMusicPortable;
+        public static bool IsLXMusic(string? id) => id is PlayerId.LXMusic or PlayerId.LXMusicPortable;
 
-        public static bool IsAppleMusic(string? id) => id is PlayerID.AppleMusic or PlayerID.AppleMusicAlternative;
+        public static bool IsAppleMusic(string? id) => id is PlayerId.AppleMusic or PlayerId.AppleMusicAlternative;
 
-        public static bool IsBetterLyrics(string? id) => id is PlayerID.BetterLyrics or PlayerID.BetterLyricsDebug;
+        public static bool IsBetterLyrics(string? id) => id is PlayerId.BetterLyrics or PlayerId.BetterLyricsDebug;
 
         public static string? GetDisplayName(string? id) => id switch
         {
-            PlayerID.Spotify => PlayerName.Spotify,
-            PlayerID.AppleMusic => PlayerName.AppleMusic,
-            PlayerID.iTunes => PlayerName.iTunes,
-            PlayerID.KugouMusic => PlayerName.KugouMusic,
-            PlayerID.NetEaseCloudMusic => PlayerName.NetEaseCloudMusic,
-            PlayerID.QQMusic => PlayerName.QQMusic,
-            PlayerID.LXMusic => PlayerName.LXMusic,
-            PlayerID.LXMusicPortable => PlayerName.LXMusicPortable,
-            PlayerID.MediaPlayerWindows11 => PlayerName.MediaPlayerWindows11,
-            PlayerID.AIMP => PlayerName.AIMP,
-            PlayerID.Foobar2000 => PlayerName.Foobar2000,
-            PlayerID.MusicBee => PlayerName.MusicBee,
-            PlayerID.PotPlayer => PlayerName.PotPlayer,
-            PlayerID.Chrome => PlayerName.Chrome,
-            PlayerID.Edge => PlayerName.Edge,
-            PlayerID.BetterLyrics => PlayerName.BetterLyrics,
-            PlayerID.BetterLyricsDebug => PlayerName.BetterLyricsDebug,
-            PlayerID.SaltPlayerForWindowsMS => PlayerName.SaltPlayerForWindowsMS,
-            PlayerID.SaltPlayerForWindowsSteam => PlayerName.SaltPlayerForWindowsSteam,
-            PlayerID.MoeKoeMusic => PlayerName.MoeKoeMusic,
-            PlayerID.MoeKoeMusicAlternative => PlayerName.MoeKoeMusic,
-            PlayerID.Listen1 => PlayerName.Listen1,
+            PlayerId.Spotify => PlayerName.Spotify,
+            PlayerId.AppleMusic => PlayerName.AppleMusic,
+            PlayerId.iTunes => PlayerName.iTunes,
+            PlayerId.KugouMusic => PlayerName.KugouMusic,
+            PlayerId.NetEaseCloudMusic => PlayerName.NetEaseCloudMusic,
+            PlayerId.QQMusic => PlayerName.QQMusic,
+            PlayerId.LXMusic => PlayerName.LXMusic,
+            PlayerId.LXMusicPortable => PlayerName.LXMusicPortable,
+            PlayerId.MediaPlayerWindows11 => PlayerName.MediaPlayerWindows11,
+            PlayerId.AIMP => PlayerName.AIMP,
+            PlayerId.Foobar2000 => PlayerName.Foobar2000,
+            PlayerId.MusicBee => PlayerName.MusicBee,
+            PlayerId.PotPlayer => PlayerName.PotPlayer,
+            PlayerId.Chrome => PlayerName.Chrome,
+            PlayerId.Edge => PlayerName.Edge,
+            PlayerId.BetterLyrics => PlayerName.BetterLyrics,
+            PlayerId.BetterLyricsDebug => PlayerName.BetterLyricsDebug,
+            PlayerId.SaltPlayerForWindowsMS => PlayerName.SaltPlayerForWindowsMS,
+            PlayerId.SaltPlayerForWindowsSteam => PlayerName.SaltPlayerForWindowsSteam,
+            PlayerId.MoeKoeMusic => PlayerName.MoeKoeMusic,
+            PlayerId.MoeKoeMusicAlternative => PlayerName.MoeKoeMusic,
+            PlayerId.Listen1 => PlayerName.Listen1,
+            PlayerId.OriginalSoundHQPlayer => PlayerName.OriginalSoundHQPlayer,
             _ => id,
         };
 
         public static string GetLogoPath(string? id) => id switch
         {
-            PlayerID.Spotify => PathHelper.SpotifyLogoPath,
-            PlayerID.AppleMusic => PathHelper.AppleMusicLogoPath,
-            PlayerID.AppleMusicAlternative => PathHelper.AppleMusicLogoPath,
-            PlayerID.iTunes => PathHelper.iTunesLogoPath,
-            PlayerID.KugouMusic => PathHelper.KugouMusicLogoPath,
-            PlayerID.NetEaseCloudMusic => PathHelper.NetEaseCloudMusicLogoPath,
-            PlayerID.QQMusic => PathHelper.QQMusicLogoPath,
-            PlayerID.LXMusic => PathHelper.LXMusicLogoPath,
-            PlayerID.LXMusicPortable => PathHelper.LXMusicLogoPath,
-            PlayerID.MediaPlayerWindows11 => PathHelper.MediaPlayerWindows11LogoPath,
-            PlayerID.AIMP => PathHelper.AIMPLogoPath,
-            PlayerID.Foobar2000 => PathHelper.Foobar2000LogoPath,
-            PlayerID.MusicBee => PathHelper.MusicBeeLogoPath,
-            PlayerID.PotPlayer => PathHelper.PotPlayerLogoPath,
-            PlayerID.Chrome => PathHelper.ChromeLogoPath,
-            PlayerID.Edge => PathHelper.EdgeLogoPath,
-            PlayerID.BetterLyrics => PathHelper.LogoPath,
-            PlayerID.BetterLyricsDebug => PathHelper.LogoPath,
-            PlayerID.SaltPlayerForWindowsMS => PathHelper.SaltPlayerForWindowsLogoPath,
-            PlayerID.SaltPlayerForWindowsSteam => PathHelper.SaltPlayerForWindowsLogoPath,
-            PlayerID.MoeKoeMusic => PathHelper.MoeKoeMusicLogoPath,
-            PlayerID.MoeKoeMusicAlternative => PathHelper.MoeKoeMusicLogoPath,
-            PlayerID.Listen1 => PathHelper.Listen1LogoPath,
+            PlayerId.Spotify => PathHelper.SpotifyLogoPath,
+            PlayerId.AppleMusic => PathHelper.AppleMusicLogoPath,
+            PlayerId.AppleMusicAlternative => PathHelper.AppleMusicLogoPath,
+            PlayerId.iTunes => PathHelper.iTunesLogoPath,
+            PlayerId.KugouMusic => PathHelper.KugouMusicLogoPath,
+            PlayerId.NetEaseCloudMusic => PathHelper.NetEaseCloudMusicLogoPath,
+            PlayerId.QQMusic => PathHelper.QQMusicLogoPath,
+            PlayerId.LXMusic => PathHelper.LXMusicLogoPath,
+            PlayerId.LXMusicPortable => PathHelper.LXMusicLogoPath,
+            PlayerId.MediaPlayerWindows11 => PathHelper.MediaPlayerWindows11LogoPath,
+            PlayerId.AIMP => PathHelper.AIMPLogoPath,
+            PlayerId.Foobar2000 => PathHelper.Foobar2000LogoPath,
+            PlayerId.MusicBee => PathHelper.MusicBeeLogoPath,
+            PlayerId.PotPlayer => PathHelper.PotPlayerLogoPath,
+            PlayerId.Chrome => PathHelper.ChromeLogoPath,
+            PlayerId.Edge => PathHelper.EdgeLogoPath,
+            PlayerId.BetterLyrics => PathHelper.LogoPath,
+            PlayerId.BetterLyricsDebug => PathHelper.LogoPath,
+            PlayerId.SaltPlayerForWindowsMS => PathHelper.SaltPlayerForWindowsLogoPath,
+            PlayerId.SaltPlayerForWindowsSteam => PathHelper.SaltPlayerForWindowsLogoPath,
+            PlayerId.MoeKoeMusic => PathHelper.MoeKoeMusicLogoPath,
+            PlayerId.MoeKoeMusicAlternative => PathHelper.MoeKoeMusicLogoPath,
+            PlayerId.Listen1 => PathHelper.Listen1LogoPath,
+            PlayerId.OriginalSoundHQPlayer => PathHelper.OriginalSoundHQPlayerLogoPath,
             _ => PathHelper.UnknownPlayerLogoPath,
         };
     }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/StreamFileAbstraction.cs

@@ -0,0 +1,43 @@
+using System;
+using System.IO;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public class StreamFileAbstraction : TagLib.File.IFileAbstraction
+    {
+        private readonly string _name;
+        private readonly Stream _stream;
+        private readonly bool _closeStreamOnDispose;
+
+        public StreamFileAbstraction(string path, Stream? stream, bool closeStreamOnDispose = false)
+        {
+            _name = Path.GetFileName(path);
+            _stream = stream ?? throw new ArgumentNullException(nameof(stream));
+            _closeStreamOnDispose = closeStreamOnDispose;
+        }
+
+        public string Name => _name;
+
+        public Stream ReadStream => _stream;
+
+        public Stream WriteStream
+        {
+            get
+            {
+                if (_stream.CanWrite)
+                {
+                    return _stream;
+                }
+                throw new InvalidOperationException("The underlying stream is read-only. Tag saving is not supported for this source.");
+            }
+        }
+
+        public void CloseStream(Stream stream)
+        {
+            if (_closeStreamOnDispose)
+            {
+                stream?.Dispose();
+            }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/ToastHelper.cs

@@ -1,4 +1,4 @@
-using BetterLyrics.WinUI3.Services.ResourceService;
+using BetterLyrics.WinUI3.Services.LocalizationService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.Windows.AppNotifications;
@@ -8,12 +8,12 @@ namespace BetterLyrics.WinUI3.Helper
 {
     public class ToastHelper
     {
-        private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
+        private static readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
 
         public static void ShowToast(string localizedTitleKey, string? description, InfoBarSeverity severity)
         {
             AppNotification notification = new AppNotificationBuilder()
-                .AddText(_resourceService.GetLocalizedString(localizedTitleKey))
+                .AddText(_localizationService.GetLocalizedString(localizedTitleKey))
                 .AddText(description)
                 .BuildNotification();
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/WebDavProbeHelper.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Helper
+{
+    public static class WebDavProbeHelper
+    {
+        /// <summary>
+        /// 自动检测目标主机是 HTTP 还是 HTTPS
+        /// </summary>
+        /// <returns>返回 "https" 或 "http"，如果都连不上返回 null</returns>
+        public static async Task<string?> DetectSchemeAsync(string host, int port, string? path, string? user, string? pwd)
+        {
+            if (port == 443) return "https";
+            if (port == 80) return "http";
+
+            // 忽略 SSL 证书错误，因为很多 NAS 是自签名的
+            var handler = new HttpClientHandler
+            {
+                ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true,
+                UseProxy = false
+            };
+
+            // 设置认证
+            if (!string.IsNullOrEmpty(user) && !string.IsNullOrEmpty(pwd))
+            {
+                handler.Credentials = new NetworkCredential(user, pwd);
+                handler.PreAuthenticate = true;
+            }
+
+            using var client = new HttpClient(handler);
+            client.Timeout = TimeSpan.FromSeconds(3);
+
+            if (await ProbeUrlAsync(client, "https", host, port, path))
+            {
+                return "https";
+            }
+
+            if (await ProbeUrlAsync(client, "http", host, port, path))
+            {
+                return "http";
+            }
+
+            // 都失败
+            return null;
+        }
+
+        private static async Task<bool> ProbeUrlAsync(HttpClient client, string scheme, string host, int port, string? path)
+        {
+            try
+            {
+                var uriBuilder = new UriBuilder(scheme, host, port, path);
+
+                // 使用 PROPFIND 方法，且 Depth 为 0，只检测根节点是否存在，不拉取列表
+                var request = new HttpRequestMessage(new HttpMethod("PROPFIND"), uriBuilder.Uri);
+                request.Headers.Add("Depth", "0");
+
+                var response = await client.SendAsync(request);
+
+                return response.StatusCode != HttpStatusCode.BadRequest;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/SystemVolumeHook.cs

@@ -17,12 +17,20 @@ namespace BetterLyrics.WinUI3.Hooks
 
         static SystemVolumeHook()
         {
-            _deviceEnumerator = new MMDeviceEnumerator();
-            _defaultDevice = _deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
-
-            if (_defaultDevice != null)
+            try
             {
-                _defaultDevice.AudioEndpointVolume.OnVolumeNotification += AudioEndpointVolume_OnVolumeNotification;
+                _deviceEnumerator = new MMDeviceEnumerator();
+                // 找不到设备会抛出异常，在这里截获它
+                _defaultDevice = _deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
+
+                if (_defaultDevice != null)
+                {
+                    _defaultDevice.AudioEndpointVolume.OnVolumeNotification += AudioEndpointVolume_OnVolumeNotification;
+                }
+            }
+            catch (Exception ex)
+            {
+                _defaultDevice = null;
             }
         }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Hooks/TaskbarHook.cs

@@ -7,6 +7,7 @@ using FlaUI.Core.EventHandlers;
 using FlaUI.UIA3;
 using Microsoft.UI.Dispatching;
 using System;
+using System.Diagnostics;
 using System.Drawing;
 using System.Threading;
 
@@ -186,7 +187,8 @@ namespace BetterLyrics.WinUI3.Hooks
 
                 if (width < 20) return Rectangle.Empty;
 
-                return new Rectangle(finalLeft, taskbarRect.Top, width, taskbarRect.Height);
+                var finalRect = new Rectangle(finalLeft, taskbarRect.Top, width, taskbarRect.Height);
+                return finalRect;
             }
             catch (Exception ex)
             {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsAnimator.cs

@@ -92,27 +92,30 @@ namespace BetterLyrics.WinUI3.Logic
 
                     line.ScaleTransition.SetDuration(yScrollDuration);
                     line.ScaleTransition.SetDelay(yScrollDelay);
-                    line.ScaleTransition.StartTransition(_highlightedScale - distanceFactor * (_highlightedScale - _defaultScale));
+                    line.ScaleTransition.StartTransition(
+                        lyricsEffect.IsLyricsOutOfSightEffectEnabled ?
+                        (_highlightedScale - distanceFactor * (_highlightedScale - _defaultScale)) :
+                        _highlightedScale);
 
                     line.PhoneticOpacityTransition.SetDuration(yScrollDuration);
                     line.PhoneticOpacityTransition.SetDelay(yScrollDelay);
                     line.PhoneticOpacityTransition.StartTransition(
-                        absLineCountDelta == 0 ? phoneticOpacity : (isMouseScrolling ? phoneticOpacity : (1 - distanceFactor) * phoneticOpacity));
+                        CalculateTargetOpacity(phoneticOpacity, phoneticOpacity, distanceFactor, isMouseScrolling, lyricsEffect));
 
                     line.PlayedOriginalOpacityTransition.SetDuration(yScrollDuration);
                     line.PlayedOriginalOpacityTransition.SetDelay(yScrollDelay);
                     line.PlayedOriginalOpacityTransition.StartTransition(
-                        absLineCountDelta == 0 ? 1 : (isMouseScrolling ? 1.0 : (1 - distanceFactor) * originalOpacity));
+                        CalculateTargetOpacity(originalOpacity, 1.0, distanceFactor, isMouseScrolling, lyricsEffect));
 
                     line.UnplayedOriginalOpacityTransition.SetDuration(yScrollDuration);
                     line.UnplayedOriginalOpacityTransition.SetDelay(yScrollDelay);
                     line.UnplayedOriginalOpacityTransition.StartTransition(
-                        absLineCountDelta == 0 ? originalOpacity : (isMouseScrolling ? originalOpacity : (1 - distanceFactor) * originalOpacity));
+                        CalculateTargetOpacity(originalOpacity, originalOpacity, distanceFactor, isMouseScrolling, lyricsEffect));
 
                     line.TranslatedOpacityTransition.SetDuration(yScrollDuration);
                     line.TranslatedOpacityTransition.SetDelay(yScrollDelay);
                     line.TranslatedOpacityTransition.StartTransition(
-                        absLineCountDelta == 0 ? translatedOpacity : (isMouseScrolling ? translatedOpacity : (1 - distanceFactor) * translatedOpacity));
+                        CalculateTargetOpacity(translatedOpacity, translatedOpacity, distanceFactor, isMouseScrolling, lyricsEffect));
 
                     line.ColorTransition.SetDuration(yScrollDuration);
                     line.ColorTransition.SetDelay(yScrollDelay);
@@ -121,8 +124,10 @@ namespace BetterLyrics.WinUI3.Logic
                     line.AngleTransition.SetEasingType(canvasYScrollTransition.EasingType);
                     line.AngleTransition.SetDuration(yScrollDuration);
                     line.AngleTransition.SetDelay(yScrollDelay);
-                    line.AngleTransition.StartTransition(lyricsEffect.IsFanLyricsEnabled ?
-                        Math.PI * (lyricsEffect.FanLyricsAngle / 180.0) * distanceFactor * (i > playingLineIndex ? 1 : -1) : 0);
+                    line.AngleTransition.StartTransition(
+                        (lyricsEffect.IsFanLyricsEnabled && !isMouseScrolling) ?
+                        Math.PI * (lyricsEffect.FanLyricsAngle / 180.0) * distanceFactor * (i > playingLineIndex ? 1 : -1) :
+                        0);
 
                     line.YOffsetTransition.SetEasingType(canvasYScrollTransition.EasingType);
                     line.YOffsetTransition.SetDuration(yScrollDuration);
@@ -143,5 +148,33 @@ namespace BetterLyrics.WinUI3.Logic
                 line.ColorTransition.Update(elapsedTime);
             }
         }
+
+        private static double CalculateTargetOpacity(double baseOpacity, double baseOpacityWhenZeroDistanceFactor, double distanceFactor, bool isMouseScrolling, LyricsEffectSettings lyricsEffect)
+        {
+            double targetOpacity;
+            if (distanceFactor == 0)
+            {
+                targetOpacity = baseOpacityWhenZeroDistanceFactor;
+            }
+            else
+            {
+                if (isMouseScrolling)
+                {
+                    targetOpacity = baseOpacity;
+                }
+                else
+                {
+                    if (lyricsEffect.IsLyricsFadeOutEffectEnabled)
+                    {
+                        targetOpacity = (1 - distanceFactor) * baseOpacity;
+                    }
+                    else
+                    {
+                        targetOpacity = baseOpacity;
+                    }
+                }
+            }
+            return targetOpacity;
+        }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Logic/LyricsLayoutManager.cs

@@ -213,6 +213,17 @@ namespace BetterLyrics.WinUI3.Logic
                 if (value >= mousePosition.Y) { result = mid; right = mid - 1; }
                 else { left = mid + 1; }
             }
+
+            if (result != -1)
+            {
+                var line = lines[result];
+                double lineTopY = offset + line.TopLeftPosition.Y;
+                if (mousePosition.Y < lineTopY)
+                {
+                    result = -1;
+                }
+            }
+
             return result;
         }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/CutletDockerRequest.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace BetterLyrics.WinUI3.Models
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/CutletDockerResponse.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace BetterLyrics.WinUI3.Models
 {

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/FilesIndexDbContext.cs

@@ -0,0 +1,14 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models.Db
+{
+    public partial class FilesIndexDbContext : DbContext
+    {
+        public FilesIndexDbContext(DbContextOptions<FilesIndexDbContext> options) : base(options) { }
+
+        public DbSet<FilesIndexItem> FilesIndex { get; set; }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Db/PlayHistoryDbContext.cs

@@ -0,0 +1,14 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models.Db
+{
+    public partial class PlayHistoryDbContext : DbContext
+    {
+        public PlayHistoryDbContext(DbContextOptions<PlayHistoryDbContext> options) : base(options) { }
+
+        public DbSet<PlayHistoryItem> PlayHistory { get; set; }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs

@@ -0,0 +1,224 @@
+using ATL;
+using BetterLyrics.WinUI3.Helper;
+using System;
+using System.IO;
+using System.Linq;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public class ExtendedTrack
+    {
+        public string Uri { get; private set; } = "";
+
+        public string DecodedAbsoluteUri
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(Uri)) return "";
+                try
+                {
+                    var u = new Uri(Uri);
+                    return u.IsFile ? u.LocalPath : System.Net.WebUtility.UrlDecode(u.AbsoluteUri);
+                }
+                catch { return Uri; }
+            }
+        }
+
+        public string? RawLyrics { get; set; }
+        public string? LocalAlbumArtPath { get; set; }
+        public byte[]? AlbumArtByteArray { get; set; }
+
+        public string ParentFolderName
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(Uri)) return "";
+                try
+                {
+                    // 使用 Uri Segments 安全获取倒数第二层 (文件夹名)
+                    // Segments 示例: "/", "Music/", "Artist/", "Song.mp3"
+                    var u = new System.Uri(Uri);
+                    if (u.Segments.Length > 1)
+                    {
+                        // 取倒数第二个 segment (如果是文件)
+                        // 注意处理末尾斜杠
+                        string folder = u.Segments[u.Segments.Length - 2];
+                        return System.Net.WebUtility.UrlDecode(folder.TrimEnd('/', '\\'));
+                    }
+                    return "";
+                }
+                catch
+                {
+                    return "";
+                }
+            }
+        }
+
+        public string ParentFolderPath
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(Uri)) return "";
+                try
+                {
+                    var u = new System.Uri(Uri);
+                    if (u.IsFile)
+                    {
+                        // 本地文件：返回目录路径 C:\Music
+                        return System.IO.Path.GetDirectoryName(u.LocalPath) ?? "";
+                    }
+                    else
+                    {
+                        // 远程文件：返回去掉文件名的 URI
+                        // new Uri(u, ".") 表示当前目录
+                        return new System.Uri(u, ".").AbsoluteUri;
+                    }
+                }
+                catch
+                {
+                    return "";
+                }
+            }
+        }
+
+        public string FileName
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(Uri)) return "";
+                try
+                {
+                    var u = new System.Uri(Uri);
+                    if (u.IsFile) return System.IO.Path.GetFileName(u.LocalPath);
+
+                    // 远程文件：获取 AbsolutePath 的最后一段并解码
+                    // 例如: /Music/My%20Song.mp3 -> My Song.mp3
+                    string rawName = System.IO.Path.GetFileName(u.AbsolutePath);
+                    return System.Net.WebUtility.UrlDecode(rawName);
+                }
+                catch
+                {
+                    return System.IO.Path.GetFileName(Uri);
+                }
+            }
+        }
+        public string MediaFolderId { get; set; } = "";
+
+        public string Title { get; set; } = "";
+        public string Artist { get; set; } = "";
+        public string Album { get; set; } = "";
+        public int? Year { get; set; }
+        public int Bitrate { get; set; }
+        public double SampleRate { get; set; }
+        public int BitDepth { get; set; }
+        public int Duration { get; set; }
+        public string AudioFormatName { get; set; } = "";
+        public string AudioFormatShortName { get; set; } = "";
+        public string Encoder { get; set; } = "";
+
+
+        public ExtendedTrack() : base() { }
+
+        public ExtendedTrack(string uriString) : base()
+        {
+            Uri = uriString;
+
+            string atlPath = uriString;
+            try
+            {
+                var u = new Uri(uriString);
+                if (u.IsFile) atlPath = u.LocalPath;
+            }
+            catch { }
+
+            // 用于本地文件
+            var track = new Track(atlPath);
+            SetFromTrack(track);
+        }
+
+        public ExtendedTrack(FilesIndexItem? entity, Stream? stream = null) : base()
+        {
+            if (entity == null) return;
+
+            this.MediaFolderId = entity.MediaFolderId;
+            this.Uri = entity.Uri;
+
+            this.Title = entity.Title;
+            this.Artist = entity.Artists;
+            this.Album = entity.Album;
+            this.Year = entity.Year;
+            this.Bitrate = entity.Bitrate;
+            this.SampleRate = entity.SampleRate;
+            this.BitDepth = entity.BitDepth;
+
+            this.Duration = entity.Duration;
+
+            this.AudioFormatName = entity.AudioFormatName;
+            this.AudioFormatShortName = entity.AudioFormatShortName;
+
+            this.Encoder = entity.Encoder;
+
+            this.RawLyrics = entity.EmbeddedLyrics;
+            this.LocalAlbumArtPath = entity.LocalAlbumArtPath;
+
+            if (stream != null)
+            {
+                var track = new Track(stream, Path.GetExtension(FileName));
+                SetFromTrack(track);
+                SetRawLyrics(new StreamFileAbstraction(Uri, stream));
+            }
+        }
+
+        private void SetFromTrack(Track? track)
+        {
+            if (track == null) return;
+
+            this.Title = track.Title;
+            this.Artist = track.Artist;
+            this.Album = track.Album;
+            this.Year = track.Year;
+            this.Bitrate = track.Bitrate;
+            this.SampleRate = track.SampleRate;
+            this.BitDepth = track.BitDepth;
+
+            this.Duration = track.Duration;
+
+            this.AudioFormatName = track.AudioFormat.Name;
+            this.AudioFormatShortName = track.AudioFormat.ShortName;
+
+            this.Encoder = track.Encoder;
+
+            this.AlbumArtByteArray = null;
+
+            if (track.EmbeddedPictures != null && track.EmbeddedPictures.Count > 0)
+            {
+                try
+                {
+                    var validPics = track.EmbeddedPictures.Where(p => p != null).ToList();
+
+                    if (validPics.Count > 0)
+                    {
+                        var cover = validPics.FirstOrDefault(p => p.PicType == PictureInfo.PIC_TYPE.Front);
+
+                        if (cover == null)
+                        {
+                            cover = validPics.First();
+                        }
+
+                        this.AlbumArtByteArray = cover.PictureData;
+                    }
+                }
+                catch (Exception) { }
+            }
+        }
+
+        private void SetRawLyrics(StreamFileAbstraction streamFileAbstraction)
+        {
+            try
+            {
+                RawLyrics = TagLib.File.Create(streamFileAbstraction).Tag.Lyrics;
+            }
+            catch (Exception) { }
+        }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FilesIndexItem.cs

@@ -0,0 +1,67 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    [Index(nameof(MediaFolderId))] // 普通索引
+    [Index(nameof(ParentUri))]     // 普通索引
+    [Index(nameof(Uri), IsUnique = true)] // 唯一索引
+    public class FilesIndexItem
+    {
+        [Key] // 主键
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)] // 明确指定为自增 (Identity)
+        public int Id { get; set; }
+
+        // 关联到 MediaFolder.Id
+        // 注意：作为索引列，必须限制长度，否则 SQL Server 会报错 (索引最大900字节)
+        [MaxLength(450)]
+        public string MediaFolderId { get; set; }
+
+        // 存储父文件夹的标准 URI
+        // 允许为空
+        [MaxLength(450)]
+        public string? ParentUri { get; set; }
+
+        // 唯一索引列
+        // 必须限制长度。450字符 * 2字节/字符 = 900字节 (正好卡在 SQL Server 限制内)
+        [Required]
+        [MaxLength(450)]
+        public string Uri { get; set; }
+
+        public string FileName { get; set; } = "";
+
+        public bool IsDirectory { get; set; }
+
+        public long FileSize { get; set; }
+
+        public DateTime? LastModified { get; set; }
+
+        // 下面的元数据字段通常不需要索引，可以使用 MaxLength 稍微优化空间，
+        // 或者直接留空（默认为 nvarchar(max)）
+        public string Title { get; set; } = "";
+        public string Artists { get; set; } = "";
+        public string Album { get; set; } = "";
+        public int? Year { get; set; }
+        public int Bitrate { get; set; }
+        public double SampleRate { get; set; }
+        public int BitDepth { get; set; }
+        public int Duration { get; set; }
+
+        [MaxLength(50)] // 格式名称通常很短，限制一下是个好习惯
+        public string AudioFormatName { get; set; } = "";
+
+        [MaxLength(20)]
+        public string AudioFormatShortName { get; set; } = "";
+
+        public string Encoder { get; set; } = "";
+
+        // 歌词可能会很长，保留默认的 nvarchar(max) 即可
+        public string? EmbeddedLyrics { get; set; }
+
+        public string? LocalAlbumArtPath { get; set; }
+
+        public bool IsMetadataParsed { get; set; }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FolderNode.cs

@@ -0,0 +1,24 @@
+using BetterLyrics.WinUI3.Enums;
+using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public partial class FolderNode : ObservableObject
+    {
+        public FileSourceType SourceType { get; set; } = FileSourceType.Local;
+
+        public string FolderName { get; set; } = "";
+
+        public string FolderPath { get; set; } = "";
+
+        public string MediaFolderId { get; set; } = "";
+
+        public ObservableCollection<FolderNode> SubFolders { get; set; } = new();
+
+        [ObservableProperty] public partial bool IsExpanded { get; set; }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LocalLyricsFolder.cs

@@ -1,20 +0,0 @@
-// 2025/6/23 by Zhe Fang
-
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public partial class LocalMediaFolder : ObservableRecipient
-    {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsEnabled { get; set; } = true;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsRealTimeWatchEnabled { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string Path { get; set; }
-
-        public LocalMediaFolder() { }
-
-        public LocalMediaFolder(string path)
-        {
-            Path = path;
-        }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LyricsData.cs

@@ -1,5 +1,5 @@
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Services.ResourceService;
+using BetterLyrics.WinUI3.Services.LocalizationService;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using System;
 using System.Collections.Generic;
@@ -9,9 +9,9 @@ namespace BetterLyrics.WinUI3.Models
 {
     public class LyricsData
     {
-        private static readonly IResourceService _resourceService = Ioc.Default.GetRequiredService<IResourceService>();
+        private static readonly ILocalizationService _localizationService = Ioc.Default.GetRequiredService<ILocalizationService>();
 
-        public List<LyricsLine> LyricsLines { get; set; }
+        public List<LyricsLine> LyricsLines { get; set; } = [];
         public string? LanguageCode
         {
             get => field ?? LanguageHelper.DetectLanguageCode(WrappedOriginalText);
@@ -22,7 +22,6 @@ namespace BetterLyrics.WinUI3.Models
 
         public LyricsData()
         {
-            LyricsLines = [];
         }
 
         public LyricsData(List<LyricsLine> lyricsLines)
@@ -30,118 +29,15 @@ namespace BetterLyrics.WinUI3.Models
             LyricsLines = lyricsLines;
         }
 
-        public void SetTranslatedText(LyricsData translationData, int toleranceMs = 50)
-        {
-            foreach (var line in LyricsLines)
-            {
-                // 在翻译歌词中查找与当前行开始时间最接近且在容忍范围内的行
-                var transLine = translationData.LyricsLines
-                    .FirstOrDefault(t => Math.Abs(t.StartMs - line.StartMs) <= toleranceMs);
-
-                if (transLine != null)
-                {
-                    // 此处 transLine.OriginalText 指翻译中的“原文”属性
-                    line.TranslatedText = transLine.OriginalText;
-                }
-                else
-                {
-                    // 没有匹配的翻译
-                    line.TranslatedText = "";
-                }
-            }
-        }
-
-        public void SetPhoneticText(LyricsData phoneticData, int toleranceMs = 50)
-        {
-            foreach (var line in LyricsLines)
-            {
-                // 在音译歌词中查找与当前行开始时间最接近且在容忍范围内的行
-                var transLine = phoneticData.LyricsLines
-                    .FirstOrDefault(t => Math.Abs(t.StartMs - line.StartMs) <= toleranceMs);
-
-                if (transLine != null)
-                {
-                    // 此处 transLine.OriginalText 指音译中的“原文”属性
-                    line.PhoneticText = transLine.OriginalText;
-                }
-                else
-                {
-                    // 没有匹配的音译
-                    line.PhoneticText = "";
-                }
-            }
-        }
-
-        public void SetTranslation(string translation)
-        {
-            List<string> translationArr = translation.Split(StringHelper.NewLine).ToList();
-            int i = 0;
-            foreach (var line in LyricsLines)
-            {
-                if (i >= translationArr.Count)
-                {
-                    line.TranslatedText = ""; // No translation available, keep empty
-                }
-                else
-                {
-                    line.TranslatedText = translationArr[i];
-                }
-                i++;
-            }
-        }
-
-        public void SetTransliteration(string transliteration)
-        {
-            List<string> transliterationArr = transliteration.Split(StringHelper.NewLine).ToList();
-            int i = 0;
-            foreach (var line in LyricsLines)
-            {
-                if (i >= transliterationArr.Count)
-                {
-                    line.PhoneticText = ""; // No transliteration available, keep empty
-                }
-                else
-                {
-                    line.PhoneticText = transliterationArr[i];
-                }
-                i++;
-            }
-        }
-
         public static LyricsData GetNotfoundPlaceholder()
         {
             return new LyricsData([new LyricsLine
             {
                 StartMs = 0,
                 EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds,
-                OriginalText = _resourceService.GetLocalizedString("LyricsNotFound"),
+                OriginalText = _localizationService.GetLocalizedString("LyricsNotFound"),
             }]);
         }
 
-        public static LyricsData GetLoadingPlaceholder()
-        {
-            return new LyricsData([
-                new LyricsLine
-                {
-                    StartMs = 0,
-                    EndMs = (int)TimeSpan.FromMinutes(99).TotalMilliseconds,
-                    OriginalText = "● ● ●",
-                },
-            ]);
-        }
-
-        public LyricsLine? GetLyricsLine(double sec)
-        {
-            for (int i = 0; i < LyricsLines.Count; i++)
-            {
-                var line = LyricsLines[i];
-                if (line.StartMs > sec * 1000)
-                {
-                    return LyricsLines.ElementAtOrDefault(i - 1);
-                }
-            }
-            return null;
-        }
-
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs

@@ -0,0 +1,127 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Services.FileSystemService;
+using BetterLyrics.WinUI3.Services.FileSystemService.Providers;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.UI.Xaml.Controls;
+using System;
+using System.Text.Json.Serialization;
+using System.Threading;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public partial class MediaFolder : ObservableRecipient
+    {
+        [ObservableProperty] public partial string Id { get; set; } = Guid.NewGuid().ToString();
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsEnabled { get; set; } = true;
+
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        [NotifyPropertyChangedFor(nameof(IsLocal))]
+        [NotifyPropertyChangedFor(nameof(ConnectionSummary))]
+        [NotifyPropertyChangedFor(nameof(UriString))]
+        public partial FileSourceType SourceType { get; set; } = FileSourceType.Local;
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string Name { get; set; }
+
+        // 连接属性
+        [ObservableProperty][NotifyPropertyChangedFor(nameof(UriString))] public partial string UserName { get; set; }
+        [ObservableProperty][NotifyPropertyChangedFor(nameof(UriString))] public partial string UriScheme { get; set; }
+        [ObservableProperty][NotifyPropertyChangedFor(nameof(UriString))] public partial string UriHost { get; set; }
+        [ObservableProperty][NotifyPropertyChangedFor(nameof(UriString))] public partial int UriPort { get; set; } = -1;
+
+        [JsonPropertyName("Path")]
+        [ObservableProperty]
+        [NotifyPropertyChangedRecipients]
+        [NotifyPropertyChangedFor(nameof(ConnectionSummary))]
+        [NotifyPropertyChangedFor(nameof(UriString))]
+        public partial string UriPath { get; set; }
+
+        [JsonIgnore] public string Password { get; set; }
+
+        [JsonIgnore] public bool IsLocal => SourceType == FileSourceType.Local;
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsProcessing { get; set; } = false;
+        [ObservableProperty] public partial double IndexingProgress { get; set; } = 0;
+        [ObservableProperty] public partial string StatusText { get; set; } = "";
+        [ObservableProperty] public partial InfoBarSeverity StatusSeverity { get; set; } = InfoBarSeverity.Informational;
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial DateTime? LastSyncTime { get; set; }
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial AutoScanInterval ScanInterval { get; set; } = AutoScanInterval.Disabled;
+
+        public Uri GetStandardUri()
+        {
+            try
+            {
+                if (IsLocal)
+                {
+                    return new Uri(UriPath);
+                }
+
+                var builder = new UriBuilder
+                {
+                    Scheme = UriScheme ?? "file",
+                    Host = UriHost,
+                    Port = UriPort,
+                };
+
+                if (!string.IsNullOrEmpty(UriPath))
+                {
+                    string cleanPath = UriPath.Replace("\\", "/");
+                    if (!cleanPath.StartsWith("/")) cleanPath = "/" + cleanPath;
+                    builder.Path = cleanPath;
+                }
+
+                return builder.Uri;
+            }
+            catch (Exception)
+            {
+                return new Uri("about:blank");
+            }
+        }
+
+        // 例：smb://user@host:445/share/path
+        [JsonIgnore]
+        public string UriString => GetStandardUri().AbsoluteUri;
+
+        [JsonIgnore]
+        public string ConnectionSummary
+        {
+            get
+            {
+                if (IsLocal) return UriPath;
+                return $"{UriScheme}://{UriHost}{(UriPort > 0 ? ":" + UriPort : "")}/{UriPath?.TrimStart('/', '\\')} {(string.IsNullOrEmpty(UserName) ? "" : $"({UserName})")}";
+            }
+        }
+
+        [JsonIgnore] public string VaultKey => $"{Id}-{UserName}";
+
+        public MediaFolder() { }
+
+        public MediaFolder(string path)
+        {
+            UriPath = path;
+            SourceType = FileSourceType.Local;
+        }
+
+        public IUnifiedFileSystem? CreateFileSystem()
+        {
+            if (!IsEnabled) return null;
+            if (string.IsNullOrEmpty(Password) && !IsLocal)
+            {
+                Password = PasswordVaultHelper.Get(Constants.App.AppName, VaultKey) ?? "";
+            }
+
+            return SourceType switch
+            {
+                FileSourceType.Local => new LocalFileSystem(this),
+                FileSourceType.SMB => new SMBFileSystem(this),
+                FileSourceType.FTP => new FTPFileSystem(this),
+                FileSourceType.WebDAV => new WebDavFileSystem(this),
+                _ => throw new NotImplementedException()
+            };
+        }
+
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaSourceProviderInfo.cs

@@ -35,11 +35,11 @@ namespace BetterLyrics.WinUI3.Models
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsSearchType LyricsSearchType { get; set; } = LyricsSearchType.Sequential;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial int MatchingThreshold { get; set; } = 40;
 
-        [JsonIgnore] public string LogoPath => PlayerIDHelper.GetLogoPath(Provider);
+        [JsonIgnore] public string LogoPath => PlayerIdHelper.GetLogoPath(Provider);
 
-        [JsonIgnore] public string? DisplayName => PlayerIDHelper.GetDisplayName(Provider);
+        [JsonIgnore] public string? DisplayName => PlayerIdHelper.GetDisplayName(Provider);
 
-        [JsonIgnore] public bool IsLXMusic => PlayerIDHelper.IsLXMusic(Provider);
+        [JsonIgnore] public bool IsLXMusic => PlayerIdHelper.IsLXMusic(Provider);
 
         public MediaSourceProviderInfo()
         {
@@ -53,7 +53,7 @@ namespace BetterLyrics.WinUI3.Models
             IsEnabled = isEnable;
             switch (provider)
             {
-                case Constants.PlayerID.AppleMusic:
+                case Constants.PlayerId.AppleMusic:
                     // Apple Music 的特性
                     TimelineSyncThreshold = 1000;
                     PositionOffset = 1000;

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayHistoryItem.cs

@@ -0,0 +1,39 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    [Index(nameof(Title))]
+    [Index(nameof(Artist))]
+    [Index(nameof(StartedAt))] // 用于按时间排序查询（如：最近播放）
+    [Index(nameof(PlayerId))]
+    public class PlayHistoryItem
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)] // AutoIncrement
+        public int Id { get; set; }
+
+        // 注意：作为索引列，必须加 MaxLength。
+        // 如果不加，默认为 nvarchar(max)，SQL Server 无法对其建立高效索引。
+        [MaxLength(450)]
+        public string Title { get; set; } = "";
+
+        [MaxLength(450)]
+        public string Artist { get; set; } = "";
+
+        // Album 没有索引，可以不限制长度，或者为了规范也限制一下
+        public string Album { get; set; } = "";
+
+        public DateTime StartedAt { get; set; }
+
+        public double DurationPlayedMs { get; set; }
+
+        public double TotalDurationMs { get; set; }
+
+        // PlayerId 通常是个 GUID 或者短字符串，给 100 长度通常足够了，节省索引空间
+        [MaxLength(100)]
+        public string PlayerId { get; set; } = "";
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayQueueItem.cs

@@ -1,12 +1,10 @@
-using ATL;
-
-namespace BetterLyrics.WinUI3.Models
+namespace BetterLyrics.WinUI3.Models
 {
     public class PlayQueueItem
     {
-        public Track Track { get; set; }
+        public ExtendedTrack Track { get; set; }
 
-        public PlayQueueItem(Track track)
+        public PlayQueueItem(ExtendedTrack track)
         {
             Track = track;
         }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayerStatDisplayItem.cs

@@ -0,0 +1,15 @@
+using BetterLyrics.WinUI3.Helper;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public class PlayerStatDisplayItem
+    {
+        public string PlayerId { get; set; }
+        public int PlayCount { get; set; }
+
+        public string PlayerName => PlayerIdHelper.GetDisplayName(PlayerId);
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AppSettings.cs

@@ -12,7 +12,7 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial MusicGallerySettings MusicGallerySettings { get; set; } = new MusicGallerySettings();
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial AdvancedSettings AdvancedSettings { get; set; } = new AdvancedSettings();
 
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<LocalMediaFolder> LocalMediaFolders { get; set; } = [];
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<MediaFolder> LocalMediaFolders { get; set; } = [];
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<MediaSourceProviderInfo> MediaSourceProvidersInfo { get; set; } = [];
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<MappedSongSearchQuery> MappedSongSearchQueries { get; set; } = [];
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<LyricsWindowStatus> WindowBoundsRecords { get; set; } = [];

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsEffectSettings.cs

@@ -7,6 +7,8 @@ namespace BetterLyrics.WinUI3.Models.Settings
     public partial class LyricsEffectSettings : ObservableRecipient, ICloneable
     {
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsBlurEffectEnabled { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsFadeOutEffectEnabled { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsOutOfSightEffectEnabled { get; set; } = true;
 
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsLyricsGlowEffectEnabled { get; set; } = true;
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial LyricsEffectScope LyricsGlowEffectScope { get; set; } = LyricsEffectScope.LongDurationSyllable;
@@ -52,6 +54,8 @@ namespace BetterLyrics.WinUI3.Models.Settings
             return new LyricsEffectSettings(this.LyricsScrollTopDuration, this.LyricsScrollDuration, this.LyricsScrollBottomDuration, this.LyricsScrollEasingType)
             {
                 IsLyricsBlurEffectEnabled = this.IsLyricsBlurEffectEnabled,
+                IsLyricsFadeOutEffectEnabled = this.IsLyricsFadeOutEffectEnabled,
+                IsLyricsOutOfSightEffectEnabled = this.IsLyricsOutOfSightEffectEnabled,
 
                 IsLyricsGlowEffectEnabled = this.IsLyricsGlowEffectEnabled,
                 LyricsGlowEffectLongSyllableDuration = this.LyricsGlowEffectLongSyllableDuration,

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/LyricsStyleSettings.cs

@@ -1,9 +1,7 @@
 using BetterLyrics.WinUI3.Enums;
-using BetterLyrics.WinUI3.Helper;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.UI;
 using System;
-using System.Linq;
 using Windows.UI;
 
 namespace BetterLyrics.WinUI3.Models.Settings

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/SongsTabInfo.cs

@@ -6,37 +6,18 @@ namespace BetterLyrics.WinUI3.Models
 {
     public partial class SongsTabInfo : BaseViewModel
     {
-        public string Name { get; set; }
+        public string Name { get; set; } = "";
 
-        public string Icon { get; set; }
+        public string Icon { get; set; } = "";
 
-        public bool IsClosable { get; set; }
+        public CommonSongProperty FilterProperty { get; set; } = CommonSongProperty.Title;
 
-        [ObservableProperty]
-        public partial bool IsStarred { get; set; }
+        public string FilterValue { get; set; } = "";
 
-        public CommonSongProperty FilterProperty { get; set; }
-
-        public string FilterValue { get; set; }
+        public bool IsDefault => Icon == "\uE8A9";
 
         public SongsTabInfo()
         {
-            Name = string.Empty;
-            Icon = string.Empty;
-            IsClosable = true;
-            IsStarred = false;
-            FilterProperty = CommonSongProperty.Title;
-            FilterValue = string.Empty;
-        }
-
-        public SongsTabInfo(string name, string icon, bool isClosable, bool isStarred, CommonSongProperty filterProperty, string filterValue)
-        {
-            Name = name;
-            Icon = icon;
-            IsClosable = isClosable;
-            IsStarred = isStarred;
-            FilterProperty = filterProperty;
-            FilterValue = filterValue;
         }
     }
 }

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/ArtistPlayCount.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models.Stats
+{
+    public class ArtistPlayCount
+    {
+        public string Artist { get; set; }
+        public int PlayCount { get; set; }
+        public double TotalDurationSeconds { get; set; }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/HourlyStatBar.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models.Stats
+{
+    public class HourlyStatBar
+    {
+        public int Hour { get; set; }
+        public double NormalizedHeight { get; set; } // 0 - 100，用于UI高度
+        public int RawCount { get; set; } // 实际播放数
+        public string Label { get; set; } // Tooltip: "09:00 - 15 plays"
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/PlayerStats.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models.Stats
+{
+    public class PlayerStats
+    {
+        public string PlayerId { get; set; }
+        public int Count { get; set; }
+
+        public double DisplayWidth => (TotalCount > 0) ? (Count / (double)TotalCount) * 150 : 0;
+
+        public int TotalCount { get; set; }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Stats/SongPlayCount.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models.Stats
+{
+    public class SongPlayCount
+    {
+        public string Title { get; set; }
+        public string Artist { get; set; }
+        public int PlayCount { get; set; }
+    }
+}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/TrimmedTrack.cs

@@ -1,14 +0,0 @@
-namespace BetterLyrics.WinUI3.Models
-{
-    public class TrimmedTrack
-    {
-        public string Title { get; set; }
-        public string Artist { get; set; }
-        public string Album { get; set; }
-        public int? Year { get; set; }
-        public string Genre { get; set; }
-        public string FilePath { get; set; }
-        public int Duration { get; set; }
-        public byte[]? AlbumArt { get; set; }
-    }
-}

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/LyricsRenderer.cs

@@ -233,13 +233,15 @@ namespace BetterLyrics.WinUI3.Renderer
             catch (Exception) { }
         }
 
-        public void CalculateLyrics3DMatrix(LyricsEffectSettings lyricsEffect, double lyricsX, double lyricsY, double lyricsWidth, double canvasHeight)
+        public void CalculateLyrics3DMatrix(LyricsStyleSettings lyricsStyle, LyricsEffectSettings lyricsEffect, double lyricsX, double lyricsY, double lyricsWidth, double lyricsHeight)
         {
             if (!lyricsEffect.Is3DLyricsEnabled) return;
 
+            var playingLineTopOffsetFactor = lyricsStyle.PlayingLineTopOffset / 100.0;
+
             Vector3 center = new(
                 (float)(lyricsX + lyricsWidth / 2),
-                (float)(lyricsY + canvasHeight / 2),
+                (float)(lyricsY + lyricsHeight * playingLineTopOffsetFactor / 2),
                 0);
 
             float rotationX = (float)(Math.PI * lyricsEffect.Lyrics3DXAngle / 180.0);

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Renderer/UnplayingLineRenderer.cs

@@ -63,7 +63,7 @@ namespace BetterLyrics.WinUI3.Renderer
             float blur,
             float opacity)
         {
-            if (opacity <= 0) return;
+            if (float.IsNaN(opacity) || opacity <= 0) return;
 
             var bounds = layout.LayoutBounds;
             var destRect = new Rect(

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/AlbumArtSearchService.cs

@@ -1,8 +1,7 @@
-using ATL;
-using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
-using BetterLyrics.WinUI3.Helper.BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.FileSystemService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using Microsoft.Extensions.Logging;
 using System;
@@ -24,11 +23,13 @@ namespace BetterLyrics.WinUI3.Services.AlbumArtSearchService
         private readonly HttpClient _iTunesHttpClinet;
 
         private readonly ISettingsService _settingsService;
+        private readonly IFileSystemService _fileSystemService;
         private readonly ILogger _logger;
 
-        public AlbumArtSearchService(ISettingsService settingsService, ILogger<AlbumArtSearchService> logger)
+        public AlbumArtSearchService(ISettingsService settingsService, IFileSystemService fileSystemService, ILogger<AlbumArtSearchService> logger)
         {
             _settingsService = settingsService;
+            _fileSystemService = fileSystemService;
             _logger = logger;
             _iTunesHttpClinet = new();
         }
@@ -49,7 +50,7 @@ namespace BetterLyrics.WinUI3.Services.AlbumArtSearchService
                     switch (provider.Provider)
                     {
                         case AlbumArtSearchProvider.Local:
-                            result = SearchFile(songInfo)?.AsBuffer();
+                            result = (await SearchFile(songInfo))?.AsBuffer();
                             break;
                         case AlbumArtSearchProvider.SMTC:
                             result = bufferFromSMTC;
@@ -77,29 +78,57 @@ namespace BetterLyrics.WinUI3.Services.AlbumArtSearchService
             return null;
         }
 
-        private byte[]? SearchFile(SongInfo songInfo)
+        private async Task<byte[]?> SearchFile(SongInfo songInfo)
         {
-            foreach (var folder in _settingsService.AppSettings.LocalMediaFolders)
+            var enabledIds = _settingsService.AppSettings.LocalMediaFolders
+                .Where(f => f.IsEnabled)
+                .Select(f => f.Id)
+                .ToList();
+
+            if (enabledIds.Count == 0) return null;
+
+            var allFiles = await _fileSystemService.GetParsedFilesAsync(enabledIds);
+            allFiles = allFiles.Where(x => FileHelper.MusicExtensions.Contains(Path.GetExtension(x.FileName))).ToList();
+
+            FilesIndexItem? bestMatch = null;
+
+            foreach (var item in allFiles)
             {
-                if (Directory.Exists(folder.Path) && folder.IsEnabled)
+                var ext = Path.GetExtension(item.FileName).ToLower();
+                if (!FileHelper.MusicExtensions.Contains(ext)) continue;
+
+                bool isMetadataMatch = (item.Title == songInfo.Title && item.Artists == songInfo.DisplayArtists);
+
+                bool isFilenameMatch = StringHelper.IsSwitchableNormalizedMatch(
+                    Path.GetFileNameWithoutExtension(item.FileName),
+                    songInfo.DisplayArtists,
+                    songInfo.Title
+                );
+
+                if (isMetadataMatch || isFilenameMatch)
                 {
-                    foreach (var file in DirectoryHelper.GetAllFiles(folder.Path))
-                    {
-                        if (FileHelper.MusicExtensions.Contains(Path.GetExtension(file)))
-                        {
-                            Track track = new(file);
-                            if ((track.Title == songInfo.Title && track.Artist == songInfo.DisplayArtists) || StringHelper.IsSwitchableNormalizedMatch(Path.GetFileNameWithoutExtension(file), songInfo.DisplayArtists, songInfo.Title))
-                            {
-                                var bytes = track.EmbeddedPictures.FirstOrDefault()?.PictureData;
-                                if (bytes != null)
-                                {
-                                    return bytes;
-                                }
-                            }
-                        }
-                    }
+                    bestMatch = item;
+                    break;
                 }
             }
+
+            if (bestMatch == null || string.IsNullOrEmpty(bestMatch.LocalAlbumArtPath))
+            {
+                return null;
+            }
+
+            try
+            {
+                if (File.Exists(bestMatch.LocalAlbumArtPath))
+                {
+                    return await File.ReadAllBytesAsync(bestMatch.LocalAlbumArtPath);
+                }
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"读取本地缓存失败: {ex.Message}");
+            }
+
             return null;
         }
 

BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs

@@ -0,0 +1,596 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Models.Db;
+using BetterLyrics.WinUI3.Services.FileSystemService.Providers;
+using BetterLyrics.WinUI3.Services.LocalizationService;
+using BetterLyrics.WinUI3.Services.SettingsService;
+using BetterLyrics.WinUI3.ViewModels;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.Mvvm.Messaging.Messages;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Microsoft.UI.Xaml.Controls;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Services.FileSystemService
+{
+    public partial class FileSystemService : BaseViewModel, IFileSystemService,
+        IRecipient<PropertyChangedMessage<AutoScanInterval>>,
+        IRecipient<PropertyChangedMessage<bool>>
+    {
+        private readonly ISettingsService _settingsService;
+        private readonly ILocalizationService _localizationService;
+        private readonly ILogger<FileSystemService> _logger;
+
+        private readonly IDbContextFactory<FilesIndexDbContext> _contextFactory;
+
+        private bool _isInitialized = false;
+
+        // 定时器字典
+        private readonly ConcurrentDictionary<string, CancellationTokenSource> _folderTimerTokens = new();
+        // 当前正在执行的扫描任务字典
+        private readonly ConcurrentDictionary<string, CancellationTokenSource> _activeScanTokens = new();
+
+        private static readonly SemaphoreSlim _folderScanLock = new(1, 1);
+
+        public FileSystemService(
+            ISettingsService settingsService,
+            ILocalizationService localizationService,
+            ILogger<FileSystemService> logger,
+            IDbContextFactory<FilesIndexDbContext> contextFactory)
+        {
+            _logger = logger;
+            _localizationService = localizationService;
+            _settingsService = settingsService;
+            _contextFactory = contextFactory;
+        }
+
+        public async Task<List<FilesIndexItem>> GetFilesAsync(IUnifiedFileSystem provider, FilesIndexItem? parentFolder, string configId, bool forceRefresh = false)
+        {
+            string queryParentUri = parentFolder == null ? "" : parentFolder.Uri;
+            if (parentFolder == null && !forceRefresh) forceRefresh = true;
+
+            using var context = await _contextFactory.CreateDbContextAsync();
+
+            var cachedEntities = await context.FilesIndex
+                .AsNoTracking() // 读操作不追踪，提升性能
+                .Where(x => x.MediaFolderId == configId && x.ParentUri == queryParentUri)
+                .ToListAsync();
+
+            bool needSync = forceRefresh || cachedEntities.Count == 0;
+
+            if (needSync)
+            {
+                // SyncAsync 内部自己管理 Context
+                cachedEntities = await SyncAsync(provider, parentFolder, configId);
+            }
+
+            return cachedEntities;
+        }
+
+        /// <summary>
+        /// 从远端/本地同步文件至数据库
+        /// </summary>
+        private async Task<List<FilesIndexItem>> SyncAsync(IUnifiedFileSystem provider, FilesIndexItem? parentFolder, string configId)
+        {
+            List<FilesIndexItem> remoteItems;
+            try
+            {
+                remoteItems = await provider.GetFilesAsync(parentFolder);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"Network sync error: {ex.Message}");
+                return [];
+            }
+
+            if (remoteItems == null) return [];
+
+            string targetParentUri = "";
+            if (remoteItems.Count > 0)
+                targetParentUri = remoteItems[0].ParentUri ?? "";
+            else if (parentFolder != null)
+                targetParentUri = parentFolder.Uri;
+            else
+                return [];
+
+            try
+            {
+                using var context = await _contextFactory.CreateDbContextAsync();
+
+                // 开启事务 (EF Core 也能管理事务)
+                using var transaction = await context.Database.BeginTransactionAsync();
+
+                // 1. 获取数据库中现有的该目录下的文件
+                var dbItems = await context.FilesIndex
+                    .Where(x => x.MediaFolderId == configId && x.ParentUri == targetParentUri)
+                    .ToListAsync();
+
+                var dbMap = dbItems.ToDictionary(x => x.Uri, x => x);
+
+                // 2. 远端数据去重（防止 Provider 返回重复 Uri）
+                var remoteDistinct = remoteItems
+                    .GroupBy(x => x.Uri)
+                    .Select(g => g.First())
+                    .ToList();
+
+                var remoteUris = new HashSet<string>();
+
+                // 3. 处理 新增 和 更新
+                foreach (var remote in remoteDistinct)
+                {
+                    remoteUris.Add(remote.Uri);
+
+                    if (dbMap.TryGetValue(remote.Uri, out var existing))
+                    {
+                        // 检查是否变更
+                        bool isChanged = existing.FileSize != remote.FileSize ||
+                                         existing.LastModified != remote.LastModified;
+
+                        if (isChanged)
+                        {
+                            existing.FileSize = remote.FileSize;
+                            existing.LastModified = remote.LastModified;
+                            existing.IsMetadataParsed = false; // 标记重新解析
+
+                            // EF Core 自动追踪 existing 的变化，无需手动 Update
+                        }
+                    }
+                    else
+                    {
+                        // 新增
+                        // 注意：如果 Id 是自增的，不要手动赋值 Id，除非是 Guid
+                        context.FilesIndex.Add(remote);
+                    }
+                }
+
+                // 4. 处理 删除 (数据库有，远端没有)
+                foreach (var dbItem in dbItems)
+                {
+                    if (!remoteUris.Contains(dbItem.Uri))
+                    {
+                        context.FilesIndex.Remove(dbItem);
+                    }
+                }
+
+                await context.SaveChangesAsync();
+                await transaction.CommitAsync();
+
+                // 5. 返回最新数据
+                // 这里的 dbItems 已经被 Update 更新了内存状态，但 Remove 的还在列表里，Add 的不在列表里
+                // 所以最稳妥的是重新查一次，或者手动维护列表。为了准确性，重新查询 (AsNoTracking)
+                var finalItems = await context.FilesIndex
+                    .AsNoTracking()
+                    .Where(x => x.MediaFolderId == configId && x.ParentUri == targetParentUri)
+                    .ToListAsync();
+
+                FolderUpdated?.Invoke(this, targetParentUri);
+
+                return finalItems;
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"Database sync error: {ex.Message}");
+                return [];
+            }
+        }
+
+        public async Task UpdateMetadataAsync(FilesIndexItem entity)
+        {
+            using var context = await _contextFactory.CreateDbContextAsync();
+
+            // 使用 EF Core 7.0+ 的 ExecuteUpdateAsync 高效更新
+            // 这会直接生成 UPDATE SQL，不经过内存加载，性能极高
+            await context.FilesIndex
+                .Where(x => x.Id == entity.Id) // 优先用 Id
+                .ExecuteUpdateAsync(setters => setters
+                    .SetProperty(p => p.Title, entity.Title)
+                    .SetProperty(p => p.Artists, entity.Artists)
+                    .SetProperty(p => p.Album, entity.Album)
+                    .SetProperty(p => p.Year, entity.Year)
+                    .SetProperty(p => p.Bitrate, entity.Bitrate)
+                    .SetProperty(p => p.SampleRate, entity.SampleRate)
+                    .SetProperty(p => p.BitDepth, entity.BitDepth)
+                    .SetProperty(p => p.Duration, entity.Duration)
+                    .SetProperty(p => p.AudioFormatName, entity.AudioFormatName)
+                    .SetProperty(p => p.AudioFormatShortName, entity.AudioFormatShortName)
+                    .SetProperty(p => p.Encoder, entity.Encoder)
+                    .SetProperty(p => p.EmbeddedLyrics, entity.EmbeddedLyrics)
+                    .SetProperty(p => p.LocalAlbumArtPath, entity.LocalAlbumArtPath)
+                    .SetProperty(p => p.IsMetadataParsed, true)
+                );
+        }
+
+        public async Task<Stream?> OpenFileAsync(IUnifiedFileSystem provider, FilesIndexItem entity)
+        {
+            return await provider.OpenReadAsync(entity);
+        }
+
+        public async Task DeleteCacheForMediaFolderAsync(MediaFolder folder)
+        {
+            _dispatcherQueue.TryEnqueue(() =>
+            {
+                folder.IndexingProgress = 0;
+                folder.StatusSeverity = InfoBarSeverity.Informational;
+                folder.StatusText = _localizationService.GetLocalizedString("FileSystemServicePrepareToClean");
+                folder.IsProcessing = true;
+            });
+
+            if (_folderTimerTokens.TryRemove(folder.Id, out var timerCts))
+            {
+                timerCts.Cancel();
+                timerCts.Dispose();
+                _logger.LogInformation("DeleteCacheForMediaFolderAsync: {}", "cts.Dispose();");
+            }
+
+            if (_activeScanTokens.TryGetValue(folder.Id, out var activeScanCts))
+            {
+                activeScanCts.Cancel();
+            }
+
+            try
+            {
+                await _folderScanLock.WaitAsync();
+
+                try
+                {
+                    _dispatcherQueue.TryEnqueue(() =>
+                    {
+                        folder.StatusText = _localizationService.GetLocalizedString("FileSystemServiceCleaningCache");
+                    });
+
+                    using var context = await _contextFactory.CreateDbContextAsync();
+
+                    await context.FilesIndex
+                        .Where(x => x.MediaFolderId == folder.Id)
+                        .ExecuteDeleteAsync();
+
+                    // VACUUM 是 SQLite 特有的命令
+                    if (context.Database.IsSqlite())
+                    {
+                        await context.Database.ExecuteSqlRawAsync("VACUUM");
+                    }
+                }
+                finally
+                {
+                    _folderScanLock.Release();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("DeleteCacheForMediaFolderAsync: {}", ex.Message);
+            }
+            finally
+            {
+                _dispatcherQueue.TryEnqueue(() =>
+                {
+                    folder.IsProcessing = false;
+                    folder.LastSyncTime = null;
+                });
+            }
+        }
+
+        public async Task ScanMediaFolderAsync(MediaFolder folder, CancellationToken token = default)
+        {
+            if (folder == null || !folder.IsEnabled) return;
+
+            using var scanCts = CancellationTokenSource.CreateLinkedTokenSource(token);
+            _activeScanTokens[folder.Id] = scanCts;
+
+            _dispatcherQueue.TryEnqueue(() =>
+            {
+                folder.StatusSeverity = InfoBarSeverity.Informational;
+                folder.IsProcessing = true;
+                folder.IndexingProgress = 0;
+                folder.StatusText = _localizationService.GetLocalizedString("FileSystemServiceWaitingForScan");
+            });
+
+            try
+            {
+                await _folderScanLock.WaitAsync(scanCts.Token);
+
+                _dispatcherQueue.TryEnqueue(() => folder.StatusText = _localizationService.GetLocalizedString("FileSystemServiceConnecting"));
+
+                using var fs = folder.CreateFileSystem();
+                if (fs == null || !await fs.ConnectAsync())
+                {
+                    _dispatcherQueue.TryEnqueue(() =>
+                    {
+                        folder.StatusSeverity = InfoBarSeverity.Error;
+                        folder.StatusText = _localizationService.GetLocalizedString("FileSystemServiceConnectFailed");
+                    });
+                    return;
+                }
+
+                _dispatcherQueue.TryEnqueue(() => folder.StatusText = _localizationService.GetLocalizedString("FileSystemServiceFetchingFileList"));
+
+                var filesToProcess = new List<FilesIndexItem>();
+                var foldersToScan = new Queue<FilesIndexItem?>();
+                foldersToScan.Enqueue(null); // 根目录
+
+                while (foldersToScan.Count > 0)
+                {
+                    if (scanCts.Token.IsCancellationRequested) return;
+
+                    var currentParent = foldersToScan.Dequeue();
+                    var items = await GetFilesAsync(fs, currentParent, folder.Id, forceRefresh: true);
+
+                    foreach (var item in items)
+                    {
+                        if (item.IsDirectory)
+                        {
+                            foldersToScan.Enqueue(item);
+                        }
+                        else
+                        {
+                            var ext = Path.GetExtension(item.FileName).ToLower();
+                            if (FileHelper.AllSupportedExtensions.Contains(ext))
+                            {
+                                filesToProcess.Add(item);
+                            }
+                        }
+                    }
+                }
+
+                int total = filesToProcess.Count;
+                int current = 0;
+
+                foreach (var item in filesToProcess)
+                {
+                    if (scanCts.Token.IsCancellationRequested) return;
+
+                    current++;
+
+                    if (current % 10 == 0 || current == total)
+                    {
+                        double progress = (double)current / total * 100;
+                        _dispatcherQueue.TryEnqueue(() =>
+                        {
+                            folder.IndexingProgress = progress;
+                            folder.StatusText = $"{_localizationService.GetLocalizedString("FileSystemServiceParsing")} {current}/{total}";
+                        });
+                    }
+
+                    if (item.IsMetadataParsed) continue;
+
+                    var ext = Path.GetExtension(item.FileName).ToLower();
+
+                    try
+                    {
+                        if (FileHelper.MusicExtensions.Contains(ext))
+                        {
+                            using var originalStream = await OpenFileAsync(fs, item);
+                            if (originalStream == null) continue;
+
+                            ExtendedTrack track;
+                            if (originalStream.CanSeek)
+                            {
+                                track = new ExtendedTrack(item, originalStream);
+                            }
+                            else
+                            {
+                                using var memStream = new MemoryStream();
+                                await originalStream.CopyToAsync(memStream, scanCts.Token);
+                                memStream.Position = 0;
+                                track = new ExtendedTrack(item, memStream);
+                            }
+
+                            if (track.Duration > 0)
+                            {
+                                string? artPath = await SaveAlbumArtToDiskAsync(track);
+
+                                item.Title = track.Title;
+                                item.Artists = track.Artist;
+                                item.Album = track.Album;
+                                item.Year = track.Year;
+                                item.Bitrate = track.Bitrate;
+                                item.SampleRate = track.SampleRate;
+                                item.BitDepth = track.BitDepth;
+                                item.Duration = track.Duration;
+                                item.AudioFormatName = track.AudioFormatName;
+                                item.AudioFormatShortName = track.AudioFormatShortName;
+                                item.Encoder = track.Encoder;
+                                item.EmbeddedLyrics = track.RawLyrics;
+                                item.LocalAlbumArtPath = artPath;
+                                item.IsMetadataParsed = true;
+                            }
+                        }
+                        else if (FileHelper.LyricExtensions.Contains(ext))
+                        {
+                            using var stream = await OpenFileAsync(fs, item);
+                            if (stream != null)
+                            {
+                                using var reader = new StreamReader(stream);
+                                string content = await reader.ReadToEndAsync();
+                                item.EmbeddedLyrics = content;
+                                item.IsMetadataParsed = true;
+                            }
+                        }
+
+                        if (item.IsMetadataParsed)
+                        {
+                            // 更新操作：直接调用 UpdateMetadataAsync
+                            // 此时不需要 _dbLock，因为 UpdateMetadataAsync 内部会 CreateDbContextAsync
+                            // 而 _folderScanLock 已经保证了当前文件夹扫描的独占性
+                            await UpdateMetadataAsync(item);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError("ScanMediaFolderAsync: {}", ex.Message);
+                    }
+                }
+
+                _dispatcherQueue.TryEnqueue(() =>
+                {
+                    folder.StatusSeverity = InfoBarSeverity.Success;
+                    folder.StatusText = _localizationService.GetLocalizedString("FileSystemServiceReady");
+                    folder.LastSyncTime = DateTime.Now;
+                });
+            }
+            catch (OperationCanceledException)
+            {
+                // 正常取消
+            }
+            catch (Exception ex)
+            {
+                _dispatcherQueue.TryEnqueue(() =>
+                {
+                    folder.StatusText = ex.Message;
+                    folder.StatusSeverity = InfoBarSeverity.Error;
+                });
+            }
+            finally
+            {
+                _folderScanLock.Release();
+                _activeScanTokens.TryRemove(folder.Id, out _);
+
+                _dispatcherQueue.TryEnqueue(() =>
+                {
+                    folder.IsProcessing = false;
+                    folder.IndexingProgress = 0;
+                });
+            }
+        }
+
+        public async Task<List<FilesIndexItem>> GetParsedFilesAsync(IEnumerable<string> enabledConfigIds)
+        {
+            if (enabledConfigIds == null || !enabledConfigIds.Any())
+            {
+                return new List<FilesIndexItem>();
+            }
+
+            var idList = enabledConfigIds.ToList();
+
+            using var context = await _contextFactory.CreateDbContextAsync();
+
+            // SQL: SELECT * FROM FileCache WHERE IsMetadataParsed = 1 AND MediaFolderId IN (...)
+            return await context.FilesIndex
+                .AsNoTracking()
+                .Where(x => x.IsMetadataParsed && idList.Contains(x.MediaFolderId))
+                .ToListAsync();
+        }
+
+        public void StartAllFolderTimers()
+        {
+            foreach (var folder in _settingsService.AppSettings.LocalMediaFolders)
+            {
+                if (folder.IsEnabled)
+                {
+                    UpdateFolderTimer(folder);
+                }
+            }
+        }
+
+        private void UpdateFolderTimer(MediaFolder folder)
+        {
+            if (_folderTimerTokens.TryRemove(folder.Id, out var oldCts))
+            {
+                oldCts.Cancel();
+                oldCts.Dispose();
+            }
+
+            if (!folder.IsEnabled || folder.ScanInterval == AutoScanInterval.Disabled)
+            {
+                return;
+            }
+
+            var newCts = new CancellationTokenSource();
+            _folderTimerTokens[folder.Id] = newCts;
+
+            TimeSpan period = folder.ScanInterval switch
+            {
+                AutoScanInterval.Every15Minutes => TimeSpan.FromMinutes(15),
+                AutoScanInterval.EveryHour => TimeSpan.FromHours(1),
+                AutoScanInterval.Every6Hours => TimeSpan.FromHours(6),
+                AutoScanInterval.Daily => TimeSpan.FromDays(1),
+                _ => TimeSpan.FromHours(1)
+            };
+
+            Task.Run(async () =>
+            {
+                try
+                {
+                    using var timer = new PeriodicTimer(period);
+
+                    while (await timer.WaitForNextTickAsync(newCts.Token))
+                    {
+                        await ScanMediaFolderAsync(folder, newCts.Token);
+                    }
+                }
+                catch (OperationCanceledException)
+                {
+                }
+                catch (Exception ex)
+                {
+                    System.Diagnostics.Debug.WriteLine($"文件夹 {folder.Name} 定时扫描出错: {ex.Message}");
+                }
+            }, newCts.Token);
+        }
+
+        public event EventHandler<string>? FolderUpdated;
+
+        private async Task<string?> SaveAlbumArtToDiskAsync(ExtendedTrack track)
+        {
+            // 代码未变，纯 IO 操作
+            var picData = track.AlbumArtByteArray;
+            if (picData == null || picData.Length == 0) return null;
+
+            try
+            {
+                string hash = ComputeHashForBytes(picData);
+                string safeName = hash + ".jpg";
+
+                string localPath = Path.Combine(PathHelper.LocalAlbumArtCacheDirectory, safeName);
+
+                if (File.Exists(localPath)) return localPath;
+
+                await File.WriteAllBytesAsync(localPath, picData);
+
+                return localPath;
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+
+        private string ComputeHashForBytes(byte[] data)
+        {
+            using (var md5 = System.Security.Cryptography.MD5.Create())
+            {
+                var hashBytes = md5.ComputeHash(data);
+                return BitConverter.ToString(hashBytes).Replace("-", "").ToLowerInvariant();
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<AutoScanInterval> message)
+        {
+            if (message.Sender is MediaFolder mediaFolder)
+            {
+                if (message.PropertyName == nameof(MediaFolder.ScanInterval))
+                {
+                    UpdateFolderTimer(mediaFolder);
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<bool> message)
+        {
+            if (message.Sender is MediaFolder mediaFolder)
+            {
+                if (message.PropertyName == nameof(MediaFolder.IsEnabled))
+                {
+                    UpdateFolderTimer(mediaFolder);
+                }
+            }
+        }
+    }
+}