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

Merge Dimensions classes.

Browse Source
This commit is contained in:
Natalia Portillo
2022-12-17 20:59:12 +00:00
parent 7a2b37496b
commit 42b9caaaa0
9 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.CommonTypes

Submodule Aaru.CommonTypes updated: b2afea72c8...8d7f99e0d3

4
Aaru.Core/Devices/Dumping/Metadata.cs
View File

@@ -39,8 +39,6 @@ using Aaru.CommonTypes;
using Aaru.CommonTypes.AaruMetadata; using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces; using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Metadata;
using MediaType = Aaru.CommonTypes.MediaType;
namespace Aaru.Core.Devices.Dumping; namespace Aaru.Core.Devices.Dumping;
@@ -126,7 +124,7 @@ partial class Dump
}).Distinct()) }).Distinct())
_dumpLog.WriteLine(Localization.Core.Found_filesystem_0_at_sector_1, filesystem.type, filesystem.start); _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); (string type, string subType) discType = CommonTypes.Metadata.MediaType.MediaTypeToString(mediaType);
sidecar.OpticalDiscs[0].DiscType = discType.type; sidecar.OpticalDiscs[0].DiscType = discType.type;
sidecar.OpticalDiscs[0].DiscSubType = discType.subType; sidecar.OpticalDiscs[0].DiscSubType = discType.subType;

4
Aaru.Core/Devices/Dumping/MiniDisc.cs
View File

@@ -42,13 +42,11 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Extents; using Aaru.CommonTypes.Extents;
using Aaru.CommonTypes.Interfaces; using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Metadata;
using Aaru.Console; using Aaru.Console;
using Aaru.Core.Graphics; using Aaru.Core.Graphics;
using Aaru.Core.Logging; using Aaru.Core.Logging;
using Aaru.Decoders.SCSI; using Aaru.Decoders.SCSI;
using Aaru.Devices; using Aaru.Devices;
using MediaType = Aaru.CommonTypes.MediaType;
using Version = Aaru.CommonTypes.Interop.Version; using Version = Aaru.CommonTypes.Interop.Version;
namespace Aaru.Core.Devices.Dumping; namespace Aaru.Core.Devices.Dumping;
@@ -841,7 +839,7 @@ partial class Dump
filesystem.start); 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); (string type, string subType) xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType);
sidecar.BlockMedias[0].MediaType = xmlType.type; sidecar.BlockMedias[0].MediaType = xmlType.type;
sidecar.BlockMedias[0].MediaSubType = xmlType.subType; sidecar.BlockMedias[0].MediaSubType = xmlType.subType;

4
Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs
View File

@@ -42,13 +42,11 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Extents; using Aaru.CommonTypes.Extents;
using Aaru.CommonTypes.Interfaces; using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Metadata;
using Aaru.Console; using Aaru.Console;
using Aaru.Core.Graphics; using Aaru.Core.Graphics;
using Aaru.Core.Logging; using Aaru.Core.Logging;
using Aaru.Decoders.SCSI; using Aaru.Decoders.SCSI;
using Aaru.Devices; using Aaru.Devices;
using MediaType = Aaru.CommonTypes.MediaType;
using Version = Aaru.CommonTypes.Interop.Version; using Version = Aaru.CommonTypes.Interop.Version;
namespace Aaru.Core.Devices.Dumping; namespace Aaru.Core.Devices.Dumping;
@@ -694,7 +692,7 @@ public partial class Dump
filesystem.start); 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); (string type, string subType) xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType);
sidecar.BlockMedias[0].MediaType = xmlType.type; sidecar.BlockMedias[0].MediaType = xmlType.type;
sidecar.BlockMedias[0].MediaSubType = xmlType.subType; sidecar.BlockMedias[0].MediaSubType = xmlType.subType;

4
Aaru.Core/Devices/Dumping/SSC.cs
View File

