mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
This commit is contained in:
Stephan Raue
commit
f967c83737
13
packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-393c14d-move-cache.patch
vendored
Normal file
13
packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-393c14d-move-cache.patch
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/couchpotato/runner.py b/couchpotato/runner.py
|
||||
index c0b7eb8..3a550f9 100644
|
||||
--- a/couchpotato/runner.py
|
||||
+++ b/couchpotato/runner.py
|
||||
@@ -112,7 +112,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
|
||||
Env.set('data_dir', data_dir)
|
||||
Env.set('log_path', os.path.join(log_dir, 'CouchPotato.log'))
|
||||
Env.set('db_path', 'sqlite:///' + db_path)
|
||||
- Env.set('cache_dir', os.path.join(data_dir, 'cache'))
|
||||
+ Env.set('cache_dir', os.path.join(data_dir, 'cache.cpv2'))
|
||||
Env.set('cache', FileSystemCache(os.path.join(Env.get('cache_dir'), 'python')))
|
||||
Env.set('console_log', options.console_log)
|
||||
Env.set('quiet', options.quiet)
|
||||
@ -1,3 +1,6 @@
|
||||
3.0.2
|
||||
- update to htop-1.0.2
|
||||
|
||||
3.0.1
|
||||
- bump addon version
|
||||
|
||||
|
||||
@ -19,8 +19,8 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="htop"
|
||||
PKG_VERSION="1.0.1"
|
||||
PKG_REV="1"
|
||||
PKG_VERSION="1.0.2"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://htop.sourceforge.net/"
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
3.0.2
|
||||
- Fixed bug causing configobj to throw an exception with Couchpotato v2s config
|
||||
- corrected a bug causing most of the suite to crash on first launch in certain circumstances
|
||||
- update to SABnzbd-0.7.9
|
||||
- update to CouchPotatoServer-393c14d
|
||||
- update to Headphones-263272c
|
||||
|
||||
@ -8,6 +8,6 @@
|
||||
<setting id="SABNZBD_LAUNCH" value="true" />
|
||||
<setting id="SICKBEARD_LAUNCH" value="true" />
|
||||
<setting id="COUCHPOTATO_LAUNCH" value="true" />
|
||||
<setting id="COUCHPOTATO_VERSION" value="0" />
|
||||
<setting id="COUCHPOTATO_VERSION" value="1" />
|
||||
<setting id="HEADPHONES_LAUNCH" value="true" />
|
||||
</settings>
|
||||
|
||||
@ -74,6 +74,7 @@ pSickBeardSettings = os.path.join(pAddonHome, 'sickbeard.ini')
|
||||
pCouchPotatoSettings = os.path.join(pAddonHome, 'couchpotato.ini')
|
||||
pCouchPotatoServerSettings = os.path.join(pAddonHome, 'couchpotatoserver.ini')
|
||||
pHeadphonesSettings = os.path.join(pAddonHome, 'headphones.ini')
|
||||
pTransmission_Addon_Settings ='/storage/.xbmc/userdata/addon_data/service.downloadmanager.transmission/settings.xml'
|
||||
|
||||
# directories
|
||||
pSabNzbdComplete = '/storage/downloads'
|
||||
@ -130,6 +131,18 @@ if firstLaunch:
|
||||
# read addon and xbmc settings
|
||||
# ----------------------------
|
||||
|
||||
# Transmission-Daemon
|
||||
if os.path.exists(pTransmission_Addon_Settings):
|
||||
fTransmission_Addon_Settings = open(pTransmission_Addon_Settings, 'r')
|
||||
data = fTransmission_Addon_Settings.read()
|
||||
fTransmission_Addon_Settings.close
|
||||
transmission_addon_settings = parseString(data)
|
||||
transuser = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_USER')
|
||||
transpwd = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_PWD')
|
||||
transauth = getAddonSetting(transmission_addon_settings, 'TRANSMISSION_AUTH')
|
||||
else:
|
||||
transauth = 'false'
|
||||
|
||||
# SABnzbd-Suite
|
||||
fSuiteSettings = open(pSuiteSettings, 'r')
|
||||
data = fSuiteSettings.read()
|
||||
@ -249,7 +262,7 @@ try:
|
||||
|
||||
# launch SABnzbd and get the API key
|
||||
# ----------------------------------
|
||||
if "true" in sabnzbd_launch:
|
||||
if firstLaunch or "true" in sabnzbd_launch:
|
||||
logging.debug('Launching SABnzbd...')
|
||||
subprocess.call(sabnzbd,close_fds=True)
|
||||
logging.debug('...done')
|
||||
@ -260,6 +273,8 @@ try:
|
||||
sabNzbdConfig.reload()
|
||||
sabNzbdApiKey = sabNzbdConfig['misc']['api_key']
|
||||
logging.debug('SABnzbd api key: ' + sabNzbdApiKey)
|
||||
if firstLaunch and "false" in sabnzbd_launch:
|
||||
urllib2.urlopen('http://' + sabNzbdHost + '/api?mode=shutdown&apikey=' + sabNzbdApiKey)
|
||||
except Exception,e:
|
||||
print 'SABnzbd: exception occurred:', e
|
||||
print traceback.format_exc()
|
||||
@ -308,6 +323,7 @@ try:
|
||||
defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost
|
||||
defaultConfig['XBMC']['xbmc_notify_ondownload'] = '1'
|
||||
defaultConfig['XBMC']['xbmc_update_library'] = '1'
|
||||
defaultConfig['XBMC']['xbmc_update_full'] = '1'
|
||||
|
||||
sickBeardConfig.merge(defaultConfig)
|
||||
sickBeardConfig.write()
|
||||
@ -383,10 +399,8 @@ try:
|
||||
|
||||
# write CouchPotatoServer settings
|
||||
# --------------------------
|
||||
couchPotatoServerConfig = ConfigObj(pCouchPotatoServerSettings,create_empty=True)
|
||||
couchPotatoServerConfig = ConfigObj(pCouchPotatoServerSettings,create_empty=True, list_values=False)
|
||||
defaultConfig = ConfigObj()
|
||||
defaultConfig['newznab'] = {}
|
||||
defaultConfig['newznab']['api_key'] = ''
|
||||
defaultConfig['core'] = {}
|
||||
defaultConfig['core']['username'] = user
|
||||
defaultConfig['core']['password'] = md5pwd
|
||||
@ -415,15 +429,26 @@ try:
|
||||
defaultConfig['xbmc']['username'] = xbmcUser
|
||||
defaultConfig['xbmc']['password'] = xbmcPwd
|
||||
|
||||
if 'true' in transauth:
|
||||
defaultConfig['transmission'] = {}
|
||||
defaultConfig['transmission']['username'] = transuser
|
||||
defaultConfig['transmission']['password'] = transpwd
|
||||
defaultConfig['transmission']['directory'] = pSabNzbdCompleteMov
|
||||
defaultConfig['transmission']['host'] = 'localhost:9091'
|
||||
|
||||
if firstLaunch:
|
||||
defaultConfig['xbmc']['xbmc_update_library'] = '1'
|
||||
defaultConfig['xbmc']['xbmc_update_full'] = '1'
|
||||
defaultConfig['xbmc']['xbmc_notify_onsnatch'] = '1'
|
||||
defaultConfig['xbmc']['xbmc_notify_ondownload'] = '1'
|
||||
defaultConfig['Sabnzbd']['category'] = 'movies'
|
||||
defaultConfig['Sabnzbd']['pp_directory'] = pSabNzbdCompleteMov
|
||||
defaultConfig['Renamer'] = {}
|
||||
defaultConfig['Renamer']['enabled'] = 'True'
|
||||
defaultConfig['Renamer']['enabled'] = '1'
|
||||
defaultConfig['Renamer']['download'] = pSabNzbdCompleteMov
|
||||
defaultConfig['Renamer']['destination'] = '/storage/videos'
|
||||
defaultConfig['Renamer']['separator'] = '.'
|
||||
defaultConfig['Renamer']['cleanup'] = 'False'
|
||||
defaultConfig['Renamer']['cleanup'] = '0'
|
||||
|
||||
couchPotatoServerConfig.merge(defaultConfig)
|
||||
couchPotatoServerConfig.write()
|
||||
@ -446,13 +471,23 @@ try:
|
||||
headphonesConfig = ConfigObj(pHeadphonesSettings,create_empty=True)
|
||||
defaultConfig = ConfigObj()
|
||||
defaultConfig['General'] = {}
|
||||
defaultConfig['General']['launch_browser'] = '0'
|
||||
defaultConfig['General']['http_port'] = '8084'
|
||||
defaultConfig['General']['http_host'] = host
|
||||
defaultConfig['General']['http_username'] = user
|
||||
defaultConfig['General']['http_password'] = pwd
|
||||
defaultConfig['General']['launch_browser'] = '0'
|
||||
defaultConfig['General']['http_port'] = '8084'
|
||||
defaultConfig['General']['http_host'] = host
|
||||
defaultConfig['General']['http_username'] = user
|
||||
defaultConfig['General']['http_password'] = pwd
|
||||
defaultConfig['General']['check_github'] = '0'
|
||||
defaultConfig['General']['check_github_on_startup'] = '0'
|
||||
defaultConfig['General']['log_dir'] = pAddonHome + '/logs'
|
||||
defaultConfig['General']['folder_permissions'] = '0644'
|
||||
defaultConfig['XBMC'] = {}
|
||||
defaultConfig['XBMC']['xbmc_enabled'] = '1'
|
||||
defaultConfig['XBMC']['xbmc_host'] = '127.0.0.1:' + xbmcPort
|
||||
defaultConfig['XBMC']['xbmc_username'] = xbmcUser
|
||||
defaultConfig['XBMC']['xbmc_password'] = xbmcPwd
|
||||
defaultConfig['SABnzbd'] = {}
|
||||
|
||||
if "true" in sabnzbd_launch:
|
||||
defaultConfig['SABnzbd'] = {}
|
||||
defaultConfig['SABnzbd']['sab_apikey'] = sabNzbdApiKey
|
||||
defaultConfig['SABnzbd']['sab_host'] = sabNzbdHost
|
||||
defaultConfig['SABnzbd']['sab_username'] = user
|
||||
@ -460,6 +495,8 @@ try:
|
||||
|
||||
if firstLaunch:
|
||||
defaultConfig['SABnzbd']['sab_category'] = 'music'
|
||||
defaultConfig['XBMC']['xbmc_update'] = '1'
|
||||
defaultConfig['XBMC']['xbmc_notify'] = '1'
|
||||
defaultConfig['General']['music_dir'] = '/storage/music'
|
||||
defaultConfig['General']['destination_dir'] = '/storage/music'
|
||||
defaultConfig['General']['download_dir'] = '/storage/downloads/music'
|
||||
|
||||
@ -1,6 +1,2 @@
|
||||
#!/bin/sh
|
||||
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
|
||||
kill `ps | grep -E 'python.*service.downloadmanager.SABnzbd-Suite' | awk '{print $1}'` 2>/dev/null
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<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)" />
|
||||
<setting id="COUCHPOTATO_VERSION" type="enum" label="1027" default="1" values="Version 1|Version 2" enable="eq(-1,true)" />
|
||||
<setting id="HEADPHONES_LAUNCH" type="bool" label="1028" default="true" />
|
||||
|
||||
<setting label="2010" type="lsep"/>
|
||||
|
||||
@ -26,12 +26,16 @@
|
||||
PATH="/bin:/sbin:/usr/bin:/usr/sbin"
|
||||
|
||||
# hack: add addons to $PATH
|
||||
for addons in `find /storage/.xbmc/addons/* -name bin -type d`; do
|
||||
PATH="$PATH:$addons"
|
||||
for addon in /storage/.xbmc/addons/*/bin; do
|
||||
if [ -d "$addon" ] ; then
|
||||
PATH="$PATH:$addon"
|
||||
fi
|
||||
done
|
||||
|
||||
for sys in `find /usr/lib/xbmc/addons/* -name bin -type d`; do
|
||||
PATH="$PATH:$sys"
|
||||
for sys in /usr/lib/xbmc/addons/*/bin; do
|
||||
if [ -d "$sys" ] ; then
|
||||
PATH="$PATH:$sys"
|
||||
fi
|
||||
done
|
||||
|
||||
export PATH
|
||||
|
||||
@ -60,6 +60,8 @@
|
||||
}
|
||||
|
||||
# read config files
|
||||
for config in `ls /etc/profile.d/`; do
|
||||
. /etc/profile.d/$config
|
||||
for config in /etc/profile.d/*; do
|
||||
if [ -f "$config" ] ; then
|
||||
. $config
|
||||
fi
|
||||
done
|
||||
|
||||
@ -28,12 +28,16 @@
|
||||
LD_LIBRARY_PATH="/usr/lib:/lib"
|
||||
|
||||
# hack: add addons to $LD_LIBRARY_PATH
|
||||
for addons in `find /storage/.xbmc/addons/* -name lib -type d`; do
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addons"
|
||||
for addon in /storage/.xbmc/addons/*/lib; do
|
||||
if [ -d "$addon" ] ; then
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addon"
|
||||
fi
|
||||
done
|
||||
|
||||
for sys in `find /usr/lib/xbmc/addons/* -name lib -type d`; do
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$sys"
|
||||
for sys in /usr/lib/xbmc/addons/*/lib; do
|
||||
if [ -d "$sys" ] ; then
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$sys"
|
||||
fi
|
||||
done
|
||||
|
||||
export LD_LIBRARY_PATH
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user