v20180217.1

This commit is contained in:
Steven Hildreth 2019-02-17 10:09:49 -06:00
parent 48bb25106f
commit d25524a741
5 changed files with 9 additions and 6 deletions

View file

@ -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": [
{

View file

@ -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);
}

View file

@ -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,

View file

@ -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",

View file

@ -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": {