Patch/onedr0p 3 13 17 (#1166)

* Update message when the person has no movies with helpful links

* Added ImdbId to the release info from AwesomeHD

* Add ImdbId to release info for PTP and HDBits

* ImdbId is required for HDBits

* Added some error handling in SkyHook for TMDb

* Remove un-needed imports

* DIsable movie search after list sync (causing issues)

* small change

* Fix HDBits tests

src/NzbDrone.Common/Http/HttpAccept.cs

@@ -4,6 +4,7 @@
     {
         public static readonly HttpAccept Rss = new HttpAccept("application/rss+xml, text/rss+xml, application/xml, text/xml");
         public static readonly HttpAccept Json = new HttpAccept("application/json");
+        public static readonly HttpAccept JsonCharset = new HttpAccept("application/json;charset=utf-8");
         public static readonly HttpAccept Html = new HttpAccept("text/html");
         
         public string Value { get; private set; }

src/NzbDrone.Core.Test/Files/Indexers/HdBits/RecentFeedLongIDs.json

@@ -25,6 +25,9 @@
           "id": 78901,
           "season": 10,
           "episode": 17
+        },
+        "imdb": {
+          "id": 78901
         }
       },
       {
@@ -51,6 +54,9 @@
           "id": 248841,
           "season": 4,
           "episode": 18
+        },
+        "imdb": {
+          "id": 78901
         }
       }
     ]

src/NzbDrone.Core.Test/Files/Indexers/HdBits/RecentFeedStringIDs.json

@@ -25,6 +25,9 @@
           "id": 78901,
           "season": 10,
           "episode": 17
+        },
+        "imdb": {
+          "id": 78901
         }
       },
       {
@@ -51,6 +54,9 @@
           "id": 248841,
           "season": 4,
           "episode": 18
+        },
+        "imdb": {
+          "id": 78901
         }
       }
     ]

src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDRssParser.cs

@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 using System.Net;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers.Exceptions;
 using NzbDrone.Core.Parser.Model;
@@ -64,6 +62,7 @@ namespace NzbDrone.Core.Indexers.AwesomeHD
                     Subtitles = x.Element("subtitles").Value,
                     EncodeStatus = x.Element("encodestatus").Value,
                     Freeleech = x.Element("freeleech").Value,
+                    ImdbId = x.Element("imdb").Value
                 }).ToList();
 
                 foreach (var torrent in torrents)
@@ -80,7 +79,8 @@ namespace NzbDrone.Core.Indexers.AwesomeHD
                         InfoUrl = GetInfoUrl(torrent.GroupId, id),
                         Seeders = int.Parse(torrent.Seeders),
                         Peers = int.Parse(torrent.Leechers) + int.Parse(torrent.Seeders),
-                        PublishDate = torrent.Time.ToUniversalTime()
+                        PublishDate = torrent.Time.ToUniversalTime(),
+                        ImdbId = int.Parse(torrent.ImdbId.Substring(2))
                     });
                 }
             }

src/NzbDrone.Core/Indexers/HDBits/HDBitsApi.cs

@@ -101,7 +101,7 @@ namespace NzbDrone.Core.Indexers.HDBits
 
     public class ImdbInfo
     {
-        public int? Id { get; set; }
+        public int Id { get; set; }
         public string EnglishTitle { get; set; }
         public string OriginalTitle { get; set; }
         public int? Year { get; set; }

src/NzbDrone.Core/Indexers/HDBits/HDBitsInfo.cs

@@ -1,8 +1,4 @@
 using NzbDrone.Core.Parser.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace NzbDrone.Core.Indexers.HDBits
 {

src/NzbDrone.Core/Indexers/HDBits/HDBitsParser.cs

@@ -64,7 +64,8 @@ namespace NzbDrone.Core.Indexers.HDBits
                     Seeders = result.Seeders,
                     Peers = result.Leechers + result.Seeders,
                     PublishDate = result.Added.ToUniversalTime(),
-                    Internal = internalRelease
+                    Internal = internalRelease,
+                    ImdbId = result.ImdbInfo.Id
                 });
             }
 

src/NzbDrone.Core/Indexers/PassThePopcorn/PassThePopcornParser.cs

@@ -81,7 +81,8 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
                             PublishDate = torrent.UploadTime.ToUniversalTime(),
                             Golden = torrent.GoldenPopcorn,
                             Scene = torrent.Scene,
-                            Approved = torrent.Checked
+                            Approved = torrent.Checked,
+                            ImdbId = int.Parse(result.ImdbId)
                         });
                     }
                     // Add all torrents
@@ -99,7 +100,8 @@ namespace NzbDrone.Core.Indexers.PassThePopcorn
                             PublishDate = torrent.UploadTime.ToUniversalTime(),
                             Golden = torrent.GoldenPopcorn,
                             Scene = torrent.Scene,
-                            Approved = torrent.Checked
+                            Approved = torrent.Checked,
+                            ImdbId = int.Parse(result.ImdbId)
                         });
                     }
                     // Don't add any torrents

src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs

@@ -84,9 +84,18 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
                .Build();
 
             request.AllowAutoRedirect = true;
-            request.SuppressHttpError = true;
+            // request.SuppressHttpError = true;
 
             var response = _httpClient.Get<MovieResourceRoot>(request);
+            if (response.StatusCode != HttpStatusCode.OK)
+            {
+                throw new HttpException(request, response);
+            }
+
+            if (response.Headers.ContentType != HttpAccept.JsonCharset.Value)
+            {
+                throw new HttpException(request, response);
+            }
 
             // The dude abides, so should us, Lets be nice to TMDb
             // var allowed = int.Parse(response.Headers.GetValues("X-RateLimit-Limit").First()); // get allowed
@@ -301,19 +310,28 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
             return movie;
         }
 
-        public Movie GetMovieInfo(string ImdbId)
+        public Movie GetMovieInfo(string imdbId)
         {
             var request = _movieBuilder.Create()
                 .SetSegment("route", "find")
-                .SetSegment("id", ImdbId)
+                .SetSegment("id", imdbId)
                 .SetSegment("secondaryRoute", "")
                 .AddQueryParam("external_source", "imdb_id")
                 .Build();
 
             request.AllowAutoRedirect = true;
-            request.SuppressHttpError = true;
+            // request.SuppressHttpError = true;
 
             var response = _httpClient.Get<FindRoot>(request);
+            if (response.StatusCode != HttpStatusCode.OK)
+            {
+                throw new HttpException(request, response);
+            }
+
+            if (response.Headers.ContentType != HttpAccept.JsonCharset.Value)
+            {
+                throw new HttpException(request, response);
+            }
 
             // The dude abides, so should us, Lets be nice to TMDb
             // var allowed = int.Parse(response.Headers.GetValues("X-RateLimit-Limit").First()); // get allowed

src/NzbDrone.Core/NetImport/NetImportSearchService.cs

@@ -81,7 +81,7 @@ namespace NzbDrone.Core.NetImport
 
             _logger.Debug("Found {0} movies from list(s) {1}", movies.Count, string.Join(", ", lists.Select(l => l.Definition.Name)));
 
-            return movies;
+            return movies.DistinctBy(x => x.TmdbId).ToList();
         }
 
 
@@ -114,29 +114,29 @@ namespace NzbDrone.Core.NetImport
                 // listedMovies = listedMovies.Where(ah => importExclusions.Any(h => ah.TmdbId.ToString() != h)).ToList();
             }
 
-            var downloadedCount = 0;
+            //var downloadedCount = 0;
             foreach (var movie in listedMovies)
             {
                 var mapped = _movieSearch.MapMovieToTmdbMovie(movie);
                 if (mapped != null && !importExclusions.Any(x => x == mapped.TmdbId.ToString()))
                 {
-                    List<DownloadDecision> decisions;
+                    //List<DownloadDecision> decisions;
-                    mapped.AddOptions = new AddMovieOptions {SearchForMovie = true};
+                    //mapped.AddOptions = new AddMovieOptions {SearchForMovie = true};
                     _movieService.AddMovie(mapped);
 
-                    // Search for movie
+                    //// Search for movie
-                    try
+                    //try
-                    {
+                    //{
-                        decisions = _nzbSearchService.MovieSearch(mapped.Id, false);
+                    //    decisions = _nzbSearchService.MovieSearch(mapped.Id, false);
-                    }
+                    //}
-                    catch (Exception ex)
+                    //catch (Exception ex)
-                    {
+                    //{
-                        _logger.Error(ex, $"Unable to search in list for movie {mapped.Id}");
+                    //    _logger.Error(ex, $"Unable to search in list for movie {mapped.Id}");
-                        continue;
+                    //    continue;
-                    }
+                    //}
 
-                    var processed = _processDownloadDecisions.ProcessDecisions(decisions);
+                    //var processed = _processDownloadDecisions.ProcessDecisions(decisions);
-                    downloadedCount += processed.Grabbed.Count;
+                    //downloadedCount += processed.Grabbed.Count;
                 }
                 else
                 {
@@ -147,7 +147,7 @@ namespace NzbDrone.Core.NetImport
                 }
             }
 
-            _logger.ProgressInfo("Movie search completed. {0} reports downloaded.", downloadedCount);
+            //_logger.ProgressInfo("Movie search completed. {0} reports downloaded.", downloadedCount);
         }
 
         private void CleanLibrary(List<Movie> movies)

src/UI/Movies/Index/EmptyTemplate.hbs

@@ -2,15 +2,12 @@
     <div class="row">
         <div class="well col-md-12">
             <i class="icon-sonarr-comment"/>
-            You must be new around here, You should add some movies.
+            &nbsp;You must be new around here, before you start adding movies you may want to check out the following links on our <a href="https://github.com/Radarr/Radarr/wiki">wiki</a>:
-        </div>
+            <ul>
-    </div>
+                <li><a href="https://github.com/Radarr/Radarr/wiki/Setup-Guide">Our setup guide</a></li>
-    <div class="row">
+                <li><a href="https://github.com/Radarr/Radarr/wiki/Common-Problems">Common Problems</a></li>
-        <div class="col-md-4 col-md-offset-4">
+                <li><a href="https://github.com/Radarr/Radarr/wiki/FAQ">FAQ</a></li>
-            <a href="/addmovies" class='btn btn-lg btn-block btn-success x-add-movies'>
+            </ul>
-                <i class='icon-sonarr-add'></i>
-                Add Movie
-            </a>
         </div>
     </div>
 </div>