michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fixes #354 - BaseItemXmlParser not handling MusicVideos

Browse Source
This commit is contained in:
Luke Pulverenti 2013-06-17 14:48:18 -04:00
parent 9bb1588afd
commit 95f471e8c3
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
MediaBrowser.Providers/Movies/MovieProviderFromXml.cs
View File

@ -1,12 +1,12 @@
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Logging;
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Logging;
namespace MediaBrowser.Providers.Movies
{
@ -15,7 +15,8 @@ namespace MediaBrowser.Providers.Movies
/// </summary>
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)
{
cancellationToken.ThrowIfCancellationRequested();
var metadataFile = item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.MetaLocation, "movie.xml"));
if (metadataFile != null)
{
var path = metadataFile.FullName;
var boxset = item as BoxSet;
await XmlParsingResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
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
{
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