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

Fixed #1189

Browse source
This commit is contained in:
tidusjar 2017-03-04 14:18:53 +00:00
parent 4df12281c5
commit 9a1b0c49ec
4 changed files with 45 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ombi.Helpers/StringHasher.cs
View file

@ -35,6 +35,10 @@ namespace Ombi.Helpers
{ {
public static string CalcuateMd5Hash(string input) public static string CalcuateMd5Hash(string input)
{ {
if (string.IsNullOrEmpty(input))
{
return string.Empty;
}
using (var md5 = MD5.Create()) using (var md5 = MD5.Create())
{ {
var inputBytes = Encoding.UTF8.GetBytes(input); var inputBytes = Encoding.UTF8.GetBytes(input);

7
Ombi.UI/Modules/LayoutModule.cs
View file

@ -128,6 +128,13 @@ namespace Ombi.UI.Modules
{ {
var user = UserHelper.GetUser(Username); var user = UserHelper.GetUser(Username);
var hashed = StringHasher.CalcuateMd5Hash(user.EmailAddress); var hashed = StringHasher.CalcuateMd5Hash(user.EmailAddress);
if (string.IsNullOrEmpty(hashed))
{
return Response.AsJson(new JsonResponseModel
{
Result = false
});
}
return return
Response.AsJson(new JsonResponseModel Response.AsJson(new JsonResponseModel
{ {

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

@ -33,6 +33,7 @@ using Nancy;
using Nancy.Responses.Negotiation; using Nancy.Responses.Negotiation;
using NLog; using NLog;
using Ombi.Api.Interfaces; using Ombi.Api.Interfaces;
using Ombi.Api.Models.Sonarr;
using Ombi.Core; using Ombi.Core;
using Ombi.Core.Models; using Ombi.Core.Models;
using Ombi.Core.SettingModels; using Ombi.Core.SettingModels;
@ -104,7 +105,8 @@ namespace Ombi.UI.Modules
Post["/changeavailability", true] = async (x, ct) => await 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["/changeRootFolder", true] = async (x, ct) => await ChangeRootFolder((int) Request.Form.requestId, (int) Request.Form.rootFolderId); Post["/changeRootFoldertv", true] = async (x, ct) => await ChangeRootFolder(RequestType.TvShow, (int)Request.Form.requestId, (int)Request.Form.rootFolderId);
Post["/changeRootFoldermovie", true] = async (x, ct) => await ChangeRootFolder(RequestType.Movie, (int)Request.Form.requestId, (int)Request.Form.rootFolderId);
Get["/UpdateFilters", true] = async (x, ct) => await GetFilterAndSortSettings(); Get["/UpdateFilters", true] = async (x, ct) => await GetFilterAndSortSettings();
} }
@ -171,7 +173,7 @@ namespace Ombi.UI.Modules
if (result != null) if (result != null)
{ {
qualities = qualities =
result.list.Select(x => new QualityModel {Id = x._id, Name = x.label}).ToList(); result.list.Select(x => new QualityModel { Id = x._id, Name = x.label }).ToList();
} }
} }
catch (Exception e) catch (Exception e)
@ -188,7 +190,7 @@ namespace Ombi.UI.Modules
rootFolders = rootFolders =
rootFoldersResult.Select( rootFoldersResult.Select(
x => new RootFolderModel {Id = x.id.ToString(), Path = x.path, FreeSpace = x.freespace}) x => new RootFolderModel { Id = x.id.ToString(), Path = x.path, FreeSpace = x.freespace })
.ToList(); .ToList();
var result = await Cache.GetOrSetAsync(CacheKeys.RadarrQualityProfiles, async () => var result = await Cache.GetOrSetAsync(CacheKeys.RadarrQualityProfiles, async () =>
@ -266,13 +268,13 @@ namespace Ombi.UI.Modules
qualities = result.Select(x => new QualityModel { Id = x.id.ToString(), Name = x.name }).ToList(); qualities = result.Select(x => new QualityModel { Id = x.id.ToString(), Name = x.name }).ToList();
var rootFoldersResult =await Cache.GetOrSetAsync(CacheKeys.SonarrRootFolders, async () => var rootFoldersResult = await Cache.GetOrSetAsync(CacheKeys.SonarrRootFolders, async () =>
{ {
return await Task.Run(() => SonarrApi.GetRootFolders(sonarrSettings.ApiKey, sonarrSettings.FullUri)); return await Task.Run(() => SonarrApi.GetRootFolders(sonarrSettings.ApiKey, sonarrSettings.FullUri));
}); });
rootFolders = rootFoldersResult.Select(x => new RootFolderModel { Id = x.id.ToString(), Path = x.path, FreeSpace = x.freespace}).ToList(); rootFolders = rootFoldersResult.Select(x => new RootFolderModel { Id = x.id.ToString(), Path = x.path, FreeSpace = x.freespace }).ToList();
} }
else else
{ {
var sickRageSettings = await SickRageSettings.GetSettingsAsync(); var sickRageSettings = await SickRageSettings.GetSettingsAsync();
@ -318,7 +320,7 @@ namespace Ombi.UI.Modules
TvSeriesRequestType = tv.SeasonsRequested, TvSeriesRequestType = tv.SeasonsRequested,
Qualities = qualities.ToArray(), Qualities = qualities.ToArray(),
Episodes = tv.Episodes.ToArray(), Episodes = tv.Episodes.ToArray(),
RootFolders = rootFolders.ToArray(), RootFolders = rootFolders.ToArray(),
HasRootFolders = rootFolders.Any(), HasRootFolders = rootFolders.Any(),
CurrentRootPath = sonarrSettings.Enabled ? GetRootPath(tv.RootFolderSelected, sonarrSettings).Result : null CurrentRootPath = sonarrSettings.Enabled ? GetRootPath(tv.RootFolderSelected, sonarrSettings).Result : null
}).ToList(); }).ToList();
@ -555,11 +557,21 @@ namespace Ombi.UI.Modules
return Response.AsJson(vm); return Response.AsJson(vm);
} }
private async Task<Response> ChangeRootFolder(int id, int rootFolderId) private async Task<Response> ChangeRootFolder(RequestType type, int id, int rootFolderId)
{ {
// Get all root folders var rootFolders = new List<SonarrRootFolder>();
var settings = await SonarrSettings.GetSettingsAsync(); if (type == RequestType.TvShow)
var rootFolders = SonarrApi.GetRootFolders(settings.ApiKey, settings.FullUri); {
// Get all root folders
var settings = await SonarrSettings.GetSettingsAsync();
rootFolders = SonarrApi.GetRootFolders(settings.ApiKey, settings.FullUri);
}
else
{
var settings = await Radarr.GetSettingsAsync();
rootFolders = RadarrApi.GetRootFolders(settings.ApiKey, settings.FullUri);
}
// Get Request // Get Request
var allRequests = await Service.GetAllAsync(); var allRequests = await Service.GetAllAsync();
@ -567,7 +579,7 @@ namespace Ombi.UI.Modules
if (request == null) if (request == null)
{ {
return Response.AsJson(new JsonResponseModel {Result = false}); return Response.AsJson(new JsonResponseModel { Result = false });
} }
foreach (var folder in rootFolders) foreach (var folder in rootFolders)
@ -581,7 +593,7 @@ namespace Ombi.UI.Modules
await Service.UpdateRequestAsync(request); await Service.UpdateRequestAsync(request);
return Response.AsJson(new JsonResponseModel {Result = true}); return Response.AsJson(new JsonResponseModel { Result = true });
} }
} }
} }

2
Ombi.UI/Views/Requests/Index.cshtml
View file

@ -281,7 +281,7 @@
</form> </form>
<form method="POST" action="@formAction/requests/changeRootFolder" id="changeFolder{{requestId}}"> <form method="POST" action="@formAction/requests/changeRootFolder{{#if_eq type "tv"}}tv{{else}}movie{{/if_eq}}" id="changeFolder{{requestId}}">
<input name="requestId" type="text" value="{{requestId}}" hidden="hidden" /> <input name="requestId" type="text" value="{{requestId}}" hidden="hidden" />
{{#if_eq hasRootFolders true}} {{#if_eq hasRootFolders true}}
<div class="btn-group btn-split"> <div class="btn-group btn-split">