mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 21:56:42 +00:00
SABnzbd-Suite: update addon version, remove trailing whitespaces
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
7696d7c099
commit
4fb33be0f7
@ -1,3 +1,6 @@
|
|||||||
|
2.1.2
|
||||||
|
- improve startup script
|
||||||
|
|
||||||
2.1.1
|
2.1.1
|
||||||
- update to addon version 2.1
|
- update to addon version 2.1
|
||||||
- update to SABnzbd-0.6.15
|
- update to SABnzbd-0.6.15
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
PKG_NAME="SABnzbd-Suite"
|
PKG_NAME="SABnzbd-Suite"
|
||||||
PKG_VERSION="2.1"
|
PKG_VERSION="2.1"
|
||||||
PKG_REV="1"
|
PKG_REV="2"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="OSS"
|
PKG_LICENSE="OSS"
|
||||||
PKG_SITE="http://www.openelec.tv"
|
PKG_SITE="http://www.openelec.tv"
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
# This Program is free software; you can redistribute it and/or modify
|
# This Program is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
# the Free Software Foundation; either version 2, or (at your option)
|
# the Free Software Foundation; either version 2, or (at your option)
|
||||||
# any later version.
|
# any later version
|
||||||
#
|
#
|
||||||
# This Program is distributed in the hope that it will be useful,
|
# This Program is distributed in the hope that it will be useful,
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
@ -18,7 +18,6 @@
|
|||||||
# http://www.gnu.org/copyleft/gpl.html
|
# http://www.gnu.org/copyleft/gpl.html
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
|
|
||||||
# Initializes and launches SABnzbd, Couchpotato, Sickbeard and Headphones
|
# Initializes and launches SABnzbd, Couchpotato, Sickbeard and Headphones
|
||||||
|
|
||||||
import os
|
import os
|
||||||
@ -36,9 +35,6 @@ logging.basicConfig(filename='/var/log/sabnzbd-suite.log',
|
|||||||
format='%(asctime)s SABnzbd-Suite: %(message)s',
|
format='%(asctime)s SABnzbd-Suite: %(message)s',
|
||||||
level=logging.WARNING)
|
level=logging.WARNING)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# helper functions
|
# helper functions
|
||||||
# ----------------
|
# ----------------
|
||||||
|
|
||||||
@ -60,9 +56,6 @@ def loadWebInterface(url,user,pwd):
|
|||||||
pagehandle = urllib2.urlopen(url)
|
pagehandle = urllib2.urlopen(url)
|
||||||
return pagehandle.read()
|
return pagehandle.read()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# define some things that we're gonna need, mainly paths
|
# define some things that we're gonna need, mainly paths
|
||||||
# ------------------------------------------------------
|
# ------------------------------------------------------
|
||||||
|
|
||||||
@ -87,7 +80,6 @@ pSabNzbdIncomplete = '/storage/downloads/incomplete'
|
|||||||
pSickBeardTvScripts = os.path.join(pAddon, 'SickBeard/autoProcessTV')
|
pSickBeardTvScripts = os.path.join(pAddon, 'SickBeard/autoProcessTV')
|
||||||
pSabNzbdScripts = os.path.join(pAddonHome, 'scripts')
|
pSabNzbdScripts = os.path.join(pAddonHome, 'scripts')
|
||||||
|
|
||||||
|
|
||||||
# pylib
|
# pylib
|
||||||
pPylib = os.path.join(pAddon, 'pylib')
|
pPylib = os.path.join(pAddon, 'pylib')
|
||||||
|
|
||||||
@ -105,9 +97,6 @@ headphones = ['python', os.path.join(pAddon, 'Headphones/Headphones.p
|
|||||||
sabNzbdHost = '127.0.0.1:8081'
|
sabNzbdHost = '127.0.0.1:8081'
|
||||||
addonId = 'service.downloadmanager.SABnzbd-Suite'
|
addonId = 'service.downloadmanager.SABnzbd-Suite'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# create directories and settings on first launch
|
# create directories and settings on first launch
|
||||||
# -----------------------------------------------
|
# -----------------------------------------------
|
||||||
|
|
||||||
@ -130,9 +119,6 @@ if firstLaunch:
|
|||||||
for utility in {'par2','unrar','unzip'}:
|
for utility in {'par2','unrar','unzip'}:
|
||||||
os.chmod(os.path.join(pAddon, 'bin', utility), 0755)
|
os.chmod(os.path.join(pAddon, 'bin', utility), 0755)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# read addon and xbmc settings
|
# read addon and xbmc settings
|
||||||
# ----------------------------
|
# ----------------------------
|
||||||
|
|
||||||
@ -162,17 +148,12 @@ try:
|
|||||||
except:
|
except:
|
||||||
xbmcPwd = ''
|
xbmcPwd = ''
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# prepare execution environment
|
# prepare execution environment
|
||||||
# -----------------------------
|
# -----------------------------
|
||||||
|
|
||||||
signal.signal(signal.SIGCHLD, signal.SIG_DFL)
|
signal.signal(signal.SIGCHLD, signal.SIG_DFL)
|
||||||
os.environ['PYTHONPATH'] = str(os.environ.get('PYTHONPATH')) + ':' + pPylib
|
os.environ['PYTHONPATH'] = str(os.environ.get('PYTHONPATH')) + ':' + pPylib
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# write SABnzbd settings
|
# write SABnzbd settings
|
||||||
# ----------------------
|
# ----------------------
|
||||||
|
|
||||||
@ -236,9 +217,6 @@ defaultConfig['SickBeard']['password'] = pwd
|
|||||||
autoProcessConfig.merge(defaultConfig)
|
autoProcessConfig.merge(defaultConfig)
|
||||||
autoProcessConfig.write()
|
autoProcessConfig.write()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# launch SABnzbd and get the API key
|
# launch SABnzbd and get the API key
|
||||||
# ----------------------------------
|
# ----------------------------------
|
||||||
|
|
||||||
@ -253,9 +231,6 @@ sabNzbdConfig.reload()
|
|||||||
sabNzbdApiKey = sabNzbdConfig['misc']['api_key']
|
sabNzbdApiKey = sabNzbdConfig['misc']['api_key']
|
||||||
logging.debug('SABnzbd api key: ' + sabNzbdApiKey)
|
logging.debug('SABnzbd api key: ' + sabNzbdApiKey)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# write SickBeard settings
|
# write SickBeard settings
|
||||||
# ------------------------
|
# ------------------------
|
||||||
|
|
||||||
@ -301,18 +276,12 @@ if firstLaunch:
|
|||||||
sickBeardConfig.merge(defaultConfig)
|
sickBeardConfig.merge(defaultConfig)
|
||||||
sickBeardConfig.write()
|
sickBeardConfig.write()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# launch SickBeard
|
# launch SickBeard
|
||||||
# ----------------
|
# ----------------
|
||||||
logging.debug('Launching SickBeard...')
|
logging.debug('Launching SickBeard...')
|
||||||
subprocess.call(sickBeard)
|
subprocess.call(sickBeard)
|
||||||
logging.debug('...done')
|
logging.debug('...done')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# write CouchPotato settings
|
# write CouchPotato settings
|
||||||
# --------------------------
|
# --------------------------
|
||||||
|
|
||||||
@ -349,9 +318,6 @@ if firstLaunch:
|
|||||||
couchPotatoConfig.merge(defaultConfig)
|
couchPotatoConfig.merge(defaultConfig)
|
||||||
couchPotatoConfig.write()
|
couchPotatoConfig.write()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# launch CouchPotato
|
# launch CouchPotato
|
||||||
# ------------------
|
# ------------------
|
||||||
|
|
||||||
@ -359,9 +325,6 @@ logging.debug('Launching CouchPotato...')
|
|||||||
subprocess.call(couchPotato)
|
subprocess.call(couchPotato)
|
||||||
logging.debug('...done')
|
logging.debug('...done')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# write Headphones settings
|
# write Headphones settings
|
||||||
# -------------------------
|
# -------------------------
|
||||||
|
|
||||||
@ -390,9 +353,6 @@ if firstLaunch:
|
|||||||
headphonesConfig.merge(defaultConfig)
|
headphonesConfig.merge(defaultConfig)
|
||||||
headphonesConfig.write()
|
headphonesConfig.write()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# launch Headphones
|
# launch Headphones
|
||||||
# -----------------
|
# -----------------
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user