From d5689164b55aa6dedf79dc498e0044482510d0ed Mon Sep 17 00:00:00 2001
From: real-zony <zony@myzony.com>
Date: Tue, 2 Jul 2024 18:27:52 +0800
Subject: [PATCH] fix(Fixed some issues in the settings page.):

---
 .../Pages/SettingsPage.axaml                  | 16 +++--
 .../ViewModels/Settings/BlockWordViewModel.cs | 39 +++++-------
 .../Settings/GlobalConfigurationViewModel.cs  | 37 +++++------
 .../Settings/LyricsProviderViewModel.cs       | 63 ++++++++++---------
 .../ViewModels/Settings/SettingsViewModel.cs  | 44 +++++++++----
 .../Settings/TagInfoProviderViewModel.cs      | 30 ++-------
 .../ViewModels/Settings/TagInfoViewModel.cs   | 12 ++--
 7 files changed, 116 insertions(+), 125 deletions(-)

diff --git a/src/ZonyLrcTools.Desktop/Pages/SettingsPage.axaml b/src/ZonyLrcTools.Desktop/Pages/SettingsPage.axaml
index 9a9ccd6..217e848 100644
--- a/src/ZonyLrcTools.Desktop/Pages/SettingsPage.axaml
+++ b/src/ZonyLrcTools.Desktop/Pages/SettingsPage.axaml
@@ -8,6 +8,10 @@
              xmlns:settings="clr-namespace:ZonyLrcTools.Desktop.ViewModels.Settings"
              x:DataType="settings:SettingsViewModel">
 
+    <UserControl.Resources>
+        <settings:NullToDefaultValueConverter x:Key="NullToDefaultValueConverter" />
+    </UserControl.Resources>
+
     <ScrollViewer>
         <StackPanel Orientation="Vertical" Margin="24" Spacing="8">
             <Grid ColumnDefinitions="Auto,*,Auto,Auto">
@@ -80,7 +84,7 @@
 
             <!-- 歌词下载器配置 -->
             <ui:SettingsExpander Header="歌词下载器设置" Description="配置每个单独的歌词下载器参数" IconSource="{StaticResource DownloadIcon}">
-                <ItemsRepeater ItemsSource="{Binding Plugin}">
+                <ItemsRepeater ItemsSource="{Binding LyricsProviders}">
                     <ItemsRepeater.ItemTemplate>
                         <DataTemplate>
                             <ui:SettingsExpander Margin="0,0,0,10">
@@ -90,13 +94,13 @@
 
                                 <ui:SettingsExpanderItem Content="下载器优先级">
                                     <ui:SettingsExpanderItem.Footer>
-                                        <NumericUpDown Value="{Binding Priority}" Minimum="-1" Maximum="100" />
+                                        <NumericUpDown Value="{Binding Priority}" Minimum="-1" Maximum="100" Increment="1" />
                                     </ui:SettingsExpanderItem.Footer>
                                 </ui:SettingsExpanderItem>
 
                                 <ui:SettingsExpanderItem Content="搜索深度">
                                     <ui:SettingsExpanderItem.Footer>
-                                        <NumericUpDown Value="{Binding Depth}" Minimum="1" Maximum="100" />
+                                        <NumericUpDown Value="{Binding Depth}" Minimum="1" Maximum="100" Increment="1" />
                                     </ui:SettingsExpanderItem.Footer>
                                 </ui:SettingsExpanderItem>
                             </ui:SettingsExpander>
@@ -118,13 +122,13 @@
                     <ui:SettingsExpanderItem.Footer>
                         <StackPanel Orientation="Horizontal" Spacing="10">
                             <TextBox Text="{Binding Tag.BlockWord.FilePath}" Width="200" />
-                            <Button Content="浏览" Command="{Binding BrowseBlockWordFileCommand}" />
+                            <Button Content="浏览" Command="{Binding BrowseBlockWordFileCommand}" CommandParameter="{Binding $parent[Window]}" />
                         </StackPanel>
                     </ui:SettingsExpanderItem.Footer>
                 </ui:SettingsExpanderItem>
 
                 <ui:SettingsExpander Header="标签扫描器" Description="配置标签扫描器">
