feat(discover): Add original language filter

Ombi-app · Apr 23, 2022 · ef7ec86 · ef7ec86
1 parent eea8663
commit ef7ec86
Show file tree

Hide file tree

Showing 12 changed files with 100 additions and 26 deletions.
diff --git a/src/Ombi.Core/Engine/V2/IMultiSearchEngine.cs b/src/Ombi.Core/Engine/V2/IMultiSearchEngine.cs
@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using Ombi.Api.TheMovieDb.Models;
 using Ombi.Core.Models.Search.V2;
+using Ombi.TheMovieDbApi.Models;
 
 // Due to conflicting Genre models in
 // Ombi.TheMovieDbApi.Models and Ombi.Api.TheMovieDb.Models   
@@ -14,5 +15,6 @@ public interface IMultiSearchEngine
     {
         Task<List<MultiSearchResult>> MultiSearch(string searchTerm, MultiSearchFilter filter, CancellationToken cancellationToken);
         Task<IEnumerable<Genre>> GetGenres(string media, CancellationToken requestAborted);
+        Task<IEnumerable<Language>> GetLanguages(CancellationToken requestAborted);
     }
 }
diff --git a/src/Ombi.Core/Engine/V2/MultiSearchEngine.cs b/src/Ombi.Core/Engine/V2/MultiSearchEngine.cs
@@ -17,6 +17,7 @@
 using Ombi.Settings.Settings.Models.External;
 using Ombi.Store.Entities;
 using Ombi.Store.Repository;
+using Ombi.TheMovieDbApi.Models;
 
 // Due to conflicting Genre models in
 // Ombi.TheMovieDbApi.Models and Ombi.Api.TheMovieDb.Models   
@@ -124,5 +125,9 @@ public async Task<IEnumerable<Genre>> GetGenres(string media, CancellationToken
             var lang = await DefaultLanguageCode(null);
             return await _movieDbApi.GetGenres(media, cancellationToken, lang);
         }
+        public async Task<IEnumerable<Language>> GetLanguages(CancellationToken cancellationToken)
+        {
+            return await _movieDbApi.GetLanguages(cancellationToken);
+        }
     }
 }
diff --git a/src/Ombi.Settings/Settings/Models/External/TheMovieDbSettings.cs b/src/Ombi.Settings/Settings/Models/External/TheMovieDbSettings.cs
@@ -11,5 +11,7 @@ public sealed class TheMovieDbSettings : Ombi.Settings.Settings.Models.Settings
         public List<int> ExcludedMovieGenreIds { get; set; }
 
         public List<int> ExcludedTvGenreIds { get; set; }
+
+        public List<string> OriginalLanguages { get; set; }
     }
 }
diff --git a/src/Ombi.TheMovieDbApi/IMovieDbApi.cs b/src/Ombi.TheMovieDbApi/IMovieDbApi.cs
@@ -41,6 +41,7 @@ public interface IMovieDbApi
         Task<WatchProviders> GetMovieWatchProviders(int theMoviedbId, CancellationToken token);
         Task<WatchProviders> GetTvWatchProviders(int theMoviedbId, CancellationToken token);
         Task<List<Genre>> GetGenres(string media, CancellationToken cancellationToken, string languageCode);
+        Task<List<Language>> GetLanguages(CancellationToken cancellationToken);
         Task<List<WatchProvidersResults>> SearchWatchProviders(string media, string searchTerm, CancellationToken cancellationToken);
         Task<List<MovieDbSearchResult>> AdvancedSearch(DiscoverModel model, CancellationToken cancellationToken);
     }

diff --git a/src/Ombi.TheMovieDbApi/Models/Language.cs b/src/Ombi.TheMovieDbApi/Models/Language.cs
@@ -0,0 +1,14 @@
+using Newtonsoft.Json;
+
+namespace Ombi.TheMovieDbApi.Models
+{
+    public class Language
+    {
+        [JsonProperty("iso_639_1")]
+        public string Id { get; set; }
+        [JsonProperty("english_name")]
+        public string EnglishName { get; set; }
+        [JsonProperty("name")]
+        public string Name { get; set; }
+    }
+}
diff --git a/src/Ombi.TheMovieDbApi/TheMovieDbApi.cs b/src/Ombi.TheMovieDbApi/TheMovieDbApi.cs
@@ -438,6 +438,16 @@ public async Task<List<Genre>> GetGenres(string media, CancellationToken cancell
             return result.genres ?? new List<Genre>();
         }
 
