From ffc3d6aa8a3cd42fb348a9350354dbe38fc92eb2 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 27 Jan 2017 22:24:35 +0000 Subject: [PATCH] Fixed #998 --- Ombi.Core/SettingModels/SonarrSettings.cs | 7 +++++++ Ombi.Core/TvSender.cs | 2 +- Ombi.Core/TvSenderOld.cs | 2 +- Ombi.UI/Views/Admin/Sonarr.cshtml | 4 ++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Ombi.Core/SettingModels/SonarrSettings.cs b/Ombi.Core/SettingModels/SonarrSettings.cs index ec2edb49a..d8ab8f991 100644 --- a/Ombi.Core/SettingModels/SonarrSettings.cs +++ b/Ombi.Core/SettingModels/SonarrSettings.cs @@ -32,6 +32,13 @@ namespace Ombi.Core.SettingModels public string ApiKey { get; set; } public string QualityProfile { get; set; } public bool SeasonFolders { get; set; } + /// + /// This is the root path ID + /// + /// + /// The root path. + /// public string RootPath { get; set; } + public string FullRootPath { get; set; } } } \ No newline at end of file diff --git a/Ombi.Core/TvSender.cs b/Ombi.Core/TvSender.cs index 14146c17f..3f6d5f86e 100644 --- a/Ombi.Core/TvSender.cs +++ b/Ombi.Core/TvSender.cs @@ -85,7 +85,7 @@ namespace Ombi.Core var latest = model.SeasonsRequested?.Equals("Latest", StringComparison.CurrentCultureIgnoreCase); var specificSeasonRequest = model.SeasonList?.Any(); - var rootFolderPath = model.RootFolderSelected <= 0 ? sonarrSettings.RootPath : await GetRootPath(model.RootFolderSelected, sonarrSettings); + var rootFolderPath = model.RootFolderSelected <= 0 ? sonarrSettings.FullRootPath : await GetRootPath(model.RootFolderSelected, sonarrSettings); if (episodeRequest) { diff --git a/Ombi.Core/TvSenderOld.cs b/Ombi.Core/TvSenderOld.cs index 6d819753e..d3423e291 100644 --- a/Ombi.Core/TvSenderOld.cs +++ b/Ombi.Core/TvSenderOld.cs @@ -70,7 +70,7 @@ namespace Ombi.Core { int.TryParse(sonarrSettings.QualityProfile, out qualityProfile); } - var rootFolderPath = model.RootFolderSelected <= 0 ? sonarrSettings.RootPath : await GetRootPath(model.RootFolderSelected, sonarrSettings); + var rootFolderPath = model.RootFolderSelected <= 0 ? sonarrSettings.FullRootPath : await GetRootPath(model.RootFolderSelected, sonarrSettings); var series = await GetSonarrSeries(sonarrSettings, model.ProviderId); diff --git a/Ombi.UI/Views/Admin/Sonarr.cshtml b/Ombi.UI/Views/Admin/Sonarr.cshtml index 8c6405f5d..28e2a9140 100644 --- a/Ombi.UI/Views/Admin/Sonarr.cshtml +++ b/Ombi.UI/Views/Admin/Sonarr.cshtml @@ -15,6 +15,8 @@
Sonarr Settings + +
@if (Model.Enabled) @@ -220,6 +222,8 @@ } var qualityProfile = $("#profiles option:selected").val(); var rootFolder = $("#rootFolders option:selected").val(); + var rootFolderPath = $('#rootFolders option:selected').text(); + $('#fullRootPath').val(rootFolderPath); var $form = $("#mainForm");