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] Set up media scan view model to receive device instead of device path.

Browse Source
This commit is contained in:
Natalia Portillo
2025-11-19 23:09:43 +00:00
parent 185f8fb7ab
commit 0ef27976db
1 changed files with 5 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,6 @@ using System.Diagnostics.CodeAnalysis;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Input; using System.Windows.Input;
using Aaru.CommonTypes.Enums;
using Aaru.Core; using Aaru.Core;
using Aaru.Core.Devices.Scanning; using Aaru.Core.Devices.Scanning;
using Aaru.Devices; using Aaru.Devices;
@@ -57,6 +56,7 @@ namespace Aaru.Gui.ViewModels.Windows;
public sealed partial class MediaScanViewModel : ViewModelBase public sealed partial class MediaScanViewModel : ViewModelBase
{ {
readonly Device _device;
readonly Window _view; readonly Window _view;
[ObservableProperty] [ObservableProperty]
string _a; string _a;
@@ -75,7 +75,7 @@ public sealed partial class MediaScanViewModel : ViewModelBase
bool _closeVisible; bool _closeVisible;
[ObservableProperty] [ObservableProperty]
string _d; string _d;
string _devicePath; readonly string _devicePath;
[ObservableProperty] [ObservableProperty]
string _e; string _e;
[ObservableProperty] [ObservableProperty]
@@ -135,8 +135,9 @@ public sealed partial class MediaScanViewModel : ViewModelBase
[ObservableProperty] [ObservableProperty]
string _unreadableSectors; string _unreadableSectors;
public MediaScanViewModel(string devicePath, Window view) public MediaScanViewModel(Device device, string devicePath, Window view)
{ {
_device = device;
_devicePath = devicePath; _devicePath = devicePath;
_view = view; _view = view;
StopVisible = false; StopVisible = false;
@@ -188,58 +189,8 @@ public sealed partial class MediaScanViewModel : ViewModelBase
[SuppressMessage("ReSharper", "AsyncVoidMethod")] [SuppressMessage("ReSharper", "AsyncVoidMethod")]
async void DoWork() async void DoWork()
{ {
if(_devicePath.Length == 2 && _devicePath[1] == ':' && _devicePath[0] != '/' && char.IsLetter(_devicePath[0]))
_devicePath = "\\\\.\\" + char.ToUpper(_devicePath[0]) + ':';
var dev = Device.Create(_devicePath, out ErrorNumber devErrno);
switch(dev)
{
case null:
await MessageBoxManager
.GetMessageBoxStandard(UI.Title_Error,
string.Format(UI.Error_0_opening_device, devErrno),
ButtonEnum.Ok,
Icon.Error)
.ShowWindowDialogAsync(_view);
StopVisible = false;
StartVisible = true;
CloseVisible = true;
ProgressVisible = false;
return;
case Devices.Remote.Device remoteDev:
Statistics.AddRemote(remoteDev.RemoteApplication,
remoteDev.RemoteVersion,
remoteDev.RemoteOperatingSystem,
remoteDev.RemoteOperatingSystemVersion,
remoteDev.RemoteArchitecture);
break;
}
if(dev.Error)
{
await MessageBoxManager
.GetMessageBoxStandard(UI.Title_Error,
string.Format(UI.Error_0_opening_device, dev.LastError),
ButtonEnum.Ok,
Icon.Error)
.ShowWindowDialogAsync(_view);
StopVisible = false;
StartVisible = true;
CloseVisible = true;
ProgressVisible = false;
return;
}
Statistics.AddDevice(dev);
_localResults = new ScanResults(); _localResults = new ScanResults();
_scanner = new MediaScan(null, null, _devicePath, dev, false); _scanner = new MediaScan(null, null, _devicePath, _device, false);
_scanner.ScanTime += OnScanTime; _scanner.ScanTime += OnScanTime;
_scanner.ScanUnreadable += OnScanUnreadable; _scanner.ScanUnreadable += OnScanUnreadable;
_scanner.UpdateStatus += UpdateStatus; _scanner.UpdateStatus += UpdateStatus;
@@ -297,7 +248,6 @@ public sealed partial class MediaScanViewModel : ViewModelBase
Statistics.AddCommand("media-scan"); Statistics.AddCommand("media-scan");
dev.Close();
await WorkFinished(); await WorkFinished();
} }