From a25fb37c803b0e6b394c3eda232b22e8b5910940 Mon Sep 17 00:00:00 2001 From: Luke Date: Sat, 17 Dec 2016 21:48:00 -0500 Subject: [PATCH 1/2] update mac project --- .../Emby.Server.Mac.csproj | 53 ++++++++++++------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index b4f383a077..c4b1af7a86 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -257,22 +257,9 @@ - - - False - Dynamic - - - False - Dynamic - - - - Resources\dashboard-ui\about.html - Resources\dashboard-ui\addplugin.html @@ -960,6 +947,9 @@ Resources\dashboard-ui\bower_components\emby-apiclient\localassetmanager.js + + Resources\dashboard-ui\bower_components\emby-apiclient\nullassetmanager.js + Resources\dashboard-ui\bower_components\emby-apiclient\serverdiscovery-chrome.js @@ -975,6 +965,12 @@ Resources\dashboard-ui\bower_components\emby-apiclient\sync\contentuploader.js + + Resources\dashboard-ui\bower_components\emby-apiclient\sync\filerepository.js + + + Resources\dashboard-ui\bower_components\emby-apiclient\sync\itemrepository.js + Resources\dashboard-ui\bower_components\emby-apiclient\sync\localsync.js @@ -990,6 +986,15 @@ Resources\dashboard-ui\bower_components\emby-apiclient\sync\serversync.js + + Resources\dashboard-ui\bower_components\emby-apiclient\sync\transfermanager.js + + + Resources\dashboard-ui\bower_components\emby-apiclient\sync\useractionrepository.js + + + Resources\dashboard-ui\bower_components\emby-apiclient\sync\userrepository.js + Resources\dashboard-ui\bower_components\emby-webcomponents\.bower.json @@ -1038,6 +1043,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\globalize.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\idb.js + Resources\dashboard-ui\bower_components\emby-webcomponents\inputmanager.js @@ -1407,12 +1415,6 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\fullscreen\fullscreenmanager.js - - Resources\dashboard-ui\bower_components\emby-webcomponents\guide\guide-categories.js - - - Resources\dashboard-ui\bower_components\emby-webcomponents\guide\guide-categories.template.html - Resources\dashboard-ui\bower_components\emby-webcomponents\guide\guide-settings.js @@ -1806,6 +1808,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\sync\sync.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\sync\synctoggle.js + Resources\dashboard-ui\bower_components\emby-webcomponents\toast\toast.css @@ -3616,4 +3621,14 @@ Resources\dashboard-ui\thirdparty\jstree\themes\default\throbber.gif + + + Dynamic + False + + + Dynamic + False + + \ No newline at end of file From 2d09c187cc4707b94c845984429412b86881b59b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 17 Dec 2016 23:58:20 -0500 Subject: [PATCH 2/2] redesign series timer edit screen --- .../LiveTv/LiveTvDtoService.cs | 68 +++++++++++++++++++ MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs | 13 ++++ .../MediaBrowser.WebDashboard.csproj | 12 +--- 3 files changed, 84 insertions(+), 9 deletions(-) diff --git a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs index 7c1de251ca..e73378ddeb 100644 --- a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs +++ b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs @@ -167,6 +167,21 @@ namespace Emby.Server.Implementations.LiveTv { } } + image = librarySeries.GetImageInfo(ImageType.Backdrop, 0); + if (image != null) + { + try + { + dto.ParentBackdropImageTags = new List + { + _imageProcessor.GetImageCacheTag(librarySeries, image) + }; + dto.ParentBackdropItemId = librarySeries.Id.ToString("N"); + } + catch (Exception ex) + { + } + } } if (!string.IsNullOrWhiteSpace(programSeriesId)) @@ -194,6 +209,25 @@ namespace Emby.Server.Implementations.LiveTv { } } + + if (dto.ParentBackdropImageTags == null || dto.ParentBackdropImageTags.Count == 0) + { + image = program.GetImageInfo(ImageType.Backdrop, 0); + if (image != null) + { + try + { + dto.ParentBackdropImageTags = new List + { + _imageProcessor.GetImageCacheTag(program, image) + }; + dto.ParentBackdropItemId = program.Id.ToString("N"); + } + catch (Exception ex) + { + } + } + } } } } @@ -223,6 +257,21 @@ namespace Emby.Server.Implementations.LiveTv { } } + image = librarySeries.GetImageInfo(ImageType.Backdrop, 0); + if (image != null) + { + try + { + dto.ParentBackdropImageTags = new List + { + _imageProcessor.GetImageCacheTag(librarySeries, image) + }; + dto.ParentBackdropItemId = librarySeries.Id.ToString("N"); + } + catch (Exception ex) + { + } + } } if (!string.IsNullOrWhiteSpace(programSeriesId)) @@ -250,6 +299,25 @@ namespace Emby.Server.Implementations.LiveTv { } } + + if (dto.ParentBackdropImageTags == null || dto.ParentBackdropImageTags.Count == 0) + { + image = program.GetImageInfo(ImageType.Backdrop, 0); + if (image != null) + { + try + { + dto.ParentBackdropImageTags = new List + { + _imageProcessor.GetImageCacheTag(program, image) + }; + dto.ParentBackdropItemId = program.Id.ToString("N"); + } + catch (Exception ex) + { + } + } + } } } } diff --git a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs index 7e93a130b6..9d7fdd129e 100644 --- a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs +++ b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs @@ -1,5 +1,6 @@ using MediaBrowser.Model.Dto; using System; +using System.Collections.Generic; namespace MediaBrowser.Model.LiveTv { @@ -102,6 +103,18 @@ namespace MediaBrowser.Model.LiveTv /// true if this instance is pre padding required; otherwise, false. public bool IsPrePaddingRequired { get; set; } + /// + /// If the item does not have any backdrops, this will hold the Id of the Parent that has one. + /// + /// The parent backdrop item id. + public string ParentBackdropItemId { get; set; } + + /// + /// Gets or sets the parent backdrop image tags. + /// + /// The parent backdrop image tags. + public List ParentBackdropImageTags { get; set; } + /// /// Gets or sets a value indicating whether this instance is post padding required. /// diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index be5db5a0e0..8678925675 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -180,6 +180,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -714,9 +717,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest @@ -897,9 +897,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest @@ -942,9 +939,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest