From 83f3a3bd6d6dabf13bc7fd3f35926d0eef7170a6 Mon Sep 17 00:00:00 2001
From: Zhe Fang <founchoo@outlook.com>
Date: Sat, 27 Dec 2025 15:25:49 -0500
Subject: [PATCH] chores: fix SMB and local file system, add auto-sync, improve
 lyruics search, album art search, local music gallery load speed (after 1st
 time)

---
 .../BetterLyrics.WinUI3/App.xaml              |   1 +
 .../BetterLyrics.WinUI3/App.xaml.cs           |   5 +-
 .../Controls/LyricsSearchControl.xaml         |   2 -
 .../Controls/MediaSettingsControl.xaml        |  68 +-
 .../Controls/MediaSettingsControl.xaml.cs     |  18 +-
 .../RemoteServerConfigControl.xaml.cs         |  62 +-
 .../Converter/ByteArrayToImageConverter.cs    |  10 +-
 .../Converter/PathToImageConverter.cs         |  31 +
 .../Enums/AutoScanInterval.cs                 |  15 +
 .../BetterLyrics.WinUI3/Helper/FileHelper.cs  |  12 +
 .../BetterLyrics.WinUI3/Helper/PathHelper.cs  |   3 +
 .../Helper/StreamFileAbstraction.cs           |   2 +-
 .../Models/ExtendedTrack.cs                   | 214 ++++++-
 .../Models/FileCacheEntity.cs                 |  49 +-
 .../BetterLyrics.WinUI3/Models/MediaFolder.cs |  84 ++-
 .../Models/UnifiedFileItem.cs                 |  11 -
 .../AlbumArtSearchService.cs                  | 102 ++-
 .../FileSystemService/FileSystemService.cs    | 593 ++++++++++++++++--
 .../FileSystemService/IFileSystemService.cs   |  52 +-
 .../FileSystemService/IUnifiedFileSystem.cs   |  14 +-
 .../Providers/FTPFileSystem.cs                | 149 ++++-
 .../Providers/LocalFileSystem.cs              | 100 ++-
 .../Providers/SMBFileSystem.cs                | 218 +++++--
 .../Providers/SMBReadOnlyStream.cs            |  72 ++-
 .../Providers/WebDavFileSystem.cs             | 130 ++--
 .../LibWatcherService/ILibWatcherService.cs   |  12 -
 .../LibWatcherService/LibWatcherService.cs    |  91 ---
 .../LyricsSearchService.cs                    | 215 ++-----
 .../MediaSessionsService.AlbumArtUpdater.cs   |   1 +
 .../MediaSessionsService.cs                   |  42 +-
 .../Strings/ar/Resources.resw                 |  45 +-
 .../Strings/de/Resources.resw                 |  45 +-
 .../Strings/en/Resources.resw                 |  45 +-
 .../Strings/es/Resources.resw                 |  45 +-
 .../Strings/fr/Resources.resw                 |  45 +-
 .../Strings/hi/Resources.resw                 |  45 +-
 .../Strings/id/Resources.resw                 |  45 +-
 .../Strings/ja/Resources.resw                 |  45 +-
 .../Strings/ko/Resources.resw                 |  45 +-
 .../Strings/ms/Resources.resw                 |  45 +-
 .../Strings/pt/Resources.resw                 |  45 +-
 .../Strings/ru/Resources.resw                 |  45 +-
 .../Strings/th/Resources.resw                 |  45 +-
 .../Strings/vi/Resources.resw                 |  45 +-
 .../Strings/zh-Hans/Resources.resw            |  45 +-
 .../Strings/zh-Hant/Resources.resw            |  45 +-
 .../MediaSettingsControlViewModel.cs          | 104 +--
 .../ViewModels/MusicGalleryPageViewModel.cs   | 277 ++++----
 .../Views/MusicGalleryPage.xaml               |  17 +-
 .../Views/MusicGalleryPage.xaml.cs            |   4 +-
 50 files changed, 2622 insertions(+), 878 deletions(-)
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToImageConverter.cs
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AutoScanInterval.cs
 delete mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/UnifiedFileItem.cs
 delete mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/ILibWatcherService.cs
 delete mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/LibWatcherService.cs

diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
index e13d843..b59987a 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
@@ -75,6 +75,7 @@
             <converter:LyricsLayoutOrientationToOrientationConverter x:Key="LyricsLayoutOrientationToOrientationConverter" />
             <converter:LyricsLayoutOrientationNegationToOrientationConverter x:Key="LyricsLayoutOrientationNegationToOrientationConverter" />
             <converter:FileSourceTypeToIconConverter x:Key="FileSourceTypeToIconConverter" />
+            <converter:PathToImageConverter x:Key="PathToImageConverter" />
 
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
index ba0fccf..1f3402d 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml.cs
@@ -7,7 +7,6 @@ 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;
@@ -75,6 +74,9 @@ namespace BetterLyrics.WinUI3
         {
             var settingsService = Ioc.Default.GetRequiredService<ISettingsService>();
 
+            var fileSystemService = Ioc.Default.GetRequiredService<IFileSystemService>();
+            fileSystemService.StartAllFolderTimers();
+
             WindowHook.OpenOrShowWindow<SystemTrayWindow>();
 
             if (settingsService.AppSettings.GeneralSettings.AutoStartLyricsWindow)
@@ -118,7 +120,6 @@ namespace BetterLyrics.WinUI3
                     .AddSingleton<IMediaSessionsService, MediaSessionsService>()
                     .AddSingleton<IAlbumArtSearchService, AlbumArtSearchService>()
                     .AddSingleton<ILyricsSearchService, LyricsSearchService>()
-                    .AddSingleton<ILibWatcherService, LibWatcherService>()
                     .AddSingleton<ITranslationService, TranslationService>()
                     .AddSingleton<ITransliterationService, TransliterationService>()
                     .AddSingleton<ILastFMService, LastFMService>()
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml
index 94ff8d2..29ca891 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/LyricsSearchControl.xaml
@@ -240,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">
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml
index 2a3f335..f91ea9c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml
@@ -50,37 +50,73 @@
                         SelectionMode="None">
                         <ListView.ItemTemplate>
                             <DataTemplate x:DataType="models:MediaFolder">
-                                <dev:SettingsExpander Description="{x:Bind ConnectionSummary, Mode=OneWay}">
+                                <dev:SettingsExpander Description="{x:Bind ConnectionSummary, Mode=OneWay}" 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
                                             Padding="0"
                                             Click="LocalFolderHyperlinkButton_Click"
-                                            Content="{x:Bind Path, Mode=OneWay}"
-                                            Tag="{x:Bind Path, Mode=OneWay}"
-                                            ToolTipService.ToolTip="{x:Bind ConnectionSummary}" />
+                                            Content="{x:Bind ConnectionSummary, Mode=OneWay}" />
                                     </dev:SettingsExpander.Header>
 
                                     <ToggleSwitch IsOn="{x:Bind IsEnabled, Mode=TwoWay}" />
 
                                     <dev:SettingsExpander.Items>
-                                        <dev:SettingsCard>
-                                            <dev:SettingsCard.Header>
-                                                <HyperlinkButton
-                                                    x:Uid="SettingsPageRemovePath"
-                                                    Padding="0"
-                                                    Click="SettingsPageRemovePathButton_Click"
-                                                    Tag="{Binding}" />
-                                            </dev:SettingsCard.Header>
+                                        <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="SettingsPageMusicLibRealTimeWatch" IsEnabled="{Binding IsLocal, Mode=OneWay}">
-                                            <ToggleSwitch IsOn="{Binding IsRealTimeWatchEnabled, Mode=TwoWay}" />
+                                        <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.ItemsFooter>
+                                        <StackPanel>
+                                            <!--  Index info  -->
+                                            <InfoBar
+                                                IsClosable="False"
+                                                IsOpen="{x:Bind IsIndexing, Mode=OneWay}"
+                                                Message="{x:Bind IndexingStatusText, Mode=OneWay}" />
+                                            <ProgressBar Visibility="{x:Bind IsIndexing, 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>
+                                            <!--  Clean up info  -->
+                                            <InfoBar
+                                                IsClosable="False"
+                                                IsOpen="{x:Bind IsCleaningUp, Mode=OneWay}"
+                                                Message="{x:Bind CleaningUpStatusText, Mode=OneWay}" />
+                                            <ProgressBar IsIndeterminate="True" Visibility="{x:Bind IsCleaningUp, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                        </StackPanel>
+                                    </dev:SettingsExpander.ItemsFooter>
+
                                 </dev:SettingsExpander>
                             </DataTemplate>
                         </ListView.ItemTemplate>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs
index a005ca6..18eaacf 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs
+++ b/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,23 @@ namespace BetterLyrics.WinUI3.Controls
 
         private void SettingsPageRemovePathButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
         {
-            ViewModel.RemoveFolderAsync((MediaFolder)(sender as HyperlinkButton)!.Tag);
+            var folder = (MediaFolder)((FrameworkElement)sender).DataContext;
+            ViewModel.RemoveFolder(folder);
         }
 
         private async void LocalFolderHyperlinkButton_Click(object sender, RoutedEventArgs e)
         {
-            if (sender is HyperlinkButton button && button.Tag is string uriStr)
+            var folder = (MediaFolder)((FrameworkElement)sender).DataContext;
+            if (Uri.TryCreate(folder.UriString, UriKind.Absolute, out var uri))
             {
-                if (Uri.TryCreate(uriStr, UriKind.Absolute, out var uri))
-                {
-                    await Launcher.LaunchUriAsync(uri);
-                }
+                await Launcher.LaunchUriAsync(uri);
             }
         }
+
+        private void SyncNowButton_Click(object sender, RoutedEventArgs e)
+        {
+            var folder = (MediaFolder)((FrameworkElement)sender).DataContext;
+            ViewModel.SyncFolder(folder);
+        }
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs
index f5710e3..d851455 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs
@@ -40,53 +40,49 @@ namespace BetterLyrics.WinUI3.Controls
             }
         }
 
+        private string GetScheme()
+        {
+            string scheme = string.Empty;
+            switch (_protocolType.ToUpper())
+            {
+                case "SMB":
+                    scheme = "smb";
+                    break;
+                case "FTP":
+                    scheme = "ftp";
+                    break;
+                case "WEBDAV":
+                    scheme = "https";
+                    break;
+            }
+            return scheme;
+        }
+
         public MediaFolder GetConfig()
         {
             if (string.IsNullOrWhiteSpace(HostBox.Text))
                 throw new ArgumentException(_localizationService.GetLocalizedString("RemoteServerConfigControlServerAddressRequired"));
 
             string name = $"{_protocolType} - {HostBox.Text}";
-
             Enum.TryParse(_protocolType, true, out FileSourceType sourceType);
 
+            string scheme = GetScheme();
+
             var folder = new MediaFolder
             {
                 Name = name,
-                Path = HostBox.Text, // 这里 Path 存的是 IP/Host
-                Port = (int)PortBox.Value,
-                UserName = UserBox.Text,
-                Password = PwdBox.Password, // 从 PasswordBox 获取密码
                 SourceType = sourceType,
-                IsRealTimeWatchEnabled = false
+
+                UriScheme = scheme,
+                UriHost = HostBox.Text.Trim(), // 去除首尾空格
+                UriPort = (int)PortBox.Value,
+
+                UriPath = PathBox.Text.Trim(),
+
+                UserName = UserBox.Text.Trim(),
+                Password = PwdBox.Password,
             };
 
-            // 特殊处理路径：
-            // 我们需要把"远程路径"拼接到 Path 里，或者用另一个字段存
-            // 为了简单，我们遵循上面的 MediaFolder 定义：
-            // 建议 MediaFolder 类里再加一个 RemotePath 字段，或者在这里把 Path 组合起来
-
-            // *修正建议*：如果不改 MediaFolder 定义，我们可以这样约定：
-            // Path 字段存储格式： "192.168.1.5/Music"
-
-            var rawPath = PathBox.Text.Trim().TrimStart('/', '\\'); // 去掉开头的斜杠
-            if (!string.IsNullOrEmpty(rawPath))
-            {
-                // 简单的路径拼接逻辑
-                if (sourceType == FileSourceType.SMB)
-                {
-                    // SMBLibrary 的逻辑通常是 Host 分开，ShareName 分开
-                    // 如果你把 IP 存在 Path 属性里，那你需要把 ShareName 拼在后面或者用新字段
-                    // 为了方便，这里把 IP 和 ShareName 拼在一起存入 Path
-                    // 比如: 192.168.1.5/Music
-                    folder.Path = $"{HostBox.Text}/{rawPath}";
-                }
-                else
-                {
-                    // FTP/WebDAV: 192.168.1.5/pub/music
-                    folder.Path = $"{HostBox.Text}/{rawPath}";
-                }
-            }
-
             return folder;
         }
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ByteArrayToImageConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ByteArrayToImageConverter.cs
index a636257..13eb3dc 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/ByteArrayToImageConverter.cs
+++ b/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)
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToImageConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToImageConverter.cs
new file mode 100644
index 0000000..9f77e6f
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/PathToImageConverter.cs
@@ -0,0 +1,31 @@
+锘縰sing 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();
+        }
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AutoScanInterval.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AutoScanInterval.cs
new file mode 100644
index 0000000..e9d40a7
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/AutoScanInterval.cs
@@ -0,0 +1,15 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum AutoScanInterval
+    {
+        Disabled,
+        Every15Minutes,
+        EveryHour,
+        Every6Hours,
+        Daily
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs
index ce18ce7..5b1cb5c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/FileHelper.cs
@@ -5,7 +5,9 @@ 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 Ude;
 
@@ -86,5 +88,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));
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PathHelper.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PathHelper.cs
index 15fd85a..a9c5900 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PathHelper.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/PathHelper.cs
@@ -54,8 +54,10 @@ 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 FilesCachePath => Path.Combine(CacheFolder, "files_cache.db");
 
         public static void EnsureDirectories()
         {
@@ -75,6 +77,7 @@ namespace BetterLyrics.WinUI3.Helper
             Directory.CreateDirectory(LocalTtmlCacheDirectory);
 
             Directory.CreateDirectory(iTunesAlbumArtCacheDirectory);
+            Directory.CreateDirectory(LocalAlbumArtCacheDirectory);
         }
     }
 }
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/StreamFileAbstraction.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/StreamFileAbstraction.cs
index 1a81a65..d398ce1 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/StreamFileAbstraction.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Helper/StreamFileAbstraction.cs
@@ -9,7 +9,7 @@ namespace BetterLyrics.WinUI3.Helper
         private readonly Stream _stream;
         private readonly bool _closeStreamOnDispose;
 
-        public StreamFileAbstraction(string path, Stream stream, bool closeStreamOnDispose = false)
+        public StreamFileAbstraction(string path, Stream? stream, bool closeStreamOnDispose = false)
         {
             _name = Path.GetFileName(path);
             _stream = stream ?? throw new ArgumentNullException(nameof(stream));
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs
index 2a6f08e..282ff91 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs
@@ -1,28 +1,216 @@
-锘縰sing BetterLyrics.WinUI3.Helper;
+锘縰sing ATL;
+using BetterLyrics.WinUI3.Helper;
 using System;
 using System.IO;
+using System.Linq;
 
 namespace BetterLyrics.WinUI3.Models
 {
-    public class ExtendedTrack : ATL.Track
+    public class ExtendedTrack
     {
-        public new string Path { get; private set; } = "";
-        public string RawLyrics { get; set; } = "";
-        public string ParentFolderName => Directory.GetParent(Path)?.Name ?? "";
-        public string ParentFolderPath => Directory.GetParent(Path)?.FullName ?? "";
-        public string FileName => System.IO.Path.GetFileName(Path);
+        // 鏍囧噯 URI (file:///..., smb://..., http://...)
+        public string Uri { get; private set; } = "";
+
+        // 瀵逛簬鏈湴鏂囦欢锛岃繑鍥� C:\Music\Song.mp3
+        // 瀵逛簬杩滅▼鏂囦欢锛岃繑鍥炶В鐮佸悗鐨勮矾寰勯儴鍒� /Music/Song.mp3
+        public string UriPath
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(Uri)) return "";
+                try
+                {
+                    var u = new System.Uri(Uri);
+                    return u.IsFile ? u.LocalPath : System.Net.WebUtility.UrlDecode(u.AbsolutePath);
+                }
+                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 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 path) : base(path)
+        public ExtendedTrack(string uriString) : base()
         {
-            Path = path;
+            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(string path, Stream stream) : base(stream, System.IO.Path.GetExtension(path))
+        public ExtendedTrack(FileCacheEntity? entity, Stream? stream = null) : base()
         {
-            Path = path;
-            SetRawLyrics(new StreamFileAbstraction(path, stream));
+            if (entity == null) return;
+
+            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)
@@ -34,4 +222,4 @@ namespace BetterLyrics.WinUI3.Models
             catch (Exception) { }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileCacheEntity.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileCacheEntity.cs
index f55f690..dccb817 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileCacheEntity.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileCacheEntity.cs
@@ -1,22 +1,57 @@
 锘縰sing SQLite;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace BetterLyrics.WinUI3.Models
 {
     [Table("FileCache")]
-    public class FileCacheEntity : UnifiedFileItem
+    public class FileCacheEntity
     {
         [PrimaryKey, AutoIncrement]
         public int Id { get; set; }
 
+        // 銆愭柊澧炪�戝叧閿瓧娈碉紒
+        // 鍏宠仈鍒� MediaFolder.Id銆�
+        // 浣滅敤锛�
+        // 1. 鍖哄垎涓嶅悓閰嶇疆锛堝嵆浣夸袱涓厤缃繛鐨勬槸鍚屼竴涓� SMB锛屼絾鍦� APP 閲岃涓轰笉鍚屾簮锛夈��
+        // 2. 鍒犻櫎閰嶇疆鏃讹紝鍙互鐢� MediaFolderId 蹇�熺骇鑱斿垹闄ゆ墍鏈夌紦瀛樸��
         [Indexed]
-        public string ParentPath { get; set; }
+        public string MediaFolderId { get; set; }
 
+        // 銆愪慨鏀广�戜粠 ParentPath 鏀逛负 ParentUri
+        // 瀛樺偍鐖舵枃浠跺す鐨勬爣鍑� URI (smb://host/share/parent)
+        // 鏍圭洰褰曟枃浠剁殑 ParentUri 鍙互涓虹┖锛屾垨鑰呯瓑浜� MediaFolder 鐨� Base Uri
+        [Indexed]
+        public string? ParentUri { get; set; }
+
+        // 銆愭牳蹇冦�戞爣鍑嗗寲鐨勫畬鏁� URI (smb://host/share/folder/file.ext)
+        // 纭繚瀹冩槸 URL 缂栫爜杩囦笖鏍煎紡缁熶竴鐨�
         [Indexed(Unique = true)]
-        public string FullPath { get; set; }
+        public string Uri { get; set; }
 
-        public string Title { get; set; }
+        public string FileName { get; set; }
+
+        public bool IsDirectory { get; set; }
+
+        // 璁板綍鏂囦欢澶у皬锛屽悓姝ユ椂鐢ㄦ潵瀵规瘮鏂囦欢鏄惁鍙樺寲
+        public long FileSize { get; set; }
+
+        // 璁板綍淇敼鏃堕棿锛屽悓姝ユ椂瀵规瘮浣跨敤
+        public DateTime? LastModified { get; set; }
+
+        // ------ 鍏冩暟鎹儴鍒� (淇濇寔涓嶅彉) ------
+        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; } // 寤鸿鏄庣‘鍗曚綅锛屼緥濡� DurationMs
+        public string? AudioFormatName { get; set; }
+        public string? AudioFormatShortName { get; set; }
+        public string? Encoder { get; set; }
+        public string? EmbeddedLyrics { get; set; }
+        public string? LocalAlbumArtPath { get; set; }
+        public bool IsMetadataParsed { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs
index 44d010c..130e7c1 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs
@@ -1,12 +1,11 @@
-锘�// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Enums;
+锘縰sing BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Services.FileSystemService;
 using BetterLyrics.WinUI3.Services.FileSystemService.Providers;
 using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 using System.Text.Json.Serialization;
+using System.Threading;
 
 namespace BetterLyrics.WinUI3.Models
 {
@@ -15,32 +14,85 @@ namespace BetterLyrics.WinUI3.Models
         [ObservableProperty] public partial string Id { get; set; } = Guid.NewGuid().ToString();
 
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsEnabled { get; set; } = true;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsRealTimeWatchEnabled { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients][NotifyPropertyChangedFor(nameof(ConnectionSummary))] public partial string Path { get; set; }
 
         [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] public partial string UserName { 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;
 
-        [ObservableProperty] public partial int Port { get; set; } = 80;
+        [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;
 
+        [JsonIgnore][ObservableProperty] public partial bool IsIndexing { get; set; } = false;
+        [JsonIgnore][ObservableProperty] public partial double IndexingProgress { get; set; } = 0;
+        [JsonIgnore][ObservableProperty] public partial string IndexingStatusText { get; set; } = "";
+
+        [JsonIgnore][ObservableProperty] public partial bool IsCleaningUp { get; set; } = false;
+        [JsonIgnore][ObservableProperty] public partial string CleaningUpStatusText { get; set; } = "";
+
+        [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,
+                    UserName = UserName
+                };
+
+                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 Path;
-                return $"{SourceType} - {Path} {(string.IsNullOrEmpty(UserName) ? "" : $"({UserName})")}";
+                if (IsLocal) return UriPath;
+                return $"{UriScheme}://{UriHost}{(UriPort > 0 ? ":" + UriPort : "")}/{UriPath?.TrimStart('/', '\\')} {(string.IsNullOrEmpty(UserName) ? "" : $"({UserName})")}";
             }
         }
 
@@ -50,7 +102,8 @@ namespace BetterLyrics.WinUI3.Models
 
         public MediaFolder(string path)
         {
-            Path = path;
+            UriPath = path;
+            SourceType = FileSourceType.Local;
         }
 
         public IUnifiedFileSystem? CreateFileSystem()
@@ -63,12 +116,13 @@ namespace BetterLyrics.WinUI3.Models
 
             return SourceType switch
             {
-                FileSourceType.Local => new LocalFileSystem(Path),
-                FileSourceType.SMB => new SMBFileSystem(Path, UserName, Password),
-                FileSourceType.FTP => new FTPFileSystem(Path, UserName, Password, Port, Path),
-                FileSourceType.WebDav => new WebDavFileSystem(Path, UserName, Password, Port, Path),
+                FileSourceType.Local => new LocalFileSystem(this),
+                FileSourceType.SMB => new SMBFileSystem(this),
+                FileSourceType.FTP => new FTPFileSystem(this),
+                FileSourceType.WebDav => new WebDavFileSystem(this),
                 _ => throw new NotImplementedException()
             };
         }
+
     }
-}
+}
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/UnifiedFileItem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/UnifiedFileItem.cs
deleted file mode 100644
index 6923d1c..0000000
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/UnifiedFileItem.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縰sing System;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public class UnifiedFileItem
-    {
-        public string Name { get; set; }
-        public string FullPath { get; set; }
-        public bool IsFolder { get; set; }
-    }
-}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/AlbumArtSearchService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/AlbumArtSearchService.cs
index fcff76c..583766c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/AlbumArtSearchService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/AlbumArtSearchService.cs
@@ -1,6 +1,7 @@
 锘縰sing BetterLyrics.WinUI3.Enums;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.FileSystemService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using Microsoft.Extensions.Logging;
 using System;