-                    <ItemsRepeater ItemsSource="{Binding Tag.Plugin}">
+                    <ItemsRepeater ItemsSource="{Binding Tag.TagInfoProviders}">
                         <ItemsRepeater.ItemTemplate>
                             <DataTemplate>
                                 <ui:SettingsExpander Margin="0,0,0,10">
@@ -134,7 +138,7 @@
 
                                     <ui:SettingsExpanderItem Content="优先级">
                                         <ui:SettingsExpanderItem.Footer>
-                                            <NumericUpDown Value="{Binding Priority}" Minimum="-1" Maximum="100" />
+                                            <NumericUpDown Value="{Binding Priority}" Minimum="-1" Maximum="100" Increment="1" />
                                         </ui:SettingsExpanderItem.Footer>
                                     </ui:SettingsExpanderItem>
 
diff --git a/src/ZonyLrcTools.Desktop/ViewModels/Settings/BlockWordViewModel.cs b/src/ZonyLrcTools.Desktop/ViewModels/Settings/BlockWordViewModel.cs
index a44ecf6..0fb5215 100644
--- a/src/ZonyLrcTools.Desktop/ViewModels/Settings/BlockWordViewModel.cs
+++ b/src/ZonyLrcTools.Desktop/ViewModels/Settings/BlockWordViewModel.cs
@@ -1,37 +1,26 @@
+using System;
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
 using ZonyLrcTools.Common.Configuration;
 
 namespace ZonyLrcTools.Desktop.ViewModels.Settings;
 
 public class BlockWordViewModel : ViewModelBase
 {
-    private readonly BlockWordOptions _options;
-
-    public BlockWordViewModel(BlockWordOptions options)
+    public BlockWordViewModel(GlobalOptions options)
     {
-        _options = options;
-    }
+        IsEnable = options.Provider.Tag.BlockWord.IsEnable;
+        FilePath = options.Provider.Tag.BlockWord.FilePath;
 
-    public bool IsEnable
-    {
-        get => _options.IsEnable;
-        set
-        {
-            if (_options.IsEnable != value)
+        this.WhenAnyValue(x => x.IsEnable, x => x.FilePath)
+            .Subscribe(_ =>
             {
-                _options.IsEnable = value;
-            }
-        }
+                options.Provider.Tag.BlockWord.IsEnable = IsEnable;
+                options.Provider.Tag.BlockWord.FilePath = FilePath;
+            });
     }
 
-    public string FilePath
-    {
-        get => _options.FilePath;
-        set
-        {
-            if (_options.FilePath != value)
-            {
-                _options.FilePath = value;
-            }
-        }
-    }
+    [Reactive] public bool IsEnable { get; set; }
+
+    [Reactive] public string? FilePath { get; set; }
 }
\ No newline at end of file
diff --git a/src/ZonyLrcTools.Desktop/ViewModels/Settings/GlobalConfigurationViewModel.cs b/src/ZonyLrcTools.Desktop/ViewModels/Settings/GlobalConfigurationViewModel.cs
index bdd54c7..ce30281 100644
--- a/src/ZonyLrcTools.Desktop/ViewModels/Settings/GlobalConfigurationViewModel.cs
+++ b/src/ZonyLrcTools.Desktop/ViewModels/Settings/GlobalConfigurationViewModel.cs
@@ -10,26 +10,25 @@ namespace ZonyLrcTools.Desktop.ViewModels.Settings;
 
 public class GlobalConfigurationViewModel : ViewModelBase
 {
-    private readonly GlobalLyricsConfigOptions _config;
-
-    public GlobalConfigurationViewModel(GlobalLyricsConfigOptions config)
+    public GlobalConfigurationViewModel(GlobalOptions config)
     {
-        _config = config;
-        InitializeLineBreakComboBoxItem();
+        var globalConfig = config.Provider.Lyric.Config;
 
-        IsOneLine = _config.IsOneLine;
-        IsEnableTranslation = _config.IsEnableTranslation;
-        IsSkipExistLyricFiles = _config.IsSkipExistLyricFiles;
-        IsOnlyOutputTranslation = _config.IsOnlyOutputTranslation;
+        InitializeLineBreakComboBoxItem(globalConfig);
+
+        IsOneLine = globalConfig.IsOneLine;
+        IsEnableTranslation = globalConfig.IsEnableTranslation;
+        IsSkipExistLyricFiles = globalConfig.IsSkipExistLyricFiles;
+        IsOnlyOutputTranslation = globalConfig.IsOnlyOutputTranslation;
 
         this.WhenAnyValue(x => x.IsOneLine)
-            .Subscribe(x => _config.IsOneLine = x);
+            .Subscribe(x => globalConfig.IsOneLine = x);
         this.WhenAnyValue(x => x.IsEnableTranslation)
-            .Subscribe(x => _config.IsEnableTranslation = x);
+            .Subscribe(x => globalConfig.IsEnableTranslation = x);
         this.WhenAnyValue(x => x.IsSkipExistLyricFiles)
-            .Subscribe(x => _config.IsSkipExistLyricFiles = x);
+            .Subscribe(x => globalConfig.IsSkipExistLyricFiles = x);
         this.WhenAnyValue(x => x.IsOnlyOutputTranslation)
-            .Subscribe(x => _config.IsOnlyOutputTranslation = x);
+            .Subscribe(x => globalConfig.IsOnlyOutputTranslation = x);
     }
 
     [Reactive] public bool IsOneLine { get; set; }
@@ -38,11 +37,9 @@ public class GlobalConfigurationViewModel : ViewModelBase
 
     [Reactive] public bool IsSkipExistLyricFiles { get; set; }
 
-    [Reactive] public string FileEncoding { get; set; }
-
     [Reactive] public bool IsOnlyOutputTranslation { get; set; }
 
-    private void InitializeLineBreakComboBoxItem()
+    private void InitializeLineBreakComboBoxItem(GlobalLyricsConfigOptions config)
     {
         LineBreakOptions =
         [
@@ -50,20 +47,20 @@ public class GlobalConfigurationViewModel : ViewModelBase
             new TextComboboxItem { Name = "Unix", Value = "\n" },
             new TextComboboxItem { Name = "Mac", Value = "\r" }
         ];
-        SelectedLineBreak = LineBreakOptions.FirstOrDefault(x => x.Value == _config.LineBreak)
+        SelectedLineBreak = LineBreakOptions.FirstOrDefault(x => x.Value == config.LineBreak)
                             ?? LineBreakOptions.First();
 
         FileEncodingOptions = Encoding.GetEncodings()
             .Select(x => new TextComboboxItem { Name = x.DisplayName, Value = x.Name })
             .ToList();
         FileEncodingOptions.Insert(0, new TextComboboxItem { Name = "UTF-8-BOM", Value = "utf-8-bom" });
-        SelectedFileEncoding = FileEncodingOptions.FirstOrDefault(x => x.Value == _config.FileEncoding)
+        SelectedFileEncoding = FileEncodingOptions.FirstOrDefault(x => x.Value == config.FileEncoding)
                                ?? FileEncodingOptions.First();
 
         this.WhenAnyValue(x => x.SelectedLineBreak)
-            .Subscribe(x => _config.LineBreak = x.Value);
+            .Subscribe(x => config.LineBreak = x.Value);
         this.WhenAnyValue(x => x.SelectedFileEncoding)
-            .Subscribe(x => _config.FileEncoding = x.Value);
+            .Subscribe(x => config.FileEncoding = x.Value);
     }
 
     public List<TextComboboxItem> LineBreakOptions { get; private set; }
diff --git a/src/ZonyLrcTools.Desktop/ViewModels/Settings/LyricsProviderViewModel.cs b/src/ZonyLrcTools.Desktop/ViewModels/Settings/LyricsProviderViewModel.cs
index b0c33bb..1e2176f 100644
--- a/src/ZonyLrcTools.Desktop/ViewModels/Settings/LyricsProviderViewModel.cs
+++ b/src/ZonyLrcTools.Desktop/ViewModels/Settings/LyricsProviderViewModel.cs
@@ -1,49 +1,52 @@
+using System;
+using System.Globalization;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
 using ZonyLrcTools.Common.Configuration;
 
 namespace ZonyLrcTools.Desktop.ViewModels.Settings;
 
 public class LyricsProviderViewModel : ViewModelBase
 {
-    private readonly LyricsProviderOptions _options;
-
     public LyricsProviderViewModel(LyricsProviderOptions options)
     {
-        _options = options;
+        var globalOptions = App.Current.Services.GetRequiredService<IOptions<GlobalOptions>>().Value;
+
+        Name = options.Name;
+        Priority = options.Priority;
+        Depth = options.Depth;
+
+        this.WhenAnyValue(x => x.Priority)
+            .Subscribe(priority => globalOptions.Provider.Lyric.GetLyricProviderOption(Name).Priority = priority);
+        this.WhenAnyValue(x => x.Depth)
+            .Subscribe(depth => globalOptions.Provider.Lyric.GetLyricProviderOption(Name).Depth = depth);
     }
 
-    public string Name
+    public string Name { get; set; }
+
+    [Reactive] public int Priority { get; set; }
+
+    [Reactive] public int Depth { get; set; }
+}
+
+internal class NullToDefaultValueConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
     {
-        get => _options.Name;
-        set
-        {
-            if (_options.Name != value)
-            {
-                _options.Name = value;
-            }
-        }
+        return value != null ? System.Convert.ToDecimal(value) : 0;
     }
 
-    public int Priority
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
     {
-        get => _options.Priority;
-        set
+        if (value is decimal dValue)
         {
-            if (_options.Priority != value)
-            {
-                _options.Priority = value;
-            }
+            return System.Convert.ToInt32(dValue);
         }
-    }
 
-    public int Depth
-    {
-        get => _options.Depth;
-        set
-        {
-            if (_options.Depth != value)
-            {
-                _options.Depth = value;
-            }
-        }
+        return BindingOperations.DoNothing;
     }
 }
