Obsoleteをつけて削除予定だったクラス（LiteDB）を削除

r-koubou · Oct 22, 2023 · 442d31c · 442d31c
1 parent 9b1b017
commit 442d31c
Show file tree

Hide file tree

Showing 19 changed files with 13 additions and 837 deletions.
diff --git a/KeySwitchManager/KeySwitchManager.sln b/KeySwitchManager/KeySwitchManager.sln
@@ -14,8 +14,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Interactors", "Sources\Runt
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructures", "Infrastructures", "{505E86DD-3A59-4038-B109-22B3678D035E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Database.LiteDB", "Sources\Runtime\Infrastructures\Database.LiteDB\Database.LiteDB.csproj", "{20749A6A-AD52-4545-B6B2-A921EC8CF850}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Storage.Json", "Sources\Runtime\Infrastructures\Storage.Json\Storage.Json.csproj", "{EAE5D07E-8455-4C33-BCD1-07EFF958E21B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Storage.Xml", "Sources\Runtime\Infrastructures\Storage.Xml\Storage.Xml.csproj", "{499CCE1B-A7D9-4EFA-B890-8785C137EF72}"
@@ -32,8 +30,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Domain", "Sources\Tests\Dom
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructures", "Infrastructures", "{B1FC3859-B078-471F-81F2-FBB0A25C974B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Database.LiteDB", "Sources\Tests\Infrastructures\Database.LiteDB\Database.LiteDB.csproj", "{87930720-147C-4DD4-89C8-F022A65BE461}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Storage.Xml", "Sources\Tests\Infrastructures\Storage.Xml\Storage.Xml.csproj", "{20F51031-CED4-48E2-BBC2-99239D4C3A68}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Storage.Yaml", "Sources\Runtime\Infrastructures\Storage.Yaml\Storage.Yaml.csproj", "{17FB1646-6A55-422B-AB7C-9AEB25126D03}"
@@ -74,10 +70,6 @@ Global
 		{8CAA9A5D-B054-42F7-8589-300866F8223A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8CAA9A5D-B054-42F7-8589-300866F8223A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8CAA9A5D-B054-42F7-8589-300866F8223A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{20749A6A-AD52-4545-B6B2-A921EC8CF850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20749A6A-AD52-4545-B6B2-A921EC8CF850}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20749A6A-AD52-4545-B6B2-A921EC8CF850}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{20749A6A-AD52-4545-B6B2-A921EC8CF850}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EAE5D07E-8455-4C33-BCD1-07EFF958E21B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EAE5D07E-8455-4C33-BCD1-07EFF958E21B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EAE5D07E-8455-4C33-BCD1-07EFF958E21B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -106,10 +98,6 @@ Global
 		{D023CB3F-71C6-4925-9651-5FBA3BEF4404}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D023CB3F-71C6-4925-9651-5FBA3BEF4404}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D023CB3F-71C6-4925-9651-5FBA3BEF4404}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87930720-147C-4DD4-89C8-F022A65BE461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87930720-147C-4DD4-89C8-F022A65BE461}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87930720-147C-4DD4-89C8-F022A65BE461}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87930720-147C-4DD4-89C8-F022A65BE461}.Release|Any CPU.Build.0 = Release|Any CPU
 		{20F51031-CED4-48E2-BBC2-99239D4C3A68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{20F51031-CED4-48E2-BBC2-99239D4C3A68}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{20F51031-CED4-48E2-BBC2-99239D4C3A68}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -136,14 +124,12 @@ Global
 		{D35DCF05-CE3B-4258-AF17-5D73C2A9EE86}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{20749A6A-AD52-4545-B6B2-A921EC8CF850} = {505E86DD-3A59-4038-B109-22B3678D035E}
 		{EAE5D07E-8455-4C33-BCD1-07EFF958E21B} = {505E86DD-3A59-4038-B109-22B3678D035E}
 		{499CCE1B-A7D9-4EFA-B890-8785C137EF72} = {505E86DD-3A59-4038-B109-22B3678D035E}
 		{1747E137-ABC6-4DE6-BE33-9C6B6335266F} = {505E86DD-3A59-4038-B109-22B3678D035E}
 		{62BED324-A809-4740-BB44-7D0ADC88B8E3} = {505E86DD-3A59-4038-B109-22B3678D035E}
 		{BA5C1A39-004B-45EC-8FB6-59DB7F80A305} = {505E86DD-3A59-4038-B109-22B3678D035E}
 		{01822D19-80DD-4979-BA62-FE10E4ACE5CA} = {DF635B48-6000-45EF-AA41-01E06BA4A254}
-		{87930720-147C-4DD4-89C8-F022A65BE461} = {B1FC3859-B078-471F-81F2-FBB0A25C974B}
 		{20F51031-CED4-48E2-BBC2-99239D4C3A68} = {B1FC3859-B078-471F-81F2-FBB0A25C974B}
 		{17FB1646-6A55-422B-AB7C-9AEB25126D03} = {505E86DD-3A59-4038-B109-22B3678D035E}
 		{A2D9D05E-00A1-456D-93DF-40CB784BB74A} = {B1FC3859-B078-471F-81F2-FBB0A25C974B}

diff --git a/KeySwitchManager/Sources/Runtime/Applications/CLI/Sources/Commands/New.cs b/KeySwitchManager/Sources/Runtime/Applications/CLI/Sources/Commands/New.cs
@@ -9,7 +9,7 @@ public class New : ICommand
         [Verb( "new", HelpText = "export a template file" )]
         public class CommandOption : ICommandOption
         {
-            [Value( index: 0, MetaName = "output", HelpText = "Output path for template file (*.yaml or *.xlsx or *.db)", Default = "(ProductName).yaml" )]
+            [Value( index: 0, MetaName = "output", HelpText = "Output path for template file (*.yaml or *.xlsx)", Default = "(ProductName).yaml" )]
             public string OutputPath { get; set; } = string.Empty;
         }
 

diff --git a/KeySwitchManager/Sources/Runtime/Applications/Core/Applications.Core.csproj b/KeySwitchManager/Sources/Runtime/Applications/Core/Applications.Core.csproj
@@ -14,7 +14,6 @@
 
     <ItemGroup>
       <ProjectReference Include="..\..\Commons\Commons.csproj" />
-      <ProjectReference Include="..\..\Infrastructures\Database.LiteDB\Database.LiteDB.csproj" />
       <ProjectReference Include="..\..\Infrastructures\Storage.Json\Storage.Json.csproj" />
       <ProjectReference Include="..\..\Infrastructures\Storage.Spreadsheet.ClosedXml\Storage.Spreadsheet.ClosedXml.csproj" />
       <ProjectReference Include="..\..\Infrastructures\Storage.Xml\Storage.Xml.csproj" />

diff --git a/...chManager/Sources/Runtime/Applications/Core/Controllers/Create/CreateControllerFactory.cs b/...chManager/Sources/Runtime/Applications/Core/Controllers/Create/CreateControllerFactory.cs
@@ -4,7 +4,6 @@
 using KeySwitchManager.Applications.Core.Views.LogView;
 using KeySwitchManager.Commons.Data;
 using KeySwitchManager.Domain.KeySwitches.Models;
-using KeySwitchManager.Infrastructures.Database.LiteDB.KeySwitches;
 using KeySwitchManager.Infrastructures.Storage.Spreadsheet.ClosedXml.KeySwitches;
 using KeySwitchManager.Infrastructures.Storage.Yaml.KeySwitches;
 
@@ -26,11 +25,6 @@ public static IController Create( string outputFilePath, ILogTextView logTextVie
                 return CreateImpl( outputFilePath, logTextView, ( stream ) => new YamlKeySwitchWriter( stream ) );
             }
 
-            if( path.EndsWith( ".db" ) )
-            {
-                return CreateImpl( logTextView, new LiteDbFileWriter( new FilePath( outputFilePath ) ) );
-            }
-
             throw new ArgumentException( $"{outputFilePath} is unknown file format" );
         }
 

diff --git a/KeySwitchManager/Sources/Runtime/Applications/Core/Helpers/KeySwitchRepositoryFactory.cs b/KeySwitchManager/Sources/Runtime/Applications/Core/Helpers/KeySwitchRepositoryFactory.cs
@@ -2,7 +2,6 @@
 
 using KeySwitchManager.Commons.Data;
 using KeySwitchManager.Domain.KeySwitches.Models;
-using KeySwitchManager.Infrastructures.Database.LiteDB.KeySwitches;
 using KeySwitchManager.Infrastructures.Storage.Yaml.KeySwitches;
 
 namespace KeySwitchManager.Applications.Core.Helpers
@@ -13,11 +12,6 @@ public static IKeySwitchRepository CreateFileRepository(string filePath)
         {
             var path = filePath.ToLower();
 
-            if( path.EndsWith( ".db" ) )
-            {
-                return new LiteDbRepository( new FilePath( filePath ) );
-            }
-
             if( path.EndsWith( ".yaml" ) || path.EndsWith( ".yml" ) )
             {
                 return new YamlRepository( new FilePath( filePath ) );

diff --git a/KeySwitchManager/Sources/Runtime/Applications/WPF/Sources/MainWindow.xaml.cs b/KeySwitchManager/Sources/Runtime/Applications/WPF/Sources/MainWindow.xaml.cs
@@ -27,8 +27,8 @@ namespace KeySwitchManager.Applications.WPF
     public partial class MainWindow
     {
         private const string KeySwitchDefinitionFileFilter = "KeySwitch definition File|*.xlsx;*.yaml;*.yml";
-        private const string KeySwitchDatabaseFileFilter = "KeySwitch Database File|*.yaml;*.yml;*.db";
-        private const string KeySwitchAllFileFilter = "Supported File|*.xlsx;*.yaml;*.yml;*.db";
+        private const string KeySwitchDatabaseFileFilter = "KeySwitch Database File|*.yaml;*.yml";
+        private const string KeySwitchAllFileFilter = "Supported File|*.xlsx;*.yaml;*.yml";
 
         #region UI Binding
         #endregion

diff --git a/KeySwitchManager/Sources/Runtime/Applications/Xamarin.Mac/Sources/ViewController.cs b/KeySwitchManager/Sources/Runtime/Applications/Xamarin.Mac/Sources/ViewController.cs
@@ -92,7 +92,12 @@ private void PostExecuteController()
         private async Task ExecuteControllerAsync( Func<IController> controllerFactory )
         {
             PreExecuteController();
-            await ControlExecutor.ExecuteAsync( controllerFactory, LogView );
+
+            await Task.Run( async () => {
+                    await ControlExecutor.ExecuteAsync( controllerFactory, LogView );
+                }
+            );
+
             PostExecuteController();
         }
         #endregion
@@ -108,7 +113,7 @@ partial void OnCreateDefinitionFileChooserButtonClicked( NSObject sender )
         {
             ChooseSaveFilePath( ( path ) => {
                 NewFileText.StringValue = path;
-            }, "db", "yaml", "xlsx" );
+            }, "yaml", "yml", "xlsx" );
         }
 
         async partial void OnOpenNewFileButtonClicked( NSObject sender )
@@ -130,14 +135,14 @@ partial void OnOpenDatabaseFileChooserButtonClicked( NSObject sender )
         {
             ChooseOpenFilePath( ( path ) => {
                 ImportDatabaseFileText.StringValue = path;
-            }, "db" );
+            }, "yaml", "yml" );
         }
 
         partial void OnOpenFileChooserButtonClicked( NSObject sender )
         {
             ChooseOpenFilePath( ( path ) => {
                 ImportFileText.StringValue = path;
-            }, "yaml", "xlsx" );
+            }, "yaml", "yml", "xlsx" );
         }
 
         async partial void OnDoImportButtonClicked( NSObject sender )
@@ -159,7 +164,7 @@ partial void OpenFindDatabaseFileChooserButtonClicked( NSObject sender )
         {
             ChooseOpenFilePath( ( path ) => {
                 FindDatabaseFileText.StringValue = path;
-            }, "db" );
+            }, "yaml", "yml" );
         }
 
         async partial void OnFindButtonClicked( NSObject sender )

diff --git a/KeySwitchManager/Sources/Runtime/Infrastructures/Database.LiteDB/Database.LiteDB.csproj b/KeySwitchManager/Sources/Runtime/Infrastructures/Database.LiteDB/Database.LiteDB.csproj
diff --git a/...chManager/Sources/Runtime/Infrastructures/Database.LiteDB/KeySwitches/LiteDbFileWriter.cs b/...chManager/Sources/Runtime/Infrastructures/Database.LiteDB/KeySwitches/LiteDbFileWriter.cs