Browse Source

code cleanup

pull/31/head
Jason Dove 6 years ago
parent
commit
869308fed9
  1. 3
      ErsatzTV.Application/Images/Queries/GetImageContents.cs
  2. 4
      ErsatzTV.Application/Television/Mapper.cs
  3. 4
      ErsatzTV.Core/Domain/Metadata/EpisodeMetadata.cs
  4. 4
      ErsatzTV.Core/FileSystemLayout.cs
  5. 2
      ErsatzTV.Core/Metadata/LocalFileSystem.cs
  6. 2
      ErsatzTV.Core/Metadata/LocalFolderScanner.cs
  7. 2
      ErsatzTV.Infrastructure/Data/Configurations/Metadata/EpisodeMetadataConfiguration.cs
  8. 2
      ErsatzTV.Infrastructure/Data/Configurations/Metadata/MovieMetadataConfiguration.cs
  9. 7
      ErsatzTV.Infrastructure/Data/Repositories/TelevisionRepository.cs
  10. 4
      ErsatzTV.Infrastructure/Images/ImageCache.cs
  11. 1
      ErsatzTV.Infrastructure/Migrations/20210227134812_Reset_MetadataDateUpdated.cs
  12. 2
      ErsatzTV.Infrastructure/Plex/PlexServerApiClient.cs
  13. 2
      ErsatzTV/Controllers/ArtworkController.cs
  14. 1
      ErsatzTV/Services/SchedulerService.cs
  15. 2
      ErsatzTV/Shared/MediaCard.razor

3
ErsatzTV.Application/Images/Queries/GetImageContents.cs

@ -5,5 +5,6 @@ using MediatR; @@ -5,5 +5,6 @@ using MediatR;
namespace ErsatzTV.Application.Images.Queries
{
public record GetImageContents(string FileName, ArtworkKind ArtworkKind, int? MaxHeight = null) : IRequest<Either<BaseError, ImageViewModel>>;
public record GetImageContents
(string FileName, ArtworkKind ArtworkKind, int? MaxHeight = null) : IRequest<Either<BaseError, ImageViewModel>>;
}

4
ErsatzTV.Application/Television/Mapper.cs

@ -31,11 +31,11 @@ namespace ErsatzTV.Application.Television @@ -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);

4
ErsatzTV.Core/Domain/Metadata/EpisodeMetadata.cs

@ -1,6 +1,4 @@ @@ -1,6 +1,4 @@
using System.Collections.Generic;
namespace ErsatzTV.Core.Domain
namespace ErsatzTV.Core.Domain
{
public class EpisodeMetadata : Metadata
{

4
ErsatzTV.Core/FileSystemLayout.cs

@ -16,9 +16,9 @@ namespace ErsatzTV.Core @@ -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");

2
ErsatzTV.Core/Metadata/LocalFileSystem.cs

@ -28,7 +28,7 @@ namespace ErsatzTV.Core.Metadata @@ -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);

2
ErsatzTV.Core/Metadata/LocalFolderScanner.cs

@ -89,7 +89,7 @@ namespace ErsatzTV.Core.Metadata @@ -89,7 +89,7 @@ namespace ErsatzTV.Core.Metadata
DateTime lastWriteTime = _localFileSystem.GetLastWriteTime(artworkFile);
metadata.Artwork ??= new List<Artwork>();
Option<Artwork> maybePoster =
metadata.Artwork.FirstOrDefault(a => a.ArtworkKind == artworkKind);

2
ErsatzTV.Infrastructure/Data/Configurations/Metadata/EpisodeMetadataConfiguration.cs

@ -9,7 +9,7 @@ namespace ErsatzTV.Infrastructure.Data.Configurations @@ -9,7 +9,7 @@ namespace ErsatzTV.Infrastructure.Data.Configurations
public void Configure(EntityTypeBuilder<EpisodeMetadata> builder)
{
builder.ToTable("EpisodeMetadata");
builder.HasMany(em => em.Artwork)
.WithOne()
.OnDelete(DeleteBehavior.Cascade);

2
ErsatzTV.Infrastructure/Data/Configurations/Metadata/MovieMetadataConfiguration.cs

@ -9,7 +9,7 @@ namespace ErsatzTV.Infrastructure.Data.Configurations @@ -9,7 +9,7 @@ namespace ErsatzTV.Infrastructure.Data.Configurations
public void Configure(EntityTypeBuilder<MovieMetadata> builder)
{
builder.ToTable("MovieMetadata");
builder.HasMany(mm => mm.Artwork)
.WithOne()
.OnDelete(DeleteBehavior.Cascade);

7
ErsatzTV.Infrastructure/Data/Repositories/TelevisionRepository.cs

@ -108,7 +108,7 @@ namespace ErsatzTV.Infrastructure.Data.Repositories @@ -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 @@ -207,7 +207,10 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
() => AddSeason(show, path, seasonNumber));
}
public async Task<Either<BaseError, Episode>> GetOrAddEpisode(Season season, LibraryPath libraryPath, string path)
public async Task<Either<BaseError, Episode>> GetOrAddEpisode(
Season season,
LibraryPath libraryPath,
string path)
{
Option<Episode> maybeExisting = await _dbContext.Episodes
.Include(i => i.EpisodeMetadata)

4
ErsatzTV.Infrastructure/Images/ImageCache.cs

@ -22,7 +22,7 @@ namespace ErsatzTV.Infrastructure.Images @@ -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 @@ -37,7 +37,7 @@ namespace ErsatzTV.Infrastructure.Images
return outStream.ToArray();
}
public async Task<Either<BaseError, string>> ResizeAndSaveImage(byte[] imageBuffer, int? height, int? width)
{
await using var inStream = new MemoryStream(imageBuffer);

1
ErsatzTV.Infrastructure/Migrations/20210227134812_Reset_MetadataDateUpdated.cs

@ -14,7 +14,6 @@ namespace ErsatzTV.Infrastructure.Migrations @@ -14,7 +14,6 @@ namespace ErsatzTV.Infrastructure.Migrations
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

2
ErsatzTV.Infrastructure/Plex/PlexServerApiClient.cs

@ -133,7 +133,7 @@ namespace ErsatzTV.Infrastructure.Plex @@ -133,7 +133,7 @@ namespace ErsatzTV.Infrastructure.Plex
DateAdded = DateTime.UtcNow, // TODO: actual date added?
DateUpdated = lastWriteTime
};
// TODO: artwork
var movie = new PlexMovie

2
ErsatzTV/Controllers/ArtworkController.cs

@ -26,7 +26,7 @@ namespace ErsatzTV.Controllers @@ -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<IActionResult> GetThumbnail(string fileName)
{

1
ErsatzTV/Services/SchedulerService.cs

@ -7,7 +7,6 @@ using System.Threading.Tasks; @@ -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;

2
ErsatzTV/Shared/MediaCard.razor

@ -97,6 +97,6 @@ @@ -97,6 +97,6 @@
{
ArtworkKind.Thumbnail => "thumbnails",
_ => "posters"
};
};
}
Loading…
Cancel
Save