+        public async Task<List<Language>> GetLanguages(CancellationToken cancellationToken)
+        {
+            var request = new Request($"/configuration/languages", BaseUri, HttpMethod.Get);
+            request.AddQueryString("api_key", ApiToken);
+            AddRetry(request);
+
+            var result = await Api.Request<List<Language>>(request, cancellationToken);
+            return result ?? new List<Language>();
+        }
+
         public Task<TheMovieDbContainer<MultiSearch>> MultiSearch(string searchTerm, string languageCode, CancellationToken cancellationToken)
         {
             var request = new Request("search/multi", BaseUri, HttpMethod.Get);
@@ -472,6 +482,10 @@ private async Task AddDiscoverSettings(Request request)
             {
                 request.AddQueryString("without_keywords", string.Join(",", settings.ExcludedKeywordIds));
             }
+            if (settings.OriginalLanguages?.Any() == true)
+            {
+                request.AddQueryString("with_original_language", string.Join("|", settings.OriginalLanguages));
+            }
         }
 
         private async Task AddGenreFilter(Request request, string media_type)

diff --git a/src/Ombi/ClientApp/src/app/interfaces/IMovieDb.ts b/src/Ombi/ClientApp/src/app/interfaces/IMovieDb.ts
@@ -17,3 +17,8 @@ export interface IDiscoverModel {
     watchProviders?: number[];
     companies?: number[];
 }
+export interface ILanguage {
+    iso_639_1 : string;
+    english_name : string;
+    name : string;
+}
diff --git a/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts b/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts
@@ -339,7 +339,8 @@ export interface ITheMovieDbSettings extends ISettings {
     showAdultMovies: boolean;
     excludedKeywordIds: number[];
     excludedMovieGenreIds: number[];
-    excludedTvGenreIds: number[]
+    excludedTvGenreIds: number[];
+    originalLanguages: string[];
 }
 
 export interface IUpdateModel

diff --git a/src/Ombi/ClientApp/src/app/services/searchV2.service.ts b/src/Ombi/ClientApp/src/app/services/searchV2.service.ts
@@ -4,7 +4,7 @@ import { Injectable, Inject } from "@angular/core";
 import { HttpClient } from "@angular/common/http";
 import { Observable } from "rxjs";
 
-import { IDiscoverModel, IMovieDbKeyword, IMultiSearchResult, ISearchMovieResult, ISearchTvResult } from "../interfaces";
+import { IDiscoverModel, ILanguage, IMovieDbKeyword, IMultiSearchResult, ISearchMovieResult, ISearchTvResult } from "../interfaces";
 import { ServiceHelpers } from "./service.helpers";
 
 import { ISearchMovieResultV2 } from "../interfaces/ISearchMovieResultV2";
