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

add timings for jf episode loading and saving during update

pull/2752/head
Jason Dove 7 months ago
parent
7c82ecdfff
commit
825f1b12e7
No known key found for this signature in database
1 changed files with 140 additions and 131 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 271
      ErsatzTV.Infrastructure/Data/Repositories/JellyfinTelevisionRepository.cs

271
ErsatzTV.Infrastructure/Data/Repositories/JellyfinTelevisionRepository.cs
Unescape View File

@ -175,26 +175,32 @@ public class JellyfinTelevisionRepository : IJellyfinTelevisionRepository
MediaItemScanResult<JellyfinEpisode> result; MediaItemScanResult<JellyfinEpisode> result;
if (existingState.Etag != item.Etag || deepScan) if (existingState.Etag != item.Etag || deepScan)
{ {
JellyfinEpisode existing = await dbContext.JellyfinEpisodes JellyfinEpisode existing;
.TagWithCallSite()
.Include(e => e.EpisodeMetadata).ThenInclude(em => em.Artwork) using (ScanProfiler.Measure("DB Ep Upd Load"))
.Include(e => e.EpisodeMetadata).ThenInclude(em => em.Guids) {
.Include(e => e.EpisodeMetadata).ThenInclude(em => em.Genres) existing = await dbContext.JellyfinEpisodes
.Include(e => e.EpisodeMetadata).ThenInclude(em => em.Tags) .TagWithCallSite()
.Include(e => e.EpisodeMetadata).ThenInclude(em => em.Actors).ThenInclude(a => a.Artwork) .Include(e => e.EpisodeMetadata).ThenInclude(em => em.Artwork)
.Include(e => e.EpisodeMetadata).ThenInclude(em => em.Directors) .Include(e => e.EpisodeMetadata).ThenInclude(em => em.Guids)
.Include(e => e.EpisodeMetadata).ThenInclude(em => em.Writers) .Include(e => e.EpisodeMetadata).ThenInclude(em => em.Genres)
.Include(e => e.MediaVersions).ThenInclude(mv => mv.MediaFiles) .Include(e => e.EpisodeMetadata).ThenInclude(em => em.Tags)
.Include(e => e.MediaVersions).ThenInclude(mv => mv.Streams) .Include(e => e.EpisodeMetadata).ThenInclude(em => em.Actors).ThenInclude(a => a.Artwork)
.Include(e => e.MediaVersions).ThenInclude(mv => mv.Chapters) .Include(e => e.EpisodeMetadata).ThenInclude(em => em.Directors)
.AsSplitQuery() .Include(e => e.EpisodeMetadata).ThenInclude(em => em.Writers)
.SingleAsync(s => s.Id == existingId, cancellationToken); .Include(e => e.MediaVersions).ThenInclude(mv => mv.MediaFiles)
.Include(e => e.MediaVersions).ThenInclude(mv => mv.Streams)
await dbContext.Entry(existing).Reference(e => e.Season).LoadAsync(cancellationToken); .Include(e => e.MediaVersions).ThenInclude(mv => mv.Chapters)
.AsSplitQuery()
.SingleAsync(s => s.Id == existingId, cancellationToken);
await dbContext.Entry(existing).Reference(e => e.Season).LoadAsync(cancellationToken);
}
await UpdateEpisode(dbContext, existing, item, cancellationToken); await UpdateEpisode(dbContext, existing, item, cancellationToken);
result = new MediaItemScanResult<JellyfinEpisode>(existing) { IsAdded = false, IsUpdated = true }; result = new MediaItemScanResult<JellyfinEpisode>(existing)
{ IsAdded = false, IsUpdated = true };
} }
else else
{ {
@ -800,137 +806,140 @@ public class JellyfinTelevisionRepository : IJellyfinTelevisionRepository
JellyfinEpisode incoming, JellyfinEpisode incoming,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
// library path is used for search indexing later using (ScanProfiler.Measure("DB Ep Upd Save"))
incoming.LibraryPathId = existing.LibraryPathId;
incoming.Id = existing.Id;
// metadata
// TODO: multiple metadata?
EpisodeMetadata metadata = existing.EpisodeMetadata.Head();
EpisodeMetadata incomingMetadata = incoming.EpisodeMetadata.Head();
metadata.Title = incomingMetadata.Title;
metadata.SortTitle = incomingMetadata.SortTitle;
metadata.Plot = incomingMetadata.Plot;
metadata.Year = incomingMetadata.Year;
metadata.DateAdded = incomingMetadata.DateAdded;
metadata.DateUpdated = DateTime.UtcNow;
metadata.ReleaseDate = incomingMetadata.ReleaseDate;
metadata.EpisodeNumber = incomingMetadata.EpisodeNumber;
// thumbnail
Artwork incomingThumbnail =
incomingMetadata.Artwork.FirstOrDefault(a => a.ArtworkKind == ArtworkKind.Thumbnail);
if (incomingThumbnail != null)
{ {
Artwork thumbnail = metadata.Artwork.FirstOrDefault(a => a.ArtworkKind == ArtworkKind.Thumbnail); // library path is used for search indexing later
if (thumbnail == null) incoming.LibraryPathId = existing.LibraryPathId;
incoming.Id = existing.Id;
// metadata
// TODO: multiple metadata?
EpisodeMetadata metadata = existing.EpisodeMetadata.Head();
EpisodeMetadata incomingMetadata = incoming.EpisodeMetadata.Head();
metadata.Title = incomingMetadata.Title;
metadata.SortTitle = incomingMetadata.SortTitle;
metadata.Plot = incomingMetadata.Plot;
metadata.Year = incomingMetadata.Year;
metadata.DateAdded = incomingMetadata.DateAdded;
metadata.DateUpdated = DateTime.UtcNow;
metadata.ReleaseDate = incomingMetadata.ReleaseDate;
metadata.EpisodeNumber = incomingMetadata.EpisodeNumber;
// thumbnail
Artwork incomingThumbnail =
incomingMetadata.Artwork.FirstOrDefault(a => a.ArtworkKind == ArtworkKind.Thumbnail);
if (incomingThumbnail != null)
{ {
thumbnail = new Artwork { ArtworkKind = ArtworkKind.Thumbnail }; Artwork thumbnail = metadata.Artwork.FirstOrDefault(a => a.ArtworkKind == ArtworkKind.Thumbnail);
metadata.Artwork.Add(thumbnail); if (thumbnail == null)
} {
thumbnail = new Artwork { ArtworkKind = ArtworkKind.Thumbnail };
metadata.Artwork.Add(thumbnail);
}
thumbnail.Path = incomingThumbnail.Path; thumbnail.Path = incomingThumbnail.Path;
thumbnail.DateAdded = incomingThumbnail.DateAdded; thumbnail.DateAdded = incomingThumbnail.DateAdded;
thumbnail.DateUpdated = incomingThumbnail.DateUpdated; thumbnail.DateUpdated = incomingThumbnail.DateUpdated;
} }
// directors // directors
foreach (Director director in metadata.Directors foreach (Director director in metadata.Directors
.Filter(d => incomingMetadata.Directors.All(d2 => d2.Name != d.Name)) .Filter(d => incomingMetadata.Directors.All(d2 => d2.Name != d.Name))
.ToList()) .ToList())
{ {
metadata.Directors.Remove(director); metadata.Directors.Remove(director);
} }
foreach (Director director in incomingMetadata.Directors foreach (Director director in incomingMetadata.Directors
.Filter(d => metadata.Directors.All(d2 => d2.Name != d.Name)) .Filter(d => metadata.Directors.All(d2 => d2.Name != d.Name))
.ToList()) .ToList())
{ {
metadata.Directors.Add(director); metadata.Directors.Add(director);
} }
// writers // writers
foreach (Writer writer in metadata.Writers foreach (Writer writer in metadata.Writers
.Filter(w => incomingMetadata.Writers.All(w2 => w2.Name != w.Name)) .Filter(w => incomingMetadata.Writers.All(w2 => w2.Name != w.Name))
.ToList()) .ToList())
{ {
metadata.Writers.Remove(writer); metadata.Writers.Remove(writer);
} }
foreach (Writer writer in incomingMetadata.Writers foreach (Writer writer in incomingMetadata.Writers
.Filter(w => metadata.Writers.All(w2 => w2.Name != w.Name)) .Filter(w => metadata.Writers.All(w2 => w2.Name != w.Name))
.ToList()) .ToList())
{ {
metadata.Writers.Add(writer); metadata.Writers.Add(writer);
} }
// guids // guids
foreach (MetadataGuid guid in metadata.Guids foreach (MetadataGuid guid in metadata.Guids
.Filter(g => incomingMetadata.Guids.All(g2 => g2.Guid != g.Guid)) .Filter(g => incomingMetadata.Guids.All(g2 => g2.Guid != g.Guid))
.ToList()) .ToList())
{ {
metadata.Guids.Remove(guid); metadata.Guids.Remove(guid);
} }
foreach (MetadataGuid guid in incomingMetadata.Guids foreach (MetadataGuid guid in incomingMetadata.Guids
.Filter(g => metadata.Guids.All(g2 => g2.Guid != g.Guid)) .Filter(g => metadata.Guids.All(g2 => g2.Guid != g.Guid))
.ToList()) .ToList())
{ {
metadata.Guids.Add(guid); metadata.Guids.Add(guid);
} }
// genres // genres
foreach (Genre genre in metadata.Genres foreach (Genre genre in metadata.Genres
.Filter(g => incomingMetadata.Genres.All(g2 => g2.Name != g.Name)) .Filter(g => incomingMetadata.Genres.All(g2 => g2.Name != g.Name))
.ToList()) .ToList())
{ {
metadata.Genres.Remove(genre); metadata.Genres.Remove(genre);
} }
foreach (Genre genre in incomingMetadata.Genres foreach (Genre genre in incomingMetadata.Genres
.Filter(g => metadata.Genres.All(g2 => g2.Name != g.Name)) .Filter(g => metadata.Genres.All(g2 => g2.Name != g.Name))
.ToList()) .ToList())
{ {
metadata.Genres.Add(genre); metadata.Genres.Add(genre);
} }
// tags // tags
foreach (Tag tag in metadata.Tags foreach (Tag tag in metadata.Tags
.Filter(g => incomingMetadata.Tags.All(g2 => g2.Name != g.Name)) .Filter(g => incomingMetadata.Tags.All(g2 => g2.Name != g.Name))
.Filter(g => g.ExternalCollectionId is null) .Filter(g => g.ExternalCollectionId is null)
.ToList()) .ToList())
{ {
metadata.Tags.Remove(tag); metadata.Tags.Remove(tag);
} }
foreach (Tag tag in incomingMetadata.Tags foreach (Tag tag in incomingMetadata.Tags
.Filter(g => metadata.Tags.All(g2 => g2.Name != g.Name)) .Filter(g => metadata.Tags.All(g2 => g2.Name != g.Name))
.ToList()) .ToList())
{ {
metadata.Tags.Add(tag); metadata.Tags.Add(tag);
} }
var paths = incomingMetadata.Artwork.Map(a => a.Path).ToList(); var paths = incomingMetadata.Artwork.Map(a => a.Path).ToList();
foreach (Artwork artworkToRemove in metadata.Artwork foreach (Artwork artworkToRemove in metadata.Artwork
.Filter(a => !paths.Contains(a.Path)) .Filter(a => !paths.Contains(a.Path))
.ToList()) .ToList())
{ {
metadata.Artwork.Remove(artworkToRemove); metadata.Artwork.Remove(artworkToRemove);
} }
// version // version
MediaVersion version = existing.MediaVersions.Head(); MediaVersion version = existing.MediaVersions.Head();
MediaVersion incomingVersion = incoming.MediaVersions.Head(); MediaVersion incomingVersion = incoming.MediaVersions.Head();
version.Name = incomingVersion.Name; version.Name = incomingVersion.Name;
version.DateAdded = incomingVersion.DateAdded; version.DateAdded = incomingVersion.DateAdded;
version.Chapters = incomingVersion.Chapters; version.Chapters = incomingVersion.Chapters;
// media file // media file
MediaFile file = version.MediaFiles.Head(); MediaFile file = version.MediaFiles.Head();
MediaFile incomingFile = incomingVersion.MediaFiles.Head(); MediaFile incomingFile = incomingVersion.MediaFiles.Head();
file.Path = incomingFile.Path; file.Path = incomingFile.Path;
await dbContext.SaveChangesAsync(cancellationToken); await dbContext.SaveChangesAsync(cancellationToken);
}
} }
private static async Task<Either<BaseError, MediaItemScanResult<JellyfinShow>>> AddShow( private static async Task<Either<BaseError, MediaItemScanResult<JellyfinShow>>> AddShow(

Write Preview
Loading…
Cancel
Save