diff --git a/src/Jackett.Common/Content/custom.js b/src/Jackett.Common/Content/custom.js index c22607fcd..c72a29f0f 100644 --- a/src/Jackett.Common/Content/custom.js +++ b/src/Jackett.Common/Content/custom.js @@ -1,4 +1,5 @@ var basePath = ''; +var baseUrl = ''; var indexers = []; var configuredIndexers = []; @@ -114,6 +115,12 @@ function loadJackettSettings() { basePath = ''; } + $("#jackett-baseurloverride").val(data.baseurloverride); + baseUrl = data.baseurloverride; + if (baseUrl === null || baseUrl === undefined) { + baseUrl = ''; + } + api.key = data.api_key; $("#jackett-savedir").val(data.blackholedir); @@ -163,9 +170,9 @@ function reloadIndexers() { availableFilters = []; for (var i = 0; i < data.length; i++) { var item = data[i]; - item.rss_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/api?apikey=" + api.key + "&t=search&cat=&q="); - item.torznab_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/"); - item.potato_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/potato/"); + item.rss_host = resolveUrl(baseUrl, basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/api?apikey=" + api.key + "&t=search&cat=&q="); + item.torznab_host = resolveUrl(baseUrl, basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/"); + item.potato_host = resolveUrl(baseUrl, basePath + "/api/v2.0/indexers/" + item.id + "/results/potato/"); if (item.last_error) item.state = "error"; @@ -922,10 +929,14 @@ function populateSetupForm(indexerId, name, config, caps, link, alternativesitel configForm.modal("show"); } -function resolveUrl(url) { - var a = document.createElement('a'); - a.href = url; - url = a.href; +function resolveUrl(baseUrl, url) { + if (baseUrl != '') { + url = baseUrl + url; + }else{ + var a = document.createElement('a'); + a.href = url; + url = a.href; + } return url; } @@ -1514,6 +1525,7 @@ function bindUIButtons() { $("#change-jackett-port").click(function () { var jackett_port = Number($("#jackett-port").val()); var jackett_basepathoverride = $("#jackett-basepathoverride").val(); + var jackett_baseurloverride = $("#jackett-baseurloverride").val(); var jackett_external = $("#jackett-allowext").is(':checked'); var jackett_update = $("#jackett-allowupdate").is(':checked'); var jackett_prerelease = $("#jackett-prerelease").is(':checked'); @@ -1540,6 +1552,7 @@ function bindUIButtons() { blackholedir: $("#jackett-savedir").val(), logging: jackett_logging, basepathoverride: jackett_basepathoverride, + baseurloverride: jackett_baseurloverride, logging: jackett_logging, cache_enabled: jackett_cache_enabled, cache_ttl: jackett_cache_ttl, diff --git a/src/Jackett.Common/Content/index.html b/src/Jackett.Common/Content/index.html index c02f36fdf..86211cbeb 100644 --- a/src/Jackett.Common/Content/index.html +++ b/src/Jackett.Common/Content/index.html @@ -130,6 +130,10 @@ Base path override: +