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

Made the request module async #278

Browse Source
pull/284/head
tidusjar 9 years ago
parent e9d74a3d76
commit 05b219a351
2 changed files with 54 additions and 166 deletions
Show Stats Download Patch File Download Diff File

67
PlexRequests.UI/Content/requests-1.7.js
Unescape View File

@ -12,6 +12,8 @@ var albumTemplate = Handlebars.compile(albumSource);
var movieTimer = 0; var movieTimer = 0;
var tvimer = 0; var tvimer = 0;
var base = $('#baseUrl').text(); var base = $('#baseUrl').text();
var tvLoaded = false;
var albumLoaded = false;
var mixItUpDefault = { var mixItUpDefault = {
animation: { enable: true }, animation: { enable: true },
@ -42,6 +44,11 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
$('.approve-category,.delete-category').hide(); $('.approve-category,.delete-category').hide();
if (target === "#TvShowTab") { if (target === "#TvShowTab") {
if (!tvLoaded) {
tvLoaded = true;
tvLoad();
}
$('#approveTVShows,#deleteTVShows').show(); $('#approveTVShows,#deleteTVShows').show();
if ($ml.mixItUp('isLoaded')) { if ($ml.mixItUp('isLoaded')) {
activeState = $ml.mixItUp('getState'); activeState = $ml.mixItUp('getState');
@ -51,8 +58,8 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
activeState = $musicL.mixItUp('getState'); activeState = $musicL.mixItUp('getState');
$musicL.mixItUp('destroy'); $musicL.mixItUp('destroy');
} }
if ($tvl.mixItUp('isLoaded')) $tvl.mixItUp('destroy'); //if ($tvl.mixItUp('isLoaded')) $tvl.mixItUp('destroy');
$tvl.mixItUp(mixItUpConfig(activeState)); // init or reinit //$tvl.mixItUp(mixItUpConfig(activeState)); // init or reinit
} }
if (target === "#MoviesTab") { if (target === "#MoviesTab") {
$('#approveMovies,#deleteMovies').show(); $('#approveMovies,#deleteMovies').show();
@ -69,6 +76,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
} }
if (target === "#MusicTab") { if (target === "#MusicTab") {
if (!albumLoaded) {
albumLoaded = true;
albumLoad();
}
$('#approveMusic,#deleteMusic').show(); $('#approveMusic,#deleteMusic').show();
if ($tvl.mixItUp('isLoaded')) { if ($tvl.mixItUp('isLoaded')) {
activeState = $tvl.mixItUp('getState'); activeState = $tvl.mixItUp('getState');
@ -516,10 +527,8 @@ function mixItUpConfig(activeState) {
var position = 0; var position = 0;
function initLoad() { function initLoad() {
//movieLoad(); movieLoad();
movieLoadWithPosition(0);
tvLoad();
albumLoad();
} }
function movieLoad() { function movieLoad() {
@ -546,52 +555,6 @@ function movieLoad() {
}); });
}; };
function movieLoadWithPosition(pos) {
var $ml = $('#movieList');
if ($ml.mixItUp('isLoaded')) {
activeState = $ml.mixItUp('getState');
$ml.mixItUp('destroy');
}
var url = createBaseUrl(base, '/requests/movies/'+pos);
$.ajax(url).success(function (results) {
if (results.length > 0) {
position++;
results.forEach(function (result) {
var context = buildRequestContext(result, "movie");
var html = searchTemplate(context);
$ml.append(html);
});
}
else {
$ml.append(noResultsHtml.format("movie"));
}
$ml.mixItUp(mixItUpConfig());
});
};
var win = $(window);
$(win).scroll(function () {
if ($(win).scrollTop() + $(win).height() >= $(document).height() - 100) {
// Debounce the scroll event
if (this.timeoutId)
win.clearTimeout(this.timeoutId);
this.timeoutId = win.setTimeout(function () {
movieLoadWithPosition(position);
}, 200);
}
});
//// Each time the user scrolls
//win.scroll(function () {
// // End of the document reached?
// if ($(document).height() - win.height() == win.scrollTop()) {
// $('#loading').show();
// movieLoadWithPosition(position);
// }
//});
function tvLoad() { function tvLoad() {
var $tvl = $('#tvList'); var $tvl = $('#tvList');
if ($tvl.mixItUp('isLoaded')) { if ($tvl.mixItUp('isLoaded')) {

153
PlexRequests.UI/Modules/RequestsModule.cs
Unescape View File

@ -75,17 +75,16 @@ namespace PlexRequests.UI.Modules
Get["/"] = _ => LoadRequests(); Get["/"] = _ => LoadRequests();
Get["/movies", true] = async (x, ct) => await GetMovies(); Get["/movies", true] = async (x, ct) => await GetMovies();
Get["/movies/{position}", true] = async (x, ct) => await GetMovies(x.position); Get["/tvshows", true] = async (c, ct) => await GetTvShows();
Get["/tvshows"] = _ => GetTvShows(); Get["/albums", true] = async (x,ct) => await GetAlbumRequests();
Get["/albums"] = _ => GetAlbumRequests(); Post["/delete", true] = async (x, ct) => await DeleteRequest((int)Request.Form.id);
Post["/delete"] = _ => DeleteRequest((int)Request.Form.id); Post["/reportissue", true] = async (x, ct) => await ReportIssue((int)Request.Form.requestId, (IssueState)(int)Request.Form.issue, null);
Post["/reportissue"] = _ => ReportIssue((int)Request.Form.requestId, (IssueState)(int)Request.Form.issue, null); Post["/reportissuecomment", true] = async (x, ct) => await ReportIssue((int)Request.Form.requestId, IssueState.Other, (string)Request.Form.commentArea);
Post["/reportissuecomment"] = _ => ReportIssue((int)Request.Form.requestId, IssueState.Other, (string)Request.Form.commentArea);
Post["/clearissues"] = _ => ClearIssue((int)Request.Form.Id); Post["/clearissues", true] = async (x, ct) => await ClearIssue((int)Request.Form.Id);
Post["/changeavailability"] = _ => ChangeRequestAvailability((int)Request.Form.Id, (bool)Request.Form.Available); Post["/changeavailability", true] = async (x, ct) => await ChangeRequestAvailability((int)Request.Form.Id, (bool)Request.Form.Available);
Post["/addnote"] = _ => AddNote((int)Request.Form.requestId, (string)Request.Form.noteArea); Post["/addnote", true] = async (x, ct) => await AddNote((int)Request.Form.requestId, (string)Request.Form.noteArea);
} }
private IRequestService Service { get; } private IRequestService Service { get; }
@ -166,44 +165,31 @@ namespace PlexRequests.UI.Modules
return Response.AsJson(viewModel); return Response.AsJson(viewModel);
} }
private Response GetTvShows() // TODO: async await the API calls private async Task<Response> GetTvShows()
{ {
var settings = PrSettings.GetSettings(); var settings = PrSettings.GetSettings();
List<Task> taskList = new List<Task>(); var requests = await Service.GetAllAsync();
requests = requests.Where(x => x.Type == RequestType.TvShow);
List<RequestedModel> dbTv = new List<RequestedModel>(); var dbTv = requests;
taskList.Add(Task.Factory.StartNew(() =>
{
return Service.GetAll().Where(x => x.Type == RequestType.TvShow);
}).ContinueWith((t) => if (settings.UsersCanViewOnlyOwnRequests && !IsAdmin)
{ {
dbTv = t.Result.ToList(); dbTv = dbTv.Where(x => x.UserHasRequested(Username)).ToList();
}
if (settings.UsersCanViewOnlyOwnRequests && !IsAdmin)
{
dbTv = dbTv.Where(x => x.UserHasRequested(Username)).ToList();
}
}));
List<QualityModel> qualities = new List<QualityModel>(); IEnumerable<QualityModel> qualities = new List<QualityModel>();
if (IsAdmin) if (IsAdmin)
{ {
var sonarrSettings = SonarrSettings.GetSettings(); var sonarrSettings = SonarrSettings.GetSettings();
if (sonarrSettings.Enabled) if (sonarrSettings.Enabled)
{ {
taskList.Add(Task.Factory.StartNew(() => var result = Cache.GetOrSetAsync(CacheKeys.SonarrQualityProfiles, async () =>
{
return Cache.GetOrSet(CacheKeys.SonarrQualityProfiles, () =>
{
return SonarrApi.GetProfiles(sonarrSettings.ApiKey, sonarrSettings.FullUri); // TODO: cache this!
});
}).ContinueWith((t) =>
{ {
qualities = t.Result.Select(x => new QualityModel() { Id = x.id.ToString(), Name = x.name }).ToList(); 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();
} }
else else
{ {
@ -215,8 +201,6 @@ namespace PlexRequests.UI.Modules
} }
} }
Task.WaitAll(taskList.ToArray());
var viewModel = dbTv.Select(tv => var viewModel = dbTv.Select(tv =>
{ {
return new RequestViewModel return new RequestViewModel
@ -250,10 +234,11 @@ namespace PlexRequests.UI.Modules
return Response.AsJson(viewModel); return Response.AsJson(viewModel);
} }
private Response GetAlbumRequests() private async Task<Response> GetAlbumRequests()
{ {
var settings = PrSettings.GetSettings(); var settings = PrSettings.GetSettings();
var dbAlbum = Service.GetAll().Where(x => x.Type == RequestType.Album); var dbAlbum = await Service.GetAllAsync();
dbAlbum = dbAlbum.Where(x => x.Type == RequestType.Album);
if (settings.UsersCanViewOnlyOwnRequests && !IsAdmin) if (settings.UsersCanViewOnlyOwnRequests && !IsAdmin)
{ {
dbAlbum = dbAlbum.Where(x => x.UserHasRequested(Username)); dbAlbum = dbAlbum.Where(x => x.UserHasRequested(Username));
@ -294,12 +279,12 @@ namespace PlexRequests.UI.Modules
return Response.AsJson(viewModel); return Response.AsJson(viewModel);
} }
private Response DeleteRequest(int requestid) private async Task<Response> DeleteRequest(int requestid)
{ {
this.RequiresClaims(UserClaims.Admin); this.RequiresClaims(UserClaims.Admin);
var currentEntity = Service.Get(requestid); var currentEntity = await Service.GetAsync(requestid);
Service.DeleteRequest(currentEntity); await Service.DeleteRequestAsync(currentEntity);
return Response.AsJson(new JsonResponseModel { Result = true }); return Response.AsJson(new JsonResponseModel { Result = true });
} }
@ -311,9 +296,9 @@ namespace PlexRequests.UI.Modules
/// <param name="issue">The issue.</param> /// <param name="issue">The issue.</param>
/// <param name="comment">The comment.</param> /// <param name="comment">The comment.</param>
/// <returns></returns> /// <returns></returns>
private Response ReportIssue(int requestId, IssueState issue, string comment) private async Task<Response> ReportIssue(int requestId, IssueState issue, string comment)
{ {
var originalRequest = Service.Get(requestId); var originalRequest = await Service.GetAsync(requestId);
if (originalRequest == null) if (originalRequest == null)
{ {
return Response.AsJson(new JsonResponseModel { Result = false, Message = "Could not add issue, please try again or contact the administrator!" }); return Response.AsJson(new JsonResponseModel { Result = false, Message = "Could not add issue, please try again or contact the administrator!" });
@ -324,7 +309,7 @@ namespace PlexRequests.UI.Modules
: string.Empty; : string.Empty;
var result = Service.UpdateRequest(originalRequest); var result = await Service.UpdateRequestAsync(originalRequest);
var model = new NotificationModel var model = new NotificationModel
{ {
@ -334,18 +319,18 @@ namespace PlexRequests.UI.Modules
DateTime = DateTime.Now, DateTime = DateTime.Now,
Body = issue == IssueState.Other ? comment : issue.ToString().CamelCaseToWords() Body = issue == IssueState.Other ? comment : issue.ToString().CamelCaseToWords()
}; };
NotificationService.Publish(model); await NotificationService.Publish(model);
return Response.AsJson(result return Response.AsJson(result
? new JsonResponseModel { Result = true } ? new JsonResponseModel { Result = true }
: new JsonResponseModel { Result = false, Message = "Could not add issue, please try again or contact the administrator!" }); : new JsonResponseModel { Result = false, Message = "Could not add issue, please try again or contact the administrator!" });
} }
private Response ClearIssue(int requestId) private async Task<Response> ClearIssue(int requestId)
{ {
this.RequiresClaims(UserClaims.Admin); this.RequiresClaims(UserClaims.Admin);
var originalRequest = Service.Get(requestId); var originalRequest = await Service.GetAsync(requestId);
if (originalRequest == null) if (originalRequest == null)
{ {
return Response.AsJson(new JsonResponseModel { Result = false, Message = "Request does not exist to clear it!" }); return Response.AsJson(new JsonResponseModel { Result = false, Message = "Request does not exist to clear it!" });
@ -353,16 +338,16 @@ namespace PlexRequests.UI.Modules
originalRequest.Issues = IssueState.None; originalRequest.Issues = IssueState.None;
originalRequest.OtherMessage = string.Empty; originalRequest.OtherMessage = string.Empty;
var result = Service.UpdateRequest(originalRequest); var result = await Service.UpdateRequestAsync(originalRequest);
return Response.AsJson(result return Response.AsJson(result
? new JsonResponseModel { Result = true } ? new JsonResponseModel { Result = true }
: new JsonResponseModel { Result = false, Message = "Could not clear issue, please try again or check the logs" }); : new JsonResponseModel { Result = false, Message = "Could not clear issue, please try again or check the logs" });
} }
private Response ChangeRequestAvailability(int requestId, bool available) private async Task<Response> ChangeRequestAvailability(int requestId, bool available)
{ {
this.RequiresClaims(UserClaims.Admin); this.RequiresClaims(UserClaims.Admin);
var originalRequest = Service.Get(requestId); var originalRequest = await Service.GetAsync(requestId);
if (originalRequest == null) if (originalRequest == null)
{ {
return Response.AsJson(new JsonResponseModel { Result = false, Message = "Request does not exist to change the availability!" }); return Response.AsJson(new JsonResponseModel { Result = false, Message = "Request does not exist to change the availability!" });
@ -370,16 +355,16 @@ namespace PlexRequests.UI.Modules
originalRequest.Available = available; originalRequest.Available = available;
var result = Service.UpdateRequest(originalRequest); var result = await Service.UpdateRequestAsync(originalRequest);
return Response.AsJson(result return Response.AsJson(result
? new { Result = true, Available = available, Message = string.Empty } ? new { Result = true, Available = available, Message = string.Empty }
: new { Result = false, Available = false, Message = "Could not update the availability, please try again or check the logs" }); : new { Result = false, Available = false, Message = "Could not update the availability, please try again or check the logs" });
} }
private Response AddNote(int requestId, string noteArea) private async Task<Response> AddNote(int requestId, string noteArea)
{ {
this.RequiresClaims(UserClaims.Admin); this.RequiresClaims(UserClaims.Admin);
var originalRequest = Service.Get(requestId); var originalRequest = await Service.GetAsync(requestId);
if (originalRequest == null) if (originalRequest == null)
{ {
return Response.AsJson(new JsonResponseModel { Result = false, Message = "Request does not exist to add a note!" }); return Response.AsJson(new JsonResponseModel { Result = false, Message = "Request does not exist to add a note!" });
@ -387,70 +372,10 @@ namespace PlexRequests.UI.Modules
originalRequest.AdminNote = noteArea; originalRequest.AdminNote = noteArea;
var result = Service.UpdateRequest(originalRequest); var result = await Service.UpdateRequestAsync(originalRequest);
return Response.AsJson(result return Response.AsJson(result
? new JsonResponseModel { Result = true } ? new JsonResponseModel { Result = true }
: new JsonResponseModel { Result = false, Message = "Could not update the notes, please try again or check the logs" }); : new JsonResponseModel { Result = false, Message = "Could not update the notes, please try again or check the logs" });
} }
private async Task<Response> GetMovies(int position)
{
var settings = PrSettings.GetSettings();
var allRequests = await Service.GetAllAsync();
allRequests = allRequests.Where(x => x.Type == RequestType.Movie).OrderByDescending(x => x.RequestedDate).Skip(position == 0 ? 0 : position * 3).Take(3);
var dbMovies = allRequests.ToList();
if (settings.UsersCanViewOnlyOwnRequests && !IsAdmin)
{
dbMovies = dbMovies.Where(x => x.UserHasRequested(Username)).ToList();
}
List<QualityModel> qualities = new List<QualityModel>();
if (IsAdmin)
{
var cpSettings = CpSettings.GetSettings();
if (cpSettings.Enabled)
{
var result = await Cache.GetOrSetAsync(CacheKeys.CouchPotatoQualityProfiles, async () =>
{
return await Task.Run(() => CpApi.GetProfiles(cpSettings.FullUri, cpSettings.ApiKey)).ConfigureAwait(false);
});
qualities = result.list.Select(x => new QualityModel() { Id = x._id, Name = x.label }).ToList();
}
}
var viewModel = dbMovies.Select(movie => new RequestViewModel
{
ProviderId = movie.ProviderId,
Type = movie.Type,
Status = movie.Status,
ImdbId = movie.ImdbId,
Id = movie.Id,
PosterPath = movie.PosterPath,
ReleaseDate = movie.ReleaseDate,
ReleaseDateTicks = movie.ReleaseDate.Ticks,
RequestedDate = movie.RequestedDate,
Released = DateTime.Now > movie.ReleaseDate,
RequestedDateTicks = DateTimeHelper.OffsetUTCDateTime(movie.RequestedDate, DateTimeOffset).Ticks,
Approved = movie.Available || movie.Approved,
Title = movie.Title,
Overview = movie.Overview,
RequestedUsers = IsAdmin ? movie.AllUsers.ToArray() : new string[] { },
ReleaseYear = movie.ReleaseDate.Year.ToString(),
Available = movie.Available,
Admin = IsAdmin,
Issues = movie.Issues.ToString().CamelCaseToWords(),
OtherMessage = movie.OtherMessage,
AdminNotes = movie.AdminNote,
Qualities = qualities.ToArray()
}).ToList();
return Response.AsJson(viewModel);
}
} }
} }

Write Preview
Loading…
Cancel
Save