pimhwang
/
ErsatzTV
mirror of https://github.com/ErsatzTV/ErsatzTV.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

load movie genres from sidecar metadata

pull/61/head
Jason Dove 5 years ago
parent
c016cac8d4
commit
95c45b1b26
9 changed files with 1775 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      ErsatzTV.Core/Domain/Metadata/Genre.cs
  2. 1
      ErsatzTV.Core/Domain/Metadata/Metadata.cs
  3. 31
      ErsatzTV.Core/Metadata/LocalMetadataProvider.cs
  4. 4
      ErsatzTV.Infrastructure/Data/Configurations/Metadata/MovieMetadataConfiguration.cs
  5. 4
      ErsatzTV.Infrastructure/Data/Configurations/Metadata/ShowMetadataConfiguration.cs
  6. 2
      ErsatzTV.Infrastructure/Data/Repositories/MovieRepository.cs
  7. 1560
      ErsatzTV.Infrastructure/Migrations/20210310225515_Add_MetadataGenres.Designer.cs
  8. 75
      ErsatzTV.Infrastructure/Migrations/20210310225515_Add_MetadataGenres.cs
  9. 95
      ErsatzTV.Infrastructure/Migrations/TvContextModelSnapshot.cs

8
ErsatzTV.Core/Domain/Metadata/Genre.cs
Unescape View File

@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
namespace ErsatzTV.Core.Domain
{
public class Genre
{
public int Id { get; set; }
public string Name { get; set; }
}
}

1
ErsatzTV.Core/Domain/Metadata/Metadata.cs
Unescape View File

@ -15,5 +15,6 @@ namespace ErsatzTV.Core.Domain @@ -15,5 +15,6 @@ namespace ErsatzTV.Core.Domain
public DateTime DateAdded { get; set; }
public DateTime DateUpdated { get; set; }
public List<Artwork> Artwork { get; set; }
public List<Genre> Genres { get; set; }
}
}

31
ErsatzTV.Core/Metadata/LocalMetadataProvider.cs
Unescape View File

@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Xml.Serialization;
using ErsatzTV.Core.Domain;
@ -133,6 +134,18 @@ namespace ErsatzTV.Core.Metadata @@ -133,6 +134,18 @@ namespace ErsatzTV.Core.Metadata
existing.SortTitle = string.IsNullOrWhiteSpace(metadata.SortTitle)
? _fallbackMetadataProvider.GetSortTitle(metadata.Title)
: metadata.SortTitle;
foreach (Genre genre in existing.Genres.Filter(g => metadata.Genres.All(g2 => g2.Name != g.Name))
.ToList())
{
existing.Genres.Remove(genre);
}
foreach (Genre genre in metadata.Genres.Filter(g => existing.Genres.All(g2 => g2.Name != g.Name))
.ToList())
{
existing.Genres.Add(genre);
}
},
() =>
{
@ -163,6 +176,18 @@ namespace ErsatzTV.Core.Metadata @@ -163,6 +176,18 @@ namespace ErsatzTV.Core.Metadata
existing.SortTitle = string.IsNullOrWhiteSpace(metadata.SortTitle)
? _fallbackMetadataProvider.GetSortTitle(metadata.Title)
: metadata.SortTitle;
// foreach (Genre genre in existing.Genres.Filter(g => metadata.Genres.All(g2 => g2.Name != g.Name))
// .ToList())
// {
// existing.Genres.Remove(genre);
// }
//
// foreach (Genre genre in metadata.Genres.Filter(g => existing.Genres.All(g2 => g2.Name != g.Name))
// .ToList())
// {
// existing.Genres.Add(genre);
// }
},
() =>
{
@ -279,7 +304,8 @@ namespace ErsatzTV.Core.Metadata @@ -279,7 +304,8 @@ namespace ErsatzTV.Core.Metadata
ReleaseDate = nfo.Premiered,
Plot = nfo.Plot,
Outline = nfo.Outline,
Tagline = nfo.Tagline
Tagline = nfo.Tagline,
Genres = nfo.Genres.Map(g => new Genre { Name = g }).ToList()
},
None);
}
@ -328,6 +354,9 @@ namespace ErsatzTV.Core.Metadata @@ -328,6 +354,9 @@ namespace ErsatzTV.Core.Metadata
[XmlElement("tagline")]
public string Tagline { get; set; }
[XmlElement("genre")]
public List<string> Genres { get; set; }
}
[XmlRoot("tvshow")]

