fixes #1145 - Improve support for daily episodes
This commit is contained in:
parent
1e470a15d6
commit
47f3571aea
|
@ -1779,7 +1779,8 @@ namespace MediaBrowser.Controller.Entities
|
||||||
ProviderIds = ProviderIds,
|
ProviderIds = ProviderIds,
|
||||||
IndexNumber = IndexNumber,
|
IndexNumber = IndexNumber,
|
||||||
ParentIndexNumber = ParentIndexNumber,
|
ParentIndexNumber = ParentIndexNumber,
|
||||||
Year = ProductionYear
|
Year = ProductionYear,
|
||||||
|
PremiereDate = PremiereDate
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@ namespace MediaBrowser.Controller.Providers
|
||||||
public int? Year { get; set; }
|
public int? Year { get; set; }
|
||||||
public int? IndexNumber { get; set; }
|
public int? IndexNumber { get; set; }
|
||||||
public int? ParentIndexNumber { get; set; }
|
public int? ParentIndexNumber { get; set; }
|
||||||
|
public DateTime? PremiereDate { get; set; }
|
||||||
|
|
||||||
public ItemLookupInfo()
|
public ItemLookupInfo()
|
||||||
{
|
{
|
||||||
|
|
|
@ -63,33 +63,26 @@ namespace MediaBrowser.Providers.TV
|
||||||
var seriesDataPath = TvdbSeriesProvider.GetSeriesDataPath(_config.ApplicationPaths, series.ProviderIds);
|
var seriesDataPath = TvdbSeriesProvider.GetSeriesDataPath(_config.ApplicationPaths, series.ProviderIds);
|
||||||
var indexOffset = TvdbSeriesProvider.GetSeriesOffset(series.ProviderIds) ?? 0;
|
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))
|
var result = nodes.Select(i => GetImageInfo(i, cancellationToken))
|
||||||
.Where(i => i != null);
|
.Where(i => i != null)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
return Task.FromResult(result);
|
return Task.FromResult<IEnumerable<RemoteImageInfo>>(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Task.FromResult<IEnumerable<RemoteImageInfo>>(new RemoteImageInfo[] { });
|
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 height = 225;
|
||||||
var width = 400;
|
var width = 400;
|
||||||
var url = string.Empty;
|
var url = string.Empty;
|
||||||
|
|
||||||
using (var streamReader = new StreamReader(xmlFile.FullName, Encoding.UTF8))
|
|
||||||
{
|
|
||||||
// Use XmlReader for best performance
|
// Use XmlReader for best performance
|
||||||
using (var reader = XmlReader.Create(streamReader, new XmlReaderSettings
|
using (reader)
|
||||||
{
|
|
||||||
CheckCharacters = false,
|
|
||||||
IgnoreProcessingInstructions = true,
|
|
||||||
IgnoreComments = true,
|
|
||||||
ValidationType = ValidationType.None
|
|
||||||
}))
|
|
||||||
{
|
{
|
||||||
reader.MoveToContent();
|
reader.MoveToContent();
|
||||||
|
|
||||||
|
@ -153,7 +146,6 @@ namespace MediaBrowser.Providers.TV
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(url))
|
if (string.IsNullOrEmpty(url))
|
||||||
{
|
{
|
||||||
|
@ -205,11 +197,9 @@ namespace MediaBrowser.Providers.TV
|
||||||
if (series != null && TvdbSeriesProvider.IsValidSeries(series.ProviderIds))
|
if (series != null && TvdbSeriesProvider.IsValidSeries(series.ProviderIds))
|
||||||
{
|
{
|
||||||
// Process images
|
// 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 _fileSystem.GetLastWriteTimeUtc(seriesXmlPath) > date;
|
||||||
|
|
||||||
return files.Any(i => _fileSystem.GetLastWriteTimeUtc(i) > date);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,12 +47,22 @@ namespace MediaBrowser.Providers.TV
|
||||||
{
|
{
|
||||||
var list = new List<RemoteSearchResult>();
|
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 seriesDataPath = TvdbSeriesProvider.GetSeriesDataPath(_config.ApplicationPaths, searchInfo.SeriesProviderIds);
|
||||||
|
|
||||||
var searchNumbers = new EpisodeNumbers();
|
var searchNumbers = new EpisodeNumbers();
|
||||||
|
|
||||||
|
if (searchInfo.IndexNumber.HasValue) {
|
||||||
searchNumbers.EpisodeNumber = searchInfo.IndexNumber.Value;
|
searchNumbers.EpisodeNumber = searchInfo.IndexNumber.Value;
|
||||||
|
}
|
||||||
|
|
||||||
searchNumbers.SeasonNumber = searchInfo.ParentIndexNumber;
|
searchNumbers.SeasonNumber = searchInfo.ParentIndexNumber;
|
||||||
searchNumbers.EpisodeNumberEnd = searchInfo.IndexNumberEnd ?? searchNumbers.EpisodeNumber;
|
searchNumbers.EpisodeNumberEnd = searchInfo.IndexNumberEnd ?? searchNumbers.EpisodeNumber;
|
||||||
|
|
||||||
|
@ -97,47 +107,17 @@ namespace MediaBrowser.Providers.TV
|
||||||
|
|
||||||
public async Task<MetadataResult<Episode>> GetMetadata(EpisodeInfo searchInfo, CancellationToken cancellationToken)
|
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>();
|
var result = new MetadataResult<Episode>();
|
||||||
|
|
||||||
if (identity != null)
|
if (TvdbSeriesProvider.IsValidSeries(searchInfo.SeriesProviderIds) &&
|
||||||
{
|
(searchInfo.IndexNumber.HasValue || searchInfo.PremiereDate.HasValue))
|
||||||
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)
|
|
||||||
{
|
{
|
||||||
var seriesDataPath = TvdbSeriesProvider.GetSeriesDataPath(_config.ApplicationPaths, searchInfo.SeriesProviderIds);
|
var seriesDataPath = TvdbSeriesProvider.GetSeriesDataPath(_config.ApplicationPaths, searchInfo.SeriesProviderIds);
|
||||||
|
|
||||||
var searchNumbers = new EpisodeNumbers();
|
var searchNumbers = new EpisodeNumbers();
|
||||||
|
if (searchInfo.IndexNumber.HasValue) {
|
||||||
searchNumbers.EpisodeNumber = searchInfo.IndexNumber.Value;
|
searchNumbers.EpisodeNumber = searchInfo.IndexNumber.Value;
|
||||||
|
}
|
||||||
searchNumbers.SeasonNumber = searchInfo.ParentIndexNumber;
|
searchNumbers.SeasonNumber = searchInfo.ParentIndexNumber;
|
||||||
searchNumbers.EpisodeNumberEnd = searchInfo.IndexNumberEnd ?? searchNumbers.EpisodeNumber;
|
searchNumbers.EpisodeNumberEnd = searchInfo.IndexNumberEnd ?? searchNumbers.EpisodeNumber;
|
||||||
|
|
||||||
|
@ -176,11 +156,9 @@ namespace MediaBrowser.Providers.TV
|
||||||
if (series != null && TvdbSeriesProvider.IsValidSeries(series.ProviderIds))
|
if (series != null && TvdbSeriesProvider.IsValidSeries(series.ProviderIds))
|
||||||
{
|
{
|
||||||
// Process images
|
// 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 _fileSystem.GetLastWriteTimeUtc(seriesXmlPath) > date;
|
||||||
|
|
||||||
return files.Any(i => _fileSystem.GetLastWriteTimeUtc(i) > date);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -194,7 +172,85 @@ namespace MediaBrowser.Providers.TV
|
||||||
/// <param name="endingEpisodeNumber">The ending episode number.</param>
|
/// <param name="endingEpisodeNumber">The ending episode number.</param>
|
||||||
/// <param name="seriesDataPath">The series data path.</param>
|
/// <param name="seriesDataPath">The series data path.</param>
|
||||||
/// <returns>List{FileInfo}.</returns>
|
/// <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>();
|
var files = new List<FileSystemMetadata>();
|
||||||
|
|
||||||
|
@ -258,111 +314,30 @@ namespace MediaBrowser.Providers.TV
|
||||||
return files;
|
return files;
|
||||||
}
|
}
|
||||||
|
|
||||||
private class EpisodeNumbers
|
private XmlReader GetXmlReader(FileSystemMetadata xmlFile)
|
||||||
{
|
{
|
||||||
public int EpisodeNumber;
|
return GetXmlReader (_fileSystem.ReadAllText(xmlFile.FullName, Encoding.UTF8));
|
||||||
public int? SeasonNumber;
|
|
||||||
public int EpisodeNumberEnd;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
private XmlReader GetXmlReader(String xml)
|
||||||
/// 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 episodeNumber = searchNumbers.EpisodeNumber;
|
var streamReader = new StringReader (xml);
|
||||||
var seasonNumber = searchNumbers.SeasonNumber;
|
|
||||||
|
|
||||||
string file;
|
return XmlReader.Create (streamReader, new XmlReaderSettings {
|
||||||
var usingAbsoluteData = false;
|
CheckCharacters = false,
|
||||||
|
IgnoreProcessingInstructions = true,
|
||||||
var result = new MetadataResult<Episode>()
|
IgnoreComments = true,
|
||||||
{
|
ValidationType = ValidationType.None
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
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);
|
using (var streamReader = new StreamReader (xmlFile, Encoding.UTF8)) {
|
||||||
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))
|
|
||||||
{
|
|
||||||
// Use XmlReader for best performance
|
// Use XmlReader for best performance
|
||||||
using (var reader = XmlReader.Create(streamReader, new XmlReaderSettings
|
using (var reader = XmlReader.Create (streamReader, new XmlReaderSettings {
|
||||||
{
|
|
||||||
CheckCharacters = false,
|
CheckCharacters = false,
|
||||||
IgnoreProcessingInstructions = true,
|
IgnoreProcessingInstructions = true,
|
||||||
IgnoreComments = true,
|
IgnoreComments = true,
|
||||||
|
@ -371,6 +346,98 @@ namespace MediaBrowser.Providers.TV
|
||||||
{
|
{
|
||||||
reader.MoveToContent();
|
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();
|
result.ResetPeople();
|
||||||
|
|
||||||
// Loop through each element
|
// Loop through each element
|
||||||
|
@ -637,7 +704,6 @@ namespace MediaBrowser.Providers.TV
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private void AddPeople<T>(MetadataResult<T> result, string val, string personType)
|
private void AddPeople<T>(MetadataResult<T> result, string val, string personType)
|
||||||
{
|
{
|
||||||
|
@ -680,20 +746,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;
|
var item = result.Item;
|
||||||
|
|
||||||
using (var streamReader = new StreamReader(xmlFile, Encoding.UTF8))
|
|
||||||
{
|
|
||||||
// Use XmlReader for best performance
|
// Use XmlReader for best performance
|
||||||
using (var reader = XmlReader.Create(streamReader, new XmlReaderSettings
|
using (reader)
|
||||||
{
|
|
||||||
CheckCharacters = false,
|
|
||||||
IgnoreProcessingInstructions = true,
|
|
||||||
IgnoreComments = true,
|
|
||||||
ValidationType = ValidationType.None
|
|
||||||
}))
|
|
||||||
{
|
{
|
||||||
reader.MoveToContent();
|
reader.MoveToContent();
|
||||||
|
|
||||||
|
@ -782,7 +840,6 @@ namespace MediaBrowser.Providers.TV
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
|
public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
|
|
|
@ -161,9 +161,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
|
|
||||||
var seriesDataPath = GetSeriesDataPath(_config.ApplicationPaths, seriesProviderIds);
|
var seriesDataPath = GetSeriesDataPath(_config.ApplicationPaths, seriesProviderIds);
|
||||||
|
|
||||||
var seriesXmlFilename = metadataLanguage.ToLower() + ".xml";
|
var seriesXmlPath = GetSeriesXmlPath (seriesProviderIds, metadataLanguage);
|
||||||
|
|
||||||
var seriesXmlPath = Path.Combine(seriesDataPath, seriesXmlFilename);
|
|
||||||
var actorsXmlPath = Path.Combine(seriesDataPath, "actors.xml");
|
var actorsXmlPath = Path.Combine(seriesDataPath, "actors.xml");
|
||||||
|
|
||||||
FetchSeriesInfo(series, seriesXmlPath, cancellationToken);
|
FetchSeriesInfo(series, seriesXmlPath, cancellationToken);
|
||||||
|
@ -1278,6 +1276,15 @@ namespace MediaBrowser.Providers.TV
|
||||||
return null;
|
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>
|
/// <summary>
|
||||||
/// Gets the series data path.
|
/// Gets the series data path.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -1067,9 +1067,6 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\credentials.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\credentials.js">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\credentials.js</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\credentials.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\deferred.js">
|
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\deferred.js</Link>
|
|
||||||
</BundleResource>
|
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\events.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\events.js">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\events.js</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\events.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -1079,9 +1076,6 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\localassetmanager.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\localassetmanager.js">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\localassetmanager.js</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\localassetmanager.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\logger.js">
|
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\logger.js</Link>
|
|
||||||
</BundleResource>
|
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\serverdiscovery.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\serverdiscovery.js">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\serverdiscovery.js</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-apiclient\serverdiscovery.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -1109,6 +1103,21 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-icons\emby-icons.html">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-icons\emby-icons.html">
|
||||||
<Link>Resources\dashboard-ui\bower_components\emby-icons\emby-icons.html</Link>
|
<Link>Resources\dashboard-ui\bower_components\emby-icons\emby-icons.html</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\.bower.json">
|
||||||
|
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\.bower.json</Link>
|
||||||
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\LICENSE">
|
||||||
|
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\LICENSE</Link>
|
||||||
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\README.md">
|
||||||
|
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\README.md</Link>
|
||||||
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\bower.json">
|
||||||
|
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\bower.json</Link>
|
||||||
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\requirehtml.js">
|
||||||
|
<Link>Resources\dashboard-ui\bower_components\emby-webcomponents\requirehtml.js</Link>
|
||||||
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\fastclick\.bower.json">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\fastclick\.bower.json">
|
||||||
<Link>Resources\dashboard-ui\bower_components\fastclick\.bower.json</Link>
|
<Link>Resources\dashboard-ui\bower_components\fastclick\.bower.json</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -4175,9 +4184,6 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\requirecss.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\requirecss.js">
|
||||||
<Link>Resources\dashboard-ui\components\requirecss.js</Link>
|
<Link>Resources\dashboard-ui\components\requirecss.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\requirehtml.js">
|
|
||||||
<Link>Resources\dashboard-ui\components\requirehtml.js</Link>
|
|
||||||
</BundleResource>
|
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\sharingwidget.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\sharingwidget.js">
|
||||||
<Link>Resources\dashboard-ui\components\sharingwidget.js</Link>
|
<Link>Resources\dashboard-ui\components\sharingwidget.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
@ -4667,6 +4673,9 @@
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\legacy\buttonenabled.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\legacy\buttonenabled.js">
|
||||||
<Link>Resources\dashboard-ui\legacy\buttonenabled.js</Link>
|
<Link>Resources\dashboard-ui\legacy\buttonenabled.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\legacy\deferred.js">
|
||||||
|
<Link>Resources\dashboard-ui\legacy\deferred.js</Link>
|
||||||
|
</BundleResource>
|
||||||
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\aboutpage.js">
|
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\aboutpage.js">
|
||||||
<Link>Resources\dashboard-ui\scripts\aboutpage.js</Link>
|
<Link>Resources\dashboard-ui\scripts\aboutpage.js</Link>
|
||||||
</BundleResource>
|
</BundleResource>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user