From ed1bb2ae770931475b6f0bcca4e1f9a66a3c6f6c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 14 Jun 2011 00:42:54 +0200 Subject: [PATCH] SABnzbd: move to '3rdparty' Signed-off-by: Stephan Raue --- .../download}/SABnzbd/meta | 5 +- ....6.4-001_remove_default_settings-0.3.patch | 0 .../service/downloadmanager/SABnzbd/addon | 37 ------ .../downloadmanager/SABnzbd/changelog.txt | 10 -- .../SABnzbd/config/settings.xml | 5 - .../downloadmanager/SABnzbd/icon/icon.png | Bin 2745 -> 0 bytes .../SABnzbd/source/bin/SABnzbd.service | 113 ----------------- .../SABnzbd/source/bin/ini_tool | 117 ------------------ .../downloadmanager/SABnzbd/source/default.py | 23 ---- .../resources/language/Dutch/strings.xml | 12 -- .../resources/language/English/strings.xml | 12 -- .../resources/language/French/strings.xml | 12 -- .../resources/language/German/strings.xml | 12 -- .../resources/language/Norwegian/strings.xml | 12 -- .../SABnzbd/source/resources/settings.xml | 15 --- 15 files changed, 2 insertions(+), 383 deletions(-) rename packages/{addons/service/downloadmanager => 3rdparty/download}/SABnzbd/meta (96%) rename packages/{addons/service/downloadmanager => 3rdparty/download}/SABnzbd/patches/SABnzbd-0.6.4-001_remove_default_settings-0.3.patch (100%) delete mode 100755 packages/addons/service/downloadmanager/SABnzbd/addon delete mode 100644 packages/addons/service/downloadmanager/SABnzbd/changelog.txt delete mode 100644 packages/addons/service/downloadmanager/SABnzbd/config/settings.xml delete mode 100644 packages/addons/service/downloadmanager/SABnzbd/icon/icon.png delete mode 100755 packages/addons/service/downloadmanager/SABnzbd/source/bin/SABnzbd.service delete mode 100755 packages/addons/service/downloadmanager/SABnzbd/source/bin/ini_tool delete mode 100644 packages/addons/service/downloadmanager/SABnzbd/source/default.py delete mode 100644 packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml delete mode 100644 packages/addons/service/downloadmanager/SABnzbd/source/resources/language/English/strings.xml delete mode 100644 packages/addons/service/downloadmanager/SABnzbd/source/resources/language/French/strings.xml delete mode 100644 packages/addons/service/downloadmanager/SABnzbd/source/resources/language/German/strings.xml delete mode 100644 packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml delete mode 100644 packages/addons/service/downloadmanager/SABnzbd/source/resources/settings.xml diff --git a/packages/addons/service/downloadmanager/SABnzbd/meta b/packages/3rdparty/download/SABnzbd/meta similarity index 96% rename from packages/addons/service/downloadmanager/SABnzbd/meta rename to packages/3rdparty/download/SABnzbd/meta index fd627494c2..a755d459a1 100644 --- a/packages/addons/service/downloadmanager/SABnzbd/meta +++ b/packages/3rdparty/download/SABnzbd/meta @@ -20,7 +20,7 @@ PKG_NAME="SABnzbd" PKG_VERSION="0.6.4" -PKG_REV="3" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://sabnzbd.org/" @@ -32,7 +32,6 @@ PKG_SECTION="service/downloadmanager" PKG_SHORTDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can." PKG_LONGDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add a .nzb file. SABnzbd+ takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction." -PKG_IS_ADDON="yes" -PKG_ADDON_TYPE="xbmc.service" +PKG_IS_ADDON="no" PKG_AUTORECONF="no" diff --git a/packages/addons/service/downloadmanager/SABnzbd/patches/SABnzbd-0.6.4-001_remove_default_settings-0.3.patch b/packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.4-001_remove_default_settings-0.3.patch similarity index 100% rename from packages/addons/service/downloadmanager/SABnzbd/patches/SABnzbd-0.6.4-001_remove_default_settings-0.3.patch rename to packages/3rdparty/download/SABnzbd/patches/SABnzbd-0.6.4-001_remove_default_settings-0.3.patch diff --git a/packages/addons/service/downloadmanager/SABnzbd/addon b/packages/addons/service/downloadmanager/SABnzbd/addon deleted file mode 100755 index 88dd090e00..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd/addon +++ /dev/null @@ -1,37 +0,0 @@ -#!/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 - cp -PR $PKG_DIR/config/settings.xml* $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml - -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/service/downloadmanager/SABnzbd/changelog.txt b/packages/addons/service/downloadmanager/SABnzbd/changelog.txt deleted file mode 100644 index 3f998a0303..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd/changelog.txt +++ /dev/null @@ -1,10 +0,0 @@ -0.99.3 -- update to SABnzbd-0.6.4 -- presetup script dir - -0.99.2 -- update to SABnzbd-0.6.1 -- rework addon - -0.99.1 -- initial version SABnzbd-0.6.0RC2 diff --git a/packages/addons/service/downloadmanager/SABnzbd/config/settings.xml b/packages/addons/service/downloadmanager/SABnzbd/config/settings.xml deleted file mode 100644 index 20c2a69b4e..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd/config/settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packages/addons/service/downloadmanager/SABnzbd/icon/icon.png b/packages/addons/service/downloadmanager/SABnzbd/icon/icon.png deleted file mode 100644 index 2c629000630096dd5d40024416156703104cb533..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2745 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 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/SABnzbd/source/default.py b/packages/addons/service/downloadmanager/SABnzbd/source/default.py deleted file mode 100644 index 726a943a06..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd/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("SABnzbd.service") diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml deleted file mode 100644 index 69ffefaeb3..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - SABnzbd - Gebruikers instellingen - Gebruikersnaam - Wachtwoord - Netwerk instellingen - Toegestane IP adressen - - diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/English/strings.xml b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/English/strings.xml deleted file mode 100644 index 68cb162a30..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/English/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - SABnzbd - User Settings - Username - Password - Network Settings - Allowed IP addresses - - diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/French/strings.xml b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/French/strings.xml deleted file mode 100644 index fb3f0fc1f9..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/French/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - SABnzbd - Préférences utilisateur - Nom d'utilisateur - Mot de passe - Préférences réseau - Adresses IP autorisées - - diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/German/strings.xml b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/German/strings.xml deleted file mode 100644 index ad209d26c7..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/German/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - SABnzbd - Benutzer Einstellungen - Benutzername - Passwort - Netzwerk Einstellungen - Erlaubte IP Adressen - - diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml deleted file mode 100644 index a70961eb4c..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - SABnzbd - Bruker Instillinger - Brukernavn - Passord - Nettverksinstillinger - Tilatte IP addresser - - diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/resources/settings.xml b/packages/addons/service/downloadmanager/SABnzbd/source/resources/settings.xml deleted file mode 100644 index 8ee2bb0ab2..0000000000 --- a/packages/addons/service/downloadmanager/SABnzbd/source/resources/settings.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - -