mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
* DiscImageChef.DiscImages/CDRDAO.cs:
Corrected typo on audio track matching. * DiscImageChef.DiscImages/CDRWin.cs: Corrected detection of images with CD-Text. Do not output partitions for index 0. * DiscImageChef.DiscImages/CopyQM.cs: Do not create debug image output. * DiscImageChef.DiscImages/Nero.cs: Added type for any dvd seen on old Nero version. Corrected handling of images where pregap is not indicated (nonetheless, Nero stores them). Corrected handling of track 1 (Lead-In is stored there). Corrected session count in discs with 1 session. Do not add partitions of index 0. Corrected partition start offset of disc start. Guess disc type for old Nero discs. Corrected output of Mode2 sectors stored in RAW mode. Do not throw exceptions on values that should be returned empty or null if not supported by image format. * DiscImageChef.Filesystems/FFS.cs: * DiscImageChef.Filesystems/BFS.cs: * DiscImageChef.Filesystems/ODS.cs: * DiscImageChef.Filesystems/FAT.cs: * DiscImageChef.Filesystems/APFS.cs: * DiscImageChef.Filesystems/NTFS.cs: * DiscImageChef.Filesystems/SysV.cs: * DiscImageChef.Filesystems/HPFS.cs: * DiscImageChef.Filesystems/Opera.cs: * DiscImageChef.Filesystems/Acorn.cs: * DiscImageChef.Filesystems/extFS.cs: * DiscImageChef.Filesystems/BTRFS.cs: * DiscImageChef.Filesystems/ext2FS.cs: * DiscImageChef.Filesystems/ProDOS.cs: * DiscImageChef.Filesystems/SolarFS.cs: * DiscImageChef.Filesystems/UNIXBFS.cs: * DiscImageChef.Filesystems/ISO9660.cs: * DiscImageChef.Filesystems/MinixFS.cs: * DiscImageChef.Filesystems/AmigaDOS.cs: * DiscImageChef.Filesystems/PCEngine.cs: * DiscImageChef.Filesystems/AppleHFS.cs: * DiscImageChef.Filesystems/AppleHFSPlus.cs: * DiscImageChef.Filesystems/AppleMFS/Info.cs: Do not try to read past partition end. * DiscImageChef/Commands/CreateSidecar.cs: Added points for skipping whole image checksum on debugging. Track starts at index 0.
This commit is contained in:
@@ -326,19 +326,22 @@ namespace DiscImageChef.ImagePlugins
|
||||
Regex Rr = new Regex(CommentRegEx);
|
||||
Regex Cr = new Regex(MCNRegEx);
|
||||
Regex Fr = new Regex(FileRegEx);
|
||||
Regex Tr = new Regex(CDTextRegEx);
|
||||
|
||||
Match Sm;
|
||||
Match Rm;
|
||||
Match Cm;
|
||||
Match Fm;
|
||||
Match Tm;
|
||||
|
||||
// First line must be SESSION, REM, CATALOG or FILE.
|
||||
// First line must be SESSION, REM, CATALOG, FILE or CDTEXTFILE.
|
||||
Sm = Sr.Match(_line);
|
||||
Rm = Rr.Match(_line);
|
||||
Cm = Cr.Match(_line);
|
||||
Fm = Fr.Match(_line);
|
||||
Tm = Tr.Match(_line);
|
||||
|
||||
if(!Sm.Success && !Rm.Success && !Cm.Success && !Fm.Success)
|
||||
if(!Sm.Success && !Rm.Success && !Cm.Success && !Fm.Success && !Tm.Success)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
@@ -1062,7 +1065,7 @@ namespace DiscImageChef.ImagePlugins
|
||||
|
||||
Partition partition = new Partition();
|
||||
|
||||
if(discimage.tracks[i].pregap > 0)
|
||||
/*if(discimage.tracks[i].pregap > 0)
|
||||
{
|
||||
partition.PartitionDescription = string.Format("Track {0} pregap.", discimage.tracks[i].sequence);
|
||||
partition.PartitionName = discimage.tracks[i].title;
|
||||
@@ -1093,14 +1096,14 @@ namespace DiscImageChef.ImagePlugins
|
||||
|
||||
partitions.Add(partition);
|
||||
partition = new Partition();
|
||||
}
|
||||
}*/
|
||||
|
||||
index_zero |= discimage.tracks[i].indexes.TryGetValue(0, out index_zero_offset);
|
||||
|
||||
if(!discimage.tracks[i].indexes.TryGetValue(1, out index_one_offset))
|
||||
throw new ImageNotSupportedException(string.Format("Track {0} lacks index 01", discimage.tracks[i].sequence));
|
||||
|
||||
if(index_zero && index_one_offset > index_zero_offset)
|
||||
/*if(index_zero && index_one_offset > index_zero_offset)
|
||||
{
|
||||
partition.PartitionDescription = string.Format("Track {0} index 00.", discimage.tracks[i].sequence);
|
||||
partition.PartitionName = discimage.tracks[i].title;
|
||||
@@ -1132,7 +1135,7 @@ namespace DiscImageChef.ImagePlugins
|
||||
|
||||
partitions.Add(partition);
|
||||
partition = new Partition();
|
||||
}
|
||||
}*/
|
||||
|
||||
// Index 01
|
||||
partition.PartitionDescription = string.Format("Track {0}.", discimage.tracks[i].sequence);
|
||||
|
||||
Reference in New Issue
Block a user