@@ -23,11 +23,15 @@ export class SearchV2Service extends ServiceHelpers {
     public multiSearch(searchTerm: string, filter: SearchFilter): Observable<IMultiSearchResult[]> {
         return this.http.post<IMultiSearchResult[]>(`${this.url}/multi/${encodeURIComponent(searchTerm)}`, filter);
     }
-    
+
     public getGenres(media: string): Observable<IMovieDbKeyword[]> {
         return this.http.get<IMovieDbKeyword[]>(`${this.url}/Genres/${media}`, { headers: this.headers })
     }
 
+    public getLanguages(): Observable<ILanguage[]> {
+        return this.http.get<ILanguage[]>(`${this.url}/Languages`, { headers: this.headers })
+    }
+
     public getFullMovieDetails(theMovieDbId: number): Observable<ISearchMovieResultV2> {
         return this.http.get<ISearchMovieResultV2>(`${this.url}/Movie/${theMovieDbId}`);
     }

diff --git a/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.html b/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.html
@@ -13,6 +13,14 @@
 
             <div class="form-group">
                 <form [formGroup]='tagForm'>
+                  <mat-form-field appearance="outline" >
+                      <mat-label>Original languages</mat-label>
+                      <mat-select multiple formControlName="originalLanguages" [(value)]="settings.originalLanguages" matTooltip="Filter content by original language.">
+                          <mat-option *ngFor="let language of languages" [value]="language.iso_639_1">
+                              {{language.english_name}}
+                          </mat-option>
+                        </mat-select>
+                  </mat-form-field>
 
                     <mat-form-field class="example-full-width">
                         <input type="text" placeholder="Excluded Keyword IDs for Movie & TV Suggestions" matInput
@@ -33,7 +41,7 @@
                             <i matChipRemove class="fas fa-times fa-lg"></i>
                         </mat-chip>
                     </mat-chip-list>
-                    
+
                     <div class="md-form-field" style="margin-top:1em;">
                         <mat-form-field appearance="outline" >
                             <mat-label>Movie Genres</mat-label>
@@ -51,7 +59,7 @@
                             {{key.name}}
                             <i matChipRemove class="fas fa-times fa-lg"></i>
                         </mat-chip>
-                    </mat-chip-list>                    
+                    </mat-chip-list>
 
                     <div class="md-form-field" style="margin-top:1em;">
                         <mat-form-field appearance="outline" >

diff --git a/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.ts b/src/Ombi/ClientApp/src/app/settings/themoviedb/themoviedb.component.ts
@@ -1,7 +1,7 @@
 import {COMMA, ENTER} from "@angular/cdk/keycodes";
 import { Component, ElementRef, OnInit, ViewChild } from "@angular/core";
 import { FormBuilder, FormGroup } from "@angular/forms";
-import { IMovieDbKeyword, ITheMovieDbSettings } from "../../interfaces";
+import { ILanguage, IMovieDbKeyword, ITheMovieDbSettings } from "../../interfaces";
 import { debounceTime, switchMap } from "rxjs/operators";
 
 import { MatAutocomplete } from "@angular/material/autocomplete";
@@ -22,29 +22,48 @@ interface IKeywordTag {
 export class TheMovieDbComponent implements OnInit {
 
     public settings: ITheMovieDbSettings;
+    public originalLanguages: ILanguage[];
     public excludedKeywords: IKeywordTag[];
     public excludedMovieGenres: IKeywordTag[];
     public excludedTvGenres: IKeywordTag[];
     public tagForm: FormGroup;
+    public languages: ILanguage[];
     public filteredTags: IMovieDbKeyword[];
     public filteredMovieGenres: IMovieDbKeyword[];
     public filteredTvGenres: IMovieDbKeyword[];
 
+
     constructor(private settingsService: SettingsService,
                 private notificationService: NotificationService,
                 private tmdbService: TheMovieDbService,
                 private searchService: SearchV2Service,
                 private fb: FormBuilder) { }
 
     public ngOnInit() {
-        this.tagForm = this.fb.group({
-            input: null,
-            excludedMovieGenres: null,
-            excludedTvGenres: null,
-          });
         this.settingsService.getTheMovieDbSettings().subscribe(settings => {
             this.settings = settings;
 
+            this.tagForm = this.fb.group({
+              input: null,
+              originalLanguages: [this.settings.originalLanguages],
+              excludedMovieGenres: null,
+              excludedTvGenres: null,
+            });
+
+            this.tagForm
+            .get("input")
+            .valueChanges.pipe(
+              debounceTime(600),
+              switchMap((value: string) => {
+                if (value) {
+                  return this.tmdbService.getKeywords(value);
+                }
+                return [];
+              })
+            )
+            .subscribe((r) => (this.filteredTags = r));
+
+
             // Map Keyword ids -> keyword name
             this.excludedKeywords = settings.excludedKeywordIds
                 ? settings.excludedKeywordIds.map(id => ({
@@ -82,8 +101,12 @@ export class TheMovieDbComponent implements OnInit {
                         }
                     });
                 });
-            });        
-
+            });
+
+            this.searchService.getLanguages().subscribe((results) => {
+              this.languages = results.sort((a: ILanguage, b: ILanguage) => (a.english_name > b.english_name) ? 1 : -1);;
+            });
+
             // Map Tv Genre ids -> genre name
             this.excludedTvGenres = settings.excludedTvGenreIds
                 ? settings.excludedTvGenreIds.map(id => ({
@@ -102,22 +125,10 @@ export class TheMovieDbComponent implements OnInit {
                             genre.name = result.name;
                         }
                     });
-                }); 
+                });
             });
         });
 
-        this.tagForm
-        .get("input")
-        .valueChanges.pipe(
-          debounceTime(600),
-          switchMap((value: string) => {
-            if (value) {
-              return this.tmdbService.getKeywords(value);
-            }
-            return [];
-          })
-        )
-        .subscribe((r) => (this.filteredTags = r));
     }
 
     public remove(tag: IKeywordTag, tag_type: string): void {

diff --git a/src/Ombi/Controllers/V2/SearchController.cs b/src/Ombi/Controllers/V2/SearchController.cs
@@ -19,6 +19,7 @@
 // Due to conflicting Genre models in
 // Ombi.TheMovieDbApi.Models and Ombi.Api.TheMovieDb.Models   
 using Genre = Ombi.TheMovieDbApi.Models.Genre;
+using Ombi.TheMovieDbApi.Models;
 
 namespace Ombi.Controllers.V2
 {
@@ -69,6 +70,12 @@ public Task<IEnumerable<Genre>> GetGenres(string media)
             return _multiSearchEngine.GetGenres(media, HttpContext.RequestAborted);
         }
 
+        [HttpGet("Languages")]
+        public Task<IEnumerable<Language>> GetLanguages()
+        {
+            return _multiSearchEngine.GetLanguages(HttpContext.RequestAborted);
+        }
+
         /// <summary>
         /// Returns details for a single movie
         /// </summary>