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

[Aaru.Console] Markup more console output to prevent Spectre from crashing.

Browse Source
This commit is contained in:
Natalia Portillo
2023-10-26 09:20:42 +01:00
parent 520eb54a21
commit da3bbdc80c
8 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Aaru/Commands/Archive/Extract.cs
View File

@@ -266,6 +266,13 @@ sealed class ArchiveExtractCommand : Command
string outputPath = Path.Combine(outputDir, fileName); string outputPath = Path.Combine(outputDir, fileName);
string destinationDir = Path.GetDirectoryName(outputPath); string destinationDir = Path.GetDirectoryName(outputPath);
if(File.Exists(destinationDir))
{
AaruConsole.ErrorWriteLine(UI.Cannot_write_file_0_output_exists, Markup.Escape(fileName));
continue;
}
if(destinationDir is not null) if(destinationDir is not null)
Directory.CreateDirectory(destinationDir); Directory.CreateDirectory(destinationDir);
@@ -450,7 +457,7 @@ sealed class ArchiveExtractCommand : Command
} }
catch(Exception ex) catch(Exception ex)
{ {
AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message)); AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
AaruConsole.WriteException(ex); AaruConsole.WriteException(ex);
return (int)ErrorNumber.UnexpectedException; return (int)ErrorNumber.UnexpectedException;

2
Aaru/Commands/Archive/Info.cs
View File

@@ -184,7 +184,7 @@ sealed class ArchiveInfoCommand : Command
} }
catch(Exception ex) catch(Exception ex)
{ {
AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message)); AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
AaruConsole.WriteException(ex); AaruConsole.WriteException(ex);
return (int)ErrorNumber.UnexpectedException; return (int)ErrorNumber.UnexpectedException;

2
Aaru/Commands/Archive/List.cs
View File

@@ -392,7 +392,7 @@ sealed class ArchiveListCommand : Command
} }
catch(Exception ex) catch(Exception ex)
{ {
AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message)); AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
AaruConsole.WriteException(ex); AaruConsole.WriteException(ex);
return (int)ErrorNumber.UnexpectedException; return (int)ErrorNumber.UnexpectedException;

2
Aaru/Commands/Filesystem/ExtractFiles.cs
View File

@@ -386,7 +386,7 @@ sealed class ExtractFilesCommand : Command
} }
catch(Exception ex) catch(Exception ex)
{ {
AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message)); AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
AaruConsole.WriteException(ex); AaruConsole.WriteException(ex);
return (int)ErrorNumber.UnexpectedException; return (int)ErrorNumber.UnexpectedException;

2
Aaru/Commands/Filesystem/Ls.cs
View File

@@ -349,7 +349,7 @@ sealed class LsCommand : Command
} }
catch(Exception ex) catch(Exception ex)
{ {
AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message)); AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
AaruConsole.WriteException(ex); AaruConsole.WriteException(ex);
return (int)ErrorNumber.UnexpectedException; return (int)ErrorNumber.UnexpectedException;

2
Aaru/Commands/Image/CreateSidecar.cs
View File

@@ -298,7 +298,7 @@ sealed class CreateSidecarCommand : Command
} }
catch(Exception ex) catch(Exception ex)
{ {
AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message)); AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
AaruConsole.WriteException(ex); AaruConsole.WriteException(ex);
return (int)ErrorNumber.UnexpectedException; return (int)ErrorNumber.UnexpectedException;

2
Aaru/Commands/Image/Info.cs
View File

@@ -168,7 +168,7 @@ sealed class ImageInfoCommand : Command
} }
catch(Exception ex) catch(Exception ex)
{ {
AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, ex.Message)); AaruConsole.ErrorWriteLine(string.Format(UI.Error_reading_file_0, Markup.Escape(ex.Message)));
AaruConsole.WriteException(ex); AaruConsole.WriteException(ex);
return (int)ErrorNumber.UnexpectedException; return (int)ErrorNumber.UnexpectedException;

0
build.sh Normal file → Executable file
View File