From 83560ad937160237b4b9f0f04a1d0ab3b6344743 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Sat, 4 Mar 2017 13:25:04 -0500 Subject: [PATCH] Patch/more updates (#1009) * add downloaded quality to cut off * set profile to 1 on model too * get the lowest year in release dates --- .../MetadataSource/SkyHook/SkyHookProxy.cs | 13 ++++++++++++- .../AddMovies/BulkImport/BulkImportProfileCellT.js | 8 ++++++-- src/UI/Wanted/Cutoff/CutoffUnmetLayout.js | 7 +++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs index 450a9b51d..9e624c4bf 100644 --- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs +++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs @@ -138,12 +138,23 @@ namespace NzbDrone.Core.MetadataSource.SkyHook movie.SortTitle = Parser.Parser.NormalizeTitle(resource.title); movie.Overview = resource.overview; movie.Website = resource.homepage; + if (resource.release_date.IsNotNullOrWhiteSpace()) { movie.InCinemas = DateTime.Parse(resource.release_date); - movie.Year = movie.InCinemas.Value.Year; } + // get the lowest year in all release date + var lowestYear = new List(); + foreach (ReleaseDates releaseDates in resource.release_dates.results) + { + foreach (ReleaseDate releaseDate in releaseDates.release_dates) + { + lowestYear.Add(DateTime.Parse(releaseDate.release_date).Year); + } + } + movie.Year = lowestYear.Min(); + movie.TitleSlug += "-" + movie.TmdbId.ToString(); movie.Images.Add(_configService.GetCoverForURL(resource.poster_path, MediaCoverTypes.Poster));//TODO: Update to load image specs from tmdb page! diff --git a/src/UI/AddMovies/BulkImport/BulkImportProfileCellT.js b/src/UI/AddMovies/BulkImport/BulkImportProfileCellT.js index 263304942..249a475fd 100644 --- a/src/UI/AddMovies/BulkImport/BulkImportProfileCellT.js +++ b/src/UI/AddMovies/BulkImport/BulkImportProfileCellT.js @@ -28,8 +28,12 @@ module.exports = TemplatedCell.extend({ if(ProfileCollection.get(this.defaultProfile)) { this.profile = this.defaultProfile; - this.$(".x-profile").val(this.defaultProfile);//this.ui.profile.val(this.defaultProfile); - this.model.set("profileId", this.defaultProfile) + this.$(".x-profile").val(this.defaultProfile); + this.model.set("profileId", this.defaultProfile); + } else { + this.profile = 1; + this.$(".x-profile").val(1); + this.model.set("profileId", 1); } this.cellValue = ProfileCollection; diff --git a/src/UI/Wanted/Cutoff/CutoffUnmetLayout.js b/src/UI/Wanted/Cutoff/CutoffUnmetLayout.js index 9cf1bf1cc..e777ba802 100644 --- a/src/UI/Wanted/Cutoff/CutoffUnmetLayout.js +++ b/src/UI/Wanted/Cutoff/CutoffUnmetLayout.js @@ -4,6 +4,7 @@ var Backgrid = require('backgrid'); var CutoffUnmetCollection = require('./CutoffUnmetCollection'); var SelectAllCell = require('../../Cells/SelectAllCell'); var MovieTitleCell = require('../../Cells/MovieTitleCell'); +var DownloadedQualityCell = require('../../Cells/DownloadedQualityCell'); var MovieStatusWithTextCell = require('../../Cells/MovieStatusWithTextCell'); var RelativeDateCell = require('../../Cells/RelativeDateCell'); var GridPager = require('../../Shared/Grid/Pager'); @@ -41,6 +42,12 @@ module.exports = Marionette.Layout.extend({ cell : MovieTitleCell, cellValue : 'this', }, + { + name : "downloadedQuality", + label : "Downloaded", + cell : DownloadedQualityCell, + sortable : true + }, { name : 'inCinemas', label : 'In Cinemas',