diff --git a/config/addon/addon.xml b/config/addon/addon.xml index 92881eb1fb..7b53c47393 100644 --- a/config/addon/addon.xml +++ b/config/addon/addon.xml @@ -1,14 +1,15 @@ +@REQUIRES@ + library="default.py"> executable diff --git a/packages/addons/downloadmanager/SABnzbd/source/bin/ini_tool b/packages/addons/downloadmanager/SABnzbd/source/bin/ini_tool index 7f8d52f3b3..97f7b4c433 100755 --- a/packages/addons/downloadmanager/SABnzbd/source/bin/ini_tool +++ b/packages/addons/downloadmanager/SABnzbd/source/bin/ini_tool @@ -2,8 +2,7 @@ ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2011 Thansen +# 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 diff --git a/packages/python/web/Sick-Beard/init.d/60_sickbeard b/packages/addons/downloadmanager/SickBeard/addon old mode 100644 new mode 100755 similarity index 66% rename from packages/python/web/Sick-Beard/init.d/60_sickbeard rename to packages/addons/downloadmanager/SickBeard/addon index 178d1224b8..9b37c454b5 --- a/packages/python/web/Sick-Beard/init.d/60_sickbeard +++ b/packages/addons/downloadmanager/SickBeard/addon @@ -1,3 +1,5 @@ +#!/bin/sh + ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) @@ -19,25 +21,10 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -# Starting Sickbeard downloader daemon -# -# runlevels: openelec, textmode +. config/options $1 -( - if [ -f /var/config/settings.conf ]; then - . /var/config/settings.conf +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/$1 + cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/$1 - if [ "$SABNZBD_START" = "true" ]; then - - mkdir -p /var/run - mkdir -p $HOME/.sickbeard - - wait_for_network - - progress "Starting sickbeard downloader daemon" - python /usr/lib/SickBeard/SickBeard.py --daemon \ - --pidfile=/var/run/sickbeard.pid \ - --datadir $HOME/.sickbeard - fi - fi -)& +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib + cp -R $BUILD/Cheetah*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib \ No newline at end of file diff --git a/packages/addons/downloadmanager/SickBeard/changelog.txt b/packages/addons/downloadmanager/SickBeard/changelog.txt new file mode 100644 index 0000000000..7b85927133 --- /dev/null +++ b/packages/addons/downloadmanager/SickBeard/changelog.txt @@ -0,0 +1,2 @@ +0.99.1 +- initial version SickBeard-48caf04 \ No newline at end of file diff --git a/packages/addons/downloadmanager/SickBeard/icon/icon.png b/packages/addons/downloadmanager/SickBeard/icon/icon.png new file mode 100644 index 0000000000..682044c5cc Binary files /dev/null and b/packages/addons/downloadmanager/SickBeard/icon/icon.png differ diff --git a/packages/python/web/Sick-Beard/meta b/packages/addons/downloadmanager/SickBeard/meta similarity index 80% rename from packages/python/web/Sick-Beard/meta rename to packages/addons/downloadmanager/SickBeard/meta index c62f9c6183..4622f9bad3 100644 --- a/packages/python/web/Sick-Beard/meta +++ b/packages/addons/downloadmanager/SickBeard/meta @@ -19,19 +19,22 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -PKG_NAME="Sick-Beard" -PKG_VERSION="0f076f4" +PKG_NAME="SickBeard" +PKG_VERSION="48caf04" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="https://github.com/midgetspy/Sick-Beard" PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2" -PKG_DEPENDS="Python Cheetah SABnzbd" +PKG_DEPENDS="Python Cheetah" PKG_BUILD_DEPENDS="toolchain Python" PKG_PRIORITY="optional" -PKG_SECTION="plugins" -PKG_SHORTDESC="Sick-beard: automated TV show downloading." -PKG_LONGDESC="Sick-beard: automated TV show downloading." -PKG_IS_ADDON="no" +PKG_SECTION="downloadmanager" +PKG_SHORTDESC="SickBeard: automated TV show downloading." +PKG_LONGDESC="SickBeard: automated TV show downloading." + +PKG_IS_ADDON="yes" +PKG_ADDON_TYPE="xbmc.service" +PKG_ADDON_REQUIRES="addon.downloadmanager.SABnzbd" PKG_AUTORECONF="no" diff --git a/packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-001-remove_logo_update-header_and_donate_button-0.1.patch b/packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-001-remove_logo_update-header_and_donate_button-0.1.patch new file mode 100644 index 0000000000..a8608033aa --- /dev/null +++ b/packages/addons/downloadmanager/SickBeard/patches/SickBeard-48caf04-001-remove_logo_update-header_and_donate_button-0.1.patch @@ -0,0 +1,44 @@ +diff -Naur SickBeard-48caf04/data/interfaces/default/config.tmpl SickBeard-48caf04.patch/data/interfaces/default/config.tmpl +--- SickBeard-48caf04/data/interfaces/default/config.tmpl 2011-04-22 19:15:10.000000000 +0200 ++++ SickBeard-48caf04.patch/data/interfaces/default/config.tmpl 2011-04-23 03:57:14.515808144 +0200 +@@ -24,9 +24,4 @@ + + + +- +- +- +-
[donate]Sickbeard is free, but you can contribute by giving a donation.
+- + #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl") +diff -Naur SickBeard-48caf04/data/interfaces/default/inc_top.tmpl SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl +--- SickBeard-48caf04/data/interfaces/default/inc_top.tmpl 2011-04-22 19:15:10.000000000 +0200 ++++ SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl 2011-04-23 03:59:09.088665913 +0200 +@@ -147,19 +147,6 @@ + + + +-#if $sickbeard.NEWEST_VERSION_STRING: +-
+-
+- $sickbeard.NEWEST_VERSION_STRING +-
+-
+-
+-#end if +- + + #if $varExists('submenu'): + + +- +-
+-
+-

