Refactor device capability handling and extensibility

Refactored `FluxDeviceInfo` to use a new `FlucDeviceFeatures` structure, replacing `AllowSCP` and `AllowHFE` with extensible lists for valid input and output types. Introduced `FluxDeviceGetFeatures` to centralize device feature definitions.

Updated capability checks across the codebase to use the new `Features` property, improving consistency and reducing redundancy. Enhanced file extension handling to dynamically determine valid extensions based on output types.

Author: Digitoxin1

DiskImageTool/Flux/Enums.vb

@@ -31,6 +31,7 @@
             head1
             both
         End Enum
+
         Public Function ImageImportOutputTypeDescription(Value As ImageImportOutputTypes) As String
             Select Case Value
                 Case ImageImportOutputTypes.HFE

DiskImageTool/Flux/Forms/ConvertImageForm.vb

@@ -105,9 +105,10 @@ Namespace Flux
 
         Private Function CanAcceptDrop(paths As IEnumerable(Of String)) As Boolean
             Dim SelectedDevice As FluxDeviceInfo = CType(ComboDevices.SelectedItem, FluxDeviceInfo)
+            Dim AllowSCP As Boolean = SelectedDevice.Features.ImportValidInputTypes.Contains(InputFileTypeEnum.scp)
 
             For Each path In paths
-                If IsValidFluxImport(path, SelectedDevice.AllowSCP).Result Then
+                If IsValidFluxImport(path, AllowSCP).Result Then
                     Return True
                 End If
 
@@ -418,8 +419,9 @@ Namespace Flux
 
         Private Function OpenFluxImage(Filename As String) As Boolean
             Dim SelectedDevice As FluxDeviceInfo = CType(ComboDevices.SelectedItem, FluxDeviceInfo)
+            Dim AllowSCP As Boolean = SelectedDevice.Features.ImportValidInputTypes.Contains(InputFileTypeEnum.scp)
 
-            Dim response = AnalyzeFluxImage(Filename, SelectedDevice.AllowSCP)
+            Dim response = AnalyzeFluxImage(Filename, AllowSCP)
             If response.Result Then
                 _TrackCount = response.TrackCount
                 _SideCount = response.SideCount
@@ -433,7 +435,9 @@ Namespace Flux
 
         Private Function OpenFluxImage() As Boolean
             Dim SelectedDevice As FluxDeviceInfo = CType(ComboDevices.SelectedItem, FluxDeviceInfo)
-            Dim FileName As String = SharedLib.OpenFluxImage(Me, SelectedDevice.AllowSCP)
+            Dim AllowSCP As Boolean = SelectedDevice.Features.ImportValidInputTypes.Contains(InputFileTypeEnum.scp)
+
+            Dim FileName As String = SharedLib.OpenFluxImage(Me, AllowSCP)
 
             If FileName <> "" Then
                 Return OpenFluxImage(FileName)
@@ -479,11 +483,12 @@ Namespace Flux
             _ComboExtensionsNoEvent = True
 
             Dim OutputType As ImageImportOutputTypes = ComboOutputType.SelectedValue
-            Dim hfeOnly = OutputType = ImageImportOutputTypes.HFE AndAlso _SelectedDevice.AllowHFE
 
-            If hfeOnly Then
+            If OutputType <> ImageImportOutputTypes.IMA Then
+                Dim Extension = ImageImportOutputTypeFileExt(OutputType)
+
                 Dim items As New List(Of FileExtensionItem) From {
-                    New FileExtensionItem(".hfe", Nothing)
+                    New FileExtensionItem(Extension, Nothing)
                 }
 
                 With ComboExtensions
@@ -515,11 +520,7 @@ Namespace Flux
             Dim UseSectorImage As Boolean = AllowSectorImage()
 
             For Each OutputType As ImageImportOutputTypes In [Enum].GetValues(GetType(ImageImportOutputTypes))
-                If OutputType = ImageImportOutputTypes.IMA AndAlso Not UseSectorImage AndAlso _SelectedDevice.AllowHFE Then
-                    Continue For
-                End If
-
-                If OutputType = ImageImportOutputTypes.HFE AndAlso Not _SelectedDevice.AllowHFE Then
+                If Not _SelectedDevice.Features.ImportValidOutputTypes.Contains(OutputType) Then
                     Continue For
                 End If
 
@@ -783,7 +784,9 @@ Namespace Flux
 
         Private Sub ImageImportForm_DragDrop(sender As Object, e As DragEventArgs) Handles Me.DragDrop
             Dim SelectedDevice As FluxDeviceInfo = CType(ComboDevices.SelectedItem, FluxDeviceInfo)
