diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/addon b/packages/addons/service/downloadmanager/SABnzbd-Suite/addon index 4bf37389a5..6d7c7d6eea 100755 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/addon +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/addon @@ -42,9 +42,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/SABnzbd mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/SickBeard cp -PR $BUILD/SickBeard-*/* $ADDON_BUILD/$PKG_ADDON_ID/SickBeard -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/CouchPotato - cp -PR $BUILD/CouchPotato-*/* $ADDON_BUILD/$PKG_ADDON_ID/CouchPotato - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/CouchPotatoServer cp -PR $BUILD/CouchPotatoServer-*/* $ADDON_BUILD/$PKG_ADDON_ID/CouchPotatoServer diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml index 3d34bb5d21..4bace92a16 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/config/settings.xml @@ -8,7 +8,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 4639ed6d2a..ed7a4a3ba9 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 @@ -71,7 +71,6 @@ pSuiteSettings = os.path.join(pAddonHome, 'settings.xml') pXbmcSettings = '/storage/.xbmc/userdata/guisettings.xml' pSabNzbdSettings = os.path.join(pAddonHome, 'sabnzbd.ini') 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' @@ -92,8 +91,6 @@ sabnzbd = ['python', os.path.join(pAddon, 'SABnzbd/SABnzbd.py'), '-d', '-f', pSabNzbdSettings, '-l 0'] sickBeard = ['python', os.path.join(pAddon, 'SickBeard/SickBeard.py'), '--daemon', '--datadir', pAddonHome, '--config', pSickBeardSettings] -couchPotato = ['python', os.path.join(pAddon, 'CouchPotato/CouchPotato.py'), - '-d', '--datadir', pAddonHome, '--config', pCouchPotatoSettings] couchPotatoServer = ['python', os.path.join(pAddon, 'CouchPotatoServer/CouchPotato.py'), '--daemon', '--pid_file', os.path.join(pAddonHome, 'couchpotato.pid'), '--config_file', pCouchPotatoServerSettings] headphones = ['python', os.path.join(pAddon, 'Headphones/Headphones.py'), @@ -155,7 +152,6 @@ 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') # merge defaults @@ -169,8 +165,6 @@ if not sickbeard_launch: sickbeard_launch = getAddonSetting(DefaultSuiteSettings, 'SICKBEARD_LAUNCH') if not couchpotato_launch: couchpotato_launch = getAddonSetting(DefaultSuiteSettings, 'COUCHPOTATO_LAUNCH') -if not couchpotato_version: - couchpotato_version = getAddonSetting(DefaultSuiteSettings, 'COUCHPOTATO_VERSION') if not headphones_launch: headphones_launch = getAddonSetting(DefaultSuiteSettings, 'HEADPHONES_LAUNCH') @@ -342,55 +336,6 @@ except Exception,e: print traceback.format_exc() # SickBeard end -# CouchPotato start -try: - # write CouchPotato settings - # -------------------------- - couchPotatoConfig = ConfigObj(pCouchPotatoSettings,create_empty=True) - defaultConfig = ConfigObj() - defaultConfig['global'] = {} - defaultConfig['global']['launchbrowser'] = 'False' - defaultConfig['global']['updater'] = 'False' - 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['XBMC'] = {} - defaultConfig['XBMC']['enabled'] = 'True' - defaultConfig['XBMC']['host'] = '127.0.0.1:' + xbmcPort - defaultConfig['XBMC']['username'] = xbmcUser - defaultConfig['XBMC']['password'] = xbmcPwd - - if firstLaunch: - defaultConfig['Sabnzbd']['category'] = 'movies' - defaultConfig['Sabnzbd']['ppdir'] = pSabNzbdCompleteMov - defaultConfig['Renamer'] = {} - defaultConfig['Renamer']['enabled'] = 'True' - defaultConfig['Renamer']['download'] = pSabNzbdCompleteMov - defaultConfig['Renamer']['destination'] = '/storage/videos' - defaultConfig['Renamer']['separator'] = '.' - defaultConfig['Renamer']['cleanup'] = 'True' - - couchPotatoConfig.merge(defaultConfig) - couchPotatoConfig.write() - - # launch CouchPotato - # ------------------ - if "true" in couchpotato_launch and "0" in couchpotato_version: - logging.debug('Launching CouchPotato...') - subprocess.call(couchPotato,close_fds=True) - logging.debug('...done') -except Exception,e: - print 'CouchPotato: exception occurred:', e - print traceback.format_exc() -# CouchPotato end - # CouchPotatoServer start try: # empty password hack @@ -458,7 +403,7 @@ try: # launch CouchPotatoServer # ------------------ - if "true" in couchpotato_launch and "1" in couchpotato_version: + if "true" in couchpotato_launch: logging.debug('Launching CouchPotatoServer...') subprocess.call(couchPotatoServer,close_fds=True) logging.debug('...done') 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 ca7f995bdb..7bd7d0e8f8 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 @@ -9,7 +9,6 @@ Enable SABnzbd Enable Sickbeard Enable Couchpotato - Couchpotato Version Enable Headphones Network Settings Allowed IP addresses diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Turkish/strings.xml b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Turkish/strings.xml index 67efee6427..ae24ad356e 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Turkish/strings.xml +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/language/Turkish/strings.xml @@ -9,7 +9,6 @@ SABnzbd'yi Etkinleştir Sickbeard'ı Etkinleştir Couchpotato'yu Etkinleştir - Couchpotato Sürümü Headphones'u Etkinleştir Ağ Ayarları İzin verilen IP adresleri 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 2cc11a2521..cf20410a95 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/resources/settings.xml @@ -10,7 +10,6 @@ -