4
ErsatzTV.Infrastructure/Data/Configurations/Metadata/MovieMetadataConfiguration.cs
Unescape View File

@ -13,6 +13,10 @@ namespace ErsatzTV.Infrastructure.Data.Configurations @@ -13,6 +13,10 @@ namespace ErsatzTV.Infrastructure.Data.Configurations
builder.HasMany(mm => mm.Artwork)
.WithOne()
.OnDelete(DeleteBehavior.Cascade);
builder.HasMany(mm => mm.Genres)
.WithOne()
.OnDelete(DeleteBehavior.Cascade);
}
}
}

4
ErsatzTV.Infrastructure/Data/Configurations/Metadata/ShowMetadataConfiguration.cs
Unescape View File

@ -13,6 +13,10 @@ namespace ErsatzTV.Infrastructure.Data.Configurations @@ -13,6 +13,10 @@ namespace ErsatzTV.Infrastructure.Data.Configurations
builder.HasMany(sm => sm.Artwork)
.WithOne()
.OnDelete(DeleteBehavior.Cascade);
builder.HasMany(mm => mm.Genres)
.WithOne()
.OnDelete(DeleteBehavior.Cascade);
}
}
}

2
ErsatzTV.Infrastructure/Data/Repositories/MovieRepository.cs
Unescape View File

@ -45,6 +45,8 @@ namespace ErsatzTV.Infrastructure.Data.Repositories @@ -45,6 +45,8 @@ namespace ErsatzTV.Infrastructure.Data.Repositories
Option<Movie> maybeExisting = await _dbContext.Movies
.Include(i => i.MovieMetadata)
.ThenInclude(mm => mm.Artwork)
.Include(i => i.MovieMetadata)
.ThenInclude(mm => mm.Genres)
.Include(i => i.LibraryPath)
.Include(i => i.MediaVersions)
.ThenInclude(mv => mv.MediaFiles)

1560
ErsatzTV.Infrastructure/Migrations/20210310225515_Add_MetadataGenres.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

75
ErsatzTV.Infrastructure/Migrations/20210310225515_Add_MetadataGenres.cs
Unescape View File

