jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-30 06:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

Browse Source
This commit is contained in:
Stephan Raue 2012-06-20 21:41:57 +02:00
commit a214848f6c
9 changed files with 63 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/3rdparty/download/Headphones/meta vendored
View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="Headphones"
PKG_VERSION="ddf3432"
PKG_VERSION="89c2a8c"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

4
packages/3rdparty/download/SABnzbd/meta vendored
View File

@ -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"

25
packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.15-001_remove_default_settings-0.3.patch → packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.7.0-001_remove_default_settings-0.3.patch vendored
View File

@ -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 @@
<span class="component-desc">$T('explain-dirscan_speed')</span>
</label>
@ -68,9 +69,10 @@ diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_directories.tmpl SABn
<div class="component-group-last clearfix">
<div class="component-group-desc">
<h3>&nbsp;</h3>
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 @@
</div>
<fieldset class="component-group-list">
@ -154,7 +156,7 @@ diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl SABnzbd-
<label class="nocheck clearfix" for="language">
<span class="component-title">$T('opt-language')</span>
<select name="language" id="language" id="language" class="select">
@@ -129,13 +53,6 @@
@@ -131,13 +55,6 @@
<span class="component-desc">$T('explain-nzbkey')</span>
</label>
</div>
@ -168,7 +170,7 @@ diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl SABnzbd-
</fieldset>
</div><!-- /component-group1 -->
@@ -152,36 +69,6 @@
@@ -154,36 +71,6 @@
<span class="component-desc">$T('explain-enable_https')</span>
</label>
</div>
@ -205,9 +207,10 @@ diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_general.tmpl SABnzbd-
</fieldset>
</div><!-- /component-group2 -->
diff -Naur SABnzbd-0.6.4/interfaces/Plush/templates/config_switches.tmpl SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_switches.tmpl
--- SABnzbd-0.6.4/interfaces/Plush/templates/config_switches.tmpl 2011-06-08 00:02:34.000000000 +0200
+++ SABnzbd-0.6.4.patch/interfaces/Plush/templates/config_switches.tmpl 2011-06-13 16:35:26.446903654 +0200
diff --git a/interfaces/Plush/templates/config_switches.tmpl b/interfaces/Plush/templates/config_switches.tmpl
index a8f1069..6f50b49 100644
--- a/interfaces/Plush/templates/config_switches.tmpl
+++ b/interfaces/Plush/templates/config_switches.tmpl
@@ -12,20 +12,6 @@
<h3>$T('swtag-general')</h3>
</div>

4
packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt
View File

@ -1,3 +1,7 @@
2.1.7
- update to SABnzbd-0.7.0
- update to Headphones-89c2a8c
2.1.6
- fixed another startup bug

1
packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml
View File

@ -5,7 +5,6 @@
<setting id="SABNZBD_KEEP_AWAKE" value="false" />
<setting id="SABNZBD_PERIODIC_WAKE" value="false" />
<setting id="SABNZBD_WAKE_AT" value="1" />
<setting id="SABNZBD_LAUNCH" value="true" />
<setting id="SICKBEARD_LAUNCH" value="true" />
<setting id="COUCHPOTATO_LAUNCH" value="true" />
<setting id="COUCHPOTATO_VERSION" value="0" />

82
packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.py
View File

@ -138,27 +138,24 @@ 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')
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"
# 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')
@ -247,17 +244,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
# ------------------------
@ -272,12 +268,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
@ -324,12 +319,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
@ -382,12 +376,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
@ -425,12 +418,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'

10
packages/addons/service/downloadmanager/SABnzbd-Suite/source/bin/SABnzbd-Suite.stop
View File

@ -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

1
packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/English/strings.xml
View File

@ -6,7 +6,6 @@
<string id="1010">User Settings</string>
<string id="1022">Username</string>
<string id="1023">Password</string>
<string id="1024">Enable SABnzbd</string>>
<string id="1025">Enable Sickbeard</string>
<string id="1026">Enable Couchpotato</string>
<string id="1027">Couchpotato Version</string>

1
packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml
View File

@ -7,7 +7,6 @@
<setting type="sep" />
<setting id="SABNZBD_USER" type="text" label="1022" default="openelec"/>
<setting id="SABNZBD_PWD" type="text" label="1023" default="openelec"/>
<setting id="SABNZBD_LAUNCH" type="bool" label="1024" default="true" />
<setting id="SICKBEARD_LAUNCH" type="bool" label="1025" default="true" />
<setting id="COUCHPOTATO_LAUNCH" type="bool" label="1026" default="true" />
<setting id="COUCHPOTATO_VERSION" type="enum" label="1027" default="0" values="Version 1|Version 2" enable="eq(-1,true)" />