From bdc31c3e0da96bf9b83fc348da961f1e35c751fc Mon Sep 17 00:00:00 2001
From: Zhe Fang <founchoo@outlook.com>
Date: Sun, 21 Dec 2025 06:34:11 -0500
Subject: [PATCH] fix: lyrics source search issue when id is not null; feat:
 support ftp, smb, webdav (still testing)

---
 .../Package.appxmanifest                      |   2 +-
 .../BetterLyrics.WinUI3/App.xaml              |   2 +-
 .../BetterLyrics.WinUI3.csproj                |  25 ++-
 .../Controls/MediaSettingsControl.xaml        |  73 +++++--
 .../Controls/MediaSettingsControl.xaml.cs     |   2 +-
 .../Controls/RemoteServerConfigControl.xaml   |  62 ++++++
 .../RemoteServerConfigControl.xaml.cs         | 101 +++++++++
 .../FileSourceTypeToIconConverter.cs          |  30 +++
 .../Converter/TrackToLyricsConverter.cs       |  24 ---
 .../Enums/FileSourceType.cs                   |  14 ++
 .../Extensions/TrackExtensions.cs             |  33 ---
 .../Models/ExtendedTrack.cs                   |  39 ++++
 .../Models/FileSystem/FTPFileSystem.cs        |  55 +++++
 .../Models/FileSystem/IUnifiedFileSystem.cs   |  17 ++
 .../Models/FileSystem/LocalFileSystem.cs      |  58 ++++++
 .../Models/FileSystem/SMBFileSystem.cs        | 131 ++++++++++++
 .../Models/FileSystem/SMBReadOnlyStream.cs    | 116 +++++++++++
 .../FileSystem/StreamFileAbstraction.cs       |  45 ++++
 .../Models/FileSystem/UnifiedFileItem.cs      |  15 ++
 .../Models/FileSystem/WebDavFileSystem.cs     |  87 ++++++++
 .../Models/LocalLyricsFolder.cs               |  20 --
 .../BetterLyrics.WinUI3/Models/MediaFolder.cs |  73 +++++++
 .../Models/PlayQueueItem.cs                   |   4 +-
 .../Models/Settings/AppSettings.cs            |   2 +-
 .../AlbumArtSearchService.cs                  |  64 +++++-
 .../LyricsSearchService.cs                    | 197 +++++++++++++-----
 .../Strings/en-US/Resources.resw              |  24 ++-
 .../Strings/ja-JP/Resources.resw              |  24 ++-
 .../Strings/ko-KR/Resources.resw              |  24 ++-
 .../Strings/zh-CN/Resources.resw              |  24 ++-
 .../Strings/zh-TW/Resources.resw              |  24 ++-
 .../MediaSettingsControlViewModel.cs          | 101 +++++++--
 .../ViewModels/MusicGalleryPageViewModel.cs   |  93 +++++++--
 .../Views/MusicGalleryPage.xaml               |   4 +-
 .../Views/MusicGalleryPage.xaml.cs            |  22 +-
 35 files changed, 1400 insertions(+), 231 deletions(-)
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FileSourceTypeToIconConverter.cs
 delete mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TrackToLyricsConverter.cs
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/FileSourceType.cs
 delete mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/TrackExtensions.cs
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/FTPFileSystem.cs
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/IUnifiedFileSystem.cs
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/LocalFileSystem.cs
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBFileSystem.cs
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBReadOnlyStream.cs
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/StreamFileAbstraction.cs
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/UnifiedFileItem.cs
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/WebDavFileSystem.cs
 delete mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LocalLyricsFolder.cs
 create mode 100644 BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs

diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest
index 5767bf3..338aaf4 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest	
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/Package.appxmanifest	
@@ -12,7 +12,7 @@
 	<Identity
 	  Name="37412.BetterLyrics"
 	  Publisher="CN=E1428B0E-DC1D-4EA4-ACB1-4556569D5BA9"
-	  Version="1.1.198.0" />
+	  Version="1.1.201.0" />
 
 	<mp:PhoneIdentity PhoneProductId="ca4a4830-fc19-40d9-b823-53e2bff3d816" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
index 89a9e84..e13d843 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/App.xaml
@@ -65,7 +65,6 @@
             <converter:ByteArrayToImageConverter x:Key="ByteArrayToImageConverter" />
             <converter:DisplayLanguageCodeToIndexConverter x:Key="DisplayLanguageCodeToIndexConverter" />
             <converter:PathToParentFolderConverter x:Key="PathToParentFolderConverter" />
-            <converter:TrackToLyricsConverter x:Key="TrackToLyricsConverter" />
             <converter:IntToBoolConverter x:Key="IntToBoolConverter" />
             <converter:IndexToDisplayConverter x:Key="IndexToDisplayConverter" />
             <converter:IntToDoubleConverter x:Key="IntToDoubleConverter" />
@@ -75,6 +74,7 @@
             <converter:TextAlignmentTypeToHorizontalAlignmentConverter x:Key="TextAlignmentTypeToHorizontalAlignmentConverter" />
             <converter:LyricsLayoutOrientationToOrientationConverter x:Key="LyricsLayoutOrientationToOrientationConverter" />
             <converter:LyricsLayoutOrientationNegationToOrientationConverter x:Key="LyricsLayoutOrientationNegationToOrientationConverter" />
+            <converter:FileSourceTypeToIconConverter x:Key="FileSourceTypeToIconConverter" />
 
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
index b279d3e..e76e68e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/BetterLyrics.WinUI3.csproj
@@ -37,6 +37,7 @@
 		<None Remove="Controls\NowPlayingBar.xaml" />
 		<None Remove="Controls\PlaybackSettingsControl.xaml" />
 		<None Remove="Controls\PropertyRow.xaml" />
+		<None Remove="Controls\RemoteServerConfigControl.xaml" />
 		<None Remove="Controls\ShortcutTextBox.xaml" />
 		<None Remove="Controls\SystemTray.xaml" />
 		<None Remove="Controls\WindowSettingsControl.xaml" />
@@ -58,20 +59,21 @@
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" Version="0.1.251021-build.2365" />
 		<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.250703-build.2173" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-		<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.250402" />
-		<PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.2.250402" />
+		<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.2.251219" />
 		<PackageReference Include="ComputeSharp.D2D1.WinUI" Version="3.2.0" />
 		<PackageReference Include="csharp-pinyin" Version="1.0.1" />
 		<PackageReference Include="DevWinUI.Controls" Version="9.8.1" />
 		<PackageReference Include="Dubya.WindowsMediaController" Version="2.5.6" />
 		<PackageReference Include="F23.StringSimilarity" Version="7.0.1" />
 		<PackageReference Include="FlaUI.UIA3" Version="5.0.0" />
+		<PackageReference Include="FluentFTP" Version="53.0.2" />
 		<PackageReference Include="H.NotifyIcon.WinUI" Version="2.4.1" />
 		<PackageReference Include="Hqub.Last.fm" Version="2.5.1" />
 		<PackageReference Include="Interop.UIAutomationClient" Version="10.19041.0" />
@@ -85,6 +87,7 @@
 		<PackageReference Include="NTextCat" Version="0.3.65" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="10.0.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
+		<PackageReference Include="SMBLibrary" Version="1.5.5.1" />
 		<PackageReference Include="System.Drawing.Common" Version="10.0.1" />
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.1" />
 		<PackageReference Include="TagLibSharp" Version="2.3.0" />
@@ -95,6 +98,7 @@
 		<PackageReference Include="Vanara.PInvoke.User32" Version="4.2.1" />
 		<PackageReference Include="Vanara.Windows.Shell" Version="4.2.1" />
 		<PackageReference Include="VCollab.DiscordRichPresence" Version="1.7.0" />
+		<PackageReference Include="WebDav.Client" Version="2.9.0" />
 		<PackageReference Include="WinUIEx" Version="2.9.0" />
 		<PackageReference Include="z440.atl.core" Version="7.9.0" />
 	</ItemGroup>
@@ -339,6 +343,11 @@
 	<ItemGroup>
 	  <Folder Include="TemplateSelector\" />
 	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\RemoteServerConfigControl.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
 	<ItemGroup>
 	  <Page Update="Controls\NowPlayingBar.xaml">
 	    <Generator>MSBuild:Compile</Generator>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml
index 7ef65f4..964d0cd 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <UserControl
     x:Class="BetterLyrics.WinUI3.Controls.MediaSettingsControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -9,6 +8,7 @@
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:local="using:BetterLyrics.WinUI3.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="using:BetterLyrics.WinUI3.Models"
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
 
@@ -49,25 +49,32 @@
                         ItemsSource="{x:Bind ViewModel.AppSettings.LocalMediaFolders, Mode=OneWay}"
                         SelectionMode="None">
                         <ListView.ItemTemplate>
-                            <DataTemplate>
-                                <dev:SettingsExpander>
+                            <DataTemplate x:DataType="models:MediaFolder">
+                                <dev:SettingsExpander Description="{x:Bind ConnectionSummary, Mode=OneWay}" HeaderIcon="{Binding SourceType, Converter={StaticResource FileSourceTypeToIconConverter}}">
+
                                     <dev:SettingsExpander.Header>
                                         <HyperlinkButton
+                                            Padding="0"
                                             Click="LocalFolderHyperlinkButton_Click"
-                                            Content="{Binding Path, Mode=OneWay}"
-                                            Tag="{Binding Path, Mode=OneWay}" />
+                                            Content="{x:Bind Path, Mode=OneWay}"
+                                            Tag="{x:Bind Path, Mode=OneWay}"
+                                            ToolTipService.ToolTip="{x:Bind ConnectionSummary}" />
                                     </dev:SettingsExpander.Header>