@ -0,0 +1,75 @@ @@ -0,0 +1,75 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace ErsatzTV.Infrastructure.Migrations
{
public partial class Add_MetadataGenres : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
"Genre",
table => new
{
Id = table.Column<int>("INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
Name = table.Column<string>("TEXT", nullable: true),
EpisodeMetadataId = table.Column<int>("INTEGER", nullable: true),
MovieMetadataId = table.Column<int>("INTEGER", nullable: true),
SeasonMetadataId = table.Column<int>("INTEGER", nullable: true),
ShowMetadataId = table.Column<int>("INTEGER", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Genre", x => x.Id);
table.ForeignKey(
"FK_Genre_EpisodeMetadata_EpisodeMetadataId",
x => x.EpisodeMetadataId,
"EpisodeMetadata",
"Id",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
"FK_Genre_MovieMetadata_MovieMetadataId",
x => x.MovieMetadataId,
"MovieMetadata",
"Id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
"FK_Genre_SeasonMetadata_SeasonMetadataId",
x => x.SeasonMetadataId,
"SeasonMetadata",
"Id",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
"FK_Genre_ShowMetadata_ShowMetadataId",
x => x.ShowMetadataId,
"ShowMetadata",
"Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
"IX_Genre_EpisodeMetadataId",
"Genre",
"EpisodeMetadataId");
migrationBuilder.CreateIndex(
"IX_Genre_MovieMetadataId",
"Genre",
"MovieMetadataId");
migrationBuilder.CreateIndex(
"IX_Genre_SeasonMetadataId",
"Genre",
"SeasonMetadataId");
migrationBuilder.CreateIndex(
"IX_Genre_ShowMetadataId",
"Genre",
"ShowMetadataId");
}
protected override void Down(MigrationBuilder migrationBuilder) =>
migrationBuilder.DropTable(
"Genre");
}
}

95
ErsatzTV.Infrastructure/Migrations/TvContextModelSnapshot.cs
Unescape View File

@ -274,6 +274,42 @@ namespace ErsatzTV.Infrastructure.Migrations @@ -274,6 +274,42 @@ namespace ErsatzTV.Infrastructure.Migrations
b.ToTable("FFmpegProfile");
});
modelBuilder.Entity(
"ErsatzTV.Core.Domain.Genre",
b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<int?>("EpisodeMetadataId")
.HasColumnType("INTEGER");
b.Property<int?>("MovieMetadataId")
.HasColumnType("INTEGER");
b.Property<string>("Name")
.HasColumnType("TEXT");
b.Property<int?>("SeasonMetadataId")
.HasColumnType("INTEGER");
b.Property<int?>("ShowMetadataId")
.HasColumnType("INTEGER");
b.HasKey("Id");
b.HasIndex("EpisodeMetadataId");
b.HasIndex("MovieMetadataId");
b.HasIndex("SeasonMetadataId");
b.HasIndex("ShowMetadataId");
b.ToTable("Genre");
});
modelBuilder.Entity(
"ErsatzTV.Core.Domain.Library",
b =>
@ -1068,6 +1104,29 @@ namespace ErsatzTV.Infrastructure.Migrations @@ -1068,6 +1104,29 @@ namespace ErsatzTV.Infrastructure.Migrations
b.Navigation("Resolution");
});
modelBuilder.Entity(
"ErsatzTV.Core.Domain.Genre",
b =>
{
b.HasOne("ErsatzTV.Core.Domain.EpisodeMetadata", null)
.WithMany("Genres")
.HasForeignKey("EpisodeMetadataId");
b.HasOne("ErsatzTV.Core.Domain.MovieMetadata", null)
.WithMany("Genres")
.HasForeignKey("MovieMetadataId")
.OnDelete(DeleteBehavior.Cascade);
b.HasOne("ErsatzTV.Core.Domain.SeasonMetadata", null)
.WithMany("Genres")
.HasForeignKey("SeasonMetadataId");
b.HasOne("ErsatzTV.Core.Domain.ShowMetadata", null)
.WithMany("Genres")
.HasForeignKey("ShowMetadataId")
.OnDelete(DeleteBehavior.Cascade);
});
modelBuilder.Entity(
"ErsatzTV.Core.Domain.Library",
b =>
@ -1543,7 +1602,14 @@ namespace ErsatzTV.Infrastructure.Migrations @@ -1543,7 +1602,14 @@ namespace ErsatzTV.Infrastructure.Migrations
modelBuilder.Entity("ErsatzTV.Core.Domain.Collection", b => { b.Navigation("CollectionItems"); });
modelBuilder.Entity("ErsatzTV.Core.Domain.EpisodeMetadata", b => { b.Navigation("Artwork"); });
modelBuilder.Entity(
"ErsatzTV.Core.Domain.EpisodeMetadata",
b =>
{
b.Navigation("Artwork");
b.Navigation("Genres");
});
modelBuilder.Entity("ErsatzTV.Core.Domain.Library", b => { b.Navigation("Paths"); });
@ -1555,7 +1621,14 @@ namespace ErsatzTV.Infrastructure.Migrations @@ -1555,7 +1621,14 @@ namespace ErsatzTV.Infrastructure.Migrations
modelBuilder.Entity("ErsatzTV.Core.Domain.MediaVersion", b => { b.Navigation("MediaFiles"); });
modelBuilder.Entity("ErsatzTV.Core.Domain.MovieMetadata", b => { b.Navigation("Artwork"); });
modelBuilder.Entity(
"ErsatzTV.Core.Domain.MovieMetadata",
b =>
{
b.Navigation("Artwork");
b.Navigation("Genres");
});
modelBuilder.Entity(
"ErsatzTV.Core.Domain.Playout",
@ -1575,9 +1648,23 @@ namespace ErsatzTV.Infrastructure.Migrations @@ -1575,9 +1648,23 @@ namespace ErsatzTV.Infrastructure.Migrations
b.Navigation("Playouts");
});
modelBuilder.Entity("ErsatzTV.Core.Domain.SeasonMetadata", b => { b.Navigation("Artwork"); });
modelBuilder.Entity(
"ErsatzTV.Core.Domain.SeasonMetadata",
b =>
{
b.Navigation("Artwork");
modelBuilder.Entity("ErsatzTV.Core.Domain.ShowMetadata", b => { b.Navigation("Artwork"); });
b.Navigation("Genres");
});
modelBuilder.Entity(
"ErsatzTV.Core.Domain.ShowMetadata",
b =>
{
b.Navigation("Artwork");
b.Navigation("Genres");
});
modelBuilder.Entity(
"ErsatzTV.Core.Domain.Episode",

Write Preview
Loading…
Cancel
Save