mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-21 13:10:45 +02:00
fixes #347 - File Properties in Video file formats override local xml
This commit is contained in:
parent
a2557d7981
commit
a4f7eb84cd
|
@ -764,7 +764,7 @@ namespace MediaBrowser.Controller.Entities
|
||||||
return false;
|
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
|
// 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;
|
var dbItem = LibraryManager.RetrieveItem(video.Id) as Trailer;
|
||||||
|
@ -776,9 +776,8 @@ namespace MediaBrowser.Controller.Entities
|
||||||
}
|
}
|
||||||
|
|
||||||
return video;
|
return video;
|
||||||
}).ToList();
|
|
||||||
|
|
||||||
return trailers;
|
}).ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -37,9 +37,7 @@ namespace MediaBrowser.Providers.MediaInfo
|
||||||
/// <value>The priority.</value>
|
/// <value>The priority.</value>
|
||||||
public override MetadataProviderPriority Priority
|
public override MetadataProviderPriority Priority
|
||||||
{
|
{
|
||||||
// Give this second priority
|
get { return MetadataProviderPriority.First; }
|
||||||
// Give metadata xml providers a chance to fill in data first, so that we can skip this whenever possible
|
|
||||||
get { return MetadataProviderPriority.Second; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected readonly CultureInfo UsCulture = new CultureInfo("en-US");
|
protected readonly CultureInfo UsCulture = new CultureInfo("en-US");
|
||||||
|
|
|
@ -85,6 +85,14 @@ namespace MediaBrowser.Providers.Movies
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override MetadataProviderPriority Priority
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return MetadataProviderPriority.Fourth;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The fan art base URL
|
/// The fan art base URL
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -64,7 +64,7 @@ namespace MediaBrowser.Providers.Movies
|
||||||
/// <value>The priority.</value>
|
/// <value>The priority.</value>
|
||||||
public override MetadataProviderPriority Priority
|
public override MetadataProviderPriority Priority
|
||||||
{
|
{
|
||||||
get { return MetadataProviderPriority.Fourth; }
|
get { return MetadataProviderPriority.Last; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -83,7 +83,7 @@ namespace MediaBrowser.Providers.Movies
|
||||||
/// <value>The priority.</value>
|
/// <value>The priority.</value>
|
||||||
public override MetadataProviderPriority Priority
|
public override MetadataProviderPriority Priority
|
||||||
{
|
{
|
||||||
get { return MetadataProviderPriority.Second; }
|
get { return MetadataProviderPriority.Third; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -46,7 +46,7 @@ namespace MediaBrowser.Providers.Movies
|
||||||
/// <value>The priority.</value>
|
/// <value>The priority.</value>
|
||||||
public override MetadataProviderPriority Priority
|
public override MetadataProviderPriority Priority
|
||||||
{
|
{
|
||||||
get { return MetadataProviderPriority.First; }
|
get { return MetadataProviderPriority.Second; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -42,7 +42,7 @@ namespace MediaBrowser.Providers.Movies
|
||||||
/// <value>The priority.</value>
|
/// <value>The priority.</value>
|
||||||
public override MetadataProviderPriority Priority
|
public override MetadataProviderPriority Priority
|
||||||
{
|
{
|
||||||
get { return MetadataProviderPriority.First; }
|
get { return MetadataProviderPriority.Second; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -37,7 +37,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
/// <value>The priority.</value>
|
/// <value>The priority.</value>
|
||||||
public override MetadataProviderPriority Priority
|
public override MetadataProviderPriority Priority
|
||||||
{
|
{
|
||||||
get { return MetadataProviderPriority.First; }
|
get { return MetadataProviderPriority.Second; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -65,7 +65,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
/// <value>The priority.</value>
|
/// <value>The priority.</value>
|
||||||
public override MetadataProviderPriority Priority
|
public override MetadataProviderPriority Priority
|
||||||
{
|
{
|
||||||
get { return MetadataProviderPriority.Second; }
|
get { return MetadataProviderPriority.Third; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
Loading…
Reference in a new issue