@@ -22,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();
         }
@@ -77,70 +80,53 @@ namespace BetterLyrics.WinUI3.Services.AlbumArtSearchService
 
         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);
+
+            FileCacheEntity? bestMatch = null;
+
+            foreach (var item in allFiles)
             {
-                if (!folder.IsEnabled) continue;
+                var ext = Path.GetExtension(item.FileName).ToLower();
+                if (!FileHelper.MusicExtensions.Contains(ext)) continue;
 
-                try
+                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)
                 {
-                    using var fs = folder.CreateFileSystem();
-                    if (fs == null) continue;
-                    if (!await fs.ConnectAsync()) continue;
-
-                    // 閫掑綊鎵弿
-                    var foldersToScan = new Queue<string>();
-                    foldersToScan.Enqueue(""); // 鏍圭洰褰�
-
-                    while (foldersToScan.Count > 0)
-                    {
-                        var currentPath = foldersToScan.Dequeue();
-                        var items = await fs.GetFilesAsync(currentPath);
-
-                        foreach (var item in items)
-                        {
-                            if (item.IsFolder)
-                            {
-                                foldersToScan.Enqueue(Path.Combine(currentPath, item.Name));
-                                continue;
-                            }
-
-                            var ext = Path.GetExtension(item.Name).ToLower();
-                            if (FileHelper.MusicExtensions.Contains(ext))
-                            {
-                                try
-                                {
-                                    using (var stream = await fs.OpenReadAsync(item.FullPath))
-                                    {
-                                        var track = new ExtendedTrack(item.FullPath, stream);
-
-                                        bool isMetadataMatch = (track.Title == songInfo.Title && track.Artist == songInfo.DisplayArtists);
-                                        bool isFilenameMatch = StringHelper.IsSwitchableNormalizedMatch(
-                                            Path.GetFileNameWithoutExtension(item.Name),
-                                            songInfo.DisplayArtists,
-                                            songInfo.Title
-                                        );
-
-                                        if (isMetadataMatch || isFilenameMatch)
-                                        {
-                                            var bytes = track.EmbeddedPictures.FirstOrDefault()?.PictureData;
-                                            if (bytes != null && bytes.Length > 0)
-                                            {
-                                                return bytes;
-                                            }
-                                        }
-                                    }
-                                }
-                                catch
-                                {
-                                }
-                            }
-                        }
-                    }
+                    bestMatch = item;
+                    break;
                 }
-                catch
+            }
+
+            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;
         }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs
index 2da71ae..1c5d3f6 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/FileSystemService.cs
@@ -1,85 +1,606 @@
-锘縰sing BetterLyrics.WinUI3.Models;
+锘縰sing BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
 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.Extensions.Logging;
 using SQLite;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Services.FileSystemService
 {
-    public class FileSystemService : IFileSystemService
+    public partial class FileSystemService : BaseViewModel, IFileSystemService,
+        IRecipient<PropertyChangedMessage<AutoScanInterval>>,
+        IRecipient<PropertyChangedMessage<bool>>
     {
-        private readonly IUnifiedFileSystem _provider;
+        private readonly ISettingsService _settingsService;
+        private readonly ILocalizationService _localizationService;
+        private readonly ILogger<FileSystemService> _logger;
+
         private readonly SQLiteAsyncConnection _db;
         private bool _isInitialized = false;
+        private readonly System.Collections.Concurrent.ConcurrentDictionary<string, CancellationTokenSource> _folderTimerTokens = new();
+        private static readonly SemaphoreSlim _dbLock = new(1, 1);
+        private static readonly SemaphoreSlim _folderScanLock = new(1, 1);
 
-        public FileSystemService(IUnifiedFileSystem provider)
+        public FileSystemService(ISettingsService settingsService, ILocalizationService localizationService, ILogger<FileSystemService> logger)
         {
-            _provider = provider;
-
-            var dbPath = Path.Combine(Windows.Storage.ApplicationData.Current.LocalFolder.Path, "files_cache.db");
-            _db = new SQLiteAsyncConnection(dbPath);
+            _logger = logger;
+            _localizationService = localizationService;
+            _settingsService = settingsService;
+            _db = new SQLiteAsyncConnection(PathHelper.FilesCachePath);
         }
 
+        /// <summary>
+        /// 鍒濆鍖栵紙杩炴帴锛夋暟鎹簱
+        /// </summary>
+        /// <returns></returns>
         public async Task InitializeAsync()
         {
             if (_isInitialized) return;
 
-            await _provider.ConnectAsync();
-
             await _db.CreateTableAsync<FileCacheEntity>();
+
             _isInitialized = true;
         }
 
-        public async Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath)
+        public async Task<List<FileCacheEntity>> GetFilesAsync(IUnifiedFileSystem provider, FileCacheEntity? parentFolder, string configId, bool forceRefresh = false)
         {
             await InitializeAsync();
 
-            var cachedEntities = await _db.Table<FileCacheEntity>()
-                .Where(x => x.ParentPath == relativePath)
-                .ToListAsync();
-
-            var result = cachedEntities.Select(x => new UnifiedFileItem
+            string queryParentUri;
+            if (parentFolder == null)
             {
-                Name = x.Name,
-                FullPath = x.FullPath,
-                IsFolder = x.IsFolder,
-            }).ToList();
+                if (!forceRefresh) forceRefresh = true;
+                queryParentUri = "";
+            }
+            else
+            {
+                queryParentUri = parentFolder.Uri;
+            }
 
-            _ = SyncInBackground(relativePath);
-            return result;
+            List<FileCacheEntity> cachedEntities = new List<FileCacheEntity>();
+
+            if (parentFolder != null)
+            {
+                cachedEntities = await _db.Table<FileCacheEntity>()
+                    .Where(x => x.MediaFolderId == configId && x.ParentUri == queryParentUri)
+                    .ToListAsync();
+            }
+
+            bool needSync = forceRefresh || cachedEntities.Count == 0;
+
+            if (needSync)
+            {
+                cachedEntities = await SyncAsync(provider, parentFolder, configId);
+            }
+
+            return cachedEntities;
         }
 
-        private async Task SyncInBackground(string relativePath)
+        /// <summary>
+        /// 浠庤繙绔�/鏈湴鍚屾鏂囦欢鑷虫暟鎹簱锛岃闃舵涓嶄細瑙ｆ瀽鏂囦欢鍏ㄩ儴鍏冩暟鎹��
+        /// <para/>
+        /// 濡傛灉鏌愪釜宸叉湁鏂囦欢琚慨鏀规垨鏈夋柊鏂囦欢琚坊鍔狅紝浼氶鐣欑┖浣嶏紝绛夊緟鍚庣画濉厖锛堥�氬父浜ょ粰 <see cref="ScanMediaFolderAsync"/> 瀹屾垚锛�
+        /// </summary>
+        /// <param name="provider"></param>
+        /// <param name="parentFolder"></param>
+        /// <param name="configId"></param>
+        /// <returns></returns>
+        private async Task<List<FileCacheEntity>> SyncAsync(IUnifiedFileSystem provider, FileCacheEntity? parentFolder, string configId)
         {
-            var remoteItems = await _provider.GetFilesAsync(relativePath);
-
-            var newEntities = remoteItems.Select(item => new FileCacheEntity
+            List<FileCacheEntity> remoteItems;
+            try
             {
-                ParentPath = relativePath,
+                remoteItems = await provider.GetFilesAsync(parentFolder);
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"Network sync error: {ex.Message}");
+                return [];
+            }
 
-                FullPath = item.FullPath,
-                Name = item.Name,
-                IsFolder = item.IsFolder,
+            if (remoteItems == null) return [];
+
+            string targetParentUri = "";
+            if (remoteItems.Count > 0)
+            {
+                targetParentUri = remoteItems[0].ParentUri ?? "";
+            }
+            else if (parentFolder != null)
+            {
+                targetParentUri = parentFolder.Uri;
+            }
+            else
+            {
+                return [];
+            }
+
+            try
+            {
+                await _db.RunInTransactionAsync(conn =>
+                {
+                    var dbItems = conn.Table<FileCacheEntity>()
+                                      .Where(x => x.MediaFolderId == configId && x.ParentUri == targetParentUri)
+                                      .ToList();
+
+                    var dbMap = dbItems.ToDictionary(x => x.Uri, x => x);
+
+                    var remoteMap = remoteItems.GroupBy(x => x.Uri)
+                                               .Select(g => g.First())
+                                               .ToDictionary(x => x.Uri, x => x);
+
+                    var toInsert = new List<FileCacheEntity>();
+                    var toUpdate = new List<FileCacheEntity>();
+                    var toDelete = new List<FileCacheEntity>();
+
+                    foreach (var remote in remoteItems)
+                    {
+                        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; // 鏍囪涓烘湭瑙ｆ瀽锛屼笅娆′細閲嶆柊璇诲彇鍏冩暟鎹�
+
+                                toUpdate.Add(existing);
+                            }
+                            else
+                            {
+                                // 鏁版嵁搴撻噷鍘熸湁鐨� Title, Artist, LocalAlbumArtPath 閮戒細琚畬缇庝繚鐣�
+                            }
+                        }
+                        else
+                        {
+                            toInsert.Add(remote);
+                        }
+                    }
+
+                    foreach (var dbItem in dbItems)
+                    {
+                        if (!remoteMap.ContainsKey(dbItem.Uri))
+                        {
+                            toDelete.Add(dbItem);
+                        }
+                    }
+
+                    if (toInsert.Count > 0) conn.InsertAll(toInsert);
+                    if (toUpdate.Count > 0) conn.UpdateAll(toUpdate);
+                    if (toDelete.Count > 0)
+                    {
+                        foreach (var item in toDelete) conn.Delete(item);
+                    }
+                });
+
+                var finalItems = await _db.Table<FileCacheEntity>()
+                    .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(FileCacheEntity entity)
+        {
+            // 鐜板湪鐨勫疄浣撳凡缁忓寘鍚簡瀹屾暣淇℃伅锛岀洿鎺� Update 鍗冲彲
+            // 鎴戜滑鍙渶瑕佺‘淇� Where 瀛愬彞鐢ㄧ殑鏄富閿垨鑰� Uri
+
+            // 绠�鍖栫増 SQL锛岀洿鎺ョ敤 ORM 鐨� Update
+            // 浣嗗洜涓� entity 瀵硅薄鍙兘鍖呭惈涓�浜涗笉搴旇琚鐩栫殑鏃ф暟鎹紙濡傛灉澶氱嚎绋嬫搷浣滐級锛�
+            // 鎵嬪啓 SQL 鍙洿鏂� Metadata 瀛楁鏇村畨鍏ㄣ��
+
+            string sql = @"
+                UPDATE FileCache 
+                SET 
+                    Title = ?, Artists = ?, Album = ?, 
+                    Year = ?, Bitrate = ?, SampleRate = ?, BitDepth = ?, 
+                    Duration = ?, AudioFormatName = ?, AudioFormatShortName = ?, Encoder = ?,
+                    EmbeddedLyrics = ?, LocalAlbumArtPath = ?, 
+                    IsMetadataParsed = 1 
+                WHERE Id = ?"; // 鎺ㄨ崘鐢� Id (涓婚敭) 鏈�蹇紝濡傛灉娌℃湁 Id 鍒欑敤 Uri
+
+            await _db.ExecuteAsync(sql,
+                entity.Title, entity.Artists, entity.Album,
+                entity.Year, entity.Bitrate, entity.SampleRate, entity.BitDepth,
+                entity.Duration, entity.AudioFormatName, entity.AudioFormatShortName, entity.Encoder,
+                entity.EmbeddedLyrics, entity.LocalAlbumArtPath,
+                entity.Id // WHERE Id = ?
+            );
+        }
+
+        public async Task<Stream?> OpenFileAsync(IUnifiedFileSystem provider, FileCacheEntity entity)
+        {
+            // 鐩存帴浼犻�掑疄浣撶粰 Provider
+            return await provider.OpenReadAsync(entity);
+        }
+
+        public async Task DeleteCacheForMediaFolderAsync(MediaFolder folder)
+        {
+            _dispatcherQueue.TryEnqueue(() =>
+            {
+                folder.CleaningUpStatusText = _localizationService.GetLocalizedString("FileSystemServiceCleaningCache");
+                folder.IsCleaningUp = true;
             });
 
-            await _db.RunInTransactionAsync(conn =>
+            if (_folderTimerTokens.TryRemove(folder.Id, out var cts))
             {
-                conn.Execute("DELETE FROM FileCache WHERE ParentPath = ?", relativePath);
-                conn.InsertAll(newEntities);
+                cts.Cancel();
+                cts.Dispose();
+                _logger.LogInformation("DeleteCacheForMediaFolderAsync: {}", "cts.Dispose();");
+            }
+
+            try
+            {
+                await _folderScanLock.WaitAsync();
+
+                try
+                {
+                    await InitializeAsync();
+
+                    await _dbLock.WaitAsync();
+                    try
+                    {
+                        await _db.ExecuteAsync("DELETE FROM FileCache WHERE MediaFolderId = ?", folder.Id);
+                        await _db.ExecuteAsync("VACUUM");
+                    }
+                    finally
+                    {
+                        _dbLock.Release();
+                    }
+                }
+                finally
+                {
+                    _folderScanLock.Release();
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("DeleteCacheForMediaFolderAsync: {}", ex.Message);
+            }
+            finally
+            {
+                _dispatcherQueue.TryEnqueue(() =>
+                {
+                    folder.CleaningUpStatusText = "";
+                    folder.IsCleaningUp = false;
+                    folder.LastSyncTime = null;
+                });
+            }
+        }
+
+        public async Task ScanMediaFolderAsync(MediaFolder folder, CancellationToken token = default)
+        {
+            if (folder == null || !folder.IsEnabled) return;
+
+            _dispatcherQueue.TryEnqueue(() =>
+            {
+                folder.IsIndexing = true;
+                folder.IndexingProgress = 0;
+                folder.IndexingStatusText = _localizationService.GetLocalizedString("FileSystemServiceWaitingForScan");
             });
 
-            FolderUpdated?.Invoke(this, relativePath);
+            try
+            {
+                await _folderScanLock.WaitAsync(token);
+
+                _dispatcherQueue.TryEnqueue(() => folder.IndexingStatusText = _localizationService.GetLocalizedString("FileSystemServiceConnecting"));
+
+                await InitializeAsync();
+
+                using var fs = folder.CreateFileSystem();
+                if (fs == null || !await fs.ConnectAsync())
+                {
+                    _dispatcherQueue.TryEnqueue(() => folder.IndexingStatusText = _localizationService.GetLocalizedString("FileSystemServiceConnectFailed"));
+                    return;
+                }
+
+                _dispatcherQueue.TryEnqueue(() => folder.IndexingStatusText = _localizationService.GetLocalizedString("FileSystemServiceFetchingFileList"));
+
+                var filesToProcess = new List<FileCacheEntity>();
+                var foldersToScan = new Queue<FileCacheEntity?>();
+                foldersToScan.Enqueue(null); // 鏍圭洰褰�
+
+                while (foldersToScan.Count > 0)
+                {
+                    if (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 (token.IsCancellationRequested) return;
+
+                    current++;
+
+                    if (current % 10 == 0 || current == total)
+                    {
+                        double progress = (double)current / total * 100;
+                        _dispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Low, () =>
+                        {
+                            folder.IndexingProgress = progress;
+                            folder.IndexingStatusText = $"{_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, 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)
+                        {
+                            await _dbLock.WaitAsync(token);
+                            try
+                            {
+                                await UpdateMetadataAsync(item);
+                            }
+                            finally
+                            {
+                                _dbLock.Release();
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError("ScanMediaFolderAsync: {}", ex.Message);
+                    }
+                }
+
+                _dispatcherQueue.TryEnqueue(() =>
+                {
+                    folder.LastSyncTime = DateTime.Now;
+                });
+            }
+            catch (OperationCanceledException)
+            {
+                // 姝ｅ父鍙栨秷
+            }
+            catch (Exception ex)
+            {
+                _dispatcherQueue.TryEnqueue(() => folder.IndexingStatusText = ex.Message);
+            }
+            finally
+            {
+                _folderScanLock.Release();
+
+                _dispatcherQueue.TryEnqueue(() =>
+                {
+                    folder.IsIndexing = false;
+                    folder.IndexingStatusText = "";
+                    folder.IndexingProgress = 100;
+                });
+            }
         }
 
-        public async Task<Stream> OpenFileAsync(UnifiedFileItem item)
+        public async Task<List<FileCacheEntity>> GetParsedFilesAsync(IEnumerable<string> enabledConfigIds)
         {
-            return await _provider.OpenReadAsync(item.FullPath);
+            await InitializeAsync();
+
+            if (enabledConfigIds == null || !enabledConfigIds.Any())
+            {
+                return new List<FileCacheEntity>();
+            }
+
+            var idList = enabledConfigIds.ToList();
+
+            // SQL 閫昏緫: SELECT * FROM FileCache WHERE IsMetadataParsed = 1 AND MediaFolderId IN (...)
+            var results = await _db.Table<FileCacheEntity>()
+                                    .Where(x => x.IsMetadataParsed && idList.Contains(x.MediaFolderId))
+                                    .ToListAsync();
+
+            return results;
         }
 
+        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);
+        }
+
+        // 鍙傛暟涓� string parentUri锛岃〃绀哄摢涓枃浠跺す鐨勫唴瀹瑰彉浜�
         public event EventHandler<string>? FolderUpdated;
 
+        private async Task<string?> SaveAlbumArtToDiskAsync(ExtendedTrack track)
+        {
+            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);
+                }
+            }
+        }
+
     }
 }
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs
index 26d7146..790e622 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IFileSystemService.cs
@@ -1,7 +1,9 @@
 锘縰sing BetterLyrics.WinUI3.Models;
