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

Move most of PluginBase logic into Aaru.Commontypes.

Browse Source
This commit is contained in:
Natalia Portillo
2023-10-05 13:47:59 +01:00
parent 7df41de4af
commit a50d892f2a
28 changed files with 91 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ using System;
using System.Collections.ObjectModel;
using System.Reactive;
using System.Reflection;
using Aaru.CommonTypes;
using Aaru.CommonTypes.Interfaces;
using Aaru.Core;
using Aaru.Gui.Models;
@@ -60,9 +61,10 @@ public sealed class PluginsViewModel : ViewModelBase
FloppyImages = new ObservableCollection<PluginModel>();
WritableFloppyImages = new ObservableCollection<PluginModel>();
CloseCommand = ReactiveCommand.Create(ExecuteCloseCommand);
PluginBase.Init();
// TODO: Takes too much time
foreach(Type filterType in PluginBase.Singleton.Filters.Values)
foreach(Type filterType in PluginRegister.Singleton.Filters.Values)
{
if(Activator.CreateInstance(filterType) is not IFilter filter)
continue;
@@ -76,7 +78,7 @@ public sealed class PluginsViewModel : ViewModelBase
});
}
foreach(Type imageType in PluginBase.Singleton.FloppyImages.Values)
foreach(Type imageType in PluginRegister.Singleton.FloppyImages.Values)
{
if(Activator.CreateInstance(imageType) is not IFloppyImage floppyImage)
continue;
@@ -90,7 +92,7 @@ public sealed class PluginsViewModel : ViewModelBase
});
}
foreach(Type imageType in PluginBase.Singleton.MediaImages.Values)
foreach(Type imageType in PluginRegister.Singleton.MediaImages.Values)
{
if(Activator.CreateInstance(imageType) is not IMediaImage mediaImage)
continue;
@@ -104,7 +106,7 @@ public sealed class PluginsViewModel : ViewModelBase
});
}
foreach(Type partitionType in PluginBase.Singleton.Partitions.Values)
foreach(Type partitionType in PluginRegister.Singleton.Partitions.Values)
{
if(Activator.CreateInstance(partitionType) is not IPartition partition)
continue;
@@ -118,7 +120,7 @@ public sealed class PluginsViewModel : ViewModelBase
});
}
foreach(Type filesystem in PluginBase.Singleton.Filesystems.Values)
foreach(Type filesystem in PluginRegister.Singleton.Filesystems.Values)
{
if(Activator.CreateInstance(filesystem) is not IFilesystem fs)
continue;
@@ -132,7 +134,7 @@ public sealed class PluginsViewModel : ViewModelBase
});
}
foreach(Type readOnlyFilesystem in PluginBase.Singleton.ReadOnlyFilesystems.Values)
foreach(Type readOnlyFilesystem in PluginRegister.Singleton.ReadOnlyFilesystems.Values)
{
if(Activator.CreateInstance(readOnlyFilesystem) is not IReadOnlyFilesystem fs)
continue;
@@ -146,7 +148,7 @@ public sealed class PluginsViewModel : ViewModelBase
});
}
foreach(Type imageType in PluginBase.Singleton.WritableFloppyImages.Values)
foreach(Type imageType in PluginRegister.Singleton.WritableFloppyImages.Values)
{
if(Activator.CreateInstance(imageType) is not IWritableFloppyImage writableFloppyImage)
continue;
@@ -160,7 +162,7 @@ public sealed class PluginsViewModel : ViewModelBase
});
}
foreach(Type baseWritableImageType in PluginBase.Singleton.WritableImages.Values)
foreach(Type baseWritableImageType in PluginRegister.Singleton.WritableImages.Values)
{
if(Activator.CreateInstance(baseWritableImageType) is not IWritableImage writableImage)
continue;

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

@@ -41,6 +41,7 @@ using System.Text;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using Aaru.CommonTypes;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
@@ -172,7 +173,8 @@ public sealed class ImageConvertViewModel : ViewModelBase
DriveSerialNumberVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.DriveSerialNumber);
DriveFirmwareRevisionVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.DriveFirmwareRevision);
PluginBase plugins = PluginBase.Singleton;
PluginBase.Init();
PluginRegister plugins = PluginRegister.Singleton;
foreach(Type pluginType in plugins.WritableImages.Values)
{
@@ -1385,10 +1387,12 @@ public sealed class ImageConvertViewModel : ViewModelBase
if(trackFlags.Count > 0)
{
foreach(KeyValuePair<byte, byte> flags in trackFlags)
{
outputOptical.WriteSectorTag(new[]
{
flags.Value
}, flags.Key, SectorTagType.CdTrackFlags);
}
}
if(mcn != null)

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

@@ -609,7 +609,8 @@ public sealed class MainWindowViewModel : ViewModelBase
var checkRaw = false;
List<string> idPlugins;
Type pluginType;
PluginBase plugins = PluginBase.Singleton;
PluginBase.Init();
PluginRegister plugins = PluginRegister.Singleton;
if(partitions.Count == 0)
{

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

@@ -42,6 +42,7 @@ using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using System.Xml.Serialization;
using Aaru.CommonTypes;
using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces;
@@ -167,7 +168,8 @@ public sealed class MediaDumpViewModel : ViewModelBase
}
}
PluginBase plugins = PluginBase.Singleton;
PluginBase.Init();
PluginRegister plugins = PluginRegister.Singleton;
foreach(Type pluginType in plugins.WritableImages.Values)
{