From e7febc163e14ed76dcd768752d05aebafd628b53 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 14 Jun 2011 00:43:15 +0200 Subject: [PATCH] CouchPotato: move to '3rdparty' Signed-off-by: Stephan Raue --- .../download}/CouchPotato/meta | 6 +- .../service/downloadmanager/CouchPotato/addon | 28 ----- .../downloadmanager/CouchPotato/changelog.txt | 5 - .../downloadmanager/CouchPotato/icon/icon.png | Bin 5749 -> 0 bytes .../source/bin/CouchPotato.service | 100 --------------- .../CouchPotato/source/bin/ini_tool | 117 ------------------ .../CouchPotato/source/default.py | 23 ---- 7 files changed, 2 insertions(+), 277 deletions(-) rename packages/{addons/service/downloadmanager => 3rdparty/download}/CouchPotato/meta (92%) delete mode 100755 packages/addons/service/downloadmanager/CouchPotato/addon delete mode 100644 packages/addons/service/downloadmanager/CouchPotato/changelog.txt delete mode 100644 packages/addons/service/downloadmanager/CouchPotato/icon/icon.png delete mode 100755 packages/addons/service/downloadmanager/CouchPotato/source/bin/CouchPotato.service delete mode 100755 packages/addons/service/downloadmanager/CouchPotato/source/bin/ini_tool delete mode 100644 packages/addons/service/downloadmanager/CouchPotato/source/default.py diff --git a/packages/addons/service/downloadmanager/CouchPotato/meta b/packages/3rdparty/download/CouchPotato/meta similarity index 92% rename from packages/addons/service/downloadmanager/CouchPotato/meta rename to packages/3rdparty/download/CouchPotato/meta index 6ed7f2d818..722ac51d39 100644 --- a/packages/addons/service/downloadmanager/CouchPotato/meta +++ b/packages/3rdparty/download/CouchPotato/meta @@ -21,7 +21,7 @@ PKG_NAME="CouchPotato" PKG_VERSION="2504efc" -PKG_REV="2" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="https://github.com/RuudBurger/CouchPotato" @@ -33,8 +33,6 @@ PKG_SECTION="service/downloadmanager" PKG_SHORTDESC="CouchPotato: automated movie downloading." PKG_LONGDESC="CouchPotato: automated movie downloading." -PKG_IS_ADDON="yes" -PKG_ADDON_TYPE="xbmc.service" -PKG_ADDON_REQUIRES="addon.downloadmanager.SABnzbd:0.99.1" +PKG_IS_ADDON="no" PKG_AUTORECONF="no" diff --git a/packages/addons/service/downloadmanager/CouchPotato/addon b/packages/addons/service/downloadmanager/CouchPotato/addon deleted file mode 100755 index a6d6b3cab7..0000000000 --- a/packages/addons/service/downloadmanager/CouchPotato/addon +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com) -# -# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/$1 - cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/$1 - diff --git a/packages/addons/service/downloadmanager/CouchPotato/changelog.txt b/packages/addons/service/downloadmanager/CouchPotato/changelog.txt deleted file mode 100644 index fdb3511d92..0000000000 --- a/packages/addons/service/downloadmanager/CouchPotato/changelog.txt +++ /dev/null @@ -1,5 +0,0 @@ -0.99.2 -- update to CouchPotato-2504efc - -0.99.1 -- initial version CouchPotato-ded60e1 diff --git a/packages/addons/service/downloadmanager/CouchPotato/icon/icon.png b/packages/addons/service/downloadmanager/CouchPotato/icon/icon.png deleted file mode 100644 index d189fe8ba2f4840e448bee3bb10971c2d07a4090..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5749 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" $XBMC_SETTINGS | sed -e "s,[[:space:]]*<$1>,," -e "s,,," -} - -mkdir -p $ADDON_HOME - -if [ ! -f "$ADDON_HOME/config.ini" ]; then - COUCHPOTATO_FIRSTRUN="yes" -fi - -# default values - COUCHPOTATO_LAUNCHBROWSER="False" - COUCHPOTATO_VERSIONCHECK="False" - COUCHPOTATO_PORT="8083" - COUCHPOTATO_USEXBMC="True" - COUCHPOTATO_UPDATEXBMC="True" - -# read xbmc settings - XBMC_HOST="127.0.0.1" - XBMC_PORT=`read_xbmcconfig webserverport` - XBMC_USER=`read_xbmcconfig webserverusername` - XBMC_PWD=`read_xbmcconfig webserverpassword` - -# read sabnzbd settings - SABNZBD_HOST="127.0.0.1" - SABNZBD_PORT="8081" - SABNZBD_APIKEY=`read_sabconfig misc api_key` - SABNZBD_WEBUSERNAME=`read_sabconfig misc username` - SABNZBD_WEBPASSWORD=`read_sabconfig misc password` - -if [ -z "$COUCHPOTATO_HOST" ]; then - COUCHPOTATO_HOST="0.0.0.0" -fi - -write_ini global host $COUCHPOTATO_HOST -write_ini global port $COUCHPOTATO_PORT -write_ini global username $SABNZBD_WEBUSERNAME -write_ini global password $SABNZBD_WEBPASSWORD -write_ini global launchbrowser $COUCHPOTATO_LAUNCHBROWSER -write_ini global updater $COUCHPOTATO_VERSIONCHECK - -write_ini Sabnzbd username $SABNZBD_WEBUSERNAME -write_ini Sabnzbd password $SABNZBD_WEBPASSWORD -write_ini Sabnzbd apikey $SABNZBD_APIKEY -write_ini Sabnzbd host "$SABNZBD_HOST:$SABNZBD_PORT" - -write_ini XBMC enabled $COUCHPOTATO_USEXBMC -write_ini XBMC host "$XBMC_HOST:$XBMC_PORT" -write_ini XBMC username $XBMC_USER -write_ini XBMC password $XBMC_PWD - -if [ "$COUCHPOTATO_FIRSTRUN" = "yes" ]; then - write_ini XBMC updateoneonly $COUCHPOTATO_UPDATEXBMC -fi - -python $ADDON_DIR/CouchPotato/CouchPotato.py -d --datadir $ADDON_HOME --config $ADDON_HOME/config.ini diff --git a/packages/addons/service/downloadmanager/CouchPotato/source/bin/ini_tool b/packages/addons/service/downloadmanager/CouchPotato/source/bin/ini_tool deleted file mode 100755 index 97f7b4c433..0000000000 --- a/packages/addons/service/downloadmanager/CouchPotato/source/bin/ini_tool +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env python - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2011 Travis Glenn Hansen (travisghansen@openelec.tv) -# -# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -from configobj import ConfigObj -import sys -import os -import string - -python_major = sys.version_info[0] -python_minor = sys.version_info[1] - -prog="ini_tool" -description="""Read/Write config files. - -Examples: - %(prog)s --file config.ini --action read --option [section:]username - %(prog)s --file config.ini --action write --option [section:]username --value foo""" % {'prog':prog} - -def option_required_error(option): - parser.print_usage() - print prog + ": error: " + option + " is required" - exit(2) - -if python_major > 2 or (python_major == 2 and python_minor >= 7): - import argparse - - parser = argparse.ArgumentParser( - prog=prog, - description=description, - formatter_class=argparse.RawDescriptionHelpFormatter, - ) - - parser.add_argument('--file', help='file to read/write to/from', required=True) - parser.add_argument('--action', help='read|write', required=True) - parser.add_argument('--option', help='the option key', required=True) - parser.add_argument('--value', help='value to store in the given option (only for write action)') - - options = parser.parse_args() - -else: - import optparse - - parser = optparse.OptionParser( - prog=prog, - description=description, - ) - - parser.add_option('--file', help='file to read/write to/from') - parser.add_option('--action', help='read|write') - parser.add_option('--option', help='the option key') - parser.add_option('--value', help='value to store in the given option (only for write action)') - - (options, args) = parser.parse_args() - - if not options.file: - option_required_error("--file") - if not options.action: - option_required_error("--action") - if not options.option: - option_required_error("--option") - - -if options.action != "read" and options.action != "write": - print "'" + options.action + "' is not a valid action" - parser.print_help() - exit(2) - -if options.action == "read" and not os.path.isfile(options.file): - print "'" + options.file + "' is not a file" - exit(2) - -config = ConfigObj(options.file) -keys = string.split(options.option, ":") -key_len = len(keys) -current_section = config - -if options.action == 'read': - i = 1 - for key in keys: - if i == key_len: - print current_section[key] - exit(0) - else: - current_section = current_section[key] - i += 1 -elif options.action == 'write': - i = 1 - for key in keys: - if i == key_len: - current_section[key] = options.value - elif key not in current_section: - current_section[key] = {} - current_section = current_section[key] - i += 1 - - config.write() -else: - exit(1) \ No newline at end of file diff --git a/packages/addons/service/downloadmanager/CouchPotato/source/default.py b/packages/addons/service/downloadmanager/CouchPotato/source/default.py deleted file mode 100644 index 68516442a7..0000000000 --- a/packages/addons/service/downloadmanager/CouchPotato/source/default.py +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -import xbmc, time, os, subprocess - -os.system("CouchPotato.service")