diff --git a/src/Ombi.Core/Models/Search/V2/MovieFullInfoViewModel.cs b/src/Ombi.Core/Models/Search/V2/MovieFullInfoViewModel.cs index e22bfffc2..97496f35f 100644 --- a/src/Ombi.Core/Models/Search/V2/MovieFullInfoViewModel.cs +++ b/src/Ombi.Core/Models/Search/V2/MovieFullInfoViewModel.cs @@ -38,8 +38,16 @@ namespace Ombi.Core.Models.Search.V2 public DateTime? DigitalReleaseDate { get; set; } public Similar Similar { get; set; } public Recommendations Recommendations { get; set; } + public ExternalIds ExternalIds { get; set; } } + public class ExternalIds + { + public string ImdbId { get; set; } + public string FacebookId { get; set; } + public string InstagramId { get; set; } + public string TwitterId { get; set; } + } public class GenreViewModel { public int id { get; set; } diff --git a/src/Ombi.Mapping/Profiles/MovieProfile.cs b/src/Ombi.Mapping/Profiles/MovieProfile.cs index 930013599..aae7fae64 100644 --- a/src/Ombi.Mapping/Profiles/MovieProfile.cs +++ b/src/Ombi.Mapping/Profiles/MovieProfile.cs @@ -85,6 +85,7 @@ namespace Ombi.Mapping.Profiles CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); + CreateMap().ReverseMap(); } } } \ No newline at end of file diff --git a/src/Ombi.TheMovieDbApi/Models/FullMovieInfo.cs b/src/Ombi.TheMovieDbApi/Models/FullMovieInfo.cs index 654aa3c12..58e05b3f4 100644 --- a/src/Ombi.TheMovieDbApi/Models/FullMovieInfo.cs +++ b/src/Ombi.TheMovieDbApi/Models/FullMovieInfo.cs @@ -64,6 +64,8 @@ namespace Ombi.Api.TheMovieDb.Models public Recommendations Recommendations { get; set; } [JsonProperty("release_dates")] public ReleaseDates ReleaseDates { get; set; } + [JsonProperty("external_ids")] + public ExternalIds ExternalIds { get; set; } } public class Videos @@ -83,6 +85,18 @@ namespace Ombi.Api.TheMovieDb.Models public string type { get; set; } } + public class ExternalIds + { + [JsonProperty("imdb_id")] + public string ImdbId { get; set; } + [JsonProperty("facebook_id")] + public string FacebookId { get; set; } + [JsonProperty("instagram_id")] + public string InstagramId { get; set; } + [JsonProperty("twitter_id")] + public string TwitterId { get; set; } + } + public class Credits { public FullMovieCast[] cast { get; set; } diff --git a/src/Ombi.TheMovieDbApi/TheMovieDbApi.cs b/src/Ombi.TheMovieDbApi/TheMovieDbApi.cs index 47652b26b..3bdc952ac 100644 --- a/src/Ombi.TheMovieDbApi/TheMovieDbApi.cs +++ b/src/Ombi.TheMovieDbApi/TheMovieDbApi.cs @@ -38,7 +38,7 @@ namespace Ombi.Api.TheMovieDb var request = new Request($"movie/{movieId}", BaseUri, HttpMethod.Get); request.FullUri = request.FullUri.AddQueryParameter("api_key", ApiToken); request.FullUri = request.FullUri.AddQueryParameter("language", langCode); - request.FullUri = request.FullUri.AddQueryParameter("append_to_response", "videos,credits,similar,recommendations,release_dates"); + request.FullUri = request.FullUri.AddQueryParameter("append_to_response", "videos,credits,similar,recommendations,release_dates,external_ids"); AddRetry(request); return await Api.Request(request); diff --git a/src/Ombi/ClientApp/src/app/interfaces/ISearchMovieResultV2.ts b/src/Ombi/ClientApp/src/app/interfaces/ISearchMovieResultV2.ts index cf6d2ff24..b13ed3abd 100644 --- a/src/Ombi/ClientApp/src/app/interfaces/ISearchMovieResultV2.ts +++ b/src/Ombi/ClientApp/src/app/interfaces/ISearchMovieResultV2.ts @@ -38,6 +38,7 @@ digitalReleaseDate: Date; subscribed: boolean; showSubscribe: boolean; + externalIds: IExternalIds; // for the UI requestProcessing: boolean; @@ -49,6 +50,13 @@ export interface IVideos { results: IVideoResult[]; } +export interface IExternalIds { + facebookId: string; + imdbId: string; + instagramId: string; + twitterId: string; +} + export interface IGenresViewModel { id: number; name: string; @@ -125,16 +133,16 @@ export interface IOtherMovies { results: IOtherMoviesViewModel[]; } -export interface IOtherMoviesViewModel { +export interface IOtherMoviesViewModel { adult: boolean; backdrop_path: string; id: number; original_language: string; original_title: string; - overview : string; + overview: string; poster_path: string; - release_date : string; - title : string; + release_date: string; + title: string; video: boolean; vote_average: number; vote_count: number; diff --git a/src/Ombi/ClientApp/src/app/media-details/movie-details.component.html b/src/Ombi/ClientApp/src/app/media-details/movie-details.component.html index 8ac2f3bac..b0da3791f 100644 --- a/src/Ombi/ClientApp/src/app/media-details/movie-details.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/movie-details.component.html @@ -35,7 +35,22 @@ - +
+ + + + + + + + + + + +
@@ -85,26 +100,48 @@
-
-
+
+
+
+ + + + + + +
+
- diff --git a/src/Ombi/ClientApp/src/app/media-details/movie-details.component.scss b/src/Ombi/ClientApp/src/app/media-details/movie-details.component.scss index 500f5f8fa..b1915941f 100644 --- a/src/Ombi/ClientApp/src/app/media-details/movie-details.component.scss +++ b/src/Ombi/ClientApp/src/app/media-details/movie-details.component.scss @@ -1,3 +1,4 @@ +$ombi-primary:#3f3f3f; //MINE @media (max-width: 570px) { h1 { @@ -163,4 +164,13 @@ section { } .grow:hover { transform: scale(1.1); +} + +.media-icons { + color:$ombi-primary; + padding: 1%; +} + +.media-row { + padding-top: 2%; } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/media-details/movie-details.component.ts b/src/Ombi/ClientApp/src/app/media-details/movie-details.component.ts index d23defec1..c8c5a3319 100644 --- a/src/Ombi/ClientApp/src/app/media-details/movie-details.component.ts +++ b/src/Ombi/ClientApp/src/app/media-details/movie-details.component.ts @@ -34,6 +34,10 @@ export class MovieDetailsComponent { } + public request() { + // + } + public openDialog() { this.dialog.open(MovieDetailsTrailerComponent, { width: '560px', diff --git a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html index e2ec72a90..c5b907791 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html +++ b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html @@ -1,20 +1,3 @@ - - - - - - - \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.ts b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.ts index b64ee506f..13cad8001 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.ts +++ b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.ts @@ -21,7 +21,7 @@ export class NavSearchComponent { public searchFailed = false; - public formatter = (result: IMultiSearchResult) => result.media_type == "movie" ? result.title : result.name; + public formatter = (result: IMultiSearchResult) => result.media_type == "movie" ? result.title + ` (${result.release_date.slice(0,4)})` : result.name + ` (${result.release_date.slice(0,4)})`; public searchModel = (text$: Observable) => text$.pipe(