Refactor database busy indicator

Author: CodingOctocat

IPConfig/App.xaml.cs

@@ -1,9 +1,7 @@
 using System;
-using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Json;
@@ -43,28 +41,13 @@ public partial class App : Application
         Converters = { new JsonStringEnumConverter() }
     };
 
-    private static bool _isDbSyncing;
-
     public static bool CanForceClose { get; set; }
 
     /// <summary>
     /// Gets the current <see cref="App"/> instance in use.
     /// </summary>
     public static new App Current => (App)Application.Current;
 
-    public static bool IsDbSyncing
-    {
-        get => _isDbSyncing;
-        set
-        {
-            if (_isDbSyncing != value)
-            {
-                _isDbSyncing = value;
-                OnStaticPropertyChanged();
-            }
-        }
-    }
-
     public static bool IsInDesignMode => Application.Current is not App;
 
     public static Version? Version => Assembly.GetEntryAssembly()?.GetName().Version;
@@ -232,15 +215,4 @@ private void ThemeWatcher_WindowsThemeChanged(object? sender, ThemeWatcher.Theme
             ThemeManager.UpdateSkin(null);
         }
     }
-
-    #region Static Properties Change Notification
-
-    public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged = delegate { };
-
-    private static void OnStaticPropertyChanged([CallerMemberName] string? staticPropertyName = null)
-    {
-        StaticPropertyChanged(null, new PropertyChangedEventArgs(staticPropertyName));
-    }
-
-    #endregion Static Properties Change Notification
 }

IPConfig/Helpers/LiteDbHelper.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 
 using IPConfig.Models;
 
@@ -9,6 +11,21 @@ namespace IPConfig.Helpers;
 
 public static class LiteDbHelper
 {
+    private static bool _isDbBusy;
+
+    public static bool IsDbBusy
+    {
+        get => _isDbBusy;
+        private set
+        {
+            if (_isDbBusy != value)
+            {
+                _isDbBusy = value;
+                OnStaticPropertyChanged();
+            }
+        }
+    }
+
     public static void Handle(Action<ILiteCollection<EditableIPConfigModel>> action)
     {
         Handle(col => {
@@ -20,14 +37,14 @@ public static void Handle(Action<ILiteCollection<EditableIPConfigModel>> action)
 
     public static T Handle<T>(Func<ILiteCollection<EditableIPConfigModel>, T> func)
     {
-        App.IsDbSyncing = true;
+        IsDbBusy = true;
 
         using var db = new LiteDatabase("Filename=ipconfig.db; Connection=Shared;");
         var col = db.GetCollection<EditableIPConfigModel>("ipconfigs");
 
         var result = func(col);
 
-        App.IsDbSyncing = false;
+        IsDbBusy = false;
 
         return result;
     }
@@ -58,4 +75,15 @@ public static T Query<T>(Func<IEnumerable<EditableIPConfigModel>, T> func)
             return result;
         });
     }
+
+    #region Static Properties Change Notification
+
+    public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged = delegate { };
+
+    private static void OnStaticPropertyChanged([CallerMemberName] string? staticPropertyName = null)
+    {
+        StaticPropertyChanged(null, new PropertyChangedEventArgs(staticPropertyName));
+    }
+
+    #endregion Static Properties Change Notification
 }

IPConfig/Languages/Lang.Designer.cs

@@ -212,8 +212,8 @@
   <data name="CheckUpdateFailed" xml:space="preserve">
     <value>Failed to check for updates</value>
   </data>
-  <data name="ClosingInfoDbSyncing" xml:space="preserve">
-    <value>Syncing the database, please try again later.</value>
+  <data name="ClosingInfoDbBusy" xml:space="preserve">
+    <value>The database is busy, please try again later.</value>
   </data>
   <data name="ClosingSaveAsk_Format" xml:space="preserve">
     <value>Do you want to save the changes to {0}?</value>
@@ -254,8 +254,8 @@
   <data name="DataValidation_ToolTip" xml:space="preserve">
     <value>Check that the configuration meets the basic requirements</value>
   </data>
-  <data name="DbSyncing_ToolTip" xml:space="preserve">
-    <value>Database syncing...</value>
+  <data name="DbBusy_ToolTip" xml:space="preserve">
+    <value>Database busy...</value>
   </data>
   <data name="Default" xml:space="preserve">
     <value>Default</value>

IPConfig/Languages/Lang.en.resx

@@ -221,8 +221,8 @@
     <value>检查更新失败</value>
     <comment>VersionInfoViewModel</comment>
   </data>
-  <data name="ClosingInfoDbSyncing" xml:space="preserve">
-    <value>正在同步数据库，请稍后再试。</value>
+  <data name="ClosingInfoDbBusy" xml:space="preserve">
+    <value>数据库繁忙，请稍后再试。</value>
     <comment>MainViewModel</comment>
   </data>
   <data name="ClosingSaveAsk_Format" xml:space="preserve">
@@ -277,9 +277,9 @@
     <value>检查配置是否符合基本要求</value>
     <comment>IPConfigDetailView</comment>
   </data>
-  <data name="DbSyncing_ToolTip" xml:space="preserve">
-    <value>正在同步到数据库...</value>
-    <comment>MainWindow</comment>
+  <data name="DbBusy_ToolTip" xml:space="preserve">
+    <value>数据库繁忙...</value>
+    <comment>StatusBarView</comment>
   </data>
   <data name="Default" xml:space="preserve">
     <value>默认</value>

IPConfig/Languages/Lang.resx

@@ -68,10 +68,10 @@ private static void ChangeLanguage(string name)
     [RelayCommand]
     private async Task ClosingAsync(CancelEventArgs e)
     {
-        if (App.IsDbSyncing)
+        if (LiteDbHelper.IsDbBusy)
         {
             HcMessageBox.Show(
-                Lang.ClosingInfoDbSyncing,
+                Lang.ClosingInfoDbBusy,
                 App.AppName,
                 MessageBoxButton.OK,
                 MessageBoxImage.Information,

IPConfig/ViewModels/MainViewModel.cs

@@ -4,7 +4,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:app="clr-namespace:IPConfig"
+             xmlns:h="clr-namespace:IPConfig.Helpers"
              xmlns:lang="clr-namespace:IPConfig.Languages"
              xmlns:vm="clr-namespace:IPConfig.ViewModels"
              xmlns:v="clr-namespace:IPConfig.Views"
@@ -42,9 +42,9 @@
                                       Margin="0,0,4,0"
                                       d:Visibility="Visible"
                                       IsIndeterminate="True"
-                                      ToolTip="{lang:Lang {x:Static lang:LangKey.DbSyncing_ToolTip}}"
+                                      ToolTip="{lang:Lang {x:Static lang:LangKey.DbBusy_ToolTip}}"
                                       ToolTipService.ShowOnDisabled="True"
-                                      Visibility="{Binding Path=(app:App.IsDbSyncing), Mode=OneWay, Converter={StaticResource Boolean2VisibilityConverter}}" />
+                                      Visibility="{Binding Path=(h:LiteDbHelper.IsDbBusy), Mode=OneWay, Converter={StaticResource Boolean2VisibilityConverter}}" />
 
                 <v:IPConfigListSelectionCounterView />
             </hc:SimpleStackPanel>