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

Fixed api

Browse source
This commit is contained in:
tidusjar 2016-05-24 17:18:34 +01:00
parent b2144f3f69
commit c9e5a8aec8
3 changed files with 177 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

21
PlexRequests.UI/Modules/ApiRequestModule.cs
View file

@ -28,7 +28,11 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using Nancy; using Nancy;
using Nancy.Extensions;
using Nancy.ModelBinding; using Nancy.ModelBinding;
using Nancy.Validation;
using Newtonsoft.Json;
using PlexRequests.Core; using PlexRequests.Core;
using PlexRequests.Core.SettingModels; using PlexRequests.Core.SettingModels;
@ -84,14 +88,13 @@ namespace PlexRequests.UI.Modules
public Response CreateRequest() public Response CreateRequest()
{ {
var request = this.BindAndValidate<RequestedModel>(); var request = JsonConvert.DeserializeObject<RequestedModel>(Request.Body.AsString());
var a = this.Validate(request);
if (!ModelValidationResult.IsValid) if (!a.IsValid)
{ {
return ReturnValidationReponse(ModelValidationResult); return ReturnValidationReponse(a);
} }
var apiModel = new ApiModel<bool>(); var apiModel = new ApiModel<bool>();
var result = RequestService.AddRequest(request); var result = RequestService.AddRequest(request);
@ -109,11 +112,11 @@ namespace PlexRequests.UI.Modules
public Response UpdateRequest() public Response UpdateRequest()
{ {
var request = this.BindAndValidate<RequestedModel>(); var request = JsonConvert.DeserializeObject<RequestedModel>(Request.Body.AsString());
var a = this.Validate(request);
if (!ModelValidationResult.IsValid) if (!a.IsValid)
{ {
return ReturnValidationReponse(ModelValidationResult); return ReturnValidationReponse(a);
} }

19
PlexRequests.UI/Modules/ApiSettingsMetadataModule.cs
View file

@ -150,6 +150,25 @@ namespace PlexRequests.UI.Modules
with.BodyParam<HeadphonesSettings>("headphones settings", true); with.BodyParam<HeadphonesSettings>("headphones settings", true);
with.Notes("Saves the headphones settings saved in the application"); with.Notes("Saves the headphones settings saved in the application");
}); });
Describe["GetPlexRequestSettings"] = description => description.AsSwagger(with =>
{
with.ResourcePath("/settings/plexrequest");
with.Summary("Gets the plexrequest settings saved in the application");
with.Model<ApiModel<PlexRequestSettings>>();
with.Notes("Gets the plexrequest settings saved in the application");
with.QueryParam<string>("apikey", "The Api Key found in the settings", true);
});
Describe["PostPlexRequestSettings"] = description => description.AsSwagger(with =>
{
with.ResourcePath("/settings/plexrequest");
with.Summary("Saves the plexrequest settings saved in the application");
with.Model<ApiModel<bool>>();
with.QueryParam<string>("apikey", "The Api Key found in the settings", true);
with.BodyParam<PlexRequestSettings>("plexrequest settings", true);
with.Notes("Saves the plexrequest settings saved in the application");
});
} }
} }
} }

185
PlexRequests.UI/Modules/ApiSettingsModule.cs
View file