+using BetterLyrics.WinUI3.Services.FileSystemService.Providers;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace BetterLyrics.WinUI3.Services.FileSystemService
@@ -9,8 +11,54 @@ namespace BetterLyrics.WinUI3.Services.FileSystemService
     public interface IFileSystemService
     {
         Task InitializeAsync();
-        Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath);
-        Task<Stream> OpenFileAsync(UnifiedFileItem item);
+
+        /// <summary>
+        /// 浠庢暟鎹簱鎷夊彇鏂囦欢锛堝繀瑕佹椂闇�瑕佷粠杩滅/鏈湴鍚屾鑷虫暟鎹簱锛�
+        /// </summary>
+        /// <param name="provider"></param>
+        /// <param name="parentFolder"></param>
+        /// <param name="configId"></param>
+        /// <param name="forceRefresh">寮哄埗闇�瑕佷粠杩滅/鏈湴鍚屾鑷虫暟鎹簱</param>
+        /// <returns></returns>
+        Task<List<FileCacheEntity>> GetFilesAsync(IUnifiedFileSystem provider, FileCacheEntity? parentFolder, string configId, bool forceRefresh = false);
+
+        /// <summary>
+        /// 鎵撳紑鏂囦欢锛堥�氳繃杩滅/鏈湴娴侊級
+        /// </summary>
+        /// <param name="provider"></param>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<Stream?> OpenFileAsync(IUnifiedFileSystem provider, FileCacheEntity entity);
+
+        /// <summary>
+        /// 鏇存柊鏁版嵁搴擄紙鍗曚釜鏂囦欢锛�
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task UpdateMetadataAsync(FileCacheEntity entity);
+
+        /// <summary>
+        /// 浠庢暟鎹簱鍒犻櫎
+        /// </summary>
+        /// <param name="folder"></param>
+        /// <returns></returns>
+        Task DeleteCacheForMediaFolderAsync(MediaFolder folder);
+
+        /// <summary>
+        /// 浠庢暟鎹簱鎷夊彇鏂囦欢锛堝繀瑕佹椂闇�瑕佷粠杩滅/鏈湴鍚屾鑷虫暟鎹簱锛夈�傚浜庨渶瑕佽В鏋愮殑鏂囦欢锛屾墦寮�娴佸～鍏呭厓鏁版嵁骞跺洖鍐欒嚦鏁版嵁搴撱��
+        /// </summary>
+        /// <param name="folder"></param>
+        /// <returns></returns>
+        Task ScanMediaFolderAsync(MediaFolder folder, CancellationToken token = default);
+
+        /// <summary>
+        /// 浠庢暟鎹簱鎷夊彇
+        /// </summary>
+        /// <param name="enabledConfigIds"></param>
+        /// <returns></returns>
+        Task<List<FileCacheEntity>> GetParsedFilesAsync(IEnumerable<string> enabledConfigIds);
+
+        void StartAllFolderTimers();
 
         event EventHandler<string> FolderUpdated;
     }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IUnifiedFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IUnifiedFileSystem.cs
index 3e2a8d4..1e1409c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IUnifiedFileSystem.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/IUnifiedFileSystem.cs
@@ -9,8 +9,18 @@ namespace BetterLyrics.WinUI3.Services.FileSystemService
     public interface IUnifiedFileSystem : IDisposable
     {
         Task<bool> ConnectAsync();
-        Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath);
-        Task<Stream> OpenReadAsync(string fullPath);
+        /// <summary>
+        /// 浠庢祦鎷夊彇
+        /// </summary>
+        /// <param name="parentFolder"></param>
+        /// <returns></returns>
+        Task<List<FileCacheEntity>> GetFilesAsync(FileCacheEntity? parentFolder = null);
+        /// <summary>
+        /// 鎵撳紑娴�
+        /// </summary>
+        /// <param name="file"></param>
+        /// <returns></returns>
+        Task<Stream?> OpenReadAsync(FileCacheEntity file);
         Task DisconnectAsync();
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs
index dd1a99e..0287c9a 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/FTPFileSystem.cs
@@ -1,6 +1,6 @@
 锘縰sing BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Services.FileSystemService;
 using FluentFTP;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -11,43 +11,142 @@ namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
     public partial class FTPFileSystem : IUnifiedFileSystem
     {
         private readonly AsyncFtpClient _client;
-        private readonly string _rootPath; // 鏈嶅姟鍣ㄤ笂鐨勬牴璺緞 (渚嬪 /pub/music)
+        private readonly MediaFolder _config;
 
-        public FTPFileSystem(string host, string user, string pass, int port, string remotePath)
+        public FTPFileSystem(MediaFolder config)
         {
-            // 濡傛灉 path 鏄� "192.168.1.5/Music"锛屾垜浠渶瑕佹妸 /Music 鎷嗗嚭鏉�
-            // 浣嗕负浜嗙畝鍗曪紝鍋囪 host 浠呬粎鏄� IP锛宺emotePath 鎵嶆槸璺緞
-            _rootPath = remotePath ?? "/";
+            _config = config ?? throw new ArgumentNullException(nameof(config));
 
-            var config = new FtpConfig { ConnectTimeout = 5000 };
-            _client = new AsyncFtpClient(host, user ?? "anonymous", pass ?? "", port > 0 ? port : 21, config);
+            // 鍒濆鍖� FluentFTP 閰嶇疆
+            var ftpConfig = new FtpConfig
+            {
+                ConnectTimeout = 5000,
+                // 鏍规嵁闇�瑕侀厤缃紪鐮侊紝闃叉涓枃涔辩爜
+                // Encoding = System.Text.Encoding.GetEncoding("GB2312") 
+            };
+
+            // FluentFTP 鏋勯�犲嚱鏁版帴鏀朵富鏈恒�佺敤鎴枫�佸瘑鐮併�佺鍙�
+            // 绔彛濡傛灉涓� -1 (MediaFolder 榛樿鍊�)锛屽垯璁� FluentFTP 浣跨敤榛樿 21
+            int port = _config.UriPort > 0 ? _config.UriPort : 0;
+
+            _client = new AsyncFtpClient(
+                _config.UriHost,
+                _config.UserName ?? "anonymous",
+                _config.Password ?? "",
+                port,
+                ftpConfig
+            );
         }
 
         public async Task<bool> ConnectAsync()
         {
-            await _client.AutoConnect();
-            return _client.IsConnected;
-        }
-
-        public async Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath)
-        {
-            string targetPath = Path.Combine(_rootPath, relativePath).Replace("\\", "/");
-
-            var items = await _client.GetListing(targetPath);
-            return items.Select(i => new UnifiedFileItem
+            try
             {
-                Name = i.Name,
-                FullPath = i.FullName,
-                IsFolder = i.Type == FtpObjectType.Directory,
-            }).ToList();
+                await _client.AutoConnect();
+                return _client.IsConnected;
+            }
+            catch
+            {
+                return false;
+            }
         }
 
-        public async Task<Stream> OpenReadAsync(string fullPath)
+        public async Task<List<FileCacheEntity>> GetFilesAsync(FileCacheEntity? parentFolder = null)
         {
-            return await _client.OpenRead(fullPath);
+            var result = new List<FileCacheEntity>();
+
+            // 1. 纭畾鐩爣鏈嶅姟鍣ㄨ矾寰�
+            string targetServerPath;
+            Uri parentUri;
+
+            if (parentFolder == null)
+            {
+                // 鏍圭洰褰曪細浠庨厤缃腑鎻愬彇璺緞 (渚嬪 /Music)
+                // GetStandardUri().AbsolutePath 浼氳繑鍥炲甫鍓嶅鏂滄潬鐨勮矾寰�
+                var rootUri = _config.GetStandardUri();
+                targetServerPath = rootUri.AbsolutePath; // "/Music"
+                parentUri = rootUri;
+            }
+            else
+            {
+                // 瀛愮洰褰曪細灏嗘爣鍑� URI 杞崲涓� FTP 鏈嶅姟鍣ㄨ矾寰�
+                targetServerPath = GetServerPathFromUri(parentFolder.Uri);
+                parentUri = new Uri(parentFolder.Uri);
+            }
+
+            // 纭繚璺緞鍚堟硶鎬� (FluentFTP 鍠滄 Unix 椋庢牸鏂滄潬)
+            targetServerPath = targetServerPath.Replace("\\", "/");
+            if (string.IsNullOrEmpty(targetServerPath)) targetServerPath = "/";
+
+            // 2. 鑾峰彇鍒楄〃
+            var items = await _client.GetListing(targetServerPath);
+
+            // 3. 鍑嗗 Base URI 鐢ㄤ簬鎷兼帴瀛愰」
+            // FTP URI 鍩虹閮ㄥ垎: ftp://host:port
+            string baseUriStr = $"{parentUri.Scheme}://{parentUri.Host}";
+            if (parentUri.Port > 0) baseUriStr += $":{parentUri.Port}";
+
+            foreach (var item in items)
+            {
+                // 鎺掗櫎 . 鍜� ..
+                if (item.Name == "." || item.Name == "..") continue;
+
+                // 鏋勫缓瀹屾暣鐨勬爣鍑� URI
+                // item.FullName 鏄湇鍔″櫒涓婄殑缁濆璺緞 (渚嬪 /Music/Song.mp3)
+                // 鎴戜滑闇�瑕佹妸瀹冩嫾鎴� ftp://host:port/Music/Song.mp3
+                // 娉ㄦ剰锛歅ath.Combine 鍦� Windows 涓婂彲鑳戒細鐢ㄥ弽鏂滄潬锛岃繖閲屾墜鍔ㄦ嫾鎺ユ洿瀹夊叏
+
+                string itemFullPath = item.FullName.StartsWith("/") ? item.FullName : "/" + item.FullName;
+                string standardUri = baseUriStr + itemFullPath; // Uri 鏋勯�犲嚱鏁颁細鑷姩澶勭悊缂栫爜
+
+                result.Add(new FileCacheEntity
+                {
+                    MediaFolderId = _config.Id,
+
+                    // 璁板綍鐖剁骇 URI
+                    // 濡傛灉 parentFolder 涓虹┖锛屽垯鐖剁骇鏄� Config 鐨勬牴 URI
+                    ParentUri = parentFolder?.Uri ?? _config.GetStandardUri().AbsoluteUri,
+
+                    Uri = standardUri, // 鏍囧噯鍖� URI
+
+                    FileName = item.Name,
+                    IsDirectory = item.Type == FtpObjectType.Directory,
+
+                    FileSize = item.Size,
+                    LastModified = item.Modified
+                });
+            }
+
+            return result;
+        }
+
+        public async Task<Stream?> OpenReadAsync(FileCacheEntity entity)
+        {
+            if (entity == null) return null;
+
+            // 浠庢爣鍑� URI 杩樺師鍥� FTP 鏈嶅姟鍣ㄨ矾寰�
+            string serverPath = GetServerPathFromUri(entity.Uri);
+
+            return await _client.OpenRead(serverPath);
         }
 
         public async Task DisconnectAsync() => await _client.Disconnect();
         public void Dispose() => _client?.Dispose();
+
+        // =========================================================
+        // 鈽� 绉佹湁杈呭姪鏂规硶锛歎RI -> FTP Path
+        // =========================================================
+        private string GetServerPathFromUri(string uriString)
+        {
+            // 杈撳叆: ftp://192.168.1.5:21/Music/Song.mp3
+            // 杈撳嚭: /Music/Song.mp3
+
+            var uri = new Uri(uriString);
+
+            // Uri.AbsolutePath 鑷姩鍖呭惈浜嗚矾寰勯儴鍒� (渚嬪 /Music/Song.mp3)
+            // 骞朵笖浼氳嚜鍔ㄨ繘琛� URL Decode (姣斿 %20 -> 绌烘牸)
+            // 杩欐鏄� FluentFTP 闇�瑕佺殑鏍煎紡
+            return uri.AbsolutePath;
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs
index 478bf3f..872090f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/LocalFileSystem.cs
@@ -1,5 +1,5 @@
 锘縰sing BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Services.FileSystemService;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
@@ -8,49 +8,99 @@ namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
 {
     public partial class LocalFileSystem : IUnifiedFileSystem
     {
-        private readonly string _rootPath;
+        private readonly MediaFolder _config;
+        private readonly string _rootLocalPath;
 
-        public LocalFileSystem(string rootPath)
+        public LocalFileSystem(MediaFolder config)
         {
-            _rootPath = rootPath;
+            _config = config ?? throw new ArgumentNullException(nameof(config));
+            _rootLocalPath = config.UriPath;
         }
 
         public Task<bool> ConnectAsync()
         {
-            return Task.FromResult(Directory.Exists(_rootPath));
+            return Task.FromResult(Directory.Exists(_rootLocalPath));
         }
 
-        public async Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath)
+        public async Task<List<FileCacheEntity>> GetFilesAsync(FileCacheEntity? parentFolder = null)
         {
-            var result = new List<UnifiedFileItem>();
+            var result = new List<FileCacheEntity>();
 
-            var targetPath = string.IsNullOrWhiteSpace(relativePath)
-                ? _rootPath
-                : Path.Combine(_rootPath, relativePath);
+            string targetPath;
+            string parentUriString;
 
-            if (!Directory.Exists(targetPath)) return result;
-
-            var dirInfo = new DirectoryInfo(targetPath);
-
-            foreach (var item in dirInfo.GetFileSystemInfos())
+            try
             {
-                bool isDir = (item.Attributes & FileAttributes.Directory) == FileAttributes.Directory;
-                result.Add(new UnifiedFileItem
+                if (parentFolder == null)
                 {
-                    Name = item.Name,
-                    FullPath = item.FullName,
-                    IsFolder = isDir,
-                });
+                    // 鏍圭洰褰�
+                    targetPath = _rootLocalPath;
+                    parentUriString = _config.GetStandardUri().AbsoluteUri;
+                }
+                else
+                {
+                    // 瀛愮洰褰曪細浠庢爣鍑� URI (file:///...) 杩樺師涓烘湰鍦拌矾寰� (C:\...)
+                    var uri = new Uri(parentFolder.Uri);
+                    targetPath = uri.LocalPath;
+                    parentUriString = parentFolder.Uri;
+                }
+
+                if (!Directory.Exists(targetPath)) return result;
+
+                var dirInfo = new DirectoryInfo(targetPath);
+
+                foreach (var item in dirInfo.GetFileSystemInfos())
+                {
+                    // 鐢熸垚鏍囧噯 URI 浣滀负鍞竴 ID
+                    // new Uri("C:\Path\File") 浼氳嚜鍔ㄧ敓鎴� file:///C:/Path/File
+                    var itemUri = new Uri(item.FullName).AbsoluteUri;
+
+                    bool isDir = (item.Attributes & FileAttributes.Directory) == FileAttributes.Directory;
+                    long size = 0;
+
+                    // DirectoryInfo 娌℃湁 Length 灞炴�э紝鍙湁 FileInfo 鏈�
+                    if (!isDir && item is FileInfo fi)
+                    {
+                        size = fi.Length;
+                    }
+
+                    result.Add(new FileCacheEntity
+                    {
+                        MediaFolderId = _config.Id, // 鍏宠仈閰嶇疆 ID
+
+                        ParentUri = parentUriString, // 璁板綍鐖剁骇 URI
+
+                        Uri = itemUri, // 鏍囧噯鍖� URI (file:///...)
+
+                        FileName = item.Name,
+                        IsDirectory = isDir,
+
+                        FileSize = size,
+                        LastModified = item.LastWriteTime
+                    });
+                }
             }
-            return result;
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"Local scan error: {ex.Message}");
+            }
+
+            return await Task.FromResult(result);
         }
 
-        public async Task<Stream> OpenReadAsync(string fullPath)
+        public async Task<Stream?> OpenReadAsync(FileCacheEntity entity)
         {
-            return new FileStream(fullPath, FileMode.Open, FileAccess.Read, FileShare.Read);
+            if (entity == null) return null;
+
+            // 灏嗘爣鍑� URI (file:///C:/...) 杩樺師涓烘湰鍦拌矾寰� (C:\...)
+            string localPath = new Uri(entity.Uri).LocalPath;
+
+            // 浣跨敤 FileShare.Read 鍏佽鍏朵粬绋嬪簭鍚屾椂璇诲彇
+            // 浣跨敤 useAsync: true 浼樺寲寮傛璇诲啓鎬ц兘
+            return new FileStream(localPath, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, true);
         }
 
         public async Task DisconnectAsync() => await Task.CompletedTask;
         public void Dispose() { }
     }
-}
+}
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs
index 47f637a..f24359c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBFileSystem.cs
@@ -1,5 +1,4 @@
 锘縰sing BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Services.FileSystemService;
 using SMBLibrary;
 using SMBLibrary.Client;
 using System;
