Merge branch 'develop'

AonaSuzutsuki · Jan 19, 2022 · 8840cdd · 8840cdd
2 parents dffdf94 + 9ad7b28
commit 8840cdd
Show file tree

Hide file tree

Showing 179 changed files with 4,297 additions and 2,103 deletions.
diff --git a/ConfigEditor/ConfigEditor.csproj b/ConfigEditor/ConfigEditor.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -148,10 +148,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommonStyleLib" Version="1.0.5" />
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
-    <PackageReference Include="Prism.Core" Version="8.1.97" />
-    <PackageReference Include="ReactiveProperty" Version="7.11.0" />
+    <PackageReference Include="CommonStyleLib" Version="1.0.9" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ConfigEditor/lang/a20b/ja_ConfigData.xml b/ConfigEditor/lang/a20b/ja_ConfigData.xml
diff --git a/SSH.NET.LICENSE.txt b/SSH.NET.LICENSE.txt
@@ -0,0 +1,19 @@
+The MIT License (MIT)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/SavannahManager.sln b/SavannahManager.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29009.5
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{2FA6990C-0A0D-4D9C-8C0E-67EBE81C0053}"
 EndProject
@@ -36,6 +36,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SavannahManager", "Savannah
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Updater", "Updater\Updater.csproj", "{53D5F6A6-6218-4B2F-B409-2F8585516C73}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SshConsole", "SshConsole\SshConsole.csproj", "{3237FA14-ABBF-424A-923F-E511C8E84D83}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -130,6 +132,18 @@ Global
 		{53D5F6A6-6218-4B2F-B409-2F8585516C73}.Release|x64.Build.0 = Release|Any CPU
 		{53D5F6A6-6218-4B2F-B409-2F8585516C73}.Release|x86.ActiveCfg = Release|Any CPU
 		{53D5F6A6-6218-4B2F-B409-2F8585516C73}.Release|x86.Build.0 = Release|Any CPU
+		{3237FA14-ABBF-424A-923F-E511C8E84D83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3237FA14-ABBF-424A-923F-E511C8E84D83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3237FA14-ABBF-424A-923F-E511C8E84D83}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3237FA14-ABBF-424A-923F-E511C8E84D83}.Debug|x64.Build.0 = Debug|Any CPU
+		{3237FA14-ABBF-424A-923F-E511C8E84D83}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3237FA14-ABBF-424A-923F-E511C8E84D83}.Debug|x86.Build.0 = Debug|Any CPU
+		{3237FA14-ABBF-424A-923F-E511C8E84D83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3237FA14-ABBF-424A-923F-E511C8E84D83}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3237FA14-ABBF-424A-923F-E511C8E84D83}.Release|x64.ActiveCfg = Release|Any CPU
+		{3237FA14-ABBF-424A-923F-E511C8E84D83}.Release|x64.Build.0 = Release|Any CPU
+		{3237FA14-ABBF-424A-923F-E511C8E84D83}.Release|x86.ActiveCfg = Release|Any CPU
+		{3237FA14-ABBF-424A-923F-E511C8E84D83}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -142,6 +156,7 @@ Global
 		{FA07FC46-E341-4DBF-9B3C-1741C9ACF50A} = {0333E27F-0504-40A4-A258-7D138F45DFE3}
 		{E59C12D3-59AC-4993-AB2A-4F1BD121E596} = {0333E27F-0504-40A4-A258-7D138F45DFE3}
 		{53D5F6A6-6218-4B2F-B409-2F8585516C73} = {0333E27F-0504-40A4-A258-7D138F45DFE3}
