diff --git a/ErsatzTV.Application/Images/Queries/GetImageContents.cs b/ErsatzTV.Application/Images/Queries/GetImageContents.cs index 7ef245322..b1ef0ed46 100644 --- a/ErsatzTV.Application/Images/Queries/GetImageContents.cs +++ b/ErsatzTV.Application/Images/Queries/GetImageContents.cs @@ -5,5 +5,6 @@ using MediatR; namespace ErsatzTV.Application.Images.Queries { - public record GetImageContents(string FileName, ArtworkKind ArtworkKind, int? MaxHeight = null) : IRequest>; + public record GetImageContents + (string FileName, ArtworkKind ArtworkKind, int? MaxHeight = null) : IRequest>; } diff --git a/ErsatzTV.Application/Television/Mapper.cs b/ErsatzTV.Application/Television/Mapper.cs index e18fc9368..77aec13b9 100644 --- a/ErsatzTV.Application/Television/Mapper.cs +++ b/ErsatzTV.Application/Television/Mapper.cs @@ -31,11 +31,11 @@ namespace ErsatzTV.Application.Television episode.EpisodeMetadata.HeadOrNone().Map(m => m.Title).IfNone(string.Empty), episode.EpisodeMetadata.HeadOrNone().Map(m => m.Plot).IfNone(string.Empty), episode.EpisodeMetadata.HeadOrNone().Map(GetThumbnail).IfNone(string.Empty)); - + private static string GetPoster(Metadata metadata) => Optional(metadata.Artwork.FirstOrDefault(a => a.ArtworkKind == ArtworkKind.Poster)) .Match(a => a.Path, string.Empty); - + private static string GetThumbnail(Metadata metadata) => Optional(metadata.Artwork.FirstOrDefault(a => a.ArtworkKind == ArtworkKind.Thumbnail)) .Match(a => a.Path, string.Empty); diff --git a/ErsatzTV.Core/Domain/Metadata/EpisodeMetadata.cs b/ErsatzTV.Core/Domain/Metadata/EpisodeMetadata.cs index c587f25bc..61fe29c3f 100644 --- a/ErsatzTV.Core/Domain/Metadata/EpisodeMetadata.cs +++ b/ErsatzTV.Core/Domain/Metadata/EpisodeMetadata.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace ErsatzTV.Core.Domain +namespace ErsatzTV.Core.Domain { public class EpisodeMetadata : Metadata { diff --git a/ErsatzTV.Core/FileSystemLayout.cs b/ErsatzTV.Core/FileSystemLayout.cs index c64132e2f..e1014845f 100644 --- a/ErsatzTV.Core/FileSystemLayout.cs +++ b/ErsatzTV.Core/FileSystemLayout.cs @@ -16,9 +16,9 @@ namespace ErsatzTV.Core public static readonly string LogDatabasePath = Path.Combine(AppDataFolder, "logs.sqlite3"); public static readonly string ImageCacheFolder = Path.Combine(AppDataFolder, "cache", "images"); - + public static readonly string PlexSecretsPath = Path.Combine(AppDataFolder, "plex-secrets.json"); - + public static readonly string ArtworkCacheFolder = Path.Combine(AppDataFolder, "cache", "artwork"); public static readonly string PosterCacheFolder = Path.Combine(ArtworkCacheFolder, "posters"); diff --git a/ErsatzTV.Core/Metadata/LocalFileSystem.cs b/ErsatzTV.Core/Metadata/LocalFileSystem.cs index bfb4d99da..12a3a1b8a 100644 --- a/ErsatzTV.Core/Metadata/LocalFileSystem.cs +++ b/ErsatzTV.Core/Metadata/LocalFileSystem.cs @@ -28,7 +28,7 @@ namespace ErsatzTV.Core.Metadata public Unit CopyFile(string source, string destination) { - var directory = Path.GetDirectoryName(destination); + string? directory = Path.GetDirectoryName(destination); if (!Directory.Exists(directory)) { Directory.CreateDirectory(directory); diff --git a/ErsatzTV.Core/Metadata/LocalFolderScanner.cs b/ErsatzTV.Core/Metadata/LocalFolderScanner.cs index 7c6eb9f0d..450305df1 100644 --- a/ErsatzTV.Core/Metadata/LocalFolderScanner.cs +++ b/ErsatzTV.Core/Metadata/LocalFolderScanner.cs @@ -89,7 +89,7 @@ namespace ErsatzTV.Core.Metadata DateTime lastWriteTime = _localFileSystem.GetLastWriteTime(artworkFile); metadata.Artwork ??= new List(); - + Option maybePoster = metadata.Artwork.FirstOrDefault(a => a.ArtworkKind == artworkKind); diff --git a/ErsatzTV.Infrastructure/Data/Configurations/Metadata/EpisodeMetadataConfiguration.cs b/ErsatzTV.Infrastructure/Data/Configurations/Metadata/EpisodeMetadataConfiguration.cs index 4edd7f82f..04ae2d4f7 100644 --- a/ErsatzTV.Infrastructure/Data/Configurations/Metadata/EpisodeMetadataConfiguration.cs +++ b/ErsatzTV.Infrastructure/Data/Configurations/Metadata/EpisodeMetadataConfiguration.cs @@ -9,7 +9,7 @@ namespace ErsatzTV.Infrastructure.Data.Configurations public void Configure(EntityTypeBuilder builder) { builder.ToTable("EpisodeMetadata"); - + builder.HasMany(em => em.Artwork) .WithOne() .OnDelete(DeleteBehavior.Cascade); diff --git a/ErsatzTV.Infrastructure/Data/Configurations/Metadata/MovieMetadataConfiguration.cs b/ErsatzTV.Infrastructure/Data/Configurations/Metadata/MovieMetadataConfiguration.cs index 0f81a6f78..bc08274b0 100644 --- a/ErsatzTV.Infrastructure/Data/Configurations/Metadata/MovieMetadataConfiguration.cs +++ b/ErsatzTV.Infrastructure/Data/Configurations/Metadata/MovieMetadataConfiguration.cs @@ -9,7 +9,7 @@ namespace ErsatzTV.Infrastructure.Data.Configurations public void Configure(EntityTypeBuilder builder) { builder.ToTable("MovieMetadata"); - + builder.HasMany(mm => mm.Artwork) .WithOne() .OnDelete(DeleteBehavior.Cascade); diff --git a/ErsatzTV.Infrastructure/Data/Repositories/TelevisionRepository.cs b/ErsatzTV.Infrastructure/Data/Repositories/TelevisionRepository.cs index aa6049483..e45e7db1b 100644 --- a/ErsatzTV.Infrastructure/Data/Repositories/TelevisionRepository.cs +++ b/ErsatzTV.Infrastructure/Data/Repositories/TelevisionRepository.cs @@ -108,7 +108,7 @@ namespace ErsatzTV.Infrastructure.Data.Repositories WHERE m1.Title = m2.Title AND m1.Year = m2.Year", new { ShowId = televisionShowId }) .Map(results => results.ToList()); - + return await _dbContext.Seasons .AsNoTracking() .Where(s => showIds.Contains(s.ShowId)) @@ -207,7 +207,10 @@ namespace ErsatzTV.Infrastructure.Data.Repositories () => AddSeason(show, path, seasonNumber)); } - public async Task> GetOrAddEpisode(Season season, LibraryPath libraryPath, string path) + public async Task> GetOrAddEpisode( + Season season, + LibraryPath libraryPath, + string path) { Option maybeExisting = await _dbContext.Episodes .Include(i => i.EpisodeMetadata) diff --git a/ErsatzTV.Infrastructure/Images/ImageCache.cs b/ErsatzTV.Infrastructure/Images/ImageCache.cs index 07857009b..5ad2332a8 100644 --- a/ErsatzTV.Infrastructure/Images/ImageCache.cs +++ b/ErsatzTV.Infrastructure/Images/ImageCache.cs @@ -22,7 +22,7 @@ namespace ErsatzTV.Infrastructure.Images await using var inStream = new MemoryStream(imageBuffer); using var image = await Image.LoadAsync(inStream); - Size size = new Size { Height = height }; + var size = new Size { Height = height }; image.Mutate( i => i.Resize( @@ -37,7 +37,7 @@ namespace ErsatzTV.Infrastructure.Images return outStream.ToArray(); } - + public async Task> ResizeAndSaveImage(byte[] imageBuffer, int? height, int? width) { await using var inStream = new MemoryStream(imageBuffer); diff --git a/ErsatzTV.Infrastructure/Migrations/20210227134812_Reset_MetadataDateUpdated.cs b/ErsatzTV.Infrastructure/Migrations/20210227134812_Reset_MetadataDateUpdated.cs index da79edf91..09c801a63 100644 --- a/ErsatzTV.Infrastructure/Migrations/20210227134812_Reset_MetadataDateUpdated.cs +++ b/ErsatzTV.Infrastructure/Migrations/20210227134812_Reset_MetadataDateUpdated.cs @@ -14,7 +14,6 @@ namespace ErsatzTV.Infrastructure.Migrations protected override void Down(MigrationBuilder migrationBuilder) { - } } } diff --git a/ErsatzTV.Infrastructure/Plex/PlexServerApiClient.cs b/ErsatzTV.Infrastructure/Plex/PlexServerApiClient.cs index ef7867168..16411a32e 100644 --- a/ErsatzTV.Infrastructure/Plex/PlexServerApiClient.cs +++ b/ErsatzTV.Infrastructure/Plex/PlexServerApiClient.cs @@ -133,7 +133,7 @@ namespace ErsatzTV.Infrastructure.Plex DateAdded = DateTime.UtcNow, // TODO: actual date added? DateUpdated = lastWriteTime }; - + // TODO: artwork var movie = new PlexMovie diff --git a/ErsatzTV/Controllers/ArtworkController.cs b/ErsatzTV/Controllers/ArtworkController.cs index b70d2e001..66014ecd4 100644 --- a/ErsatzTV/Controllers/ArtworkController.cs +++ b/ErsatzTV/Controllers/ArtworkController.cs @@ -26,7 +26,7 @@ namespace ErsatzTV.Controllers Left: _ => new NotFoundResult(), Right: r => new FileContentResult(r.Contents, r.MimeType)); } - + [HttpGet("/artwork/thumbnails/{fileName}")] public async Task GetThumbnail(string fileName) { diff --git a/ErsatzTV/Services/SchedulerService.cs b/ErsatzTV/Services/SchedulerService.cs index 782f56e17..2653109d4 100644 --- a/ErsatzTV/Services/SchedulerService.cs +++ b/ErsatzTV/Services/SchedulerService.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using ErsatzTV.Application; using ErsatzTV.Application.MediaSources.Commands; using ErsatzTV.Application.Playouts.Commands; -using ErsatzTV.Core.Domain; using ErsatzTV.Core.Interfaces.Locking; using ErsatzTV.Infrastructure.Data; using Microsoft.EntityFrameworkCore; diff --git a/ErsatzTV/Shared/MediaCard.razor b/ErsatzTV/Shared/MediaCard.razor index 58f0fe016..f6b9a13b4 100644 --- a/ErsatzTV/Shared/MediaCard.razor +++ b/ErsatzTV/Shared/MediaCard.razor @@ -97,6 +97,6 @@ { ArtworkKind.Thumbnail => "thumbnails", _ => "posters" - }; + }; } \ No newline at end of file