From 61aaea06b3449a13cbc07fba96783619cd6bf682 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Fri, 28 Feb 2020 00:11:45 +0000
Subject: [PATCH] Change CDRWin media type

---
 Aaru.Images/CDRWin/Constants.cs |  1 +
 Aaru.Images/CDRWin/Read.cs      | 16 +++++++++++++---
 Aaru.Images/CDRWin/Structs.cs   |  4 ++--
 Aaru.Images/CDRWin/Write.cs     |  2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Aaru.Images/CDRWin/Constants.cs b/Aaru.Images/CDRWin/Constants.cs
index 8029d7618..ea4bfffab 100644
--- a/Aaru.Images/CDRWin/Constants.cs
+++ b/Aaru.Images/CDRWin/Constants.cs
@@ -172,6 +172,7 @@ namespace Aaru.DiscImages
         const string REGEX_TRURIP_TRACK_SHA1    = @"\bREM\s+(Gap|Trk)\s+(?<number>\d{2}):\s+[\da-f]{40}$";
         const string REGEX_TRURIP_TRACK_UNKNOWN = @"\bREM\s+(Gap|Trk)\s+(?<number>\d{2}):\s+[\da-f]{8,}$";
         const string REGEX_DIC_MEDIA_TYPE       = @"\bREM\s+METADATA DIC MEDIA-TYPE:\s+(?<mediatype>.+)$";
+        const string REGEX_AARU_MEDIA_TYPE       = @"\bREM\s+METADATA AARU MEDIA-TYPE:\s+(?<mediatype>.+)$";
         const string REGEX_APPLICATION_VERSION  = @"\bREM\s+Ripping Tool Version:\s+(?<application>.+)$";
         const string REGEX_DUMP_EXTENT =
             @"\bREM\s+METADATA DUMP EXTENT:\s+(?<application>.+)\s+\|\s+(?<version>.+)\s+\|\s+(?<os>.+)\s+\|\s+(?<manufacturer>.+)\s+\|\s+(?<model>.+)\s+\|\s+(?<firmware>.+)\s+\|\s+(?<serial>.+)\s+\|\s+(?<start>\d+):(?<end>\d+)$";
diff --git a/Aaru.Images/CDRWin/Read.cs b/Aaru.Images/CDRWin/Read.cs
index d96ab0807..1de6e441c 100644
--- a/Aaru.Images/CDRWin/Read.cs
+++ b/Aaru.Images/CDRWin/Read.cs
@@ -101,6 +101,7 @@ namespace Aaru.DiscImages
                 var regexDicMediaType           = new Regex(REGEX_DIC_MEDIA_TYPE);
                 var regexApplicationVersion     = new Regex(REGEX_APPLICATION_VERSION);
                 var regexDumpExtent             = new Regex(REGEX_DUMP_EXTENT);
+                var regexAaruMediaType          = new Regex(REGEX_AARU_MEDIA_TYPE);
 
                 // Initialize all RegEx matches
                 Match matchTrack;
@@ -170,6 +171,7 @@ namespace Aaru.DiscImages
                     Match matchDicMediaType       = regexDicMediaType.Match(line);
                     Match matchApplicationVersion = regexApplicationVersion.Match(line);
                     Match matchDumpExtent         = regexDumpExtent.Match(line);
+                    Match matchAaruMediaType      = regexAaruMediaType.Match(line);
 
                     if(inTruripDiscHash)
                     {
@@ -317,7 +319,15 @@ namespace Aaru.DiscImages
                         AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM METADATA DIC MEDIA-TYPE at line {0}",
                                                   lineNumber);
 
-                        _discImage.DicMediaType = matchDicMediaType.Groups[1].Value;
+                        _discImage.AaruMediaType = matchDicMediaType.Groups[1].Value;
+                    }
+                    else if(matchAaruMediaType.Success &&
+                            !inTrack)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM METADATA AARU MEDIA-TYPE at line {0}",
+                                                  lineNumber);
+
+                        _discImage.AaruMediaType = matchAaruMediaType.Groups[1].Value;
                     }
                     else if(matchDiskType.Success &&
                             !inTrack)
@@ -794,8 +804,8 @@ namespace Aaru.DiscImages
                     _discImage.Tracks.Add(cueTracks[t - 1]);
                 }
 
-                if(!string.IsNullOrWhiteSpace(_discImage.DicMediaType) &&
-                   Enum.TryParse(_discImage.DicMediaType, true, out MediaType mediaType))
+                if(!string.IsNullOrWhiteSpace(_discImage.AaruMediaType) &&
+                   Enum.TryParse(_discImage.AaruMediaType, true, out MediaType mediaType))
                 {
                     _discImage.MediaType = mediaType;
                 }
diff --git a/Aaru.Images/CDRWin/Structs.cs b/Aaru.Images/CDRWin/Structs.cs
index fc957726c..c6df1d79d 100644
--- a/Aaru.Images/CDRWin/Structs.cs
+++ b/Aaru.Images/CDRWin/Structs.cs
@@ -131,8 +131,8 @@ namespace Aaru.DiscImages
             public bool IsTrurip;
             /// <summary>Disc image hashes</summary>
             public Dictionary<string, string> DiscHashes;
-            /// <summary>DIC media type</summary>
-            public string DicMediaType;
+            /// <summary>Aaru media type</summary>
+            public string AaruMediaType;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRWin/Write.cs b/Aaru.Images/CDRWin/Write.cs
index ed52cf20a..86097d48e 100644
--- a/Aaru.Images/CDRWin/Write.cs
+++ b/Aaru.Images/CDRWin/Write.cs
@@ -441,7 +441,7 @@ namespace Aaru.DiscImages
 
             _descriptorStream.WriteLine("REM ORIGINAL MEDIA-TYPE: {0}", MediaTypeToCdrwinType(_imageInfo.MediaType));
 
-            _descriptorStream.WriteLine("REM METADATA DIC MEDIA-TYPE: {0}", _imageInfo.MediaType);
+            _descriptorStream.WriteLine("REM METADATA AARU MEDIA-TYPE: {0}", _imageInfo.MediaType);
 
             if(!string.IsNullOrEmpty(_imageInfo.Application))
             {