-                                    <ToggleSwitch IsOn="{Binding IsEnabled, Mode=TwoWay}" />
+
+                                    <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>
-                                        <dev:SettingsCard x:Uid="SettingsPageMusicLibRealTimeWatch">
+
+                                        <dev:SettingsCard x:Uid="SettingsPageMusicLibRealTimeWatch" IsEnabled="{Binding IsLocal, Mode=OneWay}">
                                             <ToggleSwitch IsOn="{Binding IsRealTimeWatchEnabled, Mode=TwoWay}" />
                                         </dev:SettingsCard>
                                     </dev:SettingsExpander.Items>
@@ -76,15 +83,55 @@
                         </ListView.ItemTemplate>
                     </ListView>
 
-                    <dev:SettingsCard x:Uid="SettingsPageAddFolder" Style="{StaticResource DefaultSettingsExpanderItemStyle}">
-                        <Button
-                            x:Uid="SettingsPageAddFolderButton"
-                            Command="{x:Bind ViewModel.SelectAndAddFolderCommand}"
-                            CommandParameter="{Binding ElementName=RootGrid}" />
+                    <dev:SettingsCard Style="{StaticResource DefaultSettingsExpanderItemStyle}">
+                        <DropDownButton x:Uid="SettingsPageAddFolderButton">
+                            <DropDownButton.Flyout>
+                                <MenuFlyout>
+                                    <MenuFlyoutItem
+                                        x:Uid="SettingsPageLocalFolder"
+                                        Command="{x:Bind ViewModel.SelectAndAddFolderCommand}"
+                                        CommandParameter="{Binding ElementName=RootGrid}"
+                                        Icon="Folder" />
+
+                                    <MenuFlyoutSeparator />
+
+                                    <MenuFlyoutItem
+                                        Command="{x:Bind ViewModel.AddRemoteSourceCommand}"
+                                        CommandParameter="SMB"
+                                        Text="SMB"
+                                        Visibility="Collapsed">
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE839;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+
+                                    <MenuFlyoutItem
+                                        Command="{x:Bind ViewModel.AddRemoteSourceCommand}"
+                                        CommandParameter="FTP"
+                                        Text="FTP Server"
+                                        Visibility="Collapsed">
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE838;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+
+                                    <MenuFlyoutItem
+                                        Command="{x:Bind ViewModel.AddRemoteSourceCommand}"
+                                        CommandParameter="WebDAV"
+                                        Text="WebDAV"
+                                        Visibility="Collapsed">
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon FontFamily="{StaticResource IconFontFamily}" Glyph="&#xE774;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+
+                                </MenuFlyout>
+                            </DropDownButton.Flyout>
+                        </DropDownButton>
                     </dev:SettingsCard>
 
                 </StackPanel>
             </Grid>
         </ScrollViewer>
     </Grid>
