mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Added ability to discover new movies based on upcoming blurays as well as popular movies (borrowed from steven lu :))

This commit is contained in:
Leonardo Galli 2017-05-09 16:46:19 +02:00
parent d133ee3143
commit 3ab3fbfd57
6 changed files with 111 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/NzbDrone.Api/Series/MovieDiscoverModule.cs
View File

@ -17,12 +17,12 @@ namespace NzbDrone.Api.Movie
: base("/movies/discover")
{
_searchProxy = searchProxy;
Get["/"] = x => Search();
Get["/{action?recommendations}"] = x => Search(x.action);
}
private Response Search()
private Response Search(string action)
{
var imdbResults = _searchProxy.DiscoverNewMovies();
var imdbResults = _searchProxy.DiscoverNewMovies(action);
return MapToResource(imdbResults).AsResponse();
}

2
src/NzbDrone.Core/MetadataSource/IDiscoverNewMovies.cs
View File

@ -5,6 +5,6 @@ namespace NzbDrone.Core.MetadataSource
{
public interface IDiscoverNewMovies
{
List<Movie> DiscoverNewMovies();
List<Movie> DiscoverNewMovies(string action);
}
}

62
src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
View File

@ -349,31 +349,57 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
return resources.movie_results.SelectList(MapMovie).FirstOrDefault();
}
public List<Movie> DiscoverNewMovies()
public List<Movie> DiscoverNewMovies(string action)
{
string allIds = string.Join(",", _movieService.GetAllMovies().Select(m => m.TmdbId));
var request = new HttpRequestBuilder("https://radarr.video/recommendations/api.php").Build();
request.AllowAutoRedirect = true;
request.Method = HttpMethod.POST;
request.Headers.ContentType = "application/x-www-form-urlencoded";
request.SetContent($"tmdbids={allIds}");
HttpRequest request;
List<MovieResult> results;
var response = _httpClient.Post<List<MovieResult>>(request);
if (response.StatusCode != HttpStatusCode.OK)
if (action == "upcoming")
{
throw new HttpException(request, response);
var lastWeek = DateTime.Now.AddDays(-7);
var threeWeeks = DateTime.Now.AddDays(7 * 3);
request = _movieBuilder.Create().SetSegment("route", "discover")
.SetSegment("id", "movie")
.SetSegment("secondaryRoute", "")
.AddQueryParam("region", "us")
.AddQueryParam("with_release_type", "5|4|6")
.AddQueryParam("release_date.gte", lastWeek.ToString("yyyy-MM-dd"))
.AddQueryParam("sort_by", "popularity.desc")
.AddQueryParam("release_date.lte", threeWeeks.ToString("yyyy-MM-dd")).Build();
var response = _httpClient.Get<MovieSearchRoot>(request);
if (response.StatusCode != HttpStatusCode.OK)
{
throw new HttpException(request, response);
}
results = response.Resource.results.ToList();
}
else
{
request = new HttpRequestBuilder("https://radarr.video/api/{action}/").SetSegment("action", action).Build();
request.AllowAutoRedirect = true;
request.Method = HttpMethod.POST;
request.Headers.ContentType = "application/x-www-form-urlencoded";
request.SetContent($"tmdbids={allIds}");
var response = _httpClient.Post<List<MovieResult>>(request);
if (response.StatusCode != HttpStatusCode.OK)
{
throw new HttpException(request, response);
}
results = response.Resource;
}
if (response.Headers.ContentType != HttpAccept.Json.Value)
{
throw new HttpException(request, response);
}
var movieResults = response.Resource;
return movieResults.SelectList(MapMovie);
return results.SelectList(MapMovie);
}
private string StripTrailingTheFromTitle(string title)

58
src/UI/AddMovies/AddMoviesView.js
View File