Libnotify Libnotify

+-

The standard desktop notification API for Linux/*nix systems. This notifier will only function if the pynotify module is installed (Ubuntu/Debian package python-notify).

+-
+- +-
+-
+- +- +-
+- +-
+-
+- +- +-
+- +-
+- +- +-
+- +-
Click below to test.
+- +- +- +-
+- +-
+-
+- +
+ +
+diff -Naur SickBeard-48caf04/data/interfaces/default/inc_top.tmpl SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl +--- SickBeard-48caf04/data/interfaces/default/inc_top.tmpl 2011-04-23 03:59:09.000000000 +0200 ++++ SickBeard-48caf04.patch/data/interfaces/default/inc_top.tmpl 2011-04-23 14:24:01.035048035 +0200 +@@ -172,7 +172,6 @@ + +
- -
-- -- -- --
-- --
-
- -- -- -- --
[donate]Sickbeard is free, but you can contribute by giving a donation.
-- - #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_bottom.tmpl") -diff -Naur Sick-Beard-0f076f4/data/interfaces/default/inc_top.tmpl Sick-Beard-0f076f4.patch/data/interfaces/default/inc_top.tmpl ---- Sick-Beard-0f076f4/data/interfaces/default/inc_top.tmpl 2011-04-16 17:14:02.055365889 +0200 -+++ Sick-Beard-0f076f4.patch/data/interfaces/default/inc_top.tmpl 2011-04-16 17:51:40.232667081 +0200 -@@ -147,19 +147,6 @@ - - - --#if $sickbeard.NEWEST_VERSION_STRING: --
--
-- $sickbeard.NEWEST_VERSION_STRING --
--
--
--#end if -- - - #if $varExists('submenu'): - - -diff -Naur Sick-Beard-0f076f4/sickbeard/__init__.py Sick-Beard-0f076f4.patch/sickbeard/__init__.py ---- Sick-Beard-0f076f4/sickbeard/__init__.py 2011-04-16 15:57:38.000000000 +0200 -+++ Sick-Beard-0f076f4.patch/sickbeard/__init__.py 2011-04-16 16:51:40.750117126 +0200 -@@ -393,12 +393,12 @@ - logger.log(u"!!! No log folder, logging to screen only!", logger.ERROR) - - try: -- WEB_PORT = check_setting_int(CFG, 'General', 'web_port', 8081) -+ WEB_PORT = check_setting_int(CFG, 'General', 'web_port', 8082) - except: -- WEB_PORT = 8081 -+ WEB_PORT = 8082 - - if WEB_PORT < 21 or WEB_PORT > 65535: -- WEB_PORT = 8081 -+ WEB_PORT = 8082 - - WEB_HOST = check_setting_str(CFG, 'General', 'web_host', '0.0.0.0') - WEB_IPV6 = bool(check_setting_int(CFG, 'General', 'web_ipv6', 0)) -diff -Naur Sick-Beard-0f076f4/sickbeard/webserveInit.py Sick-Beard-0f076f4.patch/sickbeard/webserveInit.py ---- Sick-Beard-0f076f4/sickbeard/webserveInit.py 2011-04-16 15:57:38.000000000 +0200 -+++ Sick-Beard-0f076f4.patch/sickbeard/webserveInit.py 2011-04-16 16:52:50.786662601 +0200 -@@ -24,7 +24,7 @@ - from sickbeard.webserve import WebInterface - - def initWebServer(options = {}): -- options.setdefault('port', 8081) -+ options.setdefault('port', 8082) - options.setdefault('host', '0.0.0.0') - options.setdefault('log_dir', None) - options.setdefault('username', '') diff --git a/packages/python/web/Sick-Beard/patches/Sick-Beard-0f076f4-002_enable_xbmc_support-0.1.patch b/packages/python/web/Sick-Beard/patches/Sick-Beard-0f076f4-002_enable_xbmc_support-0.1.patch deleted file mode 100644 index c62fd85f9a..0000000000 --- a/packages/python/web/Sick-Beard/patches/Sick-Beard-0f076f4-002_enable_xbmc_support-0.1.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur Sick-Beard-0f076f4/sickbeard/__init__.py Sick-Beard-0f076f4.patch/sickbeard/__init__.py ---- Sick-Beard-0f076f4/sickbeard/__init__.py 2011-04-16 16:57:52.784398169 +0200 -+++ Sick-Beard-0f076f4.patch/sickbeard/__init__.py 2011-04-16 17:04:12.103546012 +0200 -@@ -190,12 +190,12 @@ - NZBGET_CATEGORY = None - NZBGET_HOST = None - --USE_XBMC = False -+USE_XBMC = True - XBMC_NOTIFY_ONSNATCH = False - XBMC_NOTIFY_ONDOWNLOAD = False - XBMC_UPDATE_LIBRARY = False - XBMC_UPDATE_FULL = False --XBMC_HOST = '' -+XBMC_HOST = '127.0.0.1:8080' - XBMC_USERNAME = None - XBMC_PASSWORD = None - -@@ -528,12 +528,12 @@ - NZBGET_CATEGORY = check_setting_str(CFG, 'NZBget', 'nzbget_category', 'tv') - NZBGET_HOST = check_setting_str(CFG, 'NZBget', 'nzbget_host', '') - -- USE_XBMC = bool(check_setting_int(CFG, 'XBMC', 'use_xbmc', 0)) -+ USE_XBMC = bool(check_setting_int(CFG, 'XBMC', 'use_xbmc', 1)) - XBMC_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'XBMC', 'xbmc_notify_onsnatch', 0)) - XBMC_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'XBMC', 'xbmc_notify_ondownload', 0)) - XBMC_UPDATE_LIBRARY = bool(check_setting_int(CFG, 'XBMC', 'xbmc_update_library', 0)) - XBMC_UPDATE_FULL = bool(check_setting_int(CFG, 'XBMC', 'xbmc_update_full', 0)) -- XBMC_HOST = check_setting_str(CFG, 'XBMC', 'xbmc_host', '') -+ XBMC_HOST = check_setting_str(CFG, 'XBMC', 'xbmc_host', '127.0.0.1:8080') - XBMC_USERNAME = check_setting_str(CFG, 'XBMC', 'xbmc_username', '') - XBMC_PASSWORD = check_setting_str(CFG, 'XBMC', 'xbmc_password', '') - diff --git a/packages/python/web/Sick-Beard/patches/Sick-Beard-0f076f4-005_setup_SABnzbd_host-0.1.patch b/packages/python/web/Sick-Beard/patches/Sick-Beard-0f076f4-005_setup_SABnzbd_host-0.1.patch deleted file mode 100644 index 45066a7cb7..0000000000 --- a/packages/python/web/Sick-Beard/patches/Sick-Beard-0f076f4-005_setup_SABnzbd_host-0.1.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur Sick-Beard-0f076f4/sickbeard/__init__.py Sick-Beard-0f076f4.patch/sickbeard/__init__.py ---- Sick-Beard-0f076f4/sickbeard/__init__.py 2011-04-16 22:38:48.449071968 +0200 -+++ Sick-Beard-0f076f4.patch/sickbeard/__init__.py 2011-04-16 22:52:23.704291427 +0200 -@@ -184,7 +184,7 @@ - SAB_PASSWORD = None - SAB_APIKEY = None - SAB_CATEGORY = None --SAB_HOST = '' -+SAB_HOST = '127.0.0.1:8081' - - NZBGET_PASSWORD = None - NZBGET_CATEGORY = None -@@ -522,7 +522,7 @@ - SAB_PASSWORD = check_setting_str(CFG, 'SABnzbd', 'sab_password', '') - SAB_APIKEY = check_setting_str(CFG, 'SABnzbd', 'sab_apikey', '') - SAB_CATEGORY = check_setting_str(CFG, 'SABnzbd', 'sab_category', 'tv') -- SAB_HOST = check_setting_str(CFG, 'SABnzbd', 'sab_host', '') -+ SAB_HOST = check_setting_str(CFG, 'SABnzbd', 'sab_host', '127.0.0.1:8081') - - NZBGET_PASSWORD = check_setting_str(CFG, 'NZBget', 'nzbget_password', 'tegbzn6789') - NZBGET_CATEGORY = check_setting_str(CFG, 'NZBget', 'nzbget_category', 'tv') diff --git a/scripts/create_addon b/scripts/create_addon index 617569e8bd..407cc7e1ff 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -22,6 +22,15 @@ . config/options $1 +IFS=" " +for i in $PKG_ADDON_REQUIRES; do + REQUIRES_ADDONNAME=`echo $i | cut -f1 -d ":"` + REQUIRES_ADDONVERSION=`echo $i | cut -f2 -d ":"` + REQUIRES="$REQUIRES\n " +done + +unset IFS + if [ -z "$1" ]; then echo "usage: $0 package_name" exit 1 @@ -46,8 +55,10 @@ if [ -f $PKG_DIR/addon ]; then mkdir -p $ADDON_BUILD/$PKG_ADDON_ID cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID $SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \ + -e "s|@PKG_NAME@|$PKG_NAME|g" \ -e "s|@ADDON_VERSION@|$OS_VERSION.$PKG_REV|g" \ -e "s|@PKG_ADDON_TYPE@|$PKG_ADDON_TYPE|g" \ + -e "s|@REQUIRES@|$REQUIRES|g" \ -e "s|@PKG_SHORTDESC@|$PKG_SHORTDESC|g" \ -e "s|@OS_VERSION@|$OS_VERSION|g" \ -e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \ diff --git a/tools/mkpkg/mkpkg_sickbeard b/tools/mkpkg/mkpkg_sickbeard index 7c9fcb7b78..e960023a74 100755 --- a/tools/mkpkg/mkpkg_sickbeard +++ b/tools/mkpkg/mkpkg_sickbeard @@ -20,25 +20,24 @@ ################################################################################ echo "getting sources..." - if [ ! -d sickbeard.git ]; then - git clone git://github.com/midgetspy/Sick-Beard.git sickbeard.git - GIT_REV=`git log -n1 --format=%h` - else - cd sickbeard.git - git pull - GIT_REV=`git log -n1 --format=%h` - cd .. + if [ ! -d SickBeard.git ]; then + git clone git://github.com/midgetspy/Sick-Beard.git SickBeard.git fi + cd SickBeard.git + git pull + GIT_REV=`git log -n1 --format=%h` + cd .. + echo "copying sources..." - rm -rf sickbeard-$GIT_REV - cp -R sickbeard.git sickbeard-$GIT_REV + rm -rf SickBeard-$GIT_REV + cp -R SickBeard.git SickBeard-$GIT_REV echo "cleaning sources..." - rm -rf sickbeard-$GIT_REV/.git + rm -rf SickBeard-$GIT_REV/.git echo "packing sources..." - tar cvjf sickbeard-$GIT_REV.tar.bz2 sickbeard-$GIT_REV + tar cvjf SickBeard-$GIT_REV.tar.bz2 SickBeard-$GIT_REV echo "remove temporary sourcedir..." - rm -rf sickbeard-$GIT_REV + rm -rf SickBeard-$GIT_REV