@@ -12,106 +11,167 @@ namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
 {
     public partial class SMBFileSystem : IUnifiedFileSystem
     {
-        private SMB2Client _client;
-        private ISMBFileStore _fileStore;
+        private SMB2Client? _client;
+        private ISMBFileStore? _fileStore;
 
-        private readonly string _ip;
-        private readonly string _shareName;
-        private readonly string _pathInsideShare; // 鍏变韩閲岀殑瀛愯矾寰�
-        private readonly string _username;
-        private readonly string _password;
+        // 淇濆瓨閰嶇疆瀵硅薄鐨勫紩鐢紝瀹冩槸鎴戜滑鐨勨�滅湡鐞嗘潵婧愨��
+        private readonly MediaFolder _config;
 
-        // fullPathInput 渚嬪: "192.168.1.5/Music/Pop"
-        public SMBFileSystem(string fullPathInput, string user, string pass)
+        // 缂撳瓨瑙ｆ瀽鍑烘潵鐨� Share 鍚嶇О锛屽洜涓� TreeConnect 瑕佺敤
+        private string _shareName;
+
+        public SMBFileSystem(MediaFolder config)
         {
-            _username = user;
-            _password = pass;
+            _config = config ?? throw new ArgumentNullException(nameof(config));
 
-            // 瑙ｆ瀽璺緞锛氬垎绂� IP 鍜� 鍏变韩鍚�
-            var parts = fullPathInput.Replace("\\", "/").Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+            // 鍦ㄦ瀯閫犳椂灏辫В鏋愬ソ Share 鍚嶇О锛岄伩鍏嶅悗缁噸澶嶈В鏋�
+            // 鍋囪 URI 鏄� smb://host/ShareName/Folder/Sub
+            // 鎴戜滑闇�瑕佹彁鍙� "ShareName"
+            var uri = _config.GetStandardUri();
 
-            if (parts.Length >= 1) _ip = parts[0];
-            if (parts.Length >= 2) _shareName = parts[1];
-
-            // 鍓╀笅鐨勯儴鍒嗛噸鏂版嫾璧锋潵浣滀负瀛愯矾寰�
-            if (parts.Length > 2)
-                _pathInsideShare = string.Join("\\", parts.Skip(2));
+            // Segments[0] 鏄� "/", Segments[1] 鏄� "ShareName/"
+            if (uri.Segments.Length > 1)
+            {
+                _shareName = uri.Segments[1].TrimEnd('/');
+            }
             else
-                _pathInsideShare = "";
+            {
+                // 濡傛灉娌℃湁 ShareName锛岃繖鍦� SMB 涓�氬父鏄笉鍚堟硶鐨勶紝浣嗗湪鏍圭洰褰曚笅鍙兘鍙戠敓
+                _shareName = "";
+            }
         }
 
         public async Task<bool> ConnectAsync()
         {
-            _client = new SMB2Client();
-            bool connected = _client.Connect(_ip, SMBTransportType.DirectTCPTransport);
-            if (!connected) return false;
+            try
+            {
+                _client = new SMB2Client();
 
-            var status = _client.Login(string.Empty, _username, _password);
-            if (status != NTStatus.STATUS_SUCCESS) return false;
+                // 1. 杩炴帴涓绘満
+                bool connected = _client.Connect(_config.UriHost, SMBTransportType.DirectTCPTransport);
+                if (!connected) return false;
 
-            // 杩炴帴鍏蜂綋鐨勫叡浜枃浠跺す
-            if (string.IsNullOrEmpty(_shareName)) return true; // 鍙繛浜嗘湇鍔″櫒锛屾病杩炲叡浜�
+                // 2. 鐧诲綍
+                var status = _client.Login(string.Empty, _config.UserName, _config.Password);
+                if (status != NTStatus.STATUS_SUCCESS) return false;
 
-            _fileStore = _client.TreeConnect(_shareName, out status);
-            return status == NTStatus.STATUS_SUCCESS;
+                // 3. 杩炴帴鍏变韩鐩綍 (TreeConnect)
+                // 娉ㄦ剰锛歋MBLibrary 蹇呴』鍏堣繛鎺ュ埌 Share锛屽悗缁墍鏈夋枃浠舵搷浣滈兘鏄熀浜庤繖涓� Share 鐨勭浉瀵硅矾寰�
+                if (string.IsNullOrEmpty(_shareName)) return false;
+
+                _fileStore = _client.TreeConnect(_shareName, out status);
+                return status == NTStatus.STATUS_SUCCESS;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
         }
 
-        public async Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath)
+        /// <summary>
+        /// 鑾峰彇鏂囦欢鍒楄〃
+        /// </summary>
+        /// <param name="parentFolder">
+        /// 浼犲叆瑕佸垪鍑虹殑鏂囦欢澶瑰疄浣撱��
+        /// 濡傛灉浼犲叆 null锛屽垯榛樿鍒楀嚭 MediaFolder 閰嶇疆鐨勬牴鐩綍銆�
+        /// </param>
+        public async Task<List<FileCacheEntity>> GetFilesAsync(FileCacheEntity? parentFolder = null)
         {
-            var result = new List<UnifiedFileItem>();
+            var result = new List<FileCacheEntity>();
             if (_fileStore == null) return result;
 
-            // 鎷兼帴瀹屾暣璺緞: Root閲岄潰鐨勫瓙璺緞 + 浼犲叆鐨勭浉瀵硅矾寰�
-            string queryPath = Path.Combine(_pathInsideShare, relativePath).Replace("/", "\\").TrimStart('\\');
+            string smbPath = GetPathRelativeToShare(parentFolder);
 
-            // 鎵撳紑鐩綍
-            var statusRet = _fileStore.CreateFile(out object handle, out FileStatus status, queryPath,
+            var statusRet = _fileStore.CreateFile(out object handle, out FileStatus status, smbPath,
                 AccessMask.GENERIC_READ, SMBLibrary.FileAttributes.Directory, ShareAccess.Read,
                 CreateDisposition.FILE_OPEN, CreateOptions.FILE_DIRECTORY_FILE, null);
 
             if (statusRet != NTStatus.STATUS_SUCCESS) return result;
 
+            // 纭繚 parentUriString 鎬绘槸浠� / 缁撳熬锛屾柟渚垮悗缁嫾鎺�
+            string parentUriString = parentFolder?.Uri ?? _config.GetStandardUri().AbsoluteUri;
+
             List<QueryDirectoryFileInformation> fileInfo;
+
             do
             {
                 statusRet = _fileStore.QueryDirectory(out fileInfo, handle, "*", FileInformationClass.FileDirectoryInformation);
 
-                List<FileDirectoryInformation> list = fileInfo.Select(x => (FileDirectoryInformation)x).ToList();
-                foreach (var item in list)
+                // 銆愬畨鍏ㄦ鏌ャ�戝鏋滄煡璇㈠け璐ユ垨鑰呮病鏈夋洿澶氭枃浠讹紝fileInfo 鍙兘鏄� null锛岀洿鎺ヨ烦鍑�
+                if (statusRet != NTStatus.STATUS_SUCCESS && statusRet != NTStatus.STATUS_NO_MORE_FILES)
                 {
-                    // 鎺掗櫎褰撳墠鐩綍鍜岀埗鐩綍
-                    if (item.FileName == "." || item.FileName == "..") continue;
+                    break;
+                }
 
-                    result.Add(new UnifiedFileItem
+                // 濡傛灉鏄� NO_MORE_FILES 浣� fileInfo 渚濈劧鏈夋畫鐣欐暟鎹紙鏋佸皯瑙侊級锛屾垨鑰呮槸 SUCCESS
+                if (fileInfo != null)
+                {
+                    foreach (var item in fileInfo.Cast<FileDirectoryInformation>())
                     {
-                        Name = item.FileName,
-                        FullPath = Path.Combine(queryPath, item.FileName),
-                        IsFolder = (item.FileAttributes & SMBLibrary.FileAttributes.Directory) == SMBLibrary.FileAttributes.Directory,
-                    });
+                        if (item.FileName == "." || item.FileName == "..") continue;
+
+                        // ==================================================
+                        // 鈽� 淇鍚庣殑 URI 鏋勫缓閫昏緫
+                        // ==================================================
+
+                        // 鏂规硶 A (鎺ㄨ崘): 浣跨敤 Uri 鏋勯�犲嚱鏁拌嚜鍔ㄥ悎骞�
+                        // 1. 纭繚 Base Uri 浠� / 缁撳熬 (鍚﹀垯 "folder" + "file" 浼氬彉鎴� "file" 鏇挎崲鎺� "folder")
+                        if (!parentUriString.EndsWith("/")) parentUriString += "/";
+                        var baseUri = new Uri(parentUriString);
+
+                        // 2. 鐩存帴鍒╃敤 Uri 鐨勬瀯閫犲嚱鏁板鐞嗙浉瀵硅矾寰�
+                        // new Uri(baseUri, "filename") 浼氳嚜鍔ㄥ鐞嗙紪鐮佸拰鏂滄潬
+                        // 娉ㄦ剰锛氬鏋� item.FileName 鍖呭惈鐗规畩瀛楃锛孶ri 绫讳細鑷姩甯垜浠紪鐮�
+                        var newUri = new Uri(baseUri, item.FileName);
+
+                        // 濡傛灉浣犺繕鏄兂鐢� UriBuilder (鎵嬪姩鎺у埗鏇村己)锛岃鐢ㄤ笅闈㈣繖琛屼唬鏇夸笂闈細
+                        /*
+                        var builder = new UriBuilder(baseUri);
+                        // 鍏抽敭锛氬厛 Unescape 瑙ｇ爜锛屽彉鍥炲師濮嬪瓧绗︿覆锛屽啀鎷兼帴锛屾渶鍚庤祴鍊肩粰 builder 璁╁畠閲嶆柊缂栫爜
+                        string cleanBasePath = Uri.UnescapeDataString(baseUri.AbsolutePath); 
+                        builder.Path = Path.Combine(cleanBasePath, item.FileName).Replace("\\", "/");
+                        var newUri = builder.Uri;
+                        */
+
+                        result.Add(new FileCacheEntity
+                        {
+                            MediaFolderId = _config.Id,
+                            ParentUri = parentFolder?.Uri ?? _config.GetStandardUri().AbsoluteUri, // 淇濇寔鍘熷鐖剁骇 URI (涓嶅甫鏈熬鏂滄潬鐨�)
+
+                            Uri = newUri.AbsoluteUri, // 浣跨敤淇鍚庣殑 URI
+
+                            FileName = item.FileName,
+                            IsDirectory = (item.FileAttributes & SMBLibrary.FileAttributes.Directory) == SMBLibrary.FileAttributes.Directory,
+                            FileSize = item.AllocationSize,
+                            LastModified = item.ChangeTime
+                        });
+                    }
                 }
 
-                if (statusRet == NTStatus.STATUS_NO_MORE_FILES)
-                {
-                    break;
-                }
+                if (statusRet == NTStatus.STATUS_NO_MORE_FILES) break;
 
-                if (statusRet != NTStatus.STATUS_SUCCESS)
-                {
-                    // Log
-                    break;
-                }
             } while (statusRet == NTStatus.STATUS_SUCCESS);
 
             _fileStore.CloseFile(handle);
             return result;
         }
 
-        public async Task<Stream> OpenReadAsync(string fullPath)
+        /// <summary>
+        /// 鎵撳紑鏂囦欢娴�
+        /// </summary>
+        /// <param name="file">鍙渶瑕佷紶鍏ユ枃浠跺疄浣撳嵆鍙�</param>
+        public async Task<Stream?> OpenReadAsync(FileCacheEntity file)
         {
-            var ret = _fileStore.CreateFile(out object handle, out FileStatus status, fullPath,
+            if (_fileStore == null || file == null) return null;
+
+            // 鈽� 鏍稿績绠�鍖栵細鐩存帴鎶婂璞℃墧杩涘幓锛岃幏鍙栬矾寰�
+            string smbPath = GetPathRelativeToShare(file);
+
+            var ret = _fileStore.CreateFile(out object handle, out FileStatus status, smbPath,
                 AccessMask.GENERIC_READ | AccessMask.SYNCHRONIZE, 0, ShareAccess.Read, CreateDisposition.FILE_OPEN, 0, null);
 
-            if (ret != NTStatus.STATUS_SUCCESS) throw new IOException($"SMB Open Error: {ret}");
+            if (ret != NTStatus.STATUS_SUCCESS)
+                throw new IOException($"SMB Open Error: {ret}");
 
             return new SMBReadOnlyStream(_fileStore, handle);
         }
@@ -126,5 +186,47 @@ namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
         {
             _client?.Disconnect();
         }
+
+        // =========================================================
+        // 鈽� 绉佹湁榄旀硶鏂规硶锛氬鐞嗘墍鏈変护浜哄ご澶х殑璺緞閫昏緫
+        // =========================================================
+        private string GetPathRelativeToShare(FileCacheEntity? entity)
+        {
+            Uri targetUri;
+
+            if (entity == null)
+            {
+                targetUri = _config.GetStandardUri();
+            }
+            else
+            {
+                targetUri = new Uri(entity.Uri);
+            }
+
+            // 1. 鑾峰彇缁濆璺緞
+            // 鈽呪槄鈽� 鍏抽敭淇锛氬繀椤昏В鐮侊紒鎶� %20 鍙樺洖绌烘牸 鈽呪槄鈽�
+            // targetUri.AbsolutePath -> "/Share/My%20Music/Song.mp3"
+            // Uri.UnescapeDataString -> "/Share/My Music/Song.mp3"
+            string absolutePath = Uri.UnescapeDataString(targetUri.AbsolutePath);
+
+            // 2. 绉婚櫎 ShareName 閮ㄥ垎
+            // 纭繚绉婚櫎寮�澶寸殑 /
+            string cleanPath = absolutePath.TrimStart('/');
+
+            // 鎵惧埌 ShareName 鍚庣殑绗竴涓枩鏉�
+            int slashIndex = cleanPath.IndexOf('/');
+
+            if (slashIndex == -1)
+            {
+                // 濡傛灉娌℃湁鏂滄潬锛岃鏄庡氨鏄� Share 鏍圭洰褰�
+                return string.Empty;
+            }
+
+            // 鎴彇 Share 涔嬪悗鐨勯儴鍒�
+            string relativePath = cleanPath.Substring(slashIndex + 1);
+
+            // 3. 杞崲涓� Windows 椋庢牸鐨勫弽鏂滄潬 (SMB 鍗忚瑕佹眰)
+            return relativePath.Replace("/", "\\");
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBReadOnlyStream.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBReadOnlyStream.cs
index 1046fd6..08f2f81 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBReadOnlyStream.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/SMBReadOnlyStream.cs
@@ -10,7 +10,10 @@ namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
         private readonly ISMBFileStore _store;
         private readonly object _handle;
         private long _position;
-        private long _length; // 鏂板锛氱紦瀛樻枃浠堕暱搴�
+        private long _length;
+
+        // SMB 鍗忚寤鸿鐨勬渶澶ц鍙栧潡澶у皬 (64KB 鏄渶瀹夊叏鐨勯�氱敤鍊�)
+        private const int MaxReadChunkSize = 65536;
 
         public SMBReadOnlyStream(ISMBFileStore store, object handle)
         {
@@ -25,18 +28,15 @@ namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
             }
             else
             {
-                // 濡傛灉鑾峰彇澶辫触锛岃繖鏄竴涓弗閲嶉棶棰橈紝鎰忓懗鐫�鏃犳硶 Seek 鍒版湯灏�
-                // 鏆傛椂璁句负 0锛屼絾鍚庣画璇诲彇鍙兘浼氬嚭闂
-                _length = 0;
+                _length = 0; // 杩欐槸涓�涓闄╃偣锛屼絾涓轰簡涓� crash 鍏堣涓� 0
+                System.Diagnostics.Debug.WriteLine($"SMB GetLength Error: {status}");
             }
         }
 
         public override bool CanRead => true;
         public override bool CanSeek => true;
         public override bool CanWrite => false;
-
         public override long Length => _length;
-
         public override long Position
         {
             get => _position;
@@ -45,30 +45,49 @@ namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
 
         public override int Read(byte[] buffer, int offset, int count)
         {
-            // 淇濇姢锛氬鏋滀綅缃凡缁忚秴杩囨枃浠舵湯灏撅紝鐩存帴杩斿洖 0 (EOF)
             if (_position >= _length) return 0;
 
-            // 淇濇姢锛氶槻姝㈣鍙栬秺鐣� (璇锋眰璇诲彇閲忎笉鑳借秴杩囧墿浣欓噺)
-            long remaining = _length - _position;
-            int bytesToRequest = (int)Math.Min(count, remaining);
+            int totalBytesRead = 0;
+            int remainingRequest = count;
 
-            // 涓轰簡瀹夊叏锛屼繚鐣欏 remaining 鐨勬鏌ユ槸蹇呴』鐨�
-            if (bytesToRequest <= 0) return 0;
-
-            var status = _store.ReadFile(out byte[] data, _handle, _position, bytesToRequest);
-
-            if (status == NTStatus.STATUS_END_OF_FILE) return 0;
-
-            if (status != NTStatus.STATUS_SUCCESS)
+            // 寰幆璇诲彇锛岀洿鍒拌瀹岃姹傜殑鏁伴噺锛屾垨鑰呮枃浠剁粨鏉�
+            while (remainingRequest > 0)
             {
-                throw new IOException($"SMB Read failed. Status: {status} (Pos: {_position}, Req: {bytesToRequest})");
+                // 璁＄畻鍓╀綑鏂囦欢闀垮害
+                long remainingFile = _length - _position;
+                if (remainingFile <= 0) break; // 宸插埌鏈熬
+
+                // 璁＄畻鏈 SMB 璇锋眰鐨勫ぇ灏� (鍙栦笁鑰呮渶灏忓�硷細璇锋眰鍓╀綑閲忋�佹枃浠跺墿浣欓噺銆丼MB鏈�澶у潡闄愬埗)
+                int bytesToReadThisChunk = (int)Math.Min(Math.Min(remainingRequest, remainingFile), MaxReadChunkSize);
+
+                // 鍙戦�� SMB 璇锋眰
+                var status = _store.ReadFile(out byte[] data, _handle, _position, bytesToReadThisChunk);
+
+                // 澶勭悊缁撴灉
+                if (status == NTStatus.STATUS_END_OF_FILE) break;
+
+                if (status != NTStatus.STATUS_SUCCESS)
+                {
+                    // 閬囧埌閿欒鎶涘嚭璇︾粏淇℃伅
+                    throw new IOException($"SMB Read failed. Status: {status}, Position: {_position}, ChunkReq: {bytesToReadThisChunk}");
+                }
+
+                if (data == null || data.Length == 0) break;
+
+                // 澶嶅埗鏁版嵁鍒拌緭鍑� buffer
+                Array.Copy(data, 0, buffer, offset + totalBytesRead, data.Length);
+
+                // 鏇存柊鎸囬拡鍜岃鏁板櫒
+                _position += data.Length;
+                totalBytesRead += data.Length;
+                remainingRequest -= data.Length;
+
+                // 濡傛灉瀹為檯璇诲埌鐨勬瘮璇锋眰鐨勫皯锛岄�氬父鎰忓懗鐫�鎻愬墠鍒颁簡 EOF锛屾垨鑰呯綉缁滃寘杈冨皬
+                // 杩欓噷閫夋嫨缁х画寰幆灏濊瘯锛岀洿鍒拌涓嶅鎴栬�呮槑纭� EOF
+                if (data.Length < bytesToReadThisChunk) break;
             }
 
-            if (data == null || data.Length == 0) return 0;
-
-            Array.Copy(data, 0, buffer, offset, data.Length);
-            _position += data.Length;
-            return data.Length;
+            return totalBytesRead;
         }
 
         public override long Seek(long offset, SeekOrigin origin)
@@ -88,10 +107,9 @@ namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
                     break;
             }
 
-            // 鍏佽 Seek 瓒呰繃 EOF (鏍囧噯 Stream 琛屼负)锛屼絾鍦� Read 鏃朵細杩斿洖 0
             if (newPos < 0)
             {
-                throw new IOException("An attempt was made to move the file pointer before the beginning of the file.");
+                throw new IOException("Seek before beginning.");
             }
 
             _position = newPos;
@@ -111,4 +129,4 @@ namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs
index 18d225c..6bf9c3c 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/FileSystemService/Providers/WebDavFileSystem.cs
@@ -1,5 +1,4 @@
 锘縰sing BetterLyrics.WinUI3.Models;
-using BetterLyrics.WinUI3.Services.FileSystemService;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -12,70 +11,129 @@ namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
     public partial class WebDavFileSystem : IUnifiedFileSystem
     {
         private readonly WebDavClient _client;
-        private readonly string _baseUrl;
-        private readonly string _rootPath;
+        private readonly MediaFolder _config;
+        private readonly Uri _baseAddress;
 
-        // host: http://192.168.1.5:5005
-        // path: /music
-        public WebDavFileSystem(string host, string user, string pass, int port, string path)
+        public WebDavFileSystem(MediaFolder config)
         {
-            if (!host.StartsWith("http")) host = $"http://{host}";
-            if (port > 0) host = $"{host}:{port}";
+            _config = config ?? throw new ArgumentNullException(nameof(config));
 
-            _baseUrl = host;
-            _rootPath = path ?? "/";
+            // 1. 鏋勫缓 BaseAddress (鍙寘鍚� http://host:port/)
+            // MediaFolder.GetStandardUri() 杩斿洖鐨勬槸甯﹁矾寰勭殑瀹屾暣 URI (http://host:port/path)
+            // 鎴戜滑闇�瑕佹彁鍙栧嚭鏍圭敤浜庡垵濮嬪寲 WebDavClient
+            var fullUri = _config.GetStandardUri();
+
+            // 鎻愬彇 "http://host:port"
+            _baseAddress = new Uri($"{fullUri.Scheme}://{fullUri.Authority}");
 
             _client = new WebDavClient(new WebDavClientParams
             {
-                BaseAddress = new Uri(_baseUrl),
-                Credentials = new System.Net.NetworkCredential(user, pass)
+                BaseAddress = _baseAddress,
+                Credentials = new System.Net.NetworkCredential(_config.UserName, _config.Password)
             });
         }
 
         public async Task<bool> ConnectAsync()
         {
-            // WebDAV 鏃犵姸鎬侊紝Propfind 娴嬭瘯鏍圭洰褰曡繛閫氭��
-            var result = await _client.Propfind(_rootPath);
-            return result.IsSuccessful;
+            try
+            {
+                // 娴嬭瘯杩炴帴锛歅ropfind 璇锋眰閰嶇疆鐨勬牴璺緞
+                // GetStandardUri 宸茬粡鍖呭惈浜嗙敤鎴疯缃殑璺緞
+                var result = await _client.Propfind(_config.GetStandardUri().AbsoluteUri);
+                return result.IsSuccessful;
+            }
+            catch
+            {
+                return false;
+            }
         }
 
-        public async Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath)
+        public async Task<List<FileCacheEntity>> GetFilesAsync(FileCacheEntity? parentFolder = null)
         {
-            var targetPath = Path.Combine(_rootPath, relativePath).Replace("\\", "/");
-            var result = await _client.Propfind(targetPath);
+            var list = new List<FileCacheEntity>();
+
+            // 1. 纭畾鐩爣 URI
+            Uri targetUri;
+            if (parentFolder == null)
+            {
+                targetUri = _config.GetStandardUri();
+            }
+            else
+            {
+                targetUri = new Uri(parentFolder.Uri);
+            }
+
+            // 2. 鍙戦�佽姹� (浣跨敤缁濆 URI)
+            // WebDavClient 鍏佽浼犲叆缁濆璺緞锛屽畠浼氳嚜鍔ㄥ鐞�
+            var result = await _client.Propfind(targetUri.AbsoluteUri);
 
-            var list = new List<UnifiedFileItem>();
             if (result.IsSuccessful)
             {
+                // 3. 鍑嗗鐖剁骇 URI 瀛楃涓� (鐢ㄤ簬濉厖 Entity)
+                // 纭繚浠� / 缁撳熬锛屾柟渚垮悗缁�昏緫鍒ゆ柇鎴栨暟鎹簱鏌ヨ
+                string parentUriString = targetUri.AbsoluteUri;
+                if (!parentUriString.EndsWith("/")) parentUriString += "/";
+
+                // WebDAV 鍙兘浼氭妸鏂囦欢澶硅嚜宸变綔涓虹粨鏋滆繑鍥烇紝鎴戜滑闇�瑕佽繃婊ゅ畠
+                // 姣旇緝鏃跺拷鐣ユ湯灏炬枩鏉�
+                string targetPathClean = targetUri.AbsolutePath.TrimEnd('/');
+
                 foreach (var res in result.Resources)
                 {
-                    if (res == null || res.Uri == null) continue;
+                    // res.Uri 閫氬父鏄浉瀵硅矾寰勶紝渚嬪 "/dav/music/file.mp3"
+                    // 鎴戜滑闇�瑕佸皢鍏惰浆鎹负缁濆 URI
+                    var itemUri = new Uri(_baseAddress, res.Uri);
+
+                    // 鈽� 杩囨护鎺夋枃浠跺す鑷韩
+                    // 姣旇緝 AbsolutePath (渚嬪 /dav/music vs /dav/music)
+                    if (itemUri.AbsolutePath.TrimEnd('/') == targetPathClean) continue;
+
+                    // 鑾峰彇鏂囦欢鍚� (瑙ｇ爜)
+                    // res.DisplayName 鏈夋椂鍊欐槸绌虹殑锛岃繖鏃跺�欓渶瑕佷粠 Uri 瑙ｆ瀽
+                    string name = res.DisplayName;
+                    if (string.IsNullOrEmpty(name))
+                    {
+                        // 鍙栨渶鍚庝竴娈碉紝蹇界暐鏈熬鏂滄潬
+                        name = itemUri.AbsolutePath.TrimEnd('/').Split('/').Last();
+                        name = System.Net.WebUtility.UrlDecode(name);
+                    }
 
-                    // 鎺掗櫎鎺夋枃浠跺す鑷韩 (WebDAV 閫氬父浼氭妸褰撳墠璇锋眰鐨勬枃浠跺す浣滀负绗竴涓粨鏋滆繑鍥�)
-                    // 閫氳繃鍒ゆ柇 URL 缁撳熬鏄惁涓�鑷存潵绠�鍗曡繃婊わ紝鎴栬�呭垽鏂� IsCollection 涓� Uri 鐩稿悓
-                    // 杩欓噷绠�鍗曞鐞嗭細鍙鍚嶅瓧涓嶄负绌�
-                    var name = System.Net.WebUtility.UrlDecode(res.Uri.Split('/').LastOrDefault());
                     if (string.IsNullOrEmpty(name)) continue;
 
-                    // 濡傛灉鍚嶅瓧鍜岃姹傜殑鐩綍鍚嶄竴鏍凤紝鍙兘鏄畠鑷繁锛岃烦杩� (杩欓渶瑕佹牴鎹叿浣撴湇鍔″櫒鍝嶅簲璋冩暣)
-                    // 鏇寸ǔ濡ョ殑鏄瘮杈� Uri
-
-                    list.Add(new UnifiedFileItem
+                    list.Add(new FileCacheEntity
                     {
-                        Name = name,
-                        FullPath = res.Uri.ToString(), // WebDAV 闇�瑕佸畬鏁� URI 
-                        IsFolder = res.IsCollection,
+                        MediaFolderId = _config.Id,
+
+                        // 璁板綍鐖剁骇 URI (淇濇寔浼犲叆鏃剁殑褰㈠紡锛屾垨鑰呯粺涓�鏍囧噯)
+                        // 娉ㄦ剰锛氬浜� WebDAV锛孭arentUri 鏈�濂戒笉甯︽湯灏炬枩鏉狅紝闄ら潪鏄牴
+                        ParentUri = parentFolder?.Uri ?? _config.GetStandardUri().AbsoluteUri,
+
+                        // 鈽� 瀛樺偍瀹屾暣鐨� http://... 鏍囧噯 URI
+                        Uri = itemUri.AbsoluteUri,
+
+                        FileName = name,
+                        IsDirectory = res.IsCollection,
+
+                        // WebDAV 閫氬父鑳芥彁渚涜繖浜涗俊鎭�
+                        FileSize = res.ContentLength ?? 0,
+                        LastModified = res.LastModifiedDate
                     });
                 }
             }
+
             return list;
         }
 
-        public async Task<Stream> OpenReadAsync(string fullPath)
+        public async Task<Stream?> OpenReadAsync(FileCacheEntity entity)
         {
-            // WebDAV 鑾峰彇娴�
-            var res = await _client.GetRawFile(fullPath);
-            if (!res.IsSuccessful) throw new IOException($"WebDAV Error: {res.StatusCode}");
+            if (entity == null) return null;
+
+            // WebDAV 鑾峰彇娴侊紝鐩存帴浣跨敤瀹屾暣 URI
+            var res = await _client.GetRawFile(entity.Uri);
+
+            if (!res.IsSuccessful)
+                throw new IOException($"WebDAV Error {res.StatusCode}: {res.Description}");
+
             return res.Stream;
         }
 
@@ -83,4 +141,4 @@ namespace BetterLyrics.WinUI3.Services.FileSystemService.Providers
 
         public void Dispose() => _client?.Dispose();
     }
-}
+}
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/ILibWatcherService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/ILibWatcherService.cs
deleted file mode 100644
index 82652ae..0000000
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/ILibWatcherService.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-锘�// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Events;
-using System;
-
-namespace BetterLyrics.WinUI3.Services.LibWatcherService
-{
-    public interface ILibWatcherService
-    {
-        event EventHandler<LibChangedEventArgs>? MusicLibraryFilesChanged;
-    }
-}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/LibWatcherService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/LibWatcherService.cs
deleted file mode 100644
index cd4faf4..0000000
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LibWatcherService/LibWatcherService.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-锘�// 2025/6/23 by Zhe Fang
-
-using BetterLyrics.WinUI3.Events;
-using BetterLyrics.WinUI3.Services.SettingsService;
-using BetterLyrics.WinUI3.ViewModels;
-using Microsoft.UI.Dispatching;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace BetterLyrics.WinUI3.Services.LibWatcherService
-{
-    public class LibWatcherService : BaseViewModel, IDisposable, ILibWatcherService
-    {
-        private readonly ISettingsService _settingsService;
-        private readonly Dictionary<string, FileSystemWatcher> _watchers = [];
-
-        public LibWatcherService(ISettingsService settingsService)
-        {
-            _settingsService = settingsService;
-            _settingsService.AppSettings.LocalMediaFolders.CollectionChanged += LocalMediaFolders_CollectionChanged;
-            _settingsService.AppSettings.LocalMediaFolders.ItemPropertyChanged += LocalMediaFolders_ItemPropertyChanged;
-            UpdateWatchers();
-        }
-
-        private void LocalMediaFolders_ItemPropertyChanged(object? sender, Collections.ItemPropertyChangedEventArgs e)
-        {
-            UpdateWatchers();
-        }
-
-        private void LocalMediaFolders_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-        {
-            UpdateWatchers();
-        }
-
-        public event EventHandler<LibChangedEventArgs>? MusicLibraryFilesChanged;
-
-        public void Dispose()
-        {
-            foreach (var watcher in _watchers.Values)
-            {
-                watcher.Dispose();
-            }
-            _watchers.Clear();
-        }
-
-        private void UpdateWatchers()
-        {
-            var folders = _settingsService.AppSettings.LocalMediaFolders;
-            // 绉婚櫎涓嶅啀鐩戝惉鐨�
-            foreach (var key in _watchers.Keys.ToList())
-            {
-                if (!folders.Any(x => x.Path == key && x.IsEnabled && x.IsRealTimeWatchEnabled))
-                {
-                    _watchers[key].Dispose();
-                    _watchers.Remove(key);
-                }
-            }
-
-            // 娣诲姞鏂扮殑鐩戝惉
-            foreach (var folder in folders)
-            {
-                if (!_watchers.ContainsKey(folder.Path) && Directory.Exists(folder.Path) && folder.IsEnabled && folder.IsRealTimeWatchEnabled)
-                {
-                    var watcher = new FileSystemWatcher(folder.Path)
-                    {
-                        IncludeSubdirectories = true,
-                        EnableRaisingEvents = true,
-                    };
-                    watcher.Created += (s, e) => OnChanged(folder.Path, e);
-                    watcher.Changed += (s, e) => OnChanged(folder.Path, e);
-                    watcher.Deleted += (s, e) => OnChanged(folder.Path, e);
-                    watcher.Renamed += (s, e) => OnChanged(folder.Path, e);
-                    _watchers[folder.Path] = watcher;
-                }
-            }
-        }
-
-        private void OnChanged(string folder, FileSystemEventArgs e)
-        {
-            _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
-            {
-                MusicLibraryFilesChanged?.Invoke(
-                    this,
-                    new LibChangedEventArgs(folder, e.FullPath, e.ChangeType)
-                );
-            });
-        }
-    }
-}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs
index 133c959..108e319 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs
@@ -5,6 +5,7 @@ using BetterLyrics.WinUI3.Extensions;
 using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Providers;
