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

Added the settings for #925 but need to apply the settings to the UI

Browse source
This commit is contained in:
Jamie.Rees 2017-01-13 09:02:53 +00:00
commit bef6e036f7
10 changed files with 335 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Ombi.UI/Modules/Admin/CustomizationModule.cs
View file

@ -1,4 +1,5 @@
#region Copyright
// /************************************************************************
// Copyright (c) 2016 Jamie Rees
// File: CustomizationModule.cs
@ -23,43 +24,94 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// ************************************************************************/
#endregion
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Nancy;
using Nancy.ModelBinding;
using Nancy.Responses.Negotiation;
using Ombi.Core;
using Ombi.Core.SettingModels;
using Ombi.Helpers;
using Ombi.Helpers.Permissions;
using Ombi.UI.Models;
using Ombi.UI.Models.Admin;
using Ombi.UI.Models.UI;
using TMDbLib.Utilities;
using ISecurityExtensions = Ombi.Core.ISecurityExtensions;
namespace Ombi.UI.Modules.Admin
{
public class CustomizationModule : BaseModule
{
public CustomizationModule(ISettingsService<PlexRequestSettings> settingsService, ISettingsService<CustomizationSettings> cust, ISecurityExtensions security) : base("admin", settingsService, security)
public CustomizationModule(ISettingsService<PlexRequestSettings> settingsService,
ISettingsService<CustomizationSettings> cust, ISecurityExtensions security)
: base("admin", settingsService, security)
{
Before += (ctx) => Security.AdminLoginRedirect(Permissions.Administrator, ctx);
Settings = cust;
Get["/customization", true] = async (x,ct) => await Index();
Post["/customization", true] = async (x,ct) => await Save();
Get["/customization", true] = async (x, ct) => await Index();
Post["/customization", true] = async (x, ct) => await Save();
}
private ISettingsService<CustomizationSettings> Settings { get; }
private async Task<Negotiator> Index()
{
var model = await Settings.GetSettingsAsync();
return View["customization", model];
var viewModel = new CustomizationViewModel
{
Settings = model,
SortOptions = new List<Dropdown<SortOptions>>()
};
foreach (var value in EnumHelper<SortOptions>.GetValues(SortOptions.LatestRelease))
{
viewModel.SortOptions.Add(new Dropdown<SortOptions>
{
Value = value,
Name = EnumHelper<SortOptions>.GetDisplayDescription(value),
Selected = model.DefaultSort == (int) value
});
}
foreach (var value in EnumHelper<FilterOptions>.GetValues(FilterOptions.Available))
{
viewModel.FilterOptions.Add(new Dropdown<FilterOptions>
{
Value = value,
Name = EnumHelper<FilterOptions>.GetDisplayDescription(value),
Selected = model.DefaultFilter == (int) value
});
}
foreach (var value in EnumHelper<Languages>.GetValues(Languages.en))
{
viewModel.LanguageDropdown.Add(new Dropdown<Languages>
{
Value = value,
Name = EnumHelper<Languages>.GetDisplayValue(value),
Selected = model.DefaultLang == (int) value
});
}
return View["customization", viewModel];
}
private async Task<Response> Save()
{
try
{
var model = this.Bind<CustomizationSettings>();
var result = await Settings.SaveSettingsAsync(model);
@ -67,6 +119,12 @@ namespace Ombi.UI.Modules.Admin
return Response.AsJson(result
? new JsonResponseModel { Result = true }
: new JsonResponseModel { Result = false, Message = "We could not save to the database, please try again" });
}
catch (Exception e)
{
throw;
}
}
}
}

21
Ombi.UI/Modules/RequestsModule.cs
View file

@ -43,6 +43,7 @@ using Ombi.Services.Interfaces;
using Ombi.Services.Notification;
using Ombi.Store;
using Ombi.UI.Models;
using Ombi.UI.Models.Admin;
using Action = Ombi.Helpers.Analytics.Action;
using ISecurityExtensions = Ombi.Core.ISecurityExtensions;
@ -64,7 +65,8 @@ namespace Ombi.UI.Modules
ICacheProvider cache,
IAnalytics an,
INotificationEngine engine,
ISecurityExtensions security) : base("requests", prSettings, security)
ISecurityExtensions security,
ISettingsService<CustomizationSettings> customSettings) : base("requests", prSettings, security)
{
Service = service;
PrSettings = prSettings;
@ -79,6 +81,7 @@ namespace Ombi.UI.Modules
Cache = cache;
Analytics = an;
NotificationEngine = engine;
CustomizationSettings = customSettings;
Get["/", true] = async (x, ct) => await LoadRequests();
Get["/movies", true] = async (x, ct) => await GetMovies();
@ -92,7 +95,7 @@ namespace Ombi.UI.Modules
Post["/changeavailability", true] = async (x, ct) => await ChangeRequestAvailability((int)Request.Form.Id, (bool)Request.Form.Available);
Post["/UpdateFilters", true] = async (x, ct) => await UpdateFilters();
Get["/UpdateFilters", true] = async (x, ct) => await GetFilterAndSortSettings();
}
private static Logger Log = LogManager.GetCurrentClassLogger();
@ -104,6 +107,7 @@ namespace Ombi.UI.Modules
private ISettingsService<SonarrSettings> SonarrSettings { get; }
private ISettingsService<SickRageSettings> SickRageSettings { get; }
private ISettingsService<CouchPotatoSettings> CpSettings { get; }
private ISettingsService<CustomizationSettings> CustomizationSettings { get; }
private ISonarrApi SonarrApi { get; }
private ISickRageApi SickRageApi { get; }
private ICouchPotatoApi CpApi { get; }
@ -408,11 +412,20 @@ namespace Ombi.UI.Modules
: new { Result = false, Available = false, Message = "Could not update the availability, please try again or check the logs" });
}
private async Task<Response> UpdateFilters()
private async Task<Response> GetFilterAndSortSettings()
{
var s = await CustomizationSettings.GetSettingsAsync();
var sortVal = EnumHelper<SortOptions>.GetDisplayValue((SortOptions)s.DefaultSort);
var filterVal = EnumHelper<FilterOptions>.GetDisplayValue((FilterOptions)s.DefaultFilter);
return Response.AsJson("");
var vm = new
{
DefaultSort = sortVal,
DefaultFilter = filterVal
};
return Response.AsJson(vm);
}
}
}