@@ -43,13 +43,11 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Extents; using Aaru.CommonTypes.Extents;
using Aaru.CommonTypes.Interfaces; using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Metadata;
using Aaru.Core.Logging; using Aaru.Core.Logging;
using Aaru.Decoders.SCSI; using Aaru.Decoders.SCSI;
using Aaru.Decoders.SCSI.SSC; using Aaru.Decoders.SCSI.SSC;
using Aaru.Devices; using Aaru.Devices;
using Aaru.Helpers; using Aaru.Helpers;
using MediaType = Aaru.CommonTypes.MediaType;
using TapeFile = Aaru.CommonTypes.Structs.TapeFile; using TapeFile = Aaru.CommonTypes.Structs.TapeFile;
using TapePartition = Aaru.CommonTypes.Structs.TapePartition; using TapePartition = Aaru.CommonTypes.Structs.TapePartition;
using Version = Aaru.CommonTypes.Interop.Version; using Version = Aaru.CommonTypes.Interop.Version;
@@ -1414,7 +1412,7 @@ partial class Dump
filesystem.start); 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); (string type, string subType) xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType);

7
Aaru.Core/Devices/Dumping/Sbc/Dump.cs
View File

@@ -41,9 +41,9 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Extents; using Aaru.CommonTypes.Extents;
using Aaru.CommonTypes.Interfaces; using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Metadata;
using Aaru.CommonTypes.Structs.Devices.SCSI; using Aaru.CommonTypes.Structs.Devices.SCSI;
using Aaru.Console; using Aaru.Console;
using Aaru.Core.Devices.Report;
using Aaru.Core.Graphics; using Aaru.Core.Graphics;
using Aaru.Core.Logging; using Aaru.Core.Logging;
using Aaru.Core.Media.Detection; using Aaru.Core.Media.Detection;
@@ -52,12 +52,9 @@ using Aaru.Decoders.DVD;
using Aaru.Decoders.SCSI; using Aaru.Decoders.SCSI;
using Aaru.Decoders.SCSI.MMC; using Aaru.Decoders.SCSI.MMC;
using Aaru.Devices; using Aaru.Devices;
using DeviceReport = Aaru.Core.Devices.Report.DeviceReport;
using DVDDecryption = Aaru.Decryption.DVD.Dump; using DVDDecryption = Aaru.Decryption.DVD.Dump;
using MediaType = Aaru.CommonTypes.MediaType;
using Track = Aaru.CommonTypes.Structs.Track; using Track = Aaru.CommonTypes.Structs.Track;
using TrackType = Aaru.CommonTypes.Enums.TrackType; using TrackType = Aaru.CommonTypes.Enums.TrackType;
using Usb = Aaru.CommonTypes.AaruMetadata.Usb;
using Version = Aaru.CommonTypes.Interop.Version; using Version = Aaru.CommonTypes.Interop.Version;
// ReSharper disable JoinDeclarationAndInitializer // ReSharper disable JoinDeclarationAndInitializer
@@ -1267,7 +1264,7 @@ partial class Dump
filesystem.start); 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); (string type, string subType) xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType);

6
Aaru.Core/Devices/Dumping/SecureDigital.cs
View File

@@ -42,14 +42,12 @@ using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Extents; using Aaru.CommonTypes.Extents;
using Aaru.CommonTypes.Interfaces; using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Metadata;
using Aaru.Core.Graphics; using Aaru.Core.Graphics;
using Aaru.Core.Logging; using Aaru.Core.Logging;
using Aaru.Decoders.MMC; using Aaru.Decoders.MMC;
using Aaru.Decoders.SecureDigital; using Aaru.Decoders.SecureDigital;
using CSD = Aaru.Decoders.MMC.CSD; using CSD = Aaru.Decoders.MMC.CSD;
using DeviceType = Aaru.CommonTypes.Enums.DeviceType; using DeviceType = Aaru.CommonTypes.Enums.DeviceType;
using MediaType = Aaru.CommonTypes.MediaType;
using Version = Aaru.CommonTypes.Interop.Version; using Version = Aaru.CommonTypes.Interop.Version;
namespace Aaru.Core.Devices.Dumping; namespace Aaru.Core.Devices.Dumping;
@@ -951,13 +949,13 @@ public partial class Dump
case DeviceType.MMC: case DeviceType.MMC:
xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(MediaType.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; break;
case DeviceType.SecureDigital: case DeviceType.SecureDigital:
CommonTypes.Metadata.MediaType.MediaTypeToString(MediaType.SecureDigital); CommonTypes.Metadata.MediaType.MediaTypeToString(MediaType.SecureDigital);
sidecar.BlockMedias[0].Dimensions = Dimensions.DimensionsFromMediaType(MediaType.SecureDigital); sidecar.BlockMedias[0].Dimensions = Dimensions.FromMediaType(MediaType.SecureDigital);
break; break;
} }

