diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt index 42dc98e060..47362083f9 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt @@ -1,3 +1,10 @@ +2.1.6 +- fixed another startup bug + +2.1.5 +- fixed bug in startup (caused by couchpotatoserver / configobj) +- add possibilty to start / stop addon from addon manager with enable / disable + 2.1.4 - fixes bug in sleep control - added couchpotato v2 diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta b/packages/addons/service/downloadmanager/SABnzbd-Suite/meta index 722778b308..f1b2c37976 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/meta +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/meta @@ -20,7 +20,7 @@ PKG_NAME="SABnzbd-Suite" PKG_VERSION="2.1" -PKG_REV="4" +PKG_REV="6" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.openelec.tv" 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 7000160edd..c39ac0f884 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 @@ -141,6 +141,22 @@ 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 +if not sabnzbd_launch: + sabnzbd_launch = "true" +if not sickbeard_launch: + sickbeard_launch = "true" +if not couchpotato_launch: + couchpotato_launch = "true" +if not couchpotato_version: + couchpotato_version = "0" +if not headphones_launch: + headphones_launch = "true" +########## + # XBMC fXbmcSettings = open(pXbmcSettings, 'r') data = fXbmcSettings.read() @@ -345,6 +361,8 @@ md5pwd = hashlib.md5(pwd).hexdigest() couchPotatoServerConfig = ConfigObj(pCouchPotatoServerSettings,create_empty=True) defaultConfig = ConfigObj() +defaultConfig['newznab'] = {} +defaultConfig['newznab']['api_key'] = '' defaultConfig['core'] = {} defaultConfig['core']['username'] = user defaultConfig['core']['password'] = md5pwd 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 new file mode 100755 index 0000000000..189cbd7519 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.stop @@ -0,0 +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 diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py index 7cb23eebec..8618a767be 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py @@ -35,14 +35,18 @@ __author__ = "OpenELEC" __url__ = "http://www.openelec.tv" __settings__ = xbmcaddon.Addon(id='service.downloadmanager.SABnzbd-Suite') __cwd__ = __settings__.getAddonInfo('path') -__path__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "SABnzbd-Suite.py") ) +__start__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "SABnzbd-Suite.py") ) +__stop__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "SABnzbd-Suite.stop") ) + +#make binary files executable in adson bin folder +subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True) checkInterval = 120 timeout = 20 wake_times = ['01:00','03:00','05:00','07:00','09:00','11:00','13:00','15:00','17:00','19:00','21:00','23:00'] # Launch Suite -subprocess.call(['python',__path__]) +subprocess.call(['python',__start__]) # SABnzbd addresses and api key @@ -108,5 +112,7 @@ while (not xbmc.abortRequested): open("/sys/class/rtc/rtc0/wakealarm", "w").write("0") open("/sys/class/rtc/rtc0/wakealarm", "w").write(str(secondsSinceEpoch)) - xbmc.sleep(checkInterval * 1000) + time.sleep(0.250) + +subprocess.Popen(__stop__, shell=True, close_fds=True) 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 273fac30b5..c4d2998892 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 @@ -8,7 +8,7 @@ Password Enable SABnzbd> Enable Sickbeard - Enable Coutchpotato + Enable Couchpotato Couchpotato Version Enable Headphones Network Settings diff --git a/packages/sysutils/busybox/init.d/06_systemconfig b/packages/sysutils/busybox/init.d/06_systemconfig index 1120b6c770..ba3baf9f2f 100644 --- a/packages/sysutils/busybox/init.d/06_systemconfig +++ b/packages/sysutils/busybox/init.d/06_systemconfig @@ -30,6 +30,6 @@ if [ -f "$OPENELEC_SETTINGS" ]; then mkdir -p /var/config cat "$OPENELEC_SETTINGS" \ - | awk -F'[\"|'\'']' '{gsub(/\"\;/, "\\\"", $4); gsub(/\&apos\;/, "\047", $4); gsub(/\&\;/, "&", $4); gsub(/\<\;/, "<", $4); gsub(/\>\;/, ">", $4); print $2"=\""$4"\"";}' \ + | awk -F'[\"|'\'']' '{gsub(/\"\;/, "\\\"", $4); gsub(/\&apos\;/, "\047", $4); gsub(/\&\;/, "\\&", $4); gsub(/\<\;/, "<", $4); gsub(/\>\;/, ">", $4); print $2"=\""$4"\"";}' \ | sed '/^=/d' > /var/config/settings.conf fi