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

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Luke Pulverenti 2013-05-15 00:05:58 -04:00
commit 531a165caf
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.Controller/Providers/Movies/MovieDbImagesProvider.cs
View File

@ -152,6 +152,13 @@ namespace MediaBrowser.Controller.Providers.Movies
return true; return true;
} }
// Don't refresh if we already have both poster and backdrop and we're not refreshing images
if (item.LocationType == LocationType.FileSystem && !ConfigurationManager.Configuration.RefreshItemImages
&& item.HasLocalImage("folder") && item.HasLocalImage("backdrop"))
{
return false;
}
return base.NeedsRefreshInternal(item, providerInfo); return base.NeedsRefreshInternal(item, providerInfo);
} }

14
MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs
View File

@ -71,6 +71,14 @@ namespace MediaBrowser.Controller.Providers.TV
} }
} }
protected override bool RefreshOnFileSystemStampChange
{
get
{
return ConfigurationManager.Configuration.SaveLocalMeta;
}
}
/// <summary> /// <summary>
/// Needses the refresh internal. /// Needses the refresh internal.
/// </summary> /// </summary>
@ -168,7 +176,8 @@ namespace MediaBrowser.Controller.Providers.TV
{ {
if (ConfigurationManager.Configuration.RefreshItemImages || !season.HasLocalImage("folder")) if (ConfigurationManager.Configuration.RefreshItemImages || !season.HasLocalImage("folder"))
{ {
var n = images.SelectSingleNode("//Banner[BannerType='season'][BannerType2='season'][Season='" + seasonNumber + "']"); var n = images.SelectSingleNode("//Banner[BannerType='season'][BannerType2='season'][Season='" + seasonNumber + "'][Language='" + ConfigurationManager.Configuration.PreferredMetadataLanguage + "']") ??
images.SelectSingleNode("//Banner[BannerType='season'][BannerType2='season'][Season='" + seasonNumber + "'][Language='en']");
if (n != null) if (n != null)
{ {
n = n.SelectSingleNode("./BannerPath"); n = n.SelectSingleNode("./BannerPath");
@ -187,7 +196,8 @@ namespace MediaBrowser.Controller.Providers.TV
if (ConfigurationManager.Configuration.DownloadSeasonImages.Banner && (ConfigurationManager.Configuration.RefreshItemImages || !season.HasLocalImage("banner"))) if (ConfigurationManager.Configuration.DownloadSeasonImages.Banner && (ConfigurationManager.Configuration.RefreshItemImages || !season.HasLocalImage("banner")))
{ {
var n = images.SelectSingleNode("//Banner[BannerType='season'][BannerType2='seasonwide'][Season='" + seasonNumber + "']"); var n = images.SelectSingleNode("//Banner[BannerType='season'][BannerType2='seasonwide'][Season='" + seasonNumber + "'][Language='" + ConfigurationManager.Configuration.PreferredMetadataLanguage + "']") ??
images.SelectSingleNode("//Banner[BannerType='season'][BannerType2='seasonwide'][Season='" + seasonNumber + "'][Language='en']");
if (n != null) if (n != null)
{ {
n = n.SelectSingleNode("./BannerPath"); n = n.SelectSingleNode("./BannerPath");

6
MediaBrowser.Model/Entities/DisplayPreferences.cs
View File

@ -22,6 +22,7 @@ namespace MediaBrowser.Model.Entities
RememberIndexing = false; RememberIndexing = false;
PrimaryImageHeight = 250; PrimaryImageHeight = 250;
PrimaryImageWidth = 250; PrimaryImageWidth = 250;
ShowBackdrop = true;
CustomPrefs = new Dictionary<string, string>(); CustomPrefs = new Dictionary<string, string>();
} }
@ -71,6 +72,11 @@ namespace MediaBrowser.Model.Entities
/// <value>The scroll direction.</value> /// <value>The scroll direction.</value>
public ScrollDirection ScrollDirection { get; set; } public ScrollDirection ScrollDirection { get; set; }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether to show backdrops on this item.
/// </summary>
/// <value><c>true</c> if showing backdrops; otherwise, <c>false</c>.</value>
public bool ShowBackdrop { get; set; }
/// <summary>
/// Gets or sets a value indicating whether [remember sorting]. /// Gets or sets a value indicating whether [remember sorting].
/// </summary> /// </summary>
/// <value><c>true</c> if [remember sorting]; otherwise, <c>false</c>.</value> /// <value><c>true</c> if [remember sorting]; otherwise, <c>false</c>.</value>