+		{3237FA14-ABBF-424A-923F-E511C8E84D83} = {5A07C2C2-CEB4-4416-88D0-C861C5FC70CD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {31C190B0-ABF9-42A1-9D21-B9089B220FA9}

diff --git a/SavannahManager/App.xaml b/SavannahManager/App.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:_7dtd_svmanager_fix_mvvm"
-             Startup="MyApp_Startup"
+             Startup="MyApp_Startup" Exit="App_OnExit"
              DispatcherUnhandledException="Application_DispatcherUnhandledException">
     <Application.Resources>
 

diff --git a/SavannahManager/App.xaml.cs b/SavannahManager/App.xaml.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Threading;
+using _7dtd_svmanager_fix_mvvm.Models.Interfaces;
 
 namespace _7dtd_svmanager_fix_mvvm
 {
@@ -13,7 +14,7 @@ namespace _7dtd_svmanager_fix_mvvm
     /// </summary>
     public partial class App : Application
     {
-        private IDisposable _mainWindow;
+        private IRelease _mainWindow;
         private void MyApp_Startup(object sender, StartupEventArgs e)
         {
             TaskScheduler.UnobservedTaskException += TaskSchedulerOnUnobservedTaskException;
@@ -24,19 +25,25 @@ private void MyApp_Startup(object sender, StartupEventArgs e)
             mainWindow.Show();
         }
 
+        private void App_OnExit(object sender, ExitEventArgs e)
+        {
+            _mainWindow.Dispose();
+        }
+
         private void CurrentDomainOnUnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
             if (e.ExceptionObject is Exception exception)
             {
                 ShowAndWriteException(exception);
-                _mainWindow.Dispose();
+                _mainWindow.Release();
             }
         }
 
         private void TaskSchedulerOnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e)
         {
-            ShowAndWriteException(e.Exception);
-            _mainWindow.Dispose();
+            var exception = e.Exception.InnerException;
+            ShowAndWriteException(exception);
+            _mainWindow.Release();
         }
 
         private void Application_DispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
@@ -58,12 +65,17 @@ public static void ShowAndWriteException(Exception exception)
             MessageBox.Show(mes, "予期せぬエラー", MessageBoxButton.OK, MessageBoxImage.Error);
 
             var dt = DateTime.Now;
-            OutToFile(AppInfo.GetAppPath() + @"\error-" + dt.ToString("yyyy-MM-dd- HH-mm-ss") + ".log", mes);
+            OutToFile("error-" + dt.ToString("yyyy-MM-dd- HH-mm-ss") + ".log", mes);
         }
 
         private static void OutToFile(string filename, string text)
         {
-            using var fs = new FileStream(filename, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read);
+            var dirName = "errors";
+            var dirInfo = new DirectoryInfo(dirName);
+            if (!dirInfo.Exists)
+                dirInfo.Create();
+
+            using var fs = new FileStream($"{dirInfo.FullName}\\{filename}", FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read);
             using var sw = new StreamWriter(fs, System.Text.Encoding.UTF8);
             sw.Write(text);
         }

diff --git a/SavannahManager/Backup/Views/BackupSelector.xaml.cs b/SavannahManager/Backup/Views/BackupSelector.xaml.cs
diff --git a/...ahManager/Backup/Images/DirectoryIcon.png → ...ahManager/Images/Backup/DirectoryIcon.png b/...ahManager/Backup/Images/DirectoryIcon.png → ...ahManager/Images/Backup/DirectoryIcon.png
diff --git a/SavannahManager/Backup/Images/FileIcon.png → SavannahManager/Images/Backup/FileIcon.png b/SavannahManager/Backup/Images/FileIcon.png → SavannahManager/Images/Backup/FileIcon.png
diff --git a/SavannahManager/Backup/Images/no-image.png → SavannahManager/Images/Backup/no-image.png b/SavannahManager/Backup/Images/no-image.png → SavannahManager/Images/Backup/no-image.png
diff --git a/SavannahManager/LangResources/SettingsResources.Designer.cs b/SavannahManager/LangResources/SettingsResources.Designer.cs
diff --git a/SavannahManager/LangResources/SettingsResources.en-US.resx b/SavannahManager/LangResources/SettingsResources.en-US.resx
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="ConfigFilePath" xml:space="preserve">
     <value>Config File Path</value>
@@ -129,6 +129,10 @@
     <value>XML Files (*.xml)|*.xml|All Files(*.*)|*.*</value>
     <comment>Filter</comment>
   </data>
+  <data name="Help_BackupRestorePath" xml:space="preserve">
+    <value>The directory path for restoring.
+It will be expanded to "%AppData%\7DaysToDie" if the path is empty.</value>
+  </data>
   <data name="Help_BetaMode" xml:space="preserve">
     <value>In beta mode, you can use features that are still under development.
 There is no guarantee that they will be formally implemented, nor can they be guaranteed to work, so please be careful when using them.</value>
@@ -154,6 +158,10 @@ In a local environment, 2000 milliseconds (2 seconds) should usually be enough.<
     <value>Check automatically updates</value>
     <comment>UI, Setting</comment>
   </data>
