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

more more more !wip

Browse Source
pull/3895/head
TidusJar 6 years ago
parent b570d904bf
commit c18efc5a3a
13 changed files with 256 additions and 161 deletions
Show Stats Download Patch File Download Diff File

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

@ -13,7 +13,7 @@ namespace Ombi.Core.Engine.Interfaces
Task RemoveMovieRequest(int requestId);
Task RemoveAllMovieRequests();
Task<MovieRequests> GetRequest(int requestId);
Task<MovieRequests> UpdateMovieRequest(MovieRequests request);
Task<RequestEngineResult> ApproveMovie(MovieRequests request);
Task<RequestEngineResult> ApproveMovieById(int requestId);

9
src/Ombi.Core/Engine/MovieRequestEngine.cs
Unescape View File

@ -259,6 +259,15 @@ namespace Ombi.Core.Engine
return allRequests;
}
public async Task<MovieRequests> GetRequest(int requestId)
{
var request = await MovieRepository.GetWithUser().Where(x => x.Id == requestId).FirstOrDefaultAsync();
request.PosterPath = PosterPathHelper.FixPosterPath(request.PosterPath);
await CheckForSubscription(new HideResult(), request);
return request;
}
private async Task CheckForSubscription(HideResult shouldHide, MovieRequests x)
{
if (shouldHide.UserId == x.RequestedUserId)

6
src/Ombi/ClientApp/src/app/media-details/media-details.component.scss
Unescape View File

@ -157,7 +157,11 @@
}
.spacing-below {
margin-bottom: 15px;
margin-bottom: 15px !important;
}
.left-seperator {
margin-left:40px;
}
.tagline {

2
src/Ombi/ClientApp/src/app/media-details/media-details.module.ts
Unescape View File

@ -11,6 +11,7 @@ import { TvDetailsComponent } from "./tv/tv-details.component";
import { PipeModule } from "../pipes/pipe.module";
import { YoutubeTrailerComponent } from "./youtube-trailer.component";
import { MovieInformationPanelComponent } from "./movie/panels/movie-information-panel.component";
import { TvInformationPanelComponent } from "./tv/panels/tv-information-panel.component";
const routes: Routes = [
{ path: "movie/:movieDbId", component: MovieDetailsComponent },
@ -29,6 +30,7 @@ const routes: Routes = [
YoutubeTrailerComponent,
TvDetailsComponent,
MovieInformationPanelComponent,
TvInformationPanelComponent,
],
exports: [
RouterModule,

27
src/Ombi/ClientApp/src/app/media-details/movie/movie-details.component.html
Unescape View File

@ -67,6 +67,19 @@
<i matTooltip="Instagram" class="fa fa-instagram fa-2x grow"></i>
</a>
<span class="left-seperator" *ngIf="movie.available">
<a *ngIf="movie.plexUrl" class="media-icons" href="{{movie.plexUrl}}" target="_blank">
<i matTooltip=" {{'Search.ViewOnPlex' | translate}}"
class="fa fa-play-circle fa-2x grow"></i>
</a>
<a *ngIf="movie.embyUrl" class="media-icons" href="{{movie.embyUrl}}" target="_blank">
<i matTooltip=" {{'Search.ViewOnEmby' | translate}}"
class="fa fa-play-circle fa-2x grow"></i>
</a>
</span>
</div>
@ -89,17 +102,9 @@
'Common.Request' | translate }}</button>
</ng-template>
</span>
<span *ngIf="isAdmin"><button mat-raised-button class="btn-spacing" color="warn"
(click)="deny()">Deny</button></span>
<span *ngIf="movie.available">
<a *ngIf="movie.plexUrl" mat-raised-button style="text-align: right"
class="btn-spacing btn-greem" href="{{movie.plexUrl}}" target="_blank"><i
class="fa fa-eye"></i> {{'Search.ViewOnPlex' |
translate}}</a>
<a *ngIf="movie.embyUrl" mat-raised-button class="btn-green btn-spacing"
href="{{movie.embyUrl}}" target="_blank"><i class="fa fa-eye"></i> {{'Search.ViewOnEmby' |
translate}}</a>
</span>
<span *ngIf="isAdmin && hasRequest"><button mat-raised-button class="btn-spacing" color="warn"
(click)="deny()">{{ 'Requests.Deny' | translate }}</button></span>
</div>
</div>

22
src/Ombi/ClientApp/src/app/media-details/movie/movie-details.component.ts
Unescape View File

@ -6,6 +6,7 @@ import { ISearchMovieResultV2 } from "../../interfaces/ISearchMovieResultV2";
import { MatDialog } from "@angular/material";
import { YoutubeTrailerComponent } from "../youtube-trailer.component";
import { AuthService } from "../../auth/auth.service";
import { IMovieRequests } from "../../interfaces";
@Component({
templateUrl: "./movie-details.component.html",
@ -14,6 +15,8 @@ import { AuthService } from "../../auth/auth.service";
})
export class MovieDetailsComponent {
public movie: ISearchMovieResultV2;
public hasRequest: boolean;
public movieRequest: IMovieRequests;
public isAdmin: boolean;
private theMovidDbId: number;
@ -30,8 +33,13 @@ export class MovieDetailsComponent {
public load() {
this.isAdmin = this.auth.hasRole("admin") || this.auth.hasRole("poweruser");
this.searchService.getFullMovieDetails(this.theMovidDbId).subscribe(x => {
this.searchService.getFullMovieDetails(this.theMovidDbId).subscribe(async x => {
this.movie = x;
if(this.movie.requestId > 0) {
// Load up this request
this.hasRequest = true;
this.movieRequest = await this.requestService.getMovieRequest(this.movie.requestId);
}
this.imageService.getMovieBanner(this.theMovidDbId.toString()).subscribe(x => {
this.movie.background = this.sanitizer.bypassSecurityTrustStyle
("url(" + x + ")");
@ -41,7 +49,7 @@ export class MovieDetailsComponent {
}
public async request() {
var result = await this.requestService.requestMovie({ theMovieDbId: this.theMovidDbId, languageCode: null }).toPromise();
const result = await this.requestService.requestMovie({ theMovieDbId: this.theMovidDbId, languageCode: null }).toPromise();
if (result.result) {
this.movie.requested = true;
this.messageService.send(result.message, "Ok");
@ -56,4 +64,14 @@ export class MovieDetailsComponent {
data: this.movie.videos.results[0].key
});
}
public async deny() {
const result = await this.requestService.denyMovie({id: this.theMovidDbId, reason: ""}).toPromise();
if (result.result) {
this.movie.approved = false;
this.messageService.send(result.message, "Ok");
} else {
this.messageService.send(result.errorMessage, "Ok");
}
}
}

36
src/Ombi/ClientApp/src/app/media-details/movie/panels/movie-information-panel.component.html
Unescape View File

@ -1,24 +1,41 @@
<div *ngIf="movie">
<div>
<strong>Status:</strong>
<div>{{movie.status}}</div>
</div>
<div>
<strong>Availability</strong>
<div *ngIf="movie.available">{{'Common.Available' | translate}}</div>
<div *ngIf="!movie.available">{{'Common.NotAvailable' | translate}}</div>
</div>
<div>
<strong>Request Status</strong>
<div *ngIf="movie.approved && !movie.available">{{'Common.ProcessingRequest' | translate}}</div>
<div *ngIf="movie.requested && !movie.approved && !movie.available">{{'Common.PendingApproval' | translate}}
</div>
<div *ngIf="!movie.requested && !movie.available && !movie.approved">{{'Common.NotRequested' | translate}}
</div>
</div>
<br />
<div *ngIf="movie.genres">
<strong>Genres:</strong>
<div>
<mat-chip-list>
<mat-chip *ngFor="let genre of movie.genres">
<mat-chip color="accent" selected *ngFor="let genre of movie.genres">
{{genre.name}}
</mat-chip>
</mat-chip-list>
</div>
</div>
<br />
<div>
<div>
<strong>Status:</strong>
<div>{{movie.status}}</div>
</div>
<strong>Theatrical Release:</strong>
<div>
{{movie.releaseDate | date: 'mediumDate'}}
</div>
</div>
<div *ngIf="movie.digitalReleaseDate">
<strong>Digital Release:</strong>
<div>
@ -55,8 +72,9 @@
<div>
<strong>Keywords/Tags:</strong>
<mat-chip-list>
<mat-chip *ngFor="let keyword of movie.keywords.keywordsValue">
<mat-chip color="accent" selected *ngFor="let keyword of movie.keywords.keywordsValue">
{{keyword.name}}
</mat-chip>
</mat-chip-list>
</div>
</div>

61
src/Ombi/ClientApp/src/app/media-details/tv/panels/tv-information-panel.component.html
Unescape View File

@ -0,0 +1,61 @@
<div>
<div *ngIf="tv.status">
<strong>Status:</strong>
<div>
{{tv.status}}
</div>
</div>
<strong>First Aired:</strong>
<div>
{{tv.firstAired | date: 'mediumDate'}}
</div>
</div>
<div>
<strong>Status:</strong>
<div>
{{tv.status}}
</div>
</div>
<div>
<strong>Runtime:</strong>
<div>
{{tv.runtime}} Minutes
</div>
</div>
<div *ngIf="tv.rating">
<strong>Rating:</strong>
<div>
{{tv.rating}} / 10
</div>
</div>
<div *ngIf="tv.network">
<strong>Network:</strong>
<div>
{{tv.network.name}}
</div>
</div>
<div *ngIf="tv.genre">
<strong>Genres:</strong>
<div>
<span *ngFor="let genre of tv.genre">
{{genre}} |
</span>
</div>
</div>
<br />
<div *ngIf="seasonCount">
<strong>Seasons:</strong>
<div>
{{seasonCount}}
</div>
</div>
<div *ngIf="totalEpisodes">
<strong>Episodes:</strong>
<div>
{{totalEpisodes}}
</div>
</div>

12
src/Ombi/ClientApp/src/app/media-details/tv/panels/tv-information-panel.component.ts
Unescape View File

@ -0,0 +1,12 @@
import { Component, ViewEncapsulation, Input } from "@angular/core";
import { ISearchTvResultV2 } from "../../../interfaces/ISearchTvResultV2";
@Component({
templateUrl: "./tv-information-panel.component.html",
styleUrls: ["../../media-details.component.scss"],
selector: "tv-information-panel",
encapsulation: ViewEncapsulation.None
})
export class TvInformationPanelComponent {
@Input() public tv: ISearchTvResultV2;
}

100
src/Ombi/ClientApp/src/app/media-details/tv/tv-details.component.html
Unescape View File

@ -79,91 +79,28 @@
</div>
<div class="row">
<div class="col-12 col-md-3">
<div class="col-12 col-md-2">
<mat-card class="card-full mat-elevation-z8">
<mat-card-content>
<div>
<span><strong>First Aired:</strong>
{{tv.firstAired | date: 'mediumDate'}}</span></div>
<div>
<span *ngIf="tv.rating"><strong>Rating:</strong> {{tv.rating}}/10</span>
</div>
<div>
<span><strong>Status:</strong> {{tv.status}}</span>
</div>
<div>
<span><strong>Runtime:</strong> {{tv.runtime}} Minutes</span>
</div>
<div>
<span *ngIf="tv.status"><strong>Status:</strong> {{tv.status}}</span>
</div>
<div>
<span *ngIf="tv.network"><strong>Network:</strong> {{tv.network.name}}</span>
</div>
<div>
<span *ngIf="tv.genre"><strong>Genres:</strong>
<span *ngFor="let genre of tv.genre">
{{genre}} |
</span>
</span>
</div>
<div>
<span *ngIf="seasonCount"><strong>Seasons:</strong> {{seasonCount}}</span>
</div>
<div>
<span *ngIf="totalEpisodes"><strong>Episodes:</strong> {{totalEpisodes}}</span>
</div>
</mat-card-content>
</mat-card>
</div>
<div class="col-12 col-md-9">
<mat-card class="card-full mat-elevation-z8">
<mat-card-content>
{{tv.overview}}
<mat-card class="mat-elevation-z8">
<mat-card-content class="medium-font">
<tv-information-panel [tv]="tv"></tv-information-panel>
</mat-card-content>
</mat-card>
</div>
</div>
<div class="row card-spacer media-row">
<!-- <div class="col-12 col-md-3">
<mat-card class="mat-elevation-z8 keywords-panel">
<mat-card-content>
<div>
<span>
<strong>Keywords/Tags:</strong>
<mat-chip-list>
<mat-chip *ngFor="let keyword of tv.keywords.keywordsValue">
{{keyword.name}}
</mat-chip>
</mat-chip-list>
</span>
</div>
</mat-card-content>
</mat-card>
</div> -->
<div class="col-12 col-md-3">
<mat-card class="mat-elevation-z8">
<div class="col-12 col-md-10">
<div class="row">
<div class="col-12">
<mat-card class="mat-elevation-z8 spacing-below">
<mat-card-content>
{{tv.overview}}
</mat-card-content>
</mat-card>
</div>
<div class="col-12 col-md-9">
<mat-card class="card-full mat-elevation-z8">
<div class="col-12">
<mat-card class="mat-elevation-z8 spacing-below">
<mat-card-header>Cast</mat-card-header>
<mat-card-content>
<p-carousel [value]="tv.cast" [numVisible]="5" easing="easeOutStrong">
@ -186,6 +123,21 @@
</mat-card-content>
</mat-card>
</div>
</div>
</div>
</div>
<div class="row card-spacer media-row">
<div class="col-12 col-md-9">
</div>
</div>
<div class="row card-spacer media-row">
<div class="col-12 col-md-3"></div>

8
src/Ombi/ClientApp/src/app/search/moviesearch.component.html
Unescape View File

@ -101,10 +101,10 @@
class="label label-info" [translate]="'Search.Movies.Trailer'"></span></a>
<span *ngIf="result.quality" id="qualityLabel" class="label label-success">{{result.quality}}p</span>
<ng-template [ngIf]="result.available"><span class="label label-success" id="availableLabel"
[translate]="'Common.Available'"></span></ng-template>
<ng-template [ngIf]="result.approved && !result.available"><span class="label label-info"
id="processingRequestLabel" [translate]="'Common.ProcessingRequest'"></span></ng-template>
<ng-template [ngIf]="result.available">
<span class="label label-success" id="availableLabel" [translate]="'Common.Available'"></span></ng-template>
<ng-template [ngIf]="result.approved && !result.available">
<span class="label label-info" id="processingRequestLabel" [translate]="'Common.ProcessingRequest'"></span></ng-template>
<ng-template [ngIf]="result.requested && !result.approved && !result.available"><span class="label label-warning"
id="pendingApprovalLabel" [translate]="'Common.PendingApproval'"></span></ng-template>
<ng-template [ngIf]="!result.requested && !result.available && !result.approved"><span

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

@ -70,6 +70,10 @@ export class RequestService extends ServiceHelpers {
return this.http.get<IMovieRequests[]>(`${this.url}movie/search/${search}`, {headers: this.headers});
}
public getMovieRequest(requestId: number): Promise<IMovieRequests> {
return this.http.get<IMovieRequests>(`${this.url}movie/info/${requestId}`, {headers: this.headers}).toPromise();
}
public removeMovieRequest(request: IMovieRequests) {
this.http.delete(`${this.url}movie/${request.id}`, {headers: this.headers}).subscribe();
}

10
src/Ombi/Controllers/V1/RequestController.cs
Unescape View File

@ -56,6 +56,16 @@ namespace Ombi.Controllers.V1
});
}
/// <summary>
/// Returns information about the Single Movie Request
/// </summary>
/// <param name="requestId">the movie request id</param>
[HttpGet("movie/info/{requestId}")]
public async Task<MovieRequests> GetMovieRequest(int requestId)
{
return await MovieRequestEngine.GetRequest(requestId);
}
/// <summary>
/// Gets the total amount of movie requests.
/// </summary>

Write Preview
Loading…
Cancel
Save