mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 03:26:07 +02:00
Improve support for daily episodes
This commit is contained in:
parent
ebffea0696
commit
8a3e52bc09
10 changed files with 731 additions and 621 deletions
|
@ -1779,7 +1779,8 @@ namespace MediaBrowser.Controller.Entities
|
|||
ProviderIds = ProviderIds,
|
||||
IndexNumber = IndexNumber,
|
||||
ParentIndexNumber = ParentIndexNumber,
|
||||
Year = ProductionYear
|
||||
Year = ProductionYear,
|
||||
PremiereDate = PremiereDate
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -33,6 +33,7 @@ namespace MediaBrowser.Controller.Providers
|
|||
public int? Year { get; set; }
|
||||
public int? IndexNumber { get; set; }
|
||||
public int? ParentIndexNumber { get; set; }
|
||||
public DateTime? PremiereDate { get; set; }
|
||||
|
||||
public ItemLookupInfo()
|
||||
{
|
||||
|
|
|
@ -359,12 +359,13 @@ namespace MediaBrowser.Providers.Manager
|
|||
private void ClearImages(IHasImages item, ImageType type)
|
||||
{
|
||||
var deleted = false;
|
||||
var deletedImages = new List<ItemImageInfo>();
|
||||
|
||||
foreach (var image in item.GetImages(type).ToList())
|
||||
{
|
||||
if (!image.IsLocalFile)
|
||||
{
|
||||
// TODO: Need to get this image removed
|
||||
deletedImages.Add(image);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
@ -384,6 +385,11 @@ namespace MediaBrowser.Providers.Manager
|
|||
}
|
||||
}
|
||||
|
||||
foreach (var image in deletedImages)
|
||||
{
|
||||
item.RemoveImage(image);
|
||||
}
|
||||
|
||||
if (deleted)
|
||||
{
|
||||
item.ValidateImages(new DirectoryService(_logger, _fileSystem));
|
||||
|
|
|
@ -97,7 +97,7 @@ namespace MediaBrowser.Providers.Manager
|
|||
var itemImageProvider = new ItemImageProvider(Logger, ProviderManager, ServerConfigurationManager, FileSystem);
|
||||
var localImagesFailed = false;
|
||||
|
||||
var allImageProviders = ((ProviderManager)ProviderManager).GetImageProviders(item).ToList();
|
||||
var allImageProviders = ((ProviderManager)ProviderManager).GetImageProviders(item, refreshOptions).ToList();
|
||||
|
||||
// Start by validating images
|
||||
try
|
||||
|
|
|
@ -249,17 +249,17 @@ namespace MediaBrowser.Providers.Manager
|
|||
});
|
||||
}
|
||||
|
||||
public IEnumerable<IImageProvider> GetImageProviders(IHasImages item)
|
||||
public IEnumerable<IImageProvider> GetImageProviders(IHasImages item, ImageRefreshOptions refreshOptions)
|
||||
{
|
||||
return GetImageProviders(item, GetMetadataOptions(item), false);
|
||||
return GetImageProviders(item, GetMetadataOptions(item), refreshOptions, false);
|
||||
}
|
||||
|
||||
private IEnumerable<IImageProvider> GetImageProviders(IHasImages item, MetadataOptions options, bool includeDisabled)
|
||||
private IEnumerable<IImageProvider> GetImageProviders(IHasImages item, MetadataOptions options, ImageRefreshOptions refreshOptions, bool includeDisabled)
|
||||
{
|
||||
// Avoid implicitly captured closure
|
||||
var currentOptions = options;
|
||||
|
||||
return ImageProviders.Where(i => CanRefresh(i, item, options, includeDisabled))
|
||||
return ImageProviders.Where(i => CanRefresh(i, item, options, refreshOptions, includeDisabled))
|
||||
.OrderBy(i =>
|
||||
{
|
||||
// See if there's a user-defined order
|
||||
|
@ -315,7 +315,7 @@ namespace MediaBrowser.Providers.Manager
|
|||
{
|
||||
var options = GetMetadataOptions(item);
|
||||
|
||||
return GetImageProviders(item, options, includeDisabled).OfType<IRemoteImageProvider>();
|
||||
return GetImageProviders(item, options, new ImageRefreshOptions(new DirectoryService(_fileSystem)), includeDisabled).OfType<IRemoteImageProvider>();
|
||||
}
|
||||
|
||||
private bool CanRefresh(IMetadataProvider provider, IHasMetadata item, MetadataOptions options, bool includeDisabled, bool checkIsOwnedItem)
|
||||
|
@ -359,15 +359,18 @@ namespace MediaBrowser.Providers.Manager
|
|||
return true;
|
||||
}
|
||||
|
||||
private bool CanRefresh(IImageProvider provider, IHasImages item, MetadataOptions options, bool includeDisabled)
|
||||
private bool CanRefresh(IImageProvider provider, IHasImages item, MetadataOptions options, ImageRefreshOptions refreshOptions, bool includeDisabled)
|
||||
{
|
||||
if (!includeDisabled)
|
||||
{
|
||||
// If locked only allow local providers
|
||||
if (item.IsLocked && !(provider is ILocalImageProvider))
|
||||
{
|
||||
if (refreshOptions.ImageRefreshMode != ImageRefreshMode.FullRefresh)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (provider is IRemoteImageProvider || provider is IDynamicImageProvider)
|
||||
{
|
||||
|
@ -502,7 +505,7 @@ namespace MediaBrowser.Providers.Manager
|
|||
ItemType = typeof(T).Name
|
||||
};
|
||||
|
||||
var imageProviders = GetImageProviders(dummy, options, true).ToList();
|
||||
var imageProviders = GetImageProviders(dummy, options, new ImageRefreshOptions(new DirectoryService(_fileSystem)), true).ToList();
|
||||
|
||||
AddMetadataPlugins(summary.Plugins, dummy, options);
|
||||
AddImagePlugins(summary.Plugins, dummy, imageProviders);
|
||||
|
|
|
@ -15,6 +15,7 @@ using System;
|
|||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using CommonIO;
|
||||
|
@ -130,6 +131,8 @@ namespace MediaBrowser.Providers.Subtitles
|
|||
|
||||
try
|
||||
{
|
||||
//var isText = MediaStream.IsTextFormat(response.Format);
|
||||
|
||||
using (var fs = _fileSystem.GetFileStream(savePath, FileMode.Create, FileAccess.Write, FileShare.Read, true))
|
||||
{
|
||||
await stream.CopyToAsync(fs).ConfigureAwait(false);
|
||||
|
|
|
@ -63,33 +63,26 @@ namespace MediaBrowser.Providers.TV
|
|||
var seriesDataPath = TvdbSeriesProvider.GetSeriesDataPath(_config.ApplicationPaths, series.ProviderIds);
|
||||
var indexOffset = TvdbSeriesProvider.GetSeriesOffset(series.ProviderIds) ?? 0;
|
||||
|
||||
var files = TvdbEpisodeProvider.Current.GetEpisodeXmlFiles(episode.ParentIndexNumber + indexOffset, episode.IndexNumber, episode.IndexNumberEnd, seriesDataPath);
|
||||
var nodes = TvdbEpisodeProvider.Current.GetEpisodeXmlNodes(seriesDataPath, episode.GetLookupInfo());
|
||||
|
||||
var result = files.Select(i => GetImageInfo(i, cancellationToken))
|
||||
.Where(i => i != null);
|
||||
var result = nodes.Select(i => GetImageInfo(i, cancellationToken))
|
||||
.Where(i => i != null)
|
||||
.ToList();
|
||||
|
||||
return Task.FromResult(result);
|
||||
return Task.FromResult<IEnumerable<RemoteImageInfo>>(result);
|
||||
}
|
||||
|
||||
return Task.FromResult<IEnumerable<RemoteImageInfo>>(new RemoteImageInfo[] { });
|
||||
}
|
||||
|
||||
private RemoteImageInfo GetImageInfo(FileSystemMetadata xmlFile, CancellationToken cancellationToken)
|
||||
private RemoteImageInfo GetImageInfo(XmlReader reader, CancellationToken cancellationToken)
|
||||
{
|
||||
var height = 225;
|
||||
var width = 400;
|
||||
var url = string.Empty;
|
||||
|
||||
using (var streamReader = new StreamReader(xmlFile.FullName, Encoding.UTF8))
|
||||
{
|
||||
// Use XmlReader for best performance
|
||||
using (var reader = XmlReader.Create(streamReader, new XmlReaderSettings
|
||||
{
|
||||
CheckCharacters = false,
|
||||
IgnoreProcessingInstructions = true,
|
||||
IgnoreComments = true,
|
||||
ValidationType = ValidationType.None
|
||||
}))
|
||||
using (reader)
|
||||
{
|
||||
reader.MoveToContent();
|
||||
|
||||
|
@ -153,7 +146,6 @@ namespace MediaBrowser.Providers.TV
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(url))
|
||||
{
|
||||
|
@ -205,11 +197,9 @@ namespace MediaBrowser.Providers.TV
|
|||
if (series != null && TvdbSeriesProvider.IsValidSeries(series.ProviderIds))
|
||||
{
|
||||
// Process images
|
||||
var seriesDataPath = TvdbSeriesProvider.GetSeriesDataPath(_config.ApplicationPaths, series.ProviderIds);
|
||||
var seriesXmlPath = TvdbSeriesProvider.Current.GetSeriesXmlPath(series.ProviderIds, series.GetPreferredMetadataLanguage());
|
||||
|
||||
var files = TvdbEpisodeProvider.Current.GetEpisodeXmlFiles(episode.ParentIndexNumber, episode.IndexNumber, episode.IndexNumberEnd, seriesDataPath);
|
||||
|
||||
return files.Any(i => _fileSystem.GetLastWriteTimeUtc(i) > date);
|
||||
return _fileSystem.GetLastWriteTimeUtc(seriesXmlPath) > date;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -47,12 +47,22 @@ namespace MediaBrowser.Providers.TV
|
|||
{
|
||||
var list = new List<RemoteSearchResult>();
|
||||
|
||||
if (TvdbSeriesProvider.IsValidSeries(searchInfo.SeriesProviderIds) && searchInfo.IndexNumber.HasValue)
|
||||
// The search query must either provide an episode number or date
|
||||
if (!searchInfo.IndexNumber.HasValue && !searchInfo.PremiereDate.HasValue)
|
||||
{
|
||||
return list;
|
||||
}
|
||||
|
||||
if (TvdbSeriesProvider.IsValidSeries(searchInfo.SeriesProviderIds))
|
||||
{
|
||||
var seriesDataPath = TvdbSeriesProvider.GetSeriesDataPath(_config.ApplicationPaths, searchInfo.SeriesProviderIds);
|
||||
|
||||
var searchNumbers = new EpisodeNumbers();
|
||||
|
||||
if (searchInfo.IndexNumber.HasValue) {
|
||||
searchNumbers.EpisodeNumber = searchInfo.IndexNumber.Value;
|
||||
}
|
||||
|
||||
searchNumbers.SeasonNumber = searchInfo.ParentIndexNumber;
|
||||
searchNumbers.EpisodeNumberEnd = searchInfo.IndexNumberEnd ?? searchNumbers.EpisodeNumber;
|
||||
|
||||
|
@ -97,47 +107,17 @@ namespace MediaBrowser.Providers.TV
|
|||
|
||||
public async Task<MetadataResult<Episode>> GetMetadata(EpisodeInfo searchInfo, CancellationToken cancellationToken)
|
||||
{
|
||||
var identity = Identity.ParseIdentity(searchInfo.GetProviderId(FullIdKey));
|
||||
|
||||
if (identity == null)
|
||||
{
|
||||
await Identify(searchInfo).ConfigureAwait(false);
|
||||
identity = Identity.ParseIdentity(searchInfo.GetProviderId(FullIdKey));
|
||||
}
|
||||
|
||||
var result = new MetadataResult<Episode>();
|
||||
|
||||
if (identity != null)
|
||||
{
|
||||
var seriesProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
|
||||
seriesProviderIds[MetadataProviders.Tvdb.ToString()] = identity.Value.SeriesId;
|
||||
var seriesDataPath = TvdbSeriesProvider.GetSeriesDataPath(_config.ApplicationPaths, seriesProviderIds);
|
||||
|
||||
var searchNumbers = new EpisodeNumbers();
|
||||
searchNumbers.EpisodeNumber = identity.Value.EpisodeNumber;
|
||||
var seasonOffset = TvdbSeriesProvider.GetSeriesOffset(searchInfo.SeriesProviderIds) ?? 0;
|
||||
searchNumbers.SeasonNumber = identity.Value.SeasonIndex + seasonOffset;
|
||||
searchNumbers.EpisodeNumberEnd = identity.Value.EpisodeNumberEnd ?? searchNumbers.EpisodeNumber;
|
||||
|
||||
try
|
||||
{
|
||||
result = FetchEpisodeData(searchInfo, searchNumbers, seriesDataPath, cancellationToken);
|
||||
}
|
||||
catch (FileNotFoundException)
|
||||
{
|
||||
// Don't fail the provider because this will just keep on going and going.
|
||||
}
|
||||
catch (DirectoryNotFoundException)
|
||||
{
|
||||
// Don't fail the provider because this will just keep on going and going.
|
||||
}
|
||||
}
|
||||
else if (TvdbSeriesProvider.IsValidSeries(searchInfo.SeriesProviderIds) && searchInfo.IndexNumber.HasValue)
|
||||
if (TvdbSeriesProvider.IsValidSeries(searchInfo.SeriesProviderIds) &&
|
||||
(searchInfo.IndexNumber.HasValue || searchInfo.PremiereDate.HasValue))
|
||||
{
|
||||
var seriesDataPath = TvdbSeriesProvider.GetSeriesDataPath(_config.ApplicationPaths, searchInfo.SeriesProviderIds);
|
||||
|
||||
var searchNumbers = new EpisodeNumbers();
|
||||
if (searchInfo.IndexNumber.HasValue) {
|
||||
searchNumbers.EpisodeNumber = searchInfo.IndexNumber.Value;
|
||||
}
|
||||
searchNumbers.SeasonNumber = searchInfo.ParentIndexNumber;
|
||||
searchNumbers.EpisodeNumberEnd = searchInfo.IndexNumberEnd ?? searchNumbers.EpisodeNumber;
|
||||
|
||||
|
@ -176,11 +156,9 @@ namespace MediaBrowser.Providers.TV
|
|||
if (series != null && TvdbSeriesProvider.IsValidSeries(series.ProviderIds))
|
||||
{
|
||||
// Process images
|
||||
var seriesDataPath = TvdbSeriesProvider.GetSeriesDataPath(_config.ApplicationPaths, series.ProviderIds);
|
||||
var seriesXmlPath = TvdbSeriesProvider.Current.GetSeriesXmlPath(series.ProviderIds, series.GetPreferredMetadataLanguage());
|
||||
|
||||
var files = GetEpisodeXmlFiles(episode.ParentIndexNumber, episode.IndexNumber, episode.IndexNumberEnd, seriesDataPath);
|
||||
|
||||
return files.Any(i => _fileSystem.GetLastWriteTimeUtc(i) > date);
|
||||
return _fileSystem.GetLastWriteTimeUtc(seriesXmlPath) > date;
|
||||
}
|
||||
|
||||
return false;
|
||||
|
@ -194,7 +172,85 @@ namespace MediaBrowser.Providers.TV
|
|||
/// <param name="endingEpisodeNumber">The ending episode number.</param>
|
||||
/// <param name="seriesDataPath">The series data path.</param>
|
||||
/// <returns>List{FileInfo}.</returns>
|
||||
internal List<FileSystemMetadata> GetEpisodeXmlFiles(int? seasonNumber, int? episodeNumber, int? endingEpisodeNumber, string seriesDataPath)
|
||||
internal List<XmlReader> GetEpisodeXmlNodes(string seriesDataPath, EpisodeInfo searchInfo)
|
||||
{
|
||||
var seriesXmlPath = TvdbSeriesProvider.Current.GetSeriesXmlPath (searchInfo.SeriesProviderIds, searchInfo.MetadataLanguage);
|
||||
|
||||
try
|
||||
{
|
||||
return GetXmlNodes(seriesXmlPath, searchInfo);
|
||||
}
|
||||
catch (DirectoryNotFoundException)
|
||||
{
|
||||
return new List<XmlReader> ();
|
||||
}
|
||||
catch (FileNotFoundException)
|
||||
{
|
||||
return new List<XmlReader> ();
|
||||
}
|
||||
}
|
||||
|
||||
private class EpisodeNumbers
|
||||
{
|
||||
public int EpisodeNumber;
|
||||
public int? SeasonNumber;
|
||||
public int EpisodeNumberEnd;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Fetches the episode data.
|
||||
/// </summary>
|
||||
/// <param name="id">The identifier.</param>
|
||||
/// <param name="searchNumbers">The search numbers.</param>
|
||||
/// <param name="seriesDataPath">The series data path.</param>
|
||||
/// <param name="cancellationToken">The cancellation token.</param>
|
||||
/// <returns>Task{System.Boolean}.</returns>
|
||||
private MetadataResult<Episode> FetchEpisodeData(EpisodeInfo id, EpisodeNumbers searchNumbers, string seriesDataPath, CancellationToken cancellationToken)
|
||||
{
|
||||
var result = new MetadataResult<Episode>()
|
||||
{
|
||||
Item = new Episode
|
||||
{
|
||||
IndexNumber = id.IndexNumber,
|
||||
ParentIndexNumber = id.ParentIndexNumber,
|
||||
IndexNumberEnd = id.IndexNumberEnd
|
||||
}
|
||||
};
|
||||
|
||||
var xmlNodes = GetEpisodeXmlNodes (seriesDataPath, id);
|
||||
|
||||
if (xmlNodes.Count > 0) {
|
||||
FetchMainEpisodeInfo(result, xmlNodes[0], cancellationToken);
|
||||
|
||||
result.HasMetadata = true;
|
||||
}
|
||||
|
||||
foreach (var node in xmlNodes.Skip(1)) {
|
||||
FetchAdditionalPartInfo(result, node, cancellationToken);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private List<XmlReader> GetXmlNodes(string xmlFile, EpisodeInfo searchInfo)
|
||||
{
|
||||
var list = new List<XmlReader> ();
|
||||
|
||||
if (searchInfo.IndexNumber.HasValue)
|
||||
{
|
||||
var files = GetEpisodeXmlFiles (searchInfo.ParentIndexNumber, searchInfo.IndexNumber, searchInfo.IndexNumberEnd, Path.GetDirectoryName (xmlFile));
|
||||
|
||||
list = files.Select (GetXmlReader).ToList ();
|
||||
}
|
||||
|
||||
if (list.Count == 0 && searchInfo.PremiereDate.HasValue) {
|
||||
list = GetXmlNodesByPremiereDate (xmlFile, searchInfo.PremiereDate.Value);
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
private List<FileSystemMetadata> GetEpisodeXmlFiles(int? seasonNumber, int? episodeNumber, int? endingEpisodeNumber, string seriesDataPath)
|
||||
{
|
||||
var files = new List<FileSystemMetadata>();
|
||||
|
||||
|
@ -258,111 +314,30 @@ namespace MediaBrowser.Providers.TV
|
|||
return files;
|
||||
}
|
||||
|
||||
private class EpisodeNumbers
|
||||
private XmlReader GetXmlReader(FileSystemMetadata xmlFile)
|
||||
{
|
||||
public int EpisodeNumber;
|
||||
public int? SeasonNumber;
|
||||
public int EpisodeNumberEnd;
|
||||
return GetXmlReader (_fileSystem.ReadAllText(xmlFile.FullName, Encoding.UTF8));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Fetches the episode data.
|
||||
/// </summary>
|
||||
/// <param name="id">The identifier.</param>
|
||||
/// <param name="searchNumbers">The search numbers.</param>
|
||||
/// <param name="seriesDataPath">The series data path.</param>
|
||||
/// <param name="cancellationToken">The cancellation token.</param>
|
||||
/// <returns>Task{System.Boolean}.</returns>
|
||||
private MetadataResult<Episode> FetchEpisodeData(EpisodeInfo id, EpisodeNumbers searchNumbers, string seriesDataPath, CancellationToken cancellationToken)
|
||||
private XmlReader GetXmlReader(String xml)
|
||||
{
|
||||
var episodeNumber = searchNumbers.EpisodeNumber;
|
||||
var seasonNumber = searchNumbers.SeasonNumber;
|
||||
var streamReader = new StringReader (xml);
|
||||
|
||||
string file;
|
||||
var usingAbsoluteData = false;
|
||||
|
||||
var result = new MetadataResult<Episode>()
|
||||
{
|
||||
Item = new Episode
|
||||
{
|
||||
IndexNumber = id.IndexNumber,
|
||||
ParentIndexNumber = id.ParentIndexNumber,
|
||||
IndexNumberEnd = id.IndexNumberEnd
|
||||
}
|
||||
};
|
||||
|
||||
try
|
||||
{
|
||||
if (seasonNumber != null)
|
||||
{
|
||||
file = Path.Combine(seriesDataPath, string.Format("episode-{0}-{1}.xml", seasonNumber.Value, episodeNumber));
|
||||
FetchMainEpisodeInfo(result, file, cancellationToken);
|
||||
|
||||
result.HasMetadata = true;
|
||||
}
|
||||
}
|
||||
catch (FileNotFoundException)
|
||||
{
|
||||
// Could be using absolute numbering
|
||||
if (seasonNumber.HasValue && seasonNumber.Value != 1)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
return XmlReader.Create (streamReader, new XmlReaderSettings {
|
||||
CheckCharacters = false,
|
||||
IgnoreProcessingInstructions = true,
|
||||
IgnoreComments = true,
|
||||
ValidationType = ValidationType.None
|
||||
});
|
||||
}
|
||||
|
||||
if (!result.HasMetadata)
|
||||
private List<XmlReader> GetXmlNodesByPremiereDate(string xmlFile, DateTime premiereDate)
|
||||
{
|
||||
file = Path.Combine(seriesDataPath, string.Format("episode-abs-{0}.xml", episodeNumber));
|
||||
var list = new List<XmlReader> ();
|
||||
|
||||
FetchMainEpisodeInfo(result, file, cancellationToken);
|
||||
result.HasMetadata = true;
|
||||
usingAbsoluteData = true;
|
||||
}
|
||||
|
||||
var end = searchNumbers.EpisodeNumberEnd;
|
||||
episodeNumber++;
|
||||
|
||||
while (episodeNumber <= end)
|
||||
{
|
||||
if (usingAbsoluteData)
|
||||
{
|
||||
file = Path.Combine(seriesDataPath, string.Format("episode-abs-{0}.xml", episodeNumber));
|
||||
}
|
||||
else
|
||||
{
|
||||
file = Path.Combine(seriesDataPath, string.Format("episode-{0}-{1}.xml", seasonNumber.Value, episodeNumber));
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
FetchAdditionalPartInfo(result, file, cancellationToken);
|
||||
}
|
||||
catch (FileNotFoundException)
|
||||
{
|
||||
break;
|
||||
}
|
||||
catch (DirectoryNotFoundException)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
episodeNumber++;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private readonly CultureInfo _usCulture = new CultureInfo("en-US");
|
||||
|
||||
private void FetchMainEpisodeInfo(MetadataResult<Episode> result, string xmlFile, CancellationToken cancellationToken)
|
||||
{
|
||||
var item = result.Item;
|
||||
|
||||
using (var streamReader = new StreamReader(xmlFile, Encoding.UTF8))
|
||||
{
|
||||
using (var streamReader = new StreamReader (xmlFile, Encoding.UTF8)) {
|
||||
// Use XmlReader for best performance
|
||||
using (var reader = XmlReader.Create(streamReader, new XmlReaderSettings
|
||||
{
|
||||
using (var reader = XmlReader.Create (streamReader, new XmlReaderSettings {
|
||||
CheckCharacters = false,
|
||||
IgnoreProcessingInstructions = true,
|
||||
IgnoreComments = true,
|
||||
|
@ -371,6 +346,98 @@ namespace MediaBrowser.Providers.TV
|
|||
{
|
||||
reader.MoveToContent();
|
||||
|
||||
// Loop through each element
|
||||
while (reader.Read())
|
||||
{
|
||||
if (reader.NodeType == XmlNodeType.Element)
|
||||
{
|
||||
switch (reader.Name)
|
||||
{
|
||||
case "Episode":
|
||||
{
|
||||
var outerXml = reader.ReadOuterXml();
|
||||
|
||||
var airDate = GetEpisodeAirDate (outerXml);
|
||||
|
||||
if (airDate.HasValue && premiereDate.Date == airDate.Value.Date)
|
||||
{
|
||||
list.Add (GetXmlReader(outerXml));
|
||||
return list;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
reader.Skip();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
private DateTime? GetEpisodeAirDate(string xml)
|
||||
{
|
||||
using (var streamReader = new StringReader (xml))
|
||||
{
|
||||
// Use XmlReader for best performance
|
||||
using (var reader = XmlReader.Create (streamReader, new XmlReaderSettings {
|
||||
CheckCharacters = false,
|
||||
IgnoreProcessingInstructions = true,
|
||||
IgnoreComments = true,
|
||||
ValidationType = ValidationType.None
|
||||
}))
|
||||
{
|
||||
reader.MoveToContent ();
|
||||
|
||||
// Loop through each element
|
||||
while (reader.Read ()) {
|
||||
|
||||
if (reader.NodeType == XmlNodeType.Element) {
|
||||
switch (reader.Name) {
|
||||
|
||||
case "FirstAired":
|
||||
{
|
||||
var val = reader.ReadElementContentAsString ();
|
||||
|
||||
if (!string.IsNullOrWhiteSpace (val)) {
|
||||
DateTime date;
|
||||
if (DateTime.TryParse (val, out date)) {
|
||||
date = date.ToUniversalTime ();
|
||||
|
||||
return date;
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
reader.Skip ();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private readonly CultureInfo _usCulture = new CultureInfo("en-US");
|
||||
|
||||
private void FetchMainEpisodeInfo(MetadataResult<Episode> result, XmlReader reader, CancellationToken cancellationToken)
|
||||
{
|
||||
var item = result.Item;
|
||||
|
||||
// Use XmlReader for best performance
|
||||
using (reader)
|
||||
{
|
||||
reader.MoveToContent();
|
||||
|
||||
result.ResetPeople();
|
||||
|
||||
// Loop through each element
|
||||
|
@ -436,6 +503,48 @@ namespace MediaBrowser.Providers.TV
|
|||
break;
|
||||
}
|
||||
|
||||
case "EpisodeNumber":
|
||||
{
|
||||
if (!item.IndexNumber.HasValue)
|
||||
{
|
||||
var val = reader.ReadElementContentAsString();
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(val))
|
||||
{
|
||||
int rval;
|
||||
|
||||
// int.TryParse is local aware, so it can be probamatic, force us culture
|
||||
if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
|
||||
{
|
||||
item.IndexNumber = rval;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case "SeasonNumber":
|
||||
{
|
||||
if (!item.ParentIndexNumber.HasValue)
|
||||
{
|
||||
var val = reader.ReadElementContentAsString();
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(val))
|
||||
{
|
||||
int rval;
|
||||
|
||||
// int.TryParse is local aware, so it can be probamatic, force us culture
|
||||
if (int.TryParse(val, NumberStyles.Integer, _usCulture, out rval))
|
||||
{
|
||||
item.ParentIndexNumber = rval;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case "absolute_number":
|
||||
{
|
||||
var val = reader.ReadElementContentAsString();
|
||||
|
@ -637,7 +746,6 @@ namespace MediaBrowser.Providers.TV
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void AddPeople<T>(MetadataResult<T> result, string val, string personType)
|
||||
{
|
||||
|
@ -680,20 +788,12 @@ namespace MediaBrowser.Providers.TV
|
|||
}
|
||||
}
|
||||
|
||||
private void FetchAdditionalPartInfo(MetadataResult<Episode> result, string xmlFile, CancellationToken cancellationToken)
|
||||
private void FetchAdditionalPartInfo(MetadataResult<Episode> result, XmlReader reader, CancellationToken cancellationToken)
|
||||
{
|
||||
var item = result.Item;
|
||||
|
||||
using (var streamReader = new StreamReader(xmlFile, Encoding.UTF8))
|
||||
{
|
||||
// Use XmlReader for best performance
|
||||
using (var reader = XmlReader.Create(streamReader, new XmlReaderSettings
|
||||
{
|
||||
CheckCharacters = false,
|
||||
IgnoreProcessingInstructions = true,
|
||||
IgnoreComments = true,
|
||||
ValidationType = ValidationType.None
|
||||
}))
|
||||
using (reader)
|
||||
{
|
||||
reader.MoveToContent();
|
||||
|
||||
|
@ -782,7 +882,6 @@ namespace MediaBrowser.Providers.TV
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
|
||||
{
|
||||
|
|
|
@ -161,9 +161,7 @@ namespace MediaBrowser.Providers.TV
|
|||
|
||||
var seriesDataPath = GetSeriesDataPath(_config.ApplicationPaths, seriesProviderIds);
|
||||
|
||||
var seriesXmlFilename = metadataLanguage.ToLower() + ".xml";
|
||||
|
||||
var seriesXmlPath = Path.Combine(seriesDataPath, seriesXmlFilename);
|
||||
var seriesXmlPath = GetSeriesXmlPath (seriesProviderIds, metadataLanguage);
|
||||
var actorsXmlPath = Path.Combine(seriesDataPath, "actors.xml");
|
||||
|
||||
FetchSeriesInfo(series, seriesXmlPath, cancellationToken);
|
||||
|
@ -1278,6 +1276,15 @@ namespace MediaBrowser.Providers.TV
|
|||
return null;
|
||||
}
|
||||
|
||||
public string GetSeriesXmlPath(Dictionary<string, string> seriesProviderIds, string language)
|
||||
{
|
||||
var seriesDataPath = GetSeriesDataPath(_config.ApplicationPaths, seriesProviderIds);
|
||||
|
||||
var seriesXmlFilename = language.ToLower() + ".xml";
|
||||
|
||||
return Path.Combine (seriesDataPath, seriesXmlFilename);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the series data path.
|
||||
/// </summary>
|
||||
|
|
Loading…
Reference in a new issue