@ -24,10 +24,15 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// ************************************************************************/ // ************************************************************************/
#endregion #endregion
using System;
using System.Web.UI.WebControls; using System.Web.UI.WebControls;
using Nancy; using Nancy;
using Nancy.Extensions;
using Nancy.ModelBinding; using Nancy.ModelBinding;
using Nancy.Validation;
using Newtonsoft.Json;
using PlexRequests.Core; using PlexRequests.Core;
using PlexRequests.Core.SettingModels; using PlexRequests.Core.SettingModels;
@ -40,8 +45,11 @@ namespace PlexRequests.UI.Modules
ISettingsService<PlexSettings> plexSettings, ISettingsService<CouchPotatoSettings> cp, ISettingsService<PlexSettings> plexSettings, ISettingsService<CouchPotatoSettings> cp,
ISettingsService<SonarrSettings> sonarr, ISettingsService<SickRageSettings> sr, ISettingsService<HeadphonesSettings> hp) : base("api", pr) ISettingsService<SonarrSettings> sonarr, ISettingsService<SickRageSettings> sr, ISettingsService<HeadphonesSettings> hp) : base("api", pr)
{ {
Get["GetAuthSettings","/settings/authentication"] = x => GetAuthSettings(); Get["GetAuthSettings", "/settings/authentication"] = x => GetAuthSettings();
Post["PostAuthSettings","/settings/authentication"] = x => PostAuthSettings(); Post["PostAuthSettings", "/settings/authentication"] = x => PostAuthSettings();
Get["GetPlexRequestSettings", "/settings/plexrequest"] = x => GetPrSettings();
Post["PostPlexRequestSettings", "/settings/plexrequest"] = x => PostPrSettings();
Get["GetPlexSettings", "/settings/plex"] = x => GetPlexSettings(); Get["GetPlexSettings", "/settings/plex"] = x => GetPlexSettings();
Post["PostPlexSettings", "/settings/plex"] = x => PostPlexSettings(); Post["PostPlexSettings", "/settings/plex"] = x => PostPlexSettings();
@ -66,7 +74,7 @@ namespace PlexRequests.UI.Modules
SickRageSettings = sr; SickRageSettings = sr;
HeadphonesSettings = hp; HeadphonesSettings = hp;
} }
private ISettingsService<PlexRequestSettings> SettingsService { get; } private ISettingsService<PlexRequestSettings> SettingsService { get; }
private ISettingsService<AuthenticationSettings> AuthSettings { get; } private ISettingsService<AuthenticationSettings> AuthSettings { get; }
private ISettingsService<PlexSettings> PlexSettings { get; } private ISettingsService<PlexSettings> PlexSettings { get; }
@ -75,20 +83,69 @@ namespace PlexRequests.UI.Modules
private ISettingsService<SickRageSettings> SickRageSettings { get; } private ISettingsService<SickRageSettings> SickRageSettings { get; }
private ISettingsService<HeadphonesSettings> HeadphonesSettings { get; } private ISettingsService<HeadphonesSettings> HeadphonesSettings { get; }
private Response GetPrSettings()
{
var model = new ApiModel<PlexRequestSettings>();
try
{
var settings = SettingsService.GetSettings();
model.Data = settings;
return ReturnReponse(model);
}
catch (Exception e)
{
model.ErrorMessage = e.Message;
model.Error = true;
return ReturnReponse(model);
}
}
private Response PostPrSettings()
{
var newSettings = JsonConvert.DeserializeObject<PlexRequestSettings>(Request.Body.AsString());
var result = this.Validate(newSettings);
if (!result.IsValid)
{
return ReturnValidationReponse(result);
}
var model = new ApiModel<bool>();
var settings = SettingsService.SaveSettings(newSettings);
if (settings)
{
model.Data = true;
return ReturnReponse(model);
}
model.Error = true;
model.ErrorMessage = "Could not update the settings";
return ReturnReponse(model);
}
private Response GetAuthSettings() private Response GetAuthSettings()
{ {
var model = new ApiModel<AuthenticationSettings>(); var model = new ApiModel<AuthenticationSettings>();
var settings = AuthSettings.GetSettings(); try
model.Data = settings; {
return ReturnReponse(model); var settings = AuthSettings.GetSettings();
model.Data = settings;
return ReturnReponse(model);
}
catch (Exception e)
{
model.ErrorMessage = e.Message;
model.Error = true;
return ReturnReponse(model);
}
} }
private Response PostAuthSettings() private Response PostAuthSettings()
{ {
var newSettings = this.BindAndValidate<AuthenticationSettings>(); var newSettings = JsonConvert.DeserializeObject<AuthenticationSettings>(Request.Body.AsString());
if (!ModelValidationResult.IsValid) var result = this.Validate(newSettings);
if (!result.IsValid)
{ {
return ReturnValidationReponse(ModelValidationResult); return ReturnValidationReponse(result);
} }
var model = new ApiModel<bool>(); var model = new ApiModel<bool>();
@ -107,17 +164,27 @@ namespace PlexRequests.UI.Modules
private Response GetPlexSettings() private Response GetPlexSettings()
{ {
var model = new ApiModel<PlexSettings>(); var model = new ApiModel<PlexSettings>();
var settings = PlexSettings.GetSettings(); try
model.Data = settings; {
return ReturnReponse(model); var settings = PlexSettings.GetSettings();
model.Data = settings;
return ReturnReponse(model);
}
catch (Exception e)
{
model.ErrorMessage = e.Message;
model.Error = true;
return ReturnReponse(model);
}
} }
private Response PostPlexSettings() private Response PostPlexSettings()
{ {
var newSettings = this.BindAndValidate<PlexSettings>(); var newSettings = JsonConvert.DeserializeObject<PlexSettings>(Request.Body.AsString());
if (!ModelValidationResult.IsValid) var result = this.Validate(newSettings);
if (!result.IsValid)
{ {
return ReturnValidationReponse(ModelValidationResult); return ReturnValidationReponse(result);
} }
var model = new ApiModel<bool>(); var model = new ApiModel<bool>();
@ -136,17 +203,27 @@ namespace PlexRequests.UI.Modules
private Response GetCpSettings() private Response GetCpSettings()
{ {
var model = new ApiModel<CouchPotatoSettings>(); var model = new ApiModel<CouchPotatoSettings>();
var settings = CpSettings.GetSettings(); try
model.Data = settings; {
return ReturnReponse(model); var settings = CpSettings.GetSettings();
model.Data = settings;
return ReturnReponse(model);
}
catch (Exception e)
{
model.ErrorMessage = e.Message;
model.Error = true;
return ReturnReponse(model);
}
} }
private Response PostCpSettings() private Response PostCpSettings()
{ {
var newSettings = this.BindAndValidate<CouchPotatoSettings>(); var newSettings = JsonConvert.DeserializeObject<CouchPotatoSettings>(Request.Body.AsString());
if (!ModelValidationResult.IsValid) var result = this.Validate(newSettings);
if (!result.IsValid)
{ {
return ReturnValidationReponse(ModelValidationResult); return ReturnValidationReponse(result);
} }
var model = new ApiModel<bool>(); var model = new ApiModel<bool>();
@ -165,17 +242,27 @@ namespace PlexRequests.UI.Modules
private Response GetSonarrSettings() private Response GetSonarrSettings()
{ {
var model = new ApiModel<SonarrSettings>(); var model = new ApiModel<SonarrSettings>();
var settings = SonarrSettings.GetSettings(); try
model.Data = settings; {
return ReturnReponse(model); var settings = SonarrSettings.GetSettings();
model.Data = settings;
return ReturnReponse(model);
}
catch (Exception e)
{
model.ErrorMessage = e.Message;
model.Error = true;
return ReturnReponse(model);
}
} }
private Response PostSonarrSettings() private Response PostSonarrSettings()
{ {
var newSettings = this.BindAndValidate<SonarrSettings>(); var newSettings = JsonConvert.DeserializeObject<SonarrSettings>(Request.Body.AsString());
if (!ModelValidationResult.IsValid) var result = this.Validate(newSettings);
if (!result.IsValid)
{ {
return ReturnValidationReponse(ModelValidationResult); return ReturnValidationReponse(result);
} }
var model = new ApiModel<bool>(); var model = new ApiModel<bool>();
@ -194,17 +281,27 @@ namespace PlexRequests.UI.Modules
private Response GetSickRageSettings() private Response GetSickRageSettings()
{ {
var model = new ApiModel<SickRageSettings>(); var model = new ApiModel<SickRageSettings>();
var settings = SickRageSettings.GetSettings(); try
model.Data = settings; {
return ReturnReponse(model); var settings = SickRageSettings.GetSettings();
model.Data = settings;
return ReturnReponse(model);
}
catch (Exception e)
{
model.ErrorMessage = e.Message;
model.Error = true;
return ReturnReponse(model);
}
} }
private Response PostSickRageSettings() private Response PostSickRageSettings()
{ {
var newSettings = this.BindAndValidate<SickRageSettings>(); var newSettings = JsonConvert.DeserializeObject<SickRageSettings>(Request.Body.AsString());
if (!ModelValidationResult.IsValid) var result = this.Validate(newSettings);
if (!result.IsValid)
{ {
return ReturnValidationReponse(ModelValidationResult); return ReturnValidationReponse(result);
} }
var model = new ApiModel<bool>(); var model = new ApiModel<bool>();
@ -222,17 +319,27 @@ namespace PlexRequests.UI.Modules
private Response GetHeadphonesSettings() private Response GetHeadphonesSettings()
{ {
var model = new ApiModel<HeadphonesSettings>(); var model = new ApiModel<HeadphonesSettings>();
var settings = HeadphonesSettings.GetSettings(); try
model.Data = settings; {
return ReturnReponse(model); var settings = HeadphonesSettings.GetSettings();
model.Data = settings;
return ReturnReponse(model);
}
catch (Exception e)
{
model.ErrorMessage = e.Message;
model.Error = true;
return ReturnReponse(model);
}
} }
private Response PostHeadphonesSettings() private Response PostHeadphonesSettings()
{ {
var newSettings = this.BindAndValidate<HeadphonesSettings>(); var newSettings = JsonConvert.DeserializeObject<HeadphonesSettings>(Request.Body.AsString());
if (!ModelValidationResult.IsValid) var result = this.Validate(newSettings);
if (!result.IsValid)
{ {
return ReturnValidationReponse(ModelValidationResult); return ReturnValidationReponse(result);
} }
var model = new ApiModel<bool>(); var model = new ApiModel<bool>();