+using BetterLyrics.WinUI3.Services.FileSystemService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using Lyricify.Lyrics.Helpers;
 using Lyricify.Lyrics.Searchers;
@@ -28,11 +29,13 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
         private readonly AppleMusic _appleMusic;
 
         private readonly ISettingsService _settingsService;
+        private readonly IFileSystemService _fileSystemService;
         private readonly ILogger _logger;
 
-        public LyricsSearchService(ISettingsService settingsService, ILogger<LyricsSearchService> logger)
+        public LyricsSearchService(ISettingsService settingsService, IFileSystemService fileSystemService, ILogger<LyricsSearchService> logger)
         {
             _settingsService = settingsService;
+            _fileSystemService = fileSystemService;
             _logger = logger;
 
             _lrcLibHttpClient = new();
@@ -276,92 +279,49 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
         {
             int maxScore = 0;
 
-            MediaFolder? bestFolder = null;
-            string? bestFilePath = null;
+            FileCacheEntity? bestFileEntity = null;
+            MediaFolder? bestFolderConfig = null;
 
             var lyricsSearchResult = new LyricsSearchResult();
-
             if (format.ToLyricsSearchProvider() is LyricsSearchProvider lyricsSearchProvider)
             {
                 lyricsSearchResult.Provider = lyricsSearchProvider;
             }
 
-            foreach (var folder in _settingsService.AppSettings.LocalMediaFolders)
+            string targetExt = format.ToFileExtension();
+
+            var enabledFolders = _settingsService.AppSettings.LocalMediaFolders
+                .Where(f => f.IsEnabled)
+                .ToList();
+
+            var enabledIds = enabledFolders.Select(f => f.Id).ToList();
+
+            if (enabledIds.Count == 0) return lyricsSearchResult;
+
+            var allFiles = await _fileSystemService.GetParsedFilesAsync(enabledIds);
+
+            foreach (var item in allFiles)
             {
-                if (!folder.IsEnabled) continue;
-
-                try
+                if (item.FileName.EndsWith(targetExt, StringComparison.OrdinalIgnoreCase))
                 {
-                    using var fs = folder.CreateFileSystem();
-                    if (fs == null) continue;
-                    if (!await fs.ConnectAsync()) continue;
+                    int score = MetadataComparer.CalculateScore(songInfo, new LyricsSearchResult { Reference = item.FileName });
 
-                    // 閫掑綊鎵弿
-                    var foldersToScan = new Queue<string>();
-                    foldersToScan.Enqueue(""); // 浠庢牴鐩綍寮�濮�
-
-                    string targetExt = format.ToFileExtension();
-
-                    while (foldersToScan.Count > 0)
+                    if (score > maxScore)
                     {
-                        var currentPath = foldersToScan.Dequeue();
-                        var items = await fs.GetFilesAsync(currentPath);
+                        maxScore = score;
+                        bestFileEntity = item;
 
-                        foreach (var item in items)
-                        {
-                            if (item.IsFolder)
-                            {
-                                foldersToScan.Enqueue(Path.Combine(currentPath, item.Name));
-                                continue;
-                            }
-
-                            if (item.Name.EndsWith(targetExt, StringComparison.OrdinalIgnoreCase))
-                            {
-                                int score = MetadataComparer.CalculateScore(songInfo, new LyricsSearchResult { Reference = item.FullPath });
-
-                                if (score > maxScore)
-                                {
-                                    maxScore = score;
-                                    bestFilePath = item.FullPath;
-                                    bestFolder = folder;
-                                }
-                            }
-                        }
+                        bestFolderConfig = enabledFolders.FirstOrDefault(f => f.Id == item.MediaFolderId);
                     }
                 }
-                catch (Exception ex)
-                {
-                    // 鏃ュ織璁板綍...
-                }
             }
 
-            // 4. 濡傛灉鎵惧埌浜嗘渶浣冲尮閰嶏紝璇诲彇鍐呭
-            if (bestFolder != null && bestFilePath != null)
+            if (bestFileEntity != null)
             {
-                try
-                {
-                    // 閲嶆柊杩炴帴浠ヨ鍙栨枃浠� (鍥犱负涔嬪墠鐨� fs 宸茬粡鍦� using 缁撴潫鏃堕噴鏀�)
-                    using var fs = bestFolder.CreateFileSystem();
-                    if (fs != null && await fs.ConnectAsync())
-                    {
-                        using var stream = await fs.OpenReadAsync(bestFilePath);
+                lyricsSearchResult.Raw = bestFileEntity.EmbeddedLyrics;
 
-                        // 浣跨敤 StreamReader 璇诲彇鏂囨湰
-                        // 娉ㄦ剰锛氳繖閲岀畝鍗曚娇鐢� Default 缂栫爜锛屽鏋滈渶瑕佹帰娴嬬紪鐮�(FileHelper.GetEncoding)锛�
-                        // 鍙兘闇�瑕佸厛璇讳竴閮ㄥ垎瀛楄妭鏉ュ垽鏂紝鎴栬�呬娇鐢ㄥ甫缂栫爜鎺㈡祴鐨勫簱銆�
-                        using var reader = new StreamReader(stream);
-
-                        string raw = await reader.ReadToEndAsync();
-
-                        lyricsSearchResult.Reference = bestFilePath;
-                        lyricsSearchResult.MatchPercentage = maxScore;
-                        lyricsSearchResult.Raw = raw;
-                    }
-                }
-                catch (Exception)
-                {
-                    // 璇诲彇澶辫触澶勭悊
-                }
+                lyricsSearchResult.Reference = bestFileEntity.Uri;
+                lyricsSearchResult.MatchPercentage = maxScore;
             }
 
             return lyricsSearchResult;
@@ -369,107 +329,52 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
 
         private async Task<LyricsSearchResult> SearchEmbedded(SongInfo songInfo)
         {
-            int bestScore = 0;
-            string? bestFilePath = null;
-            string? bestRaw = null;
-
-            // 鐢ㄤ簬鏈�鍚庡洖濉� Metadata
-            string? bestTitle = null;
-            string[]? bestArtists = null;
-            string? bestAlbum = null;
-            double bestDuration = 0;
-
             var lyricsSearchResult = new LyricsSearchResult
             {
                 Provider = LyricsSearchProvider.LocalMusicFile,
             };
 
-            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 lyricsSearchResult;
+
+            var allFiles = await _fileSystemService.GetParsedFilesAsync(enabledIds);
+
+            FileCacheEntity? bestFile = null;
+            int maxScore = 0;
+
+            foreach (var item in allFiles)
             {
-                if (!folder.IsEnabled) continue;
+                if (string.IsNullOrEmpty(item.EmbeddedLyrics)) continue;
 
-                try
+                int score = MetadataComparer.CalculateScore(songInfo, new LyricsSearchResult
                 {
-                    using var fs = folder.CreateFileSystem();
-                    if (fs == null) continue;
-                    if (!await fs.ConnectAsync()) continue;
+                    Title = item.Title,
+                    Artists = item.Artists?.Split(ATL.Settings.DisplayValueSeparator),
+                    Album = item.Album,
+                    Duration = item.Duration
+                });
 
-                    var foldersToScan = new Queue<string>();
-                    foldersToScan.Enqueue("");
-
-                    while (foldersToScan.Count > 0)
-                    {
-                        var currentPath = foldersToScan.Dequeue();
-                        var items = await fs.GetFilesAsync(currentPath);
-
-                        foreach (var item in items)
-                        {
-                            if (item.IsFolder)
-                            {
-                                foldersToScan.Enqueue(Path.Combine(currentPath, item.Name));
-                                continue;
-                            }
-
-                            var ext = Path.GetExtension(item.Name).ToLower();
-                            if (FileHelper.MusicExtensions.Contains(ext))
-                            {
-                                try
-                                {
-                                    using var stream = await fs.OpenReadAsync(item.FullPath);
-
-                                    var track = new ExtendedTrack(item.FullPath, stream);
-                                    var raw = track.RawLyrics;
-
-                                    if (!string.IsNullOrEmpty(raw))
-                                    {
-                                        int score = MetadataComparer.CalculateScore(songInfo, new LyricsSearchResult
-                                        {
-                                            Title = track.Title,
-                                            Artists = track.Artist?.Split(ATL.Settings.DisplayValueSeparator),
-                                            Album = track.Album,
-                                            Duration = track.Duration,
-                                            Reference = item.FullPath,
-                                        });
-
-                                        if (score > bestScore)
-                                        {
-                                            bestScore = score;
-                                            bestFilePath = item.FullPath;
-                                            bestRaw = raw;
-
-                                            // 缂撳瓨褰撳墠鏈�浣崇殑鍏冩暟鎹紝閬垮厤鏈�鍚庤繕闇�瑕侀噸鏂版墦寮�鏂囦欢璇讳竴娆�
-                                            bestTitle = track.Title;
-                                            bestArtists = track.Artist?.Split(ATL.Settings.DisplayValueSeparator);
-                                            bestAlbum = track.Album;
-                                            bestDuration = track.Duration;
-                                        }
-                                    }
-                                }
-                                catch
-                                {
-                                    // 鍗曚釜鏂囦欢瑙ｆ瀽澶辫触蹇界暐
-                                }
-                            }
-                        }
-                    }
-                }
-                catch
+                if (score > maxScore)
                 {
-                    // 鏂囦欢澶规壂鎻忓け璐ュ拷鐣�
+                    maxScore = score;
+                    bestFile = item;
                 }
             }
 
-            if (bestFilePath != null)
+            if (bestFile != null && maxScore > 0)
             {
-                // 鐩存帴浣跨敤缂撳瓨鐨勬暟鎹紝涓嶉渶瑕� new Track(bestFile) 浜�
-                lyricsSearchResult.Title = bestTitle;
-                lyricsSearchResult.Artists = bestArtists;
-                lyricsSearchResult.Album = bestAlbum;
-                lyricsSearchResult.Duration = bestDuration;
+                lyricsSearchResult.Title = bestFile.Title;
+                lyricsSearchResult.Artists = bestFile.Artists?.Split(ATL.Settings.DisplayValueSeparator);
+                lyricsSearchResult.Album = bestFile.Album;
+                lyricsSearchResult.Duration = bestFile.Duration;
 
-                lyricsSearchResult.Raw = bestRaw;
-                lyricsSearchResult.Reference = bestFilePath;
-                lyricsSearchResult.MatchPercentage = bestScore;
+                lyricsSearchResult.Raw = bestFile.EmbeddedLyrics;
+                lyricsSearchResult.Reference = bestFile.Uri;
+                lyricsSearchResult.MatchPercentage = maxScore;
             }
 
             return lyricsSearchResult;
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs
index 008e239..96edc3e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.AlbumArtUpdater.cs
@@ -9,6 +9,7 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs
index 8b33ccd..7200c06 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/MediaSessionsService/MediaSessionsService.cs
@@ -11,7 +11,6 @@ using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.AlbumArtSearchService;
 using BetterLyrics.WinUI3.Services.DiscordService;
-using BetterLyrics.WinUI3.Services.LibWatcherService;
 using BetterLyrics.WinUI3.Services.LyricsSearchService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.Services.TranslationService;
@@ -27,6 +26,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml.Controls;
 using System;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Text.Json;
@@ -41,7 +41,8 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
     public partial class MediaSessionsService : BaseViewModel, IMediaSessionsService,
         IRecipient<PropertyChangedMessage<bool>>,
         IRecipient<PropertyChangedMessage<string>>,
-        IRecipient<PropertyChangedMessage<ChineseRomanization>>
+        IRecipient<PropertyChangedMessage<ChineseRomanization>>,
+        IRecipient<PropertyChangedMessage<DateTime?>>
     {
         private EventSourceReader? _sse = null;
         private readonly MediaManager _mediaManager = new();
@@ -52,7 +53,6 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
         private readonly ITranslationService _translationService;
         private readonly ITransliterationService _transliterationService;
         private readonly ISettingsService _settingsService;
-        private readonly ILibWatcherService _libWatcherService;
         private readonly IDiscordService _discordService;
         private readonly ILogger<MediaSessionsService> _logger;
 
@@ -71,7 +71,6 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             ISettingsService settingsService,
             IAlbumArtSearchService albumArtSearchService,
             ILyricsSearchService lyricsSearchService,
-            ILibWatcherService libWatcherService,
             IDiscordService discordService,
             ITranslationService libreTranslateService,
             ITransliterationService transliterationService,
@@ -80,7 +79,6 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             _settingsService = settingsService;
             _albumArtSearchService = albumArtSearchService;
             _lyrcsSearchService = lyricsSearchService;
-            _libWatcherService = libWatcherService;
             _translationService = libreTranslateService;
             _transliterationService = transliterationService;
             _discordService = discordService;
@@ -91,13 +89,10 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             _settingsService.AppSettings.MediaSourceProvidersInfo.ItemPropertyChanged += MediaSourceProvidersInfo_ItemPropertyChanged;
 
             _settingsService.AppSettings.LocalMediaFolders.CollectionChanged += LocalMediaFolders_CollectionChanged;
-            _settingsService.AppSettings.LocalMediaFolders.ItemPropertyChanged += LocalMediaFolders_ItemPropertyChanged;
 
             _settingsService.AppSettings.MappedSongSearchQueries.CollectionChanged += MappedSongSearchQueries_CollectionChanged;
             _settingsService.AppSettings.MappedSongSearchQueries.ItemPropertyChanged += MappedSongSearchQueries_ItemPropertyChanged;
 
-            _libWatcherService.MusicLibraryFilesChanged += LibWatcherService_MusicLibraryFilesChanged;
-
             InitMediaManager();
         }
 
@@ -111,12 +106,6 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             UpdateLyrics();
         }
 
-        private void LocalMediaFolders_ItemPropertyChanged(object? sender, ItemPropertyChangedEventArgs e)
-        {
-            UpdateAlbumArt();
-            UpdateLyrics();
-        }
-
         private void LocalMediaFolders_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
         {
             UpdateAlbumArt();
@@ -144,12 +133,6 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             }
         }
 