4
Aaru.Core/Sidecar/BlockMedia.cs
View File

@@ -35,7 +35,6 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using Aaru.CommonTypes;
using Aaru.CommonTypes.AaruMetadata; using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces; using Aaru.CommonTypes.Interfaces;
@@ -48,7 +47,6 @@ using Aaru.Filters;
using Aaru.Helpers; using Aaru.Helpers;
using Directory = System.IO.Directory; using Directory = System.IO.Directory;
using File = System.IO.File; using File = System.IO.File;
using MediaType = Aaru.CommonTypes.Metadata.MediaType;
using Partition = Aaru.CommonTypes.Partition; using Partition = Aaru.CommonTypes.Partition;
using Pcmcia = Aaru.CommonTypes.AaruMetadata.Pcmcia; using Pcmcia = Aaru.CommonTypes.AaruMetadata.Pcmcia;
using Tuple = Aaru.Decoders.PCMCIA.Tuple; using Tuple = Aaru.Decoders.PCMCIA.Tuple;
@@ -460,7 +458,7 @@ public sealed partial class Sidecar
sidecar.BlockMedias[0].MediaSubType = diskType.subType; sidecar.BlockMedias[0].MediaSubType = diskType.subType;
Statistics.AddMedia(image.Info.MediaType, false); 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].LogicalBlocks = image.Info.Sectors;
sidecar.BlockMedias[0].LogicalBlockSize = image.Info.SectorSize; sidecar.BlockMedias[0].LogicalBlockSize = image.Info.SectorSize;

10
Aaru.Core/Sidecar/OpticalDisc.cs
View File

@@ -39,12 +39,10 @@ using Aaru.CommonTypes;
using Aaru.CommonTypes.AaruMetadata; using Aaru.CommonTypes.AaruMetadata;
using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Enums;
using Aaru.CommonTypes.Interfaces; using Aaru.CommonTypes.Interfaces;
using Aaru.CommonTypes.Metadata;
using Aaru.Decoders.CD; using Aaru.Decoders.CD;
using Aaru.Decoders.DVD; using Aaru.Decoders.DVD;
using DMI = Aaru.Decoders.Xbox.DMI; using DMI = Aaru.Decoders.Xbox.DMI;
using Dump = Aaru.Core.Devices.Dumping.Dump; using Dump = Aaru.Core.Devices.Dumping.Dump;
using MediaType = Aaru.CommonTypes.MediaType;
using Partition = Aaru.CommonTypes.Partition; using Partition = Aaru.CommonTypes.Partition;
using Session = Aaru.CommonTypes.Structs.Session; using Session = Aaru.CommonTypes.Structs.Session;
using Track = Aaru.CommonTypes.Structs.Track; using Track = Aaru.CommonTypes.Structs.Track;
@@ -134,7 +132,7 @@ public sealed partial class Sidecar
{ {
dskType = MediaType.XGD; dskType = MediaType.XGD;
sidecar.OpticalDiscs[0].Dimensions = new DimensionsNew sidecar.OpticalDiscs[0].Dimensions = new Dimensions
{ {
Diameter = 120, Diameter = 120,
Thickness = 1.2 Thickness = 1.2
@@ -144,7 +142,7 @@ public sealed partial class Sidecar
{ {
dskType = MediaType.XGD2; dskType = MediaType.XGD2;
sidecar.OpticalDiscs[0].Dimensions = new DimensionsNew sidecar.OpticalDiscs[0].Dimensions = new Dimensions
{ {
Diameter = 120, Diameter = 120,
Thickness = 1.2 Thickness = 1.2
@@ -194,7 +192,7 @@ public sealed partial class Sidecar
pfi.Value.DiscSize == DVDSize.OneTwenty) pfi.Value.DiscSize == DVDSize.OneTwenty)
dskType = MediaType.WOD; dskType = MediaType.WOD;
sidecar.OpticalDiscs[0].Dimensions = new DimensionsNew(); sidecar.OpticalDiscs[0].Dimensions = new Dimensions();
if(dskType == MediaType.UMD) if(dskType == MediaType.UMD)
{ {
@@ -244,7 +242,7 @@ public sealed partial class Sidecar
if(sidecar.OpticalDiscs[0].Dimensions == null && if(sidecar.OpticalDiscs[0].Dimensions == null &&
image.Info.MediaType != MediaType.Unknown) 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) if(_aborted)
return; return;