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

REFACTOR: Remove unneeded code.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-21 14:30:38 +00:00
parent 35ce7db892
commit dcd053b20d
343 changed files with 2842 additions and 2588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
DiscImageChef.DiscImages/BlindWrite5.cs
View File

@@ -37,10 +37,15 @@ using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using DiscImageChef.Checksums;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Decoders.CD;
using DiscImageChef.Decoders.DVD;
using DiscImageChef.Decoders.SCSI;
using DiscImageChef.Decoders.SCSI.MMC;
using DiscImageChef.Filters;
using DMI = DiscImageChef.Decoders.Xbox.DMI;
namespace DiscImageChef.DiscImages
{
@@ -314,10 +319,10 @@ namespace DiscImageChef.DiscImages
{
stream.Read(mode2A, 0, mode2A.Length);
mode2A[1] -= 2;
Decoders.SCSI.Modes.ModePage_2A? decoded2A = Decoders.SCSI.Modes.DecodeModePage_2A(mode2A);
Modes.ModePage_2A? decoded2A = Modes.DecodeModePage_2A(mode2A);
if(decoded2A.HasValue)
DicConsole.DebugWriteLine("BlindWrite5 plugin", "mode page 2A: {0}",
Decoders.SCSI.Modes.PrettifyModePage_2A(decoded2A));
Modes.PrettifyModePage_2A(decoded2A));
else mode2A = null;
}
@@ -334,9 +339,9 @@ namespace DiscImageChef.DiscImages
pma[1] = tushort[0];
Array.Copy(temp, 0, pma, 4, temp.Length);
Decoders.CD.PMA.CDPMA? decodedPma = Decoders.CD.PMA.Decode(pma);
PMA.CDPMA? decodedPma = PMA.Decode(pma);
if(decodedPma.HasValue)
DicConsole.DebugWriteLine("BlindWrite5 plugin", "PMA: {0}", Decoders.CD.PMA.Prettify(decodedPma));
DicConsole.DebugWriteLine("BlindWrite5 plugin", "PMA: {0}", PMA.Prettify(decodedPma));
else pma = null;
}
@@ -350,10 +355,10 @@ namespace DiscImageChef.DiscImages
atip[1] = tushort[0];
Array.Copy(temp, 0, atip, 4, temp.Length);
Decoders.CD.ATIP.CDATIP? decodedAtip = Decoders.CD.ATIP.Decode(atip);
ATIP.CDATIP? decodedAtip = ATIP.Decode(atip);
if(decodedAtip.HasValue)
DicConsole.DebugWriteLine("BlindWrite5 plugin", "ATIP: {0}",
Decoders.CD.ATIP.Prettify(decodedAtip));
ATIP.Prettify(decodedAtip));
else atip = null;
}
@@ -367,10 +372,10 @@ namespace DiscImageChef.DiscImages
cdtext[1] = tushort[0];
Array.Copy(temp, 0, cdtext, 4, temp.Length);
Decoders.CD.CDTextOnLeadIn.CDText? decodedCdText = Decoders.CD.CDTextOnLeadIn.Decode(cdtext);
CDTextOnLeadIn.CDText? decodedCdText = CDTextOnLeadIn.Decode(cdtext);
if(decodedCdText.HasValue)
DicConsole.DebugWriteLine("BlindWrite5 plugin", "CD-Text: {0}",
Decoders.CD.CDTextOnLeadIn.Prettify(decodedCdText));
CDTextOnLeadIn.Prettify(decodedCdText));
else cdtext = null;
}
@@ -393,9 +398,9 @@ namespace DiscImageChef.DiscImages
dmi[0] = 0x08;
dmi[1] = 0x02;
Decoders.DVD.PFI.PhysicalFormatInformation? decodedPfi = Decoders.DVD.PFI.Decode(pfi);
PFI.PhysicalFormatInformation? decodedPfi = PFI.Decode(pfi);
if(decodedPfi.HasValue)
DicConsole.DebugWriteLine("BlindWrite5 plugin", "PFI: {0}", Decoders.DVD.PFI.Prettify(decodedPfi));
DicConsole.DebugWriteLine("BlindWrite5 plugin", "PFI: {0}", PFI.Prettify(decodedPfi));
else
{
pfi = null;
@@ -950,7 +955,7 @@ namespace DiscImageChef.DiscImages
fullToc[2] = firstSession;
fullToc[3] = lastSession;
Decoders.CD.FullTOC.CDFullTOC? decodedFullToc = Decoders.CD.FullTOC.Decode(fullToc);
FullTOC.CDFullTOC? decodedFullToc = FullTOC.Decode(fullToc);
if(!decodedFullToc.HasValue)
{
@@ -966,7 +971,7 @@ namespace DiscImageChef.DiscImages
if(dmi != null && pfi != null)
{
Decoders.DVD.PFI.PhysicalFormatInformation? pfi0 = Decoders.DVD.PFI.Decode(pfi);
PFI.PhysicalFormatInformation? pfi0 = PFI.Decode(pfi);
// All discs I tested the disk category and part version (as well as the start PSN for DVD-RAM) where modified by Alcohol
// So much for archival value
@@ -974,55 +979,55 @@ namespace DiscImageChef.DiscImages
{
switch(pfi0.Value.DiskCategory)
{
case Decoders.DVD.DiskCategory.DVDPR:
case DiskCategory.DVDPR:
ImageInfo.MediaType = MediaType.DVDPR;
break;
case Decoders.DVD.DiskCategory.DVDPRDL:
case DiskCategory.DVDPRDL:
ImageInfo.MediaType = MediaType.DVDPRDL;
break;
case Decoders.DVD.DiskCategory.DVDPRW:
case DiskCategory.DVDPRW:
ImageInfo.MediaType = MediaType.DVDPRW;
break;
case Decoders.DVD.DiskCategory.DVDPRWDL:
case DiskCategory.DVDPRWDL:
ImageInfo.MediaType = MediaType.DVDPRWDL;
break;
case Decoders.DVD.DiskCategory.DVDR:
case DiskCategory.DVDR:
if(pfi0.Value.PartVersion == 6) ImageInfo.MediaType = MediaType.DVDRDL;
else ImageInfo.MediaType = MediaType.DVDR;
break;
case Decoders.DVD.DiskCategory.DVDRAM:
case DiskCategory.DVDRAM:
ImageInfo.MediaType = MediaType.DVDRAM;
break;
default:
ImageInfo.MediaType = MediaType.DVDROM;
break;
case Decoders.DVD.DiskCategory.DVDRW:
case DiskCategory.DVDRW:
if(pfi0.Value.PartVersion == 3) ImageInfo.MediaType = MediaType.DVDRWDL;
else ImageInfo.MediaType = MediaType.DVDRW;
break;
case Decoders.DVD.DiskCategory.HDDVDR:
case DiskCategory.HDDVDR:
ImageInfo.MediaType = MediaType.HDDVDR;
break;
case Decoders.DVD.DiskCategory.HDDVDRAM:
case DiskCategory.HDDVDRAM:
ImageInfo.MediaType = MediaType.HDDVDRAM;
break;
case Decoders.DVD.DiskCategory.HDDVDROM:
case DiskCategory.HDDVDROM:
ImageInfo.MediaType = MediaType.HDDVDROM;
break;
case Decoders.DVD.DiskCategory.HDDVDRW:
case DiskCategory.HDDVDRW:
ImageInfo.MediaType = MediaType.HDDVDRW;
break;
case Decoders.DVD.DiskCategory.Nintendo:
if(pfi0.Value.DiscSize == Decoders.DVD.DVDSize.Eighty) ImageInfo.MediaType = MediaType.GOD;
case DiskCategory.Nintendo:
if(pfi0.Value.DiscSize == DVDSize.Eighty) ImageInfo.MediaType = MediaType.GOD;
else ImageInfo.MediaType = MediaType.WOD;
break;
case Decoders.DVD.DiskCategory.UMD:
case DiskCategory.UMD:
ImageInfo.MediaType = MediaType.UMD;
break;
}
if(Decoders.Xbox.DMI.IsXbox(dmi)) ImageInfo.MediaType = MediaType.XGD;
else if(Decoders.Xbox.DMI.IsXbox360(dmi)) ImageInfo.MediaType = MediaType.XGD2;
if(DMI.IsXbox(dmi)) ImageInfo.MediaType = MediaType.XGD;
else if(DMI.IsXbox360(dmi)) ImageInfo.MediaType = MediaType.XGD2;
}
}
else if(ImageInfo.MediaType == MediaType.CD || ImageInfo.MediaType == MediaType.CDROM)
@@ -1081,14 +1086,14 @@ namespace DiscImageChef.DiscImages
if(pma != null)
{
Decoders.CD.PMA.CDPMA pma0 = Decoders.CD.PMA.Decode(pma).Value;
PMA.CDPMA pma0 = PMA.Decode(pma).Value;
foreach(uint id in from descriptor in pma0.PMADescriptors where descriptor.ADR == 2 select (uint)((descriptor.Min << 16) + (descriptor.Sec << 8) + descriptor.Frame)) ImageInfo.MediaSerialNumber = string.Format("{0:X6}", id & 0x00FFFFFF);
}
if(atip != null)
{
Decoders.CD.ATIP.CDATIP atip0 = Decoders.CD.ATIP.Decode(atip).Value;
ATIP.CDATIP atip0 = ATIP.Decode(atip).Value;
if(atip0.DiscType) ImageInfo.MediaType = MediaType.CDRW;
else ImageInfo.MediaType = MediaType.CDR;
@@ -1097,7 +1102,7 @@ namespace DiscImageChef.DiscImages
{
int type = atip0.LeadInStartFrame % 10;
int frm = atip0.LeadInStartFrame - type;
ImageInfo.MediaManufacturer = Decoders.CD.ATIP.ManufacturerFromATIP(atip0.LeadInStartSec, frm);
ImageInfo.MediaManufacturer = ATIP.ManufacturerFromATIP(atip0.LeadInStartSec, frm);
}
}
@@ -1417,7 +1422,7 @@ namespace DiscImageChef.DiscImages
case SectorTagType.CdSectorSync: break;
case SectorTagType.CdTrackFlags:
byte flag;
if(trackFlags.TryGetValue(track, out flag)) return new byte[] {flag};
if(trackFlags.TryGetValue(track, out flag)) return new[] {flag};
throw new ArgumentException("Unsupported tag requested", nameof(tag));
default: throw new ArgumentException("Unsupported tag requested", nameof(tag));
@@ -1803,7 +1808,7 @@ namespace DiscImageChef.DiscImages
public override List<Track> GetSessionTracks(ushort session)
{
return this.tracks.Where(_track => _track.TrackSession == session).ToList();
return tracks.Where(_track => _track.TrackSession == session).ToList();
}
public override List<Session> GetSessions()
@@ -1814,13 +1819,13 @@ namespace DiscImageChef.DiscImages
public override bool? VerifySector(ulong sectorAddress)
{
byte[] buffer = ReadSectorLong(sectorAddress);
return Checksums.CdChecksums.CheckCdSector(buffer);
return CdChecksums.CheckCdSector(buffer);
}
public override bool? VerifySector(ulong sectorAddress, uint track)
{
byte[] buffer = ReadSectorLong(sectorAddress, track);
return Checksums.CdChecksums.CheckCdSector(buffer);
return CdChecksums.CheckCdSector(buffer);
}
public override bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
@@ -1835,7 +1840,7 @@ namespace DiscImageChef.DiscImages
for(int i = 0; i < length; i++)
{
Array.Copy(buffer, i * bps, sector, 0, bps);
bool? sectorStatus = Checksums.CdChecksums.CheckCdSector(sector);
bool? sectorStatus = CdChecksums.CheckCdSector(sector);
switch(sectorStatus)
{
@@ -1866,7 +1871,7 @@ namespace DiscImageChef.DiscImages
for(int i = 0; i < length; i++)
{
Array.Copy(buffer, i * bps, sector, 0, bps);
bool? sectorStatus = Checksums.CdChecksums.CheckCdSector(sector);
bool? sectorStatus = CdChecksums.CheckCdSector(sector);
switch(sectorStatus)
{