General : Using an alternative case for the field ID in AdditionalValues doesn't get detected as a new field [#379]

Author: Zeugma440

ATL.unit-test/IO/MetaData/APE.cs ATL.unit-test/IO/MetaData/APEtag.csATL.unit-test/IO/MetaData/APE.cs renamed to ATL.unit-test/IO/MetaData/APEtag.cs

@@ -7,9 +7,9 @@
 namespace ATL.test.IO.MetaData
 {
     [TestClass]
-    public class APE : MetaIOTest
+    public class APEtag : MetaIOTest
     {
-        public APE()
+        public APEtag()
         {
             emptyFile = "MP3/empty.mp3";
             notEmptyFile = "MP3/APE.mp3";
@@ -188,5 +188,11 @@ public void TagIO_RW_APE_ID3v2()
         {
             test_RW_Cohabitation(MetaDataIOFactory.TagType.APE, MetaDataIOFactory.TagType.ID3V2);
         }
+
+        [TestMethod]
+        public void TagIO_RW_VorbisFLAC_AdditionalFieldsCase()
+        {
+            additionalFieldsCase(emptyFile, MetaDataIOFactory.TagType.APE);
+        }
     }
 }

ATL.unit-test/IO/MetaData/ID3v2.cs

@@ -1619,5 +1619,11 @@ public void TagIO_RW_ID3v2_APE()
         {
             test_RW_Cohabitation(MetaDataIOFactory.TagType.ID3V2, MetaDataIOFactory.TagType.APE);
         }
+
+        [TestMethod]
+        public void TagIO_RW_ID3v2_AdditionalFieldsCase()
+        {
+            additionalFieldsCase(emptyFile, MetaDataIOFactory.TagType.ID3V2);
+        }
     }
 }

ATL.unit-test/IO/MetaData/MP4.cs

@@ -2075,5 +2075,11 @@ public void TagIO_RW_MP4_RemoveTag_AddMetaAndChap2Images_RemoveTag()
             // Get rid of the working copy
             if (Settings.DeleteAfterSuccess) File.Delete(testFileLocation);
         }
+
+        [TestMethod]
+        public void TagIO_RW_MP4_AdditionalFieldsCase()
+        {
+            additionalFieldsCase(emptyFile, MetaDataIOFactory.TagType.NATIVE);
+        }
     }
 }

ATL.unit-test/IO/MetaData/MetaIOTest.cs

@@ -567,5 +567,11 @@ private static void checkLyricsMultiple(IMetaData meta)
             Assert.AreEqual(LyricsInfo.LyricsFormat.LRC, meta.Lyrics[0].Format);
             Assert.AreEqual(99, meta.Lyrics[0].SynchronizedLyrics.Count);
         }
+
+        [TestMethod]
+        public void TagIO_RW_VorbisFLAC_AdditionalFieldsCase()
+        {
+            additionalFieldsCase(emptyFile, MetaDataIOFactory.TagType.NATIVE);
+        }
     }
 }

ATL.unit-test/IO/MetaData/Vorbis_FLAC.cs

@@ -606,5 +606,11 @@ public void TagIO_RW_WAV_Even_ID3()
             // Get rid of the working copy
             if (Settings.DeleteAfterSuccess) File.Delete(testFileLocation);
         }
+
+        [TestMethod]
+        public void TagIO_RW_WAV_AdditionalFieldsCase()
+        {
+            additionalFieldsCase(emptyFile, MetaDataIOFactory.TagType.NATIVE, "info.ICMS");
+        }
     }
 }

ATL.unit-test/IO/MetaData/WAV.cs

@@ -538,5 +538,11 @@ public void TagIO_RW_WMA_APE()
         {
             test_RW_Cohabitation(MetaDataIOFactory.TagType.NATIVE, MetaDataIOFactory.TagType.APE);
         }
+
+        [TestMethod]
+        public void TagIO_RW_WMA_AdditionalFieldsCase()
+        {
+            additionalFieldsCase(emptyFile, MetaDataIOFactory.TagType.NATIVE);
+        }
     }
 }

ATL.unit-test/IO/MetaData/WMA.cs

@@ -315,6 +315,7 @@ public void ReadPicture(Stream s, ReadTagParams readTagParams)
 
                     tagData.AdditionalFields.Remove(fieldInfo);
                 }
+
                 tagData.AdditionalFields.Add(fieldInfo);
             }
         }
@@ -533,7 +534,7 @@ private uint writeFrames(Stream w, TagData tag)
             foreach (MetaFieldInfo fieldInfo in tag.AdditionalFields.Where(isMetaFieldWritable))
             {
                 if (fieldInfo.NativeFieldCode.Equals(VENDOR_METADATA_ID)
-                    || writtenFieldCodes.Contains(fieldInfo.NativeFieldCode.ToUpper())) continue;
+                    || writtenFieldCodes.Contains(fieldInfo.NativeFieldCode)) continue;
 
                 string value = FormatBeforeWriting(fieldInfo.Value);
                 if (value.Contains(Settings.DisplayValueSeparator + ""))

ATL/AudioData/IO/VorbisTag.cs

@@ -1,4 +1,5 @@
-using System.Diagnostics.CodeAnalysis;
+using System;
+using System.Diagnostics.CodeAnalysis;
 using ATL.AudioData;
 using Commons;
 using HashDepot;
@@ -172,7 +173,7 @@ public bool EqualsWithoutZone(object obj)
             if (obj.GetType() != this.GetType()) return false;
 
             // Call the implementation from IEquatable
-            return this.ToStringWithoutZone().Equals(((MetaFieldInfo)obj).ToStringWithoutZone());
+            return this.ToStringWithoutZone().Equals(((MetaFieldInfo)obj).ToStringWithoutZone(), StringComparison.InvariantCultureIgnoreCase);
         }
 
         /// <summary>
@@ -185,7 +186,7 @@ public bool EqualsApproximate(MetaFieldInfo obj)
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
 
-            bool result = MetaDataIOFactory.TagType.ANY == obj.TagType && obj.NativeFieldCode.Equals(this.NativeFieldCode);
+            bool result = MetaDataIOFactory.TagType.ANY == obj.TagType && obj.NativeFieldCode.Equals(this.NativeFieldCode, StringComparison.InvariantCultureIgnoreCase);
             if (obj.StreamNumber > 0) result = result && obj.StreamNumber == this.StreamNumber;
             if (obj.Language.Length > 0) result = result && obj.Language.Equals(this.Language);
 

ATL/Entities/MetaFieldInfo.cs

@@ -416,6 +416,10 @@ public void IntegrateValues(TagData targetData, bool integratePictures = true, b
                         if (metaInfo.EqualsWithoutZone(newMetaInfo) || metaInfo.EqualsApproximate(newMetaInfo))
                         {
                             found = true;
+
+                            if (!newMetaInfo.NativeFieldCode.Equals(metaInfo.NativeFieldCode) && newMetaInfo.NativeFieldCode.Equals(metaInfo.NativeFieldCode, StringComparison.InvariantCultureIgnoreCase))
+                                LogDelegator.GetLogDelegate()(Log.LV_WARNING, "Adding an AdditionalField with the same field code and a different case (" + metaInfo.NativeFieldCode + " => " + newMetaInfo.NativeFieldCode+"). Initial case ("+ metaInfo.NativeFieldCode+") will be kept.");
+
                             if (newMetaInfo.MarkedForDeletion) metaInfo.MarkedForDeletion = true; // New MetaFieldInfo is a demand for deletion
                             else metaInfo.Value = newMetaInfo.Value;
                             break;