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

General code style and feature fixes.

Browse Source
This commit is contained in:
Natalia Portillo
2022-11-15 01:35:06 +00:00
parent 47965f0584
commit bd3fe7bd4e
94 changed files with 460 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.Gui/ViewModels/Dialogs/AboutViewModel.cs
View File

@@ -136,7 +136,7 @@ Logo and art:
set => this.RaiseAndSetIfChanged(ref _versionText, value);
}
void ExecuteWebsiteCommand()
static void ExecuteWebsiteCommand()
{
var process = new Process
{

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

@@ -88,7 +88,7 @@ public sealed class ConsoleViewModel : ViewModelBase
{
var dlgSave = new SaveFileDialog();
dlgSave.Filters.Add(new FileDialogFilter
dlgSave.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{
@@ -158,5 +158,5 @@ public sealed class ConsoleViewModel : ViewModelBase
}
}
void ExecuteClearCommand() => ConsoleHandler.Entries.Clear();
static void ExecuteClearCommand() => ConsoleHandler.Entries.Clear();
}

7
Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs
View File

@@ -123,7 +123,11 @@ public sealed class PluginsViewModel : ViewModelBase
Author = writableFloppyImage.Author
});
foreach(IWritableImage writableImage in GetPluginBase.Instance.WritableImages.Values)
foreach(IBaseWritableImage baseWritableImage in GetPluginBase.Instance.WritableImages.Values)
{
if(baseWritableImage is not IWritableImage writableImage)
continue;
WritableImages.Add(new PluginModel
{
Name = writableImage.Name,
@@ -131,6 +135,7 @@ public sealed class PluginsViewModel : ViewModelBase
Version = Assembly.GetAssembly(writableImage.GetType())?.GetName().Version?.ToString(),
Author = writableImage.Author
});
}
}
[NotNull]

2
Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs
View File

@@ -916,7 +916,7 @@ public sealed class DeviceInfoViewModel : ViewModelBase
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{

2
Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs
View File

@@ -348,7 +348,7 @@ public sealed class MediaInfoViewModel : ViewModelBase
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{

6
Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs
View File

@@ -110,7 +110,7 @@ public sealed class AtaInfoViewModel : ViewModelBase
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{
@@ -138,7 +138,7 @@ public sealed class AtaInfoViewModel : ViewModelBase
{
var dlgSaveText = new SaveFileDialog();
dlgSaveText.Filters.Add(new FileDialogFilter
dlgSaveText.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{
@@ -154,7 +154,7 @@ public sealed class AtaInfoViewModel : ViewModelBase
var saveFs = new FileStream(result, FileMode.Create);
var saveSw = new StreamWriter(saveFs);
saveSw.Write(AtaIdentifyText);
await saveSw.WriteAsync(AtaIdentifyText);
saveFs.Close();
}
}

2
Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs
View File

@@ -159,7 +159,7 @@ public sealed class BlurayInfoViewModel
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{

14
Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs
View File

@@ -133,7 +133,7 @@ public sealed class CompactDiscInfoViewModel : ViewModelBase
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{
@@ -157,7 +157,7 @@ public sealed class CompactDiscInfoViewModel : ViewModelBase
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{
@@ -181,7 +181,7 @@ public sealed class CompactDiscInfoViewModel : ViewModelBase
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{
@@ -205,7 +205,7 @@ public sealed class CompactDiscInfoViewModel : ViewModelBase
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{
@@ -229,7 +229,7 @@ public sealed class CompactDiscInfoViewModel : ViewModelBase
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{
@@ -253,7 +253,7 @@ public sealed class CompactDiscInfoViewModel : ViewModelBase
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{
@@ -277,7 +277,7 @@ public sealed class CompactDiscInfoViewModel : ViewModelBase
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{

2
Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs
View File

@@ -122,7 +122,7 @@ public sealed class DvdInfoViewModel
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{

2
Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs
View File

@@ -237,7 +237,7 @@ public sealed class DvdWritableInfoViewModel
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{

2
Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs
View File

@@ -172,7 +172,7 @@ public class PcmciaInfoViewModel : ViewModelBase
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{

17
Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs
View File

@@ -413,8 +413,7 @@ public sealed class ScsiInfoViewModel : ViewModelBase
}
// TODO: Automatic error reporting
if(decodedText == null)
decodedText = "Error decoding page, please open an issue.";
decodedText ??= "Error decoding page, please open an issue.";
ModeSensePages.Add(new ScsiPageModel
{
@@ -763,7 +762,7 @@ public sealed class ScsiInfoViewModel : ViewModelBase
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{
@@ -787,7 +786,7 @@ public sealed class ScsiInfoViewModel : ViewModelBase
{
var dlgSaveText = new SaveFileDialog();
dlgSaveText.Filters.Add(new FileDialogFilter
dlgSaveText.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{
@@ -803,7 +802,7 @@ public sealed class ScsiInfoViewModel : ViewModelBase
var saveFs = new FileStream(result, FileMode.Create);
var saveSw = new StreamWriter(saveFs);
saveSw.Write(ScsiInquiryText);
await saveSw.WriteAsync(ScsiInquiryText);
saveFs.Close();
}
@@ -811,7 +810,7 @@ public sealed class ScsiInfoViewModel : ViewModelBase
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{
@@ -835,7 +834,7 @@ public sealed class ScsiInfoViewModel : ViewModelBase
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{
@@ -862,7 +861,7 @@ public sealed class ScsiInfoViewModel : ViewModelBase
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{
@@ -886,7 +885,7 @@ public sealed class ScsiInfoViewModel : ViewModelBase
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{

2
Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs
View File

@@ -95,7 +95,7 @@ public sealed class XboxInfoViewModel
{
var dlgSaveBinary = new SaveFileDialog();
dlgSaveBinary.Filters.Add(new FileDialogFilter
dlgSaveBinary.Filters?.Add(new FileDialogFilter
{
Extensions = new List<string>(new[]
{

3
Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs
View File

@@ -34,9 +34,9 @@ namespace Aaru.Gui.ViewModels.Windows;
using System;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.Reactive;
using System.Threading;
using System.Threading.Tasks;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Structs;
@@ -368,6 +368,7 @@ public sealed class ImageChecksumViewModel : ViewModelBase
StopCommandEnabled = false;
}
[SuppressMessage("ReSharper", "AsyncVoidMethod")]
async void DoWork()
{
var opticalMediaImage = _inputFormat as IOpticalMediaImage;

19
Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs
View File

@@ -35,6 +35,7 @@ namespace Aaru.Gui.ViewModels.Windows;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;
using System.Reactive;
@@ -54,7 +55,6 @@ using Aaru.Devices;
using Aaru.Gui.Models;
using Avalonia.Controls;
using Avalonia.Threading;
using JetBrains.Annotations;
using MessageBox.Avalonia;
using MessageBox.Avalonia.Enums;
using ReactiveUI;
@@ -62,6 +62,7 @@ using Schemas;
using ImageInfo = Aaru.CommonTypes.Structs.ImageInfo;
using Version = Aaru.CommonTypes.Interop.Version;
[SuppressMessage("ReSharper", "AsyncVoidLambda")]
public sealed class ImageConvertViewModel : ViewModelBase
{
readonly IMediaImage _inputFormat;
@@ -127,7 +128,8 @@ public sealed class ImageConvertViewModel : ViewModelBase
bool _stopVisible;
string _title;
public ImageConvertViewModel([NotNull] IMediaImage inputFormat, string imageSource, Window view)
public ImageConvertViewModel([JetBrains.Annotations.NotNull] IMediaImage inputFormat, string imageSource,
Window view)
{
_view = view;
_inputFormat = inputFormat;
@@ -172,8 +174,10 @@ public sealed class ImageConvertViewModel : ViewModelBase
PluginBase plugins = GetPluginBase.Instance;
foreach(IWritableImage plugin in
plugins.WritableImages.Values.Where(p => p.SupportedMediaTypes.Contains(inputFormat.Info.MediaType)))
foreach(IWritableImage plugin in plugins.WritableImages.Values.
Where(p => p.SupportedMediaTypes.Contains(inputFormat.Info.MediaType)).
Select(baseWritableImage => baseWritableImage as IWritableImage).
Where(plugin => plugin is not null))
PluginsList.Add(new ImagePluginModel
{
Plugin = plugin
@@ -569,6 +573,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
new Thread(DoWork).Start(SelectedPlugin.Plugin);
}
[SuppressMessage("ReSharper", "AsyncVoidMethod")]
async void DoWork(object plugin)
{
var warning = false;
@@ -1866,7 +1871,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
Title = "Choose destination file"
};
dlgDestination.Filters.Add(new FileDialogFilter
dlgDestination.Filters?.Add(new FileDialogFilter
{
Name = SelectedPlugin.Plugin.Name,
Extensions = SelectedPlugin.Plugin.KnownExtensions.ToList()
@@ -1932,7 +1937,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
Title = "Choose existing metadata sidecar"
};
dlgMetadata.Filters.Add(new FileDialogFilter
dlgMetadata.Filters?.Add(new FileDialogFilter
{
Name = "CICM XML metadata",
Extensions = new List<string>(new[]
@@ -1979,7 +1984,7 @@ public sealed class ImageConvertViewModel : ViewModelBase
Title = "Choose existing resume file"
};
dlgMetadata.Filters.Add(new FileDialogFilter
dlgMetadata.Filters?.Add(new FileDialogFilter
{
Name = "CICM XML metadata",
Extensions = new List<string>(new[]

1
Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs
View File

@@ -307,6 +307,7 @@ public sealed class ImageEntropyViewModel : ViewModelBase
WholeDiscChecked = false;
}
// ReSharper disable once AsyncVoidLambda
var thread = new Thread(async () =>
{
if(SeparatedTracksChecked)

2
Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs
View File

@@ -330,7 +330,7 @@ public sealed class ImageSidecarViewModel : ViewModelBase
Title = "Choose destination file"
};
dlgDestination.Filters.Add(new FileDialogFilter
dlgDestination.Filters?.Add(new FileDialogFilter
{
Name = "CICM XML metadata",
Extensions = new List<string>(new[]

8
Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs
View File

@@ -418,11 +418,11 @@ public sealed class MediaDumpViewModel : ViewModelBase
{
this.RaiseAndSetIfChanged(ref _useResume, value);
if(value == false)
if(!value)
return;
if(_outputPrefix != null)
CheckResumeFile();
CheckResumeFile().GetAwaiter().GetResult();
}
}
@@ -485,7 +485,7 @@ public sealed class MediaDumpViewModel : ViewModelBase
Title = "Choose existing metadata sidecar"
};
dlgMetadata.Filters.Add(new FileDialogFilter
dlgMetadata.Filters?.Add(new FileDialogFilter
{
Name = "CICM XML metadata",
Extensions = new List<string>(new[]
@@ -643,7 +643,7 @@ public sealed class MediaDumpViewModel : ViewModelBase
Title = "Choose destination file"
};
dlgDestination.Filters.Add(new FileDialogFilter
dlgDestination.Filters?.Add(new FileDialogFilter
{
Name = SelectedPlugin.Plugin.Name,
Extensions = SelectedPlugin.Plugin.KnownExtensions.ToList()

4
Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs
View File

@@ -576,6 +576,8 @@ public sealed class MediaScanViewModel : ViewModelBase
});
[SuppressMessage("ReSharper", "AsyncVoidMethod")]
// ReSharper disable once AsyncVoidLambda
async void StoppingErrorMessage(string text) => await Dispatcher.UIThread.InvokeAsync(action: async () =>
{
ProgressText = text;
@@ -583,7 +585,7 @@ public sealed class MediaScanViewModel : ViewModelBase
await MessageBoxManager.GetMessageBoxStandardWindow("Error", $"{text}", ButtonEnum.Ok, Icon.Error).
ShowDialog(_view);
WorkFinished();
await WorkFinished();
});
[SuppressMessage("ReSharper", "AsyncVoidMethod")]

7
Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs
View File

@@ -33,6 +33,7 @@
namespace Aaru.Gui.ViewModels.Windows;
using System;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;
using System.Text;
@@ -184,10 +185,7 @@ public sealed class SplashWindowViewModel : ViewModelBase
Task.Run(() =>
{
var mainDbUpdate = false;
if(!File.Exists(Settings.MainDbPath))
mainDbUpdate = true;
bool mainDbUpdate = !File.Exists(Settings.MainDbPath);
// TODO: Update database
@@ -217,6 +215,7 @@ public sealed class SplashWindowViewModel : ViewModelBase
});
}
[SuppressMessage("ReSharper", "AsyncVoidMethod")]
async void CheckGdprCompliance()
{
CurrentProgress++;