@ -21,11 +21,18 @@ module.exports = Marionette.Layout.extend({
moviesSearch : '.x-movies-search',
searchBar : '.x-search-bar',
loadMore : '.x-load-more',
discoverHeader : ".x-discover-header"
discoverHeader : ".x-discover-header",
discoverBefore : ".x-discover-before",
discoverRecos : ".x-recommendations-tab",
discoverPopular : ".x-popular-tab" ,
discoverUpcoming : ".x-upcoming-tab"
},
events : {
'click .x-load-more' : '_onLoadMore'
'click .x-load-more' : '_onLoadMore',
"click .x-recommendations-tab" : "_discoverRecos",
"click .x-popular-tab" : "_discoverPopular",
"click .x-upcoming-tab" : "_discoverUpcoming"
},
initialize : function(options) {
@ -56,11 +63,6 @@ module.exports = Marionette.Layout.extend({
this.search({term: options.query});
} else if (options.action == "discover") {
this.isDiscover = true;
if (FullMovieCollection.length > 0) {
this._discover();
} else {
this.listenTo(FullMovieCollection, "sync", this._discover);
}
}
},
@ -110,6 +112,11 @@ module.exports = Marionette.Layout.extend({
if (this.isDiscover) {
this.ui.searchBar.hide();
if (FullMovieCollection.length > 0) {
this._discoverRecos();
} else {
this.listenTo(FullMovieCollection, "sync", this._discover);
}
if (this.collection.length == 0) {
this.searchResult.show(new LoadingView());
}
@ -117,10 +124,10 @@ module.exports = Marionette.Layout.extend({
},
onShow : function() {
this.ui.discoverHeader.hide();
this.ui.discoverBefore.hide();
this.ui.moviesSearch.focus();
if (this.isDiscover) {
this.ui.discoverHeader.show();
this.ui.discoverBefore.show();
}
},
@ -213,7 +220,34 @@ module.exports = Marionette.Layout.extend({
}
},
_discover : function() {
this.collection.fetch()
}
_discover : function(action) {
if (this.collection.action === action) {
return
}
this.searchResult.show(new LoadingView());
this.collection.action = action;
this.collection.fetch({
data : { action : action }
});
},
_discoverRecos : function() {
this.ui.discoverRecos.tab("show");
this.ui.discoverHeader.html("Recommendations by The Movie Database for you");
this._discover("recommendations");
},
_discoverPopular : function() {
this.ui.discoverPopular.tab("show");
this.ui.discoverHeader.html("Currently Popular Movies");
this._discover("popular");
},
_discoverUpcoming : function() {
this.ui.discoverUpcoming.tab("show");
this.ui.discoverHeader.html("Movies coming to Blu-Ray in the next weeks");
this._discover("upcoming");
},
});

15
src/UI/AddMovies/AddMoviesViewTemplate.hbs
View File

@ -4,9 +4,18 @@
{{folder.path}}
</div>
</div>{{/if}}
<h2 class="x-discover-header">
Recommendations by The Movie Database based on your library:
</h2>
<div class="x-discover-before">
<ul class="nav nav-tabs nav-justified settings-tabs">
<li><a href="#media-management" class="x-recommendations-tab no-router">Recommendations</a></li>
<li><a href="#popular" class="x-popular-tab no-router">Popular</a></li>
<li><a href="#upcoming" class="x-upcoming-tab no-router">Upcoming</a></li>
</ul>
<h2 class="x-discover-header">
Recommendations by The Movie Database based on your library:
</h2>
</div>
<div class="x-search-bar">
<div class="input-group input-group-lg add-movies-search">
<span class="input-group-addon"><i class="icon-sonarr-search"/></span>

6
src/UI/AddMovies/DiscoverMoviesCollection.js
View File

@ -3,7 +3,11 @@ var MovieModel = require('../Movies/MovieModel');
var _ = require('underscore');
module.exports = Backbone.Collection.extend({
url : window.NzbDrone.ApiRoot + "/movies/discover",
url : function() {
var route = this.action || "";
return window.NzbDrone.ApiRoot + "/movies/discover/" + route;
},
model : MovieModel,
parse : function(response) {