From d25524a7411386bad2f84d890c17154cff8e9842 Mon Sep 17 00:00:00 2001
From: Steven Hildreth <steven@hildreth.email>
Date: Sun, 17 Feb 2019 10:09:49 -0600
Subject: [PATCH] v20180217.1

---
 Inspector/appsettings.json                                   | 2 +-
 Roadie.Api.Library.Tests/StringExtensionTests.cs             | 4 ++--
 .../SearchEngines/MetaData/ID3Tags/ID3TagsHelper.cs          | 5 ++++-
 Roadie.Api/appsettings.Development.json                      | 2 +-
 Roadie.Api/appsettings.json                                  | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Inspector/appsettings.json b/Inspector/appsettings.json
index 38a0675..7519648 100644
--- a/Inspector/appsettings.json
+++ b/Inspector/appsettings.json
@@ -58,7 +58,7 @@
       "MaximumArtistImagesToAdd": 12,
       "MaximumReleaseImagesToAdd": 12,
       "MaxImageWidth": 2048,
-      "ReleaseRemoveStringsRegex": "(\\s*(-\\s)*((CD[0-9][0-9]*)))|((\\(|\\[)+([0-9]|,|self|bonus|released|th|anniversary|re|release|cd|disc|deluxe|digipack|vinyl|japanese|asian|remastered|limited|expanded|edition|\\s)+(]|\\)))",
+      "ReleaseRemoveStringsRegex": "(\\s*(-\\s)*((CD[0-9][0-9]*)))|((\\(|\\[)+([0-9]|,|self|bonus|re(leas|master|(e|d)*)*|th|anniversary|cd|disc|deluxe|dig(ipack)*|vinyl|japan(ese)*|asian|remastered|limited|ltd|expanded|edition|\\s)+(]|\\)*))",
       "TrackRemoveStringsRegex": "^([0-9]+)(\\.|-|\\s)*",
       "ReplaceStrings": [
         {
diff --git a/Roadie.Api.Library.Tests/StringExtensionTests.cs b/Roadie.Api.Library.Tests/StringExtensionTests.cs
index dcc82ef..87cd3d3 100644
--- a/Roadie.Api.Library.Tests/StringExtensionTests.cs
+++ b/Roadie.Api.Library.Tests/StringExtensionTests.cs
@@ -184,7 +184,6 @@ namespace Roadie.Library.Tests
         [InlineData("Angie - CD1")]
         [InlineData("Angie (Limited Edition)")]
         [InlineData("Angie (Deluxe)")]
-        [InlineData("Angie (Deluxe")]
         [InlineData("Angie (Remastered Deluxe Edition)")]
         [InlineData("Angie (Remastered Deluxe)")]
         [InlineData("Angie ( Deluxe )")]
@@ -204,10 +203,11 @@ namespace Roadie.Library.Tests
         [InlineData("Angie (Re Release 2003)")]
         [InlineData("Angie [2006, Self Released]")]
         [InlineData("Angie (2002 Expanded Edition)")]
+        [InlineData("Angie (2004 Remastered)")]
         [InlineData("Angie (Japan Ltd Dig")]
         public void CleanString_Release_Should_Be_Angie(string input)
         {
-            var r = @"(\\s*(-\\s)*((CD[0-9][0-9]*)))|((\\(|\\[)+([0-9]|,|self|bonus|released|th|anniversary|re|release|cd|disc|deluxe|digipack|vinyl|japanese|asian|remastered|limited|expanded|edition|\\s)+(]|\\)))";
+            var r = @"(\s*(-\s)*((CD[0-9][0-9]*)))|((\(|\[)+([0-9]|,|self|bonus|re(leas|master|(e|d)*)*|th|anniversary|cd|disc|deluxe|dig(ipack)*|vinyl|japan(ese)*|asian|remastered|limited|ltd|expanded|edition|\s)+(]|\)*))";
             var cleaned = input.CleanString(this.Configuration, r);
             Assert.Equal("Angie", cleaned);
         }
diff --git a/Roadie.Api.Library/SearchEngines/MetaData/ID3Tags/ID3TagsHelper.cs b/Roadie.Api.Library/SearchEngines/MetaData/ID3Tags/ID3TagsHelper.cs
index 79a41f0..47d96fc 100644
--- a/Roadie.Api.Library/SearchEngines/MetaData/ID3Tags/ID3TagsHelper.cs
+++ b/Roadie.Api.Library/SearchEngines/MetaData/ID3Tags/ID3TagsHelper.cs
@@ -159,7 +159,10 @@ namespace Roadie.Library.MetaData.ID3Tags
                 result.AudioBitrate = (int?)theTrack.Bitrate;
                 result.AudioSampleRate = (int)theTrack.Bitrate;
                 result.Disk = theTrack.DiscNumber;
-                result.DiskSubTitle = theTrack.AdditionalFields["TSST"];
+                if (theTrack.AdditionalFields.ContainsKey("TSST"))
+                {
+                    result.DiskSubTitle = theTrack.AdditionalFields["TSST"];
+                }
                 result.Images = theTrack.EmbeddedPictures?.Select(x => new AudioMetaDataImage
                 {
                     Data = x.PictureData,
diff --git a/Roadie.Api/appsettings.Development.json b/Roadie.Api/appsettings.Development.json
index 93d7e70..a14aa5c 100644
--- a/Roadie.Api/appsettings.Development.json
+++ b/Roadie.Api/appsettings.Development.json
@@ -48,7 +48,7 @@
     "Audience": "http://localhost:5500"
   },
   "ConnectionStrings": {
-    "RoadieDatabaseConnection": "server=voyager;userid=roadie;password=MenAtW0rk668;persistsecurityinfo=True;database=roadie_dev;ConvertZeroDateTime=true;Max Pool Size=200;"
+    "RoadieDatabaseConnection": "server=voyager;userid=roadie;password=MenAtW0rk668;persistsecurityinfo=True;database=roadie_dev;ConvertZeroDateTime=true;Max Pool Size=200;default command timeout=180;"
   },
   "RoadieSettings": {
     "SiteName": "Roadie",
diff --git a/Roadie.Api/appsettings.json b/Roadie.Api/appsettings.json
index fc06c1a..37183b9 100644
--- a/Roadie.Api/appsettings.json
+++ b/Roadie.Api/appsettings.json
@@ -48,7 +48,7 @@
     "Audience": "http://localhost:5500"
   },
   "ConnectionStrings": {
-    "RoadieDatabaseConnection": "server=voyager;userid=roadie;password=MenAtW0rk668;persistsecurityinfo=True;database=roadie;ConvertZeroDateTime=true;Max Pool Size=200;"
+    "RoadieDatabaseConnection": "server=voyager;userid=roadie;password=MenAtW0rk668;persistsecurityinfo=True;database=roadie;ConvertZeroDateTime=true;Max Pool Size=200;default command timeout=180;"
   },
   "CORSOrigins": "http://localhost:8080|https://localhost:8080|http://localhost:80|https://localhost:80",
   "RoadieSettings": {