From 50b7551d914519103d652d48903addae6733c769 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Sat, 3 Feb 2018 23:46:28 +0000 Subject: [PATCH 1/2] Fix API typo and a regression 'archivefirstmatch'. --- CHANGES.md | 2 ++ sickbeard/webapi.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 86feeab4..8f08a165 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -94,6 +94,8 @@ [develop changelog] +* Fix API typo and a regression 'archivefirstmatch' + ### 0.14.1 (2018-02-03 22:40:00 UTC) diff --git a/sickbeard/webapi.py b/sickbeard/webapi.py index 82de8610..f2171e20 100644 --- a/sickbeard/webapi.py +++ b/sickbeard/webapi.py @@ -2922,8 +2922,8 @@ class CMD_SickGearShow(ApiCall): showDict["network"] = "" showDict["status"] = showObj.status showDict["scenenumbering"] = showObj.is_scene - showDict["archivefirstmatch"] = showObj.upgrade_once - showDict["irgnorewords"] = showObj.rls_ignore_words + showDict["upgrade_once"] = showObj.upgrade_once + showDict["ignorewords"] = showObj.rls_ignore_words showDict["requirewords"] = showObj.rls_require_words if self.overview: showDict["overview"] = showObj.overview @@ -4127,8 +4127,8 @@ class CMD_SickGearShows(ApiCall): "status": curShow.status, "subtitles": curShow.subtitles, "scenenumbering": curShow.is_scene, - "archivefirstmatch": curShow.upgrade_once, - "irgnorewords": curShow.rls_ignore_words, + "upgrade_once": curShow.upgrade_once, + "ignorewords": curShow.rls_ignore_words, "requirewords": curShow.rls_require_words, "tag": curShow.tag, "imdb_id": curShow.imdbid, From 8d9f7e816d759108ce108b269e6bdc83f69a7b71 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Tue, 6 Feb 2018 21:51:09 +0000 Subject: [PATCH 2/2] Change removed NZBGet 'remote' PostProcess guidance until it is verified to work. --- CHANGES.md | 1 + autoProcessTV/SickGear-NG/INSTALL.txt | 4 ++-- autoProcessTV/SickGear-NG/SickGear-NG.py | 8 ++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8f08a165..2ab4cd71 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -95,6 +95,7 @@ [develop changelog] * Fix API typo and a regression 'archivefirstmatch' +* Change removed NZBGet 'remote' PostProcess guidance until it is verified to work ### 0.14.1 (2018-02-03 22:40:00 UTC) diff --git a/autoProcessTV/SickGear-NG/INSTALL.txt b/autoProcessTV/SickGear-NG/INSTALL.txt index eb8ae033..015215dd 100644 --- a/autoProcessTV/SickGear-NG/INSTALL.txt +++ b/autoProcessTV/SickGear-NG/INSTALL.txt @@ -11,7 +11,7 @@ This is the best set up to automatically get script updates from SickGear ############# -If NZBGet is installed on a different system to SickGear or NZBGet is v16 or earlier, then as a remote/older install, +If NZBGet v16 or earlier is installed, then as an older install, 1) Copy the directory with/or this single script file to path set in NZBGet Settings/PATHS/ScriptDir @@ -19,7 +19,7 @@ If NZBGet is installed on a different system to SickGear or NZBGet is v16 or ear 3) Click View -> Compact to remove any tick and un hide tips and suggestions -4) The bare minimum change is the sg_base_path setting +4) The bare minimum change is the sg_base_path setting or enter `python -m pip install requests` at admin commandline 5) Navigate to any named TV category at Settings/Categories, click "Choose" Category.Extensions then Apply SickGear-NG diff --git a/autoProcessTV/SickGear-NG/SickGear-NG.py b/autoProcessTV/SickGear-NG/SickGear-NG.py index 493f3c67..72f91f2d 100755 --- a/autoProcessTV/SickGear-NG/SickGear-NG.py +++ b/autoProcessTV/SickGear-NG/SickGear-NG.py @@ -16,7 +16,7 @@ # # ############# # -# If NZBGet is installed on a different system to SickGear or NZBGet is v16 or earlier, then as a remote/older install, +# If NZBGet v16 or earlier is installed, then as an older install, # # 1) Copy the directory with/or this single script file to path set in NZBGet Settings/PATHS/ScriptDir # @@ -24,7 +24,7 @@ # # 3) Click View -> Compact to remove any tick and un hide tips and suggestions # -# 4) The bare minimum change is the sg_base_path setting +# 4) The bare minimum change is the sg_base_path setting or enter `python -m pip install requests` at admin commandline # # 5) Navigate to any named TV category at Settings/Categories, click "Choose" Category.Extensions then Apply SickGear-NG # @@ -82,10 +82,6 @@ # Or, if NZBGet v16 or earlier is installed on the same system as SickGear and # if python requests library # is not installed, then sg_base_path must be set -#

-# Or, if NZBGet is installed on a different system to SickGear, then python -# requests library -# must be installed onto the NZBGet system # # #