-        private void LibWatcherService_MusicLibraryFilesChanged(object? sender, LibChangedEventArgs e)
-        {
-            UpdateAlbumArt();
-            UpdateLyrics();
-        }
-
         private MediaSourceProviderInfo? GetCurrentMediaSourceProviderInfo()
         {
             var desiredSession = GetCurrentSession();
@@ -693,6 +676,14 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
                     MediaManager_OnFocusedSessionChanged(null);
                 }
             }
+            else if (message.Sender is MediaFolder)
+            {
+                if (message.PropertyName == nameof(MediaFolder.IsEnabled))
+                {
+                    UpdateAlbumArt();
+                    UpdateLyrics();
+                }
+            }
         }
 
         public void Receive(PropertyChangedMessage<string> message)
@@ -726,5 +717,16 @@ namespace BetterLyrics.WinUI3.Services.MediaSessionsService
             }
         }
 
+        public void Receive(PropertyChangedMessage<DateTime?> message)
+        {
+            if (message.Sender is MediaFolder)
+            {
+                if (message.PropertyName == nameof(MediaFolder.LastSyncTime))
+                {
+                    UpdateAlbumArt();
+                    UpdateLyrics();
+                }
+            }
+        }
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ar/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ar/Resources.resw
index ee25b0e..d6b23e9 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ar/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ar/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>鬲毓匕乇 丕賱丕鬲氐丕賱 亘禺丕丿賲 賲賵爻賷賯賶 LX貙 賷乇噩賶 丕賱丕賳鬲賯丕賱 廿賱賶 丕賱廿毓丿丕丿丕鬲 - 賲氐丿乇 丕賱鬲卮睾賷賱 - LX Music - 禺丕丿賲 賲賵爻賷賯賶 LX 賱賱鬲丨賯賯 賲賲丕 廿匕丕 鬲賲 廿丿禺丕賱 丕賱乇丕亘胤 亘卮賰賱 氐丨賷丨</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value />
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>賵囟毓 賲賱亍 丕賱卮丕卮丞</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>毓乇囟 賲賯爻賲</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>廿囟丕賮丞 廿賱賶 賯丕卅賲丞 丕賱鬲卮睾賷賱</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>賲賰鬲亘丞 丕賱賲賵爻賷賯賶 - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>賵囟毓 丕賱卮丕卮丞 丕賱囟賷賯丞</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>賲賰鬲亘丞 丕賱賵爻丕卅胤 丕賱賲丨賱賷丞</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>賲乇丕賯亘丞 鬲睾賷賷乇丕鬲 丕賱賲賱賮丕鬲 賮賷 丕賱賵賯鬲 丕賱丨賯賷賯賷</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>賵囟毓 丕賱卮丕卮丞 丕賱囟賷賯丞</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/de/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/de/Resources.resw
index dc18230..b35447d 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/de/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/de/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>Verbindung zum LX Music Server fehlgeschlagen. Bitte pr眉fen Sie unter Einstellungen - Wiedergabequelle - LX Music - LX Music Server, ob der Link korrekt ist</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value />
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>Vollbildmodus</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>Geteilte Ansicht</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>Zur Wiedergabeliste hinzuf眉gen</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>Musikgalerie - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>Schmaler Modus</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>Lokale Medienbibliothek</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>Echtzeit-Datei眉berwachung</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>Schmaler Modus</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en/Resources.resw
index 6d3cd5e..4bc3f02 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>Unable to connect to LX Music Server. Please go to Settings - Playback Source - LX Music - LX Music Server to check if the link is entered correctly</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value>Cleaning cache...</value>
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value>Connection failed</value>
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value>Connecting...</value>
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value>Fetching file list...</value>
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value>Parsing...</value>
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value>Waiting for scan...</value>
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>Fullscreen Mode</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>Split View</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value>Last Sync Time</value>
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value>Sync now</value>
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>Add to playlist</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>Music Gallery - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value>Auto-sync Frequency</value>
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value>Never</value>
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value>Every Day</value>
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value>Every 15 Minutes</value>
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value>Every Hour</value>
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value>Every 6 Hours</value>
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>Narrow Mode</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>Local Media Library</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>Real-time file monitoring</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>Narrow Mode</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/es/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/es/Resources.resw
index 27ace95..74a660f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/es/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/es/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>No se puede conectar al servidor LX Music. Vaya a Configuraci贸n - Fuente de reproducci贸n - LX Music - Servidor LX Music para verificar si el enlace es correcto</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value />
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>Modo Pantalla Completa</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>Vista dividida</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>A帽adir a lista de reproducci贸n</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>Galer铆a de M煤sica - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>Modo Estrecho</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>Biblioteca multimedia local</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>Monitoreo de archivos en tiempo real</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>Modo Estrecho</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/fr/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/fr/Resources.resw
index d54cbca..0e19e63 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/fr/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/fr/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>Impossible de se connecter au serveur LX Music. Veuillez aller dans Param猫tres - Source de lecture - LX Music - Serveur LX Music pour v茅rifier si le lien est correct</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value />
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>Mode Plein 茅cran</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>Vue scind茅e</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>Ajouter 脿 la liste de lecture</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>Galerie de musique - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>Mode 脡troit</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>Biblioth猫que multim茅dia locale</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>Surveillance des fichiers en temps r茅el</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>Mode 脡troit</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/hi/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/hi/Resources.resw
index c323290..c7c8ea4 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/hi/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/hi/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>LX Music 啶膏ぐ啷嵿さ啶� 啶膏 啶曕え啷囙啷嵿 啶ㄠす啷�啶� 啶灌 啶膏啶むぞ, 啶曕啶く啶� 啶膏啶熰た啶傕啷嵿じ - 啶啶侧啶啶� 啶膏啶班啶� - LX Music - LX Music 啶膏ぐ啷嵿さ啶� 啶ぐ 啶溹ぞ啶忇 啶斷ぐ 啶溹ぞ啶傕啷囙 啶曕た 啶侧た啶傕 啶膏す啷� 啶むぐ啷�啶曕 啶膏 啶︵ぐ啷嵿 啶曕た啶ぞ 啶椸く啶� 啶灌 啶ぞ 啶ㄠす啷�啶�</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value />
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>啶啶侧じ啷嵿啷嵿ぐ啷�啶� 啶啶�</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>啶掂た啶ぞ啶溹た啶� 啶︵啶多啶�</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>啶啶侧啶侧た啶膏啶� 啶啶� 啶溹啶∴ぜ啷囙</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>啶膏啶椸啶� 啶侧ぞ啶囙が啷嵿ぐ啷囙ぐ啷� - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>啶膏啶曕啶班啶� 啶啶�</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>啶膏啶ムぞ啶ㄠ啶� 啶啶∴た啶ぞ 啶侧ぞ啶囙が啷嵿ぐ啷囙ぐ啷�</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>啶ぜ啶距啶� 啶ぐ啶苦さ啶班啶むえ啷嬥 啶曕 啶掂ぞ啶膏啶むさ啶苦 啶膏ぎ啶� 啶ㄠた啶椸ぐ啶距え啷�</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>啶膏啶曕啶班啶� 啶啶�</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/id/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/id/Resources.resw
index c7b0fd5..e125850 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/id/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/id/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>Tidak dapat terhubung ke server LX Music, silakan buka Pengaturan - Sumber Pemutaran - LX Music - Server LX Music untuk memeriksa apakah tautan telah dimasukkan dengan benar</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value />
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>Mode Layar Penuh</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>Tampilan Terpisah</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>Tambahkan ke daftar putar</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>Galeri Musik - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>Mode Sempit</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>Pustaka Media Lokal</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>Pemantauan Perubahan File Secara Real-time</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>Mode Sempit</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja/Resources.resw
index abc3d1a..a9ff83f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>LX Music 銈点兗銉愩兗銇帴缍氥仹銇嶃伨銇涖倱銆傘�岃ō瀹氥��-銆屽啀鐢熴偨銉笺偣銆�-銆孡X Music銆�-銆孡X Music 銈点兗銉愩兗銆嶃伀绉诲嫊銇椼�併儶銉炽偗銇屾銇椼亸鍏ュ姏銇曘倢銇︺亜銈嬨亱纰鸿獚銇椼仸銇忋仩銇曘亜</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value />
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>鍏ㄧ敾闈€儮銉笺儔</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>鍒嗗壊琛ㄧず</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>銉椼儸銈ゃ儶銈广儓銇拷鍔�</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>銉熴儱銉笺偢銉冦偗銈儯銉┿儶銉� - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>鐙亜琛ㄧず銉€兗銉�</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>銉兗銈儷銉°儑銈ｃ偄銉┿偆銉栥儵銉�</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>銉偄銉偪銈ゃ儬銇儠銈°偆銉洠瑕�</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>鐙亜琛ㄧず銉€兗銉�</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko/Resources.resw
index 709eb99..ebad581 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>LX Music 靹滊矂鞐� 鞐瓣舶頃� 靾� 鞐嗢姷雼堧嫟. 靹れ爼 - 鞛儩 靻岇姢 - LX Music - LX Music 靹滊矂鞐愳劀 毵來伂臧� 鞓皵毳搓矊 鞛呺牓霅橃棃電旍 頇曥澑頃橃劯鞖�</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value />
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>鞝勳泊 頇旊┐ 氇摐</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>攵勴暊 氤搓赴</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>鞛儩 氇╇鞐� 於旉皜</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>鞚岇晠 臧る煬毽� - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>膦侅潃 頇旊┐ 氇摐</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>搿滌滑 氙鸽敂鞏� 霛检澊敫岆煬毽�</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>鞁れ嫓臧� 韺岇澕 臧愳嫓</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>膦侅潃 頇旊┐ 氇摐</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ms/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ms/Resources.resw
index 223180a..8273d27 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ms/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ms/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>Tidak dapat menyambung ke pelayan LX Music, sila pergi ke Tetapan - Sumber Main Balik - LX Music - Pelayan LX Music untuk menyemak sama ada pautan dimasukkan dengan betul</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value />
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>Mod Skrin Penuh</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>Paparan Pisah</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>Tambah ke senarai main</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>Galeri Muzik - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>Mod Sempit</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>Pustaka Media Tempatan</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>Pemantauan Perubahan Fail Masa Nyata</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>Mod Sempit</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/pt/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/pt/Resources.resw
index 174b79c..29574ca 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/pt/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/pt/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>N茫o foi poss铆vel ligar ao servidor LX Music. Aceda a Defini莽玫es - Fonte de Reprodu莽茫o - LX Music - Servidor LX Music para verificar se a liga莽茫o foi introduzida corretamente</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value />
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>Modo de Ecr茫 Inteiro</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>Vista Dividida</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>Adicionar 脿 lista de reprodu莽茫o</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>Galeria de M煤sica - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>Modo Estreito</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>Biblioteca Multim茅dia Local</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>Monitoriza莽茫o de Altera莽玫es de Ficheiros em Tempo Real</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>Modo Estreito</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ru/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ru/Resources.resw
index fa07bc7..82406f4 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ru/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ru/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>袧械 褍写邪谢芯褋褜 锌芯写泻谢褞褔懈褌褜褋褟 泻 褋械褉胁械褉褍 LX Music. 袩械褉械泄写懈褌械 胁 袧邪褋褌褉芯泄泻懈 - 袠褋褌芯褔薪懈泻 胁芯褋锌褉芯懈蟹胁械写械薪懈褟 - LX Music - 小械褉胁械褉 LX Music, 褔褌芯斜褘 锌褉芯胁械褉懈褌褜 锌褉邪胁懈谢褜薪芯褋褌褜 褋褋褘谢泻懈</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value />
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>袩芯谢薪芯褝泻褉邪薪薪褘泄 褉械卸懈屑</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>袪邪蟹写械谢械薪薪褘泄 胁懈写</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>袛芯斜邪胁懈褌褜 胁 锌谢械泄谢懈褋褌</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>袦褍蟹褘泻邪谢褜薪邪褟 谐邪谢械褉械褟 - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>校蟹泻懈泄 褉械卸懈屑</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>袥芯泻邪谢褜薪邪褟 屑械写懈邪褌械泻邪</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>小谢械写懈褌褜 蟹邪 懈蟹屑械薪械薪懈褟屑懈 褎邪泄谢芯胁 胁 褉械邪谢褜薪芯屑 胁褉械屑械薪懈</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>校蟹泻懈泄 褉械卸懈屑</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/th/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/th/Resources.resw
index 9d66f78..8c6fb46 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/th/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/th/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>喙勦浮喙堗釜喔侧浮喔侧福喔栢箑喔娻阜喙堗腑喔∴笗喙堗腑喔佮副喔氞箑喔嬥复喔｀箤喔熰箑喔о腑喔｀箤 LX Music 喙傕笡喔｀笖喙勦笡喔椸傅喙� 喔佮覆喔｀笗喔编箟喔囙竸喙堗覆 - 喙佮斧喔ム箞喔囙箑喔ム箞喔權箑喔炧弗喔� - LX Music - 喙�喔嬥复喔｀箤喔熰箑喔о腑喔｀箤 LX Music 喙�喔炧阜喙堗腑喔曕福喔о笀喔腑喔氞抚喙堗覆喔涏箟喔笝喔ム复喔囙竵喙屶笘喔灌竵喔曕箟喔竾喔福喔粪腑喙勦浮喙�</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value />
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>喙傕斧喔∴笖喙�喔曕箛喔∴斧喔權箟喔侧笀喔�</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>喔∴父喔∴浮喔竾喙佮涪喔�</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>喙�喔炧复喙堗浮喔ム竾喙冟笝喙�喔炧弗喔⑧箤喔ム复喔笗喙�</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>喔勦弗喔编竾喙�喔炧弗喔� - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>喙傕斧喔∴笖喔笝喙夃覆喙佮竸喔�</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>喙勦弗喔氞福喔侧福喔掂釜喔粪箞喔箖喔權箑喔勦福喔粪箞喔竾</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>喙�喔澿箟喔侧笖喔灌竵喔侧福喙�喔涏弗喔掂箞喔⑧笝喙佮笡喔ム竾喙勦笩喔ム箤喙佮笟喔氞箑喔｀傅喔⑧弗喙勦笚喔∴箤</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>喙傕斧喔∴笖喔笝喙夃覆喙佮竸喔�</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/vi/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/vi/Resources.resw
index e8aff97..8ef4bbd 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/vi/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/vi/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>Kh么ng th峄� k岷縯 n峄慽 v峄沬 m谩y ch峄� LX Music, vui l貌ng v脿o C脿i 膽岷穞 - Ngu峄搉 ph谩t - LX Music - M谩y ch峄� LX Music 膽峄� ki峄僲 tra xem li锚n k岷縯 膽茫 膽瓢峄 nh岷璸 ch铆nh x谩c ch瓢a</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value />
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>Ch岷� 膽峄� to脿n m脿n h矛nh</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>Ch岷� 膽峄� xem chia t谩ch</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>Th锚m v脿o danh s谩ch ph谩t</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>Th瓢 vi峄噉 nh岷 - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>Ch岷� 膽峄� h岷筽</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>Th瓢 vi峄噉 ph瓢啤ng ti峄噉 c峄 b峄�</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>L岷痭g nghe thay 膽峄昳 t峄噋 th峄漣 gian th峄眂</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>Ch岷� 膽峄� h岷筽</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hans/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hans/Resources.resw
index 323f7c7..db4edad 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hans/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hans/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>鏃犳硶杩炴帴鍒� LX 闊充箰鏈嶅姟鍣紝璇疯浆鍒拌缃� - 鎾斁婧� - LX Music - LX 闊充箰鏈嶅姟鍣ㄤ互妫�鏌ユ槸鍚︽纭緭鍏ラ摼鎺�</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value>娓呯悊缂撳瓨涓�...</value>
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value>杩炴帴澶辫触</value>
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value>杩炴帴涓�...</value>
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value>鑾峰彇鏂囦欢鍒楄〃涓�...</value>
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value>瑙ｆ瀽涓�...</value>
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value>绛夊緟鎵弿涓�...</value>
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>鍏ㄥ睆妯″紡</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>鎷嗗垎瑙嗗浘</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value>涓婃鍚屾鏃堕棿</value>
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value>绔嬪嵆鍚屾</value>
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>娣诲姞鍒版挱鏀惧垪琛�</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>闊充箰搴� - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value>鑷姩鍚屾棰戠巼</value>
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value>浠庝笉</value>
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value>姣忓ぉ</value>
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value>姣� 15 鍒嗛挓</value>
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value>姣忓皬鏃�</value>
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value>姣� 6 灏忔椂</value>
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>绐勫睆妯″紡</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>鏈湴濯掍綋搴�</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>瀹炴椂鐩戝惉鏂囦欢鍙樺寲</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>绐勫睆妯″紡</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hant/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hant/Resources.resw
index 2286718..8bf7586 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hant/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-Hant/Resources.resw
@@ -165,6 +165,24 @@
   <data name="FailToStartLXMusicServer" xml:space="preserve">
     <value>鐒℃硶閫ｇ窔鍒� LX 闊虫▊浼烘湇鍣紝璜嬭綁鍒拌ō瀹� - 鎾斁渚嗘簮 - LX Music - LX 闊虫▊浼烘湇鍣ㄤ互妾㈡煡鏄惁姝ｇ⒑杓稿叆閫ｇ祼</value>
   </data>
