mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-03 12:23:27 +02:00
fixes #354 - BaseItemXmlParser not handling MusicVideos
This commit is contained in:
parent
9bb1588afd
commit
95f471e8c3
|
@ -1,12 +1,12 @@
|
||||||
using MediaBrowser.Controller.Configuration;
|
using MediaBrowser.Controller.Configuration;
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Entities.Movies;
|
using MediaBrowser.Controller.Entities.Movies;
|
||||||
|
using MediaBrowser.Controller.Providers;
|
||||||
|
using MediaBrowser.Model.Logging;
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using MediaBrowser.Controller.Providers;
|
|
||||||
using MediaBrowser.Model.Logging;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Providers.Movies
|
namespace MediaBrowser.Providers.Movies
|
||||||
{
|
{
|
||||||
|
@ -15,7 +15,8 @@ namespace MediaBrowser.Providers.Movies
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class MovieProviderFromXml : BaseMetadataProvider
|
public class MovieProviderFromXml : BaseMetadataProvider
|
||||||
{
|
{
|
||||||
public MovieProviderFromXml(ILogManager logManager, IServerConfigurationManager configurationManager) : base(logManager, configurationManager)
|
public MovieProviderFromXml(ILogManager logManager, IServerConfigurationManager configurationManager)
|
||||||
|
: base(logManager, configurationManager)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -78,25 +79,49 @@ namespace MediaBrowser.Providers.Movies
|
||||||
private async Task<bool> Fetch(BaseItem item, CancellationToken cancellationToken)
|
private async Task<bool> Fetch(BaseItem item, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
var metadataFile = item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.MetaLocation, "movie.xml"));
|
var metadataFile = item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.MetaLocation, "movie.xml"));
|
||||||
|
|
||||||
if (metadataFile != null)
|
if (metadataFile != null)
|
||||||
{
|
{
|
||||||
var path = metadataFile.FullName;
|
var path = metadataFile.FullName;
|
||||||
var boxset = item as BoxSet;
|
|
||||||
|
|
||||||
await XmlParsingResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
|
await XmlParsingResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (boxset != null)
|
var movie = item as Movie;
|
||||||
|
|
||||||
|
if (movie != null)
|
||||||
{
|
{
|
||||||
new BaseItemXmlParser<BoxSet>(Logger).Fetch(boxset, path, cancellationToken);
|
new BaseItemXmlParser<Movie>(Logger).Fetch(movie, path, cancellationToken);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
new BaseItemXmlParser<Movie>(Logger).Fetch((Movie)item, path, cancellationToken);
|
var boxset = item as BoxSet;
|
||||||
|
|
||||||
|
if (boxset != null)
|
||||||
|
{
|
||||||
|
new BaseItemXmlParser<BoxSet>(Logger).Fetch(boxset, path, cancellationToken);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var musicVideo = item as MusicVideo;
|
||||||
|
|
||||||
|
if (musicVideo != null)
|
||||||
|
{
|
||||||
|
new BaseItemXmlParser<MusicVideo>(Logger).Fetch(musicVideo, path, cancellationToken);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var trailer = item as Trailer;
|
||||||
|
|
||||||
|
if (trailer != null)
|
||||||
|
{
|
||||||
|
new BaseItemXmlParser<Trailer>(Logger).Fetch(trailer, path, cancellationToken);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
|
|
Loading…
Reference in a new issue