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

Fix CDRWin indexes.

Browse Source
This commit is contained in:
Natalia Portillo
2020-06-20 20:51:33 +01:00
parent 6465b316fc
commit de5ae7245e
5 changed files with 83 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/.idea.Aaru/.idea/contentModel.xml generated
View File

@@ -5,8 +5,6 @@
<e p="$USER_HOME$/.cache/JetBrains/Rider2020.1/resharper-host/local/Transient/ReSharperHost/v201/SolutionCaches/_Aaru.232757112.00" t="ExcludeRecursive" /> <e p="$USER_HOME$/.cache/JetBrains/Rider2020.1/resharper-host/local/Transient/ReSharperHost/v201/SolutionCaches/_Aaru.232757112.00" t="ExcludeRecursive" />
<e p="$APPLICATION_CONFIG_DIR$/consoles/db" t="IncludeRecursive" /> <e p="$APPLICATION_CONFIG_DIR$/consoles/db" t="IncludeRecursive" />
<e p="$APPLICATION_CONFIG_DIR$/extensions" t="IncludeRecursive" /> <e p="$APPLICATION_CONFIG_DIR$/extensions" t="IncludeRecursive" />
<e p="$APPLICATION_CONFIG_DIR$/scratches" t="IncludeRecursive" />
<e p="$USER_HOME$/.config/git/ignore" t="IncludeRecursive" />
<e p="$APPLICATION_PLUGINS_DIR$/puppet/lib/stubs" t="IncludeRecursive" /> <e p="$APPLICATION_PLUGINS_DIR$/puppet/lib/stubs" t="IncludeRecursive" />
<e p="$PROJECT_DIR$" t="IncludeFlat"> <e p="$PROJECT_DIR$" t="IncludeFlat">
<e p=".git/info/exclude" t="IncludeRecursive" /> <e p=".git/info/exclude" t="IncludeRecursive" />

10
Aaru.Images/CDRWin/Helpers.cs
View File

