github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-14 02:26:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
tidusjar 2020-06-19 23:51:11 +01:00
commit faee15552c
11 changed files with 41 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Ombi.Core/Engine/Interfaces/BaseEngine.cs
View file

@ -29,7 +29,8 @@ namespace Ombi.Core.Engine.Interfaces
private OmbiUser _user;
protected async Task<OmbiUser> GetUser()
{
return _user ?? (_user = await UserManager.Users.FirstOrDefaultAsync(x => x.UserName == Username));
var username = Username.ToUpper();
return _user ?? (_user = await UserManager.Users.FirstOrDefaultAsync(x => x.NormalizedUserName == username));
}
protected async Task<string> UserAlias()

1
src/Ombi.Core/Engine/V2/MultiSearchEngine.cs
View file

@ -63,6 +63,7 @@ namespace Ombi.Core.Engine.V2
var result = new MultiSearchResult
{
MediaType = multiSearch.media_type,
Poster = multiSearch.poster_path
};
if (multiSearch.media_type.Equals("movie", StringComparison.InvariantCultureIgnoreCase))

1
src/Ombi.Core/Models/Search/V2/MultiSearchResult.cs
View file

@ -5,5 +5,6 @@
public string Id { get; set; }
public string MediaType { get; set; }
public string Title { get; set; }
public string Poster { get; set; }
}
}

1
src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs
View file

@ -75,7 +75,6 @@ namespace Ombi.Schedule.Jobs.Emby
await CacheEpisodes(server);
}
await _notification.Clients.Clients(NotificationHub.AdminConnectionIds)
.SendAsync(NotificationHub.NotificationEvent, "Emby Episode Sync Finished");
_logger.LogInformation("Emby Episode Sync Finished - Triggering Metadata refresh");

1
src/Ombi/ClientApp/src/app/interfaces/ISearchMovieResult.ts
View file

@ -38,6 +38,7 @@ export interface IMultiSearchResult {
id: string;
mediaType: string;
title: string;
poster: string;
}
export interface ILanguageRefine {

10
src/Ombi/ClientApp/src/app/login/login.component.html
View file

@ -10,14 +10,16 @@
<form *ngIf="authenticationSettings" class="form-signin" novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
<mat-form-field class="full-width">
<input type="text" matInput placeholder="{{'Login.UsernamePlaceholder' | translate}}" formControlName="username" />
<mat-form-field class="dark full-width" appearance="outline">
<mat-label>{{'Login.UsernamePlaceholder' | translate}}</mat-label>
<input type="text" matInput formControlName="username" />
<mat-error *ngIf="form.get('username').hasError('required')">
{{'Login.UsernamePlaceholder' | translate}} is <strong>required</strong></mat-error>
</mat-form-field>
<mat-form-field class="full-width">
<input color="black" type="password" matInput placeholder="{{'Login.PasswordPlaceholder' | translate}}" formControlName="password" />
<mat-form-field class="full-width" appearance="outline">
<mat-label>{{'Login.PasswordPlaceholder' | translate}}</mat-label>
<input color="black" type="password" matInput formControlName="password" />
</mat-form-field>
<mat-checkbox formControlName="rememberMe">{{'Login.RememberMe' | translate}}</mat-checkbox>

27
src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html
View file

@ -15,27 +15,28 @@ aria-label="Search" [ngbTypeahead]="searchModel" [resultFormatter]="formatter" [
<mat-spinner diameter="50"></mat-spinner>
</mat-option>
<ng-container *ngIf="!searching">
<mat-option *ngFor="let result of results" [value]="result">
<div *ngIf="result.mediaType === 'movie'">
<i class="fa fa-film"></i> &nbsp;
<mat-option class="option" *ngFor="let result of results" [value]="result">
<img *ngIf="result.poster" class="option-img" aria-hidden [src]="'https://image.tmdb.org/t/p/w300/'+result.poster" height="75">
<span *ngIf="result.mediaType === 'movie'">
<i *ngIf="!result.poster" class="fa fa-film"></i> &nbsp;
<span>{{result.title}}</span>
</div>
<div *ngIf="result.mediaType === 'tv'">
<i class="fa fa-tv"></i> &nbsp;
</span>
<span *ngIf="result.mediaType === 'tv'">
<i *ngIf="!result.poster" class="fa fa-tv"></i> &nbsp;
<span>{{result.title}}</span>
</div>
</span>
<div *ngIf="result.mediaType === 'Artist'">
<i class="fa fa-music"></i> &nbsp;
<span *ngIf="result.mediaType === 'Artist'">
<i *ngIf="!result.poster" class="fa fa-music"></i> &nbsp;
<span>{{result.title}}</span>
</div>
</span>
<div *ngIf="result.mediaType === 'person'">
<i class="fa fa-user"></i> &nbsp;
<span *ngIf="result.mediaType === 'person'">
<i *ngIf="!result.poster" class="fa fa-user"></i> &nbsp;
<span>{{result.title}}</span>
</div>
</span>
</mat-option>
</ng-container>
</mat-autocomplete>

16
src/Ombi/ClientApp/src/app/my-nav/nav-search.component.scss
View file

@ -17,9 +17,9 @@ $ombi-accent: #258a6d;
}
.mat-option {
height: 50px;
height: 75px;
line-height: 50px;
padding: 0px 5px;
padding: 0px 0px;
}
.search-bar {
@ -33,4 +33,14 @@ $ombi-accent: #258a6d;
::ng-deep .mat-form-field-underline{
bottom:0.5em;
}
}
.option-img {
vertical-align: middle;
margin-right: 8px;
}
.options {
margin-bottom: 5px;
}

2
src/Ombi/ClientApp/src/app/requests-list/components/albums-grid/albums-grid.component.ts
View file

@ -74,7 +74,7 @@ export class AlbumsGridComponent implements OnInit, AfterViewInit {
this.sort.sortChange.subscribe(() => this.paginator.pageIndex = 0);
this.paginator.showFirstLastButtons = true;
merge(this.sort.sortChange, this.paginator.page, this.currentFilter)
merge(this.sort.sortChange, this.paginator.page)
.pipe(
startWith({}),
switchMap((value: any) => {

2
src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts
View file

@ -74,7 +74,7 @@ export class MoviesGridComponent implements OnInit, AfterViewInit {
this.sort.sortChange.subscribe(() => this.paginator.pageIndex = 0);
this.paginator.showFirstLastButtons = true;
merge(this.sort.sortChange, this.paginator.page, this.currentFilter)
merge(this.sort.sortChange, this.paginator.page)
.pipe(
startWith({}),
switchMap((value: any) => {

2
src/Ombi/Views/Shared/_Layout.cshtml
View file

@ -78,7 +78,7 @@
<meta name="description" content="Ombi, media request tool">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@appName</title>
<meta property="og:title" content=“@appName” />
<meta property="og:title" content="@appName" />
<meta property="og:image" content="~/images/logo.png" />
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">