From 56a5b6ec899f4b5269697afca4543d2d06c1e621 Mon Sep 17 00:00:00 2001
From: Vlad Ilies <ammi.vlad@gmail.com>
Date: Sun, 15 Jan 2017 22:17:24 +0200
Subject: [PATCH] Added trailer link to movie links (#255) (#282)

* added YouTubeTrailerId to movie model
* db migration for new column

* added videos to append_to_response for tmdb
* increased height of .series-posters-item
* new handlebar helper to build the trailer url
---
 src/NzbDrone.Api/Series/MovieResource.cs      |  7 +++++--
 .../119_add_youtube_trailer_id_table .cs      | 21 +++++++++++++++++++
 .../SkyHook/Resource/TMDBResources.cs         | 18 ++++++++++++++++
 .../MetadataSource/SkyHook/SkyHookProxy.cs    | 14 ++++++++++++-
 src/NzbDrone.Core/NzbDrone.Core.csproj        |  1 +
 src/NzbDrone.Core/Tv/Movie.cs                 |  1 +
 src/NzbDrone.Core/Tv/RefreshMovieService.cs   |  1 +
 src/UI/Cells/MovieLinksTemplate.hbs           |  5 +++++
 src/UI/Handlebars/Helpers/Series.js           |  4 ++++
 src/UI/Movies/Details/InfoViewTemplate.hbs    |  4 ++++
 .../SeriesOverviewItemViewTemplate.hbs        |  4 ++++
 .../Posters/SeriesPostersItemViewTemplate.hbs |  4 +++-
 src/UI/Movies/movies.less                     |  4 ++--
 13 files changed, 82 insertions(+), 6 deletions(-)
 create mode 100644 src/NzbDrone.Core/Datastore/Migration/119_add_youtube_trailer_id_table .cs

diff --git a/src/NzbDrone.Api/Series/MovieResource.cs b/src/NzbDrone.Api/Series/MovieResource.cs
index c0cc8d623..d791ba130 100644
--- a/src/NzbDrone.Api/Series/MovieResource.cs
+++ b/src/NzbDrone.Api/Series/MovieResource.cs
@@ -34,6 +34,7 @@ namespace NzbDrone.Api.Movie
         public string RemotePoster { get; set; }
         public int Year { get; set; }
         public bool HasFile { get; set; }
+        public string YouTubeTrailerId { get; set; }
 
         //View & Edit
         public string Path { get; set; }
@@ -144,7 +145,8 @@ namespace NzbDrone.Api.Movie
                 AddOptions = model.AddOptions,
                 AlternativeTitles = model.AlternativeTitles,
                 Ratings = model.Ratings,
-                MovieFile = movieFile
+                MovieFile = movieFile,
+                YouTubeTrailerId = model.YouTubeTrailerId
             };
         }
 
@@ -191,7 +193,8 @@ namespace NzbDrone.Api.Movie
                 Added = resource.Added,
                 AddOptions = resource.AddOptions,
                 AlternativeTitles = resource.AlternativeTitles,
-                Ratings = resource.Ratings
+                Ratings = resource.Ratings,
+                YouTubeTrailerId = resource.YouTubeTrailerId
             };
         }
 
diff --git a/src/NzbDrone.Core/Datastore/Migration/119_add_youtube_trailer_id_table .cs b/src/NzbDrone.Core/Datastore/Migration/119_add_youtube_trailer_id_table .cs
new file mode 100644
index 000000000..e975f3d9c
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Migration/119_add_youtube_trailer_id_table .cs	
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+using System.Data;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(119)]
+    public class add_youtube_trailer_id : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("Movies").AddColumn("YouTubeTrailerId").AsString().Nullable();
+
+        }
+
+    }
+}
diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TMDBResources.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TMDBResources.cs
index c0987e04f..469e72776 100644
--- a/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TMDBResources.cs
+++ b/src/NzbDrone.Core/MetadataSource/SkyHook/Resource/TMDBResources.cs
@@ -66,6 +66,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
         public int vote_count { get; set; }
         public AlternativeTitles alternative_titles { get; set; }
         public ReleaseDatesResource release_dates { get; set; }
