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

Escape format name, fixes #869

Browse Source
This commit is contained in:
Natalia Portillo
2025-08-20 19:48:41 +01:00
parent f70154c17d
commit f5414ff23d
7 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs
View File

@@ -695,8 +695,9 @@ public sealed class ImageInfoViewModel : ViewModelBase
try
{
if(opticalMediaImage.Sessions is { Count: > 0 })
foreach(Session session in opticalMediaImage.Sessions)
Sessions.Add(session);
{
foreach(Session session in opticalMediaImage.Sessions) Sessions.Add(session);
}
}
catch(Exception ex)
{
@@ -706,8 +707,9 @@ public sealed class ImageInfoViewModel : ViewModelBase
try
{
if(opticalMediaImage.Tracks is { Count: > 0 })
foreach(Track track in opticalMediaImage.Tracks)
Tracks.Add(track);
{
foreach(Track track in opticalMediaImage.Tracks) Tracks.Add(track);
}
}
catch(Exception ex)
{

13
Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
View File

@@ -64,6 +64,7 @@ using JetBrains.Annotations;
using MsBox.Avalonia;
using MsBox.Avalonia.Enums;
using ReactiveUI;
using Spectre.Console;
using Console = Aaru.Gui.Views.Dialogs.Console;
using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
using ImageInfo = Aaru.Gui.Views.Panels.ImageInfo;
@@ -568,7 +569,7 @@ public sealed class MainWindowViewModel : ViewModelBase
return;
}
AaruLogging.WriteLine(UI.Image_format_identified_by_0_1, imageFormat.Name, imageFormat.Id);
AaruLogging.WriteLine(UI.Image_format_identified_by_0_1, Markup.Escape(imageFormat.Name), imageFormat.Id);
try
{
@@ -835,11 +836,11 @@ public sealed class MainWindowViewModel : ViewModelBase
.ThenBy(d => d.Model))
{
AaruLogging.Debug(MODULE_NAME,
UI.Found_supported_device_model_0_by_manufacturer_1_on_bus_2_and_path_3,
device.Model,
device.Vendor,
device.Bus,
device.Path);
UI.Found_supported_device_model_0_by_manufacturer_1_on_bus_2_and_path_3,
device.Model,
device.Vendor,
device.Bus,
device.Path);
var deviceModel = new DeviceModel
{

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

@@ -140,9 +140,9 @@ sealed class ExtractFilesCommand : Command<ExtractFilesCommand.Settings>
}
if(settings.Verbose)
AaruLogging.Verbose(UI.Image_format_identified_by_0_1, imageFormat.Name, imageFormat.Id);
AaruLogging.Verbose(UI.Image_format_identified_by_0_1, Markup.Escape(imageFormat.Name), imageFormat.Id);
else
AaruLogging.WriteLine(UI.Image_format_identified_by_0, imageFormat.Name);
AaruLogging.WriteLine(UI.Image_format_identified_by_0, Markup.Escape(imageFormat.Name));
if(settings.OutputDir == null)
{

4
Aaru/Commands/Filesystem/Info.cs
View File

@@ -128,9 +128,9 @@ sealed class FilesystemInfoCommand : Command<FilesystemInfoCommand.Settings>
}
if(settings.Verbose)
AaruLogging.Verbose(UI.Image_format_identified_by_0_1, imageFormat.Name, imageFormat.Id);
AaruLogging.Verbose(UI.Image_format_identified_by_0_1, Markup.Escape(imageFormat.Name), imageFormat.Id);
else
AaruLogging.WriteLine(UI.Image_format_identified_by_0, imageFormat.Name);
AaruLogging.WriteLine(UI.Image_format_identified_by_0, Markup.Escape(imageFormat.Name));
AaruLogging.WriteLine();

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

@@ -136,9 +136,9 @@ sealed class LsCommand : Command<LsCommand.Settings>
}
if(settings.Verbose)
AaruLogging.Verbose(UI.Image_format_identified_by_0_1, imageFormat.Name, imageFormat.Id);
AaruLogging.Verbose(UI.Image_format_identified_by_0_1, Markup.Escape(imageFormat.Name), imageFormat.Id);
else
AaruLogging.WriteLine(UI.Image_format_identified_by_0, imageFormat.Name);
AaruLogging.WriteLine(UI.Image_format_identified_by_0, Markup.Escape(imageFormat.Name));
try
{

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

@@ -129,9 +129,11 @@ sealed class CreateSidecarCommand : Command<CreateSidecarCommand.Settings>
}
if(settings.Verbose)
AaruLogging.Verbose(UI.Image_format_identified_by_0_1, imageFormat.Name, imageFormat.Id);
AaruLogging.Verbose(UI.Image_format_identified_by_0_1,
Markup.Escape(imageFormat.Name),
imageFormat.Id);
else
AaruLogging.WriteLine(UI.Image_format_identified_by_0, imageFormat.Name);
AaruLogging.WriteLine(UI.Image_format_identified_by_0, Markup.Escape(imageFormat.Name));
try
{

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

@@ -89,7 +89,7 @@ sealed class ImageInfoCommand : Command<ImageInfoCommand.Settings>
return (int)ErrorNumber.UnrecognizedFormat;
}
AaruLogging.WriteLine(UI.Image_format_identified_by_0_1, imageFormat.Name, imageFormat.Id);
AaruLogging.WriteLine(UI.Image_format_identified_by_0_1, Markup.Escape(imageFormat.Name), imageFormat.Id);
AaruLogging.WriteLine();