github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-11 15:56:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

#254

Browse source
This commit is contained in:
tidusjar 2016-07-27 16:56:19 +01:00
parent d458dca541
commit a5257a0fbf
4 changed files with 93 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PlexRequests.UI/Content/requests.js vendored
View file

@ -637,7 +637,8 @@ function buildRequestContext(result, type) {
qualities: result.qualities, qualities: result.qualities,
hasQualities: result.qualities && result.qualities.length > 0, hasQualities: result.qualities && result.qualities.length > 0,
artist: result.artistName, artist: result.artistName,
musicBrainzId : result.musicBrainzId musicBrainzId: result.musicBrainzId,
episodes : result.episodes
}; };
return context; return context;

1
PlexRequests.UI/Models/RequestViewModel.cs
View file

@ -54,5 +54,6 @@ namespace PlexRequests.UI.Models
public string MusicBrainzId { get; set; } public string MusicBrainzId { get; set; }
public QualityModel[] Qualities { get; set; } public QualityModel[] Qualities { get; set; }
public string ArtistName { get; set; } public string ArtistName { get; set; }
public Store.EpisodesModel[] Episodes { get; set; }
} }
} }

20
PlexRequests.UI/Modules/RequestsModule.cs
View file

@ -183,13 +183,13 @@ namespace PlexRequests.UI.Modules
private async Task<Response> GetTvShows() private async Task<Response> GetTvShows()
{ {
var settings = PrSettings.GetSettings(); var settingsTask = PrSettings.GetSettingsAsync();
var requests = await Service.GetAllAsync(); var requests = await Service.GetAllAsync();
requests = requests.Where(x => x.Type == RequestType.TvShow); requests = requests.Where(x => x.Type == RequestType.TvShow);
var dbTv = requests; var dbTv = requests;
var settings = await settingsTask;
if (settings.UsersCanViewOnlyOwnRequests && !IsAdmin) if (settings.UsersCanViewOnlyOwnRequests && !IsAdmin)
{ {
dbTv = dbTv.Where(x => x.UserHasRequested(Username)).ToList(); dbTv = dbTv.Where(x => x.UserHasRequested(Username)).ToList();
@ -200,21 +200,21 @@ namespace PlexRequests.UI.Modules
{ {
try try
{ {
var sonarrSettings = SonarrSettings.GetSettings(); var sonarrSettings = await SonarrSettings.GetSettingsAsync();
if (sonarrSettings.Enabled) if (sonarrSettings.Enabled)
{ {
var result = Cache.GetOrSetAsync(CacheKeys.SonarrQualityProfiles, async () => var result = Cache.GetOrSetAsync(CacheKeys.SonarrQualityProfiles, async () =>
{ {
return await Task.Run(() => SonarrApi.GetProfiles(sonarrSettings.ApiKey, sonarrSettings.FullUri)); return await Task.Run(() => SonarrApi.GetProfiles(sonarrSettings.ApiKey, sonarrSettings.FullUri));
}); });
qualities = result.Result.Select(x => new QualityModel() { Id = x.id.ToString(), Name = x.name }).ToList(); qualities = result.Result.Select(x => new QualityModel { Id = x.id.ToString(), Name = x.name }).ToList();
} }
else else
{ {
var sickRageSettings = SickRageSettings.GetSettings(); var sickRageSettings = await SickRageSettings.GetSettingsAsync();
if (sickRageSettings.Enabled) if (sickRageSettings.Enabled)
{ {
qualities = sickRageSettings.Qualities.Select(x => new QualityModel() { Id = x.Key, Name = x.Value }).ToList(); qualities = sickRageSettings.Qualities.Select(x => new QualityModel { Id = x.Key, Name = x.Value }).ToList();
} }
} }
} }
@ -225,9 +225,7 @@ namespace PlexRequests.UI.Modules
} }
var viewModel = dbTv.Select(tv => var viewModel = dbTv.Select(tv => new RequestViewModel
{
return new RequestViewModel
{ {
ProviderId = tv.ProviderId, ProviderId = tv.ProviderId,
Type = tv.Type, Type = tv.Type,
@ -249,8 +247,8 @@ namespace PlexRequests.UI.Modules
Admin = IsAdmin, Admin = IsAdmin,
IssueId = tv.IssueId, IssueId = tv.IssueId,
TvSeriesRequestType = tv.SeasonsRequested, TvSeriesRequestType = tv.SeasonsRequested,
Qualities = qualities.ToArray() Qualities = qualities.ToArray(),
}; Episodes = tv.Episodes,
}).ToList(); }).ToList();
return Response.AsJson(viewModel); return Response.AsJson(viewModel);

3
PlexRequests.UI/Views/Requests/Index.cshtml
View file

@ -173,6 +173,9 @@
{{/if_eq}} {{/if_eq}}
</div> </div>
{{#if_eq type "tv"}} {{#if_eq type "tv"}}
{{#each episodes}}
{{this.seasonNumber}} - {{this.episodeNumber}} @*// TODO Show the episodes requested*@
{{/each}}
<div>@UI.Requests_SeasonsRequested: {{seriesRequested}}</div> <div>@UI.Requests_SeasonsRequested: {{seriesRequested}}</div>
{{/if_eq}} {{/if_eq}}
{{#if requestedUsers}} {{#if requestedUsers}}