more song fixes (#529)

* use blurhash for default etv song backgrounds

* fix saving artwork blurhash

* fix song detail alignment

* rename song background files

* watermark path is always none here

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
+### Fixed
+- Fix bug with saving multiple blurhash versions for cover art; all cover art will be automatically rescanned
+- Fix song detail margin when no cover art exists and no watermark exists
+
+### Changed
+- Use blurhash of ErsatzTV colors instead of solid colors for default song backgrounds
 
 ## [0.3.2-alpha] - 2021-12-03
 ### Fixed

ErsatzTV.Core/FFmpeg/SongVideoGenerator.cs

@@ -54,10 +54,9 @@ namespace ErsatzTV.Core.FFmpeg
             
             string[] backgrounds =
             {
-                "background_blank.png",
+                "song_background_1.png",
-                "background_e.png",
+                "song_background_2.png",
-                "background_t.png",
+                "song_background_3.png"
-                "background_v.png"
             };
 
             // use random ETV color by default
@@ -117,15 +116,18 @@ namespace ErsatzTV.Core.FFmpeg
                 int leftMarginPercent = HORIZONTAL_MARGIN_PERCENT;
                 int rightMarginPercent = HORIZONTAL_MARGIN_PERCENT;
 
-                switch (watermarkLocation)
+                if (metadata.Artwork.Any(a => a.ArtworkKind == ArtworkKind.Thumbnail))
                 {
-                    case ChannelWatermarkLocation.BottomLeft:
+                    switch (watermarkLocation)
-                        leftMarginPercent += WATERMARK_WIDTH_PERCENT + HORIZONTAL_MARGIN_PERCENT;
+                    {
-                        break;
+                        case ChannelWatermarkLocation.BottomLeft:
-                    case ChannelWatermarkLocation.BottomRight:
+                            leftMarginPercent += WATERMARK_WIDTH_PERCENT + HORIZONTAL_MARGIN_PERCENT;
-                        leftMarginPercent = rightMarginPercent = HORIZONTAL_MARGIN_PERCENT;
+                            break;
-                        rightMarginPercent += WATERMARK_WIDTH_PERCENT + HORIZONTAL_MARGIN_PERCENT;
+                        case ChannelWatermarkLocation.BottomRight:
-                        break;
+                            leftMarginPercent = rightMarginPercent = HORIZONTAL_MARGIN_PERCENT;
+                            rightMarginPercent += WATERMARK_WIDTH_PERCENT + HORIZONTAL_MARGIN_PERCENT;
+                            break;
+                    }
                 }
 
                 var leftMargin = (int)Math.Round(leftMarginPercent / 100.0 * channel.FFmpegProfile.Resolution.Width);

ErsatzTV.Infrastructure/Data/Repositories/MetadataRepository.cs

@@ -209,7 +209,7 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
 
         public Task<Unit> UpdateArtworkPath(Artwork artwork) =>
             _dbConnection.ExecuteAsync(
-                "UPDATE Artwork SET Path = @Path, SourcePath = @SourcePath, DateUpdated = @DateUpdated, BlurHash43 = @BlurHash43, BlurHash43 = @BlurHash54, BlurHash43 = @BlurHash64 WHERE Id = @Id",
+                "UPDATE Artwork SET Path = @Path, SourcePath = @SourcePath, DateUpdated = @DateUpdated, BlurHash43 = @BlurHash43, BlurHash54 = @BlurHash54, BlurHash64 = @BlurHash64 WHERE Id = @Id",
                 new { artwork.Path, artwork.SourcePath, artwork.DateUpdated, artwork.BlurHash43, artwork.BlurHash54, artwork.BlurHash64, artwork.Id }).ToUnit();
 
         public Task<Unit> AddArtwork(Metadata metadata, Artwork artwork)

ErsatzTV.Infrastructure/Migrations/20211204191304_Reset_SongMetadataBlurHashProper.cs

@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Reset_SongMetadataBlurHashProper : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql(
+                @"UPDATE LibraryPath SET LastScan = '0001-01-01 00:00:00' WHERE Id IN
+                (SELECT LP.Id FROM LibraryPath LP INNER JOIN Library L on L.Id = LP.LibraryId WHERE MediaKind = 5)");
+
+            migrationBuilder.Sql(
+                @"UPDATE Library SET LastScan = '0001-01-01 00:00:00' WHERE MediaKind = 5");
+
+            migrationBuilder.Sql(
+                @"UPDATE Artwork SET DateUpdated = '0001-01-01 00:00:00' WHERE SongMetadataId IS NOT NULL");
+            
+            migrationBuilder.Sql(
+                @"UPDATE LibraryFolder SET Etag = NULL WHERE Id IN
+                (SELECT LF.Id FROM LibraryFolder LF INNER JOIN LibraryPath LP on LF.LibraryPathId = LP.Id INNER JOIN Library L on LP.LibraryId = L.Id WHERE MediaKind = 5)");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

ErsatzTV/ErsatzTV.csproj

@@ -51,10 +51,9 @@
 
     <ItemGroup>
       <EmbeddedResource Include="Resources\background.png" />
-      <EmbeddedResource Include="Resources\background_blank.png" />
+      <EmbeddedResource Include="Resources\song_background_1.png" />
-      <EmbeddedResource Include="Resources\background_e.png" />
+      <EmbeddedResource Include="Resources\song_background_2.png" />
-      <EmbeddedResource Include="Resources\background_t.png" />
+      <EmbeddedResource Include="Resources\song_background_3.png" />
-      <EmbeddedResource Include="Resources\background_v.png" />
       <EmbeddedResource Include="Resources\ErsatzTV.png" />
       <EmbeddedResource Include="Resources\Roboto-Regular.ttf" />
       <EmbeddedResource Include="Resources\OPTIKabel-Heavy.otf" />

ErsatzTV/Services/RunOnce/ResourceExtractorService.cs

@@ -19,10 +19,9 @@ namespace ErsatzTV.Services.RunOnce
             Assembly assembly = typeof(ResourceExtractorService).GetTypeInfo().Assembly;
 
             await ExtractResource(assembly, "background.png", cancellationToken);
-            await ExtractResource(assembly, "background_blank.png", cancellationToken);
+            await ExtractResource(assembly, "song_background_1.png", cancellationToken);
-            await ExtractResource(assembly, "background_e.png", cancellationToken);
+            await ExtractResource(assembly, "song_background_2.png", cancellationToken);
-            await ExtractResource(assembly, "background_t.png", cancellationToken);
+            await ExtractResource(assembly, "song_background_3.png", cancellationToken);
-            await ExtractResource(assembly, "background_v.png", cancellationToken);
             await ExtractResource(assembly, "ErsatzTV.png", cancellationToken);
             await ExtractResource(assembly, "Roboto-Regular.ttf", cancellationToken);
             await ExtractResource(assembly, "OPTIKabel-Heavy.otf", cancellationToken);