+            Dim AllowSCP As Boolean = SelectedDevice.Features.ImportValidInputTypes.Contains(InputFileTypeEnum.scp)
             Dim HasOutputfile As Boolean = Not String.IsNullOrEmpty(_OutputFilePath)
+
             If Process.IsRunning Or HasOutputfile Then
                 Return
             End If
@@ -799,7 +802,7 @@ Namespace Flux
 
             Dim firstPath = paths(0)
 
-            Dim Response = IsValidFluxImport(firstPath, SelectedDevice.AllowSCP)
+            Dim Response = IsValidFluxImport(firstPath, AllowSCP)
             If Response.Result Then
                 If OpenFluxImage(Response.File) Then
                     InitializeDevice(True)

DiskImageTool/Flux/SharedLib.vb

@@ -149,12 +149,39 @@ Namespace Flux
             Return DetectedFormat
         End Function
 
+        Private Function FluxDeviceGetFeatures(Device As FluxDevice) As FlucDeviceFeatures
+
+            Dim features As New FlucDeviceFeatures With {
+                .ImportValidInputTypes = New List(Of InputFileTypeEnum),
+                .ImportValidOutputTypes = New List(Of ImageImportOutputTypes)
+            }
+
+            Select Case Device
+                Case FluxDevice.Greaseweazle
+                    features.ImportValidInputTypes.Add(InputFileTypeEnum.scp)
+                    features.ImportValidInputTypes.Add(InputFileTypeEnum.raw)
+
+                    features.ImportValidOutputTypes.Add(ImageImportOutputTypes.IMA)
+                    features.ImportValidOutputTypes.Add(ImageImportOutputTypes.HFE)
+
+                Case FluxDevice.Kryoflux
+                    features.ImportValidInputTypes.Add(InputFileTypeEnum.raw)
+
+                    features.ImportValidOutputTypes.Add(ImageImportOutputTypes.IMA)
+            End Select
+
+            Return features
+        End Function
+
         Public Function FluxDeviceGetInfo(Device As FluxDevice) As FluxDeviceInfo?
+            Dim Features = FluxDeviceGetFeatures(Device)
+
             Select Case Device
                 Case FluxDevice.Greaseweazle
-                    Return New FluxDeviceInfo(Device, "Greaseweazle", True, True, App.Globals.AppSettings.Greaseweazle)
+                    Return New FluxDeviceInfo(Device, "Greaseweazle", Features, App.Globals.AppSettings.Greaseweazle)
+
                 Case FluxDevice.Kryoflux
-                    Return New FluxDeviceInfo(Device, "KryoFlux", False, False, App.Globals.AppSettings.Kryoflux)
+                    Return New FluxDeviceInfo(Device, "KryoFlux", Features, App.Globals.AppSettings.Kryoflux)
                 Case Else
                     Return Nothing
             End Select
@@ -173,7 +200,7 @@ Namespace Flux
                 ' Get FluxDeviceInfo
                 Dim info = FluxDeviceGetInfo(dev)
                 If info.HasValue Then
-                    If Not info.Value.AllowSCP And FileType = InputFileTypeEnum.scp Then
+                    If Not info.Value.Features.ImportValidInputTypes.Contains(FileType) Then
                         Continue For
                     End If
                     list.Add(info.Value)
@@ -615,19 +642,22 @@ Namespace Flux
             End Function
         End Structure
 
+        Public Structure FlucDeviceFeatures
+            Public Property ImportValidInputTypes As List(Of InputFileTypeEnum)
+            Public Property ImportValidOutputTypes As List(Of ImageImportOutputTypes)
+        End Structure
+
         Public Structure FluxDeviceInfo
-            Public Sub New(Device As FluxDevice, Name As String, AllowSCP As Boolean, AllowHFE As Boolean, Settings As ISettings)
+            Public Sub New(Device As FluxDevice, Name As String, Features As FlucDeviceFeatures, Settings As ISettings)
                 Me.Device = Device
                 Me.Name = Name
-                Me.AllowSCP = AllowSCP
-                Me.AllowHFE = AllowHFE
+                Me.Features = Features
                 Me.Settings = Settings
             End Sub
 
-            ReadOnly Property AllowHFE As Boolean
-            ReadOnly Property AllowSCP As Boolean
             ReadOnly Property Device As FluxDevice
             ReadOnly Property Name As String
+            ReadOnly Property Features As FlucDeviceFeatures
             ReadOnly Property Settings As ISettings
         End Structure