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 cleanup and style refactor.

Browse Source
This commit is contained in:
Natalia Portillo
2022-11-15 15:58:43 +00:00
parent f59ecffb59
commit 2f9b7fe0a1
1324 changed files with 36815 additions and 37688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,8 +30,6 @@
// Copyright © 2011-2022 Natalia Portillo
// ****************************************************************************/
namespace Aaru.Gui.ViewModels.Windows;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -55,7 +53,6 @@ using Aaru.Gui.ViewModels.Panels;
using Aaru.Gui.Views.Dialogs;
using Aaru.Gui.Views.Panels;
using Aaru.Gui.Views.Windows;
using Aaru.Settings;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
@@ -65,12 +62,13 @@ using JetBrains.Annotations;
using MessageBox.Avalonia;
using MessageBox.Avalonia.Enums;
using ReactiveUI;
using Console = Aaru.Gui.Views.Dialogs.Console;
using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
using ImageInfo = Aaru.Gui.Views.Panels.ImageInfo;
using Partition = Aaru.Gui.Views.Panels.Partition;
using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
namespace Aaru.Gui.ViewModels.Windows;
public sealed class MainWindowViewModel : ViewModelBase
{
readonly IAssetLoader _assets;
@@ -85,7 +83,7 @@ public sealed class MainWindowViewModel : ViewModelBase
readonly Bitmap _sdIcon;
readonly Bitmap _usbIcon;
readonly MainWindow _view;
Console _console;
Views.Dialogs.Console _console;
object _contentPanel;
bool _devicesSupported;
object _treeViewSelectedItem;
@@ -454,7 +452,7 @@ public sealed class MainWindowViewModel : ViewModelBase
void ExecuteStatisticsCommand()
{
using var ctx = AaruContext.Create(Settings.LocalDbPath);
using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
if(!ctx.Commands.Any() &&
!ctx.Filesystems.Any() &&
@@ -488,7 +486,7 @@ public sealed class MainWindowViewModel : ViewModelBase
{
if(_console is null)
{
_console = new Console();
_console = new Views.Dialogs.Console();
_console.DataContext = new ConsoleViewModel(_console);
}
@@ -565,10 +563,10 @@ public sealed class MainWindowViewModel : ViewModelBase
Filter = inputFilter
};
List<CommonTypes.Partition> partitions = Partitions.GetAll(imageFormat);
Partitions.AddSchemesToStats(partitions);
List<CommonTypes.Partition> partitions = Core.Partitions.GetAll(imageFormat);
Core.Partitions.AddSchemesToStats(partitions);
var checkRaw = false;
bool checkRaw = false;
List<string> idPlugins;
IFilesystem plugin;
PluginBase plugins = GetPluginBase.Instance;
@@ -604,7 +602,7 @@ public sealed class MainWindowViewModel : ViewModelBase
AaruConsole.WriteLine("Identifying filesystem on partition");
Filesystems.Identify(imageFormat, out idPlugins, partition);
Core.Filesystems.Identify(imageFormat, out idPlugins, partition);
if(idPlugins.Count == 0)
AaruConsole.WriteLine("Filesystem not identified");
@@ -673,7 +671,7 @@ public sealed class MainWindowViewModel : ViewModelBase
Size = imageFormat.Info.Sectors * imageFormat.Info.SectorSize
};
Filesystems.Identify(imageFormat, out idPlugins, wholePart);
Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart);
if(idPlugins.Count == 0)
AaruConsole.WriteLine("Filesystem not identified");
@@ -799,9 +797,8 @@ public sealed class MainWindowViewModel : ViewModelBase
case PeripheralDeviceTypes.DirectAccess:
case PeripheralDeviceTypes.SCSIZonedBlockDevice:
case PeripheralDeviceTypes.SimplifiedDevice:
deviceModel.Icon = dev.IsRemovable ? dev.IsUsb
? _usbIcon
: _removableIcon : _genericHddIcon;
deviceModel.Icon = dev.IsRemovable ? dev.IsUsb ? _usbIcon : _removableIcon
: _genericHddIcon;
break;
case PeripheralDeviceTypes.SequentialAccess: