Misc

AigioL · AigioL · commit 6e9e99248bb6 · 2023-03-16T17:29:33.000+08:00
diff --git a/WattToolkit.sln b/WattToolkit.sln
@@ -29,6 +29,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Document", "Document", "{1E
 	ProjectSection(SolutionItems) = preProject
 		doc\download-guide.en.md = doc\download-guide.en.md
 		doc\download-guide.md = doc\download-guide.md
+		doc\openwrt.md = doc\openwrt.md
 		doc\release-keylol.md = doc\release-keylol.md
 	EndProjectSection
 EndProject
@@ -151,7 +152,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.WTTS.Client.AppHost", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.WTTS.Client.Plugins.Accelerator.ReverseProxy", "src\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy\BD.WTTS.Client.Plugins.Accelerator.ReverseProxy.csproj", "{521D4676-8E8A-4A4C-9835-B09FF4AFFBBC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.WTTS.Client.IPC", "src\BD.WTTS.Client.IPC\BD.WTTS.Client.IPC.csproj", "{407BE171-FB57-4C39-BF26-7FAF4450635F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.WTTS.Client.IPC", "src\BD.WTTS.Client.IPC\BD.WTTS.Client.IPC.csproj", "{407BE171-FB57-4C39-BF26-7FAF4450635F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/doc/openwrt.md b/doc/openwrt.md
@@ -0,0 +1 @@
+### [OpenWrt](https://openwrt.org/start)
diff --git a/src/BD.WTTS.Client.Avalonia.App/Services/Implementation/AvaloniaWindowManagerImpl.cs b/src/BD.WTTS.Client.Avalonia.App/Services/Implementation/AvaloniaWindowManagerImpl.cs
@@ -87,14 +87,11 @@ static void BindingDialogWindowViewModel(Window window, DialogWindowViewModel di
                                 window.Close();
                             }
                         });
-                    if (dialogWindowViewModel.Cancel == null)
+                    dialogWindowViewModel.Cancel ??= ReactiveCommand.Create(() =>
                     {
-                        dialogWindowViewModel.Cancel = ReactiveCommand.Create(() =>
-                        {
-                            dialogWindowViewModel.DialogResult = false;
-                            window.Close();
-                        });
-                    }
+                        dialogWindowViewModel.DialogResult = false;
+                        window.Close();
+                    });
                 }
                 if (viewModel == null)
                 {
diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/Plugins/Plugin.cs b/src/BD.WTTS.Client.Plugins.Accelerator/Plugins/Plugin.cs
@@ -53,9 +53,13 @@ public override void OnAddAutoMapper(IMapperConfigurationExpression cfg)
         cfg.AddProfile<AcceleratorAutoMapperProfile>();
     }
 
-    public override void OnUnhandledException(Exception ex, string name, bool? isTerminating = null)
+    public override async void OnUnhandledException(Exception ex, string name, bool? isTerminating = null)
     {
-        Ioc.Get_Nullable<IReverseProxyService>()?.StopProxy();
+        IReverseProxyService reverseProxyService = Ioc.Get_Nullable<IReverseProxyService>();
+        if (reverseProxyService != null)
+        {
+            await reverseProxyService.StartProxy();
+        }
         ProxyService.OnExitRestoreHosts();
     }
 }
diff --git a/src/BD.WTTS.Client/Services.Implementation/App/ApplicationUpdateServiceBaseImpl.cs b/src/BD.WTTS.Client/Services.Implementation/App/ApplicationUpdateServiceBaseImpl.cs
@@ -388,9 +388,9 @@ where local_file_info.Exists
                     #endregion
 
                     #region 根据哈希值匹配已有文件
-                    if (hashFiles.ContainsKey(hashFileKey))
+                    if (hashFiles.TryGetValue(hashFileKey, out var value))
                     {
-                        var hashFilePath = hashFiles[hashFileKey];
+                        var hashFilePath = value;
                         File.Copy(hashFilePath, fileInfo.FullName);
                         goto for_end;
                     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+### [OpenWrt](https://openwrt.org/start)`
Original file line number	Diff line number	Diff line change
`@@ -87,14 +87,11 @@ static void BindingDialogWindowViewModel(Window window, DialogWindowViewModel di`
`87`	`87`	`window.Close();`
`88`	`88`	`}`
`89`	`89`	`});`
`90`		`- if (dialogWindowViewModel.Cancel == null)`
	`90`	`+ dialogWindowViewModel.Cancel ??= ReactiveCommand.Create(() =>`
`91`	`91`	`{`
`92`		`- dialogWindowViewModel.Cancel = ReactiveCommand.Create(() =>`
`93`		`- {`
`94`		`- dialogWindowViewModel.DialogResult = false;`
`95`		`- window.Close();`
`96`		`- });`
`97`		`- }`
	`92`	`+ dialogWindowViewModel.DialogResult = false;`
	`93`	`+ window.Close();`
	`94`	`+ });`
`98`	`95`	`}`
`99`	`96`	`if (viewModel == null)`
`100`	`97`	`{`
Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,13 @@ public override void OnAddAutoMapper(IMapperConfigurationExpression cfg)`
`53`	`53`	`cfg.AddProfile<AcceleratorAutoMapperProfile>();`
`54`	`54`	`}`
`55`	`55`
`56`		`- public override void OnUnhandledException(Exception ex, string name, bool? isTerminating = null)`
	`56`	`+ public override async void OnUnhandledException(Exception ex, string name, bool? isTerminating = null)`
`57`	`57`	`{`
`58`		`- Ioc.Get_Nullable<IReverseProxyService>()?.StopProxy();`
	`58`	`+ IReverseProxyService reverseProxyService = Ioc.Get_Nullable<IReverseProxyService>();`
	`59`	`+ if (reverseProxyService != null)`
	`60`	`+ {`
	`61`	`+ await reverseProxyService.StartProxy();`
	`62`	`+ }`
`59`	`63`	`ProxyService.OnExitRestoreHosts();`
`60`	`64`	`}`
`61`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -388,9 +388,9 @@ where local_file_info.Exists`
`388`	`388`	`#endregion`
`389`	`389`
`390`	`390`	`#region 根据哈希值匹配已有文件`
`391`		`- if (hashFiles.ContainsKey(hashFileKey))`
	`391`	`+ if (hashFiles.TryGetValue(hashFileKey, out var value))`
`392`	`392`	`{`
`393`		`- var hashFilePath = hashFiles[hashFileKey];`
	`393`	`+ var hashFilePath = value;`
`394`	`394`	`File.Copy(hashFilePath, fileInfo.FullName);`
`395`	`395`	`goto for_end;`
`396`	`396`	`}`