diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes index b2afea72c..8d7f99e0d 160000 --- a/Aaru.CommonTypes +++ b/Aaru.CommonTypes @@ -1 +1 @@ -Subproject commit b2afea72c84124e0ae4a5b729163a9825c515f6e +Subproject commit 8d7f99e0d3e31edc16127a013c3ee16230c9b7af diff --git a/Aaru.Core/Devices/Dumping/Metadata.cs b/Aaru.Core/Devices/Dumping/Metadata.cs index 88ae898c1..867cdb19e 100644 --- a/Aaru.Core/Devices/Dumping/Metadata.cs +++ b/Aaru.Core/Devices/Dumping/Metadata.cs @@ -39,8 +39,6 @@ using Aaru.CommonTypes; using Aaru.CommonTypes.AaruMetadata; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; -using Aaru.CommonTypes.Metadata; -using MediaType = Aaru.CommonTypes.MediaType; namespace Aaru.Core.Devices.Dumping; @@ -126,7 +124,7 @@ partial class Dump }).Distinct()) _dumpLog.WriteLine(Localization.Core.Found_filesystem_0_at_sector_1, filesystem.type, filesystem.start); - sidecar.OpticalDiscs[0].Dimensions = Dimensions.DimensionsFromMediaType(mediaType); + sidecar.OpticalDiscs[0].Dimensions = Dimensions.FromMediaType(mediaType); (string type, string subType) discType = CommonTypes.Metadata.MediaType.MediaTypeToString(mediaType); sidecar.OpticalDiscs[0].DiscType = discType.type; sidecar.OpticalDiscs[0].DiscSubType = discType.subType; diff --git a/Aaru.Core/Devices/Dumping/MiniDisc.cs b/Aaru.Core/Devices/Dumping/MiniDisc.cs index 9ff7c3f4c..acf881031 100644 --- a/Aaru.Core/Devices/Dumping/MiniDisc.cs +++ b/Aaru.Core/Devices/Dumping/MiniDisc.cs @@ -42,13 +42,11 @@ using Aaru.CommonTypes.AaruMetadata; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Extents; using Aaru.CommonTypes.Interfaces; -using Aaru.CommonTypes.Metadata; using Aaru.Console; using Aaru.Core.Graphics; using Aaru.Core.Logging; using Aaru.Decoders.SCSI; using Aaru.Devices; -using MediaType = Aaru.CommonTypes.MediaType; using Version = Aaru.CommonTypes.Interop.Version; namespace Aaru.Core.Devices.Dumping; @@ -841,7 +839,7 @@ partial class Dump filesystem.start); } - sidecar.BlockMedias[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType); + sidecar.BlockMedias[0].Dimensions = Dimensions.FromMediaType(dskType); (string type, string subType) xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType); sidecar.BlockMedias[0].MediaType = xmlType.type; sidecar.BlockMedias[0].MediaSubType = xmlType.subType; diff --git a/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs b/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs index fc82d74b0..eeeb98c6c 100644 --- a/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs +++ b/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs @@ -42,13 +42,11 @@ using Aaru.CommonTypes.AaruMetadata; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Extents; using Aaru.CommonTypes.Interfaces; -using Aaru.CommonTypes.Metadata; using Aaru.Console; using Aaru.Core.Graphics; using Aaru.Core.Logging; using Aaru.Decoders.SCSI; using Aaru.Devices; -using MediaType = Aaru.CommonTypes.MediaType; using Version = Aaru.CommonTypes.Interop.Version; namespace Aaru.Core.Devices.Dumping; @@ -694,7 +692,7 @@ public partial class Dump filesystem.start); } - sidecar.BlockMedias[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType); + sidecar.BlockMedias[0].Dimensions = Dimensions.FromMediaType(dskType); (string type, string subType) xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType); sidecar.BlockMedias[0].MediaType = xmlType.type; sidecar.BlockMedias[0].MediaSubType = xmlType.subType; diff --git a/Aaru.Core/Devices/Dumping/SSC.cs b/Aaru.Core/Devices/Dumping/SSC.cs index bd3918c03..04b1aea26 100644 --- a/Aaru.Core/Devices/Dumping/SSC.cs +++ b/Aaru.Core/Devices/Dumping/SSC.cs @@ -43,13 +43,11 @@ using Aaru.CommonTypes.AaruMetadata; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Extents; using Aaru.CommonTypes.Interfaces; -using Aaru.CommonTypes.Metadata; using Aaru.Core.Logging; using Aaru.Decoders.SCSI; using Aaru.Decoders.SCSI.SSC; using Aaru.Devices; using Aaru.Helpers; -using MediaType = Aaru.CommonTypes.MediaType; using TapeFile = Aaru.CommonTypes.Structs.TapeFile; using TapePartition = Aaru.CommonTypes.Structs.TapePartition; using Version = Aaru.CommonTypes.Interop.Version; @@ -1414,7 +1412,7 @@ partial class Dump filesystem.start); } - sidecar.BlockMedias[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType); + sidecar.BlockMedias[0].Dimensions = Dimensions.FromMediaType(dskType); (string type, string subType) xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType); diff --git a/Aaru.Core/Devices/Dumping/Sbc/Dump.cs b/Aaru.Core/Devices/Dumping/Sbc/Dump.cs index 836559ac8..7c925e65b 100644 --- a/Aaru.Core/Devices/Dumping/Sbc/Dump.cs +++ b/Aaru.Core/Devices/Dumping/Sbc/Dump.cs @@ -41,9 +41,9 @@ using Aaru.CommonTypes.AaruMetadata; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Extents; using Aaru.CommonTypes.Interfaces; -using Aaru.CommonTypes.Metadata; using Aaru.CommonTypes.Structs.Devices.SCSI; using Aaru.Console; +using Aaru.Core.Devices.Report; using Aaru.Core.Graphics; using Aaru.Core.Logging; using Aaru.Core.Media.Detection; @@ -52,12 +52,9 @@ using Aaru.Decoders.DVD; using Aaru.Decoders.SCSI; using Aaru.Decoders.SCSI.MMC; using Aaru.Devices; -using DeviceReport = Aaru.Core.Devices.Report.DeviceReport; using DVDDecryption = Aaru.Decryption.DVD.Dump; -using MediaType = Aaru.CommonTypes.MediaType; using Track = Aaru.CommonTypes.Structs.Track; using TrackType = Aaru.CommonTypes.Enums.TrackType; -using Usb = Aaru.CommonTypes.AaruMetadata.Usb; using Version = Aaru.CommonTypes.Interop.Version; // ReSharper disable JoinDeclarationAndInitializer @@ -1267,7 +1264,7 @@ partial class Dump filesystem.start); } - sidecar.BlockMedias[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType); + sidecar.BlockMedias[0].Dimensions = Dimensions.FromMediaType(dskType); (string type, string subType) xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType); diff --git a/Aaru.Core/Devices/Dumping/SecureDigital.cs b/Aaru.Core/Devices/Dumping/SecureDigital.cs index fc598cff6..9add611d7 100644 --- a/Aaru.Core/Devices/Dumping/SecureDigital.cs +++ b/Aaru.Core/Devices/Dumping/SecureDigital.cs @@ -42,14 +42,12 @@ using Aaru.CommonTypes.AaruMetadata; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Extents; using Aaru.CommonTypes.Interfaces; -using Aaru.CommonTypes.Metadata; using Aaru.Core.Graphics; using Aaru.Core.Logging; using Aaru.Decoders.MMC; using Aaru.Decoders.SecureDigital; using CSD = Aaru.Decoders.MMC.CSD; using DeviceType = Aaru.CommonTypes.Enums.DeviceType; -using MediaType = Aaru.CommonTypes.MediaType; using Version = Aaru.CommonTypes.Interop.Version; namespace Aaru.Core.Devices.Dumping; @@ -951,13 +949,13 @@ public partial class Dump case DeviceType.MMC: xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(MediaType.MMC); - sidecar.BlockMedias[0].Dimensions = Dimensions.DimensionsFromMediaType(MediaType.MMC); + sidecar.BlockMedias[0].Dimensions = Dimensions.FromMediaType(MediaType.MMC); break; case DeviceType.SecureDigital: CommonTypes.Metadata.MediaType.MediaTypeToString(MediaType.SecureDigital); - sidecar.BlockMedias[0].Dimensions = Dimensions.DimensionsFromMediaType(MediaType.SecureDigital); + sidecar.BlockMedias[0].Dimensions = Dimensions.FromMediaType(MediaType.SecureDigital); break; } diff --git a/Aaru.Core/Sidecar/BlockMedia.cs b/Aaru.Core/Sidecar/BlockMedia.cs index 4dba9b118..c3eeebf37 100644 --- a/Aaru.Core/Sidecar/BlockMedia.cs +++ b/Aaru.Core/Sidecar/BlockMedia.cs @@ -35,7 +35,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using Aaru.CommonTypes; using Aaru.CommonTypes.AaruMetadata; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; @@ -48,7 +47,6 @@ using Aaru.Filters; using Aaru.Helpers; using Directory = System.IO.Directory; using File = System.IO.File; -using MediaType = Aaru.CommonTypes.Metadata.MediaType; using Partition = Aaru.CommonTypes.Partition; using Pcmcia = Aaru.CommonTypes.AaruMetadata.Pcmcia; using Tuple = Aaru.Decoders.PCMCIA.Tuple; @@ -460,7 +458,7 @@ public sealed partial class Sidecar sidecar.BlockMedias[0].MediaSubType = diskType.subType; Statistics.AddMedia(image.Info.MediaType, false); - sidecar.BlockMedias[0].Dimensions = Dimensions.DimensionsFromMediaType(image.Info.MediaType); + sidecar.BlockMedias[0].Dimensions = Dimensions.FromMediaType(image.Info.MediaType); sidecar.BlockMedias[0].LogicalBlocks = image.Info.Sectors; sidecar.BlockMedias[0].LogicalBlockSize = image.Info.SectorSize; diff --git a/Aaru.Core/Sidecar/OpticalDisc.cs b/Aaru.Core/Sidecar/OpticalDisc.cs index 372655139..7ce304754 100644 --- a/Aaru.Core/Sidecar/OpticalDisc.cs +++ b/Aaru.Core/Sidecar/OpticalDisc.cs @@ -39,12 +39,10 @@ using Aaru.CommonTypes; using Aaru.CommonTypes.AaruMetadata; using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; -using Aaru.CommonTypes.Metadata; using Aaru.Decoders.CD; using Aaru.Decoders.DVD; using DMI = Aaru.Decoders.Xbox.DMI; using Dump = Aaru.Core.Devices.Dumping.Dump; -using MediaType = Aaru.CommonTypes.MediaType; using Partition = Aaru.CommonTypes.Partition; using Session = Aaru.CommonTypes.Structs.Session; using Track = Aaru.CommonTypes.Structs.Track; @@ -134,7 +132,7 @@ public sealed partial class Sidecar { dskType = MediaType.XGD; - sidecar.OpticalDiscs[0].Dimensions = new DimensionsNew + sidecar.OpticalDiscs[0].Dimensions = new Dimensions { Diameter = 120, Thickness = 1.2 @@ -144,7 +142,7 @@ public sealed partial class Sidecar { dskType = MediaType.XGD2; - sidecar.OpticalDiscs[0].Dimensions = new DimensionsNew + sidecar.OpticalDiscs[0].Dimensions = new Dimensions { Diameter = 120, Thickness = 1.2 @@ -194,7 +192,7 @@ public sealed partial class Sidecar pfi.Value.DiscSize == DVDSize.OneTwenty) dskType = MediaType.WOD; - sidecar.OpticalDiscs[0].Dimensions = new DimensionsNew(); + sidecar.OpticalDiscs[0].Dimensions = new Dimensions(); if(dskType == MediaType.UMD) { @@ -244,7 +242,7 @@ public sealed partial class Sidecar if(sidecar.OpticalDiscs[0].Dimensions == null && image.Info.MediaType != MediaType.Unknown) - sidecar.OpticalDiscs[0].Dimensions = Dimensions.DimensionsFromMediaType(image.Info.MediaType); + sidecar.OpticalDiscs[0].Dimensions = Dimensions.FromMediaType(image.Info.MediaType); if(_aborted) return;