+  <data name="FileSystemServiceCleaningCache" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnectFailed" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceConnecting" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceFetchingFileList" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceParsing" xml:space="preserve">
+    <value />
+  </data>
+  <data name="FileSystemServiceWaitingForScan" xml:space="preserve">
+    <value />
+  </data>
   <data name="FullscreenMode" xml:space="preserve">
     <value>鍏ㄨ灑骞曟ā寮�</value>
   </data>
@@ -357,6 +375,12 @@
   <data name="MainPageSplitView.Content" xml:space="preserve">
     <value>鍒嗗壊妾㈣</value>
   </data>
+  <data name="MediaSettingsControlLastSyncTime.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MediaSettingsControlSyncNow.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="MusicGalleryPageAddToCustomList.Text" xml:space="preserve">
     <value>鍔犲叆鎾斁娓呭柈</value>
   </data>
@@ -471,6 +495,24 @@
   <data name="MusicGalleryPageTitle" xml:space="preserve">
     <value>闊虫▊搴� - BetterLyrics</value>
   </data>
+  <data name="MusicSettingsControlAutoSyncInterval.Header" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalDisabled.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryDay.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryFifteenMin.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEveryHour.Content" xml:space="preserve">
+    <value />
+  </data>
+  <data name="MusicSettingsControlAutoSyncIntervalEverySixHrs.Content" xml:space="preserve">
+    <value />
+  </data>
   <data name="NarrowMode" xml:space="preserve">
     <value>绐勫睆妯″紡</value>
   </data>
@@ -1089,9 +1131,6 @@
   <data name="SettingsPageMusicLib.Header" xml:space="preserve">
     <value>鏈濯掗珨娅�</value>
   </data>
-  <data name="SettingsPageMusicLibRealTimeWatch.Header" xml:space="preserve">
-    <value>鍗虫檪鐩ｈ伣妾旀璁婂寲</value>
-  </data>
   <data name="SettingsPageNarrowMode.Text" xml:space="preserve">
     <value>绐勫睆妯″紡</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MediaSettingsControlViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MediaSettingsControlViewModel.cs
index a533a57..56cc7a4 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MediaSettingsControlViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MediaSettingsControlViewModel.cs
@@ -3,6 +3,7 @@ using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
+using BetterLyrics.WinUI3.Services.FileSystemService;
 using BetterLyrics.WinUI3.Services.LocalizationService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.Views;
@@ -13,7 +14,9 @@ using Microsoft.UI.Xaml.Controls;
 using System;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
