From 13e9a0ab3218d44f033dbc4cd38143c966180eb8 Mon Sep 17 00:00:00 2001
From: reven <john@reven.nz>
Date: Mon, 31 Jan 2022 17:10:09 +1300
Subject: [PATCH] added artist to music info

---
 MusicNodes/InputNodes/MusicFile.cs |   1 +
 MusicNodes/MusicInfo.cs            |   1 +
 MusicNodes/MusicInfoHelper.cs      |  18 ++++++++++--------
 MusicNodes/MusicNodes.csproj       | Bin 3930 -> 3930 bytes
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/MusicNodes/InputNodes/MusicFile.cs b/MusicNodes/InputNodes/MusicFile.cs
index c60c651e..df3e902c 100644
--- a/MusicNodes/InputNodes/MusicFile.cs
+++ b/MusicNodes/InputNodes/MusicFile.cs
@@ -16,6 +16,7 @@ namespace FileFlows.MusicNodes
             _Variables = new Dictionary<string, object>()
             {
                 { "mi.Album", "Album" },
+                { "mi.Artist", "Artist" },
                 { "mi.BitRate", 845 },
                 { "mi.Channels", 2 },
                 { "mi.Codec", "flac" },
diff --git a/MusicNodes/MusicInfo.cs b/MusicNodes/MusicInfo.cs
index fc39530d..a7298b52 100644
--- a/MusicNodes/MusicInfo.cs
+++ b/MusicNodes/MusicInfo.cs
@@ -4,6 +4,7 @@ namespace FileFlows.MusicNodes
     {
         public string Language { get; set; }
         public int Track { get; set; }
+        public string Artist { get; set; }
         public string Title { get; set; }
         public string Album { get; set; }
         public DateTime Date { get; set; }
diff --git a/MusicNodes/MusicInfoHelper.cs b/MusicNodes/MusicInfoHelper.cs
index f06d94a2..2ce00a62 100644
--- a/MusicNodes/MusicInfoHelper.cs
+++ b/MusicNodes/MusicInfoHelper.cs
@@ -83,32 +83,34 @@ namespace FileFlows.MusicNodes
                         int colonIndex = line.IndexOf(":");
                         if(colonIndex < 1)
                             continue;
-                        if(line.Trim().StartsWith("Language"))
+                        if(line.Trim().ToLower().StartsWith("language"))
                             mi.Language = line.Substring(colonIndex + 1).Trim();
                         else if (line.Trim().StartsWith("track"))
                         {
                             if (int.TryParse(line.Substring(colonIndex + 1).Trim(), out int value))
                                 mi.Track = value;
                         }
-                        else if (line.Trim().StartsWith("Title"))
+                        else if (line.Trim().ToLower().StartsWith("artist"))
+                            mi.Artist = line.Substring(colonIndex + 1).Trim();
+                        else if (line.Trim().ToLower().StartsWith("title"))
                             mi.Title = line.Substring(colonIndex + 1).Trim();
-                        else if (line.Trim().StartsWith("Album"))
+                        else if (line.Trim().ToLower().StartsWith("album"))
                             mi.Album = line.Substring(colonIndex + 1).Trim();
-                        else if (line.Trim().StartsWith("Date") && mi.Date < new DateTime(1900, 1, 1))
+                        else if (line.Trim().ToLower().StartsWith("date") && mi.Date < new DateTime(1900, 1, 1))
                         {
                             if (int.TryParse(line.Substring(colonIndex + 1).Trim(), out int value))
                                 mi.Date = new DateTime(value, 1, 1);
                         }
-                        else if (line.Trim().StartsWith("Retail Date"))
+                        else if (line.Trim().ToLower().StartsWith("retail date"))
                         {
                             if (DateTime.TryParse(line.Substring(colonIndex + 1).Trim(), out DateTime value))
                                 mi.Date = value;
                         }
-                        else if (line.Trim().StartsWith("Genre"))
+                        else if (line.Trim().ToLower().StartsWith("genre"))
                             mi.Genres = line.Substring(colonIndex + 1).Trim().Split(' ');
-                        else if (line.Trim().StartsWith("Encoder"))
+                        else if (line.Trim().ToLower().StartsWith("encoder"))
                             mi.Encoder = line.Substring(colonIndex + 1).Trim();
-                        else if (line.Trim().StartsWith("Duration"))
+                        else if (line.Trim().ToLower().StartsWith("duration"))
                         {
                             string temp = line.Substring(colonIndex + 1).Trim();
                             if(temp.IndexOf(",") > 0)
diff --git a/MusicNodes/MusicNodes.csproj b/MusicNodes/MusicNodes.csproj
index a2b8d83eac6ccc59863430946fb17baf9409ea75..12f3e567913919446dec1cc4bedea9b64d3dcade 100644
GIT binary patch
delta 36
rcmca5cS~-=6DD>e1``Gw2K~u<nItEF<Kvqw#H_;%6x-~`EXe}^)D8*A

delta 36
rcmca5cS~-=6DD>;21^DT2K~u<nItEF<Kvqw#H_;%6x-~`EXe}^)QSnv