+        public VideosResource videos { get; set; }
     }
 
     public class ReleaseDatesResource
@@ -130,4 +131,21 @@ namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
         public string iso_3166_1 { get; set; }
         public string title { get; set; }
     }
+
+    public class VideosResource
+    {
+        public List<Video> results { get; set; }
+    }
+
+    public class Video
+    {
+        public string id { get; set; }
+        public string iso_639_1 { get; set; }
+        public string iso_3166_1 { get; set; }
+        public string key { get; set; }
+        public string name { get; set; }
+        public string site { get; set; }
+        public string size { get; set; }
+        public string type { get; set; }
+    }
 }
diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
index 6f1534ed7..55efffe74 100644
--- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
+++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
@@ -73,7 +73,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
                .SetSegment("route", "movie")
                .SetSegment("id", TmdbId.ToString())
                .SetSegment("secondaryRoute", "")
-               .AddQueryParam("append_to_response", "alternative_titles,release_dates")
+               .AddQueryParam("append_to_response", "alternative_titles,release_dates,videos")
                .AddQueryParam("country", "US")
                .Build();
 
@@ -149,6 +149,18 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
             {
                 movie.Status = MovieStatusType.Announced;
             }
+            
+            if (resource.videos != null)
+            {
+                foreach(Video video in resource.videos.results)
+                {
+                    if(video.type == "Trailer" && video.site == "YouTube")
+                    {
+                        movie.YouTubeTrailerId = video.key;
+                        break;
+                    }
+                }
+            }
 
             return movie;
         }
diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj
index e69a850e7..87a4c28b2 100644
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -183,6 +183,7 @@
     <Compile Include="Datastore\Migration\002_remove_tvrage_imdb_unique_constraint.cs" />
     <Compile Include="Datastore\Migration\003_remove_clean_title_from_scene_mapping.cs" />
     <Compile Include="Datastore\Migration\004_updated_history.cs" />
+    <Compile Include="Datastore\Migration\119_add_youtube_trailer_id_table .cs" />
     <Compile Include="Datastore\Migration\118_update_movie_slug.cs" />
     <Compile Include="Datastore\Migration\117_update_movie_file.cs" />
     <Compile Include="Datastore\Migration\116_update_movie_sorttitle_again.cs" />
diff --git a/src/NzbDrone.Core/Tv/Movie.cs b/src/NzbDrone.Core/Tv/Movie.cs
index eadff4151..a96890e72 100644
--- a/src/NzbDrone.Core/Tv/Movie.cs
+++ b/src/NzbDrone.Core/Tv/Movie.cs
@@ -48,6 +48,7 @@ namespace NzbDrone.Core.Tv
         public LazyLoaded<MovieFile> MovieFile { get; set; }
         public int MovieFileId { get; set; }
         public List<string> AlternativeTitles { get; set; }
+        public string YouTubeTrailerId{ get; set; }
 
         public bool HasFile => MovieFileId > 0;
 
diff --git a/src/NzbDrone.Core/Tv/RefreshMovieService.cs b/src/NzbDrone.Core/Tv/RefreshMovieService.cs
index a0b4a56a9..3001bf953 100644
--- a/src/NzbDrone.Core/Tv/RefreshMovieService.cs
+++ b/src/NzbDrone.Core/Tv/RefreshMovieService.cs
@@ -84,6 +84,7 @@ namespace NzbDrone.Core.Tv
             movie.AlternativeTitles = movieInfo.AlternativeTitles;
             movie.Year = movieInfo.Year;
             movie.PhysicalRelease = movieInfo.PhysicalRelease;