+  <data name="UI_BackupDestinationPath" xml:space="preserve">
+    <value>Backup Destination Path</value>
+    <comment>UI, Setting</comment>
+  </data>
   <data name="UI_BetaModeEnabledLabel" xml:space="preserve">
     <value>Enable Betamode</value>
     <comment>UI, Setting</comment>
@@ -176,11 +184,11 @@ In a local environment, 2000 milliseconds (2 seconds) should usually be enough.<
   </data>
   <data name="UI_KeyConfigLabel" xml:space="preserve">
     <value>Key</value>
-    <comment>UI, 設定</comment>
+    <comment>UI, Setting</comment>
   </data>
   <data name="UI_KeyEditBTLabel" xml:space="preserve">
     <value>Edit Key</value>
-    <comment>UI, 設定</comment>
+    <comment>UI, Setting</comment>
   </data>
   <data name="UI_LogGetterEnabledLabel" xml:space="preserve">
     <value>Enable Outputing logs</value>
@@ -192,12 +200,16 @@ In a local environment, 2000 milliseconds (2 seconds) should usually be enough.<
   </data>
   <data name="UI_LogLength" xml:space="preserve">
     <value>Length of Console Text</value>
-    <comment>UI, 設定</comment>
+    <comment>UI, Setting</comment>
   </data>
   <data name="UI_OthersLabel" xml:space="preserve">
     <value>Others</value>
     <comment>UI, Setting</comment>
   </data>
+  <data name="UI_RestoreDestinationPath" xml:space="preserve">
+    <value>Restore Destination Path</value>
+    <comment>UI, Setting</comment>
+  </data>
   <data name="UI_SaveBT" xml:space="preserve">
     <value>Save</value>
     <comment>UI, Setting</comment>
@@ -212,11 +224,11 @@ In a local environment, 2000 milliseconds (2 seconds) should usually be enough.<
   </data>
   <data name="UI_ShortcutKeyLabel" xml:space="preserve">
     <value>Shortcut Key</value>
-    <comment>UI, 設定</comment>
+    <comment>UI, Setting</comment>
   </data>
   <data name="UI_TextLength" xml:space="preserve">
     <value>Characters</value>
-    <comment>UI, 設定</comment>
+    <comment>UI, Setting</comment>
   </data>
   <data name="UI_UpdateLabel" xml:space="preserve">
     <value>Update</value>

diff --git a/SavannahManager/LangResources/SettingsResources.resx b/SavannahManager/LangResources/SettingsResources.resx
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="ConfigFilePath" xml:space="preserve">
     <value>コンフィグファイルパス</value>
@@ -129,6 +129,10 @@
     <value>XMLファイル (*.xml)|*.xml|すべてのファイル(*.*)|*.*</value>
     <comment>フィルター</comment>
   </data>
+  <data name="Help_BackupRestorePath" xml:space="preserve">
+    <value>復元する際のディレクトリパスです。
+空の場合は「%AppData%\7DaysToDie」が復元先として使用されます。</value>
+  </data>
   <data name="Help_BetaMode" xml:space="preserve">
     <value>ベータモードでは開発中の機能を使用することができます。
 正式に実装する保証はなければ、動作保証もできないので使用には注意してください。</value>
@@ -154,6 +158,10 @@ Get Timeなどのコンソールログに出力しないで解析する機能で
     <value>自動でアップデートをチェックする</value>
     <comment>UI, 設定</comment>
   </data>
+  <data name="UI_BackupDestinationPath" xml:space="preserve">
+    <value>バックアップ保存先のパス</value>
+    <comment>UI, 設定</comment>
+  </data>
   <data name="UI_BetaModeEnabledLabel" xml:space="preserve">
     <value>ベータモードの有効化</value>
     <comment>UI, 設定</comment>
@@ -198,6 +206,10 @@ Get Timeなどのコンソールログに出力しないで解析する機能で
     <value>その他</value>
     <comment>UI, 設定</comment>
   </data>
+  <data name="UI_RestoreDestinationPath" xml:space="preserve">
+    <value>復元先のパス</value>
+    <comment>UI, 設定</comment>
+  </data>
   <data name="UI_SaveBT" xml:space="preserve">
     <value>保存</value>
     <comment>UI, 設定</comment>