aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[GUI] Use WriteLineAsync in Console.

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-25 13:05:42 +01:00
parent 238062c7b0
commit 4e8aba69be
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs
View File

@@ -31,7 +31,6 @@
// ****************************************************************************/ // ****************************************************************************/
using System; using System;
using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
@@ -80,10 +79,7 @@ public sealed class ConsoleViewModel : ViewModelBase
{ {
IStorageFile result = await _view.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions IStorageFile result = await _view.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
{ {
FileTypeChoices = new List<FilePickerFileType> FileTypeChoices = [FilePickerFileTypes.Log]
{
FilePickerFileTypes.Log
}
}); });
if(result is null) return; if(result is null) return;
@@ -93,7 +89,7 @@ public sealed class ConsoleViewModel : ViewModelBase
var logFs = new FileStream(result.Path.AbsolutePath, FileMode.Create, FileAccess.ReadWrite); var logFs = new FileStream(result.Path.AbsolutePath, FileMode.Create, FileAccess.ReadWrite);
var logSw = new StreamWriter(logFs); var logSw = new StreamWriter(logFs);
logSw.WriteLine(UI.Log_saved_at_0, DateTime.Now); await logSw.WriteLineAsync(string.Format(UI.Log_saved_at_0, DateTime.Now));
PlatformID platId = DetectOS.GetRealPlatformID(); PlatformID platId = DetectOS.GetRealPlatformID();
string platVer = DetectOS.GetVersion(); string platVer = DetectOS.GetVersion();
@@ -103,34 +99,34 @@ public sealed class ConsoleViewModel : ViewModelBase
typeof(AssemblyInformationalVersionAttribute)) as typeof(AssemblyInformationalVersionAttribute)) as
AssemblyInformationalVersionAttribute; AssemblyInformationalVersionAttribute;
logSw.WriteLine(Localization.Core.System_information); await logSw.WriteLineAsync(Localization.Core.System_information);
logSw.WriteLine("{0} {1} ({2}-bit)", await
DetectOS.GetPlatformName(platId, platVer), logSw.WriteLineAsync($"{DetectOS.GetPlatformName(platId, platVer)} {platVer} ({(Environment.Is64BitOperatingSystem ? 64 : 32)}-bit)");
platVer,
Environment.Is64BitOperatingSystem ? 64 : 32);
logSw.WriteLine(".NET Core {0}", Version.GetNetCoreVersion()); await logSw.WriteLineAsync($".NET Core {Version.GetNetCoreVersion()}");
logSw.WriteLine(); await logSw.WriteLineAsync();
logSw.WriteLine(Localization.Core.Program_information); await logSw.WriteLineAsync(Localization.Core.Program_information);
logSw.WriteLine("Aaru {0}", assemblyVersion?.InformationalVersion); await logSw.WriteLineAsync($"Aaru {assemblyVersion?.InformationalVersion}");
logSw.WriteLine(Localization.Core.Running_in_0_bit, Environment.Is64BitProcess ? 64 : 32);
await logSw.WriteLineAsync(string.Format(Localization.Core.Running_in_0_bit,
Environment.Is64BitProcess ? 64 : 32));
#if DEBUG #if DEBUG
logSw.WriteLine(Localization.Core.DEBUG_version); await logSw.WriteLineAsync(Localization.Core.DEBUG_version);
#endif #endif
logSw.WriteLine(Localization.Core.Command_line_0, Environment.CommandLine); await logSw.WriteLineAsync(string.Format(Localization.Core.Command_line_0, Environment.CommandLine));
logSw.WriteLine(); await logSw.WriteLineAsync();
logSw.WriteLine(UI.Console_with_ornament); await logSw.WriteLineAsync(UI.Console_with_ornament);
foreach(LogEntry entry in ConsoleHandler.Entries) foreach(LogEntry entry in ConsoleHandler.Entries)
{ {
if(entry.Type != UI.LogEntry_Type_Info) if(entry.Type != UI.LogEntry_Type_Info)
logSw.WriteLine("{0}: ({1}) {2}", entry.Timestamp, entry.Type.ToLower(), entry.Message); await logSw.WriteLineAsync($"{entry.Timestamp}: ({entry.Type.ToLower()}) {entry.Message}");
else else
logSw.WriteLine("{0}: {1}", entry.Timestamp, entry.Message); await logSw.WriteLineAsync($"{entry.Timestamp}: {entry.Message}");
} }
logSw.Close(); logSw.Close();