From 633f8e0dc75577e3690e837b9d547c0028c8d300 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Fri, 23 Oct 2020 02:57:04 +0100 Subject: [PATCH] Fix aaruformat reporting track flags and ISRCs on non-CD media. Fixes #397 --- Aaru.Images/AaruFormat/Read.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Aaru.Images/AaruFormat/Read.cs b/Aaru.Images/AaruFormat/Read.cs index 4ba8c5b2d..190c5c5f9 100644 --- a/Aaru.Images/AaruFormat/Read.cs +++ b/Aaru.Images/AaruFormat/Read.cs @@ -761,8 +761,13 @@ namespace Aaru.DiscImages TrackFilter = imageFilter }); + if(trackEntry.type == TrackType.Data) + continue; + _trackFlags.Add(trackEntry.sequence, trackEntry.flags); - _trackIsrcs.Add(trackEntry.sequence, trackEntry.isrc); + + if(!string.IsNullOrEmpty(trackEntry.isrc)) + _trackIsrcs.Add(trackEntry.sequence, trackEntry.isrc); } if(_trackFlags.Count > 0 && @@ -1245,8 +1250,8 @@ namespace Aaru.DiscImages if(compactDiscIndexes != null) { - foreach(CompactDiscIndexEntry compactDiscIndex in compactDiscIndexes. - OrderBy(i => i.Track).ThenBy(i => i.Index)) + foreach(CompactDiscIndexEntry compactDiscIndex in compactDiscIndexes.OrderBy(i => i.Track). + ThenBy(i => i.Index)) { Track track = Tracks.FirstOrDefault(t => t.TrackSequence == compactDiscIndex.Track);