\ No newline at end of file
diff --git a/src/ZonyLrcTools.Desktop/ViewModels/Settings/SettingsViewModel.cs b/src/ZonyLrcTools.Desktop/ViewModels/Settings/SettingsViewModel.cs
index 954b594..0b84221 100644
--- a/src/ZonyLrcTools.Desktop/ViewModels/Settings/SettingsViewModel.cs
+++ b/src/ZonyLrcTools.Desktop/ViewModels/Settings/SettingsViewModel.cs
@@ -1,6 +1,9 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reactive;
+using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
 using ReactiveUI;
 using ZonyLrcTools.Common.Configuration;
 
@@ -8,31 +11,46 @@ namespace ZonyLrcTools.Desktop.ViewModels.Settings;
 
 public class SettingsViewModel : ViewModelBase
 {
-    private readonly GlobalOptions _globalOptions;
-
     public SettingsViewModel(GlobalOptions globalOptions)
     {
-        _globalOptions = globalOptions;
-
-        Config = new GlobalConfigurationViewModel(globalOptions.Provider.Lyric.Config);
-        Plugin = new ObservableCollection<LyricsProviderViewModel>(globalOptions.Provider.Lyric.Plugin.Select(p => new LyricsProviderViewModel(p)));
-        Tag = new TagInfoViewModel(globalOptions.Provider.Tag);
-        BrowseBlockWordFileCommand = ReactiveCommand.Create(BrowseBlockWordFile);
+        Config = new GlobalConfigurationViewModel(globalOptions);
+        LyricsProviders = new ObservableCollection<LyricsProviderViewModel>(globalOptions.Provider.Lyric.Plugin.Select(p => new LyricsProviderViewModel(p)));
+        Tag = new TagInfoViewModel(globalOptions);
+        BrowseBlockWordFileCommand = ReactiveCommand.CreateFromTask<Window>(BrowseBlockWordFile);
     }
 
     public static string Version => typeof(Program).Assembly.GetName().Version!.ToString();
 
     public TagInfoViewModel Tag { get; }
 
-    public ReactiveCommand<Unit, Unit> BrowseBlockWordFileCommand { get; }
+    public ReactiveCommand<Window, Unit> BrowseBlockWordFileCommand { get; }
 
     public GlobalConfigurationViewModel Config { get; }
 
-    public ObservableCollection<LyricsProviderViewModel> Plugin { get; }
+    public ObservableCollection<LyricsProviderViewModel> LyricsProviders { get; }
 
-    private void BrowseBlockWordFile()
+    private async Task BrowseBlockWordFile(Window parentWindow)
     {
-        // Implement file browsing logic here
-        // Update Tag.BlockWord.FilePath with the selected file path
+        var storage = parentWindow.StorageProvider;
+        if (storage.CanOpen)
+        {
+            var options = new FilePickerOpenOptions
+            {
+                AllowMultiple = false,
+                FileTypeFilter = new[]
+                {
+                    new FilePickerFileType("JSON")
+                    {
+                        Patterns = new[] { "*.json" }
+                    }
+                }
+            };
+
+            var files = await storage.OpenFilePickerAsync(options);
+            if (files.Count > 0)
+            {
+                Tag.BlockWord.FilePath = files[0].Path.LocalPath;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/ZonyLrcTools.Desktop/ViewModels/Settings/TagInfoProviderViewModel.cs b/src/ZonyLrcTools.Desktop/ViewModels/Settings/TagInfoProviderViewModel.cs
index f57ae06..19dcbf5 100644
--- a/src/ZonyLrcTools.Desktop/ViewModels/Settings/TagInfoProviderViewModel.cs
+++ b/src/ZonyLrcTools.Desktop/ViewModels/Settings/TagInfoProviderViewModel.cs
@@ -1,42 +1,22 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using ReactiveUI.Fody.Helpers;
 using ZonyLrcTools.Common.Configuration;
 
 namespace ZonyLrcTools.Desktop.ViewModels.Settings;
 
 public class TagInfoProviderViewModel : ViewModelBase
 {
-    private readonly TagInfoProviderOptions _options;
-
     public TagInfoProviderViewModel(TagInfoProviderOptions options)
     {
-        _options = options;
+        Name = options.Name;
+        Priority = options.Priority;
         Extensions = new ObservableCollection<KeyValuePair<string, string>>(options.Extensions ?? new Dictionary<string, string>());
     }
 
-    public string Name
-    {
-        get => _options.Name;
-        set
-        {
-            if (_options.Name != value)
-            {
-                _options.Name = value;
-            }
-        }
-    }
+    public string? Name { get; set; }
 
-    public int Priority
-    {
-        get => _options.Priority;
-        set
-        {
-            if (_options.Priority != value)
-            {
-                _options.Priority = value;
-            }
-        }
-    }
+    [Reactive] public int Priority { get; set; }
 
     public ObservableCollection<KeyValuePair<string, string>> Extensions { get; }
 }
\ No newline at end of file
diff --git a/src/ZonyLrcTools.Desktop/ViewModels/Settings/TagInfoViewModel.cs b/src/ZonyLrcTools.Desktop/ViewModels/Settings/TagInfoViewModel.cs
index 7a7cbad..0ab2ef5 100644
--- a/src/ZonyLrcTools.Desktop/ViewModels/Settings/TagInfoViewModel.cs
+++ b/src/ZonyLrcTools.Desktop/ViewModels/Settings/TagInfoViewModel.cs
@@ -6,16 +6,16 @@ namespace ZonyLrcTools.Desktop.ViewModels.Settings;
 
 public class TagInfoViewModel : ViewModelBase
 {
-    private readonly TagInfoOptions _options;
+    private readonly GlobalOptions _options;
 
-    public TagInfoViewModel(TagInfoOptions options)
+    public TagInfoViewModel(GlobalOptions options)
     {
         _options = options;
-        BlockWord = new BlockWordViewModel(options.BlockWord);
-        Plugin = new ObservableCollection<TagInfoProviderViewModel>(
-            options.Plugin.Select(p => new TagInfoProviderViewModel(p)));
+        BlockWord = new BlockWordViewModel(options);
+        TagInfoProviders = new ObservableCollection<TagInfoProviderViewModel>(options.Provider.Tag.Plugin.Select(p => new TagInfoProviderViewModel(p)));
     }
 
     public BlockWordViewModel BlockWord { get; }
-    public ObservableCollection<TagInfoProviderViewModel> Plugin { get; }
+
+    public ObservableCollection<TagInfoProviderViewModel> TagInfoProviders { get; }
 }
\ No newline at end of file