From a370108b64990a9ed972db467ba66928275b9b15 Mon Sep 17 00:00:00 2001 From: Steven Hildreth Date: Sat, 9 Nov 2019 11:43:39 -0600 Subject: [PATCH] resolves #30 --- Inspector/Inspector.csproj | 2 +- .../FolderPathHelperTests.cs | 141 ++++++++++ Roadie.Api.Library.Tests/ImageHasherTests.cs | 5 + Roadie.Api.Library.Tests/ImageHelperTests.cs | 2 +- .../Roadie.Library.Tests.csproj | 4 +- .../StringExtensionTests.cs | 3 +- Roadie.Api.Library/Data/ArtistPartial.cs | 2 +- Roadie.Api.Library/Data/LabelPartial.cs | 13 +- Roadie.Api.Library/Data/Release.cs | 6 + Roadie.Api.Library/Data/ReleasePartial.cs | 7 +- .../Engines/ArtistLookupEngine.cs | 33 --- .../Engines/LabelLookupEngine.cs | 8 +- .../Engines/ReleaseLookupEngine.cs | 9 - Roadie.Api.Library/Enums/Statuses.cs | 2 + Roadie.Api.Library/Extensions/StringExt.cs | 23 +- Roadie.Api.Library/FilePlugins/Audio.cs | 18 +- Roadie.Api.Library/Imaging/ImageHelper.cs | 8 +- Roadie.Api.Library/Inspect/Inspector.cs | 2 +- Roadie.Api.Library/Models/Releases/Release.cs | 2 + Roadie.Api.Library/Roadie.Library.csproj | 16 +- .../Utility/FolderPathHelper.cs | 258 +++++++++++++----- Roadie.Api.Library/Utility/PathSanitizer.cs | 22 +- Roadie.Api.Services/AdminService.cs | 208 +++++++++++++- Roadie.Api.Services/ArtistService.cs | 10 +- Roadie.Api.Services/BookmarkService.cs | 2 +- Roadie.Api.Services/IAdminService.cs | 4 +- Roadie.Api.Services/IArtistService.cs | 2 +- Roadie.Api.Services/ReleaseService.cs | 11 +- .../Roadie.Api.Services.csproj | 2 +- Roadie.Api/Controllers/AdminController.cs | 20 +- Roadie.Api/Roadie.Api.csproj | 2 +- Roadie.Dlna.Services/DlnaService.cs | 4 +- Roadie.sln | 1 + Upgrade0007.sql | 2 + roadie.sql | 1 + 35 files changed, 687 insertions(+), 168 deletions(-) create mode 100644 Roadie.Api.Library.Tests/FolderPathHelperTests.cs create mode 100644 Upgrade0007.sql diff --git a/Inspector/Inspector.csproj b/Inspector/Inspector.csproj index a1ea8fc..a79abbe 100644 --- a/Inspector/Inspector.csproj +++ b/Inspector/Inspector.csproj @@ -21,7 +21,7 @@ - + diff --git a/Roadie.Api.Library.Tests/FolderPathHelperTests.cs b/Roadie.Api.Library.Tests/FolderPathHelperTests.cs new file mode 100644 index 0000000..3f48e7c --- /dev/null +++ b/Roadie.Api.Library.Tests/FolderPathHelperTests.cs @@ -0,0 +1,141 @@ +using Microsoft.Extensions.Configuration; +using Roadie.Library.Configuration; +using Roadie.Library.Utility; +using System.IO; +using Xunit; + +namespace Roadie.Library.Tests +{ + public class FolderPathHelperTests + { + private IRoadieSettings Configuration { get; } + + public FolderPathHelperTests() + { + var settings = new RoadieSettings(); + IConfigurationBuilder configurationBuilder = new ConfigurationBuilder(); + configurationBuilder.AddJsonFile("appsettings.test.json"); + IConfiguration configuration = configurationBuilder.Build(); + configuration.GetSection("RoadieSettings").Bind(settings); + this.Configuration = settings; + } + + [Theory] + [InlineData("Bob Jones", 1, @"B\BO\Bob Jones [1]")] + [InlineData("Smith, Angie", 2, @"S\SM\Smith, Angie [2]")] + [InlineData("Blues Traveler", 89, @"B\BL\Blues Traveler [89]")] + [InlineData("Scott, Travis", 3, @"S\SC\Scott, Travis [3]")] + [InlineData("Straight, George", 783, @"S\ST\Straight, George [783]")] + [InlineData("Good! Times?", 213, @"G\GO\Good Times [213]")] + [InlineData("3rd Attempt, The", 56, @"0\3R\3rd Attempt, The [56]")] + [InlineData("3Oh!3", 589, @"0\3O\3oh3 [589]")] + [InlineData(" 3OH!3", 589, @"0\3O\3oh3 [589]")] + [InlineData("3oh!3 ", 589, @"0\3O\3oh3 [589]")] + [InlineData("B", 3423, @"B\B\B [3423]")] + [InlineData("BB", 3423, @"B\BB\Bb [3423]")] + [InlineData("Bad.Boys.Club", 433423, @"B\BA\Bad Boys Club [433423]")] + [InlineData("Bad_Boys_Club", 433423, @"B\BA\Bad Boys Club [433423]")] + [InlineData("Bad.Boys Club", 433423, @"B\BA\Bad Boys Club [433423]")] + [InlineData("Bad~Boys~Club", 433423, @"B\BA\Bad Boys Club [433423]")] + [InlineData("Bad-Boys=Club", 433423, @"B\BA\Bad Boys Club [433423]")] + [InlineData("Bad.Boys~Club_2", 433423, @"B\BA\Bad Boys Club 2 [433423]")] + [InlineData("13", 43234, @"0\13\13 [43234]")] + [InlineData("69 Eyes, The", 123, @"0\69\69 Eyes, The [123]")] + [InlineData("2 Unlimited", 234, @"0\2U\2 Unlimited [234]")] + [InlineData("A Flock Of Seagulls", 567, @"A\AF\A Flock Of Seagulls [567]")] + [InlineData("1975, The", 23, @"0\19\1975, The [23]")] + [InlineData("1914", 89, @"0\19\1914 [89]")] + [InlineData("13th Floor Elevators, The", 24, @"0\13\13th Floor Elevators, The [24]")] + [InlineData("13TH FLOOR ELEVATORS, THE", 24, @"0\13\13th Floor Elevators, The [24]")] + [InlineData("13th floor elevators, the", 24, @"0\13\13th Floor Elevators, The [24]")] + [InlineData("3 Doors Down", 11111111, @"0\3D\3 Doors Down [11111111]")] + [InlineData(" 3 Doors Down", 11111111, @"0\3D\3 Doors Down [11111111]")] + [InlineData("01234567890123456789012345678901234567890123456789", 123, @"0\01\01234567890123456789012345678901234567890123456789 [123]")] + [InlineData("012345678901234567890", 1111111111, @"0\01\012345678901234567890 [1111111111]")] + [InlineData("Royce Da 5'9\"", 876, @"R\RO\Royce Da 59 [876]")] + [InlineData("8", 434, @"0\8\8 [434]")] + [InlineData("Hay, Colin", 888, @"H\HA\Hay, Colin [888]")] + [InlineData("Ty Dolla $Ign", 6542, @"T\TY\Ty Dolla Sign [6542]")] // + [InlineData("Panic! At The Disco", 32, @"P\PA\Panic At The Disco [32]")] + [InlineData("Ke$ha", 98, @"K\KE\Kesha [98]")] + [InlineData("(Whispers)", 432, @"W\WH\Whispers [432]")] + [InlineData("Whiskers, John \"Catfish\"", 32342, @"W\WH\Whiskers, John Catfish [32342]")] + [InlineData("'68", 54321, @"0\68\68 [54321]")] + [InlineData("2Pac", 987654321, @"0\2P\2pac [987654321]")] + [InlineData("007 Superhero", 1, @"0\00\007 Superhero [1]")] + [InlineData("4 Non Blondes", 666, @"0\4N\4 Non Blondes [666]")] + [InlineData("Dream Theater", 99, @"D\DR\Dream Theater [99]")] + [InlineData("A.X.E. Project, The", 100, @"A\AX\A X E Project, The [100]")] + [InlineData("IRON MAIDEN", 9909, @"I\IR\Iron Maiden [9909]")] + [InlineData("iRoN MaiDEn", 9909, @"I\IR\Iron Maiden [9909]")] + [InlineData(" iRoN MaiDEn ", 9909, @"I\IR\Iron Maiden [9909]")] + [InlineData(" i R o N M a i D E n ", 9909, @"I\IR\I R O N M A I D E N [9909]")] + [InlineData("iron maiden", 9909, @"I\IR\Iron Maiden [9909]")] + [InlineData("Dreamside, The", 85, @"D\DR\Dreamside, The [85]")] + [InlineData("Stacy & Tom", 41, @"S\ST\Stacy And Tom [41]")] + [InlineData("A! Whack To The Head", 2111, @"A\AW\A Whack To The Head [2111]")] + [InlineData("!WHACKO!", 2112, @"W\WH\Whacko [2112]")] + [InlineData("Öysterhead", 7653, @"O\OY\Oysterhead [7653]")] + [InlineData("Öystërheäd", 7653, @"O\OY\Oysterhead [7653]")] + [InlineData("2Nu", 7653, @"0\2N\2nu [7653]")] + [InlineData("!SÖmëthing el$e", 73223, @"S\SO\Something Else [73223]")] + [InlineData("McDonald, Audra", 1232, @"M\MC\McDonald, Audra [1232]")] + [InlineData("McKnight, Brian", 1233, @"M\MC\McKnight, Brian [1233]")] + [InlineData("Womack, Lee Ann", 1234, @"W\WO\Womack, Lee Ann [1234]")] + [InlineData("At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non providenta", 123456789, @"A\AT\At Vero Eos Et Accusamus Et Iusto Odio Dignissimos Ducimus Qui Blanditiis Praesent [123456789]")] + public void GenerateArtistFolderNames(string input, int artistId, string shouldBe) + { + var artistFolder = FolderPathHelper.ArtistPath(Configuration, artistId, input); + var t = new DirectoryInfo(Path.Combine(Configuration.LibraryFolder, shouldBe)); + Assert.Equal(t.FullName, artistFolder); + } + + [Theory] + [InlineData("!SÖmëthing el$e", @"S\SO")] + [InlineData("A&M Records", @"A\AA")] + [InlineData("A!M Records", @"A\AM")] + [InlineData("Aware Records", @"A\AW")] + [InlineData("Jive", @"J\JI")] + [InlineData("Le Plan", @"L\LE")] + [InlineData("42 Records", @"0\42")] + public void GenerateLabelFolderNames(string input, string shouldBe) + { + var artistFolder = FolderPathHelper.LabelPath(Configuration, input); + var t = new DirectoryInfo(Path.Combine(Configuration.LabelImageFolder, shouldBe)); + Assert.Equal(t.FullName, artistFolder); + } + + [Theory] + [InlineData("What Dreams May Come", "01/15/2004", @"D\DR\Dream Theater [99]", @"D\DR\Dream Theater [99]\[2004] What Dreams May Come")] + [InlineData("Killers", "01/01/1980", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1980] Killers")] + [InlineData("Original Hits (80S 12'') (72 Original Hits) Cd 5", "01/01/1980", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1980] Original Hits 80s 12 72 Original Hits Cd 5")] + [InlineData("Vices & Virtues", "01/01/1973", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1973] Vices And Virtues")] + [InlineData("Pretty, Odd.", "01/01/1973", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1973] Pretty, Odd.")] + [InlineData(" !A Pretty Odd Day", "01/01/1973", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1973] A Pretty Odd Day")] + [InlineData("A.Pretty~Odd=Day", "01/01/1973", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1973] A Pretty Odd Day")] + [InlineData("A", "01/01/1973", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1973] A")] + [InlineData("X", "01/01/1973", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1973] X")] + [InlineData("Done-Over", "01/01/1973", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1973] Done Over")] + [InlineData("%", "01/01/1973", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1973] Per")] + [InlineData("The Blues Brothers: Music From The Soundtrack", "01/01/1973", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1973] The Blues Brothers Music From The Soundtrack")] + [InlineData("14", "01/01/1973", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1973] 14")] + [InlineData(@"12\18\2103", "01/01/1973", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1973] 12182103")] + [InlineData(@"Insect Warfare / The Kill", "01/01/1973", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1973] Insect Warfare The Kill")] + [InlineData("Live (1955)", "01/01/1973", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1973] Live 1955")] + [InlineData("We're Only In It For The Money", "01/01/1968", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1968] Were Only In It For The Money")] + [InlineData("Rock \"N Roll High School", "01/01/1968", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1968] Rock N Roll High School")] + [InlineData("1958-1959 Dr. Jekyll (With Cannonball Adderley)", "01/01/1968", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1968] 1958 1959 Dr Jekyll With Cannonball Adderley")] + [InlineData("Hello, Dolly!", "01/01/1968", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1968] Hello, Dolly")] + [InlineData("Deäth", "01/01/1981", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1981] Death")] + [InlineData("Sinatra's Swingin' Session!!! And More", "01/01/1981", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1981] Sinatras Swingin Session And More")] + [InlineData("01234567890123456789012345678901234567890123456789", "01/01/1974", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1974] 01234567890123456789012345678901234567890123456789")] + [InlineData("At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non providenta", "01/01/1975", @"I\IR\Iron Maiden [9909]", @"I\IR\Iron Maiden [9909]\[1975] At Vero Eos Et Accusamus Et Iusto Odio Dignissimos Ducimus Qui Blanditiis Praesentium Volupta")] + public void GenerateReleaseFolderNames(string input, string releaseDate, string artistFolder, string shouldBe) + { + var af = new DirectoryInfo(Path.Combine(Configuration.LibraryFolder, artistFolder)); + var releaseFolder = FolderPathHelper.ReleasePath(af.FullName, input, SafeParser.ToDateTime(releaseDate).Value); + var t = new DirectoryInfo(Path.Combine(Configuration.LibraryFolder, shouldBe)); + Assert.Equal(t.FullName, releaseFolder); + } + } +} \ No newline at end of file diff --git a/Roadie.Api.Library.Tests/ImageHasherTests.cs b/Roadie.Api.Library.Tests/ImageHasherTests.cs index 8ce56c9..36bf4ec 100644 --- a/Roadie.Api.Library.Tests/ImageHasherTests.cs +++ b/Roadie.Api.Library.Tests/ImageHasherTests.cs @@ -1,5 +1,6 @@ using Roadie.Library.Imaging; using System; +using System.IO; using Xunit; namespace Roadie.Library.Tests @@ -9,6 +10,10 @@ public class ImageHasherTests [Fact] public void GenerateImageHash() { + if(!Directory.Exists(@"C:\temp\image_tests")) + { + return; + } var imageFilename = @"C:\temp\image_tests\1.jpg"; var secondImagFilename = @"C:\temp\image_tests\2.jpg"; var resizedFirstImageFilename = @"C:\temp\image_tests\1-resized.jpg"; diff --git a/Roadie.Api.Library.Tests/ImageHelperTests.cs b/Roadie.Api.Library.Tests/ImageHelperTests.cs index 17c1e17..7acda3f 100644 --- a/Roadie.Api.Library.Tests/ImageHelperTests.cs +++ b/Roadie.Api.Library.Tests/ImageHelperTests.cs @@ -413,7 +413,7 @@ join a in context.Artists on i.ArtistId equals a.Id } context.SaveChanges(); - foreach (var release in context.Releases.Include(x => x.Artist).Where(x => x.Thumbnail != null).OrderBy(x => x.Title)) + foreach (var release in context.Releases.Include(x => x.Artist).Where(x => x.Thumbnail != null).OrderBy(x => x.SortTitle ?? x.Title)) { var artistFolder = release.Artist.ArtistFileFolder(settings); var releaseFolder = release.ReleaseFileFolder(artistFolder); diff --git a/Roadie.Api.Library.Tests/Roadie.Library.Tests.csproj b/Roadie.Api.Library.Tests/Roadie.Library.Tests.csproj index f580f23..c8d1397 100644 --- a/Roadie.Api.Library.Tests/Roadie.Library.Tests.csproj +++ b/Roadie.Api.Library.Tests/Roadie.Library.Tests.csproj @@ -24,8 +24,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all diff --git a/Roadie.Api.Library.Tests/StringExtensionTests.cs b/Roadie.Api.Library.Tests/StringExtensionTests.cs index df07174..6886e7f 100644 --- a/Roadie.Api.Library.Tests/StringExtensionTests.cs +++ b/Roadie.Api.Library.Tests/StringExtensionTests.cs @@ -244,7 +244,8 @@ public void TestRegexString(string input) [InlineData("Colin Hay!", "colinhay")] [InlineData("colinhay", "colinhay")] [InlineData("COLINHAY", "colinhay")] - [InlineData("C.O!L"I$N⌐HƒAY;", "colinhay")] + [InlineData("C.O!L"IN⌐HƒAY;", "colinhay")] + [InlineData("$tacy $exp0t", "stacysexp0t")] [InlineData(" Leslie & Tom", "leslieandtom")] [InlineData("Leslie & Tom", "leslieandtom")] [InlineData("Leslie;/&/;Tom", "leslieandtom")] diff --git a/Roadie.Api.Library/Data/ArtistPartial.cs b/Roadie.Api.Library/Data/ArtistPartial.cs index 253f870..7754cc1 100644 --- a/Roadie.Api.Library/Data/ArtistPartial.cs +++ b/Roadie.Api.Library/Data/ArtistPartial.cs @@ -50,7 +50,7 @@ public static string CacheUrnByName(string name) public string ArtistFileFolder(IRoadieSettings configuration) { - return FolderPathHelper.ArtistPath(configuration, SortNameValue); + return FolderPathHelper.ArtistPath(configuration, Id, SortNameValue); } public override string ToString() diff --git a/Roadie.Api.Library/Data/LabelPartial.cs b/Roadie.Api.Library/Data/LabelPartial.cs index 49bfa2e..5bcf372 100644 --- a/Roadie.Api.Library/Data/LabelPartial.cs +++ b/Roadie.Api.Library/Data/LabelPartial.cs @@ -23,12 +23,23 @@ public string Etag } } + public string SortNameValue => string.IsNullOrEmpty(SortName) ? Name : SortName; + /// /// Returns a full file path to the Label Image /// public string PathToImage(IRoadieSettings configuration) { - return Path.Combine(configuration.LabelImageFolder, $"{ (SortName ?? Name).ToFileNameFriendly() } [{ Id }].jpg"); + return Path.Combine(FolderPathHelper.LabelPath(configuration, SortNameValue), $"{ SortNameValue.ToFileNameFriendly() } [{ Id }].jpg"); + } + + /// + /// Returns a full file path to the Label Image + /// + [Obsolete("This is only here for migration will be removed in future release.")] + public string OldPathToImage(IRoadieSettings configuration) + { + return Path.Combine(configuration.LabelImageFolder, $"{ SortNameValue.ToFileNameFriendly() } [{ Id }].jpg"); } public bool IsValid => !string.IsNullOrEmpty(Name); diff --git a/Roadie.Api.Library/Data/Release.cs b/Roadie.Api.Library/Data/Release.cs index 007d1c5..4cdb689 100644 --- a/Roadie.Api.Library/Data/Release.cs +++ b/Roadie.Api.Library/Data/Release.cs @@ -91,6 +91,12 @@ public partial class Release : EntityBase [Required] public string Title { get; set; } + [MaxLength(250)] + [Column("sortTitle")] + public string SortTitle { get; set; } + + public string SortTitleValue => string.IsNullOrEmpty(SortTitle) ? Title : SortTitle; + [Column("trackCount")] public short TrackCount { get; set; } [Column("urls", TypeName = "text")] diff --git a/Roadie.Api.Library/Data/ReleasePartial.cs b/Roadie.Api.Library/Data/ReleasePartial.cs index 218273c..87a634a 100644 --- a/Roadie.Api.Library/Data/ReleasePartial.cs +++ b/Roadie.Api.Library/Data/ReleasePartial.cs @@ -102,14 +102,11 @@ public bool IsReleaseTypeOf(string type, bool doCheckTitles = false) /// /// /// - public string ReleaseFileFolder(string artistFolder) - { - return FolderPathHelper.ReleasePath(artistFolder, Title, ReleaseDate.Value); - } + public string ReleaseFileFolder(string artistFolder) => FolderPathHelper.ReleasePath(artistFolder, SortTitleValue, ReleaseDate.Value); public override string ToString() { - return $"Id [{Id}], Status [{ Status }], LibraryStatus [{ LibraryStatus }], Title [{Title}], Release Date [{ReleaseYear}]"; + return $"Id [{Id}], Status [{ Status }], LibraryStatus [{ LibraryStatus }], Title [{Title}], SortTitle [{ SortTitleValue }], Release Date [{ReleaseYear}]"; } } } \ No newline at end of file diff --git a/Roadie.Api.Library/Engines/ArtistLookupEngine.cs b/Roadie.Api.Library/Engines/ArtistLookupEngine.cs index e030d22..19af09a 100644 --- a/Roadie.Api.Library/Engines/ArtistLookupEngine.cs +++ b/Roadie.Api.Library/Engines/ArtistLookupEngine.cs @@ -72,20 +72,6 @@ public async Task> Add(Artist artist) artist.AlternateNames = artist.AlternateNames.AddToDelimitedList(new[] { artist.Name.ToAlphanumericName() }); artist.Genres = null; artist.Images = null; - if (artist.Thumbnail == null && ArtistImages != null) - { - // Set the thumbnail to the first image - var firstImageWithNotNullBytes = ArtistImages.Where(x => x.Bytes != null).FirstOrDefault(); - if (firstImageWithNotNullBytes != null) - { - artist.Thumbnail = firstImageWithNotNullBytes.Bytes; - if (artist.Thumbnail != null) - { - artist.Thumbnail = ImageHelper.ResizeToThumbnail(artist.Thumbnail, Configuration); - } - } - } - if (!artist.IsValid) { return new OperationResult @@ -93,10 +79,6 @@ public async Task> Add(Artist artist) Errors = new Exception[1] { new Exception("Artist is Invalid") } }; } - if (artist.Thumbnail != null) - { - artist.Thumbnail = ImageHelper.ResizeToThumbnail(artist.Thumbnail, Configuration); - } var addArtistResult = DbContext.Artists.Add(artist); var inserted = 0; inserted = await DbContext.SaveChangesAsync(); @@ -378,9 +360,6 @@ public async Task> PerformMetaDataProvidersArtistSearch( BeginDate = i.BeginDate, Name = result.Name ?? i.ArtistName, SortName = result.SortName ?? i.ArtistSortName, - Thumbnail = i.ArtistThumbnailUrl != null - ? WebHelper.BytesForImageUrl(i.ArtistThumbnailUrl) - : null, ArtistType = result.ArtistType ?? i.ArtistType }); } @@ -443,9 +422,6 @@ public async Task> PerformMetaDataProvidersArtistSearch( BeginDate = mb.BeginDate, Name = result.Name ?? mb.ArtistName, SortName = result.SortName ?? mb.ArtistSortName, - Thumbnail = mb.ArtistThumbnailUrl != null - ? WebHelper.BytesForImageUrl(mb.ArtistThumbnailUrl) - : null, ArtistType = mb.ArtistType }); } @@ -488,9 +464,6 @@ public async Task> PerformMetaDataProvidersArtistSearch( BeginDate = l.BeginDate, Name = result.Name ?? l.ArtistName, SortName = result.SortName ?? l.ArtistSortName, - Thumbnail = l.ArtistThumbnailUrl != null - ? WebHelper.BytesForImageUrl(l.ArtistThumbnailUrl) - : null, ArtistType = result.ArtistType ?? l.ArtistType }); } @@ -530,9 +503,6 @@ public async Task> PerformMetaDataProvidersArtistSearch( BeginDate = s.BeginDate, Name = result.Name ?? s.ArtistName, SortName = result.SortName ?? s.ArtistSortName, - Thumbnail = s.ArtistThumbnailUrl != null - ? WebHelper.BytesForImageUrl(s.ArtistThumbnailUrl) - : null, ArtistType = result.ArtistType ?? s.ArtistType }); } @@ -573,9 +543,6 @@ public async Task> PerformMetaDataProvidersArtistSearch( DiscogsId = d.DiscogsId, Name = result.Name ?? d.ArtistName, RealName = result.RealName ?? d.ArtistRealName, - Thumbnail = d.ArtistThumbnailUrl != null - ? WebHelper.BytesForImageUrl(d.ArtistThumbnailUrl) - : null, ArtistType = result.ArtistType ?? d.ArtistType }); } diff --git a/Roadie.Api.Library/Engines/LabelLookupEngine.cs b/Roadie.Api.Library/Engines/LabelLookupEngine.cs index f44e880..e93048c 100644 --- a/Roadie.Api.Library/Engines/LabelLookupEngine.cs +++ b/Roadie.Api.Library/Engines/LabelLookupEngine.cs @@ -4,7 +4,6 @@ using Roadie.Library.Data; using Roadie.Library.Encoding; using Roadie.Library.Extensions; -using Roadie.Library.Imaging; using Roadie.Library.SearchEngines.MetaData; using Roadie.Library.Utility; using System; @@ -35,10 +34,6 @@ public async Task> Add(Label label) { var now = DateTime.UtcNow; label.AlternateNames = label.AlternateNames.AddToDelimitedList(new[] { label.Name.ToAlphanumericName() }); - if (label.Thumbnail != null) - { - label.Thumbnail = ImageHelper.ResizeToThumbnail(label.Thumbnail, Configuration); - } if (!label.IsValid) { return new OperationResult