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

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

50
DiscImageChef.DiscImages/Alcohol120.cs
View File

@@ -36,9 +36,13 @@ 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.Filters;
using DMI = DiscImageChef.Decoders.Xbox.DMI;
namespace DiscImageChef.DiscImages
{
@@ -461,7 +465,7 @@ namespace DiscImageChef.DiscImages
dmi[0] = 0x08;
dmi[1] = 0x02;
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
@@ -469,56 +473,56 @@ 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)
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;
ImageInfo.ReadableMediaTags.Add(MediaTagType.DVD_PFI);
ImageInfo.ReadableMediaTags.Add(MediaTagType.DVD_DMI);
@@ -725,7 +729,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)
{
@@ -984,7 +988,7 @@ namespace DiscImageChef.DiscImages
case SectorTagType.CdSectorSubchannel:
case SectorTagType.CdSectorSubHeader:
case SectorTagType.CdSectorSync: break;
case SectorTagType.CdTrackFlags: return new byte[] {(byte)(_track.adrCtl & 0x0F)};
case SectorTagType.CdTrackFlags: return new[] {(byte)(_track.adrCtl & 0x0F)};
default: throw new ArgumentException("Unsupported tag requested", nameof(tag));
}
@@ -1490,13 +1494,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,
@@ -1511,7 +1515,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)
{
@@ -1542,7 +1546,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)
{

31
DiscImageChef.DiscImages/BlindWrite4.cs
View File

@@ -37,6 +37,7 @@ using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using DiscImageChef.Checksums;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
@@ -562,14 +563,14 @@ namespace DiscImageChef.DiscImages
if(dataFilter != null) break;
dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.DataFile.Split(new char[] {'\\'},
header.DataFile.Split(new[] {'\\'},
StringSplitOptions
.RemoveEmptyEntries)
.Last()));
if(dataFilter != null) break;
dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.DataFile.Split(new char[] {'\\'},
header.DataFile.Split(new[] {'\\'},
StringSplitOptions
.RemoveEmptyEntries)
.Last()
@@ -577,7 +578,7 @@ namespace DiscImageChef.DiscImages
if(dataFilter != null) break;
dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.DataFile.Split(new char[] {'\\'},
header.DataFile.Split(new[] {'\\'},
StringSplitOptions
.RemoveEmptyEntries)
.Last()
@@ -609,21 +610,21 @@ namespace DiscImageChef.DiscImages
if(subFilter != null) break;
subFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.SubchannelFile.Split(new char[] {'\\'},
header.SubchannelFile.Split(new[] {'\\'},
StringSplitOptions
.RemoveEmptyEntries)
.Last()));
if(subFilter != null) break;
subFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.SubchannelFile.Split(new char[] {'\\'},
header.SubchannelFile.Split(new[] {'\\'},
StringSplitOptions
.RemoveEmptyEntries)
.Last().ToLower(CultureInfo.CurrentCulture)));
if(subFilter != null) break;
subFilter = filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
header.SubchannelFile.Split(new char[] {'\\'},
header.SubchannelFile.Split(new[] {'\\'},
StringSplitOptions
.RemoveEmptyEntries)
.Last().ToUpper(CultureInfo.CurrentCulture)));
@@ -669,7 +670,7 @@ namespace DiscImageChef.DiscImages
track.TrackFilter =
filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
bwTrack.filename.Split(new char[] {'\\'},
bwTrack.filename.Split(new[] {'\\'},
StringSplitOptions
.RemoveEmptyEntries)
.Last()));
@@ -677,7 +678,7 @@ namespace DiscImageChef.DiscImages
track.TrackFilter =
filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
bwTrack.filename.Split(new char[] {'\\'},
bwTrack.filename.Split(new[] {'\\'},
StringSplitOptions
.RemoveEmptyEntries)
.Last()
@@ -686,7 +687,7 @@ namespace DiscImageChef.DiscImages
track.TrackFilter =
filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
bwTrack.filename.Split(new char[] {'\\'},
bwTrack.filename.Split(new[] {'\\'},
StringSplitOptions
.RemoveEmptyEntries)
.Last()
@@ -1061,7 +1062,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));
@@ -1295,7 +1296,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()
@@ -1306,13 +1307,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,
@@ -1327,7 +1328,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)
{
@@ -1358,7 +1359,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)
{

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)
{

21
DiscImageChef.DiscImages/CDRDAO.cs
View File

@@ -36,6 +36,7 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using DiscImageChef.Checksums;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
@@ -583,7 +584,7 @@ namespace DiscImageChef.DiscImages
DicConsole.DebugWriteLine("CDRDAO plugin", "Found INDEX \"{1}\" at line {0}", line,
matchIndex.Groups["address"].Value);
string[] lengthString = matchFile.Groups["length"].Value.Split(new char[] {':'});
string[] lengthString = matchFile.Groups["length"].Value.Split(':');
ulong nextIndexPos = ulong.Parse(lengthString[0]) * 60 * 75 +
ulong.Parse(lengthString[1]) * 75 + ulong.Parse(lengthString[2]);
currenttrack.Indexes.Add(nextindex,
@@ -597,7 +598,7 @@ namespace DiscImageChef.DiscImages
currenttrack.Indexes.Add(0, currenttrack.StartSector);
if(matchPregap.Groups["address"].Value != "")
{
string[] lengthString = matchPregap.Groups["address"].Value.Split(new char[] {':'});
string[] lengthString = matchPregap.Groups["address"].Value.Split(':');
currenttrack.Pregap = ulong.Parse(lengthString[0]) * 60 * 75 +
ulong.Parse(lengthString[1]) * 75 + ulong.Parse(lengthString[2]);
}
@@ -608,7 +609,7 @@ namespace DiscImageChef.DiscImages
DicConsole.DebugWriteLine("CDRDAO plugin", "Found PREGAP \"{1}\" at line {0}", line,
matchZeroPregap.Groups["length"].Value);
currenttrack.Indexes.Add(0, currenttrack.StartSector);
string[] lengthString = matchZeroPregap.Groups["length"].Value.Split(new char[] {':'});
string[] lengthString = matchZeroPregap.Groups["length"].Value.Split(':');
currenttrack.Pregap = ulong.Parse(lengthString[0]) * 60 * 75 +
ulong.Parse(lengthString[1]) * 75 + ulong.Parse(lengthString[2]);
}
@@ -640,7 +641,7 @@ namespace DiscImageChef.DiscImages
if(matchAudioFile.Groups["start"].Value != "")
{
string[] startString = matchAudioFile.Groups["start"].Value.Split(new char[] {':'});
string[] startString = matchAudioFile.Groups["start"].Value.Split(':');
startSectors = ulong.Parse(startString[0]) * 60 * 75 + ulong.Parse(startString[1]) * 75 +
ulong.Parse(startString[2]);
}
@@ -649,7 +650,7 @@ namespace DiscImageChef.DiscImages
if(matchAudioFile.Groups["length"].Value != "")
{
string[] lengthString = matchAudioFile.Groups["length"].Value.Split(new char[] {':'});
string[] lengthString = matchAudioFile.Groups["length"].Value.Split(':');
currenttrack.Sectors = ulong.Parse(lengthString[0]) * 60 * 75 +
ulong.Parse(lengthString[1]) * 75 + ulong.Parse(lengthString[2]);
}
@@ -677,7 +678,7 @@ namespace DiscImageChef.DiscImages
currenttrack.Trackfile.Sequence = currentTrackNumber;
if(matchFile.Groups["length"].Value != "")
{
string[] lengthString = matchFile.Groups["length"].Value.Split(new char[] {':'});
string[] lengthString = matchFile.Groups["length"].Value.Split(':');
currenttrack.Sectors = ulong.Parse(lengthString[0]) * 60 * 75 +
ulong.Parse(lengthString[1]) * 75 + ulong.Parse(lengthString[2]);
}
@@ -1560,13 +1561,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,
@@ -1581,7 +1582,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)
{
@@ -1612,7 +1613,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)
{

9
DiscImageChef.DiscImages/CDRWin.cs
View File

@@ -36,6 +36,7 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using DiscImageChef.Checksums;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
@@ -1925,13 +1926,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,
@@ -1946,7 +1947,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)
{
@@ -1977,7 +1978,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)
{

14
DiscImageChef.DiscImages/CHD.cs
View File

@@ -37,8 +37,10 @@ using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Text.RegularExpressions;
using DiscImageChef.Checksums;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Decoders.ATA;
using DiscImageChef.Filters;
using SharpCompress.Compressors;
using SharpCompress.Compressors.Deflate;
@@ -1468,7 +1470,7 @@ namespace DiscImageChef.DiscImages
break;
// "IDNT"
case HARD_DISK_IDENT_METADATA:
Decoders.ATA.Identify.IdentifyDevice? idnt = Decoders.ATA.Identify.Decode(meta);
Identify.IdentifyDevice? idnt = Identify.Decode(meta);
if(idnt.HasValue)
{
ImageInfo.MediaManufacturer = idnt.Value.MediaManufacturer;
@@ -1775,7 +1777,7 @@ namespace DiscImageChef.DiscImages
if(isHdd) return null;
byte[] buffer = ReadSectorLong(sectorAddress);
return Checksums.CdChecksums.CheckCdSector(buffer);
return CdChecksums.CheckCdSector(buffer);
}
public override bool? VerifySector(ulong sectorAddress, uint track)
@@ -1800,7 +1802,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)
{
@@ -1833,7 +1835,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)
{
@@ -1857,7 +1859,7 @@ namespace DiscImageChef.DiscImages
byte[] calculated;
if(mapVersion >= 3)
{
Checksums.Sha1Context sha1Ctx = new Checksums.Sha1Context();
Sha1Context sha1Ctx = new Sha1Context();
sha1Ctx.Init();
for(uint i = 0; i < totalHunks; i++) sha1Ctx.Update(GetHunk(i));
@@ -1865,7 +1867,7 @@ namespace DiscImageChef.DiscImages
}
else
{
Checksums.Md5Context md5Ctx = new Checksums.Md5Context();
Md5Context md5Ctx = new Md5Context();
md5Ctx.Init();
for(uint i = 0; i < totalHunks; i++) md5Ctx.Update(GetHunk(i));

26
DiscImageChef.DiscImages/CloneCD.cs
View File

@@ -35,11 +35,11 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using DiscImageChef.Checksums;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Decoders.CD;
using DiscImageChef.Filters;
using DiscImageChef.DiscImages;
namespace DiscImageChef.DiscImages
{
@@ -85,7 +85,7 @@ namespace DiscImageChef.DiscImages
byte[] fulltoc;
bool scrambled;
string catalog;
List<DiscImages.Session> sessions;
List<Session> sessions;
List<Partition> partitions;
List<Track> tracks;
Stream dataStream;
@@ -347,7 +347,7 @@ namespace DiscImageChef.DiscImages
else if(cdtEntMatch.Success)
{
DicConsole.DebugWriteLine("CloneCD plugin", "Found CD-Text Entry at line {0}", line);
string[] bytes = cdtEntMatch.Groups["value"].Value.Split(new char[] {' '},
string[] bytes = cdtEntMatch.Groups["value"].Value.Split(new[] {' '},
StringSplitOptions
.RemoveEmptyEntries);
foreach(string byt in bytes) cdtMs.WriteByte(Convert.ToByte(byt, 16));
@@ -739,8 +739,8 @@ namespace DiscImageChef.DiscImages
if(subFilter != null && !ImageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
ImageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
sessions = new List<DiscImages.Session>();
DiscImages.Session currentSession = new DiscImages.Session();
sessions = new List<Session>();
Session currentSession = new Session();
currentSession.EndTrack = uint.MinValue;
currentSession.StartTrack = uint.MaxValue;
currentSession.SessionSequence = 1;
@@ -766,7 +766,7 @@ namespace DiscImageChef.DiscImages
else
{
sessions.Add(currentSession);
currentSession = new DiscImages.Session();
currentSession = new Session();
currentSession.EndTrack = uint.MinValue;
currentSession.StartTrack = uint.MaxValue;
currentSession.SessionSequence = track.TrackSession;
@@ -1404,7 +1404,7 @@ namespace DiscImageChef.DiscImages
return tracks;
}
public override List<Track> GetSessionTracks(DiscImages.Session session)
public override List<Track> GetSessionTracks(Session session)
{
if(sessions.Contains(session)) return GetSessionTracks(session.SessionSequence);
@@ -1413,10 +1413,10 @@ 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<DiscImages.Session> GetSessions()
public override List<Session> GetSessions()
{
return sessions;
}
@@ -1424,13 +1424,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,
@@ -1445,7 +1445,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)
{
@@ -1476,7 +1476,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)
{

10
DiscImageChef.DiscImages/DART.cs
View File

@@ -40,7 +40,7 @@ using Claunia.RsrcFork;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using DiscImageChef.DiscImages;
using Version = Resources.Version;
namespace DiscImageChef.DiscImages
{
@@ -295,7 +295,7 @@ namespace DiscImageChef.DiscImages
if(vers != null)
{
Resources.Version version = new Resources.Version(vers);
Version version = new Version(vers);
string major;
string minor;
@@ -309,13 +309,13 @@ namespace DiscImageChef.DiscImages
release = string.Format(".{0}", version.MinorVersion % 10);
switch(version.DevStage)
{
case Resources.Version.DevelopmentStage.Alpha:
case Version.DevelopmentStage.Alpha:
dev = "a";
break;
case Resources.Version.DevelopmentStage.Beta:
case Version.DevelopmentStage.Beta:
dev = "b";
break;
case Resources.Version.DevelopmentStage.PreAlpha:
case Version.DevelopmentStage.PreAlpha:
dev = "d";
break;
}

12
DiscImageChef.DiscImages/DiscJuggler.cs
View File

@@ -35,10 +35,10 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using DiscImageChef.Checksums;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using DiscImageChef.DiscImages;
namespace DiscImageChef.DiscImages
{
@@ -848,7 +848,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));
@@ -1224,13 +1224,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,
@@ -1245,7 +1245,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)
{
@@ -1276,7 +1276,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)
{

13
DiscImageChef.DiscImages/DiskCopy42.cs
View File

@@ -39,6 +39,7 @@ using Claunia.RsrcFork;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using Version = Resources.Version;
namespace DiscImageChef.DiscImages
{
@@ -406,8 +407,8 @@ namespace DiscImageChef.DiscImages
tagstream.Seek(tagOffset, SeekOrigin.Begin);
tagstream.Read(tags, 0, (int)header.TagSize);
ushort mfsMagic = BigEndianBitConverter.ToUInt16(data, (int)(data.Length / 2 + 0x400));
ushort mfsAllBlocks = BigEndianBitConverter.ToUInt16(data, (int)(data.Length / 2 + 0x412));
ushort mfsMagic = BigEndianBitConverter.ToUInt16(data, data.Length / 2 + 0x400);
ushort mfsAllBlocks = BigEndianBitConverter.ToUInt16(data, data.Length / 2 + 0x412);
// Detect a Macintosh Twiggy
if(mfsMagic == 0xD2D7 && mfsAllBlocks == 422)
@@ -463,7 +464,7 @@ namespace DiscImageChef.DiscImages
if(vers != null)
{
Resources.Version version = new Resources.Version(vers);
Version version = new Version(vers);
string major;
string minor;
@@ -477,13 +478,13 @@ namespace DiscImageChef.DiscImages
release = string.Format(".{0}", version.MinorVersion % 10);
switch(version.DevStage)
{
case Resources.Version.DevelopmentStage.Alpha:
case Version.DevelopmentStage.Alpha:
dev = "a";
break;
case Resources.Version.DevelopmentStage.Beta:
case Version.DevelopmentStage.Beta:
dev = "b";
break;
case Resources.Version.DevelopmentStage.PreAlpha:
case Version.DevelopmentStage.PreAlpha:
dev = "d";
break;
}

11
DiscImageChef.DiscImages/GDI.cs
View File

@@ -35,6 +35,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using DiscImageChef.Checksums;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
@@ -255,7 +256,7 @@ namespace DiscImageChef.DiscImages
currentTrack.Trackfilter =
filtersList.GetFilter(Path.Combine(imageFilter.GetParentFolder(),
trackMatch.Groups["filename"].Value.Replace("\\\"", "\"")
.Trim(new[] {'"'})));
.Trim('"')));
currentTrack.Trackfile = currentTrack.Trackfilter.GetFilename();
if(currentTrack.StartSector - currentStart > 0)
@@ -1031,13 +1032,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,
@@ -1052,7 +1053,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)
{
@@ -1083,7 +1084,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)
{

2
DiscImageChef.DiscImages/HDCopy.cs
View File

@@ -153,7 +153,7 @@ namespace DiscImageChef.DiscImages
/// <summary>
/// The ImageFilter we're reading from, after the file has been opened
/// </summary>
Filter hdcpImageFilter = null;
Filter hdcpImageFilter;
#endregion
#region Internal constants

23
DiscImageChef.DiscImages/ImagePlugin.cs
View File

@@ -32,6 +32,7 @@
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
using DiscImageChef.CommonTypes;
using DiscImageChef.Filters;
@@ -49,8 +50,6 @@ namespace DiscImageChef.DiscImages
/// <summary>Image information</summary>
public ImageInfo ImageInfo;
protected ImagePlugin() { }
// Basic image handling functions
/// <summary>
@@ -744,8 +743,8 @@ namespace DiscImageChef.DiscImages
/// </summary>
/// <param name="info">Info.</param>
/// <param name="context">Context.</param>
protected FeatureSupportedButNotImplementedImageException(System.Runtime.Serialization.SerializationInfo info,
System.Runtime.Serialization.StreamingContext context)
protected FeatureSupportedButNotImplementedImageException(SerializationInfo info,
StreamingContext context)
{
if(info == null) throw new ArgumentNullException(nameof(info));
}
@@ -775,8 +774,8 @@ namespace DiscImageChef.DiscImages
/// </summary>
/// <param name="info">Info.</param>
/// <param name="context">Context.</param>
protected FeatureUnsupportedImageException(System.Runtime.Serialization.SerializationInfo info,
System.Runtime.Serialization.StreamingContext context)
protected FeatureUnsupportedImageException(SerializationInfo info,
StreamingContext context)
{
if(info == null) throw new ArgumentNullException(nameof(info));
}
@@ -806,8 +805,8 @@ namespace DiscImageChef.DiscImages
/// </summary>
/// <param name="info">Info.</param>
/// <param name="context">Context.</param>
protected FeatureNotPresentImageException(System.Runtime.Serialization.SerializationInfo info,
System.Runtime.Serialization.StreamingContext context)
protected FeatureNotPresentImageException(SerializationInfo info,
StreamingContext context)
{
if(info == null) throw new ArgumentNullException(nameof(info));
}
@@ -837,8 +836,8 @@ namespace DiscImageChef.DiscImages
/// </summary>
/// <param name="info">Info.</param>
/// <param name="context">Context.</param>
protected FeaturedNotSupportedByDiscImageException(System.Runtime.Serialization.SerializationInfo info,
System.Runtime.Serialization.StreamingContext context)
protected FeaturedNotSupportedByDiscImageException(SerializationInfo info,
StreamingContext context)
{
if(info == null) throw new ArgumentNullException(nameof(info));
}
@@ -868,8 +867,8 @@ namespace DiscImageChef.DiscImages
/// </summary>
/// <param name="info">Info.</param>
/// <param name="context">Context.</param>
protected ImageNotSupportedException(System.Runtime.Serialization.SerializationInfo info,
System.Runtime.Serialization.StreamingContext context)
protected ImageNotSupportedException(SerializationInfo info,
StreamingContext context)
{
if(info == null) throw new ArgumentNullException(nameof(info));
}

10
DiscImageChef.DiscImages/NDIF.cs
View File

@@ -40,9 +40,9 @@ using Claunia.RsrcFork;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using DiscImageChef.DiscImages;
using SharpCompress.Compressors;
using SharpCompress.Compressors.ADC;
using Version = Resources.Version;
namespace DiscImageChef.DiscImages
{
@@ -374,7 +374,7 @@ namespace DiscImageChef.DiscImages
{
byte[] vers = versRsrc.GetResource(versRsrc.GetIds()[0]);
Resources.Version version = new Resources.Version(vers);
Version version = new Version(vers);
string major;
string minor;
@@ -387,13 +387,13 @@ namespace DiscImageChef.DiscImages
if(version.MinorVersion % 10 > 0) release = string.Format(".{0}", version.MinorVersion % 10);
switch(version.DevStage)
{
case Resources.Version.DevelopmentStage.Alpha:
case Version.DevelopmentStage.Alpha:
dev = "a";
break;
case Resources.Version.DevelopmentStage.Beta:
case Version.DevelopmentStage.Beta:
dev = "b";
break;
case Resources.Version.DevelopmentStage.PreAlpha:
case Version.DevelopmentStage.PreAlpha:
dev = "d";
break;
}

18
DiscImageChef.DiscImages/Nero.cs
View File

@@ -34,6 +34,8 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using DiscImageChef.Checksums;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
@@ -931,11 +933,11 @@ namespace DiscImageChef.DiscImages
DicConsole.DebugWriteLine("Nero plugin", "imageStream.Length = {0}", imageStream.Length);
DicConsole.DebugWriteLine("Nero plugin", "footerV1.ChunkID = 0x{0:X8} (\"{1}\")", footerV1.ChunkId,
System.Text.Encoding.ASCII
Encoding.ASCII
.GetString(BigEndianBitConverter.GetBytes(footerV1.ChunkId)));
DicConsole.DebugWriteLine("Nero plugin", "footerV1.FirstChunkOffset = {0}", footerV1.FirstChunkOffset);
DicConsole.DebugWriteLine("Nero plugin", "footerV2.ChunkID = 0x{0:X8} (\"{1}\")", footerV2.ChunkId,
System.Text.Encoding.ASCII
Encoding.ASCII
.GetString(BigEndianBitConverter.GetBytes(footerV2.ChunkId)));
DicConsole.DebugWriteLine("Nero plugin", "footerV2.FirstChunkOffset = {0}", footerV2.FirstChunkOffset);
@@ -974,7 +976,7 @@ namespace DiscImageChef.DiscImages
chunkLength = BigEndianBitConverter.ToUInt32(chunkHeaderBuffer, 4);
DicConsole.DebugWriteLine("Nero plugin", "ChunkID = 0x{0:X8} (\"{1}\")", chunkId,
System.Text.Encoding.ASCII
Encoding.ASCII
.GetString(BigEndianBitConverter.GetBytes(chunkId)));
DicConsole.DebugWriteLine("Nero plugin", "ChunkLength = {0}", chunkLength);
@@ -1517,7 +1519,7 @@ namespace DiscImageChef.DiscImages
default:
{
DicConsole.DebugWriteLine("Nero plugin", "Unknown chunk ID \"{0}\", skipping...",
System.Text.Encoding.ASCII.GetString(BigEndianBitConverter
Encoding.ASCII.GetString(BigEndianBitConverter
.GetBytes(chunkId)));
imageStream.Seek(chunkLength, SeekOrigin.Current);
break;
@@ -2343,13 +2345,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,
@@ -2364,7 +2366,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)
{
@@ -2395,7 +2397,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)
{

1
DiscImageChef.DiscImages/Parallels.cs
View File

@@ -38,7 +38,6 @@ using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using DiscImageChef.DiscImages;
namespace DiscImageChef.DiscImages
{

1
DiscImageChef.DiscImages/PartClone.cs
View File

@@ -38,7 +38,6 @@ using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using DiscImageChef.DiscImages;
using Extents;
namespace DiscImageChef.DiscImages

3
DiscImageChef.DiscImages/Partimage.cs
View File

@@ -38,7 +38,6 @@ using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using DiscImageChef.DiscImages;
using Extents;
namespace DiscImageChef.DiscImages
@@ -508,7 +507,7 @@ namespace DiscImageChef.DiscImages
DateTime start = DateTime.Now;
extents = new ExtentsULong();
extentsOff = new Dictionary<ulong, ulong>();
bool current = (bitmap[0] & (1 << (int)(0 % 8))) != 0;
bool current = (bitmap[0] & (1 << 0 % 8)) != 0;
ulong blockOff = 0;
ulong extentStart = 0;

5
DiscImageChef.DiscImages/TeleDisk.cs
View File

@@ -38,6 +38,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
@@ -419,7 +420,7 @@ namespace DiscImageChef.DiscImages
// Replace NULLs, used by TeleDisk as newline markers, with UNIX newline marker
if(commentBlock[i] == 0x00) commentBlock[i] = 0x0A;
ImageInfo.ImageComments = System.Text.Encoding.ASCII.GetString(commentBlock);
ImageInfo.ImageComments = Encoding.ASCII.GetString(commentBlock);
DicConsole.DebugWriteLine("TeleDisk plugin", "Comment");
DicConsole.DebugWriteLine("TeleDisk plugin", "{0}", ImageInfo.ImageComments);
@@ -1454,7 +1455,7 @@ namespace DiscImageChef.DiscImages
getbuf <<= 8;
getlen -= 8;
i = (ushort)(i >> 8);
return (int)i;
return i;
}
/* initialize freq tree */

17
DiscImageChef.DiscImages/UDIF.cs
View File

@@ -40,10 +40,11 @@ using Claunia.RsrcFork;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using DiscImageChef.DiscImages;
using SharpCompress.Compressors;
using Ionic.Zlib;
using SharpCompress.Compressors.ADC;
using SharpCompress.Compressors.BZip2;
using CompressionMode = SharpCompress.Compressors.CompressionMode;
using Version = Resources.Version;
namespace DiscImageChef.DiscImages
{
@@ -359,7 +360,7 @@ namespace DiscImageChef.DiscImages
if(vers != null)
{
Resources.Version version = new Resources.Version(vers);
Version version = new Version(vers);
string major;
string minor;
@@ -372,13 +373,13 @@ namespace DiscImageChef.DiscImages
if(version.MinorVersion % 10 > 0) release = string.Format(".{0}", version.MinorVersion % 10);
switch(version.DevStage)
{
case Resources.Version.DevelopmentStage.Alpha:
case Version.DevelopmentStage.Alpha:
dev = "a";
break;
case Resources.Version.DevelopmentStage.Beta:
case Version.DevelopmentStage.Beta:
dev = "b";
break;
case Resources.Version.DevelopmentStage.PreAlpha:
case Version.DevelopmentStage.PreAlpha:
dev = "d";
break;
}
@@ -549,7 +550,7 @@ namespace DiscImageChef.DiscImages
switch(currentChunk.type) {
case CHUNK_TYPE_ADC: decStream = new ADCStream(cmpMs, CompressionMode.Decompress);
break;
case CHUNK_TYPE_ZLIB: decStream = new Ionic.Zlib.ZlibStream(cmpMs, Ionic.Zlib.CompressionMode.Decompress);
case CHUNK_TYPE_ZLIB: decStream = new ZlibStream(cmpMs, Ionic.Zlib.CompressionMode.Decompress);
break;
case CHUNK_TYPE_BZIP: decStream = new BZip2Stream(cmpMs, CompressionMode.Decompress);
break;
@@ -578,7 +579,7 @@ namespace DiscImageChef.DiscImages
currentChunkCacheSize += (uint)realSize;
#if DEBUG
}
catch(Ionic.Zlib.ZlibException)
catch(ZlibException)
{
DicConsole.WriteLine("zlib exception on chunk starting at sector {0}", currentChunk.sector);
throw;

1
DiscImageChef.DiscImages/VDI.cs
View File

@@ -37,7 +37,6 @@ using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using DiscImageChef.DiscImages;
namespace DiscImageChef.DiscImages
{

5
DiscImageChef.DiscImages/VHD.cs
View File

@@ -36,6 +36,7 @@ using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using DiscImageChef.Checksums;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
@@ -494,7 +495,7 @@ namespace DiscImageChef.DiscImages
thisDateTime = new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc);
thisDateTime = thisDateTime.AddSeconds(thisFooter.Timestamp);
Checksums.Sha1Context sha1Ctx = new Checksums.Sha1Context();
Sha1Context sha1Ctx = new Sha1Context();
sha1Ctx.Init();
sha1Ctx.Update(thisFooter.Reserved);
@@ -720,7 +721,7 @@ namespace DiscImageChef.DiscImages
parentDateTime = new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc);
parentDateTime = parentDateTime.AddSeconds(thisDynamic.ParentTimestamp);
sha1Ctx = new Checksums.Sha1Context();
sha1Ctx = new Sha1Context();
sha1Ctx.Init();
sha1Ctx.Update(thisDynamic.Reserved2);

4
DiscImageChef.DiscImages/VHDX.cs
View File

@@ -620,7 +620,7 @@ namespace DiscImageChef.DiscImages
parentWorks = true;
break;
}
catch { continue; }
catch { }
}
else if(string.Compare(entryType, VOLUME_PATH_KEY, StringComparison.OrdinalIgnoreCase) == 0 ||
string.Compare(entryType, ABSOLUTE_WIN32_PATH_KEY, StringComparison.OrdinalIgnoreCase) == 0)
@@ -639,7 +639,7 @@ namespace DiscImageChef.DiscImages
parentWorks = true;
break;
}
catch { continue; }
catch { }
}
}

1
DiscImageChef.DiscImages/VMware.cs
View File

@@ -39,7 +39,6 @@ using System.Text.RegularExpressions;
using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
using DiscImageChef.Filters;
using DiscImageChef.DiscImages;
namespace DiscImageChef.DiscImages
{