+using static Vanara.PInvoke.Shell32;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
@@ -21,14 +24,16 @@ namespace BetterLyrics.WinUI3.ViewModels
     {
         private readonly ISettingsService _settingsService;
         private readonly ILocalizationService _localizationService;
+        private readonly IFileSystemService _fileSystemService;
 
-        [ObservableProperty]
-        public partial AppSettings AppSettings { get; set; }
+        [ObservableProperty] public partial AppSettings AppSettings { get; set; }
 
-        public MediaSettingsControlViewModel(ISettingsService settingsService, ILocalizationService localizationService)
+        public MediaSettingsControlViewModel(ISettingsService settingsService, ILocalizationService localizationService, IFileSystemService fileSystemService)
         {
             _localizationService = localizationService;
             _settingsService = settingsService;
+            _fileSystemService = fileSystemService;
+
             AppSettings = _settingsService.AppSettings;
         }
 
@@ -36,16 +41,16 @@ namespace BetterLyrics.WinUI3.ViewModels
         {
             var normalizedPath = Path.GetFullPath(path).TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar;
 
-            if (AppSettings.LocalMediaFolders.Any(x => Path.GetFullPath(x.Path).TrimEnd(Path.DirectorySeparatorChar).Equals(normalizedPath.TrimEnd(Path.DirectorySeparatorChar), StringComparison.OrdinalIgnoreCase)))
+            if (AppSettings.LocalMediaFolders.Any(x => Path.GetFullPath(x.UriPath).TrimEnd(Path.DirectorySeparatorChar).Equals(normalizedPath.TrimEnd(Path.DirectorySeparatorChar), StringComparison.OrdinalIgnoreCase)))
             {
                 ToastHelper.ShowToast("SettingsPagePathExistedInfo", null, InfoBarSeverity.Warning);
             }
-            else if (AppSettings.LocalMediaFolders.Any(item => normalizedPath.StartsWith(Path.GetFullPath(item.Path).TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase)))
+            else if (AppSettings.LocalMediaFolders.Any(item => normalizedPath.StartsWith(Path.GetFullPath(item.UriPath).TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase)))
             {
                 // 娣诲姞鐨勬枃浠跺す鏄幇鏈夋枃浠跺す鐨勫瓙鏂囦欢澶�
                 ToastHelper.ShowToast("SettingsPagePathBeIncludedInfo", null, InfoBarSeverity.Warning);
             }
-            else if (AppSettings.LocalMediaFolders.Any(item => Path.GetFullPath(item.Path).TrimEnd(Path.DirectorySeparatorChar).StartsWith(normalizedPath, StringComparison.OrdinalIgnoreCase))
+            else if (AppSettings.LocalMediaFolders.Any(item => Path.GetFullPath(item.UriPath).TrimEnd(Path.DirectorySeparatorChar).StartsWith(normalizedPath, StringComparison.OrdinalIgnoreCase))
             )
             {
                 // 娣诲姞鐨勬枃浠跺す鏄幇鏈夋枃浠跺す鐨勭埗鏂囦欢澶�
@@ -53,13 +58,29 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
             else
             {
-                AppSettings.LocalMediaFolders.Add(new MediaFolder(path));
+                var tempFolder = new MediaFolder(path);
+                AppSettings.LocalMediaFolders.Add(tempFolder);
+                _ = Task.Run(async () => await _fileSystemService.ScanMediaFolderAsync(tempFolder));
             }
         }
 
-        public void RemoveFolderAsync(MediaFolder folder)
+        public void RemoveFolder(MediaFolder folder)
         {
-            AppSettings.LocalMediaFolders.Remove(folder);
+            _ = Task.Run(async () =>
+            {
+                await _fileSystemService.DeleteCacheForMediaFolderAsync(folder);
+                _dispatcherQueue.TryEnqueue(() =>
+                {
+                    AppSettings.LocalMediaFolders.Remove(folder);
+                });
+            });
+        }
+
+        public void SyncFolder(MediaFolder folder)
+        {
+            if (folder.IsIndexing) return;
+
+            _ = Task.Run(async () => await _fileSystemService.ScanMediaFolderAsync(folder, CancellationToken.None));
         }
 
         [RelayCommand]
@@ -91,44 +112,51 @@ namespace BetterLyrics.WinUI3.ViewModels
             {
                 var configControl = (RemoteServerConfigControl)dialog.Content;
 
-                try
+                var deferral = e.GetDeferral();
+
+                e.Cancel = true;
+
+                dialog.IsPrimaryButtonEnabled = false;
+                configControl.IsEnabled = false;
+                configControl.SetProgressBarVisibility(Visibility.Visible);
+
+                var tempFolder = configControl.GetConfig();
+
+                bool isConnected = await Task.Run(async () =>
                 {
-                    e.Cancel = true;
-
-                    dialog.IsPrimaryButtonEnabled = false;
-                    configControl.IsEnabled = false;
-                    configControl.SetProgressBarVisibility(Visibility.Visible);
-
-                    var tempFolder = configControl.GetConfig();
-
-                    var provider = tempFolder.CreateFileSystem();
-
-                    bool isConnected = provider != null && await provider.ConnectAsync();
-
-                    if (isConnected)
+                    try
                     {
-                        await provider!.DisconnectAsync();
+                        using var provider = tempFolder.CreateFileSystem();
+                        if (provider == null) return false;
 
-                        PasswordVaultHelper.Save(Constants.App.AppName, tempFolder.VaultKey, tempFolder.Password);
-                        AppSettings.LocalMediaFolders.Add(tempFolder);
-
-                        e.Cancel = false;
+                        return await provider.ConnectAsync();
                     }
-                    else
+                    catch (Exception ex)
                     {
-                        ShowErrorTip(configControl, _localizationService.GetLocalizedString("SettingsPageServerTestFailedInfo"));
+                        ShowErrorTip(configControl, ex.Message);
+                        return false;
                     }
-                }
-                catch (Exception ex)
+                });
+
+                if (isConnected)
                 {
-                    ShowErrorTip(configControl, ex.Message);
+                    AppSettings.LocalMediaFolders.Add(tempFolder);
+                    PasswordVaultHelper.Save(Constants.App.AppName, tempFolder.VaultKey, tempFolder.Password);
+
+                    _ = Task.Run(async () => await _fileSystemService.ScanMediaFolderAsync(tempFolder));
+
+                    e.Cancel = false;
                 }
-                finally
+                else
                 {
-                    dialog.IsPrimaryButtonEnabled = true;
-                    configControl.IsEnabled = true;
-                    configControl.SetProgressBarVisibility(Visibility.Collapsed);
+                    ShowErrorTip(configControl, _localizationService.GetLocalizedString("SettingsPageServerTestFailedInfo"));
                 }
+
+                dialog.IsPrimaryButtonEnabled = true;
+                configControl.IsEnabled = true;
+                configControl.SetProgressBarVisibility(Visibility.Collapsed);
+
+                deferral.Complete();
             };
 
             await dialog.ShowAsync();
@@ -136,8 +164,6 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         private void ShowErrorTip(RemoteServerConfigControl control, string message)
         {
-            // 浣犲彲浠ュ湪 RemoteServerConfigControl 閲屽姞涓�涓� InfoBar 鐢ㄦ潵鏄剧ず閿欒
-            // 鍋囪浣犲湪 UserControl 閲屽叕寮�浜嗕竴涓� ShowError 鏂规硶
             control.ShowError(message);
         }
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs
index 06d723e..105dc95 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs
@@ -6,18 +6,20 @@ using BetterLyrics.WinUI3.Helper;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.FileSystemService;
-using BetterLyrics.WinUI3.Services.LibWatcherService;
 using BetterLyrics.WinUI3.Services.LocalizationService;
 using BetterLyrics.WinUI3.Services.SettingsService;
 using BetterLyrics.WinUI3.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.Mvvm.Messaging.Messages;
 using CommunityToolkit.WinUI;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -26,14 +28,17 @@ using Windows.Media;
 using Windows.Media.Core;
 using Windows.Media.Playback;
 using Windows.Storage;
+using Windows.Storage.Streams;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
-    public partial class MusicGalleryPageViewModel : BaseViewModel
+    public partial class MusicGalleryPageViewModel : BaseViewModel,
+        IRecipient<PropertyChangedMessage<DateTime?>>,
+        IRecipient<PropertyChangedMessage<bool>>
     {
-        private readonly ILibWatcherService _libWatcherService;
         private readonly ISettingsService _settingsService;
         private readonly ILocalizationService _localizationService;
+        private readonly IFileSystemService _fileSystemService;
 
         private readonly MediaPlayer _mediaPlayer = new();
         private readonly MediaTimelineController _timelineController = new();
@@ -41,6 +46,10 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         private readonly DispatcherQueueTimer _refreshSongsTimer;
 
+        private IRandomAccessStream? _currentStream;
+        private Stream? _currentNetStream;
+        private IUnifiedFileSystem? _currentProvider;
+
         // All songs
         private List<ExtendedTrack> _tracks = [];
         // Songs in current playlist
@@ -85,18 +94,22 @@ namespace BetterLyrics.WinUI3.ViewModels
 
         public SongsTabInfo? SelectedSongsTabInfo => SongsTabInfoList.ElementAtOrDefault(SelectedSongsTabInfoIndex);
 
-        [ObservableProperty]
-        public partial bool IsDataLoading { get; set; } = false;
+        [ObservableProperty] public partial bool IsDataLoading { get; set; } = false;
 
-        [ObservableProperty]
-        public partial ExtendedTrack TrackRightTapped { get; set; } = new();
+        [ObservableProperty] public partial ExtendedTrack TrackRightTapped { get; set; } = new();
 
         [ObservableProperty]
         public partial string SongSearchQuery { get; set; } = string.Empty;
 
-        public MusicGalleryPageViewModel(ISettingsService settingsService, ILibWatcherService libWatcherService, ILocalizationService localizationService)
+        public MusicGalleryPageViewModel(
+            ISettingsService settingsService,
+            ILocalizationService localizationService,
+            IFileSystemService fileSystemService
+        )
         {
             _localizationService = localizationService;
+            _fileSystemService = fileSystemService;
+
             _refreshSongsTimer = _dispatcherQueue.CreateTimer();
 
             _settingsService = settingsService;
@@ -110,7 +123,6 @@ namespace BetterLyrics.WinUI3.ViewModels
             RefreshSongs();
 
             _settingsService.AppSettings.LocalMediaFolders.CollectionChanged += LocalMediaFolders_CollectionChanged;
-            _settingsService.AppSettings.LocalMediaFolders.ItemPropertyChanged += LocalMediaFolders_ItemPropertyChanged;
 
             _mediaPlayer.MediaOpened += MediaPlayer_MediaOpened;
             _mediaPlayer.MediaEnded += MediaPlayer_MediaEnded;
@@ -126,19 +138,11 @@ namespace BetterLyrics.WinUI3.ViewModels
             _smtc.IsPreviousEnabled = true;
             _smtc.ButtonPressed += Smtc_ButtonPressed;
             _smtc.PlaybackPositionChangeRequested += Smtc_PlaybackPositionChangeRequested;
-
-            _libWatcherService = libWatcherService;
-            _libWatcherService.MusicLibraryFilesChanged += LibWatcherService_MusicLibraryFilesChanged;
         }
 
         private void TrackPlayingQueue_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
         {
-            AppSettings.MusicGallerySettings.PlayQueuePaths = [.. TrackPlayingQueue.Select(x => x.Track.Path)];
-        }
-
-        private void LocalMediaFolders_ItemPropertyChanged(object? sender, ItemPropertyChangedEventArgs e)
-        {
-            RefreshSongs();
+            AppSettings.MusicGallerySettings.PlayQueuePaths = [.. TrackPlayingQueue.Select(x => x.Track.UriPath)];
         }
 
         private void LocalMediaFolders_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
@@ -264,11 +268,6 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
         }
 
-        private void LibWatcherService_MusicLibraryFilesChanged(object? sender, Events.LibChangedEventArgs e)
-        {
-            RefreshSongs();
-        }
-
         public void CancelRefreshSongs()
         {
         }
@@ -278,102 +277,36 @@ namespace BetterLyrics.WinUI3.ViewModels
             _refreshSongsTimer.Debounce(() =>
             {
                 IsDataLoading = true;
-                _tracks.Clear();
 
-                Task.Run(async () =>
+                _ = Task.Run(async () =>
                 {
-                    try
+                    var enabledFolderIds = _settingsService.AppSettings.LocalMediaFolders
+                        .Where(f => f.IsEnabled)
+                        .Select(f => f.Id)
+                        .ToList();
+
+                    var cachedFiles = await _fileSystemService.GetParsedFilesAsync(enabledFolderIds);
+
+                    var newTrackList = cachedFiles
+                        .Select(x => new ExtendedTrack(x))
+                        .ToList();
+
+                    _dispatcherQueue.TryEnqueue(() =>
                     {
-                        foreach (var folder in _settingsService.AppSettings.LocalMediaFolders)
-                        {
-                            if (!folder.IsEnabled) continue;
+                        _tracks = newTrackList;
 
-                            try
-                            {
-                                // 1. 鍒涘缓搴曞眰鐨勯┍鍔� (FTP/SMB/Local)
-                                // 娉ㄦ剰锛氳繖閲屾垜浠娇鐢� using 纭繚鐢ㄥ畬閿�姣佽繛鎺�
-                                using var rawFs = folder.CreateFileSystem();
-                                if (rawFs == null) continue;
-
-                                // 2. 銆愬叧閿�戝皢椹卞姩鍖呰杩� Service
-                                // 杩欐牱浣犲氨鎷ユ湁浜嗭細缂撳瓨鑳藉姏 + 鍚庡彴闈欓粯鏇存柊鑳藉姏
-                                // 寤鸿锛氬鏋� DatabaseManager 鏄崟渚嬶紝鏈�濂藉皢鍏舵敞鍏ヨ繘鍘伙紝杩欓噷鐩存帴 new 涓轰簡婕旂ず鏂逛究
-                                var fileService = new FileSystemService(rawFs);
-
-                                // 鍒濆鍖栨暟鎹簱杩炴帴 (濡傛灉娌℃湁鍦ㄦ瀯閫犲嚱鏁伴噷鍋�)
-                                await fileService.InitializeAsync();
-
-                                // 閫掑綊鎵弿闃熷垪
-                                var foldersToScan = new Queue<string>();
-                                foldersToScan.Enqueue(""); // 浠庢牴鐩綍寮�濮�
-
-                                while (foldersToScan.Count > 0)
-                                {
-                                    var currentPath = foldersToScan.Dequeue();
-
-                                    // 3. 銆愭彁閫熴�戣繖閲屾敼鐢� Service 鑾峰彇鏂囦欢鍒楄〃
-                                    // 绗竴娆¤繍琛屼細璧扮綉缁滐紝绗簩娆¤繍琛岀洿鎺ヨ鏈湴 SQLite锛屾绉掔骇鍝嶅簲
-                                    var items = await fileService.GetFilesAsync(currentPath);
-
-                                    foreach (var item in items)
-                                    {
-                                        if (item.IsFolder)
-                                        {
-                                            // 鏂囦欢澶癸細鍔犲叆闃熷垪缁х画閫掑綊
-                                            foldersToScan.Enqueue(item.FullPath);
-                                            continue;
-                                        }
-
-                                        var ext = Path.GetExtension(item.Name).ToLower();
-                                        if (FileHelper.MusicExtensions.Contains(ext))
-                                        {
-                                            try
-                                            {
-                                                // 4. 璇诲彇鏂囦欢娴� (瑙ｆ瀽 ID3 淇℃伅)
-                                                // 娉ㄦ剰锛氳繖閲岀洰鍓嶈繕鏄摱棰堬紝鍥犱负姣忔閮借璇绘枃浠跺ご
-                                                // 浼樺寲鏂瑰悜锛氬皢 Title/Artist 涔熷瓨鍏� SQLite锛岃烦杩囪繖涓�姝�
-                                                using (var stream = await fileService.OpenFileAsync(item))
-                                                {
-                                                    // 杩欓噷鐨� item 鏄� UnifiedFileItem (Model)锛屾鏄� Service 杩斿洖鐨勭被鍨�
-                                                    ExtendedTrack track = new ExtendedTrack(item.FullPath, stream);
-
-                                                    if (track.Duration > 0)
-                                                    {
-                                                        // 璇诲彇涓撹緫鍥惧埌鍐呭瓨 (鍥犱负娴侀┈涓婅鍏抽棴)
-                                                        _ = track.EmbeddedPictures;
-                                                        _tracks.Add(track);
-                                                    }
-                                                }
-                                            }
-                                            catch (Exception ex)
-                                            {
-                                                System.Diagnostics.Debug.WriteLine($"Error loading track {item.Name}: {ex.Message}");
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                            catch (Exception ex)
-                            {
-                                System.Diagnostics.Debug.WriteLine($"Folder scan error ({folder.Name}): {ex.Message}");
-                            }
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        System.Diagnostics.Debug.WriteLine($"Global scan error: {ex.Message}");
-                    }
-
-                    _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
-                    {
+                        // 搴旂敤杩囨护鍣�
                         ApplyPlaylist();
                         ApplySongSearchQuery();
+
                         IsLocalMediaNotFound = !_filteredTracks.Any();
+
                         ApplySongOrderType();
+
                         IsDataLoading = false;
                     });
                 });
-            }, Constants.Time.DebounceTimeout);
+            }, Time.DebounceTimeout);
         }
 
         public void ApplyPlaylist()
@@ -404,7 +337,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                             if (File.Exists(path))
                             {
                                 var m3uFileContent = File.ReadAllText(path);
-                                _playlistTracks = _tracks.Where(t => m3uFileContent.Contains(t.Path)).ToList();
+                                _playlistTracks = _tracks.Where(t => m3uFileContent.Contains(t.UriPath)).ToList();
                             }
                             else
                             {
@@ -494,30 +427,111 @@ namespace BetterLyrics.WinUI3.ViewModels
         {
             _timelineController.Pause();
             _mediaPlayer.Source = null;
+
+            _currentStream?.Dispose();
+            _currentNetStream?.Dispose();
+            _currentStream = null;
+            _currentNetStream = null;
+
             if (playQueueItem == null)
             {
                 _smtc.IsEnabled = false;
+                _smtc.DisplayUpdater.ClearAll();
             }
             else
             {
                 PlayingTrack = playQueueItem.Track;
-
-                var updater = _smtc.DisplayUpdater;
-                updater.ClearAll();
-
                 _smtc.IsEnabled = true;
-                _mediaPlayer.Source = MediaSource.CreateFromUri(new Uri(PlayingTrack.Path));
 
-                var storageFile = await StorageFile.GetFileFromPathAsync(PlayingTrack.Path);
+                try
+                {
+                    // 鈽� 1. 鏌ユ壘瀵瑰簲鐨� MediaFolder 閰嶇疆
+                    // 鐜板湪鐨� PlayingTrack.Uri 鏄爣鍑嗙殑瀹屾暣 URI (渚嬪 smb://host/share/file.mp3)
+                    // 鎴戜滑閫氳繃瀵规瘮鍓嶇紑鏉ユ壘鍒板畠灞炰簬鍝釜 MediaFolder
+                    var targetFolder = _settingsService.AppSettings.LocalMediaFolders.FirstOrDefault(f =>
+                        PlayingTrack.Uri.StartsWith(f.GetStandardUri().AbsoluteUri, StringComparison.OrdinalIgnoreCase));
 
-                await updater.CopyFromFileAsync(MediaPlaybackType.Music, storageFile);
-                updater.AppMediaId = Package.Current.Id.FullName;
-                updater.MusicProperties.AlbumTitle = PlayingTrack.Album;
-                updater.MusicProperties.Genres.Add($"{ExtendedGenreFiled.FileName}{Path.GetFileNameWithoutExtension(PlayingTrack.Path)}");
-                updater.Update();
+                    if (targetFolder == null)
+                    {
+                        throw new Exception($"鎵句笉鍒版枃浠� {PlayingTrack.FileName} 瀵瑰簲鐨勫瓨鍌ㄩ厤缃�傝妫�鏌ユ湇鍔″櫒璁剧疆鏄惁宸插惎鐢ㄣ��");
+                    }
+
+                    // 鈽� 2. 鍒涘缓 Provider 骞惰繛鎺�
+                    _currentProvider = targetFolder.CreateFileSystem();
+                    if (_currentProvider == null) return;
+
+                    await _currentProvider.ConnectAsync();
+
+                    // 鈽� 3. 鏋勯�犲疄浣撳璞¤繘琛岃鍙�
+                    // FileSystemService.OpenFileAsync 鐜板湪鍙渶瑕� entity.Uri 灏辫兘宸ヤ綔
+                    var fileCacheStub = new FileCacheEntity
+                    {
+                        Uri = PlayingTrack.Uri
+                    };
+
+                    _currentNetStream = await _fileSystemService.OpenFileAsync(_currentProvider, fileCacheStub);
+
+                    _currentStream = _currentNetStream.AsRandomAccessStream();
+
+                    // 鑾峰彇 MIME 绫诲瀷 (浣跨敤 FileName 鎴� Uri 閮藉彲浠�)
+                    string contentType = GetMimeType(PlayingTrack.FileName);
+                    var mediaSource = MediaSource.CreateFromStream(_currentStream, contentType);
+
+                    _mediaPlayer.Source = mediaSource;
+
+                    // --- SMTC 鏇存柊閫昏緫 (鍩烘湰淇濇寔涓嶅彉) ---
+                    var updater = _smtc.DisplayUpdater;
+                    updater.Type = MediaPlaybackType.Music;
+
+                    updater.MusicProperties.Title = PlayingTrack.Title ?? PlayingTrack.FileName;
+                    updater.MusicProperties.Artist = PlayingTrack.Artist ?? "Unknown Artist";
+                    updater.MusicProperties.AlbumTitle = PlayingTrack.Album ?? "";
+
+                    updater.MusicProperties.Genres.Clear();
+                    // 娉ㄦ剰锛氳繖閲屾敼鐢� FileName 鑾峰彇鏂囦欢鍚嶏紝鍥犱负 UriPath 宸茶绉婚櫎
+                    updater.MusicProperties.Genres.Add($"{ExtendedGenreFiled.FileName}{Path.GetFileNameWithoutExtension(PlayingTrack.FileName)}");
+
+                    updater.AppMediaId = Package.Current.Id.FullName;
+
+                    if (!string.IsNullOrEmpty(PlayingTrack.LocalAlbumArtPath) && File.Exists(PlayingTrack.LocalAlbumArtPath))
+                    {
+                        var storageFile = await StorageFile.GetFileFromPathAsync(PlayingTrack.LocalAlbumArtPath);
+                        updater.Thumbnail = RandomAccessStreamReference.CreateFromFile(storageFile);
+                    }
+                    else
+                    {
+                        updater.Thumbnail = null;
+                    }
+
+                    updater.Update();
+                }
+                catch (Exception ex)
+                {
+                    // 寤鸿锛氭挱鏀惧け璐ユ椂寮逛釜 Toast 鎴栬�呭湪 UI 涓婃樉绀洪敊璇�
+                    System.Diagnostics.Debug.WriteLine($"PlayTrackAsync Error: {ex.Message}");
+
+                    // 鑷姩璺宠繃鎴栧仠姝�
+                    _timelineController.Pause();
+                }
             }
         }
 
+        private string GetMimeType(string path)
+        {
+            var ext = Path.GetExtension(path).ToLower();
+            return ext switch
+            {
+                ".mp3" => "audio/mpeg",
+                ".flac" => "audio/flac",
+                ".wav" => "audio/wav",
+                ".m4a" => "audio/mp4",
+                ".aac" => "audio/aac",
+                ".ogg" => "audio/ogg",
+                ".wma" => "audio/x-ms-wma",
+                _ => "application/octet-stream"
+            };
+        }
+
         partial void OnSongOrderTypeChanged(CommonSongProperty value)
         {
             ApplySongOrderType();
@@ -582,5 +596,28 @@ namespace BetterLyrics.WinUI3.ViewModels
         {
             await PlayTrackAtAsync(-1);
         }
+
+        public void Receive(PropertyChangedMessage<DateTime?> message)
+        {
+            if (message.Sender is MediaFolder)
+            {
+                if (message.PropertyName == nameof(MediaFolder.LastSyncTime))
+                {
+                    RefreshSongs();
+                }
+            }
+        }
+
+        public void Receive(PropertyChangedMessage<bool> message)
+        {
+            if (message.Sender is MediaFolder)
+            {
+                if (message.PropertyName == nameof(MediaFolder.IsEnabled))
+                {
+                    RefreshSongs();
+                }
+            }
+        }
+
     }
 }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml
index 32a832f..a2c4d62 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml
@@ -62,7 +62,7 @@
                                             </Rectangle.Fill>
                                         </Rectangle>
                                     </controls:OpacityMaskView.OpacityMask>
-                                    <Image Source="{x:Bind ViewModel.TrackRightTapped.EmbeddedPictures, Mode=OneWay, Converter={StaticResource PictureInfosToImageSourceConverter}}" Stretch="Uniform" />
+                                    <Image Source="{x:Bind ViewModel.TrackRightTapped.LocalAlbumArtPath, Mode=OneWay, Converter={StaticResource PathToImageConverter}}" Stretch="Uniform" />
                                 </controls:OpacityMaskView>
                                 <StackPanel
                                     Grid.Row="1"
@@ -76,12 +76,12 @@
                                     <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoBitrate" Value="{x:Bind ViewModel.TrackRightTapped.Bitrate, Mode=OneWay}" />
                                     <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoSampleRate" Value="{x:Bind ViewModel.TrackRightTapped.SampleRate, Mode=OneWay}" />
                                     <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoBitDepth" Value="{x:Bind ViewModel.TrackRightTapped.BitDepth, Mode=OneWay}" />
-                                    <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoFormat" Value="{x:Bind ViewModel.TrackRightTapped.AudioFormat.Name, Mode=OneWay}" />
+                                    <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoFormat" Value="{x:Bind ViewModel.TrackRightTapped.AudioFormatName, Mode=OneWay}" />
                                     <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoEncoder" Value="{x:Bind ViewModel.TrackRightTapped.Encoder, Mode=OneWay}" />
                                     <uc:PropertyRow
                                         x:Uid="MusicGalleryPageFileInfoPath"
-                                        Link="{x:Bind ViewModel.TrackRightTapped.Path, Mode=OneWay}"
-                                        Value="{x:Bind ViewModel.TrackRightTapped.Path, Mode=OneWay}" />
+                                        Link="{x:Bind ViewModel.TrackRightTapped.Uri, Mode=OneWay}"
+                                        Value="{x:Bind ViewModel.TrackRightTapped.Uri, Mode=OneWay}" />
                                     <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoLyrics" Value="{x:Bind ViewModel.TrackRightTapped.RawLyrics, Mode=OneWay}" />
                                 </StackPanel>
                             </Grid>
@@ -402,7 +402,7 @@
                                             MaxWidth="48"
                                             MaxHeight="48"
                                             CornerRadius="4">
-                                            <Image Source="{x:Bind EmbeddedPictures, Mode=OneWay, Converter={StaticResource PictureInfosToImageSourceConverter}}" Stretch="Uniform" />
+                                            <Image Source="{x:Bind LocalAlbumArtPath, Mode=OneWay, Converter={StaticResource PathToImageConverter}}" Stretch="Uniform" />
                                         </Grid>
 
                                         <!--  鍩烘湰淇℃伅  -->
@@ -414,7 +414,7 @@
                                                         <TextBlock
                                                             Margin="4,2"
                                                             FontSize="12"
-                                                            Text="{x:Bind AudioFormat.ShortName}" />
+                                                            Text="{x:Bind AudioFormatShortName}" />
                                                     </Grid>
                                                     <HyperlinkButton Padding="0" Click="ArtistHyperlibkButton_Click">
                                                         <TextBlock Text="{x:Bind Artist}" TextWrapping="Wrap" />
@@ -443,12 +443,12 @@
                                             Text="{x:Bind Duration, Converter={StaticResource SecondsToFormattedTimeConverter}}"
                                             TextWrapping="Wrap" />
 
-                                        <!--  姝屾洸鏃堕暱  -->
+                                        <!--  璺緞  -->
                                         <HyperlinkButton
                                             Grid.Column="5"
                                             VerticalAlignment="Center"
                                             Click="PathHyperlibkButton_Click"
-                                            Content="{x:Bind Path, Converter={StaticResource PathToParentFolderConverter}}" />
+                                            Content="{x:Bind ParentFolderName}" />
 
                                         <Button
                                             Grid.Column="6"
@@ -721,7 +721,6 @@
                 <labs:Shimmer Grid.Row="4" CornerRadius="6" />
                 <labs:Shimmer Grid.Row="6" CornerRadius="6" />
             </Grid>
-            <ProgressRing IsActive="{x:Bind ViewModel.IsDataLoading, Mode=OneWay}" />
         </Grid>
 
         <VisualStateManager.VisualStateGroups>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml.cs
index dd96bbb..8750c9e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml.cs
@@ -51,7 +51,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private async void SongPathHyperlinkButton_Click(object sender, RoutedEventArgs e)
         {
-            await LauncherHelper.SelectAndShowFile(((ExtendedTrack)((HyperlinkButton)sender).DataContext).Path);
+            await LauncherHelper.SelectAndShowFile(((ExtendedTrack)((HyperlinkButton)sender).DataContext).UriPath);
         }
 
         private async void PlayingQueueListVireItemGrid_Tapped(object sender, TappedRoutedEventArgs e)
@@ -236,7 +236,7 @@ namespace BetterLyrics.WinUI3.Views
                     if (File.Exists(path))
                     {
                         var content = File.ReadAllText(path);
-                        foreach (var item in ViewModel.SelectedTracks.Select(x => x.Path).ToList())
+                        foreach (var item in ViewModel.SelectedTracks.Select(x => x.UriPath).ToList())
                         {
                             if (!content.Contains(item))
                             {