fixes #347 - File Properties in Video file formats override local xml

This commit is contained in:
Luke Pulverenti 2013-06-13 14:45:58 -04:00
parent a2557d7981
commit a4f7eb84cd
9 changed files with 17 additions and 12 deletions

View File

@ -764,7 +764,7 @@ namespace MediaBrowser.Controller.Entities
return false;
}));
var trailers = LibraryManager.ResolvePaths<Trailer>(files, null).Select(video =>
return LibraryManager.ResolvePaths<Trailer>(files, null).Select(video =>
{
// Try to retrieve it from the db. If we don't find it, use the resolved version
var dbItem = LibraryManager.RetrieveItem(video.Id) as Trailer;
@ -776,9 +776,8 @@ namespace MediaBrowser.Controller.Entities
}
return video;
}).ToList();
return trailers;
}).ToList();
}
/// <summary>

View File

@ -37,9 +37,7 @@ namespace MediaBrowser.Providers.MediaInfo
/// <value>The priority.</value>
public override MetadataProviderPriority Priority
{
// Give this second priority
// Give metadata xml providers a chance to fill in data first, so that we can skip this whenever possible
get { return MetadataProviderPriority.Second; }
get { return MetadataProviderPriority.First; }
}
protected readonly CultureInfo UsCulture = new CultureInfo("en-US");

View File

@ -85,6 +85,14 @@ namespace MediaBrowser.Providers.Movies
}
}
public override MetadataProviderPriority Priority
{
get
{
return MetadataProviderPriority.Fourth;
}
}
/// <summary>
/// The fan art base URL
/// </summary>

View File

@ -64,7 +64,7 @@ namespace MediaBrowser.Providers.Movies
/// <value>The priority.</value>
public override MetadataProviderPriority Priority
{
get { return MetadataProviderPriority.Fourth; }
get { return MetadataProviderPriority.Last; }
}
/// <summary>

View File

@ -83,7 +83,7 @@ namespace MediaBrowser.Providers.Movies
/// <value>The priority.</value>
public override MetadataProviderPriority Priority
{
get { return MetadataProviderPriority.Second; }
get { return MetadataProviderPriority.Third; }
}
/// <summary>

View File

@ -46,7 +46,7 @@ namespace MediaBrowser.Providers.Movies
/// <value>The priority.</value>
public override MetadataProviderPriority Priority
{
get { return MetadataProviderPriority.First; }
get { return MetadataProviderPriority.Second; }
}
/// <summary>

View File

@ -42,7 +42,7 @@ namespace MediaBrowser.Providers.Movies
/// <value>The priority.</value>
public override MetadataProviderPriority Priority
{
get { return MetadataProviderPriority.First; }
get { return MetadataProviderPriority.Second; }
}
/// <summary>

View File

@ -37,7 +37,7 @@ namespace MediaBrowser.Providers.TV
/// <value>The priority.</value>
public override MetadataProviderPriority Priority
{
get { return MetadataProviderPriority.First; }
get { return MetadataProviderPriority.Second; }
}
/// <summary>

View File

@ -65,7 +65,7 @@ namespace MediaBrowser.Providers.TV
/// <value>The priority.</value>
public override MetadataProviderPriority Priority
{
get { return MetadataProviderPriority.Second; }
get { return MetadataProviderPriority.Third; }
}
/// <summary>