github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-23 06:25:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Anomized tv-series

Browse source
This commit is contained in:
Maarten Heebink 2022-01-06 19:49:52 +01:00
commit 2610c01692
4 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Ombi.Core/Engine/TvRequestEngine.cs
View file

@ -369,7 +369,7 @@ namespace Ombi.Core.Engine
} }
else else
{ {
allRequests = await TvRepository.GetChild().ToListAsync(); allRequests = await TvRepository.GetChild(shouldHide.Anonimize).ToListAsync();
} }
@ -424,7 +424,7 @@ namespace Ombi.Core.Engine
} }
else else
{ {
allRequests = await TvRepository.GetChild().ToListAsync(); allRequests = await TvRepository.GetChild(shouldHide.Anonimize).ToListAsync();
} }

2
src/Ombi.Store/Repository/Requests/ITvRequestRepository.cs
View file

@ -19,7 +19,7 @@ namespace Ombi.Store.Repository.Requests
TvRequests GetRequest(int theMovieDbId); TvRequests GetRequest(int theMovieDbId);
Task Update(TvRequests request); Task Update(TvRequests request);
Task UpdateChild(ChildRequests request); Task UpdateChild(ChildRequests request);
IQueryable<ChildRequests> GetChild(); IQueryable<ChildRequests> GetChild(bool anonimize = false);
IQueryable<ChildRequests> GetChild(string userId); IQueryable<ChildRequests> GetChild(string userId);
Task MarkEpisodeAsAvailable(int id); Task MarkEpisodeAsAvailable(int id);
Task MarkChildAsAvailable(int id); Task MarkChildAsAvailable(int id);

13
src/Ombi.Store/Repository/Requests/TvRequestRepository.cs
View file

@ -80,8 +80,9 @@ namespace Ombi.Store.Repository.Requests
.AsQueryable(); .AsQueryable();
} }
public IQueryable<ChildRequests> GetChild() public IQueryable<ChildRequests> GetChild(bool anonimize = false)
{ {
if (!anonimize) {
return Db.ChildRequests return Db.ChildRequests
.Include(x => x.RequestedUser) .Include(x => x.RequestedUser)
.Include(x => x.ParentRequest) .Include(x => x.ParentRequest)
@ -89,6 +90,16 @@ namespace Ombi.Store.Repository.Requests
.ThenInclude(x => x.Episodes) .ThenInclude(x => x.Episodes)
.AsQueryable(); .AsQueryable();
} }
else
{
return Db.ChildRequests
.AsNoTracking()
.Include(x => x.ParentRequest)
.Include(x => x.SeasonRequests)
.ThenInclude(x => x.Episodes)
.AsQueryable();
}
}
public IQueryable<ChildRequests> GetChild(string userId) public IQueryable<ChildRequests> GetChild(string userId)
{ {

14
src/Ombi/ClientApp/src/app/requests-list/components/tv-grid/tv-grid.component.ts
View file

@ -25,6 +25,7 @@ export class TvGridComponent implements OnInit, AfterViewInit {
public defaultSort: string = "requestedDate"; public defaultSort: string = "requestedDate";
public defaultOrder: string = "desc"; public defaultOrder: string = "desc";
public currentFilter: RequestFilterType = RequestFilterType.All; public currentFilter: RequestFilterType = RequestFilterType.All;
public anonimized: boolean = true;
public RequestFilter = RequestFilterType; public RequestFilter = RequestFilterType;
public manageOwnRequests: boolean; public manageOwnRequests: boolean;
@ -90,6 +91,19 @@ export class TvGridComponent implements OnInit, AfterViewInit {
this.isLoadingResults = false; this.isLoadingResults = false;
this.resultsLength = data.total; this.resultsLength = data.total;
if (data.collection.filter(x => x.requestedUser != null).length > 0) {
this.anonimized = false;
}
if (this.anonimized) {
this.displayedColumns.forEach((element, index) => {
if (element == 'requestedBy') this.displayedColumns.splice(index, 1);
});
}
console.log(this.anonimized);
console.log(data.collection);
return data.collection; return data.collection;
}), }),
catchError((err) => { catchError((err) => {