From 85273e5be4f4836b5b2e9eb0583f4f362e7c618b Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 19 Jun 2012 15:58:06 +0300 Subject: [PATCH 1/6] SABnzbd-Suite: in some cases "disable" may not work, fix --- .../SABnzbd-Suite/source/bin/SABnzbd-Suite.stop | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.stop b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.stop index 189cbd7519..9e0ed19de7 100755 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.stop +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.stop @@ -1,6 +1,6 @@ #!/bin/sh -kill -9 `ps | grep -E 'python.*/SABnzbd-Suite.py' | cut -d" " -f 1` 2>/dev/null -kill -9 `ps | grep -E 'python.*/SABnzbd.py' | cut -d" " -f 1` 2>/dev/null -kill -9 `ps | grep -E 'python.*/SickBeard.py' | cut -d" " -f 1` 2>/dev/null -kill -9 `ps | grep -E 'python.*/CouchPotato.py' | cut -d" " -f 1` 2>/dev/null -kill -9 `ps | grep -E 'python.*/Headphones.py' | cut -d" " -f 1` 2>/dev/null +kill -9 `ps | grep -E 'python.*/SABnzbd-Suite.py' | awk '{print $1}'` 2>/dev/null +kill -9 `ps | grep -E 'python.*/SABnzbd.py' | awk '{print $1}'` 2>/dev/null +kill -9 `ps | grep -E 'python.*/SickBeard.py' | awk '{print $1}'` 2>/dev/null +kill -9 `ps | grep -E 'python.*/CouchPotato.py' | awk '{print $1}'` 2>/dev/null +kill -9 `ps | grep -E 'python.*/Headphones.py' | awk '{print $1}'` 2>/dev/null From 59c434117146dc492e4af994193c7ff129094ed4 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 19 Jun 2012 16:01:04 +0300 Subject: [PATCH 2/6] SABnzbd-Suite: SABnzbd should always start --- .../SABnzbd-Suite/config/settings.xml | 1 - .../SABnzbd-Suite/source/bin/SABnzbd-Suite.py | 64 ++++++++----------- .../resources/language/English/strings.xml | 1 - .../source/resources/settings.xml | 1 - 4 files changed, 28 insertions(+), 39 deletions(-) diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml index fd3d452b30..aef45100de 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml @@ -5,7 +5,6 @@ - diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py index c39ac0f884..8dbc596bb8 100755 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py @@ -135,7 +135,6 @@ user = getAddonSetting(suiteSettings, 'SABNZBD_USER') pwd = getAddonSetting(suiteSettings, 'SABNZBD_PWD') host = getAddonSetting(suiteSettings, 'SABNZBD_IP') sabNzbdKeepAwake = getAddonSetting(suiteSettings, 'SABNZBD_KEEP_AWAKE') -sabnzbd_launch = getAddonSetting(suiteSettings, 'SABNZBD_LAUNCH') sickbeard_launch = getAddonSetting(suiteSettings, 'SICKBEARD_LAUNCH') couchpotato_launch = getAddonSetting(suiteSettings, 'COUCHPOTATO_LAUNCH') couchpotato_version = getAddonSetting(suiteSettings, 'COUCHPOTATO_VERSION') @@ -145,8 +144,6 @@ headphones_launch = getAddonSetting(suiteSettings, 'HEADPHONES_LAUNCH') # safe defaults. this is ugly # someone with better knowledge in xbmc addon api # please fix -if not sabnzbd_launch: - sabnzbd_launch = "true" if not sickbeard_launch: sickbeard_launch = "true" if not couchpotato_launch: @@ -244,17 +241,16 @@ autoProcessConfig.write() # launch SABnzbd and get the API key # ---------------------------------- -if "true" in sabnzbd_launch: - logging.debug('Launching SABnzbd...') - subprocess.call(sabnzbd,close_fds=True) - logging.debug('...done') +logging.debug('Launching SABnzbd...') +subprocess.call(sabnzbd,close_fds=True) +logging.debug('...done') # SABnzbd will only complete the .ini file when we first access the web interface - if firstLaunch: - loadWebInterface('http://' + sabNzbdHost,user,pwd) - sabNzbdConfig.reload() - sabNzbdApiKey = sabNzbdConfig['misc']['api_key'] - logging.debug('SABnzbd api key: ' + sabNzbdApiKey) +if firstLaunch: + loadWebInterface('http://' + sabNzbdHost,user,pwd) +sabNzbdConfig.reload() +sabNzbdApiKey = sabNzbdConfig['misc']['api_key'] +logging.debug('SABnzbd api key: ' + sabNzbdApiKey) # write SickBeard settings # ------------------------ @@ -269,12 +265,11 @@ defaultConfig['General']['web_port'] = '8082' defaultConfig['General']['web_host'] = host defaultConfig['General']['web_username'] = user defaultConfig['General']['web_password'] = pwd -if "true" in sabnzbd_launch: - defaultConfig['SABnzbd'] = {} - defaultConfig['SABnzbd']['sab_username'] = user - defaultConfig['SABnzbd']['sab_password'] = pwd - defaultConfig['SABnzbd']['sab_apikey'] = sabNzbdApiKey - defaultConfig['SABnzbd']['sab_host'] = 'http://' + sabNzbdHost + '/' +defaultConfig['SABnzbd'] = {} +defaultConfig['SABnzbd']['sab_username'] = user +defaultConfig['SABnzbd']['sab_password'] = pwd +defaultConfig['SABnzbd']['sab_apikey'] = sabNzbdApiKey +defaultConfig['SABnzbd']['sab_host'] = 'http://' + sabNzbdHost + '/' defaultConfig['XBMC'] = {} defaultConfig['XBMC']['use_xbmc'] = '1' defaultConfig['XBMC']['xbmc_host'] = '127.0.0.1:' + xbmcPort @@ -321,12 +316,11 @@ defaultConfig['global']['password'] = pwd defaultConfig['global']['username'] = user defaultConfig['global']['port'] = '8083' defaultConfig['global']['host'] = host -if "true" in sabnzbd_launch: - defaultConfig['Sabnzbd'] = {} - defaultConfig['Sabnzbd']['username'] = user - defaultConfig['Sabnzbd']['password'] = pwd - defaultConfig['Sabnzbd']['apikey'] = sabNzbdApiKey - defaultConfig['Sabnzbd']['host'] = sabNzbdHost +defaultConfig['Sabnzbd'] = {} +defaultConfig['Sabnzbd']['username'] = user +defaultConfig['Sabnzbd']['password'] = pwd +defaultConfig['Sabnzbd']['apikey'] = sabNzbdApiKey +defaultConfig['Sabnzbd']['host'] = sabNzbdHost defaultConfig['XBMC'] = {} defaultConfig['XBMC']['enabled'] = 'True' defaultConfig['XBMC']['host'] = '127.0.0.1:' + xbmcPort @@ -379,12 +373,11 @@ defaultConfig['updater'] = {} defaultConfig['updater']['enabled'] = '0' defaultConfig['updater']['notification'] = '0' defaultConfig['updater']['automatic'] = '0' -if "true" in sabnzbd_launch: - defaultConfig['Sabnzbd'] = {} - defaultConfig['Sabnzbd']['username'] = user - defaultConfig['Sabnzbd']['password'] = pwd - defaultConfig['Sabnzbd']['api_key'] = sabNzbdApiKey - defaultConfig['Sabnzbd']['host'] = sabNzbdHost +defaultConfig['Sabnzbd'] = {} +defaultConfig['Sabnzbd']['username'] = user +defaultConfig['Sabnzbd']['password'] = pwd +defaultConfig['Sabnzbd']['api_key'] = sabNzbdApiKey +defaultConfig['Sabnzbd']['host'] = sabNzbdHost defaultConfig['xbmc'] = {} defaultConfig['xbmc']['enabled'] = '1' defaultConfig['xbmc']['host'] = '127.0.0.1:' + xbmcPort @@ -422,12 +415,11 @@ defaultConfig['General']['http_port'] = '8084' defaultConfig['General']['http_host'] = host defaultConfig['General']['http_username'] = user defaultConfig['General']['http_password'] = pwd -if "true" in sabnzbd_launch: - defaultConfig['SABnzbd'] = {} - defaultConfig['SABnzbd']['sab_apikey'] = sabNzbdApiKey - defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost - defaultConfig['SABnzbd']['sab_username'] = user - defaultConfig['SABnzbd']['sab_password'] = pwd +defaultConfig['SABnzbd'] = {} +defaultConfig['SABnzbd']['sab_apikey'] = sabNzbdApiKey +defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost +defaultConfig['SABnzbd']['sab_username'] = user +defaultConfig['SABnzbd']['sab_password'] = pwd if firstLaunch: defaultConfig['SABnzbd']['sab_category'] = 'music' diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml index c4d2998892..191afe441a 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml @@ -6,7 +6,6 @@ User Settings Username Password - Enable SABnzbd> Enable Sickbeard Enable Couchpotato Couchpotato Version diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml index 1cd5c2b8b7..564def77ac 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml @@ -7,7 +7,6 @@ - From a5a46d48dd205f4a3c481ff53d27152a1d527b95 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 19 Jun 2012 16:02:45 +0300 Subject: [PATCH 3/6] SABnzbd-Suite: *merge* default settings --- .../SABnzbd-Suite/source/bin/SABnzbd-Suite.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py index 8dbc596bb8..20f8ebbf72 100755 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py @@ -140,19 +140,19 @@ couchpotato_launch = getAddonSetting(suiteSettings, 'COUCHPOTATO_LAUNCH') couchpotato_version = getAddonSetting(suiteSettings, 'COUCHPOTATO_VERSION') headphones_launch = getAddonSetting(suiteSettings, 'HEADPHONES_LAUNCH') -########## -# safe defaults. this is ugly -# someone with better knowledge in xbmc addon api -# please fix +# merge defaults +fDefaultSuiteSettings = open(pDefaultSuiteSettings, 'r') +data = fDefaultSuiteSettings.read() +fDefaultSuiteSettings.close +DefaultSuiteSettings = parseString(data) if not sickbeard_launch: - sickbeard_launch = "true" + sickbeard_launch = getAddonSetting(DefaultSuiteSettings, 'SICKBEARD_LAUNCH') if not couchpotato_launch: - couchpotato_launch = "true" + couchpotato_launch = getAddonSetting(DefaultSuiteSettings, 'COUCHPOTATO_LAUNCH') if not couchpotato_version: - couchpotato_version = "0" + couchpotato_version = getAddonSetting(DefaultSuiteSettings, 'COUCHPOTATO_VERSION') if not headphones_launch: - headphones_launch = "true" -########## + headphones_launch = getAddonSetting(DefaultSuiteSettings, 'HEADPHONES_LAUNCH') # XBMC fXbmcSettings = open(pXbmcSettings, 'r') From 1519be62f9672e8e39b1382b528ef19a1de3fee3 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 20 Jun 2012 20:49:42 +0300 Subject: [PATCH 4/6] Headphones: update to Headphones-89c2a8c --- packages/3rdparty/download/Headphones/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/download/Headphones/meta b/packages/3rdparty/download/Headphones/meta index 07910c5bb6..f2723e0b1e 100644 --- a/packages/3rdparty/download/Headphones/meta +++ b/packages/3rdparty/download/Headphones/meta @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="Headphones" -PKG_VERSION="ddf3432" +PKG_VERSION="89c2a8c" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From 43ef983337a702bd8a3cbf84d87aab1f9bbf502f Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 20 Jun 2012 20:52:05 +0300 Subject: [PATCH 5/6] SABnzbd: update to SABnzbd-0.7.0 --- packages/3rdparty/download/SABnzbd/meta | 4 +-- ...7.0-001_remove_default_settings-0.3.patch} | 25 +++++++++++-------- 2 files changed, 16 insertions(+), 13 deletions(-) rename packages/3rdparty/download/SABnzbd/patches/{SABnzbd-0.6.15-001_remove_default_settings-0.3.patch => SABnzbd-0.7.0-001_remove_default_settings-0.3.patch} (89%) diff --git a/packages/3rdparty/download/SABnzbd/meta b/packages/3rdparty/download/SABnzbd/meta index 32bf67d1b4..33f21569c4 100644 --- a/packages/3rdparty/download/SABnzbd/meta +++ b/packages/3rdparty/download/SABnzbd/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="SABnzbd" -PKG_VERSION="0.6.15" +PKG_VERSION="0.7.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://sabnzbd.org/" -PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus/sabnzbd-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-src.tar.gz" +PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-src.tar.gz" PKG_DEPENDS="Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline" PKG_BUILD_DEPENDS="toolchain Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline" PKG_PRIORITY="optional" diff --git a/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.15-001_remove_default_settings-0.3.patch b/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.0-001_remove_default_settings-0.3.patch similarity index 89% rename from packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.15-001_remove_default_settings-0.3.patch rename to packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.0-001_remove_default_settings-0.3.patch index 0ce5dbbb2c..d3080986c5 100644 --- a/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.15-001_remove_default_settings-0.3.patch +++ b/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.0-001_remove_default_settings-0.3.patch @@ -1,6 +1,7 @@ -diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_directories.tmpl SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_directories.tmpl ---- SABnzbd-0.6.4/interfaces/Plush/templates/config_directories.tmpl 2011-06-08 00:02:34.000000000 +0200 -+++ SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_directories.tmpl 2011-06-13 16:37:49.027611932 +0200 +diff --git a/interfaces/Plush/templates/config_folders.tmpl b/interfaces/Plush/templates/config_folders.tmpl +index 92bb5d1..94c1502 100644 +--- a/interfaces/Plush/templates/config_folders.tmpl ++++ b/interfaces/Plush/templates/config_folders.tmpl @@ -76,16 +76,6 @@ $T('explain-dirscan_speed') @@ -68,9 +69,10 @@ diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_directories.tmpl SABn

 

-diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_general.tmpl ---- SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl 2011-06-08 00:02:34.000000000 +0200 -+++ SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_general.tmpl 2011-06-13 16:35:26.411903234 +0200 +diff --git a/interfaces/Plush/templates/config_general.tmpl b/interfaces/Plush/templates/config_general.tmpl +index 0c293ec..56f9488 100644 +--- a/interfaces/Plush/templates/config_general.tmpl ++++ b/interfaces/Plush/templates/config_general.tmpl @@ -14,82 +14,6 @@
@@ -154,7 +156,7 @@ diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl SABnzbd-