@@ -38,14 +38,14 @@ namespace Aaru.DiscImages
{ {
public partial class CdrWin public partial class CdrWin
{ {
static ulong CdrWinMsfToLba(string msf) static int CdrWinMsfToLba(string msf)
{ {
string[] msfElements = msf.Split(':'); string[] msfElements = msf.Split(':');
ulong minute = ulong.Parse(msfElements[0]); int minute = int.Parse(msfElements[0]);
ulong second = ulong.Parse(msfElements[1]); int second = int.Parse(msfElements[1]);
ulong frame = ulong.Parse(msfElements[2]); int frame = int.Parse(msfElements[2]);
ulong sectors = (minute * 60 * 75) + (second * 75) + frame; int sectors = (minute * 60 * 75) + (second * 75) + frame;
return sectors; return sectors;
} }

27
Aaru.Images/CDRWin/Properties.cs
View File

@@ -74,7 +74,7 @@ namespace Aaru.DiscImages
{ {
var aaruTrack = new Track var aaruTrack = new Track
{ {
TrackDescription = cdrTrack.Title, TrackPregap = cdrTrack.Pregap, TrackDescription = cdrTrack.Title, TrackPregap = (ulong)cdrTrack.Pregap,
TrackSession = cdrTrack.Session, TrackSequence = cdrTrack.Sequence, TrackSession = cdrTrack.Session, TrackSequence = cdrTrack.Sequence,
TrackType = CdrWinTrackTypeToTrackType(cdrTrack.TrackType), TrackType = CdrWinTrackTypeToTrackType(cdrTrack.TrackType),
TrackFile = cdrTrack.TrackFile.DataFilter.GetFilename(), TrackFile = cdrTrack.TrackFile.DataFilter.GetFilename(),
@@ -83,22 +83,33 @@ namespace Aaru.DiscImages
TrackBytesPerSector = CdrWinTrackTypeToCookedBytesPerSector(cdrTrack.TrackType) TrackBytesPerSector = CdrWinTrackTypeToCookedBytesPerSector(cdrTrack.TrackType)
}; };
if(aaruTrack.TrackSequence == 1)
{
aaruTrack.TrackPregap = 150;
aaruTrack.Indexes[0] = -150;
}
if(previousTrackFile == aaruTrack.TrackFile || if(previousTrackFile == aaruTrack.TrackFile ||
previousTrackFile == "") previousTrackFile == "")
{ if(cdrTrack.Indexes.TryGetValue(0, out int idx0))
if(!cdrTrack.Indexes.TryGetValue(0, out aaruTrack.TrackStartSector)) if(idx0 > 0)
if(!cdrTrack.Indexes.TryGetValue(1, out aaruTrack.TrackStartSector)) aaruTrack.TrackStartSector = (ulong)idx0;
aaruTrack.TrackStartSector += previousStartSector; else
} aaruTrack.TrackStartSector = 0;
else if(cdrTrack.Indexes.TryGetValue(1, out int idx1))
aaruTrack.TrackStartSector = (ulong)idx1;
else else
aaruTrack.TrackStartSector += previousStartSector; aaruTrack.TrackStartSector += previousStartSector;
else
aaruTrack.TrackStartSector += previousStartSector;
foreach((ushort index, int position) in cdrTrack.Indexes)
aaruTrack.Indexes[index] = position;
if(_discImage.IsRedumpGigadisc && if(_discImage.IsRedumpGigadisc &&
cdrTrack.Session == 2 && cdrTrack.Session == 2 &&
previousStartSector < gdRomSession2Offset) previousStartSector < gdRomSession2Offset)
{
aaruTrack.TrackStartSector = gdRomSession2Offset; aaruTrack.TrackStartSector = gdRomSession2Offset;
}
previousTrackFile = cdrTrack.TrackFile.DataFilter.GetFilename(); previousTrackFile = cdrTrack.TrackFile.DataFilter.GetFilename();

50
Aaru.Images/CDRWin/Read.cs
View File

@@ -117,15 +117,15 @@ namespace Aaru.DiscImages
var currentTrack = new CdrWinTrack var currentTrack = new CdrWinTrack
{ {
Indexes = new Dictionary<int, ulong>() Indexes = new Dictionary<ushort, int>()
}; };
var currentFile = new CdrWinTrackFile(); var currentFile = new CdrWinTrackFile();
ulong currentFileOffsetSector = 0; long currentFileOffsetSector = 0;
int trackCount = 0; int trackCount = 0;
Dictionary<byte, ulong> leadouts = new Dictionary<byte, ulong>(); Dictionary<byte, int> leadouts = new Dictionary<byte, int>();
while(_cueStream.Peek() >= 0) while(_cueStream.Peek() >= 0)
{ {
@@ -627,8 +627,8 @@ namespace Aaru.DiscImages
if(!inTrack) if(!inTrack)
throw new FeatureUnsupportedImageException($"Found INDEX before a track {lineNumber}"); throw new FeatureUnsupportedImageException($"Found INDEX before a track {lineNumber}");
int index = int.Parse(matchIndex.Groups[1].Value); ushort index = ushort.Parse(matchIndex.Groups[1].Value);
ulong offset = CdrWinMsfToLba(matchIndex.Groups[2].Value); int offset = CdrWinMsfToLba(matchIndex.Groups[2].Value);
if(index != 0 && if(index != 0 &&
index != 1 && index != 1 &&
@@ -641,7 +641,8 @@ namespace Aaru.DiscImages
if((int)(currentTrack.Sequence - 2) >= 0 && if((int)(currentTrack.Sequence - 2) >= 0 &&
offset > 1) offset > 1)
{ {
cueTracks[currentTrack.Sequence - 2].Sectors = offset - currentFileOffsetSector; cueTracks[currentTrack.Sequence - 2].Sectors =
(ulong)(offset - (int)currentFileOffsetSector);
currentFile.Offset += currentFile.Offset +=
cueTracks[currentTrack.Sequence - 2].Sectors * cueTracks[currentTrack.Sequence - 2].Sectors *
@@ -665,7 +666,7 @@ namespace Aaru.DiscImages
AaruConsole.DebugWriteLine("CDRWin plugin", "Sets currentFile.offset to {0}", AaruConsole.DebugWriteLine("CDRWin plugin", "Sets currentFile.offset to {0}",
offset * currentTrack.Bps); offset * currentTrack.Bps);
currentFile.Offset = offset * currentTrack.Bps; currentFile.Offset = (ulong)(offset * currentTrack.Bps);
} }
currentFileOffsetSector = offset; currentFileOffsetSector = offset;
@@ -758,7 +759,7 @@ namespace Aaru.DiscImages
currentTrack = new CdrWinTrack currentTrack = new CdrWinTrack
{ {
Indexes = new Dictionary<int, ulong>(), Indexes = new Dictionary<ushort, int>(),
Sequence = uint.Parse(matchTrack.Groups[1].Value) Sequence = uint.Parse(matchTrack.Groups[1].Value)
}; };
@@ -827,29 +828,40 @@ namespace Aaru.DiscImages
sessions[s - 1].StartTrack = cueTracks[firstSessionTrk].Sequence; sessions[s - 1].StartTrack = cueTracks[firstSessionTrk].Sequence;
sessions[s - 1].EndTrack = cueTracks[lastSessionTrack].Sequence; sessions[s - 1].EndTrack = cueTracks[lastSessionTrack].Sequence;
if(leadouts.TryGetValue((byte)s, out ulong leadout)) if(leadouts.TryGetValue((byte)s, out int leadout))
{ {
sessions[s - 1].EndSector = leadout - 1; sessions[s - 1].EndSector = (ulong)(leadout - 1);
if(!cueTracks[lastSessionTrack].Indexes.TryGetValue(0, out ulong startSector)) if(!cueTracks[lastSessionTrack].Indexes.TryGetValue(0, out int startSector))
cueTracks[lastSessionTrack].Indexes.TryGetValue(1, out startSector); cueTracks[lastSessionTrack].Indexes.TryGetValue(1, out startSector);
cueTracks[lastSessionTrack].Sectors = leadout - startSector; cueTracks[lastSessionTrack].Sectors = (ulong)(leadout - startSector);
} }
else else
sessions[s - 1].EndSector = (sessions[s - 1].StartSector + sessionSectors) - 1; sessions[s - 1].EndSector = (sessions[s - 1].StartSector + sessionSectors) - 1;
CdrWinTrack firstSessionTrack = cueTracks.OrderBy(t => t.Sequence).First(t => t.Session == s); CdrWinTrack firstSessionTrack = cueTracks.OrderBy(t => t.Sequence).First(t => t.Session == s);
firstSessionTrack.Indexes.TryGetValue(0, out firstSessionTrack.Pregap);
if(firstSessionTrack.Pregap < 150)
firstSessionTrack.Pregap = 150;
if(cueTracks.All(i => i.TrackFile.DataFilter.GetFilename() == if(cueTracks.All(i => i.TrackFile.DataFilter.GetFilename() ==
cueTracks.First().TrackFile.DataFilter.GetFilename())) cueTracks.First().TrackFile.DataFilter.GetFilename()))
{ {
if(firstSessionTrack.Indexes.TryGetValue(0, out sessions[s - 1].StartSector)) if(firstSessionTrack.Indexes.TryGetValue(0, out int sessionStart))
continue; {
sessions[s - 1].StartSector = (ulong)sessionStart;
if(firstSessionTrack.Indexes.TryGetValue(1, out sessions[s - 1].StartSector))
continue; continue;
} }
if(firstSessionTrack.Indexes.TryGetValue(1, out sessionStart))
{
sessions[s - 1].StartSector = (ulong)sessionStart;
}
}
} }
for(int s = 1; s <= sessions.Length; s++) for(int s = 1; s <= sessions.Length; s++)
@@ -857,8 +869,8 @@ namespace Aaru.DiscImages
for(int t = 1; t <= cueTracks.Length; t++) for(int t = 1; t <= cueTracks.Length; t++)
{ {
if(cueTracks[t - 1].Indexes.TryGetValue(0, out ulong idx0) && if(cueTracks[t - 1].Indexes.TryGetValue(0, out int idx0) &&
cueTracks[t - 1].Indexes.TryGetValue(1, out ulong idx1)) cueTracks[t - 1].Indexes.TryGetValue(1, out int idx1))
cueTracks[t - 1].Pregap = idx1 - idx0; cueTracks[t - 1].Pregap = idx1 - idx0;
_discImage.Tracks.Add(cueTracks[t - 1]); _discImage.Tracks.Add(cueTracks[t - 1]);
@@ -1064,7 +1076,7 @@ namespace Aaru.DiscImages
AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tIndexes:"); AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tIndexes:");
foreach(KeyValuePair<int, ulong> kvp in _discImage.Tracks[i].Indexes) foreach(KeyValuePair<ushort, int> kvp in _discImage.Tracks[i].Indexes)
AaruConsole.DebugWriteLine("CDRWin plugin", "\t\t\tIndex {0} starts at sector {1}", kvp.Key, AaruConsole.DebugWriteLine("CDRWin plugin", "\t\t\tIndex {0} starts at sector {1}", kvp.Key,
kvp.Value); kvp.Value);
@@ -1124,7 +1136,7 @@ namespace Aaru.DiscImages
var partition = new Partition(); var partition = new Partition();
if(!_discImage.Tracks[i].Indexes.TryGetValue(1, out ulong _)) if(!_discImage.Tracks[i].Indexes.TryGetValue(1, out _))
throw new ImageNotSupportedException($"Track {_discImage.Tracks[i].Sequence} lacks index 01"); throw new ImageNotSupportedException($"Track {_discImage.Tracks[i].Sequence} lacks index 01");
if(_discImage.IsRedumpGigadisc && if(_discImage.IsRedumpGigadisc &&

54
Aaru.Images/CDRWin/Structs.cs
View File

@@ -51,48 +51,48 @@ namespace Aaru.DiscImages
public string FileType; public string FileType;
} }
struct CdrWinTrack class CdrWinTrack
{ {
/// <summary>Track #</summary>
public uint Sequence;
/// <summary>Track title (from CD-Text)</summary>
public string Title;
/// <summary>Track genre (from CD-Text)</summary>
public string Genre;
/// <summary>Track arranger (from CD-Text)</summary> /// <summary>Track arranger (from CD-Text)</summary>
public string Arranger; public string Arranger;
/// <summary>Bytes per sector</summary>
public ushort Bps;
/// <summary>Track composer (from CD-Text)</summary> /// <summary>Track composer (from CD-Text)</summary>
public string Composer; public string Composer;
/// <summary>Track performer (from CD-Text)</summary>
public string Performer;
/// <summary>Track song writer (from CD-Text)</summary>
public string Songwriter;
/// <summary>Track ISRC</summary>
public string Isrc;
/// <summary>File struct for this track</summary>
public CdrWinTrackFile TrackFile;
/// <summary>Indexes on this track</summary>
public Dictionary<int, ulong> Indexes;
/// <summary>Track pre-gap in sectors</summary>
public ulong Pregap;
/// <summary>Track post-gap in sectors</summary>
public ulong Postgap;
/// <summary>Digital Copy Permitted</summary>
public bool FlagDcp;
/// <summary>Track is quadraphonic</summary> /// <summary>Track is quadraphonic</summary>
public bool Flag4ch; public bool Flag4ch;
/// <summary>Digital Copy Permitted</summary>
public bool FlagDcp;
/// <summary>Track has pre-emphasis</summary> /// <summary>Track has pre-emphasis</summary>
public bool FlagPre; public bool FlagPre;
/// <summary>Track has SCMS</summary> /// <summary>Track has SCMS</summary>
public bool FlagScms; public bool FlagScms;
/// <summary>Bytes per sector</summary> /// <summary>Track genre (from CD-Text)</summary>
public ushort Bps; public string Genre;
/// <summary>Indexes on this track</summary>
public Dictionary<ushort, int> Indexes;
/// <summary>Track ISRC</summary>
public string Isrc;
/// <summary>Track performer (from CD-Text)</summary>
public string Performer;
/// <summary>Track post-gap in sectors</summary>
public int Postgap;
/// <summary>Track pre-gap in sectors</summary>
public int Pregap;
/// <summary>Sectors in track</summary> /// <summary>Sectors in track</summary>
public ulong Sectors; public ulong Sectors;
/// <summary>Track type</summary> /// <summary>Track #</summary>
public string TrackType; public uint Sequence;
/// <summary>Track session</summary> /// <summary>Track session</summary>
public ushort Session; public ushort Session;
/// <summary>Track song writer (from CD-Text)</summary>
public string Songwriter;
/// <summary>Track title (from CD-Text)</summary>
public string Title;
/// <summary>File struct for this track</summary>
public CdrWinTrackFile TrackFile;
/// <summary>Track type</summary>
public string TrackType;
} }
struct CdrWinDisc struct CdrWinDisc