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

Do not calculate checksum of only track for raw files.

Browse Source
This commit is contained in:
Natalia Portillo
2017-06-20 05:51:21 +01:00
parent e57f2a5131
commit 92d34eef55
1 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
DiscImageChef.Core/Sidecar.cs
View File

@@ -417,42 +417,49 @@ namespace DiscImageChef.Core
xmlTrk.Size = (xmlTrk.EndSector - xmlTrk.StartSector + 1) * trk.TrackRawBytesPerSector; xmlTrk.Size = (xmlTrk.EndSector - xmlTrk.StartSector + 1) * trk.TrackRawBytesPerSector;
xmlTrk.BytesPerSector = trk.TrackBytesPerSector; xmlTrk.BytesPerSector = trk.TrackBytesPerSector;
// For fast debugging, skip checksum
//goto skipChecksum;
uint sectorsToRead = 512; uint sectorsToRead = 512;
Checksum trkChkWorker = new Checksum();
ulong sectors = (ulong)(xmlTrk.EndSector - xmlTrk.StartSector + 1); ulong sectors = (ulong)(xmlTrk.EndSector - xmlTrk.StartSector + 1);
ulong doneSectors = 0; ulong doneSectors = 0;
InitProgress2(); // If there is only one track, and it's the same as the image file (e.g. ".iso" files), don't re-checksum.
while(doneSectors < sectors) if(tracks.Count == 1 && xmlTrk.Image.Value == sidecar.OpticalDisc[0].Image.Value)
{ {
byte[] sector; xmlTrk.Checksums = sidecar.OpticalDisc[0].Checksums;
if((sectors - doneSectors) >= sectorsToRead)
{
sector = image.ReadSectorsLong(doneSectors, sectorsToRead, (uint)xmlTrk.Sequence.TrackNumber);
UpdateProgress2("Hashings sector {0} of {1}", (long)doneSectors, (long)(trk.TrackEndSector - trk.TrackStartSector + 1));
doneSectors += sectorsToRead;
}
else
{
sector = image.ReadSectorsLong(doneSectors, (uint)(sectors - doneSectors), (uint)xmlTrk.Sequence.TrackNumber);
UpdateProgress2("Hashings sector {0} of {1}", (long)doneSectors, (long)(trk.TrackEndSector - trk.TrackStartSector + 1));
doneSectors += (sectors - doneSectors);
}
trkChkWorker.Update(sector);
} }
else
{
// For fast debugging, skip checksum
//goto skipChecksum;
List<ChecksumType> trkChecksums = trkChkWorker.End(); Checksum trkChkWorker = new Checksum();
xmlTrk.Checksums = trkChecksums.ToArray(); InitProgress2();
while(doneSectors < sectors)
{
byte[] sector;
EndProgress2(); if((sectors - doneSectors) >= sectorsToRead)
{
sector = image.ReadSectorsLong(doneSectors, sectorsToRead, (uint)xmlTrk.Sequence.TrackNumber);
UpdateProgress2("Hashings sector {0} of {1}", (long)doneSectors, (long)(trk.TrackEndSector - trk.TrackStartSector + 1));
doneSectors += sectorsToRead;
}
else
{
sector = image.ReadSectorsLong(doneSectors, (uint)(sectors - doneSectors), (uint)xmlTrk.Sequence.TrackNumber);
UpdateProgress2("Hashings sector {0} of {1}", (long)doneSectors, (long)(trk.TrackEndSector - trk.TrackStartSector + 1));
doneSectors += (sectors - doneSectors);
}
trkChkWorker.Update(sector);
}
List<ChecksumType> trkChecksums = trkChkWorker.End();
xmlTrk.Checksums = trkChecksums.ToArray();
EndProgress2();
}
if(trk.TrackSubchannelType != TrackSubchannelType.None) if(trk.TrackSubchannelType != TrackSubchannelType.None)
{ {