From 0ea96108c53481c8626c85e390569b40a79fbf7e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 20 Apr 2011 15:14:38 +0200 Subject: [PATCH] SABnzbd: inital convert to addon, needs some more work Signed-off-by: Stephan Raue --- packages/addons/downloadmanager/SABnzbd/addon | 36 ++++++++++ .../downloadmanager/SABnzbd/changelog.txt | 2 + .../downloadmanager/SABnzbd/icon/icon.png | Bin 0 -> 2745 bytes .../downloadmanager/SABnzbd/init.d/57_SABnzbd | 0 .../{ => addons}/downloadmanager/SABnzbd/meta | 8 ++- .../SABnzbd-0.6.0RC2-001_defaults-0.1.patch | 0 ....6.0RC2-002-remove_host_settings-0.1.patch | 0 .../SABnzbd/source/default.py} | 14 ++-- .../resources/language/Dutch/strings.xml | 13 ++++ .../resources/language/English/strings.xml | 13 ++++ .../resources/language/French/strings.xml | 13 ++++ .../resources/language/German/strings.xml | 13 ++++ .../resources/language/Norwegian/strings.xml | 13 ++++ .../SABnzbd/source/resources/settings.xml | 16 +++++ .../downloadmanager/SABnzbd/source/start.sh | 65 ++++++++++++++++++ .../SABnzbd/config/sabnzbd-http.service | 10 --- .../SABnzbd/config/sabnzbd-https.service | 10 --- projects/ATV/options | 3 - projects/Generic/options | 3 - projects/ION/options | 3 - projects/Intel/options | 3 - scripts/image | 4 -- 22 files changed, 194 insertions(+), 48 deletions(-) create mode 100755 packages/addons/downloadmanager/SABnzbd/addon create mode 100644 packages/addons/downloadmanager/SABnzbd/changelog.txt create mode 100644 packages/addons/downloadmanager/SABnzbd/icon/icon.png rename packages/{ => addons}/downloadmanager/SABnzbd/init.d/57_SABnzbd (100%) rename packages/{ => addons}/downloadmanager/SABnzbd/meta (91%) rename packages/{ => addons}/downloadmanager/SABnzbd/patches/SABnzbd-0.6.0RC2-001_defaults-0.1.patch (100%) rename packages/{ => addons}/downloadmanager/SABnzbd/patches/SABnzbd-0.6.0RC2-002-remove_host_settings-0.1.patch (100%) rename packages/{downloadmanager/SABnzbd/install => addons/downloadmanager/SABnzbd/source/default.py} (78%) mode change 100755 => 100644 create mode 100644 packages/addons/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml create mode 100644 packages/addons/downloadmanager/SABnzbd/source/resources/language/English/strings.xml create mode 100644 packages/addons/downloadmanager/SABnzbd/source/resources/language/French/strings.xml create mode 100644 packages/addons/downloadmanager/SABnzbd/source/resources/language/German/strings.xml create mode 100644 packages/addons/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml create mode 100644 packages/addons/downloadmanager/SABnzbd/source/resources/settings.xml create mode 100755 packages/addons/downloadmanager/SABnzbd/source/start.sh delete mode 100644 packages/downloadmanager/SABnzbd/config/sabnzbd-http.service delete mode 100644 packages/downloadmanager/SABnzbd/config/sabnzbd-https.service diff --git a/packages/addons/downloadmanager/SABnzbd/addon b/packages/addons/downloadmanager/SABnzbd/addon new file mode 100755 index 0000000000..e66733427a --- /dev/null +++ b/packages/addons/downloadmanager/SABnzbd/addon @@ -0,0 +1,36 @@ +#!/bin/sh + +################################################################################ +# 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 +################################################################################ + +. config/options $1 + +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/$1 + cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/$1 + +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin + cp $BUILD/par2cmdline*/par2 $ADDON_BUILD/$PKG_ADDON_ID/bin + cp $BUILD/unrar/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin + cp $BUILD/unzip*/unzip $ADDON_BUILD/$PKG_ADDON_ID/bin + +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib + cp -R $BUILD/Cheetah*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib + cp -R $BUILD/pyOpenSSL*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib + cp -R $BUILD/yenc*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib diff --git a/packages/addons/downloadmanager/SABnzbd/changelog.txt b/packages/addons/downloadmanager/SABnzbd/changelog.txt new file mode 100644 index 0000000000..86e63d6a63 --- /dev/null +++ b/packages/addons/downloadmanager/SABnzbd/changelog.txt @@ -0,0 +1,2 @@ +0.99.1 +- initial version SABnzbd-0.6.0RC2 \ No newline at end of file diff --git a/packages/addons/downloadmanager/SABnzbd/icon/icon.png b/packages/addons/downloadmanager/SABnzbd/icon/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2c629000630096dd5d40024416156703104cb533 GIT binary patch literal 2745 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 + + + + SABnzbd + Gebruikers instellingen + Gebruik verificatie + Gebruikersnaam + Wachtwoord + Netwerk instellingen + Toegestane IP adressen + + diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/language/English/strings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/language/English/strings.xml new file mode 100644 index 0000000000..af7ad16aff --- /dev/null +++ b/packages/addons/downloadmanager/SABnzbd/source/resources/language/English/strings.xml @@ -0,0 +1,13 @@ + + + + + SABnzbd + User Settings + Use authentification + Username + Password + Network Settings + Allowed IP addresses + + diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/language/French/strings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/language/French/strings.xml new file mode 100644 index 0000000000..8f43dc8e2d --- /dev/null +++ b/packages/addons/downloadmanager/SABnzbd/source/resources/language/French/strings.xml @@ -0,0 +1,13 @@ + + + + + SABnzbd + Préférences utilisateur + Utiliser une authentification + Nom d'utilisateur + Mot de passe + Préférences réseau + Adresses IP autorisées + + diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/language/German/strings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/language/German/strings.xml new file mode 100644 index 0000000000..99cf2a8618 --- /dev/null +++ b/packages/addons/downloadmanager/SABnzbd/source/resources/language/German/strings.xml @@ -0,0 +1,13 @@ + + + + + SABnzbd + Benutzer Einstellungen + Authentifizierung verwenden + Benutzername + Passwort + Netzwerk Einstellungen + Erlaubte IP Adressen + + diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml new file mode 100644 index 0000000000..390240a437 --- /dev/null +++ b/packages/addons/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml @@ -0,0 +1,13 @@ + + + + + SABnzbd + Bruker Instillinger + Bruk inlogging + Brukernavn + Passord + Nettverksinstillinger + Tilatte IP addresser + + diff --git a/packages/addons/downloadmanager/SABnzbd/source/resources/settings.xml b/packages/addons/downloadmanager/SABnzbd/source/resources/settings.xml new file mode 100644 index 0000000000..a9e6b7f346 --- /dev/null +++ b/packages/addons/downloadmanager/SABnzbd/source/resources/settings.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/packages/addons/downloadmanager/SABnzbd/source/start.sh b/packages/addons/downloadmanager/SABnzbd/source/start.sh new file mode 100755 index 0000000000..381c4a913d --- /dev/null +++ b/packages/addons/downloadmanager/SABnzbd/source/start.sh @@ -0,0 +1,65 @@ +#!/bin/sh + +################################################################################ +# 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 +################################################################################ + +export PATH="$PATH:./bin" +export PYTHONPATH="$PYTHONPATH:./pylib" + +SABNZBD_HOME="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.SABnzbd" +SABNZBD_SETTINGS="$SABNZBD_HOME/settings.xml" + +mkdir -p $SABNZBD_HOME + +# if [ ! -f "$SABNZBD_SETTINGS" ]; then +# cp settings.xml $SABNZBD_SETTINGS +# fi + +mkdir -p /storage/downloads +mkdir -p /storage/downloads/incoming +mkdir -p /storage/downloads/watch + +# TRANSMISSION_START=`grep TRANSMISSION_START $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +# TRANSMISSION_AUTH=`grep TRANSMISSION_AUTH $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +# TRANSMISSION_USER=`grep TRANSMISSION_USER $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +# TRANSMISSION_PWD=`grep TRANSMISSION_PWD $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +# TRANSMISSION_IP=`grep TRANSMISSION_IP $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + +# if [ -z "$TRANSMISSION_IP" ]; then +# TRANSMISSION_IP="*.*.*.*" +# fi + +# TRANSMISSION_ARG="$TRANSMISSION_ARG -w /storage/downloads" +# TRANSMISSION_ARG="$TRANSMISSION_ARG --incomplete-dir /storage/downloads/incoming" +# TRANSMISSION_ARG="$TRANSMISSION_ARG --watch-dir /storage/downloads/watch" +# TRANSMISSION_ARG="$TRANSMISSION_ARG -e /var/log/transmission.log" +# TRANSMISSION_ARG="$TRANSMISSION_ARG -g /storage/.cache/transmission" +# TRANSMISSION_ARG="$TRANSMISSION_ARG -a $TRANSMISSION_IP" + +# if [ "$TRANSMISSION_AUTH" = "true" ]; then +# TRANSMISSION_ARG="$TRANSMISSION_ARG -t" +# TRANSMISSION_ARG="$TRANSMISSION_ARG -u $TRANSMISSION_USER" +# TRANSMISSION_ARG="$TRANSMISSION_ARG -v $TRANSMISSION_PWD" +# else +# TRANSMISSION_ARG="$TRANSMISSION_ARG -T" +# fi + +chmod +x ./bin/* +python ./SABnzbd/SABnzbd.py -d -f $SABNZBD_HOME/sabnzbd.conf -l 0 > /dev/null 2>&1 diff --git a/packages/downloadmanager/SABnzbd/config/sabnzbd-http.service b/packages/downloadmanager/SABnzbd/config/sabnzbd-http.service deleted file mode 100644 index c2f0b6b646..0000000000 --- a/packages/downloadmanager/SABnzbd/config/sabnzbd-http.service +++ /dev/null @@ -1,10 +0,0 @@ - - - - SABnzbd Server on %h - - _http._tcp - 8081 - path=/index.html - - diff --git a/packages/downloadmanager/SABnzbd/config/sabnzbd-https.service b/packages/downloadmanager/SABnzbd/config/sabnzbd-https.service deleted file mode 100644 index 97fae992f0..0000000000 --- a/packages/downloadmanager/SABnzbd/config/sabnzbd-https.service +++ /dev/null @@ -1,10 +0,0 @@ - - - - SABnzbd Server on %h (secured) - - _http._tcp - 8082 - path=/index.html - - diff --git a/projects/ATV/options b/projects/ATV/options index d9f43c0706..bdac4c2f3f 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -141,9 +141,6 @@ # build and install Samba Server (yes / no) SAMBA_SERVER="yes" -# build and install SABnzbd Newsgroup downloader daemon (yes / no) - SABNZBD="no" - # build and install some tools for including in release (yes / no) # some of this tools are: htop, nano, wgetpaste TOOLS="yes" diff --git a/projects/Generic/options b/projects/Generic/options index 1d545db33c..65d3cd34c0 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -141,9 +141,6 @@ # build and install Samba Server (yes / no) SAMBA_SERVER="yes" -# build and install SABnzbd Newsgroup downloader daemon (yes / no) - SABNZBD="yes" - # build and install some tools for including in release (yes / no) # some of this tools are: htop, nano, wgetpaste TOOLS="yes" diff --git a/projects/ION/options b/projects/ION/options index 8aa49adb2e..cc351095ce 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -141,9 +141,6 @@ # build and install Samba Server (yes / no) SAMBA_SERVER="yes" -# build and install SABnzbd Newsgroup downloader daemon (yes / no) - SABNZBD="yes" - # build and install some tools for including in release (yes / no) # some of this tools are: htop, nano, wgetpaste TOOLS="yes" diff --git a/projects/Intel/options b/projects/Intel/options index b87f8f8ebe..6c3b551734 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -141,9 +141,6 @@ # build and install Samba Server (yes / no) SAMBA_SERVER="yes" -# build and install SABnzbd Newsgroup downloader daemon (yes / no) - SABNZBD="yes" - # build and install some tools for including in release (yes / no) # some of this tools are: htop, nano, wgetpaste TOOLS="yes" diff --git a/scripts/image b/scripts/image index 3e5cf4e7b8..1695a26624 100755 --- a/scripts/image +++ b/scripts/image @@ -95,10 +95,6 @@ mkdir -p $INSTALL # Network support [ "$NETWORK" = "yes" ] && $SCRIPTS/install network -# SABnzbd support - [ "$SABNZBD" = "yes" ] && $SCRIPTS/install SABnzbd - [ "$SABNZBD" = "yes" ] && $SCRIPTS/install Sick-Beard - # Graphic support [ ! "$DISPLAYSERVER" = "no" ] && $SCRIPTS/install $DISPLAYSERVER