+            movie.YouTubeTrailerId = movieInfo.YouTubeTrailerId;
 
             try
             {
diff --git a/src/UI/Cells/MovieLinksTemplate.hbs b/src/UI/Cells/MovieLinksTemplate.hbs
index 01a3f52e2..e50f569c3 100644
--- a/src/UI/Cells/MovieLinksTemplate.hbs
+++ b/src/UI/Cells/MovieLinksTemplate.hbs
@@ -8,4 +8,9 @@
     {{#if imdbId}}
         <a href="{{imdbUrl}}" class="label label-info">IMDB</a>
     {{/if}}
+
+    {{#if youTubeTrailerId}}
+        <a href="{{youTubeTrailerUrl}}" class="label label-info">Trailer</a>
+    {{/if}}
+
 </span>
diff --git a/src/UI/Handlebars/Helpers/Series.js b/src/UI/Handlebars/Helpers/Series.js
index 5f5cce2ed..f08fed3fa 100644
--- a/src/UI/Handlebars/Helpers/Series.js
+++ b/src/UI/Handlebars/Helpers/Series.js
@@ -51,6 +51,10 @@ Handlebars.registerHelper('tmdbUrl', function() {
     return 'https://www.themoviedb.org/movie/' + this.tmdbId;
 });
 
+Handlebars.registerHelper('youTubeTrailerUrl', function() {
+    return 'https://www.youtube.com/watch?v=' + this.youTubeTrailerId;
+});
+
 Handlebars.registerHelper('homepage', function() {
     return this.website;
 });
diff --git a/src/UI/Movies/Details/InfoViewTemplate.hbs b/src/UI/Movies/Details/InfoViewTemplate.hbs
index c62818297..9c73ab5b1 100644
--- a/src/UI/Movies/Details/InfoViewTemplate.hbs
+++ b/src/UI/Movies/Details/InfoViewTemplate.hbs
@@ -33,6 +33,10 @@
             {{#if imdbId}}
                 <a href="{{imdbUrl}}" class="label label-info">IMDB</a>
             {{/if}}
+
+            {{#if youTubeTrailerId}}
+                <a href="{{youTubeTrailerUrl}}" class="label label-info">Trailer</a>
+            {{/if}}
         </span>
     </div>
 </div>
diff --git a/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs b/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs
index b1181c07d..64cfa2aba 100644
--- a/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs
+++ b/src/UI/Movies/Index/Overview/SeriesOverviewItemViewTemplate.hbs
@@ -54,6 +54,10 @@
                       {{#if imdbId}}
                           <a href="{{imdbUrl}}" class="label label-info">IMDB</a>
                       {{/if}}
+
+                      {{#if youTubeTrailerId}}
+                          <a href="{{youTubeTrailerUrl}}" class="label label-info">Trailer</a>
+                      {{/if}}
                   </span>
                 </div>
             </div>
diff --git a/src/UI/Movies/Index/Posters/SeriesPostersItemViewTemplate.hbs b/src/UI/Movies/Index/Posters/SeriesPostersItemViewTemplate.hbs
index 92e6e3298..e00b317cd 100644
--- a/src/UI/Movies/Index/Posters/SeriesPostersItemViewTemplate.hbs
+++ b/src/UI/Movies/Index/Posters/SeriesPostersItemViewTemplate.hbs
@@ -26,7 +26,9 @@
           {{#if imdbId}}
               <a href="{{imdbUrl}}" class="label label-info">IMDB</a>
           {{/if}}
-
+          {{#if youTubeTrailerId}}
+              <a href="{{youTubeTrailerUrl}}" class="label label-info">Trailer</a>
+          {{/if}}
         </div>
     </div>
 </div>
diff --git a/src/UI/Movies/movies.less b/src/UI/Movies/movies.less
index 6c19733dc..1c11da0a1 100644
--- a/src/UI/Movies/movies.less
+++ b/src/UI/Movies/movies.less
@@ -126,7 +126,7 @@
     .card;
     .clickable;
     margin-bottom : 20px;
-    height        : 324px;
+    height        : 344px;
 
     .center {
       display      : block;
@@ -166,7 +166,7 @@
     }
 
     @media (max-width: @screen-xs-max) {
-      height  : 235px;
+      height  : 268px;
       margin  : 5px;
       padding : 6px 5px;