open-source-mirrors
/
Ombi
mirror of https://github.com/Ombi-app/Ombi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made the search results the language specified in the search refinement

Browse Source
pull/2728/head
tidusjar 6 years ago
parent ba15853ac1
commit ae0d0e614c
9 changed files with 85 additions and 18 deletions
Show Stats Download Patch File Download Diff File

2
src/Ombi.Core/Engine/Interfaces/IMovieEngine.cs
Unescape View File

@ -16,7 +16,7 @@ namespace Ombi.Core
Task<IEnumerable<SearchMovieViewModel>> UpcomingMovies();
Task<SearchMovieViewModel> LookupImdbInformation(int theMovieDbId);
Task<SearchMovieViewModel> LookupImdbInformation(int theMovieDbId, string langCode = "en");
Task<IEnumerable<SearchMovieViewModel>> SimilarMovies(int theMovieDbId);
}

4
src/Ombi.Core/Engine/MovieSearchEngine.cs
Unescape View File

@ -43,9 +43,9 @@ namespace Ombi.Core.Engine
/// </summary>
/// <param name="theMovieDbId">The movie database identifier.</param>
/// <returns></returns>
public async Task<SearchMovieViewModel> LookupImdbInformation(int theMovieDbId)
public async Task<SearchMovieViewModel> LookupImdbInformation(int theMovieDbId, string langCode = "en")
{
var movieInfo = await MovieApi.GetMovieInformationWithExtraInfo(theMovieDbId);
var movieInfo = await MovieApi.GetMovieInformationWithExtraInfo(theMovieDbId, langCode);
var viewMovie = Mapper.Map<SearchMovieViewModel>(movieInfo);
return await ProcessSingleMovie(viewMovie, true);

2
src/Ombi.TheMovieDbApi/IMovieDbApi.cs
Unescape View File

@ -8,7 +8,7 @@ namespace Ombi.Api.TheMovieDb
public interface IMovieDbApi
{
Task<MovieResponseDto> GetMovieInformation(int movieId);
Task<MovieResponseDto> GetMovieInformationWithExtraInfo(int movieId);
Task<MovieResponseDto> GetMovieInformationWithExtraInfo(int movieId, string langCode = "en");
Task<List<MovieSearchResult>> NowPlaying();
Task<List<MovieSearchResult>> PopularMovies();
Task<List<MovieSearchResult>> SearchMovie(string searchTerm, int? year, string languageCode);

5
src/Ombi.TheMovieDbApi/TheMovieDbApi.cs
Unescape View File

@ -73,11 +73,12 @@ namespace Ombi.Api.TheMovieDb
return Mapper.Map<List<MovieSearchResult>>(result.results);
}
public async Task<MovieResponseDto> GetMovieInformationWithExtraInfo(int movieId)
public async Task<MovieResponseDto> GetMovieInformationWithExtraInfo(int movieId, string langCode = "en")
{
var request = new Request($"movie/{movieId}", BaseUri, HttpMethod.Get);
request.FullUri = request.FullUri.AddQueryParameter("api_key", ApiToken);
request.FullUri = request.FullUri.AddQueryParameter("append_to_response", "videos,release_dates");
request.FullUri = request.FullUri.AddQueryParameter("language", langCode);
AddRetry(request);
var result = await Api.Request<MovieResponse>(request);
return Mapper.Map<MovieResponseDto>(result);
@ -88,7 +89,7 @@ namespace Ombi.Api.TheMovieDb
var request = new Request($"search/movie", BaseUri, HttpMethod.Get);
request.FullUri = request.FullUri.AddQueryParameter("api_key", ApiToken);
request.FullUri = request.FullUri.AddQueryParameter("query", searchTerm);
request.FullUri = request.FullUri.AddQueryParameter("language", searchTerm);
request.FullUri = request.FullUri.AddQueryParameter("language", langageCode);
if (year.HasValue && year.Value > 0)
{
request.FullUri = request.FullUri.AddQueryParameter("year", year.Value.ToString());

12
src/Ombi/ClientApp/app/search/moviesearch.component.ts
Unescape View File

@ -25,7 +25,7 @@ export class MovieSearchComponent implements OnInit {
public result: IRequestEngineResult;
public searchApplied = false;
public refineSearchEnabled = true;
public refineSearchEnabled = false;
public searchYear?: number;
public selectedLanguage: string;
public langauges: ILanguageRefine[];
@ -203,10 +203,18 @@ export class MovieSearchComponent implements OnInit {
}
val.background = this.sanitizer.bypassSecurityTrustStyle
("url(" + "https://image.tmdb.org/t/p/w1280" + val.backdropPath + ")");
this.searchService.getMovieInformation(val.id)
if (this.applyRefinedSearch) {
this.searchService.getMovieInformationWithRefined(val.id, this.selectedLanguage)
.subscribe(m => {
this.updateItem(val, m);
});
} else {
this.searchService.getMovieInformation(val.id)
.subscribe(m => {
this.updateItem(val, m);
});
}
});
}

4
src/Ombi/ClientApp/app/services/search.service.ts
Unescape View File

@ -45,6 +45,10 @@ export class SearchService extends ServiceHelpers {
return this.http.get<ISearchMovieResult>(`${this.url}/Movie/info/${theMovieDbId}`);
}
public getMovieInformationWithRefined(theMovieDbId: number, langCode: string): Observable<ISearchMovieResult> {
return this.http.post<ISearchMovieResult>(`${this.url}/Movie/info`, { theMovieDbId, languageCode: langCode });
}
// TV
public searchTv(searchTerm: string): Observable<ISearchTvResult[]> {
return this.http.get<ISearchTvResult[]>(`${this.url}/Tv/${searchTerm}`, { headers: this.headers });

59
src/Ombi/Controllers/SearchController.cs
Unescape View File

@ -1,14 +1,11 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Ombi.Api.Lidarr.Models;
using Ombi.Core;
using Ombi.Core.Engine;
using Ombi.Core.Engine.Interfaces;
using Ombi.Core.Models;
using Ombi.Core.Models.Search;
using Ombi.Models;
using StackExchange.Profiling;
@ -42,6 +39,8 @@ namespace Ombi.Controllers
/// <param name="searchTerm">The search term.</param>
/// <returns></returns>
[HttpGet("movie/{searchTerm}")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<IEnumerable<SearchMovieViewModel>> SearchMovie(string searchTerm)
{
using (MiniProfiler.Current.Step("SearchingMovie"))
@ -56,7 +55,7 @@ namespace Ombi.Controllers
/// Searches for a movie.
/// </summary>
/// <remarks>We use TheMovieDb as the Movie Provider</remarks>
/// <param name="model">The refinement model, language code and year are both optional</param>
/// <param name="model">The refinement model, language code and year are both optional. Language code uses ISO 639-1</param>
/// <returns></returns>
[HttpPost("movie")]
[ProducesResponseType(StatusCodes.Status200OK)]
@ -86,11 +85,35 @@ namespace Ombi.Controllers
/// We use TheMovieDb as the Movie Provider
/// </remarks>
[HttpGet("movie/info/{theMovieDbId}")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<SearchMovieViewModel> GetExtraMovieInfo(int theMovieDbId)
{
return await MovieEngine.LookupImdbInformation(theMovieDbId);
}
/// <summary>
/// Gets extra information on the movie e.g. IMDBId
/// </summary>
/// <param name="model">TheMovieDb and Language Code, Pass in the language code (ISO 639-1) to get it back in a different lang </param>
/// <returns></returns>
/// <remarks>
/// We use TheMovieDb as the Movie Provider
/// </remarks>
[HttpPost("movie/info")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status400BadRequest)]
[ProducesDefaultResponseType]
public async Task<IActionResult> GetExtraMovieInfo([FromBody] SearchMovieExtraInfoRefineModel model)
{
if (model == null)
{
return BadRequest();
}
return Json(await MovieEngine.LookupImdbInformation(model.TheMovieDbId, model.LanguageCode));
}
/// <summary>
/// Returns similar movies to the movie id passed in
/// </summary>
@ -99,6 +122,8 @@ namespace Ombi.Controllers
/// We use TheMovieDb as the Movie Provider
/// </remarks>
[HttpGet("movie/{theMovieDbId}/similar")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<IEnumerable<SearchMovieViewModel>> SimilarMovies(int theMovieDbId)
{
return await MovieEngine.SimilarMovies(theMovieDbId);
@ -110,6 +135,8 @@ namespace Ombi.Controllers
/// <remarks>We use TheMovieDb as the Movie Provider</remarks>
/// <returns></returns>
[HttpGet("movie/popular")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<IEnumerable<SearchMovieViewModel>> Popular()
{
return await MovieEngine.PopularMovies();
@ -120,6 +147,8 @@ namespace Ombi.Controllers
/// <remarks>We use TheMovieDb as the Movie Provider</remarks>
/// <returns></returns>
[HttpGet("movie/nowplaying")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<IEnumerable<SearchMovieViewModel>> NowPlayingMovies()
{
return await MovieEngine.NowPlayingMovies();
@ -130,6 +159,8 @@ namespace Ombi.Controllers
/// <returns></returns>
/// <remarks>We use TheMovieDb as the Movie Provider</remarks>
[HttpGet("movie/toprated")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<IEnumerable<SearchMovieViewModel>> TopRatedMovies()
{
return await MovieEngine.TopRatedMovies();
@ -140,6 +171,8 @@ namespace Ombi.Controllers
/// <remarks>We use TheMovieDb as the Movie Provider</remarks>
/// <returns></returns>
[HttpGet("movie/upcoming")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<IEnumerable<SearchMovieViewModel>> UpcomingMovies()
{
return await MovieEngine.UpcomingMovies();
@ -152,6 +185,8 @@ namespace Ombi.Controllers
/// <remarks>We use TvMaze as the Provider</remarks>
/// <returns></returns>
[HttpGet("tv/{searchTerm}")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<IEnumerable<SearchTvShowViewModel>> SearchTv(string searchTerm)
{
return await TvEngine.Search(searchTerm);
@ -164,6 +199,8 @@ namespace Ombi.Controllers
/// <remarks>We use TvMaze as the Provider</remarks>
/// <returns></returns>
[HttpGet("tv/info/{tvdbId}")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<SearchTvShowViewModel> GetShowInfo(int tvdbId)
{
return await TvEngine.GetShowInformation(tvdbId);
@ -175,6 +212,8 @@ namespace Ombi.Controllers
/// <remarks>We use Trakt.tv as the Provider</remarks>
/// <returns></returns>
[HttpGet("tv/popular")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<IEnumerable<SearchTvShowViewModel>> PopularTv()
{
return await TvEngine.Popular();
@ -186,6 +225,8 @@ namespace Ombi.Controllers
/// <remarks>We use Trakt.tv as the Provider</remarks>
/// <returns></returns>
[HttpGet("tv/anticipated")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<IEnumerable<SearchTvShowViewModel>> AnticipatedTv()
{
return await TvEngine.Anticipated();
@ -198,6 +239,8 @@ namespace Ombi.Controllers
/// <remarks>We use Trakt.tv as the Provider</remarks>
/// <returns></returns>
[HttpGet("tv/mostwatched")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<IEnumerable<SearchTvShowViewModel>> MostWatched()
{
return await TvEngine.MostWatches();
@ -209,6 +252,8 @@ namespace Ombi.Controllers
/// <remarks>We use Trakt.tv as the Provider</remarks>
/// <returns></returns>
[HttpGet("tv/trending")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<IEnumerable<SearchTvShowViewModel>> Trending()
{
return await TvEngine.Trending();
@ -220,6 +265,8 @@ namespace Ombi.Controllers
/// <remarks>We use Lidarr as the Provider</remarks>
/// <returns></returns>
[HttpGet("music/artist/{searchTerm}")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<IEnumerable<SearchArtistViewModel>> SearchArtist(string searchTerm)
{
return await MusicEngine.SearchArtist(searchTerm);
@ -231,6 +278,8 @@ namespace Ombi.Controllers
/// <remarks>We use Lidarr as the Provider</remarks>
/// <returns></returns>
[HttpGet("music/album/{searchTerm}")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<IEnumerable<SearchAlbumViewModel>> SearchAlbum(string searchTerm)
{
return await MusicEngine.SearchAlbum(searchTerm);
@ -242,6 +291,8 @@ namespace Ombi.Controllers
/// <remarks>We use Lidarr as the Provider</remarks>
/// <returns></returns>
[HttpGet("music/artist/album/{foreignArtistId}")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesDefaultResponseType]
public async Task<IEnumerable<SearchAlbumViewModel>> GetAlbumsByArtist(string foreignArtistId)
{
return await MusicEngine.GetArtistAlbums(foreignArtistId);

8
src/Ombi/Models/SearchMovieExtraInfoRefineModel.cs
Unescape View File

@ -0,0 +1,8 @@
namespace Ombi.Models
{
public class SearchMovieExtraInfoRefineModel
{
public int TheMovieDbId { get; set; }
public string LanguageCode { get; set; } = "en";
}
}

7
src/Ombi/Models/SearchMovieRefineModel.cs
Unescape View File

@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Ombi.Models
namespace Ombi.Models
{
public class SearchMovieRefineModel
{

Write Preview
Loading…
Cancel
Save