Browse Source

rename new movie metadata type

pull/31/head
Jason Dove 6 years ago
parent
commit
b122cadd66
  1. 2
      ErsatzTV.Application/MediaCards/Mapper.cs
  2. 2
      ErsatzTV.Core.Tests/Scheduling/PlayoutBuilderTests.cs
  3. 2
      ErsatzTV.Core/Domain/MediaItem/Movie.cs
  4. 2
      ErsatzTV.Core/Domain/Metadata/MovieMetadata.cs
  5. 2
      ErsatzTV.Core/Interfaces/Repositories/IMovieRepository.cs
  6. 6
      ErsatzTV.Core/Metadata/FallbackMetadataProvider.cs
  7. 12
      ErsatzTV.Core/Metadata/LocalMetadataProvider.cs
  8. 4
      ErsatzTV.Infrastructure/Data/Configurations/Metadata/NewMovieMetadataConfiguration.cs
  9. 2
      ErsatzTV.Infrastructure/Data/Repositories/MovieRepository.cs
  10. 2
      ErsatzTV.Infrastructure/Data/TvContext.cs
  11. 4
      ErsatzTV.Infrastructure/Plex/PlexServerApiClient.cs

2
ErsatzTV.Application/MediaCards/Mapper.cs

@ -38,7 +38,7 @@ namespace ErsatzTV.Application.MediaCards @@ -38,7 +38,7 @@ namespace ErsatzTV.Application.MediaCards
televisionEpisode.Poster,
televisionEpisode.Metadata?.Episode.ToString());
internal static MovieCardViewModel ProjectToViewModel(NewMovieMetadata movieMetadata) =>
internal static MovieCardViewModel ProjectToViewModel(MovieMetadata movieMetadata) =>
new(
movieMetadata.MovieId,
movieMetadata.Title,

2
ErsatzTV.Core.Tests/Scheduling/PlayoutBuilderTests.cs

@ -611,7 +611,7 @@ namespace ErsatzTV.Core.Tests.Scheduling @@ -611,7 +611,7 @@ namespace ErsatzTV.Core.Tests.Scheduling
new()
{
Id = id,
MovieMetadata = new List<NewMovieMetadata> { new() { ReleaseDate = aired } },
MovieMetadata = new List<MovieMetadata> { new() { ReleaseDate = aired } },
Statistics = new MediaItemStatistics { Duration = duration }
};

2
ErsatzTV.Core/Domain/MediaItem/Movie.cs

@ -4,7 +4,7 @@ namespace ErsatzTV.Core.Domain @@ -4,7 +4,7 @@ namespace ErsatzTV.Core.Domain
{
public class Movie : MediaItem
{
public List<NewMovieMetadata> MovieMetadata { get; set; }
public List<MovieMetadata> MovieMetadata { get; set; }
public List<MediaVersion> MediaVersions { get; set; }

2
ErsatzTV.Core/Domain/Metadata/NewMovieMetadata.cs → ErsatzTV.Core/Domain/Metadata/MovieMetadata.cs

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
namespace ErsatzTV.Core.Domain
{
public class NewMovieMetadata : Metadata
public class MovieMetadata : Metadata
{
public string Outline { get; set; }
public string Plot { get; set; }

2
ErsatzTV.Core/Interfaces/Repositories/IMovieRepository.cs

@ -12,6 +12,6 @@ namespace ErsatzTV.Core.Interfaces.Repositories @@ -12,6 +12,6 @@ namespace ErsatzTV.Core.Interfaces.Repositories
Task<Either<BaseError, PlexMovie>> GetOrAdd(PlexLibrary library, PlexMovie item);
Task<bool> Update(Movie movie);
Task<int> GetMovieCount();
Task<List<NewMovieMetadata>> GetPagedMovies(int pageNumber, int pageSize);
Task<List<MovieMetadata>> GetPagedMovies(int pageNumber, int pageSize);
}
}

6
ErsatzTV.Core/Metadata/FallbackMetadataProvider.cs

@ -36,10 +36,10 @@ namespace ErsatzTV.Core.Metadata @@ -36,10 +36,10 @@ namespace ErsatzTV.Core.Metadata
return metadata;
}
public static NewMovieMetadata GetFallbackMetadata(Movie movie)
public static MovieMetadata GetFallbackMetadata(Movie movie)
{
string fileName = Path.GetFileName(movie.Path);
var metadata = new NewMovieMetadata { MetadataKind = MetadataKind.Fallback, Title = fileName ?? movie.Path };
var metadata = new MovieMetadata { MetadataKind = MetadataKind.Fallback, Title = fileName ?? movie.Path };
if (fileName != null)
{
@ -76,7 +76,7 @@ namespace ErsatzTV.Core.Metadata @@ -76,7 +76,7 @@ namespace ErsatzTV.Core.Metadata
return metadata;
}
private static NewMovieMetadata GetMovieMetadata(string fileName, NewMovieMetadata metadata)
private static MovieMetadata GetMovieMetadata(string fileName, MovieMetadata metadata)
{
try
{

12
ErsatzTV.Core/Metadata/LocalMetadataProvider.cs

@ -95,9 +95,9 @@ namespace ErsatzTV.Core.Metadata @@ -95,9 +95,9 @@ namespace ErsatzTV.Core.Metadata
await _televisionRepository.Update(mediaItem);
}
private async Task ApplyMetadataUpdate(Movie movie, NewMovieMetadata metadata)
private async Task ApplyMetadataUpdate(Movie movie, MovieMetadata metadata)
{
movie.MovieMetadata = new List<NewMovieMetadata> { metadata };
movie.MovieMetadata = new List<MovieMetadata> { metadata };
await _mediaItemRepository.Update(movie);
}
@ -114,7 +114,7 @@ namespace ErsatzTV.Core.Metadata @@ -114,7 +114,7 @@ namespace ErsatzTV.Core.Metadata
await _televisionRepository.Update(televisionShow);
}
private async Task<Option<NewMovieMetadata>> LoadMetadata(Movie mediaItem, string nfoFileName)
private async Task<Option<MovieMetadata>> LoadMetadata(Movie mediaItem, string nfoFileName)
{
if (nfoFileName == null || !File.Exists(nfoFileName))
{
@ -215,14 +215,14 @@ namespace ErsatzTV.Core.Metadata @@ -215,14 +215,14 @@ namespace ErsatzTV.Core.Metadata
}
}
private async Task<Option<NewMovieMetadata>> LoadMovieMetadata(Movie mediaItem, string nfoFileName)
private async Task<Option<MovieMetadata>> LoadMovieMetadata(Movie mediaItem, string nfoFileName)
{
try
{
await using FileStream fileStream = File.Open(nfoFileName, FileMode.Open, FileAccess.Read);
Option<MovieNfo> maybeNfo = MovieSerializer.Deserialize(fileStream) as MovieNfo;
return maybeNfo.Match<Option<NewMovieMetadata>>(
nfo => new NewMovieMetadata
return maybeNfo.Match<Option<MovieMetadata>>(
nfo => new MovieMetadata
{
MetadataKind = MetadataKind.Sidecar,
DateUpdated = File.GetLastWriteTimeUtc(nfoFileName),

4
ErsatzTV.Infrastructure/Data/Configurations/Metadata/NewMovieMetadataConfiguration.cs

@ -4,8 +4,8 @@ using Microsoft.EntityFrameworkCore.Metadata.Builders; @@ -4,8 +4,8 @@ using Microsoft.EntityFrameworkCore.Metadata.Builders;
namespace ErsatzTV.Infrastructure.Data.Configurations
{
public class NewMovieMetadataConfiguration : IEntityTypeConfiguration<NewMovieMetadata>
public class NewMovieMetadataConfiguration : IEntityTypeConfiguration<MovieMetadata>
{
public void Configure(EntityTypeBuilder<NewMovieMetadata> builder) => builder.ToTable("NewMovieMetadata");
public void Configure(EntityTypeBuilder<MovieMetadata> builder) => builder.ToTable("NewMovieMetadata");
}
}

2
ErsatzTV.Infrastructure/Data/Repositories/MovieRepository.cs

@ -66,7 +66,7 @@ namespace ErsatzTV.Infrastructure.Data.Repositories @@ -66,7 +66,7 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
public Task<int> GetMovieCount() =>
_dbConnection.QuerySingleAsync<int>(@"SELECT COUNT(DISTINCT MovieId) FROM NewMovieMetadata");
public Task<List<NewMovieMetadata>> GetPagedMovies(int pageNumber, int pageSize) =>
public Task<List<MovieMetadata>> GetPagedMovies(int pageNumber, int pageSize) =>
_dbContext.MovieMetadata.FromSqlRaw(@"SELECT * FROM NewMovieMetadata WHERE Id IN
(SELECT Id FROM NewMovieMetadata GROUP BY MovieId, MetadataKind HAVING MetadataKind = MAX(MetadataKind))
ORDER BY SortTitle

2
ErsatzTV.Infrastructure/Data/TvContext.cs

@ -21,7 +21,7 @@ namespace ErsatzTV.Infrastructure.Data @@ -21,7 +21,7 @@ namespace ErsatzTV.Infrastructure.Data
public DbSet<PlexLibrary> PlexLibraries { get; set; }
public DbSet<MediaItem> MediaItems { get; set; }
public DbSet<Movie> Movies { get; set; }
public DbSet<NewMovieMetadata> MovieMetadata { get; set; }
public DbSet<MovieMetadata> MovieMetadata { get; set; }
public DbSet<Show> Shows { get; set; }
public DbSet<Season> Seasons { get; set; }
public DbSet<Episode> Episodes { get; set; }

4
ErsatzTV.Infrastructure/Plex/PlexServerApiClient.cs

@ -123,7 +123,7 @@ namespace ErsatzTV.Infrastructure.Plex @@ -123,7 +123,7 @@ namespace ErsatzTV.Infrastructure.Plex
PlexPartResponse part = media.Part.Head();
DateTime lastWriteTime = DateTimeOffset.FromUnixTimeSeconds(response.UpdatedAt).DateTime;
var metadata = new NewMovieMetadata
var metadata = new MovieMetadata
{
Title = response.Title,
Plot = response.Summary,
@ -139,7 +139,7 @@ namespace ErsatzTV.Infrastructure.Plex @@ -139,7 +139,7 @@ namespace ErsatzTV.Infrastructure.Plex
Poster = response.Thumb,
LastWriteTime = lastWriteTime,
PosterLastWriteTime = lastWriteTime,
MovieMetadata = new List<NewMovieMetadata> { metadata },
MovieMetadata = new List<MovieMetadata> { metadata },
Statistics = new MediaItemStatistics
{
Duration = TimeSpan.FromMilliseconds(media.Duration),

Loading…
Cancel
Save