github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 21:03:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/recently-added' into feature_recentlyAdded

Browse source
This commit is contained in:
Jamie 2018-03-22 13:02:08 +00:00 • committed by GitHub
commit ffe74de278
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 70 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Ombi.Core/Engine/RecentlyAddedEngine.cs
View file

@ -41,8 +41,8 @@ namespace Ombi.Core.Engine
public IEnumerable<RecentlyAddedTvModel> GetRecentlyAddedTv(DateTime from, DateTime to, bool groupBySeason)
{
var plexTv = _plex.GetAll().Where(x => x.Type == PlexMediaTypeEntity.Show && x.AddedAt > from && x.AddedAt < to);
var embyTv = _emby.GetAll().Where(x => x.Type == EmbyMediaType.Series && x.AddedAt > from && x.AddedAt < to);
var plexTv = _plex.GetAll().Include(x => x.Seasons).Include(x => x.Episodes).Where(x => x.Type == PlexMediaTypeEntity.Show && x.AddedAt > from && x.AddedAt < to);
var embyTv = _emby.GetAll().Include(x => x.Episodes).Where(x => x.Type == EmbyMediaType.Series && x.AddedAt > from && x.AddedAt < to);
return GetRecentlyAddedTv(plexTv, embyTv, groupBySeason).Take(30);
}
@ -50,8 +50,8 @@ namespace Ombi.Core.Engine
public IEnumerable<RecentlyAddedTvModel> GetRecentlyAddedTv(bool groupBySeason)
{
var plexTv = _plex.GetAll().Where(x => x.Type == PlexMediaTypeEntity.Show);
var embyTv = _emby.GetAll().Where(x => x.Type == EmbyMediaType.Series);
var plexTv = _plex.GetAll().Include(x => x.Seasons).Include(x => x.Episodes).Where(x => x.Type == PlexMediaTypeEntity.Show);
var embyTv = _emby.GetAll().Include(x => x.Episodes).Where(x => x.Type == EmbyMediaType.Series);
return GetRecentlyAddedTv(plexTv, embyTv, groupBySeason);
}

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

@ -15,6 +15,7 @@ export interface IRecentlyAddedMovies {
export interface IRecentlyAddedTvShows extends IRecentlyAddedMovies {
seasonNumber: number;
episodeNumber: number;
tvDbId: number;
}
export interface IRecentlyAddedRangeModel {

28
src/Ombi/ClientApp/app/recentlyAdded/recentlyAdded.component.html
View file

@ -1,13 +1,31 @@
<h1>Recently Added</h1>
<input type="checkbox" [(ngModel)]="groupTv" (click)="change()" />
<hr />
<p-calendar [(ngModel)]="range" showButtonBar="true" selectionMode="range" (onClose)="close()"></p-calendar>
<hr />
<style>
.img-conatiner {
position: relative;
text-align: center;
color: white;
}
/* Bottom left text */
.bottom-left {
position: absolute;
bottom: 8px;
left: 16px;
}
</style>
<ngu-carousel [inputs]="carouselTile">
<ngu-tile NguCarouselItem *ngFor="let movie of movies">
<img class="img-responsive poster" src="{{movie.posterPath}}" style="width: 300px" alt="poster">
<b>{{movie.title}}</b>
<div class="img-container">
<img class="img-responsive poster" src="{{movie.posterPath}}" style="width: 300px" alt="poster">
<div class="bottom-left"> {{movie.title}}</div>
</div>
</ngu-tile>
<button NguCarouselPrev class='leftRs'><i class="fa fa-arrow-left"></i></button>
@ -22,6 +40,10 @@
<ngu-tile NguCarouselItem *ngFor="let t of tv">
<img class="img-responsive poster" src="{{t.posterPath}}" style="width: 300px" alt="poster">
<b>{{t.title}}</b>
<br>
<b>Season: {{t.seasonNumber}}</b>
<br>
<b>Episode: {{t.episodeNumber}}</b>
</ngu-tile>
<button NguCarouselPrev class='leftRs'><i class="fa fa-arrow-left"></i></button>

44
src/Ombi/ClientApp/app/recentlyAdded/recentlyAdded.component.ts
View file

@ -39,6 +39,8 @@ export class RecentlyAddedComponent implements OnInit {
public movies: IRecentlyAddedMovies[];
public tv: IRecentlyAddedTvShows[];
public range: Date[];
public groupTv: boolean;
// https://github.com/sheikalthaf/ngu-carousel
public carouselTile: NguCarousel;
@ -74,25 +76,33 @@ export class RecentlyAddedComponent implements OnInit {
}
this.getMovies();
}
public change() {
this.getShows();
}
private getShows() {
this.recentlyAddedService.getRecentlyAddedTv().subscribe(x => {
this.tv = x;
//this.tv.forEach((t) => {
// if(t.theMovieDbId) {
// this.imageService.getTvPoster(t.imdbId).subscribe(p => {
// t.posterPath = p;
// });
// } else if(t.imdbId) {
// this.imageService.getMoviePoster(t.imdbId).subscribe(p => {
// t.posterPath = p;
// });
// } else {
// t.posterPath = "";
// }
//});
});
if(this.groupTv) {
this.recentlyAddedService.getRecentlyAddedTvGrouped().subscribe(x => {
this.tv = x;
this.tv.forEach((t) => {
this.imageService.getTvPoster(t.tvDbId).subscribe(p => {
t.posterPath = p;
});
});
});
} else {
this.recentlyAddedService.getRecentlyAddedTv().subscribe(x => {
this.tv = x;
this.tv.forEach((t) => {
this.imageService.getTvPoster(t.tvDbId).subscribe(p => {
t.posterPath = p;
});
});
});
}
}
private getMovies() {

17
src/Ombi/Controllers/ImagesController.cs
View file

@ -44,11 +44,15 @@ namespace Ombi.Controllers
}
if (images.tvbanner != null)
{
return images.tvbanner.FirstOrDefault()?.url ?? string.Empty;
var enImage = images.tvbanner.Where(x => x.lang == "en").OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
if (enImage == null)
{
return images.tvbanner.OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
}
}
if (images.showbackground != null)
if (images.seasonposter != null)
{
return images.showbackground.FirstOrDefault()?.url ?? string.Empty;
return images.seasonposter.FirstOrDefault()?.url ?? string.Empty;
}
return string.Empty;
}
@ -97,7 +101,12 @@ namespace Ombi.Controllers
if (images.tvposter?.Any() ?? false)
{
return images.tvposter.OrderBy(x => x.likes).Select(x => x.url).FirstOrDefault();
var enImage = images.tvposter.Where(x => x.lang == "en").OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
if (enImage == null)
{
return images.tvposter.OrderByDescending(x => x.likes).Select(x => x.url).FirstOrDefault();
}
return enImage;
}
if (images.tvthumb?.Any() ?? false)