feat: 导出诊断信息时导出近期日志

LyRin-owo · Sep 30, 2024 · bd3f798 · bd3f798
1 parent 865b48b
commit bd3f798
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ClassIsland/Services/DiagnosticService.cs b/ClassIsland/Services/DiagnosticService.cs
@@ -89,17 +89,21 @@ public async Task ExportDiagnosticData(string path)
         {
             var temp = Directory.CreateTempSubdirectory("ClassIslandDiagnosticExport").FullName;
             var logs = string.Join('\n', AppLogService.Logs);
-            await File.WriteAllTextAsync(Path.Combine(temp, "Logs.log"), logs);
+            //await File.WriteAllTextAsync(Path.Combine(temp, "Logs.log"), logs);
             await File.WriteAllTextAsync(Path.Combine(temp, "DiagnosticInfo.txt"), GetDiagnosticInfo());
             File.Copy("./Settings.json", Path.Combine(temp, "Settings.json"));
             var profile = App.GetService<IProfileService>().CurrentProfilePath;
             Directory.CreateDirectory(Path.Combine(temp, "Profiles/"));
             Directory.CreateDirectory(Path.Combine(temp, "Management/"));
+            Directory.CreateDirectory(Path.Combine(temp, "Config/"));
+            Directory.CreateDirectory(Path.Combine(temp, "Logs/"));
             foreach (var file in Directory.GetFiles(ManagementService.ManagementConfigureFolderPath))
             {
                 File.Copy(file, Path.Combine(temp, "Management/", Path.GetFileName(file)));
             }
             File.Copy(Path.Combine("./Profiles", profile), Path.Combine(temp, "Profiles/",  profile));
+            FileFolderService.CopyFolder(Path.Combine(App.AppConfigPath), Path.Combine(temp, "Config/"));
+            FileFolderService.CopyFolder(Path.Combine(App.AppLogFolderPath), Path.Combine(temp, "Logs/"));
 
             File.Delete(path);
             await Task.Run(() =>

diff --git a/ClassIsland/Views/SettingsWindowNew.xaml.cs b/ClassIsland/Views/SettingsWindowNew.xaml.cs
@@ -356,7 +356,7 @@ private async void MenuItemExportDiagnosticInfo_OnClick(object sender, RoutedEve
     {
         try
         {
-            var r = CommonDialog.ShowDialog("ClassIsland", $"您正在导出应用的诊断数据。导出的诊断数据将包含应用当前运行的日志、系统及环境信息、应用设置、当前加载的档案和集控设置（如有），可能包含敏感信息，请在导出后注意检查。", new BitmapImage(new Uri("/Assets/HoYoStickers/帕姆_注意.png", UriKind.Relative)),
+            var r = CommonDialog.ShowDialog("ClassIsland", $"您正在导出应用的诊断数据。导出的诊断数据将包含应用 30 天内产生的日志、系统及环境信息、应用设置、当前加载的档案和集控设置（如有），可能包含敏感信息，请在导出后注意检查。", new BitmapImage(new Uri("/Assets/HoYoStickers/帕姆_注意.png", UriKind.Relative)),
                 60, 60, [
                     new DialogAction()
                     {
-Original file line number
+Diff line change
@@ Expand Up @@
         {
             try
             {
-                var r = CommonDialog.ShowDialog("ClassIsland", $"您正在导出应用的诊断数据。导出的诊断数据将包含应用当前运行的日志、系统及环境信息、应用设置、当前加载的档案和集控设置（如有），可能包含敏感信息，请在导出后注意检查。", new BitmapImage(new Uri("/Assets/HoYoStickers/帕姆_注意.png", UriKind.Relative)),
+                var r = CommonDialog.ShowDialog("ClassIsland", $"您正在导出应用的诊断数据。导出的诊断数据将包含应用 30 天内产生的日志、系统及环境信息、应用设置、当前加载的档案和集控设置（如有），可能包含敏感信息，请在导出后注意检查。", new BitmapImage(new Uri("/Assets/HoYoStickers/帕姆_注意.png", UriKind.Relative)),
 , 60, [
                         new DialogAction()
                         {
@@ Expand Down @@