feat: show datasource name in launcher, close #741

VShawn · VShawn · commit f00f6254befe · 2024-10-30T17:48:11.000+08:00
diff --git a/Ui/Model/GlobalData.cs b/Ui/Model/GlobalData.cs
@@ -181,6 +181,7 @@ public Result AddServer(ProtocolBase protocolServer, DataSourceBase dataSource)
             if (ret.IsSuccess)
             {
                 var @new = new ProtocolBaseViewModel(protocolServer);
+                @new.DataSourceNameForLauncher = _sourceService?.AdditionalSources.Any() == true ? protocolServer?.DataSource?.DataSourceName ?? "" : "";
                 if (needReload == false)
                 {
                     VmItemList.Add(@new);
@@ -241,6 +242,7 @@ public Result UpdateServer(ProtocolBase protocolServer)
                         if (old != null)
                         {
                             old.Server = protocolServer;
+                            old.DataSourceNameForLauncher = _sourceService?.AdditionalSources.Any() == true ? old.DataSourceName : "";
                         }
                         ReadTagsFromServers();
                         IoC.Get<ServerListPageViewModel>().ClearSelection();
@@ -288,7 +290,9 @@ public Result UpdateServer(IEnumerable<ProtocolBase> protocolServers, bool reloa
                         var old = GetItemById(source.DataSourceName, protocolServer.Id);
                         // invoke main list ui change & invoke launcher ui change
                         if (old != null)
+                        {
                             old.Server = protocolServer;
+                            old.DataSourceNameForLauncher = _sourceService?.AdditionalSources.Any() == true ? old.DataSourceName : ""; }
                     }
                 }
 
diff --git a/Ui/Service/DataSource/DataSourceService.cs b/Ui/Service/DataSource/DataSourceService.cs
@@ -44,6 +44,10 @@ public List<ProtocolBaseViewModel> GetServers(bool force)
                     try
                     {
                         var pbs = dataSource.Value.GetServers(force);
+                        foreach (var pb in pbs)
+                        {
+                            pb.DataSourceNameForLauncher = AdditionalSources.Any() ? pb.DataSourceName : "";
+                        }
                         ret.AddRange(pbs);
                     }
                     catch (Exception e)
diff --git a/Ui/Ui.csproj b/Ui/Ui.csproj
@@ -36,6 +36,8 @@
 		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
 		<RunPostBuildEvent>Always</RunPostBuildEvent>
 		<XamlDebuggingInformation>True</XamlDebuggingInformation>
+
+        <CsWinRTAotOptimizerEnabled>false</CsWinRTAotOptimizerEnabled> <!-- 20241030 fix https://github.com/dotnet/sdk/issues/43680 -->
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(TargetFramework)'!='net48'">
@@ -73,7 +75,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<AssemblyVersion>1.0.1.41007</AssemblyVersion>
+		<AssemblyVersion>1.0.1.41030</AssemblyVersion>
 		<FileVersion>$(AssemblyVersion)</FileVersion>
 		<Version>$(AssemblyVersion)</Version>
 		<Authors>Shawn</Authors>
diff --git a/Ui/View/Launcher/ServerSelectionsView.xaml b/Ui/View/Launcher/ServerSelectionsView.xaml
@@ -119,7 +119,7 @@
                         </ContentControl.Resources>
                     </ContentControl>
 
-                    <Grid Grid.Row="1"  Grid.Column="1" Grid.ColumnSpan="4">
+                    <Grid Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="4">
 
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"></ColumnDefinition>
@@ -158,6 +158,15 @@
                     </Grid>
 
 
+                    <!--data source-->
+                    <TextBlock Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="4"
+                               HorizontalAlignment="Right"
+                               VerticalAlignment="Top"
+                               Text="{Binding DataSourceNameForLauncher}"
+                               Style="{StaticResource TextBlockTagStringStyle}"
+                               Opacity="0.15"
+                               >
+                    </TextBlock>
 
 
 
diff --git a/Ui/View/ProtocolBaseViewModel.cs b/Ui/View/ProtocolBaseViewModel.cs
@@ -20,6 +20,12 @@ public class ProtocolBaseViewModel : NotifyPropertyChangedBase
     {
         public DataSourceBase? DataSource => Server.DataSource;
         public string DataSourceName => DataSource?.DataSourceName ?? "";
+        private string _dataSourceNameForLauncher = "";
+        public string DataSourceNameForLauncher
+        {
+            get => _dataSourceNameForLauncher;
+            set => SetAndNotifyIfChanged(ref _dataSourceNameForLauncher, value);
+        }
 
         /// <summary>
         /// Order in Main window list view
diff --git a/Ui/View/Settings/DataSource/DataSourceViewModel.cs b/Ui/View/Settings/DataSource/DataSourceViewModel.cs
@@ -9,7 +9,6 @@
 using _1RM.Utils;
 using _1RM.View.Utils;
 using Shawn.Utils;
-using Shawn.Utils.Interface;
 using Shawn.Utils.Wpf;
 using Shawn.Utils.Wpf.FileSystem;
 
@@ -102,7 +101,11 @@ public RelayCommand CmdAdd
                     {
                         try
                         {
-                            _dataSourceService.AddOrUpdateDataSource(dataSource);
+                            var ret = _dataSourceService.AddOrUpdateDataSource(dataSource);
+                            if (ret.Status != EnumDatabaseStatus.OK)
+                            {
+                                MessageBoxHelper.ErrorAlert(ret.GetErrorMessage);
+                            }
                         }
                         finally
                         {
@@ -143,7 +146,11 @@ public RelayCommand CmdEdit
                     {
                         try
                         {
-                            _dataSourceService.AddOrUpdateDataSource(dataSource);
+                            var ret = _dataSourceService.AddOrUpdateDataSource(dataSource);
+                            if (ret.Status != EnumDatabaseStatus.OK)
+                            {
+                                MessageBoxHelper.ErrorAlert(ret.GetErrorMessage);
+                            }
                         }
                         finally
                         {
@@ -213,7 +220,11 @@ public RelayCommand CmdRefreshDataSource
                         {
                             try
                             {
-                                _dataSourceService.AddOrUpdateDataSource(dataSource);
+                                var ret = _dataSourceService.AddOrUpdateDataSource(dataSource);
+                                if (ret.Status != EnumDatabaseStatus.OK)
+                                {
+                                    MessageBoxHelper.ErrorAlert(ret.GetErrorMessage);
+                                }
                             }
                             finally
                             {
diff --git a/Ui/View/Settings/SettingsPageViewModel.cs b/Ui/View/Settings/SettingsPageViewModel.cs
@@ -152,6 +152,17 @@ public RelayCommand CmdSaveAndGoBack
                         return;
                     }
 
+                    foreach (var additionalSource in _dataSourceService.AdditionalSources)
+                    {
+                        var status = additionalSource.Value.Database_SelfCheck();
+                        if (status.Status != EnumDatabaseStatus.OK)
+                        {
+                            ShowPage(EnumMainWindowPage.SettingsData);
+                            MessageBoxHelper.ErrorAlert(status.GetErrorMessage);
+                            return;
+                        }
+                    }
+
                     if (_configurationService.Launcher.LauncherEnabled != IoC.TryGet<LauncherWindowViewModel>()?.SetHotKey(_configurationService.Launcher.LauncherEnabled, _configurationService.Launcher.HotKeyModifiers, _configurationService.Launcher.HotKeyKey))
                     {
                         ShowPage(EnumMainWindowPage.SettingsLauncher);

Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,7 @@ public Result AddServer(ProtocolBase protocolServer, DataSourceBase dataSource)`
`181`	`181`	`if (ret.IsSuccess)`
`182`	`182`	`{`
`183`	`183`	`var @new = new ProtocolBaseViewModel(protocolServer);`
	`184`	`+ @new.DataSourceNameForLauncher = _sourceService?.AdditionalSources.Any() == true ? protocolServer?.DataSource?.DataSourceName ?? "" : "";`
`184`	`185`	`if (needReload == false)`
`185`	`186`	`{`
`186`	`187`	`VmItemList.Add(@new);`
`@@ -241,6 +242,7 @@ public Result UpdateServer(ProtocolBase protocolServer)`
`241`	`242`	`if (old != null)`
`242`	`243`	`{`
`243`	`244`	`old.Server = protocolServer;`
	`245`	`+ old.DataSourceNameForLauncher = _sourceService?.AdditionalSources.Any() == true ? old.DataSourceName : "";`
`244`	`246`	`}`
`245`	`247`	`ReadTagsFromServers();`
`246`	`248`	`IoC.Get<ServerListPageViewModel>().ClearSelection();`
`@@ -288,7 +290,9 @@ public Result UpdateServer(IEnumerable<ProtocolBase> protocolServers, bool reloa`
`288`	`290`	`var old = GetItemById(source.DataSourceName, protocolServer.Id);`
`289`	`291`	`// invoke main list ui change & invoke launcher ui change`
`290`	`292`	`if (old != null)`
	`293`	`+ {`
`291`	`294`	`old.Server = protocolServer;`
	`295`	`+ old.DataSourceNameForLauncher = _sourceService?.AdditionalSources.Any() == true ? old.DataSourceName : ""; }`
`292`	`296`	`}`
`293`	`297`	`}`
`294`	`298`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,10 @@ public List<ProtocolBaseViewModel> GetServers(bool force)`
`44`	`44`	`try`
`45`	`45`	`{`
`46`	`46`	`var pbs = dataSource.Value.GetServers(force);`
	`47`	`+ foreach (var pb in pbs)`
	`48`	`+ {`
	`49`	`+ pb.DataSourceNameForLauncher = AdditionalSources.Any() ? pb.DataSourceName : "";`
	`50`	`+ }`
`47`	`51`	`ret.AddRange(pbs);`
`48`	`52`	`}`
`49`	`53`	`catch (Exception e)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`using _1RM.Utils;`
`10`	`10`	`using _1RM.View.Utils;`
`11`	`11`	`using Shawn.Utils;`
`12`		`-using Shawn.Utils.Interface;`
`13`	`12`	`using Shawn.Utils.Wpf;`
`14`	`13`	`using Shawn.Utils.Wpf.FileSystem;`
`15`	`14`
`@@ -102,7 +101,11 @@ public RelayCommand CmdAdd`
`102`	`101`	`{`
`103`	`102`	`try`
`104`	`103`	`{`
`105`		`- _dataSourceService.AddOrUpdateDataSource(dataSource);`
	`104`	`+ var ret = _dataSourceService.AddOrUpdateDataSource(dataSource);`
	`105`	`+ if (ret.Status != EnumDatabaseStatus.OK)`
	`106`	`+ {`
	`107`	`+ MessageBoxHelper.ErrorAlert(ret.GetErrorMessage);`
	`108`	`+ }`
`106`	`109`	`}`
`107`	`110`	`finally`
`108`	`111`	`{`
`@@ -143,7 +146,11 @@ public RelayCommand CmdEdit`
`143`	`146`	`{`
`144`	`147`	`try`
`145`	`148`	`{`
`146`		`- _dataSourceService.AddOrUpdateDataSource(dataSource);`
	`149`	`+ var ret = _dataSourceService.AddOrUpdateDataSource(dataSource);`
	`150`	`+ if (ret.Status != EnumDatabaseStatus.OK)`
	`151`	`+ {`
	`152`	`+ MessageBoxHelper.ErrorAlert(ret.GetErrorMessage);`
	`153`	`+ }`
`147`	`154`	`}`
`148`	`155`	`finally`
`149`	`156`	`{`
`@@ -213,7 +220,11 @@ public RelayCommand CmdRefreshDataSource`
`213`	`220`	`{`
`214`	`221`	`try`
`215`	`222`	`{`
`216`		`- _dataSourceService.AddOrUpdateDataSource(dataSource);`
	`223`	`+ var ret = _dataSourceService.AddOrUpdateDataSource(dataSource);`
	`224`	`+ if (ret.Status != EnumDatabaseStatus.OK)`
	`225`	`+ {`
	`226`	`+ MessageBoxHelper.ErrorAlert(ret.GetErrorMessage);`
	`227`	`+ }`
`217`	`228`	`}`
`218`	`229`	`finally`
`219`	`230`	`{`