aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added XGD3 detection (by its size).

Browse Source
This commit is contained in:
Natalia Portillo
2017-05-23 19:25:17 +01:00
parent a2188cfcbb
commit 97afb4ac12
6 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
DiscImageChef.DiscImages/Alcohol120.cs
View File

@@ -742,6 +742,15 @@ namespace DiscImageChef.ImagePlugins
ImageInfo.readableSectorTags.Add(SectorTagType.CDTrackFlags); ImageInfo.readableSectorTags.Add(SectorTagType.CDTrackFlags);
} }
if(ImageInfo.mediaType == MediaType.XGD2)
{
// All XGD3 all have the same number of blocks
if(ImageInfo.sectors == 25063 || // Locked (or non compatible drive)
ImageInfo.sectors == 4229664 || // Xtreme unlock
ImageInfo.sectors == 4246304) // Wxripper unlock
ImageInfo.mediaType = MediaType.XGD3;
}
DicConsole.VerboseWriteLine("Alcohol 120% image describes a disc of type {0}", ImageInfo.mediaType); DicConsole.VerboseWriteLine("Alcohol 120% image describes a disc of type {0}", ImageInfo.mediaType);
return true; return true;

9
DiscImageChef.DiscImages/BlindWrite5.cs
View File

@@ -1123,6 +1123,15 @@ namespace DiscImageChef.ImagePlugins
if(fullToc != null) if(fullToc != null)
ImageInfo.readableMediaTags.Add(MediaTagType.CD_FullTOC); ImageInfo.readableMediaTags.Add(MediaTagType.CD_FullTOC);
if(ImageInfo.mediaType == MediaType.XGD2)
{
// All XGD3 all have the same number of blocks
if(ImageInfo.sectors == 25063 || // Locked (or non compatible drive)
ImageInfo.sectors == 4229664 || // Xtreme unlock
ImageInfo.sectors == 4246304) // Wxripper unlock
ImageInfo.mediaType = MediaType.XGD3;
}
DicConsole.VerboseWriteLine("BlindWrite image describes a disc of type {0}", ImageInfo.mediaType); DicConsole.VerboseWriteLine("BlindWrite image describes a disc of type {0}", ImageInfo.mediaType);
return true; return true;

5
DiscImageChef.DiscImages/ChangeLog
View File

@@ -1,3 +1,8 @@
2017-05-23 Natalia Portillo <claunia@claunia.com>
* Alcohol120.cs:
* BlindWrite5.cs: Added XGD3 detection (by its size).
2017-05-20 Natalia Portillo <claunia@claunia.com> 2017-05-20 Natalia Portillo <claunia@claunia.com>
* packages.config: * packages.config:

6
DiscImageChef/ChangeLog
View File

@@ -1,3 +1,9 @@
2017-05-23 Natalia Portillo <claunia@claunia.com>
* Commands/MediaInfo.cs:
* Commands/CreateSidecar.cs:
Added XGD3 detection (by its size).
2017-05-23 Natalia Portillo <claunia@claunia.com> 2017-05-23 Natalia Portillo <claunia@claunia.com>
* Commands/DeviceInfo.cs: * Commands/DeviceInfo.cs:

11
DiscImageChef/Commands/CreateSidecar.cs
View File

@@ -621,6 +621,17 @@ namespace DiscImageChef.Commands
if(trksLst != null) if(trksLst != null)
sidecar.OpticalDisc[0].Track = trksLst.ToArray(); sidecar.OpticalDisc[0].Track = trksLst.ToArray();
// All XGD3 all have the same number of blocks
if(dskType == MediaType.XGD2 && sidecar.OpticalDisc[0].Track.Length == 1)
{
ulong blocks = (ulong)(sidecar.OpticalDisc[0].Track[0].EndSector - sidecar.OpticalDisc[0].Track[0].StartSector + 1);
if(blocks == 25063 || // Locked (or non compatible drive)
blocks == 4229664 || // Xtreme unlock
blocks == 4246304) // Wxripper unlock
dskType = MediaType.XGD3;
}
string dscType, dscSubType; string dscType, dscSubType;
Metadata.MediaType.MediaTypeToString(dskType, out dscType, out dscSubType); Metadata.MediaType.MediaTypeToString(dskType, out dscType, out dscSubType);
sidecar.OpticalDisc[0].DiscType = dscType; sidecar.OpticalDisc[0].DiscType = dscType;

7
DiscImageChef/Commands/MediaInfo.cs
View File

@@ -546,9 +546,14 @@ namespace DiscImageChef.Commands
} }
else if(Decoders.Xbox.DMI.IsXbox360(cmdBuf)) else if(Decoders.Xbox.DMI.IsXbox360(cmdBuf))
{ {
// TODO: Detect XGD3 from XGD2...
dskType = MediaType.XGD2; dskType = MediaType.XGD2;
DicConsole.WriteLine("Xbox 360 DMI:\n{0}", Decoders.Xbox.DMI.PrettifyXbox360(cmdBuf)); DicConsole.WriteLine("Xbox 360 DMI:\n{0}", Decoders.Xbox.DMI.PrettifyXbox360(cmdBuf));
// All XGD3 all have the same number of blocks
if(blocks == 25063 || // Locked (or non compatible drive)
blocks == 4229664 || // Xtreme unlock
blocks == 4246304) // Wxripper unlock
dskType = MediaType.XGD3;
} }
} }
} }