mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-15 09:59:06 -07:00
Remove dummy season and missing episode provider in a futile attempt to remove cruft
This commit is contained in:
cvium
parent
2a575dd67e
commit
72cd6ab071
@ -25,8 +25,6 @@ namespace MediaBrowser.Model.Configuration
|
|||||||
|
|
||||||
public bool EnableInternetProviders { get; set; }
|
public bool EnableInternetProviders { get; set; }
|
||||||
|
|
||||||
public bool ImportMissingEpisodes { get; set; }
|
|
||||||
|
|
||||||
public bool EnableAutomaticSeriesGrouping { get; set; }
|
public bool EnableAutomaticSeriesGrouping { get; set; }
|
||||||
|
|
||||||
public bool EnableEmbeddedTitles { get; set; }
|
public bool EnableEmbeddedTitles { get; set; }
|
||||||
|
|||||||
@ -80,32 +80,6 @@ namespace MediaBrowser.Providers.Plugins.TheTvdb
|
|||||||
return TryGetValue(cacheKey, language, () => TvDbClient.Episodes.GetAsync(episodeTvdbId, cancellationToken));
|
return TryGetValue(cacheKey, language, () => TvDbClient.Episodes.GetAsync(episodeTvdbId, cancellationToken));
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<List<EpisodeRecord>> GetAllEpisodesAsync(int tvdbId, string language,
|
|
||||||
CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
// Traverse all episode pages and join them together
|
|
||||||
var episodes = new List<EpisodeRecord>();
|
|
||||||
var episodePage = await GetEpisodesPageAsync(tvdbId, new EpisodeQuery(), language, cancellationToken)
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
episodes.AddRange(episodePage.Data);
|
|
||||||
if (!episodePage.Links.Next.HasValue || !episodePage.Links.Last.HasValue)
|
|
||||||
{
|
|
||||||
return episodes;
|
|
||||||
}
|
|
||||||
|
|
||||||
int next = episodePage.Links.Next.Value;
|
|
||||||
int last = episodePage.Links.Last.Value;
|
|
||||||
|
|
||||||
for (var page = next; page <= last; ++page)
|
|
||||||
{
|
|
||||||
episodePage = await GetEpisodesPageAsync(tvdbId, page, new EpisodeQuery(), language, cancellationToken)
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
episodes.AddRange(episodePage.Data);
|
|
||||||
}
|
|
||||||
|
|
||||||
return episodes;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Task<TvDbResponse<SeriesSearchResult[]>> GetSeriesByImdbIdAsync(
|
public Task<TvDbResponse<SeriesSearchResult[]>> GetSeriesByImdbIdAsync(
|
||||||
string imdbId,
|
string imdbId,
|
||||||
string language,
|
string language,
|
||||||
|
|||||||
@ -1,229 +0,0 @@
|
|||||||
#pragma warning disable CS1591
|
|
||||||
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Globalization;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using MediaBrowser.Controller.Entities.TV;
|
|
||||||
using MediaBrowser.Controller.Library;
|
|
||||||
using MediaBrowser.Controller.Providers;
|
|
||||||
using MediaBrowser.Model.Entities;
|
|
||||||
using MediaBrowser.Model.Globalization;
|
|
||||||
using MediaBrowser.Model.IO;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Providers.TV
|
|
||||||
{
|
|
||||||
public class DummySeasonProvider
|
|
||||||
{
|
|
||||||
private readonly ILogger _logger;
|
|
||||||
private readonly ILocalizationManager _localization;
|
|
||||||
private readonly ILibraryManager _libraryManager;
|
|
||||||
private readonly IFileSystem _fileSystem;
|
|
||||||
|
|
||||||
public DummySeasonProvider(
|
|
||||||
ILogger logger,
|
|
||||||
ILocalizationManager localization,
|
|
||||||
ILibraryManager libraryManager,
|
|
||||||
IFileSystem fileSystem)
|
|
||||||
{
|
|
||||||
_logger = logger;
|
|
||||||
_localization = localization;
|
|
||||||
_libraryManager = libraryManager;
|
|
||||||
_fileSystem = fileSystem;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<bool> Run(Series series, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
var seasonsRemoved = RemoveObsoleteSeasons(series);
|
|
||||||
|
|
||||||
var hasNewSeasons = await AddDummySeasonFolders(series, cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
if (hasNewSeasons)
|
|
||||||
{
|
|
||||||
// var directoryService = new DirectoryService(_fileSystem);
|
|
||||||
|
|
||||||
// await series.RefreshMetadata(new MetadataRefreshOptions(directoryService), cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
// await series.ValidateChildren(new SimpleProgress<double>(), cancellationToken, new MetadataRefreshOptions(directoryService))
|
|
||||||
// .ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
return seasonsRemoved || hasNewSeasons;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task<bool> AddDummySeasonFolders(Series series, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
var episodesInSeriesFolder = series.GetRecursiveChildren(i => i is Episode)
|
|
||||||
.Cast<Episode>()
|
|
||||||
.Where(i => !i.IsInSeasonFolder)
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
var hasChanges = false;
|
|
||||||
|
|
||||||
List<Season> seasons = null;
|
|
||||||
|
|
||||||
// Loop through the unique season numbers
|
|
||||||
foreach (var seasonNumber in episodesInSeriesFolder.Select(i => i.ParentIndexNumber ?? -1)
|
|
||||||
.Where(i => i >= 0)
|
|
||||||
.Distinct()
|
|
||||||
.ToList())
|
|
||||||
{
|
|
||||||
if (seasons == null)
|
|
||||||
{
|
|
||||||
seasons = series.Children.OfType<Season>().ToList();
|
|
||||||
}
|
|
||||||
|
|
||||||
var existingSeason = seasons
|
|
||||||
.FirstOrDefault(i => i.IndexNumber.HasValue && i.IndexNumber.Value == seasonNumber);
|
|
||||||
|
|
||||||
if (existingSeason == null)
|
|
||||||
{
|
|
||||||
await AddSeason(series, seasonNumber, false, cancellationToken).ConfigureAwait(false);
|
|
||||||
hasChanges = true;
|
|
||||||
seasons = null;
|
|
||||||
}
|
|
||||||
else if (existingSeason.IsVirtualItem)
|
|
||||||
{
|
|
||||||
existingSeason.IsVirtualItem = false;
|
|
||||||
await existingSeason.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, cancellationToken).ConfigureAwait(false);
|
|
||||||
seasons = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unknown season - create a dummy season to put these under
|
|
||||||
if (episodesInSeriesFolder.Any(i => !i.ParentIndexNumber.HasValue))
|
|
||||||
{
|
|
||||||
if (seasons == null)
|
|
||||||
{
|
|
||||||
seasons = series.Children.OfType<Season>().ToList();
|
|
||||||
}
|
|
||||||
|
|
||||||
var existingSeason = seasons
|
|
||||||
.FirstOrDefault(i => !i.IndexNumber.HasValue);
|
|
||||||
|
|
||||||
if (existingSeason == null)
|
|
||||||
{
|
|
||||||
await AddSeason(series, null, false, cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
hasChanges = true;
|
|
||||||
seasons = null;
|
|
||||||
}
|
|
||||||
else if (existingSeason.IsVirtualItem)
|
|
||||||
{
|
|
||||||
existingSeason.IsVirtualItem = false;
|
|
||||||
await existingSeason.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, cancellationToken).ConfigureAwait(false);
|
|
||||||
seasons = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return hasChanges;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Adds the season.
|
|
||||||
/// </summary>
|
|
||||||
public async Task<Season> AddSeason(
|
|
||||||
Series series,
|
|
||||||
int? seasonNumber,
|
|
||||||
bool isVirtualItem,
|
|
||||||
CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
string seasonName;
|
|
||||||
if (seasonNumber == null)
|
|
||||||
{
|
|
||||||
seasonName = _localization.GetLocalizedString("NameSeasonUnknown");
|
|
||||||
}
|
|
||||||
else if (seasonNumber == 0)
|
|
||||||
{
|
|
||||||
seasonName = _libraryManager.GetLibraryOptions(series).SeasonZeroDisplayName;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
seasonName = string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
_localization.GetLocalizedString("NameSeasonNumber"),
|
|
||||||
seasonNumber.Value);
|
|
||||||
}
|
|
||||||
|
|
||||||
_logger.LogInformation("Creating Season {0} entry for {1}", seasonName, series.Name);
|
|
||||||
|
|
||||||
var season = new Season
|
|
||||||
{
|
|
||||||
Name = seasonName,
|
|
||||||
IndexNumber = seasonNumber,
|
|
||||||
Id = _libraryManager.GetNewItemId(
|
|
||||||
series.Id + (seasonNumber ?? -1).ToString(CultureInfo.InvariantCulture) + seasonName,
|
|
||||||
typeof(Season)),
|
|
||||||
IsVirtualItem = isVirtualItem,
|
|
||||||
SeriesId = series.Id,
|
|
||||||
SeriesName = series.Name
|
|
||||||
};
|
|
||||||
|
|
||||||
season.SetParent(series);
|
|
||||||
|
|
||||||
series.AddChild(season, cancellationToken);
|
|
||||||
|
|
||||||
await season.RefreshMetadata(new MetadataRefreshOptions(new DirectoryService(_fileSystem)), cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
return season;
|
|
||||||
}
|
|
||||||
|
|
||||||
private bool RemoveObsoleteSeasons(Series series)
|
|
||||||
{
|
|
||||||
var existingSeasons = series.Children.OfType<Season>().ToList();
|
|
||||||
|
|
||||||
var physicalSeasons = existingSeasons
|
|
||||||
.Where(i => i.LocationType != LocationType.Virtual)
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
var virtualSeasons = existingSeasons
|
|
||||||
.Where(i => i.LocationType == LocationType.Virtual)
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
var seasonsToRemove = virtualSeasons
|
|
||||||
.Where(i =>
|
|
||||||
{
|
|
||||||
if (i.IndexNumber.HasValue)
|
|
||||||
{
|
|
||||||
var seasonNumber = i.IndexNumber.Value;
|
|
||||||
|
|
||||||
// If there's a physical season with the same number, delete it
|
|
||||||
if (physicalSeasons.Any(p => p.IndexNumber.HasValue && (p.IndexNumber.Value == seasonNumber)))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// If there are no episodes with this season number, delete it
|
|
||||||
if (!i.GetEpisodes().Any())
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
})
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
var hasChanges = false;
|
|
||||||
|
|
||||||
foreach (var seasonToRemove in seasonsToRemove)
|
|
||||||
{
|
|
||||||
_logger.LogInformation("Removing virtual season {0} {1}", series.Name, seasonToRemove.IndexNumber);
|
|
||||||
|
|
||||||
_libraryManager.DeleteItem(
|
|
||||||
seasonToRemove,
|
|
||||||
new DeleteOptions
|
|
||||||
{
|
|
||||||
DeleteFileLocation = true
|
|
||||||
},
|
|
||||||
false);
|
|
||||||
|
|
||||||
hasChanges = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return hasChanges;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,404 +0,0 @@
|
|||||||
#pragma warning disable CS1591
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Globalization;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using MediaBrowser.Controller.Configuration;
|
|
||||||
using MediaBrowser.Controller.Entities;
|
|
||||||
using MediaBrowser.Controller.Entities.TV;
|
|
||||||
using MediaBrowser.Controller.Library;
|
|
||||||
using MediaBrowser.Controller.Providers;
|
|
||||||
using MediaBrowser.Model.Entities;
|
|
||||||
using MediaBrowser.Model.Globalization;
|
|
||||||
using MediaBrowser.Model.IO;
|
|
||||||
using MediaBrowser.Providers.Plugins.TheTvdb;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Providers.TV
|
|
||||||
{
|
|
||||||
public class MissingEpisodeProvider
|
|
||||||
{
|
|
||||||
private const double UnairedEpisodeThresholdDays = 2;
|
|
||||||
|
|
||||||
private readonly IServerConfigurationManager _config;
|
|
||||||
private readonly ILogger _logger;
|
|
||||||
private readonly ILibraryManager _libraryManager;
|
|
||||||
private readonly ILocalizationManager _localization;
|
|
||||||
private readonly IFileSystem _fileSystem;
|
|
||||||
private readonly TvdbClientManager _tvdbClientManager;
|
|
||||||
|
|
||||||
public MissingEpisodeProvider(
|
|
||||||
ILogger logger,
|
|
||||||
IServerConfigurationManager config,
|
|
||||||
ILibraryManager libraryManager,
|
|
||||||
ILocalizationManager localization,
|
|
||||||
IFileSystem fileSystem,
|
|
||||||
TvdbClientManager tvdbClientManager)
|
|
||||||
{
|
|
||||||
_logger = logger;
|
|
||||||
_config = config;
|
|
||||||
_libraryManager = libraryManager;
|
|
||||||
_localization = localization;
|
|
||||||
_fileSystem = fileSystem;
|
|
||||||
_tvdbClientManager = tvdbClientManager;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<bool> Run(Series series, bool addNewItems, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
var tvdbIdString = series.GetProviderId(MetadataProvider.Tvdb);
|
|
||||||
if (string.IsNullOrEmpty(tvdbIdString))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
var episodes = await _tvdbClientManager.GetAllEpisodesAsync(
|
|
||||||
int.Parse(tvdbIdString, CultureInfo.InvariantCulture),
|
|
||||||
series.GetPreferredMetadataLanguage(),
|
|
||||||
cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
var episodeLookup = episodes
|
|
||||||
.Select(i =>
|
|
||||||
{
|
|
||||||
if (!DateTime.TryParse(i.FirstAired, out var firstAired))
|
|
||||||
{
|
|
||||||
firstAired = default;
|
|
||||||
}
|
|
||||||
|
|
||||||
var seasonNumber = i.AiredSeason.GetValueOrDefault(-1);
|
|
||||||
var episodeNumber = i.AiredEpisodeNumber.GetValueOrDefault(-1);
|
|
||||||
return (seasonNumber, episodeNumber, firstAired);
|
|
||||||
})
|
|
||||||
.Where(i => i.seasonNumber != -1 && i.episodeNumber != -1)
|
|
||||||
.OrderBy(i => i.seasonNumber)
|
|
||||||
.ThenBy(i => i.episodeNumber)
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
var allRecursiveChildren = series.GetRecursiveChildren();
|
|
||||||
|
|
||||||
var hasBadData = HasInvalidContent(allRecursiveChildren);
|
|
||||||
|
|
||||||
// Be conservative here to avoid creating missing episodes for ones they already have
|
|
||||||
var addMissingEpisodes = !hasBadData && _libraryManager.GetLibraryOptions(series).ImportMissingEpisodes;
|
|
||||||
|
|
||||||
var anySeasonsRemoved = RemoveObsoleteOrMissingSeasons(allRecursiveChildren, episodeLookup);
|
|
||||||
|
|
||||||
if (anySeasonsRemoved)
|
|
||||||
{
|
|
||||||
// refresh this
|
|
||||||
allRecursiveChildren = series.GetRecursiveChildren();
|
|
||||||
}
|
|
||||||
|
|
||||||
var anyEpisodesRemoved = RemoveObsoleteOrMissingEpisodes(allRecursiveChildren, episodeLookup, addMissingEpisodes);
|
|
||||||
|
|
||||||
if (anyEpisodesRemoved)
|
|
||||||
{
|
|
||||||
// refresh this
|
|
||||||
allRecursiveChildren = series.GetRecursiveChildren();
|
|
||||||
}
|
|
||||||
|
|
||||||
var hasNewEpisodes = false;
|
|
||||||
|
|
||||||
if (addNewItems && series.IsMetadataFetcherEnabled(_libraryManager.GetLibraryOptions(series), TvdbSeriesProvider.Current.Name))
|
|
||||||
{
|
|
||||||
hasNewEpisodes = await AddMissingEpisodes(series, allRecursiveChildren, addMissingEpisodes, episodeLookup, cancellationToken)
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hasNewEpisodes || anySeasonsRemoved || anyEpisodesRemoved)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Returns true if a series has any seasons or episodes without season or episode numbers
|
|
||||||
/// If this data is missing no virtual items will be added in order to prevent possible duplicates.
|
|
||||||
/// </summary>
|
|
||||||
private bool HasInvalidContent(IList<BaseItem> allItems)
|
|
||||||
{
|
|
||||||
return allItems.OfType<Season>().Any(i => !i.IndexNumber.HasValue) ||
|
|
||||||
allItems.OfType<Episode>().Any(i =>
|
|
||||||
{
|
|
||||||
if (!i.ParentIndexNumber.HasValue)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// You could have episodes under season 0 with no number
|
|
||||||
return false;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task<bool> AddMissingEpisodes(
|
|
||||||
Series series,
|
|
||||||
IEnumerable<BaseItem> allItems,
|
|
||||||
bool addMissingEpisodes,
|
|
||||||
IReadOnlyCollection<(int seasonNumber, int episodenumber, DateTime firstAired)> episodeLookup,
|
|
||||||
CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
var existingEpisodes = allItems.OfType<Episode>().ToList();
|
|
||||||
|
|
||||||
var seasonCounts = episodeLookup.GroupBy(e => e.seasonNumber).ToDictionary(g => g.Key, g => g.Count());
|
|
||||||
|
|
||||||
var hasChanges = false;
|
|
||||||
|
|
||||||
foreach (var tuple in episodeLookup)
|
|
||||||
{
|
|
||||||
if (tuple.seasonNumber <= 0 || tuple.episodenumber <= 0)
|
|
||||||
{
|
|
||||||
// Ignore episode/season zeros
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
var existingEpisode = GetExistingEpisode(existingEpisodes, seasonCounts, tuple);
|
|
||||||
|
|
||||||
if (existingEpisode != null)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
var airDate = tuple.firstAired;
|
|
||||||
|
|
||||||
var now = DateTime.UtcNow.AddDays(-UnairedEpisodeThresholdDays);
|
|
||||||
|
|
||||||
if ((airDate < now && addMissingEpisodes) || airDate > now)
|
|
||||||
{
|
|
||||||
// tvdb has a lot of nearly blank episodes
|
|
||||||
_logger.LogInformation("Creating virtual missing/unaired episode {0} {1}x{2}", series.Name, tuple.seasonNumber, tuple.episodenumber);
|
|
||||||
await AddEpisode(series, tuple.seasonNumber, tuple.episodenumber, cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
hasChanges = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return hasChanges;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Removes the virtual entry after a corresponding physical version has been added.
|
|
||||||
/// </summary>
|
|
||||||
private bool RemoveObsoleteOrMissingEpisodes(
|
|
||||||
IEnumerable<BaseItem> allRecursiveChildren,
|
|
||||||
IEnumerable<(int seasonNumber, int episodeNumber, DateTime firstAired)> episodeLookup,
|
|
||||||
bool allowMissingEpisodes)
|
|
||||||
{
|
|
||||||
var existingEpisodes = allRecursiveChildren.OfType<Episode>();
|
|
||||||
|
|
||||||
var physicalEpisodes = new List<Episode>();
|
|
||||||
var virtualEpisodes = new List<Episode>();
|
|
||||||
foreach (var episode in existingEpisodes)
|
|
||||||
{
|
|
||||||
if (episode.LocationType == LocationType.Virtual)
|
|
||||||
{
|
|
||||||
virtualEpisodes.Add(episode);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
physicalEpisodes.Add(episode);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var episodesToRemove = virtualEpisodes
|
|
||||||
.Where(i =>
|
|
||||||
{
|
|
||||||
if (!i.IndexNumber.HasValue || !i.ParentIndexNumber.HasValue)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
var seasonNumber = i.ParentIndexNumber.Value;
|
|
||||||
var episodeNumber = i.IndexNumber.Value;
|
|
||||||
|
|
||||||
// If there's a physical episode with the same season and episode number, delete it
|
|
||||||
if (physicalEpisodes.Any(p =>
|
|
||||||
p.ParentIndexNumber.HasValue && p.ParentIndexNumber.Value == seasonNumber &&
|
|
||||||
p.ContainsEpisodeNumber(episodeNumber)))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If the episode no longer exists in the remote lookup, delete it
|
|
||||||
if (!episodeLookup.Any(e => e.seasonNumber == seasonNumber && e.episodeNumber == episodeNumber))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If it's missing, but not unaired, remove it
|
|
||||||
return !allowMissingEpisodes && i.IsMissingEpisode &&
|
|
||||||
(!i.PremiereDate.HasValue ||
|
|
||||||
i.PremiereDate.Value.ToLocalTime().Date.AddDays(UnairedEpisodeThresholdDays) <
|
|
||||||
DateTime.Now.Date);
|
|
||||||
});
|
|
||||||
|
|
||||||
var hasChanges = false;
|
|
||||||
|
|
||||||
foreach (var episodeToRemove in episodesToRemove)
|
|
||||||
{
|
|
||||||
_libraryManager.DeleteItem(
|
|
||||||
episodeToRemove,
|
|
||||||
new DeleteOptions
|
|
||||||
{
|
|
||||||
DeleteFileLocation = true
|
|
||||||
},
|
|
||||||
false);
|
|
||||||
|
|
||||||
hasChanges = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return hasChanges;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Removes the obsolete or missing seasons.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="allRecursiveChildren">All recursive children.</param>
|
|
||||||
/// <param name="episodeLookup">The episode lookup.</param>
|
|
||||||
/// <returns><see cref="bool" />.</returns>
|
|
||||||
private bool RemoveObsoleteOrMissingSeasons(
|
|
||||||
IList<BaseItem> allRecursiveChildren,
|
|
||||||
IEnumerable<(int seasonNumber, int episodeNumber, DateTime firstAired)> episodeLookup)
|
|
||||||
{
|
|
||||||
var existingSeasons = allRecursiveChildren.OfType<Season>().ToList();
|
|
||||||
|
|
||||||
var physicalSeasons = new List<Season>();
|
|
||||||
var virtualSeasons = new List<Season>();
|
|
||||||
foreach (var season in existingSeasons)
|
|
||||||
{
|
|
||||||
if (season.LocationType == LocationType.Virtual)
|
|
||||||
{
|
|
||||||
virtualSeasons.Add(season);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
physicalSeasons.Add(season);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var allEpisodes = allRecursiveChildren.OfType<Episode>().ToList();
|
|
||||||
|
|
||||||
var seasonsToRemove = virtualSeasons
|
|
||||||
.Where(i =>
|
|
||||||
{
|
|
||||||
if (i.IndexNumber.HasValue)
|
|
||||||
{
|
|
||||||
var seasonNumber = i.IndexNumber.Value;
|
|
||||||
|
|
||||||
// If there's a physical season with the same number, delete it
|
|
||||||
if (physicalSeasons.Any(p => p.IndexNumber.HasValue && p.IndexNumber.Value == seasonNumber && string.Equals(p.Series.PresentationUniqueKey, i.Series.PresentationUniqueKey, StringComparison.Ordinal)))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If the season no longer exists in the remote lookup, delete it, but only if an existing episode doesn't require it
|
|
||||||
return episodeLookup.All(e => e.seasonNumber != seasonNumber) && allEpisodes.All(s => s.ParentIndexNumber != seasonNumber || s.IsInSeasonFolder);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Season does not have a number
|
|
||||||
// Remove if there are no episodes directly in series without a season number
|
|
||||||
return allEpisodes.All(s => s.ParentIndexNumber.HasValue || s.IsInSeasonFolder);
|
|
||||||
});
|
|
||||||
|
|
||||||
var hasChanges = false;
|
|
||||||
|
|
||||||
foreach (var seasonToRemove in seasonsToRemove)
|
|
||||||
{
|
|
||||||
_libraryManager.DeleteItem(
|
|
||||||
seasonToRemove,
|
|
||||||
new DeleteOptions
|
|
||||||
{
|
|
||||||
DeleteFileLocation = true
|
|
||||||
},
|
|
||||||
false);
|
|
||||||
|
|
||||||
hasChanges = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return hasChanges;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Adds the episode.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="series">The series.</param>
|
|
||||||
/// <param name="seasonNumber">The season number.</param>
|
|
||||||
/// <param name="episodeNumber">The episode number.</param>
|
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
|
||||||
/// <returns>Task.</returns>
|
|
||||||
private async Task AddEpisode(Series series, int seasonNumber, int episodeNumber, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
var season = series.Children.OfType<Season>()
|
|
||||||
.FirstOrDefault(i => i.IndexNumber.HasValue && i.IndexNumber.Value == seasonNumber);
|
|
||||||
|
|
||||||
if (season == null)
|
|
||||||
{
|
|
||||||
var provider = new DummySeasonProvider(_logger, _localization, _libraryManager, _fileSystem);
|
|
||||||
season = await provider.AddSeason(series, seasonNumber, true, cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
var name = "Episode " + episodeNumber.ToString(CultureInfo.InvariantCulture);
|
|
||||||
|
|
||||||
var episode = new Episode
|
|
||||||
{
|
|
||||||
Name = name,
|
|
||||||
IndexNumber = episodeNumber,
|
|
||||||
ParentIndexNumber = seasonNumber,
|
|
||||||
Id = _libraryManager.GetNewItemId(
|
|
||||||
series.Id + seasonNumber.ToString(CultureInfo.InvariantCulture) + name,
|
|
||||||
typeof(Episode)),
|
|
||||||
IsVirtualItem = true,
|
|
||||||
SeasonId = season?.Id ?? Guid.Empty,
|
|
||||||
SeriesId = series.Id
|
|
||||||
};
|
|
||||||
|
|
||||||
season.AddChild(episode, cancellationToken);
|
|
||||||
|
|
||||||
await episode.RefreshMetadata(new MetadataRefreshOptions(new DirectoryService(_fileSystem)), cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the existing episode.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="existingEpisodes">The existing episodes.</param>
|
|
||||||
/// <param name="seasonCounts"></param>
|
|
||||||
/// <param name="episodeTuple"></param>
|
|
||||||
/// <returns>Episode.</returns>
|
|
||||||
private Episode GetExistingEpisode(
|
|
||||||
IEnumerable<Episode> existingEpisodes,
|
|
||||||
IReadOnlyDictionary<int, int> seasonCounts,
|
|
||||||
(int seasonNumber, int episodeNumber, DateTime firstAired) episodeTuple)
|
|
||||||
{
|
|
||||||
var seasonNumber = episodeTuple.seasonNumber;
|
|
||||||
var episodeNumber = episodeTuple.episodeNumber;
|
|
||||||
|
|
||||||
while (true)
|
|
||||||
{
|
|
||||||
var episode = GetExistingEpisode(existingEpisodes, seasonNumber, episodeNumber);
|
|
||||||
if (episode != null)
|
|
||||||
{
|
|
||||||
return episode;
|
|
||||||
}
|
|
||||||
|
|
||||||
seasonNumber--;
|
|
||||||
|
|
||||||
if (seasonCounts.ContainsKey(seasonNumber))
|
|
||||||
{
|
|
||||||
episodeNumber += seasonCounts[seasonNumber];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Episode GetExistingEpisode(IEnumerable<Episode> existingEpisodes, int season, int episode)
|
|
||||||
=> existingEpisodes.FirstOrDefault(i => i.ParentIndexNumber == season && i.ContainsEpisodeNumber(episode));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,65 +1,26 @@
|
|||||||
#pragma warning disable CS1591
|
#pragma warning disable CS1591
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using MediaBrowser.Controller.Configuration;
|
using MediaBrowser.Controller.Configuration;
|
||||||
using MediaBrowser.Controller.Entities.TV;
|
using MediaBrowser.Controller.Entities.TV;
|
||||||
using MediaBrowser.Controller.Library;
|
using MediaBrowser.Controller.Library;
|
||||||
using MediaBrowser.Controller.Providers;
|
using MediaBrowser.Controller.Providers;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.Globalization;
|
|
||||||
using MediaBrowser.Model.IO;
|
using MediaBrowser.Model.IO;
|
||||||
using MediaBrowser.Providers.Manager;
|
using MediaBrowser.Providers.Manager;
|
||||||
using MediaBrowser.Providers.Plugins.TheTvdb;
|
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace MediaBrowser.Providers.TV
|
namespace MediaBrowser.Providers.TV
|
||||||
{
|
{
|
||||||
public class SeriesMetadataService : MetadataService<Series, SeriesInfo>
|
public class SeriesMetadataService : MetadataService<Series, SeriesInfo>
|
||||||
{
|
{
|
||||||
private readonly ILocalizationManager _localization;
|
|
||||||
private readonly TvdbClientManager _tvdbClientManager;
|
|
||||||
|
|
||||||
public SeriesMetadataService(
|
public SeriesMetadataService(
|
||||||
IServerConfigurationManager serverConfigurationManager,
|
IServerConfigurationManager serverConfigurationManager,
|
||||||
ILogger<SeriesMetadataService> logger,
|
ILogger<SeriesMetadataService> logger,
|
||||||
IProviderManager providerManager,
|
IProviderManager providerManager,
|
||||||
IFileSystem fileSystem,
|
IFileSystem fileSystem,
|
||||||
ILibraryManager libraryManager,
|
ILibraryManager libraryManager)
|
||||||
ILocalizationManager localization,
|
|
||||||
TvdbClientManager tvdbClientManager)
|
|
||||||
: base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager)
|
: base(serverConfigurationManager, logger, providerManager, fileSystem, libraryManager)
|
||||||
{
|
{
|
||||||
_localization = localization;
|
|
||||||
_tvdbClientManager = tvdbClientManager;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override async Task AfterMetadataRefresh(Series item, MetadataRefreshOptions refreshOptions, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
await base.AfterMetadataRefresh(item, refreshOptions, cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
var seasonProvider = new DummySeasonProvider(Logger, _localization, LibraryManager, FileSystem);
|
|
||||||
await seasonProvider.Run(item, cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
// TODO why does it not register this itself omg
|
|
||||||
var provider = new MissingEpisodeProvider(
|
|
||||||
Logger,
|
|
||||||
ServerConfigurationManager,
|
|
||||||
LibraryManager,
|
|
||||||
_localization,
|
|
||||||
FileSystem,
|
|
||||||
_tvdbClientManager);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
await provider.Run(item, true, CancellationToken.None).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Logger.LogError(ex, "Error in DummySeasonProvider for {ItemPath}", item.Path);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user