-</UserControl>
+</UserControl>
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs
index 4393667..a005ca6 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/MediaSettingsControl.xaml.cs
@@ -22,7 +22,7 @@ namespace BetterLyrics.WinUI3.Controls
 
         private void SettingsPageRemovePathButton_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
         {
-            ViewModel.RemoveFolderAsync((LocalMediaFolder)(sender as HyperlinkButton)!.Tag);
+            ViewModel.RemoveFolderAsync((MediaFolder)(sender as HyperlinkButton)!.Tag);
         }
 
         private async void LocalFolderHyperlinkButton_Click(object sender, RoutedEventArgs e)
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml
new file mode 100644
index 0000000..a210805
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="BetterLyrics.WinUI3.Controls.RemoteServerConfigControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:BetterLyrics.WinUI3.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid>
+        <StackPanel Width="400" Spacing="16">
+            <InfoBar
+                x:Name="ErrorInfoBar"
+                IsClosable="True"
+                IsOpen="False"
+                Severity="Error" />
+
+            <Grid ColumnDefinitions="*, Auto" ColumnSpacing="12">
+                <TextBox
+                    x:Name="HostBox"
+                    x:Uid="RemoteServerConfigControlServerAddress"
+                    Grid.Column="0"
+                    Header="Server Address"
+                    InputScope="Url"
+                    PlaceholderText="192.168.1.x"
+                    TextWrapping="Wrap" />
+
+                <NumberBox
+                    x:Name="PortBox"
+                    x:Uid="RemoteServerConfigControlPort"
+                    Grid.Column="1"
+                    MinWidth="100"
+                    Header="Port"
+                    LargeChange="10"
+                    SmallChange="1"
+                    SpinButtonPlacementMode="Inline"
+                    ToolTipService.ToolTip="80"
+                    Value="80" />
+            </Grid>
+
+            <TextBox
+                x:Name="PathBox"
+                x:Uid="RemoteServerConfigControlPath"
+                TextWrapping="Wrap" />
+
+            <Grid ColumnDefinitions="*, *" ColumnSpacing="12">
+                <TextBox
+                    x:Name="UserBox"
+                    x:Uid="RemoteServerConfigControlUsername"
+                    Grid.Column="0"
+                    TextWrapping="Wrap" />
+
+                <PasswordBox
+                    x:Name="PwdBox"
+                    x:Uid="RemoteServerConfigControlPassword"
+                    Grid.Column="1"
+                    PasswordRevealMode="Peek" />
+            </Grid>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs
new file mode 100644
index 0000000..d2d886e
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Controls/RemoteServerConfigControl.xaml.cs
@@ -0,0 +1,101 @@
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models;
+using DevWinUI;
+using Microsoft.UI.Xaml.Controls;
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Windows.Storage;
+
+namespace BetterLyrics.WinUI3.Controls
+{
+    public sealed partial class RemoteServerConfigControl : UserControl
+    {
+        private readonly string _protocolType;
+
+        public RemoteServerConfigControl(string protocolType)
+        {
+            this.InitializeComponent();
+            _protocolType = protocolType;
+
+            SetupDefaults();
+        }
+
+        private void SetupDefaults()
+        {
+            switch (_protocolType.ToUpper())
+            {
+                case "SMB":
+                    PortBox.Value = 445; // SMB 默认端口
+                    PathBox.PlaceholderText = "SharedMusic";
+                    break;
+                case "FTP":
+                    PortBox.Value = 21; // FTP 默认端口
+                    PathBox.PlaceholderText = "/pub/music";
+                    break;
+                case "WEBDAV":
+                    PortBox.Value = 80; // WebDAV 默认端口
+                    PathBox.PlaceholderText = "/dav/music";
+                    break;
+            }
+        }
+
+        public MediaFolder GetConfig()
+        {
+            if (string.IsNullOrWhiteSpace(HostBox.Text))
+                throw new ArgumentException("Server address is required.");
+
+            string name = $"{_protocolType} - {HostBox.Text}";
+
+            Enum.TryParse(_protocolType, true, out FileSourceType sourceType);
+
+            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
+            };
+
+            // 特殊处理路径：
+            // 我们需要把"远程路径"拼接到 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;
+        }
+
+        public void ShowError(string message)
+        {
+            ErrorInfoBar.Message = message;
+            ErrorInfoBar.IsOpen = true;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FileSourceTypeToIconConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FileSourceTypeToIconConverter.cs
new file mode 100644
index 0000000..bfe596f
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/FileSourceTypeToIconConverter.cs
@@ -0,0 +1,30 @@
+锘縰sing BetterLyrics.WinUI3.Enums;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Converter
+{
+    public partial class FileSourceTypeToIconConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is FileSourceType type)
+            {
+                return type switch
+                {
+                    FileSourceType.Local => new FontIcon { Glyph = "\uE8B7" }, // Folder
+                    FileSourceType.SMB => new FontIcon { Glyph = "\uE839" },   // Network
+                    FileSourceType.FTP => new FontIcon { Glyph = "\uE838" },   // Globe
+                    FileSourceType.WebDav => new FontIcon { Glyph = "\uE753" }, // Cloud
+                    _ => new FontIcon { Glyph = "\uE8B7" }
+                };
+            }
+            return new FontIcon { Glyph = "\uE8B7" };
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language) => throw new NotImplementedException();
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TrackToLyricsConverter.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TrackToLyricsConverter.cs
deleted file mode 100644
index 70cf3b6..0000000
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Converter/TrackToLyricsConverter.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-锘縰sing ATL;
-using BetterLyrics.WinUI3.Extensions;
-using Microsoft.UI.Xaml.Data;
-using System;
-
-namespace BetterLyrics.WinUI3.Converter
-{
-    public partial class TrackToLyricsConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            if (value is Track track)
-            {
-                return track.GetRawLyrics();
-            }
-            return "";
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/FileSourceType.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/FileSourceType.cs
new file mode 100644
index 0000000..0de142b
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Enums/FileSourceType.cs
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Enums
+{
+    public enum FileSourceType
+    {
+        Local,
+        SMB,
+        FTP,
+        WebDav
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/TrackExtensions.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/TrackExtensions.cs
deleted file mode 100644
index f1c82a0..0000000
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Extensions/TrackExtensions.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-锘縰sing ATL;
-using System.IO;
-
-namespace BetterLyrics.WinUI3.Extensions
-{
-    public static class TrackExtensions
-    {
-        extension(Track track)
-        {
-            public string GetParentFolderName() => Directory.GetParent(track.Path)?.Name ?? "";
-
-            public string GetParentFolderPath() => Directory.GetParent(track.Path)?.FullName ?? "";
-
-            public string GetRawLyrics()
-            {
-                if (track.Path is string path)
-                {
-                    try
-                    {
-                        return TagLib.File.Create(path).Tag.Lyrics;
-                    }
-                    catch (System.Exception)
-                    {
-                        return "";
-                    }
-                }
-                return "";
-            }
-
-            public string GetFileName() => Path.GetFileName(track.Path);
-        }
-    }
-}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs
new file mode 100644
index 0000000..6c1506b
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/ExtendedTrack.cs
@@ -0,0 +1,39 @@
+锘縰sing BetterLyrics.WinUI3.Models.FileSystem;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public class ExtendedTrack : ATL.Track
+    {
+        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);
+
+        public ExtendedTrack() : base() { }
+
+        public ExtendedTrack(string path) : base(path)
+        {
+            Path = path;
+        }
+
+        public ExtendedTrack(string path, Stream stream) : base(stream, System.IO.Path.GetExtension(path))
+        {
+            Path = path;
+            SetRawLyrics(new StreamFileAbstraction(path, stream));
+        }
+
+        private void SetRawLyrics(StreamFileAbstraction streamFileAbstraction)
+        {
+            try
+            {
+                RawLyrics = TagLib.File.Create(streamFileAbstraction).Tag.Lyrics;
+            }
+            catch (Exception) { }
+        }
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/FTPFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/FTPFileSystem.cs
new file mode 100644
index 0000000..f0cfc47
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/FTPFileSystem.cs
@@ -0,0 +1,55 @@
+锘縰sing FluentFTP;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public partial class FTPFileSystem : IUnifiedFileSystem
+    {
+        private readonly AsyncFtpClient _client;
+        private readonly string _rootPath; // 鏈嶅姟鍣ㄤ笂鐨勬牴璺緞 (渚嬪 /pub/music)
+
+        public FTPFileSystem(string host, string user, string pass, int port, string remotePath)
+        {
+            // 濡傛灉 path 鏄� "192.168.1.5/Music"锛屾垜浠渶瑕佹妸 /Music 鎷嗗嚭鏉�
+            // 浣嗕负浜嗙畝鍗曪紝鍋囪 host 浠呬粎鏄� IP锛宺emotePath 鎵嶆槸璺緞
+            _rootPath = remotePath ?? "/";
+
+            var config = new FtpConfig { ConnectTimeout = 5000 };
+            _client = new AsyncFtpClient(host, user ?? "anonymous", pass ?? "", port > 0 ? port : 21, config);
+        }
+
+        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
+            {
+                Name = i.Name,
+                FullPath = i.FullName,
+                IsFolder = i.Type == FtpObjectType.Directory,
+                Size = i.Size,
+                LastModified = i.Modified
+            }).ToList();
+        }
+
+        public async Task<Stream> OpenReadAsync(string fullPath)
+        {
+            return await _client.OpenRead(fullPath);
+        }
+
+        public async Task DisconnectAsync() => await _client.Disconnect();
+        public void Dispose() => _client?.Dispose();
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/IUnifiedFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/IUnifiedFileSystem.cs
new file mode 100644
index 0000000..065fd2a
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/IUnifiedFileSystem.cs
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.Storage;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public interface IUnifiedFileSystem : IDisposable
+    {
+        Task<bool> ConnectAsync();
+        Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath);
+        Task<Stream> OpenReadAsync(string fullPath);
+        Task DisconnectAsync();
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/LocalFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/LocalFileSystem.cs
new file mode 100644
index 0000000..63307c0
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/LocalFileSystem.cs
@@ -0,0 +1,58 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public partial class LocalFileSystem : IUnifiedFileSystem
+    {
+        private readonly string _rootPath;
+
+        public LocalFileSystem(string rootPath)
+        {
+            _rootPath = rootPath;
+        }
+
+        public Task<bool> ConnectAsync()
+        {
+            return Task.FromResult(Directory.Exists(_rootPath));
+        }
+
+        public async Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath)
+        {
+            var result = new List<UnifiedFileItem>();
+
+            var targetPath = string.IsNullOrWhiteSpace(relativePath)
+                ? _rootPath
+                : Path.Combine(_rootPath, relativePath);
+
+            if (!Directory.Exists(targetPath)) return result;
+
+            var dirInfo = new DirectoryInfo(targetPath);
+
+            foreach (var item in dirInfo.GetFileSystemInfos())
+            {
+                bool isDir = (item.Attributes & FileAttributes.Directory) == FileAttributes.Directory;
+                result.Add(new UnifiedFileItem
+                {
+                    Name = item.Name,
+                    FullPath = item.FullName,
+                    IsFolder = isDir,
+                    Size = isDir ? 0 : ((FileInfo)item).Length,
+                    LastModified = item.LastWriteTime
+                });
+            }
+            return result;
+        }
+
+        public async Task<Stream> OpenReadAsync(string fullPath)
+        {
+            return new FileStream(fullPath, FileMode.Open, FileAccess.Read, FileShare.Read);
+        }
+
+        public async Task DisconnectAsync() => await Task.CompletedTask;
+        public void Dispose() { }
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBFileSystem.cs
new file mode 100644
index 0000000..f15fed4
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBFileSystem.cs
@@ -0,0 +1,131 @@
+锘縰sing SMBLibrary;
+using SMBLibrary.Client;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public partial class SMBFileSystem : IUnifiedFileSystem
+    {
+        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;
+
+        // fullPathInput 渚嬪: "192.168.1.5/Music/Pop"
+        public SMBFileSystem(string fullPathInput, string user, string pass)
+        {
+            _username = user;
+            _password = pass;
+
+            // 瑙ｆ瀽璺緞锛氬垎绂� IP 鍜� 鍏变韩鍚�
+            var parts = fullPathInput.Replace("\\", "/").Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+
+            if (parts.Length >= 1) _ip = parts[0];
+            if (parts.Length >= 2) _shareName = parts[1];
+
+            // 鍓╀笅鐨勯儴鍒嗛噸鏂版嫾璧锋潵浣滀负瀛愯矾寰�
+            if (parts.Length > 2)
+                _pathInsideShare = string.Join("\\", parts.Skip(2));
+            else
+                _pathInsideShare = "";
+        }
+
+        public async Task<bool> ConnectAsync()
+        {
+            _client = new SMB2Client();
+            bool connected = _client.Connect(_ip, SMBTransportType.DirectTCPTransport);
+            if (!connected) return false;
+
+            var status = _client.Login(string.Empty, _username, _password);
+            if (status != NTStatus.STATUS_SUCCESS) return false;
+
+            // 杩炴帴鍏蜂綋鐨勫叡浜枃浠跺す
+            if (string.IsNullOrEmpty(_shareName)) return true; // 鍙繛浜嗘湇鍔″櫒锛屾病杩炲叡浜�
+
+            _fileStore = _client.TreeConnect(_shareName, out status);
+            return status == NTStatus.STATUS_SUCCESS;
+        }
+
+        public async Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath)
+        {
+            var result = new List<UnifiedFileItem>();
+            if (_fileStore == null) return result;
+
+            // 鎷兼帴瀹屾暣璺緞: Root閲岄潰鐨勫瓙璺緞 + 浼犲叆鐨勭浉瀵硅矾寰�
+            string queryPath = Path.Combine(_pathInsideShare, relativePath).Replace("/", "\\").TrimStart('\\');
+
+            // 鎵撳紑鐩綍
+            var statusRet = _fileStore.CreateFile(out object handle, out FileStatus status, queryPath,
+                AccessMask.GENERIC_READ, SMBLibrary.FileAttributes.Directory, ShareAccess.Read,
+                CreateDisposition.FILE_OPEN, CreateOptions.FILE_DIRECTORY_FILE, null);
+
+            if (statusRet != NTStatus.STATUS_SUCCESS) return result;
+
+            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)
+                {
+                    // 鎺掗櫎褰撳墠鐩綍鍜岀埗鐩綍
+                    if (item.FileName == "." || item.FileName == "..") continue;
+
+                    result.Add(new UnifiedFileItem
+                    {
+                        Name = item.FileName,
+                        FullPath = Path.Combine(queryPath, item.FileName),
+                        IsFolder = (item.FileAttributes & SMBLibrary.FileAttributes.Directory) == SMBLibrary.FileAttributes.Directory,
+                        Size = item.AllocationSize,
+                        LastModified = item.LastWriteTime
+                    });
+                }
+
+                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)
+        {
+            var ret = _fileStore.CreateFile(out object handle, out FileStatus status, fullPath,
+                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}");
+
+            return new SMBReadOnlyStream(_fileStore, handle);
+        }
+
+        public async Task DisconnectAsync()
+        {
+            _client?.Disconnect();
+            await Task.CompletedTask;
+        }
+
+        public void Dispose()
+        {
+            _client?.Disconnect();
+        }
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBReadOnlyStream.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBReadOnlyStream.cs
new file mode 100644
index 0000000..e663281
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/SMBReadOnlyStream.cs
@@ -0,0 +1,116 @@
+锘縰sing SMBLibrary;
+using SMBLibrary.Client;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public partial class SMBReadOnlyStream : Stream
+    {
+        private readonly ISMBFileStore _store;
+        private readonly object _handle;
+        private long _position;
+        private long _length; // 鏂板锛氱紦瀛樻枃浠堕暱搴�
+
+        public SMBReadOnlyStream(ISMBFileStore store, object handle)
+        {
+            _store = store;
+            _handle = handle;
+            _position = 0;
+
+            var status = _store.GetFileInformation(out FileInformation result, handle, FileInformationClass.FileStandardInformation);
+            if (status == NTStatus.STATUS_SUCCESS && result is FileStandardInformation info)
+            {
+                _length = info.EndOfFile;
+            }
+            else
+            {
+                // 濡傛灉鑾峰彇澶辫触锛岃繖鏄竴涓弗閲嶉棶棰橈紝鎰忓懗鐫�鏃犳硶 Seek 鍒版湯灏�
+                // 鏆傛椂璁句负 0锛屼絾鍚庣画璇诲彇鍙兘浼氬嚭闂
+                _length = 0;
+            }
+        }
+
+        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;
+            set => _position = value;
+        }
+
+        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);
+
+            // 涓轰簡瀹夊叏锛屼繚鐣欏 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)
+            {
+                throw new IOException($"SMB Read failed. Status: {status} (Pos: {_position}, Req: {bytesToRequest})");
+            }
+
+            if (data == null || data.Length == 0) return 0;
+
+            Array.Copy(data, 0, buffer, offset, data.Length);
+            _position += data.Length;
+            return data.Length;
+        }
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            long newPos = _position;
+
+            switch (origin)
+            {
+                case SeekOrigin.Begin:
+                    newPos = offset;
+                    break;
+                case SeekOrigin.Current:
+                    newPos = _position + offset;
+                    break;
+                case SeekOrigin.End:
+                    newPos = _length + offset;
+                    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.");
+            }
+
+            _position = newPos;
+            return _position;
+        }
+
+        public override void SetLength(long value) => throw new NotSupportedException();
+        public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException();
+        public override void Flush() { }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            if (disposing)
+            {
+                try { _store.CloseFile(_handle); } catch { }
+            }
+        }
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/StreamFileAbstraction.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/StreamFileAbstraction.cs
new file mode 100644
index 0000000..264f764
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/StreamFileAbstraction.cs
@@ -0,0 +1,45 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public class StreamFileAbstraction : TagLib.File.IFileAbstraction
+    {
+        private readonly string _name;
+        private readonly Stream _stream;
+        private readonly bool _closeStreamOnDispose;
+
+        public StreamFileAbstraction(string path, Stream stream, bool closeStreamOnDispose = false)
+        {
+            _name = Path.GetFileName(path);
+            _stream = stream ?? throw new ArgumentNullException(nameof(stream));
+            _closeStreamOnDispose = closeStreamOnDispose;
+        }
+
+        public string Name => _name;
+
+        public Stream ReadStream => _stream;
+
+        public Stream WriteStream
+        {
+            get
+            {
+                if (_stream.CanWrite)
+                {
+                    return _stream;
+                }
+                throw new InvalidOperationException("The underlying stream is read-only. Tag saving is not supported for this source.");
+            }
+        }
+
+        public void CloseStream(Stream stream)
+        {
+            if (_closeStreamOnDispose)
+            {
+                stream?.Dispose();
+            }
+        }
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/UnifiedFileItem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/UnifiedFileItem.cs
new file mode 100644
index 0000000..8e7259c
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/UnifiedFileItem.cs
@@ -0,0 +1,15 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public class UnifiedFileItem
+    {
+        public string Name { get; set; }
+        public string FullPath { get; set; }
+        public long Size { get; set; }
+        public bool IsFolder { get; set; }
+        public DateTime? LastModified { get; set; }
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/WebDavFileSystem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/WebDavFileSystem.cs
new file mode 100644
index 0000000..9e02054
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/FileSystem/WebDavFileSystem.cs
@@ -0,0 +1,87 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WebDav;
+
+namespace BetterLyrics.WinUI3.Models.FileSystem
+{
+    public partial class WebDavFileSystem : IUnifiedFileSystem
+    {
+        private readonly WebDavClient _client;
+        private readonly string _baseUrl;
+        private readonly string _rootPath;
+
+        // host: http://192.168.1.5:5005
+        // path: /music
+        public WebDavFileSystem(string host, string user, string pass, int port, string path)
+        {
+            if (!host.StartsWith("http")) host = $"http://{host}";
+            if (port > 0) host = $"{host}:{port}";
+
+            _baseUrl = host;
+            _rootPath = path ?? "/";
+
+            _client = new WebDavClient(new WebDavClientParams
+            {
+                BaseAddress = new Uri(_baseUrl),
+                Credentials = new System.Net.NetworkCredential(user, pass)
+            });
+        }
+
+        public async Task<bool> ConnectAsync()
+        {
+            // WebDAV 鏃犵姸鎬侊紝Propfind 娴嬭瘯鏍圭洰褰曡繛閫氭��
+            var result = await _client.Propfind(_rootPath);
+            return result.IsSuccessful;
+        }
+
+        public async Task<List<UnifiedFileItem>> GetFilesAsync(string relativePath)
+        {
+            var targetPath = Path.Combine(_rootPath, relativePath).Replace("\\", "/");
+            var result = await _client.Propfind(targetPath);
+
+            var list = new List<UnifiedFileItem>();
+            if (result.IsSuccessful)
+            {
+                foreach (var res in result.Resources)
+                {
+                    if (res == null || res.Uri == null) continue;
+
+                    // 鎺掗櫎鎺夋枃浠跺す鑷韩 (WebDAV 閫氬父浼氭妸褰撳墠璇锋眰鐨勬枃浠跺す浣滀负绗竴涓粨鏋滆繑鍥�)
+                    // 閫氳繃鍒ゆ柇 URL 缁撳熬鏄惁涓�鑷存潵绠�鍗曡繃婊わ紝鎴栬�呭垽鏂� IsCollection 涓� Uri 鐩稿悓
+                    // 杩欓噷绠�鍗曞鐞嗭細鍙鍚嶅瓧涓嶄负绌�
+                    var name = System.Net.WebUtility.UrlDecode(res.Uri.Split('/').LastOrDefault());
+                    if (string.IsNullOrEmpty(name)) continue;
+
+                    // 濡傛灉鍚嶅瓧鍜岃姹傜殑鐩綍鍚嶄竴鏍凤紝鍙兘鏄畠鑷繁锛岃烦杩� (杩欓渶瑕佹牴鎹叿浣撴湇鍔″櫒鍝嶅簲璋冩暣)
+                    // 鏇寸ǔ濡ョ殑鏄瘮杈� Uri
+
+                    list.Add(new UnifiedFileItem
+                    {
+                        Name = name,
+                        FullPath = res.Uri.ToString(), // WebDAV 闇�瑕佸畬鏁� URI 
+                        IsFolder = res.IsCollection,
+                        Size = res.ContentLength ?? 0,
+                        LastModified = res.LastModifiedDate
+                    });
+                }
+            }
+            return list;
+        }
+
+        public async Task<Stream> OpenReadAsync(string fullPath)
+        {
+            // WebDAV 鑾峰彇娴�
+            var res = await _client.GetRawFile(fullPath);
+            if (!res.IsSuccessful) throw new IOException($"WebDAV Error: {res.StatusCode}");
+            return res.Stream;
+        }
+
+        public async Task DisconnectAsync() => await Task.CompletedTask;
+
+        public void Dispose() => _client?.Dispose();
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LocalLyricsFolder.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LocalLyricsFolder.cs
deleted file mode 100644
index ab51d19..0000000
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/LocalLyricsFolder.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-锘�// 2025/6/23 by Zhe Fang
-
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace BetterLyrics.WinUI3.Models
-{
-    public partial class LocalMediaFolder : ObservableRecipient
-    {
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsEnabled { get; set; } = true;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsRealTimeWatchEnabled { get; set; } = false;
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string Path { get; set; }
-
-        public LocalMediaFolder() { }
-
-        public LocalMediaFolder(string path)
-        {
-            Path = path;
-        }
-    }
-}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs
new file mode 100644
index 0000000..33c1e69
--- /dev/null
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/MediaFolder.cs
@@ -0,0 +1,73 @@
+锘�// 2025/6/23 by Zhe Fang
+
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Models.FileSystem;
+using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using System.Text.Json.Serialization;
+
+namespace BetterLyrics.WinUI3.Models
+{
+    public partial class MediaFolder : ObservableRecipient
+    {
+        [ObservableProperty] public partial string Id { get; set; } = Guid.NewGuid().ToString();
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial bool IsEnabled { get; set; } = true;
+        [ObservableProperty][NotifyPropertyChangedRecipients] 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))]
+        public partial FileSourceType SourceType { get; set; } = FileSourceType.Local;
+
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial string Name { get; set; }
+
+        [ObservableProperty] public partial string UserName { get; set; }
+
+        [ObservableProperty] public partial int Port { get; set; } = -1;
+
+        [JsonIgnore] public string Password { get; set; }
+
+        [JsonIgnore] public bool IsLocal => SourceType == FileSourceType.Local;
+
+        [JsonIgnore]
+        public string ConnectionSummary
+        {
+            get
+            {
+                if (IsLocal) return Path;
+                return $"{SourceType} - {Path} {(string.IsNullOrEmpty(UserName) ? "" : $"({UserName})")}";
+            }
+        }
+
+        [JsonIgnore] public string VaultKey => $"{Id}-{UserName}";
+
+        public MediaFolder() { }
+
+        public MediaFolder(string path)
+        {
+            Path = path;
+        }
+
+        public IUnifiedFileSystem? CreateFileSystem()
+        {
+            if (!IsEnabled) return null;
+            if (string.IsNullOrEmpty(Password) && !IsLocal)
+            {
+                Password = PasswordVaultHelper.Get(Constants.App.AppName, VaultKey) ?? "";
+            }
+
+            return SourceType switch
+            {
+                FileSourceType.Local => new LocalFileSystem(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),
+                _ => throw new NotImplementedException()
+            };
+        }
+    }
+}
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayQueueItem.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayQueueItem.cs
index 56c4ce3..5473924 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayQueueItem.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/PlayQueueItem.cs
@@ -4,9 +4,9 @@ namespace BetterLyrics.WinUI3.Models
 {
     public class PlayQueueItem
     {
-        public Track Track { get; set; }
+        public ExtendedTrack Track { get; set; }
 
-        public PlayQueueItem(Track track)
+        public PlayQueueItem(ExtendedTrack track)
         {
             Track = track;
         }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AppSettings.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AppSettings.cs
index ff143a9..89e2824 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AppSettings.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Models/Settings/AppSettings.cs
@@ -12,7 +12,7 @@ namespace BetterLyrics.WinUI3.Models.Settings
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial MusicGallerySettings MusicGallerySettings { get; set; } = new MusicGallerySettings();
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial AdvancedSettings AdvancedSettings { get; set; } = new AdvancedSettings();
 
-        [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<LocalMediaFolder> LocalMediaFolders { get; set; } = [];
+        [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<MediaFolder> LocalMediaFolders { get; set; } = [];
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<MediaSourceProviderInfo> MediaSourceProvidersInfo { get; set; } = [];
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<MappedSongSearchQuery> MappedSongSearchQueries { get; set; } = [];
         [ObservableProperty][NotifyPropertyChangedRecipients] public partial FullyObservableCollection<LyricsWindowStatus> WindowBoundsRecords { get; set; } = [];
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/AlbumArtSearchService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/AlbumArtSearchService.cs
index fed2e82..afb4421 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/AlbumArtSearchService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/AlbumArtSearchService/AlbumArtSearchService.cs
@@ -49,7 +49,7 @@ namespace BetterLyrics.WinUI3.Services.AlbumArtSearchService
                     switch (provider.Provider)
                     {
                         case AlbumArtSearchProvider.Local:
-                            result = SearchFile(songInfo)?.AsBuffer();
+                            result = (await SearchFile(songInfo))?.AsBuffer();
                             break;
                         case AlbumArtSearchProvider.SMTC:
                             result = bufferFromSMTC;
@@ -77,29 +77,73 @@ namespace BetterLyrics.WinUI3.Services.AlbumArtSearchService
             return null;
         }
 
-        private byte[]? SearchFile(SongInfo songInfo)
+        private async Task<byte[]?> SearchFile(SongInfo songInfo)
         {
             foreach (var folder in _settingsService.AppSettings.LocalMediaFolders)
             {
-                if (Directory.Exists(folder.Path) && folder.IsEnabled)
+                if (!folder.IsEnabled) continue;
+
+                try
                 {
-                    foreach (var file in DirectoryHelper.GetAllFiles(folder.Path))
+                    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)
                     {
-                        if (FileHelper.MusicExtensions.Contains(Path.GetExtension(file)))
+                        var currentPath = foldersToScan.Dequeue();
+                        var items = await fs.GetFilesAsync(currentPath);
+
+                        foreach (var item in items)
                         {
-                            Track track = new(file);
-                            if ((track.Title == songInfo.Title && track.Artist == songInfo.DisplayArtists) || StringHelper.IsSwitchableNormalizedMatch(Path.GetFileNameWithoutExtension(file), songInfo.DisplayArtists, songInfo.Title))
+                            if (item.IsFolder)
                             {
-                                var bytes = track.EmbeddedPictures.FirstOrDefault()?.PictureData;
-                                if (bytes != null)
+                                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
                                 {
-                                    return bytes;
                                 }
                             }
                         }
                     }
                 }
+                catch
+                {
+                }
             }
+
             return null;
         }
 
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs
index d754cc5..14df860 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Services/LyricsSearchService/LyricsSearchService.cs
@@ -242,7 +242,7 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
                         lyricsSearchResult = await SearchAmllTtmlDbAsync(songInfo);
                         break;
                     case LyricsSearchProvider.LocalMusicFile:
-                        lyricsSearchResult = SearchEmbedded(songInfo);
+                        lyricsSearchResult = await SearchEmbedded(songInfo);
                         break;
                     case LyricsSearchProvider.LocalLrcFile:
                     case LyricsSearchProvider.LocalEslrcFile:
@@ -277,7 +277,9 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
         private async Task<LyricsSearchResult> SearchFile(SongInfo songInfo, LyricsFormat format)
         {
             int maxScore = 0;
-            string? bestFile = null;
+
+            MediaFolder? bestFolder = null;
+            string? bestFilePath = null;
 
             var lyricsSearchResult = new LyricsSearchResult();
 
@@ -288,47 +290,97 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
 
             foreach (var folder in _settingsService.AppSettings.LocalMediaFolders)
             {
-                if (Directory.Exists(folder.Path) && folder.IsEnabled)
+                if (!folder.IsEnabled) continue;
+
+                try
                 {
-                    try
+                    using var fs = folder.CreateFileSystem();
+                    if (fs == null) continue;
+                    if (!await fs.ConnectAsync()) continue;
+
+                    // 閫掑綊鎵弿
+                    var foldersToScan = new Queue<string>();
+                    foldersToScan.Enqueue(""); // 浠庢牴鐩綍寮�濮�
+
+                    string targetExt = format.ToFileExtension();
+
+                    while (foldersToScan.Count > 0)
                     {
-                        foreach (var file in DirectoryHelper.GetAllFiles(folder.Path, $"*{format.ToFileExtension()}"))
+                        var currentPath = foldersToScan.Dequeue();
+                        var items = await fs.GetFilesAsync(currentPath);
+
+                        foreach (var item in items)
                         {
-                            int score = MetadataComparer.CalculateScore(songInfo, new LyricsSearchResult { Reference = file });
-                            if (score > maxScore)
+                            if (item.IsFolder)
                             {
-                                bestFile = file;
-                                maxScore = score;
+                                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;
+                                }
                             }
                         }
                     }
-                    catch (Exception)
-                    {
-                    }
+                }
+                catch (Exception ex)
+                {
+                    // 鏃ュ織璁板綍...
                 }
             }
 
-            if (bestFile != null)
+            // 4. 濡傛灉鎵惧埌浜嗘渶浣冲尮閰嶏紝璇诲彇鍐呭
+            if (bestFolder != null && bestFilePath != null)
             {
-                lyricsSearchResult.Reference = bestFile;
-                lyricsSearchResult.MatchPercentage = maxScore;
-
-                string? raw = await File.ReadAllTextAsync(bestFile, FileHelper.GetEncoding(bestFile));
-                if (raw != null)
+                try
                 {
-                    lyricsSearchResult.Raw = raw;
+                    // 閲嶆柊杩炴帴浠ヨ鍙栨枃浠� (鍥犱负涔嬪墠鐨� fs 宸茬粡鍦� using 缁撴潫鏃堕噴鏀�)
+                    using var fs = bestFolder.CreateFileSystem();
+                    if (fs != null && await fs.ConnectAsync())
+                    {
+                        using var stream = await fs.OpenReadAsync(bestFilePath);
+
+                        // 浣跨敤 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)
+                {
+                    // 璇诲彇澶辫触澶勭悊
                 }
             }
 
             return lyricsSearchResult;
         }
 
-        private LyricsSearchResult SearchEmbedded(SongInfo songInfo)
+        private async Task<LyricsSearchResult> SearchEmbedded(SongInfo songInfo)
         {
             int bestScore = 0;
-            string? bestFile = null;
+            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,
@@ -336,49 +388,89 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
 
             foreach (var folder in _settingsService.AppSettings.LocalMediaFolders)
             {
-                if (Directory.Exists(folder.Path) && folder.IsEnabled)
+                if (!folder.IsEnabled) continue;
+
+                try
                 {
-                    foreach (var file in DirectoryHelper.GetAllFiles(folder.Path))
+                    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)
                     {
-                        if (FileHelper.MusicExtensions.Contains(Path.GetExtension(file)))
+                        var currentPath = foldersToScan.Dequeue();
+                        var items = await fs.GetFilesAsync(currentPath);
+
+                        foreach (var item in items)
                         {
-                            var track = new Track(file);
-                            var raw = track.GetRawLyrics();
-
-                            if (!string.IsNullOrEmpty(raw))
+                            if (item.IsFolder)
                             {
-                                int score = MetadataComparer.CalculateScore(songInfo, new LyricsSearchResult
-                                {
-                                    Title = track.Title,
-                                    Artists = track.Artist.Split(ATL.Settings.DisplayValueSeparator),
-                                    Album = track.Album,
-                                    Duration = track.Duration,
-                                    Reference = file,
-                                });
+                                foldersToScan.Enqueue(Path.Combine(currentPath, item.Name));
+                                continue;
+                            }
 
-                                if (score > bestScore)
+                            var ext = Path.GetExtension(item.Name).ToLower();
+                            if (FileHelper.MusicExtensions.Contains(ext))
+                            {
+                                try
                                 {
-                                    bestScore = score;
-                                    bestFile = file;
-                                    bestRaw = raw;
+                                    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 (bestFile != null)
+            if (bestFilePath != null)
             {
-                var track = new Track(bestFile);
-
-                lyricsSearchResult.Title = track.Title;
-                lyricsSearchResult.Artists = track.Artist.Split(ATL.Settings.DisplayValueSeparator);
-                lyricsSearchResult.Album = track.Album;
-                lyricsSearchResult.Duration = track.Duration;
+                // 鐩存帴浣跨敤缂撳瓨鐨勬暟鎹紝涓嶉渶瑕� new Track(bestFile) 浜�
+                lyricsSearchResult.Title = bestTitle;
+                lyricsSearchResult.Artists = bestArtists;
+                lyricsSearchResult.Album = bestAlbum;
+                lyricsSearchResult.Duration = bestDuration;
 
                 lyricsSearchResult.Raw = bestRaw;
-                lyricsSearchResult.Reference = bestFile;
+                lyricsSearchResult.Reference = bestFilePath;
                 lyricsSearchResult.MatchPercentage = bestScore;
             }
 
@@ -560,13 +652,14 @@ namespace BetterLyrics.WinUI3.Services.LyricsSearchService
             }
 
             ISearchResult? result;
-            if (searcher == Searchers.Netease && songInfo.SongId != null)
+
+            if (songInfo.SongId != null && searcher == Searchers.Netease && PlayerIDHelper.IsNeteaseFamily(songInfo.PlayerId))
             {
-                result = new NeteaseSearchResult("", [], "", [], 0, songInfo.SongId);
+                result = new NeteaseSearchResult(songInfo.Title, songInfo.Artists, songInfo.Album, [], (int)songInfo.DurationMs, songInfo.SongId);
             }
-            else if (searcher == Searchers.QQMusic && songInfo.SongId != null)
+            else if (songInfo.SongId != null && searcher == Searchers.QQMusic && songInfo.PlayerId == Constants.PlayerID.QQMusic)
             {
-                result = new QQMusicSearchResult("", [], "", [], 0, songInfo.SongId, "");
+                result = new QQMusicSearchResult(songInfo.Title, songInfo.Artists, songInfo.Album, [], (int)songInfo.DurationMs, songInfo.SongId, "");
             }
             else
             {
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
index a386c9d..d3850c8 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/en-US/Resources.resw
@@ -120,6 +120,9 @@
   <data name="ActionCompleted" xml:space="preserve">
     <value>Operation completed</value>
   </data>
+  <data name="Add" xml:space="preserve">
+    <value>Add</value>
+  </data>
   <data name="AlbumArtSearchLocalProvider" xml:space="preserve">
     <value>Local music files</value>
   </data>
@@ -546,6 +549,21 @@
   <data name="PrivacyPolicy.Content" xml:space="preserve">
     <value>Privacy policy</value>
   </data>
+  <data name="RemoteServerConfigControlPassword.Header" xml:space="preserve">
+    <value>Password</value>
+  </data>
+  <data name="RemoteServerConfigControlPath.Header" xml:space="preserve">
+    <value>Path</value>
+  </data>
+  <data name="RemoteServerConfigControlPort.Header" xml:space="preserve">
+    <value>Port</value>
+  </data>
+  <data name="RemoteServerConfigControlServerAddress.Header" xml:space="preserve">
+    <value>Server Address</value>
+  </data>
+  <data name="RemoteServerConfigControlUsername.Header" xml:space="preserve">
+    <value>Username</value>
+  </data>
   <data name="Romaji" xml:space="preserve">
     <value>Romaji</value>
   </data>
@@ -594,9 +612,6 @@
   <data name="SettingsPageAdaptEnvColor.Header" xml:space="preserve">
     <value>Adapt to environmental color</value>
   </data>
-  <data name="SettingsPageAddFolder.Header" xml:space="preserve">
-    <value>Add a folder</value>
-  </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
     <value>Add</value>
   </data>
@@ -1044,6 +1059,9 @@
   <data name="SettingsPageListenNewSession.Header" xml:space="preserve">
     <value>Enable monitoring for new playback sources</value>
   </data>
+  <data name="SettingsPageLocalFolder.Text" xml:space="preserve">
+    <value>Local Folder</value>
+  </data>
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>Log record</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
index d6c05e3..dc7ee89 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ja-JP/Resources.resw
@@ -120,6 +120,9 @@
   <data name="ActionCompleted" xml:space="preserve">
     <value>鎿嶄綔銇屽畬浜嗐仐銇俱仐銇�</value>
   </data>
+  <data name="Add" xml:space="preserve">
+    <value>杩藉姞</value>
+  </data>
   <data name="AlbumArtSearchLocalProvider" xml:space="preserve">
     <value>銉兗銈儷闊虫ソ銉曘偂銈ゃ儷</value>
   </data>
@@ -546,6 +549,21 @@
   <data name="PrivacyPolicy.Content" xml:space="preserve">
     <value>銉椼儵銈ゃ儛銈枫兗銉濄儶銈枫兗</value>
   </data>
+  <data name="RemoteServerConfigControlPassword.Header" xml:space="preserve">
+    <value>銉戙偣銉兗銉�</value>
+  </data>
+  <data name="RemoteServerConfigControlPath.Header" xml:space="preserve">
+    <value>銉戙偣</value>
+  </data>
+  <data name="RemoteServerConfigControlPort.Header" xml:space="preserve">
+    <value>銉濄兗銉�</value>
+  </data>
+  <data name="RemoteServerConfigControlServerAddress.Header" xml:space="preserve">
+    <value>銈点兗銉愩兗銈€儔銉偣</value>
+  </data>
+  <data name="RemoteServerConfigControlUsername.Header" xml:space="preserve">
+    <value>銉︺兗銈躲兗鍚�</value>
+  </data>
   <data name="Romaji" xml:space="preserve">
     <value>銉兗銉炪兂</value>
   </data>
@@ -594,9 +612,6 @@
   <data name="SettingsPageAdaptEnvColor.Header" xml:space="preserve">
     <value>鐠板銇壊銇仼蹇溿仐銇俱仐銈囥亞</value>
   </data>
-  <data name="SettingsPageAddFolder.Header" xml:space="preserve">
-    <value>銉曘偐銉儉銉笺倰杩藉姞銇椼伨銇�</value>
-  </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
     <value>杩藉姞</value>
   </data>
@@ -1044,6 +1059,9 @@
   <data name="SettingsPageListenNewSession.Header" xml:space="preserve">
     <value>鏂般仐銇勫啀鐢熴偨銉笺偣銇洠瑕栥倰鏈夊姽銇仐銇俱仚</value>
   </data>
+  <data name="SettingsPageLocalFolder.Text" xml:space="preserve">
+    <value>銉兗銈儷 銉曘偐銉儉</value>
+  </data>
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>銉偘銉偝銉笺儔</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
index c65a650..9259fdf 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/ko-KR/Resources.resw
@@ -120,6 +120,9 @@
   <data name="ActionCompleted" xml:space="preserve">
     <value>鞛戩爠 鞕勲</value>
   </data>
+  <data name="Add" xml:space="preserve">
+    <value>於旉皜頃橂嫟</value>
+  </data>
   <data name="AlbumArtSearchLocalProvider" xml:space="preserve">
     <value>搿滌滑 鞚岇晠 韺岇澕</value>
   </data>
@@ -546,6 +549,21 @@
   <data name="PrivacyPolicy.Content" xml:space="preserve">
     <value>臧滌澑鞝曤炒 氤错樃鞝曥眳</value>
   </data>
+  <data name="RemoteServerConfigControlPassword.Header" xml:space="preserve">
+    <value>牍勲皜氩堩樃</value>
+  </data>
+  <data name="RemoteServerConfigControlPath.Header" xml:space="preserve">
+    <value>旮�</value>
+  </data>
+  <data name="RemoteServerConfigControlPort.Header" xml:space="preserve">
+    <value>頃惮</value>
+  </data>
+  <data name="RemoteServerConfigControlServerAddress.Header" xml:space="preserve">
+    <value>IP 欤检唽</value>
+  </data>
+  <data name="RemoteServerConfigControlUsername.Header" xml:space="preserve">
+    <value>靷毄鞛� 鞚措</value>
+  </data>
   <data name="Romaji" xml:space="preserve">
     <value>搿滊</value>
   </data>
@@ -594,9 +612,6 @@
   <data name="SettingsPageAdaptEnvColor.Header" xml:space="preserve">
     <value>頇橁步 靸夓儊鞐� 鞝侅潙頃橃劯鞖�</value>
   </data>
-  <data name="SettingsPageAddFolder.Header" xml:space="preserve">
-    <value>韽措崝毳� 於旉皜頃橃嫮鞁滌槫</value>
-  </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
     <value>於旉皜頃橂嫟</value>
   </data>
@@ -1044,6 +1059,9 @@
   <data name="SettingsPageListenNewSession.Header" xml:space="preserve">
     <value>靸堧鞖� 鞛儩 靻岇姢鞐� 雽�頃� 氇媹韯半鞚� 頇滌劚頇旐晿鞁嫓鞓�</value>
   </data>
+  <data name="SettingsPageLocalFolder.Text" xml:space="preserve">
+    <value>搿滌滑 韽措崝</value>
+  </data>
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>搿滉犯 霠堨綌霌�</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
index 736da5b..0f09f0b 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-CN/Resources.resw
@@ -120,6 +120,9 @@
   <data name="ActionCompleted" xml:space="preserve">
     <value>鎿嶄綔瀹屾垚</value>
   </data>
+  <data name="Add" xml:space="preserve">
+    <value>娣诲姞</value>
+  </data>
   <data name="AlbumArtSearchLocalProvider" xml:space="preserve">
     <value>鏈湴闊充箰鏂囦欢</value>
   </data>
@@ -546,6 +549,21 @@
   <data name="PrivacyPolicy.Content" xml:space="preserve">
     <value>闅愮鏀跨瓥</value>
   </data>
+  <data name="RemoteServerConfigControlPassword.Header" xml:space="preserve">
+    <value>瀵嗙爜</value>
+  </data>
+  <data name="RemoteServerConfigControlPath.Header" xml:space="preserve">
+    <value>璺緞</value>
+  </data>
+  <data name="RemoteServerConfigControlPort.Header" xml:space="preserve">
+    <value>绔彛</value>
+  </data>
+  <data name="RemoteServerConfigControlServerAddress.Header" xml:space="preserve">
+    <value>鏈嶅姟鍣ㄥ湴鍧�</value>
+  </data>
+  <data name="RemoteServerConfigControlUsername.Header" xml:space="preserve">
+    <value>鐢ㄦ埛鍚�</value>
+  </data>
   <data name="Romaji" xml:space="preserve">
     <value>缃楅┈闊�</value>
   </data>
@@ -594,9 +612,6 @@
   <data name="SettingsPageAdaptEnvColor.Header" xml:space="preserve">
     <value>閫傚簲鐜鑹插僵</value>
   </data>
-  <data name="SettingsPageAddFolder.Header" xml:space="preserve">
-    <value>娣诲姞鏂囦欢澶�</value>
-  </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
     <value>娣诲姞</value>
   </data>
@@ -1044,6 +1059,9 @@
   <data name="SettingsPageListenNewSession.Header" xml:space="preserve">
     <value>鍚敤瀵规柊鎾斁婧愮殑鐩戝惉</value>
   </data>
+  <data name="SettingsPageLocalFolder.Text" xml:space="preserve">
+    <value>鏈湴鏂囦欢澶�</value>
+  </data>
   <data name="SettingsPageLog.Header" xml:space="preserve">
     <value>鏃ュ織璁板綍</value>
   </data>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
index d1634da..cda5e2f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Strings/zh-TW/Resources.resw
@@ -120,6 +120,9 @@
   <data name="ActionCompleted" xml:space="preserve">
     <value>鎿嶄綔瀹屾垚</value>
   </data>
+  <data name="Add" xml:space="preserve">
+    <value>娣诲姞</value>
+  </data>
   <data name="AlbumArtSearchLocalProvider" xml:space="preserve">
     <value>鏈湴闊虫▊鏂囦欢</value>
   </data>
@@ -546,6 +549,21 @@
   <data name="PrivacyPolicy.Content" xml:space="preserve">
     <value>闅辩鏀跨瓥</value>
   </data>
+  <data name="RemoteServerConfigControlPassword.Header" xml:space="preserve">
+    <value>瀵嗙⒓</value>
+  </data>
+  <data name="RemoteServerConfigControlPath.Header" xml:space="preserve">
+    <value>璺緫</value>
+  </data>
+  <data name="RemoteServerConfigControlPort.Header" xml:space="preserve">
+    <value>閫ｆ帴鍩�</value>
+  </data>
+  <data name="RemoteServerConfigControlServerAddress.Header" xml:space="preserve">
+    <value>浼烘湇鍣ㄤ綅鍧�</value>
+  </data>
+  <data name="RemoteServerConfigControlUsername.Header" xml:space="preserve">
+    <value>浣跨敤鑰呭悕绋�</value>
+  </data>
   <data name="Romaji" xml:space="preserve">
     <value>缇呴Μ闊�</value>
   </data>
@@ -594,9 +612,6 @@
   <data name="SettingsPageAdaptEnvColor.Header" xml:space="preserve">
     <value>閬╂噳鐠板鑹插僵</value>
   </data>
-  <data name="SettingsPageAddFolder.Header" xml:space="preserve">
-    <value>鏂板璩囨枡澶�</value>
-  </data>
   <data name="SettingsPageAddFolderButton.Content" xml:space="preserve">
     <value>娣诲姞</value>
   </data>
@@ -1044,6 +1059,9 @@
   <data name="SettingsPageListenNewSession.Header" xml:space="preserve">
     <value>鍟熺敤灏嶆柊鎾斁渚嗘簮鐨勭洠鑱�</value>
   </data>
+  <data name="SettingsPageLocalFolder.Text" xml:space="preserve">
+    <value>鏈湴璩囨枡澶�</value>
+  </data>
   <data name="SettingsPageLog.Header" 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 3610eef..579dc6e 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MediaSettingsControlViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MediaSettingsControlViewModel.cs
@@ -1,4 +1,7 @@
-锘縰sing BetterLyrics.WinUI3.Helper;
+锘縰sing BetterLyrics.WinUI3.Controls;
+using BetterLyrics.WinUI3.Enums;
+using BetterLyrics.WinUI3.Helper;
+using BetterLyrics.WinUI3.Hooks;
 using BetterLyrics.WinUI3.Models;
 using BetterLyrics.WinUI3.Models.Settings;
 using BetterLyrics.WinUI3.Services.ResourceService;
@@ -12,6 +15,7 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using Windows.Foundation;
 
 namespace BetterLyrics.WinUI3.ViewModels
 {
@@ -30,17 +34,6 @@ namespace BetterLyrics.WinUI3.ViewModels
             AppSettings = _settingsService.AppSettings;
         }
 
-        [RelayCommand]
-        private async Task SelectAndAddFolderAsync(UIElement sender)
-        {
-            var folder = await PickerHelper.PickSingleFolderAsync<SettingsWindow>();
-
-            if (folder != null)
-            {
-                AddFolderAsync(folder.Path);
-            }
-        }
-
         private void AddFolderAsync(string path)
         {
             var normalizedPath = Path.GetFullPath(path).TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar;
@@ -62,13 +55,93 @@ namespace BetterLyrics.WinUI3.ViewModels
             }
             else
             {
-                AppSettings.LocalMediaFolders.Add(new LocalMediaFolder(path));
+                AppSettings.LocalMediaFolders.Add(new MediaFolder(path));
             }
         }
 
-        public void RemoveFolderAsync(LocalMediaFolder folder)
+        public void RemoveFolderAsync(MediaFolder folder)
         {
             AppSettings.LocalMediaFolders.Remove(folder);
         }
+
+        [RelayCommand]
+        private async Task SelectAndAddFolderAsync(UIElement sender)
+        {
+            var folder = await PickerHelper.PickSingleFolderAsync<SettingsWindow>();
+
+            if (folder != null)
+            {
+                AddFolderAsync(folder.Path);
+            }
+        }
+
+        [RelayCommand]
+        private async Task AddRemoteSourceAsync(string protocolType)
+        {
+            var dialog = new ContentDialog
+            {
+                XamlRoot = WindowHook.GetWindow<SettingsWindow>()?.Content.XamlRoot,
+                Style = Application.Current.Resources["DefaultContentDialogStyle"] as Style,
+                Title = protocolType,
+                PrimaryButtonText = _resourceService.GetLocalizedString("Add"),
+                CloseButtonText = _resourceService.GetLocalizedString("Cancel"),
+                DefaultButton = ContentDialogButton.Primary,
+                Content = new RemoteServerConfigControl(protocolType)
+            };
+
+            dialog.PrimaryButtonClick += async (s, e) =>
+            {
+                var configControl = (RemoteServerConfigControl)dialog.Content;
+
+                try
+                {
+                    e.Cancel = true;
+
+                    dialog.IsPrimaryButtonEnabled = false;
+                    configControl.IsEnabled = false;
+                    dialog.Title = $"Connecting to {protocolType}...";
+
+                    var tempFolder = configControl.GetConfig();
+
+                    var provider = tempFolder.CreateFileSystem();
+
+                    bool isConnected = provider != null && await provider.ConnectAsync();
+
+                    if (isConnected)
+                    {
+                        await provider!.DisconnectAsync();
+
+                        PasswordVaultHelper.Save(Constants.App.AppName, tempFolder.VaultKey, tempFolder.Password);
+                        AppSettings.LocalMediaFolders.Add(tempFolder);
+
+                        e.Cancel = false;
+                    }
+                    else
+                    {
+                        ShowErrorTip(configControl, "Connection failed. Check IP/Port.");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    ShowErrorTip(configControl, $"Error: {ex.Message}");
+                }
+                finally
+                {
+                    dialog.IsPrimaryButtonEnabled = true;
+                    configControl.IsEnabled = true;
+                    dialog.Title = protocolType;
+                }
+            };
+
+            await dialog.ShowAsync();
+        }
+
+        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 8b4b2ed..928ae28 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/ViewModels/MusicGalleryPageViewModel.cs
@@ -43,11 +43,11 @@ namespace BetterLyrics.WinUI3.ViewModels
         private readonly DispatcherQueueTimer _refreshSongsTimer;
 
         // All songs
-        private List<Track> _tracks = [];
+        private List<ExtendedTrack> _tracks = [];
         // Songs in current playlist
-        private List<Track> _playlistTracks = [];
+        private List<ExtendedTrack> _playlistTracks = [];
         // Filtered songs based on search query for current playlist
-        private List<Track> _filteredTracks = [];
+        private List<ExtendedTrack> _filteredTracks = [];
 
         [ObservableProperty]
         public partial AppSettings AppSettings { get; set; }
@@ -62,7 +62,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         public partial ObservableCollection<GroupInfoList> GroupedTracks { get; set; } = [];
 
         [ObservableProperty]
-        public partial List<Track> SelectedTracks { get; set; } = [];
+        public partial List<ExtendedTrack> SelectedTracks { get; set; } = [];
 
         [ObservableProperty]
         public partial int SelectedTracksTotalDuration { get; set; } = 0;
@@ -73,7 +73,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         public PlayQueueItem? PlayingQueueItem => TrackPlayingQueue.ElementAtOrDefault(AppSettings.MusicGallerySettings.PlayQueueIndex);
 
         [ObservableProperty]
-        public partial Track? PlayingTrack { get; set; } = null;
+        public partial ExtendedTrack? PlayingTrack { get; set; } = null;
 
         [ObservableProperty]
         public partial CommonSongProperty SongOrderType { get; set; } = CommonSongProperty.Title;
@@ -90,7 +90,7 @@ namespace BetterLyrics.WinUI3.ViewModels
         public partial bool IsDataLoading { get; set; } = false;
 
         [ObservableProperty]
-        public partial Track TrackRightTapped { get; set; } = new();
+        public partial ExtendedTrack TrackRightTapped { get; set; } = new();
 
         [ObservableProperty]
         public partial string SongSearchQuery { get; set; } = string.Empty;
@@ -103,7 +103,7 @@ namespace BetterLyrics.WinUI3.ViewModels
             _resourceService = resourceService;
             AppSettings = _settingsService.AppSettings;
 
-            TrackPlayingQueue = [.. AppSettings.MusicGallerySettings.PlayQueuePaths.Select(x => new PlayQueueItem(new Track(x)))];
+            TrackPlayingQueue = [.. AppSettings.MusicGallerySettings.PlayQueuePaths.Select(x => new PlayQueueItem(new ExtendedTrack(x)))];
             TrackPlayingQueue.CollectionChanged += TrackPlayingQueue_CollectionChanged;
 
             SongsTabInfoList.Add(new SongsTabInfo(_resourceService.GetLocalizedString("MusicGalleryPageAllSongs"), "\uE8A9", false, false, CommonSongProperty.Title, string.Empty));
@@ -281,28 +281,75 @@ namespace BetterLyrics.WinUI3.ViewModels
                 IsDataLoading = true;
                 _tracks.Clear();
 
-                Task.Run(() =>
+                Task.Run(async () =>
                 {
                     try
                     {
                         foreach (var folder in _settingsService.AppSettings.LocalMediaFolders)
                         {
-                            if (Directory.Exists(folder.Path) && folder.IsEnabled)
+                            if (!folder.IsEnabled) continue;
+
+                            try
                             {
-                                foreach (var file in DirectoryHelper.GetAllFiles(folder.Path))
+                                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)
                                 {
-                                    if (FileHelper.MusicExtensions.Contains(Path.GetExtension(file)))
+                                    var currentPath = foldersToScan.Dequeue();
+                                    var items = await fs.GetFilesAsync(currentPath);
+
+                                    foreach (var item in items)
                                     {
-                                        Track track = new(file);
-                                        if (track.Duration <= 0) continue;
-                                        _tracks.Add(track);
+                                        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))
+                                                {
+                                                    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)
+                    catch (Exception ex)
                     {
+                        System.Diagnostics.Debug.WriteLine($"Global scan error: {ex.Message}");
                     }
 
                     _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
@@ -337,7 +384,7 @@ namespace BetterLyrics.WinUI3.ViewModels
                         _playlistTracks = _tracks.Where(t => t.Artist.Equals(SelectedSongsTabInfo.FilterValue, StringComparison.OrdinalIgnoreCase)).ToList();
                         break;
                     case CommonSongProperty.Folder:
-                        _playlistTracks = _tracks.Where(t => t.GetParentFolderPath().Equals(SelectedSongsTabInfo.FilterValue, StringComparison.OrdinalIgnoreCase)).ToList();
+                        _playlistTracks = _tracks.Where(t => t.ParentFolderPath.Equals(SelectedSongsTabInfo.FilterValue, StringComparison.OrdinalIgnoreCase)).ToList();
                         break;
                     case CommonSongProperty.M3UFilePath:
                         if (SelectedSongsTabInfo.FilterValue is string path)
@@ -375,9 +422,9 @@ namespace BetterLyrics.WinUI3.ViewModels
                     t.Artist.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) ||
                     t.Album.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) ||
                     // 鏂囦欢鍚嶏紙鍖呭惈鍚庣紑锛�
-                    t.GetFileName().Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) ||
+                    t.FileName.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase) ||
                     // 鏂囦欢鎵�鍦ㄦ枃浠跺す鐨勮矾寰�
-                    t.GetParentFolderPath().Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase)).ToList();
+                    t.ParentFolderPath.Contains(SongSearchQuery, StringComparison.OrdinalIgnoreCase)).ToList();
         }
 
         private void ApplySongOrderType()
@@ -387,25 +434,25 @@ namespace BetterLyrics.WinUI3.ViewModels
                 case CommonSongProperty.Title:
                     GroupedTracks = _filteredTracks.GetGroupedBy(
                         t => LanguageHelper.GetOrderChar(t.Title),
-                        o => ((Track)o).Title
+                        o => ((ExtendedTrack)o).Title
                     );
                     break;
                 case CommonSongProperty.Artist:
                     GroupedTracks = _filteredTracks.GetGroupedBy(
                         t => LanguageHelper.GetOrderChar(t.Artist),
-                        o => ((Track)o).Artist
+                        o => ((ExtendedTrack)o).Artist
                     );
                     break;
                 case CommonSongProperty.Album:
                     GroupedTracks = _filteredTracks.GetGroupedBy(
                         t => LanguageHelper.GetOrderChar(t.Album),
-                        o => ((Track)o).Album
+                        o => ((ExtendedTrack)o).Album
                     );
                     break;
                 case CommonSongProperty.Folder:
                     GroupedTracks = _filteredTracks.GetGroupedBy(
-                        t => LanguageHelper.GetOrderChar(t.GetParentFolderName()),
-                        o => ((Track)o).Album
+                        t => LanguageHelper.GetOrderChar(t.ParentFolderName),
+                        o => ((ExtendedTrack)o).Album
                     );
                     break;
             }
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml
index 4573603..32a832f 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml
@@ -82,7 +82,7 @@
                                         x:Uid="MusicGalleryPageFileInfoPath"
                                         Link="{x:Bind ViewModel.TrackRightTapped.Path, Mode=OneWay}"
                                         Value="{x:Bind ViewModel.TrackRightTapped.Path, Mode=OneWay}" />
-                                    <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoLyrics" Value="{x:Bind ViewModel.TrackRightTapped, Converter={StaticResource TrackToLyricsConverter}, Mode=OneWay}" />
+                                    <uc:PropertyRow x:Uid="MusicGalleryPageFileInfoLyrics" Value="{x:Bind ViewModel.TrackRightTapped.RawLyrics, Mode=OneWay}" />
                                 </StackPanel>
                             </Grid>
                         </ScrollViewer>
@@ -381,7 +381,7 @@
                                 </MenuBarItemFlyout>
                             </ListView.ContextFlyout>
                             <ListView.ItemTemplate>
-                                <DataTemplate x:DataType="atl:Track">
+                                <DataTemplate x:DataType="models:ExtendedTrack">
                                     <Grid
                                         Padding="12"
                                         ColumnSpacing="12"
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml.cs b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml.cs
index 894f5be..4a1fcc3 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml.cs
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Views/MusicGalleryPage.xaml.cs
@@ -54,7 +54,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private async void SongPathHyperlinkButton_Click(object sender, RoutedEventArgs e)
         {
-            await LauncherHelper.SelectAndShowFile(((Track)((HyperlinkButton)sender).DataContext).Path);
+            await LauncherHelper.SelectAndShowFile(((ExtendedTrack)((HyperlinkButton)sender).DataContext).Path);
         }
 
         private async void PlayingQueueListVireItemGrid_Tapped(object sender, TappedRoutedEventArgs e)
@@ -104,7 +104,7 @@ namespace BetterLyrics.WinUI3.Views
         private async void AddSongToQueueNextMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
         {
             bool startPlaying = ViewModel.TrackPlayingQueue.Count == 0;
-            ViewModel.TrackPlayingQueue.InsertRange(ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex + 1, SongListView.SelectedItems.Cast<Track>().Select(x => new PlayQueueItem(x)));
+            ViewModel.TrackPlayingQueue.InsertRange(ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex + 1, SongListView.SelectedItems.Cast<ExtendedTrack>().Select(x => new PlayQueueItem(x)));
             if (startPlaying)
             {
                 ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex = ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex + 1;
@@ -115,7 +115,7 @@ namespace BetterLyrics.WinUI3.Views
         private async void AddSongToQueueEndMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
         {
             bool startPlaying = ViewModel.TrackPlayingQueue.Count == 0;
-            ViewModel.TrackPlayingQueue.AddRange(SongListView.SelectedItems.Cast<Track>().Select(x => new PlayQueueItem(x)));
+            ViewModel.TrackPlayingQueue.AddRange(SongListView.SelectedItems.Cast<ExtendedTrack>().Select(x => new PlayQueueItem(x)));
             if (startPlaying)
             {
                 ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex = ViewModel.AppSettings.MusicGallerySettings.PlayQueueIndex + 1;
@@ -125,7 +125,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private void SongListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            ViewModel.SelectedTracks = SongListView.SelectedItems.Cast<Track>().ToList();
+            ViewModel.SelectedTracks = SongListView.SelectedItems.Cast<ExtendedTrack>().ToList();
             ViewModel.SelectedTracksTotalDuration = ViewModel.SelectedTracks.Select(x => x.Duration).Sum();
             if (SelectAllCheckBox != null)
             {
@@ -142,22 +142,22 @@ namespace BetterLyrics.WinUI3.Views
 
         private void ArtistHyperlibkButton_Click(object sender, RoutedEventArgs e)
         {
-            var artist = ((Track)((FrameworkElement)sender).DataContext).Artist;
+            var artist = ((ExtendedTrack)((FrameworkElement)sender).DataContext).Artist;
             var playlist = new SongsTabInfo(artist, "\uEFA9", true, false, CommonSongProperty.Artist, artist);
             ViewModel.UpdateSelectedPlaylist(playlist);
         }
 
         private void AlbumHyperlibkButton_Click(object sender, RoutedEventArgs e)
         {
-            var album = ((Track)((FrameworkElement)sender).DataContext).Album;
+            var album = ((ExtendedTrack)((FrameworkElement)sender).DataContext).Album;
             var playlist = new SongsTabInfo(album, "\uE93C", true, false, CommonSongProperty.Album, album);
             ViewModel.UpdateSelectedPlaylist(playlist);
         }
 
         private void PathHyperlibkButton_Click(object sender, RoutedEventArgs e)
         {
-            var track = ((Track)((FrameworkElement)sender).DataContext);
-            var playlist = new SongsTabInfo(track.GetParentFolderName(), "\uE8B7", true, false, CommonSongProperty.Folder, track.GetParentFolderPath());
+            var track = ((ExtendedTrack)((FrameworkElement)sender).DataContext);
+            var playlist = new SongsTabInfo(track.ParentFolderName, "\uE8B7", true, false, CommonSongProperty.Folder, track.ParentFolderPath);
             ViewModel.UpdateSelectedPlaylist(playlist);
         }
 
@@ -210,7 +210,7 @@ namespace BetterLyrics.WinUI3.Views
 
         private void SongListViewItemMoreButton_Click(object sender, RoutedEventArgs e)
         {
-            ViewModel.TrackRightTapped = (Track)((FrameworkElement)sender).DataContext;
+            ViewModel.TrackRightTapped = (ExtendedTrack)((FrameworkElement)sender).DataContext;
             SongFileInfoFlyout.ShowAt(sender as FrameworkElement);
         }
 
@@ -260,8 +260,8 @@ namespace BetterLyrics.WinUI3.Views
 
         private async void SongListViewItem_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
         {
-            var displayedTracks = SongListView.Items.Cast<Track>();
-            var track = (Track)((FrameworkElement)sender).DataContext;
+            var displayedTracks = SongListView.Items.Cast<ExtendedTrack>();
+            var track = (ExtendedTrack)((FrameworkElement)sender).DataContext;
 
             // Play all the songs
             ViewModel.TrackPlayingQueue.Clear();