From 03eb92f911c1b263cc965d5c4a782db30a501a2b Mon Sep 17 00:00:00 2001 From: Jamie Rees Date: Wed, 8 May 2019 16:21:15 +0100 Subject: [PATCH] Restructured the discover code. also fixed a bug where Endgame is earning too much revenue where we could no longer store it in a int32! --- .../Models/Media/Movie/MovieInformation.cs | 2 +- .../Search/V2/MovieFullInfoViewModel.cs | 2 +- .../Models/FullMovieInfo.cs | 2 +- .../actor/discover-actor.component.html | 0 .../actor/discover-actor.component.scss | 0 .../actor/discover-actor.component.ts | 8 ++--- .../card/discover-card-details.component.html | 0 .../card/discover-card-details.component.scss | 0 .../card/discover-card-details.component.ts | 14 ++++---- .../card/discover-card.component.html | 0 .../card/discover-card.component.scss | 0 .../card/discover-card.component.ts | 6 ++-- .../discover-collections.component.html | 0 .../discover-collections.component.scss | 0 .../discover-collections.component.ts | 8 ++--- .../discover}/discover.component.html | 0 .../discover}/discover.component.scss | 0 .../discover}/discover.component.ts | 6 ++-- .../src/app/discover/components/index.ts | 35 +++++++++++++++++++ .../src/app/discover/discover.module.ts | 35 +++++-------------- 20 files changed, 68 insertions(+), 50 deletions(-) rename src/Ombi/ClientApp/src/app/discover/{ => components}/actor/discover-actor.component.html (100%) rename src/Ombi/ClientApp/src/app/discover/{ => components}/actor/discover-actor.component.scss (100%) rename src/Ombi/ClientApp/src/app/discover/{ => components}/actor/discover-actor.component.ts (90%) rename src/Ombi/ClientApp/src/app/discover/{ => components}/card/discover-card-details.component.html (100%) rename src/Ombi/ClientApp/src/app/discover/{ => components}/card/discover-card-details.component.scss (100%) rename src/Ombi/ClientApp/src/app/discover/{ => components}/card/discover-card-details.component.ts (87%) rename src/Ombi/ClientApp/src/app/discover/{ => components}/card/discover-card.component.html (100%) rename src/Ombi/ClientApp/src/app/discover/{ => components}/card/discover-card.component.scss (100%) rename src/Ombi/ClientApp/src/app/discover/{ => components}/card/discover-card.component.ts (95%) rename src/Ombi/ClientApp/src/app/discover/{ => components}/collections/discover-collections.component.html (100%) rename src/Ombi/ClientApp/src/app/discover/{ => components}/collections/discover-collections.component.scss (100%) rename src/Ombi/ClientApp/src/app/discover/{ => components}/collections/discover-collections.component.ts (87%) rename src/Ombi/ClientApp/src/app/discover/{ => components/discover}/discover.component.html (100%) rename src/Ombi/ClientApp/src/app/discover/{ => components/discover}/discover.component.scss (100%) rename src/Ombi/ClientApp/src/app/discover/{ => components/discover}/discover.component.ts (98%) create mode 100644 src/Ombi/ClientApp/src/app/discover/components/index.ts diff --git a/src/Ombi.Api.Emby/Models/Media/Movie/MovieInformation.cs b/src/Ombi.Api.Emby/Models/Media/Movie/MovieInformation.cs index 0a6735375..321f7c1e1 100644 --- a/src/Ombi.Api.Emby/Models/Media/Movie/MovieInformation.cs +++ b/src/Ombi.Api.Emby/Models/Media/Movie/MovieInformation.cs @@ -53,7 +53,7 @@ namespace Ombi.Api.Emby.Models.Movie public string MediaType { get; set; } public string HomePageUrl { get; set; } public int Budget { get; set; } - public int Revenue { get; set; } + public float Revenue { get; set; } public object[] LockedFields { get; set; } public bool LockData { get; set; } } diff --git a/src/Ombi.Core/Models/Search/V2/MovieFullInfoViewModel.cs b/src/Ombi.Core/Models/Search/V2/MovieFullInfoViewModel.cs index f1d8665b0..8e8dac9b1 100644 --- a/src/Ombi.Core/Models/Search/V2/MovieFullInfoViewModel.cs +++ b/src/Ombi.Core/Models/Search/V2/MovieFullInfoViewModel.cs @@ -17,7 +17,7 @@ namespace Ombi.Core.Models.Search.V2 public string Overview { get; set; } public List ProductionCompanies { get; set; } public double Popularity { get; set; } - public int Revenue { get; set; } + public float Revenue { get; set; } public long Runtime { get; set; } public string PosterPath { get; set; } public DateTime? ReleaseDate { get; set; } diff --git a/src/Ombi.TheMovieDbApi/Models/FullMovieInfo.cs b/src/Ombi.TheMovieDbApi/Models/FullMovieInfo.cs index 151ad3399..0e352580f 100644 --- a/src/Ombi.TheMovieDbApi/Models/FullMovieInfo.cs +++ b/src/Ombi.TheMovieDbApi/Models/FullMovieInfo.cs @@ -39,7 +39,7 @@ namespace Ombi.Api.TheMovieDb.Models [JsonProperty("release_date")] public string ReleaseDate { get; set; } [JsonProperty("revenue")] - public int Revenue { get; set; } + public float Revenue { get; set; } [JsonProperty("runtime")] public long Runtime { get; set; } [JsonProperty("spoken_languages")] diff --git a/src/Ombi/ClientApp/src/app/discover/actor/discover-actor.component.html b/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.html similarity index 100% rename from src/Ombi/ClientApp/src/app/discover/actor/discover-actor.component.html rename to src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.html diff --git a/src/Ombi/ClientApp/src/app/discover/actor/discover-actor.component.scss b/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.scss similarity index 100% rename from src/Ombi/ClientApp/src/app/discover/actor/discover-actor.component.scss rename to src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.scss diff --git a/src/Ombi/ClientApp/src/app/discover/actor/discover-actor.component.ts b/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.ts similarity index 90% rename from src/Ombi/ClientApp/src/app/discover/actor/discover-actor.component.ts rename to src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.ts index da132a1c3..e4c624ce7 100644 --- a/src/Ombi/ClientApp/src/app/discover/actor/discover-actor.component.ts +++ b/src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.ts @@ -1,9 +1,9 @@ import { Component, AfterViewInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { SearchV2Service } from "../../services"; -import { IActorCredits } from "../../interfaces/ISearchTvResultV2"; -import { IDiscoverCardResult } from "../interfaces"; -import { RequestType } from "../../interfaces"; +import { SearchV2Service } from "../../../services"; +import { IActorCredits } from "../../../interfaces/ISearchTvResultV2"; +import { IDiscoverCardResult } from "../../interfaces"; +import { RequestType } from "../../../interfaces"; @Component({ templateUrl: "./discover-actor.component.html", diff --git a/src/Ombi/ClientApp/src/app/discover/card/discover-card-details.component.html b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card-details.component.html similarity index 100% rename from src/Ombi/ClientApp/src/app/discover/card/discover-card-details.component.html rename to src/Ombi/ClientApp/src/app/discover/components/card/discover-card-details.component.html diff --git a/src/Ombi/ClientApp/src/app/discover/card/discover-card-details.component.scss b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card-details.component.scss similarity index 100% rename from src/Ombi/ClientApp/src/app/discover/card/discover-card-details.component.scss rename to src/Ombi/ClientApp/src/app/discover/components/card/discover-card-details.component.scss diff --git a/src/Ombi/ClientApp/src/app/discover/card/discover-card-details.component.ts b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card-details.component.ts similarity index 87% rename from src/Ombi/ClientApp/src/app/discover/card/discover-card-details.component.ts rename to src/Ombi/ClientApp/src/app/discover/components/card/discover-card-details.component.ts index a92c2f961..950fb7732 100644 --- a/src/Ombi/ClientApp/src/app/discover/card/discover-card-details.component.ts +++ b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card-details.component.ts @@ -1,12 +1,12 @@ import { Component, Inject, OnInit, ViewEncapsulation } from "@angular/core"; import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from "@angular/material"; -import { IDiscoverCardResult } from "../interfaces"; -import { SearchV2Service, RequestService, MessageService } from "../../services"; -import { RequestType } from "../../interfaces"; -import { ISearchMovieResultV2 } from "../../interfaces/ISearchMovieResultV2"; -import { ISearchTvResultV2 } from "../../interfaces/ISearchTvResultV2"; -import { RouterLink, Router } from "@angular/router"; -import { EpisodeRequestComponent } from "../../shared/episode-request/episode-request.component"; +import { IDiscoverCardResult } from "../../interfaces"; +import { SearchV2Service, RequestService, MessageService } from "../../../services"; +import { RequestType } from "../../../interfaces"; +import { ISearchMovieResultV2 } from "../../../interfaces/ISearchMovieResultV2"; +import { ISearchTvResultV2 } from "../../../interfaces/ISearchTvResultV2"; +import { Router } from "@angular/router"; +import { EpisodeRequestComponent } from "../../../shared/episode-request/episode-request.component"; @Component({ selector: "discover-card-details", diff --git a/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.html b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html similarity index 100% rename from src/Ombi/ClientApp/src/app/discover/card/discover-card.component.html rename to src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html diff --git a/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.scss b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.scss similarity index 100% rename from src/Ombi/ClientApp/src/app/discover/card/discover-card.component.scss rename to src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.scss diff --git a/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.ts b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts similarity index 95% rename from src/Ombi/ClientApp/src/app/discover/card/discover-card.component.ts rename to src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts index 082b3b80e..fb9a4aec7 100644 --- a/src/Ombi/ClientApp/src/app/discover/card/discover-card.component.ts +++ b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, Input } from "@angular/core"; -import { IDiscoverCardResult } from "../interfaces"; -import { RequestType, ISearchTvResult, ISearchMovieResult } from "../../interfaces"; -import { SearchService } from "../../services"; +import { IDiscoverCardResult } from "../../interfaces"; +import { RequestType, ISearchTvResult, ISearchMovieResult } from "../../../interfaces"; +import { SearchService } from "../../../services"; import { MatDialog } from "@angular/material"; import { DiscoverCardDetailsComponent } from "./discover-card-details.component"; diff --git a/src/Ombi/ClientApp/src/app/discover/collections/discover-collections.component.html b/src/Ombi/ClientApp/src/app/discover/components/collections/discover-collections.component.html similarity index 100% rename from src/Ombi/ClientApp/src/app/discover/collections/discover-collections.component.html rename to src/Ombi/ClientApp/src/app/discover/components/collections/discover-collections.component.html diff --git a/src/Ombi/ClientApp/src/app/discover/collections/discover-collections.component.scss b/src/Ombi/ClientApp/src/app/discover/components/collections/discover-collections.component.scss similarity index 100% rename from src/Ombi/ClientApp/src/app/discover/collections/discover-collections.component.scss rename to src/Ombi/ClientApp/src/app/discover/components/collections/discover-collections.component.scss diff --git a/src/Ombi/ClientApp/src/app/discover/collections/discover-collections.component.ts b/src/Ombi/ClientApp/src/app/discover/components/collections/discover-collections.component.ts similarity index 87% rename from src/Ombi/ClientApp/src/app/discover/collections/discover-collections.component.ts rename to src/Ombi/ClientApp/src/app/discover/components/collections/discover-collections.component.ts index 872ffc9cc..eab7b2ec3 100644 --- a/src/Ombi/ClientApp/src/app/discover/collections/discover-collections.component.ts +++ b/src/Ombi/ClientApp/src/app/discover/components/collections/discover-collections.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { SearchV2Service, RequestService, NotificationService, MessageService } from "../../services"; -import { IMovieCollectionsViewModel } from "../../interfaces/ISearchTvResultV2"; -import { IDiscoverCardResult } from "../interfaces"; -import { RequestType } from "../../interfaces"; +import { SearchV2Service, RequestService, MessageService } from "../../../services"; +import { IMovieCollectionsViewModel } from "../../../interfaces/ISearchTvResultV2"; +import { IDiscoverCardResult } from "../../interfaces"; +import { RequestType } from "../../../interfaces"; @Component({ templateUrl: "./discover-collections.component.html", diff --git a/src/Ombi/ClientApp/src/app/discover/discover.component.html b/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.html similarity index 100% rename from src/Ombi/ClientApp/src/app/discover/discover.component.html rename to src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.html diff --git a/src/Ombi/ClientApp/src/app/discover/discover.component.scss b/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.scss similarity index 100% rename from src/Ombi/ClientApp/src/app/discover/discover.component.scss rename to src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.scss diff --git a/src/Ombi/ClientApp/src/app/discover/discover.component.ts b/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.ts similarity index 98% rename from src/Ombi/ClientApp/src/app/discover/discover.component.ts rename to src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.ts index b9f977005..866e02b00 100644 --- a/src/Ombi/ClientApp/src/app/discover/discover.component.ts +++ b/src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from "@angular/core"; -import { SearchV2Service } from "../services"; -import { ISearchMovieResult, ISearchTvResult, RequestType } from "../interfaces"; -import { IDiscoverCardResult } from "./interfaces"; +import { SearchV2Service } from "../../../services"; +import { ISearchMovieResult, ISearchTvResult, RequestType } from "../../../interfaces"; +import { IDiscoverCardResult } from "../../interfaces"; import { trigger, transition, style, animate } from "@angular/animations"; @Component({ diff --git a/src/Ombi/ClientApp/src/app/discover/components/index.ts b/src/Ombi/ClientApp/src/app/discover/components/index.ts new file mode 100644 index 000000000..428e894e1 --- /dev/null +++ b/src/Ombi/ClientApp/src/app/discover/components/index.ts @@ -0,0 +1,35 @@ +import { DiscoverComponent } from "./discover/discover.component"; +import { DiscoverCardDetailsComponent } from "./card/discover-card-details.component"; +import { DiscoverCollectionsComponent } from "./collections/discover-collections.component"; +import { DiscoverActorComponent } from "./actor/discover-actor.component"; +import { DiscoverCardComponent } from "./card/discover-card.component"; +import { Routes } from "@angular/router"; +import { AuthGuard } from "../../auth/auth.guard"; +import { SearchService, RequestService } from "../../services"; +import { MatDialog } from "@angular/material"; + + +export const components: any[] = [ + DiscoverComponent, + DiscoverCardComponent, + DiscoverCardDetailsComponent, + DiscoverCollectionsComponent, + DiscoverActorComponent, +]; + + +export const entryComponents: any[] = [ + DiscoverCardDetailsComponent +]; + +export const providers: any[] = [ + SearchService, + MatDialog, + RequestService, +]; + +export const routes: Routes = [ + { path: "", component: DiscoverComponent, canActivate: [AuthGuard] }, + { path: "collection/:collectionId", component: DiscoverCollectionsComponent, canActivate: [AuthGuard] }, + { path: "actor/:actorId", component: DiscoverActorComponent, canActivate: [AuthGuard] } +]; \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/discover/discover.module.ts b/src/Ombi/ClientApp/src/app/discover/discover.module.ts index c67f3607b..31e51fe24 100644 --- a/src/Ombi/ClientApp/src/app/discover/discover.module.ts +++ b/src/Ombi/ClientApp/src/app/discover/discover.module.ts @@ -1,49 +1,32 @@ import { NgModule } from "@angular/core"; -import { RouterModule, Routes } from "@angular/router"; +import { RouterModule } from "@angular/router"; import { InfiniteScrollModule } from 'ngx-infinite-scroll'; -import { SearchService, RequestService } from "../services"; - import { SharedModule } from "../shared/shared.module"; -import { DiscoverComponent } from "./discover.component"; -import { DiscoverCardComponent } from "./card/discover-card.component"; -import { AuthGuard } from "../auth/auth.guard"; import { PipeModule } from "../pipes/pipe.module"; -import { DiscoverCardDetailsComponent } from "./card/discover-card-details.component"; -import { MatDialog } from "@angular/material"; -import { DiscoverCollectionsComponent } from "./collections/discover-collections.component"; -import { DiscoverActorComponent } from "./actor/discover-actor.component"; -const routes: Routes = [ - { path: "", component: DiscoverComponent, canActivate: [AuthGuard] }, - { path: "collection/:collectionId", component: DiscoverCollectionsComponent, canActivate: [AuthGuard] }, - { path: "actor/:actorId", component: DiscoverActorComponent, canActivate: [AuthGuard] } -]; +import * as fromComponents from './components'; + + @NgModule({ imports: [ - RouterModule.forChild(routes), + RouterModule.forChild(fromComponents.routes), SharedModule, PipeModule, InfiniteScrollModule, ], declarations: [ - DiscoverComponent, - DiscoverCardComponent, - DiscoverCardDetailsComponent, - DiscoverCollectionsComponent, - DiscoverActorComponent, + ...fromComponents.components ], entryComponents: [ - DiscoverCardDetailsComponent + ...fromComponents.entryComponents ], exports: [ RouterModule, ], providers: [ - SearchService, - MatDialog, - RequestService, - ], + ...fromComponents.providers + ], }) export class DiscoverModule { }