From a6964046eeff3949fa6a1a5902b994247b3760b9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 8 Jun 2011 20:59:04 +0200 Subject: [PATCH 01/13] inputproto: update to inputproto-2.0.2 Signed-off-by: Stephan Raue --- packages/x11/proto/inputproto/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/proto/inputproto/meta b/packages/x11/proto/inputproto/meta index 9aa25ce212..9e34f71c45 100644 --- a/packages/x11/proto/inputproto/meta +++ b/packages/x11/proto/inputproto/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="inputproto" -PKG_VERSION="2.0.1" +PKG_VERSION="2.0.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From 3a3c8685173571919d5f72323745abe51348f329 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 8 Jun 2011 20:59:53 +0200 Subject: [PATCH 02/13] libXi: update to libXi-1.4.3 Signed-off-by: Stephan Raue --- packages/x11/lib/libXi/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/lib/libXi/meta b/packages/x11/lib/libXi/meta index 3d9e780cd0..50afb775b5 100644 --- a/packages/x11/lib/libXi/meta +++ b/packages/x11/lib/libXi/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libXi" -PKG_VERSION="1.4.2" +PKG_VERSION="1.4.3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" From b322425c6f272f3e2bdf2c6ff064cbf5178f0da6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 9 Jun 2011 17:16:07 +0200 Subject: [PATCH 03/13] Revert "Cheetah: convert to python egg package" This reverts commit 42ac97e3bcda0ca777ddfc6d0e9c8e456d0fb15f. --- packages/python/devel/Cheetah/build | 8 +++++++- packages/python/devel/Cheetah/install | 7 +------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/python/devel/Cheetah/build b/packages/python/devel/Cheetah/build index 3a7c2afbd8..3d37a7f15b 100755 --- a/packages/python/devel/Cheetah/build +++ b/packages/python/devel/Cheetah/build @@ -27,4 +27,10 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" cd $PKG_BUILD -python setup.py build --cross-compile bdist_egg --exclude-source-files +python setup.py build --cross-compile +python setup.py install -O1 --skip-build --prefix /usr --root .install + +find .install -name "*.py" -exec rm -rf "{}" ";" +find .install -name "*.pyo" -exec rm -rf "{}" ";" + +rm -rf .install/usr/bin diff --git a/packages/python/devel/Cheetah/install b/packages/python/devel/Cheetah/install index d2be73015e..a9c8b9924b 100755 --- a/packages/python/devel/Cheetah/install +++ b/packages/python/devel/Cheetah/install @@ -22,9 +22,4 @@ . config/options $1 -PKG_SRC_DIR=`ls -d $PKG_BUILD` - -PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`" -export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages" - -$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg +cp -PR $PKG_BUILD/.install/* $INSTALL From 99a1e3cfa0908901788800662d9510359285ea76 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 9 Jun 2011 17:17:57 +0200 Subject: [PATCH 04/13] Revert "pyOpenSSL: convert to python egg package" This reverts commit 03b402e7c19588c7024bfac14b05a09908403777. --- packages/python/security/pyOpenSSL/build | 8 +++++++- packages/python/security/pyOpenSSL/install | 7 +------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/python/security/pyOpenSSL/build b/packages/python/security/pyOpenSSL/build index 3a7c2afbd8..3d37a7f15b 100755 --- a/packages/python/security/pyOpenSSL/build +++ b/packages/python/security/pyOpenSSL/build @@ -27,4 +27,10 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" cd $PKG_BUILD -python setup.py build --cross-compile bdist_egg --exclude-source-files +python setup.py build --cross-compile +python setup.py install -O1 --skip-build --prefix /usr --root .install + +find .install -name "*.py" -exec rm -rf "{}" ";" +find .install -name "*.pyo" -exec rm -rf "{}" ";" + +rm -rf .install/usr/bin diff --git a/packages/python/security/pyOpenSSL/install b/packages/python/security/pyOpenSSL/install index d2be73015e..a9c8b9924b 100755 --- a/packages/python/security/pyOpenSSL/install +++ b/packages/python/security/pyOpenSSL/install @@ -22,9 +22,4 @@ . config/options $1 -PKG_SRC_DIR=`ls -d $PKG_BUILD` - -PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`" -export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages" - -$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg +cp -PR $PKG_BUILD/.install/* $INSTALL From 12eb537e2b427d33bd0d834434f6b818e4116de4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 9 Jun 2011 17:18:40 +0200 Subject: [PATCH 05/13] Revert "yenc: convert to python egg package" This reverts commit 4a6bdd47b826ab07cf717fb0439883551f3bceb6. --- packages/python/system/yenc/build | 8 +++++++- packages/python/system/yenc/install | 7 +------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/python/system/yenc/build b/packages/python/system/yenc/build index 3a7c2afbd8..3d37a7f15b 100755 --- a/packages/python/system/yenc/build +++ b/packages/python/system/yenc/build @@ -27,4 +27,10 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" cd $PKG_BUILD -python setup.py build --cross-compile bdist_egg --exclude-source-files +python setup.py build --cross-compile +python setup.py install -O1 --skip-build --prefix /usr --root .install + +find .install -name "*.py" -exec rm -rf "{}" ";" +find .install -name "*.pyo" -exec rm -rf "{}" ";" + +rm -rf .install/usr/bin diff --git a/packages/python/system/yenc/install b/packages/python/system/yenc/install index d2be73015e..a9c8b9924b 100755 --- a/packages/python/system/yenc/install +++ b/packages/python/system/yenc/install @@ -22,9 +22,4 @@ . config/options $1 -PKG_SRC_DIR=`ls -d $PKG_BUILD` - -PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`" -export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages" - -$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg +cp -PR $PKG_BUILD/.install/* $INSTALL From bf6353a02aad7cf953aab9bb121a42b2b6906414 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 9 Jun 2011 17:44:46 +0200 Subject: [PATCH 06/13] SABnzbd: readd as completly reworked addon Signed-off-by: Stephan Raue --- .../service/downloadmanager/SABnzbd/addon | 37 +++ .../downloadmanager/SABnzbd/changelog.txt | 6 + .../SABnzbd/config/settings.xml | 5 + .../downloadmanager/SABnzbd/icon/icon.png | Bin 0 -> 2745 bytes .../service/downloadmanager/SABnzbd/meta | 38 ++++ ....6.1-001_remove_default_settings-0.2.patch | 214 ++++++++++++++++++ .../SABnzbd/source/bin/SABnzbd.service | 110 +++++++++ .../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, 625 insertions(+) create mode 100755 packages/addons/service/downloadmanager/SABnzbd/addon create mode 100644 packages/addons/service/downloadmanager/SABnzbd/changelog.txt create mode 100644 packages/addons/service/downloadmanager/SABnzbd/config/settings.xml create mode 100644 packages/addons/service/downloadmanager/SABnzbd/icon/icon.png create mode 100644 packages/addons/service/downloadmanager/SABnzbd/meta create mode 100644 packages/addons/service/downloadmanager/SABnzbd/patches/SABnzbd-0.6.1-001_remove_default_settings-0.2.patch create mode 100755 packages/addons/service/downloadmanager/SABnzbd/source/bin/SABnzbd.service create mode 100755 packages/addons/service/downloadmanager/SABnzbd/source/bin/ini_tool create mode 100644 packages/addons/service/downloadmanager/SABnzbd/source/default.py create mode 100644 packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml create mode 100644 packages/addons/service/downloadmanager/SABnzbd/source/resources/language/English/strings.xml create mode 100644 packages/addons/service/downloadmanager/SABnzbd/source/resources/language/French/strings.xml create mode 100644 packages/addons/service/downloadmanager/SABnzbd/source/resources/language/German/strings.xml create mode 100644 packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml create mode 100644 packages/addons/service/downloadmanager/SABnzbd/source/resources/settings.xml diff --git a/packages/addons/service/downloadmanager/SABnzbd/addon b/packages/addons/service/downloadmanager/SABnzbd/addon new file mode 100755 index 0000000000..88dd090e00 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/addon @@ -0,0 +1,37 @@ +#!/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 new file mode 100644 index 0000000000..2703b7f6db --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/changelog.txt @@ -0,0 +1,6 @@ +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 new file mode 100644 index 0000000000..20c2a69b4e --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/config/settings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/packages/addons/service/downloadmanager/SABnzbd/icon/icon.png b/packages/addons/service/downloadmanager/SABnzbd/icon/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2c629000630096dd5d40024416156703104cb533 GIT binary patch literal 2745 zcmV;q3P$ybP)DJc|$6172y3h}@LQW0ell@J0d!2_Z!l?q5i z;sGQUi3cPk9zX>_1eMC7QfQM3(uFK_Xxx_AHO}VRj$=FCJ)XG>-+z{wJ2x|q?~G^C zVjt=Fc+S1|od5s+|NPs%z-HTQn{6XEr=Ex3^LD(S!$;Wnhd>9%uo*-LAw~)XJU?<3 zkIyb+f>VX20&rk2wvdRQIu1U=pQ*4ZY{v*EVh})VyHRZ~zY62A2%~ zmIT}%aJ!Vto@y@hVW60YDgymSo-wJ@D{^AI29#`lZVd%J;m?E-f9 zYUpLI(aIo9Ut0wFhJlM$fvkg`?Y;Q=zzELs@>%w!h5|sze^SQw7T^;Hfd_u{O|J3? zXJ#XJ`3;1ijeQcsKYJ%0{xvW%4fJ&24o)6mA7Nic0y!iC;LtmerrPiIx%{>+GXEi2 z;RlBK?gla)Z+Bq#gWtyXC%=cW8Fh{`?HSy;RKP!Yah%<22mstkPP>QzEgAlC?S;#U zm#VKVs=rxM;~E+`iUhh1A&mhbmxn{f9mg0yt!Scg3r%ERu?ys<)b@@OomBj|Nmfb( zfNUm4NVaf`mVc6cruhJP8g#eZk0thM$pL^Ce7cD9EXoaFGaAv)PnU7*)ELqw0zh~c z#Kq;MiW}Yx4Ilu8c}?zeZ3Eom5vVJhOAJ5+@sw3PpQ>1B@)2;v z1}qh6vbL$=0Jta_o1zyG<_n8W1|Un|eSIXI`m~@XHz;->Ek{6hUYTs31_r)Ha9xgb|6#gw5z`ld7n%DNf)X80 zjUXfgz%>TYiP(TVQ*eJBkATlGK1H%zrW~zXncTh(oI8WTLEzL7@H(-c&uLGj7;k1A z022xa>}k89cz~64I091T5HY4ZH1ksfSR&KMDfFQUraw7z8yRoU>M`%t&Uj4#xCQ`4 zr+qRvS+vMCa;}k0lPj0!`sx_Q&yC>(r9D9hhpAM2@|g^sY=h(f`+9{8+&!u9lvDlL-QwX(&46g0ZXg&j7>ZX zUV`j9il*6pA;9c~0B0{UrZic#NZSiEu9i6|``Xw`x@)3Q6`X~&JA#_x067LlFW@0L z0J7@}AEPDjzf9p9#yeZJdJFT8xzDLmU6ZPm&>>_5b*Mm1^#B=5fe_YSjCRevjGl)^ zm`6%98yZy)HS=*^WcjqQ_{BnBXrj@ScFR(rX^IV?w)^6aQ*KNHZUlfOjz;auIE~x9 zX1J9$FYxvMR?_jMLQADr0w7H38;eFTRlGHEQMw`kpZy?A-KV@Q<&ou?E0x3whB+72 z520{Gb)ToFoSf5Eye*?gF>a#1Q8llq@u6l~G$C}g3-k^1Ha#a@>V$4-L+ZYRsPv{H z_~o(d0V)IFbN8Zy()bShA-b8iIHK7!LlhS~Md;a#mWsDzv_XE`@Yu?O0Ogix=T`KK zjMl6k#j;zK^{je_=6Um|E%1egc_m)goOz=rDk^pKi8yq-dQG=4o5CW2jVqGuR`~ec zIQ_x^emF9TQ7x7j0A%_rMD<~{=qk!&qcCCG^|Um@NT4E842&^T%s9G&Yo)8+=y)19 z$F5}zo;;t9fFbHF+_)y}4b5EW7nxU$2DFDmPn6?$BMtA{y93<>;4pvE?;u|W02lm} zxH=(LBW=mtJ3mBWAS0 zlNF%ME#!=*5;IQi5;g^ZGGno4J9;}?@BulquhLE3MgV$tkU$}d)*mgVw;HId@rxS5 zNRJjPY&ktzRFR|P8Y!zh!!0-EmT@O4MyGTQwj36z3Aj$_UYVDCVKG+%yJ1_|8ej<2#vt-?BZjxl@JV=zQ#+qNO(TsuYy? z16A9RhxGkR! ziucmswVYwd>JrI4d!SDcDyw|a4Z4wgif=BA%Eqd=p^?5-X)95AbpO||YWoA(_}IbH zGodlMQ;S;ive$9}D^K*{^!af-%Uk}*eu90}h@@g5B;n2Ing8M!RH2D`_Tg|>3*P!C zD$NWR{`7sk+K$pkDKP_BJgYYBwFb>{?P~*87OJEpiX>J&mR|+I^=jvu7XlKJ`>uAK zLXt$8^M?89Ma=)@6izVLILS)_z`vma@zV0u;y1bB3RUK@zxLtFTxdv&5YL?he*PQi zH(_0E+5@BwGij7wO}eqU6iPo6-Se03PU!;U2BtmR@QCqo(Xu4MbEEEYop~ zFuz?>UvP{jh#Du!@9FmoG}3*i264_KwrzL~*zf=( zJ_1RNPd!Gk8EsPoR=fB{H(=}0HoOLGcmNs}2{wA&^`dRVYe2Ou>HjSms> + + +-
+-
+-

$T('systemFolders')

+-

$T('base-folder'):
$my_lcldata

+-
+-
+-
+- +- +- +-
+-
+- +- +-
+-
+- +- +-
+-
+-
+- +
+
+

 

+diff -Naur SABnzbd-0.6.1/interfaces/Plush/templates/config_general.tmpl SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_general.tmpl +--- SABnzbd-0.6.1/interfaces/Plush/templates/config_general.tmpl 2011-05-15 10:44:29.000000000 +0200 ++++ SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_general.tmpl 2011-05-23 20:09:03.985485852 +0200 +@@ -14,82 +14,6 @@ +
+
+
+- +- +-
+-
+- +- +-
+-
+- +- +-
+-
+- +- +-
+-
+- +- +-
+-
+- +- +-
+-
+ +-
+
+
+ +@@ -152,36 +69,6 @@ + $T('explain-enable_https') + + +-
+- +- +-
+-
+- +- +-
+-
+- +- +-
+ + + +diff -Naur SABnzbd-0.6.1/interfaces/Plush/templates/config_switches.tmpl SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_switches.tmpl +--- SABnzbd-0.6.1/interfaces/Plush/templates/config_switches.tmpl 2011-05-15 10:44:29.000000000 +0200 ++++ SABnzbd-0.6.1.patch/interfaces/Plush/templates/config_switches.tmpl 2011-05-23 20:09:53.829117059 +0200 +@@ -12,20 +12,6 @@ +

$T('swtag-general')

+ +
+-
+- 0 then "checked=1" else ""#--> /> +- +-
+-
+- 0 then "checked=1" else ""#--> /> +- +-
+ +
+ 0 then "checked=1" else ""#--> /> diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/bin/SABnzbd.service b/packages/addons/service/downloadmanager/SABnzbd/source/bin/SABnzbd.service new file mode 100755 index 0000000000..1771ab5730 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/bin/SABnzbd.service @@ -0,0 +1,110 @@ +#!/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 +################################################################################ + +ADDON_DIR="$HOME/.xbmc/addons/service.downloadmanager.SABnzbd" +ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.downloadmanager.SABnzbd" +LOG_FILE="$ADDON_HOME/service.log" +SABNZBD_SETTINGS="$ADDON_HOME/settings.xml" + +export PYTHONPATH="$PYTHONPATH:$ADDON_DIR/pylib" + +SABNZBD_DISABLEAPIKEY="0" +SABNZBD_CHECKRELEASE="0" +SABNZBD_LAUNCHBROWSER="0" + +SABNZBD_HTTPPORT="8081" +SABNZBD_HTTPSPORT="9081" +SABNZBD_HTTPSCERT="server.cert" +SABNZBD_HTTPSKEY="server.key" + +SABNZBD_SKIN="Plush" +SABNZBD_SKIN2="Plush" +SABNZBD_WEBCOLOR="gold" +SABNZBD_WEBCOLOR2="gold" + +SABNZBD_LOGDIR="logs" +SABNZBD_ADMINDIR="admin" +SABNZBD_BACKUPDIR="backup" + +SABNZBD_INCOMPLETEDIR="/storage/downloads/incomplete" +SABNZBD_COMPLETEDIR="/storage/downloads" +SABNZBD_WATCHDIR="/storage/downloads/watch" + +write_ini() { +python $ADDON_DIR/bin/ini_tool --action=write \ + --file=$ADDON_HOME/sabnzbd.ini \ + --option="$1:$2" \ + --value="$3" +} + +mkdir -p $ADDON_HOME + +if [ ! -f "$SABNZBD_SETTINGS" ]; then + cp $ADDON_DIR/settings-default.xml $SABNZBD_SETTINGS +fi + +if [ ! -f "$ADDON_HOME/sabnzbd.ini" ]; then + SABNZBD_FIRSTRUN="yes" +fi + +# use settings from xbmc setup dialog +SABNZBD_USER=`grep SABNZBD_USER $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +SABNZBD_PWD=`grep SABNZBD_PWD $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +SABNZBD_IP=`grep SABNZBD_IP $SABNZBD_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + +if [ -z "$SABNZBD_IP" ]; then + SABNZBD_IP="0.0.0.0" +fi + +write_ini misc disable_api_key $SABNZBD_DISABLEAPIKEY +write_ini misc check_new_rel $SABNZBD_CHECKRELEASE +write_ini misc auto_browser $SABNZBD_LAUNCHBROWSER +write_ini misc username $SABNZBD_USER +write_ini misc password $SABNZBD_PWD +write_ini misc port $SABNZBD_HTTPPORT +write_ini misc https_port $SABNZBD_HTTPSPORT +write_ini misc https_cert $SABNZBD_HTTPSCERT +write_ini misc https_key $SABNZBD_HTTPSKEY +write_ini misc host $SABNZBD_IP +write_ini misc web_dir $SABNZBD_SKIN +write_ini misc web_dir2 $SABNZBD_SKIN2 +write_ini misc web_color $SABNZBD_WEBCOLOR +write_ini misc web_color2 $SABNZBD_WEBCOLOR2 +write_ini misc log_dir $SABNZBD_LOGDIR +write_ini misc admin_dir $SABNZBD_ADMINDIR +write_ini misc nzb_backup_dir $SABNZBD_BACKUPDIR + +if [ "$SABNZBD_FIRSTRUN" = "yes" ]; then + mkdir -p "$SABNZBD_INCOMPLETEDIR" + mkdir -p "$SABNZBD_COMPLETEDIR" + mkdir -p "$SABNZBD_WATCHDIR" + write_ini misc download_dir $SABNZBD_INCOMPLETEDIR + write_ini misc complete_dir $SABNZBD_COMPLETEDIR + write_ini misc dirscan_dir $SABNZBD_WATCHDIR + + write_ini servers:localhost name "localhost" + write_ini servers:localhost host "localhost" + write_ini servers:localhost port "119" + write_ini servers:localhost enable "0" +fi + +python $ADDON_DIR/SABnzbd/SABnzbd.py -d -f $ADDON_HOME/sabnzbd.ini -l 0 diff --git a/packages/addons/service/downloadmanager/SABnzbd/source/bin/ini_tool b/packages/addons/service/downloadmanager/SABnzbd/source/bin/ini_tool new file mode 100755 index 0000000000..97f7b4c433 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/bin/ini_tool @@ -0,0 +1,117 @@ +#!/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/SABnzbd/source/default.py b/packages/addons/service/downloadmanager/SABnzbd/source/default.py new file mode 100644 index 0000000000..726a943a06 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/default.py @@ -0,0 +1,23 @@ +################################################################################ +# 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 new file mode 100644 index 0000000000..69ffefaeb3 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Dutch/strings.xml @@ -0,0 +1,12 @@ + + + + + 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 new file mode 100644 index 0000000000..68cb162a30 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/English/strings.xml @@ -0,0 +1,12 @@ + + + + + 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 new file mode 100644 index 0000000000..fb3f0fc1f9 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/French/strings.xml @@ -0,0 +1,12 @@ + + + + + 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 new file mode 100644 index 0000000000..ad209d26c7 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/German/strings.xml @@ -0,0 +1,12 @@ + + + + + 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 new file mode 100644 index 0000000000..a70961eb4c --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/resources/language/Norwegian/strings.xml @@ -0,0 +1,12 @@ + + + + + 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 new file mode 100644 index 0000000000..8ee2bb0ab2 --- /dev/null +++ b/packages/addons/service/downloadmanager/SABnzbd/source/resources/settings.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + From c5263747a8871a480b0aa291f0d7ba0b0bcfda20 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 10 Jun 2011 00:51:06 +0200 Subject: [PATCH 07/13] projects/*/linux: add USBNET, AX8817X and DM9601 support Signed-off-by: Stephan Raue --- projects/ATV/linux/linux.i386.conf | 21 +++++++++++++++++++-- projects/Fusion/linux/linux.i386.conf | 21 +++++++++++++++++++-- projects/Generic/linux/linux.i386.conf | 21 +++++++++++++++++++-- projects/ION/linux/linux.i386.conf | 21 +++++++++++++++++++-- projects/ION/linux/linux.x86_64.conf | 21 +++++++++++++++++++-- projects/Intel/linux/linux.i386.conf | 21 +++++++++++++++++++-- projects/Intel/linux/linux.x86_64.conf | 21 +++++++++++++++++++-- 7 files changed, 133 insertions(+), 14 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 350aa75760..3661a5c1c5 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39 Kernel Configuration +# Linux/i386 2.6.39.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1022,9 +1022,26 @@ CONFIG_ZD1211RW=m # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_DM9601=m +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_HSO is not set +# CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set # CONFIG_WAN is not set # diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 896bae98a4..c2f51c4caa 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39 Kernel Configuration +# Linux/i386 2.6.39.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1047,9 +1047,26 @@ CONFIG_ZD1211RW=m # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_DM9601=m +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_HSO is not set +# CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set # CONFIG_WAN is not set # diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index cecef92bfd..af472a4612 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39 Kernel Configuration +# Linux/i386 2.6.39.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1184,9 +1184,26 @@ CONFIG_ZD1211RW=m # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_DM9601=m +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_HSO is not set +# CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set # CONFIG_WAN is not set # diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index b7beede110..3f3cd3c6c0 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39 Kernel Configuration +# Linux/i386 2.6.39.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1088,9 +1088,26 @@ CONFIG_ZD1211RW=m # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_DM9601=m +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_HSO is not set +# CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set # CONFIG_WAN is not set # diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index d9eac4444f..a5d1da5b61 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.39 Kernel Configuration +# Linux/x86_64 2.6.39.1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1037,9 +1037,26 @@ CONFIG_ZD1211RW=m # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_DM9601=m +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_HSO is not set +# CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set # CONFIG_WAN is not set # diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 4e217bbe47..82d0d4d710 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39 Kernel Configuration +# Linux/i386 2.6.39.1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1102,9 +1102,26 @@ CONFIG_ZD1211RW=m # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_DM9601=m +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_HSO is not set +# CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set # CONFIG_WAN is not set # diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 04d099b262..8b9ef2f43c 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.39 Kernel Configuration +# Linux/x86_64 2.6.39.1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1052,9 +1052,26 @@ CONFIG_ZD1211RW=m # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +# CONFIG_USB_NET_CDCETHER is not set +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +CONFIG_USB_NET_DM9601=m +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_HSO is not set +# CONFIG_USB_NET_INT51X1 is not set # CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set # CONFIG_WAN is not set # From c34426e0d010d1cdc4222cbb815523a2e73003fe Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 10 Jun 2011 15:34:00 +0200 Subject: [PATCH 08/13] hotqueue: remove package 'hotqueue' Signed-off-by: Stephan Raue --- packages/python/system/hotqueue/build | 30 --------------------- packages/python/system/hotqueue/install | 30 --------------------- packages/python/system/hotqueue/meta | 36 ------------------------- 3 files changed, 96 deletions(-) delete mode 100755 packages/python/system/hotqueue/build delete mode 100755 packages/python/system/hotqueue/install delete mode 100644 packages/python/system/hotqueue/meta diff --git a/packages/python/system/hotqueue/build b/packages/python/system/hotqueue/build deleted file mode 100755 index 3a7c2afbd8..0000000000 --- a/packages/python/system/hotqueue/build +++ /dev/null @@ -1,30 +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 - -export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" -export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" - -cd $PKG_BUILD - -python setup.py build --cross-compile bdist_egg --exclude-source-files diff --git a/packages/python/system/hotqueue/install b/packages/python/system/hotqueue/install deleted file mode 100755 index d2be73015e..0000000000 --- a/packages/python/system/hotqueue/install +++ /dev/null @@ -1,30 +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 - -PKG_SRC_DIR=`ls -d $PKG_BUILD` - -PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`" -export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages" - -$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg diff --git a/packages/python/system/hotqueue/meta b/packages/python/system/hotqueue/meta deleted file mode 100644 index af2c682420..0000000000 --- a/packages/python/system/hotqueue/meta +++ /dev/null @@ -1,36 +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 -################################################################################ - -PKG_NAME="hotqueue" -PKG_VERSION="0.2.5" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="https://github.com/richardhenry/hotqueue" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="Python distribute redis-py" -PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross" -PKG_PRIORITY="optional" -PKG_SECTION="python/system" -PKG_SHORTDESC="hotqueue a Python library that allows you to use Redis as a message queue within your Python programs" -PKG_LONGDESC="HotQueue is a Python library that allows you to use Redis as a message queue within your Python programs." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" From ac835544f68195d89dc917feca7a9edf8a6530d5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 10 Jun 2011 15:34:23 +0200 Subject: [PATCH 09/13] redis-py: remove package 'redis-py' Signed-off-by: Stephan Raue --- packages/python/system/redis-py/build | 30 --------------------- packages/python/system/redis-py/install | 30 --------------------- packages/python/system/redis-py/meta | 36 ------------------------- 3 files changed, 96 deletions(-) delete mode 100755 packages/python/system/redis-py/build delete mode 100755 packages/python/system/redis-py/install delete mode 100644 packages/python/system/redis-py/meta diff --git a/packages/python/system/redis-py/build b/packages/python/system/redis-py/build deleted file mode 100755 index 3a7c2afbd8..0000000000 --- a/packages/python/system/redis-py/build +++ /dev/null @@ -1,30 +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 - -export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" -export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib" - -cd $PKG_BUILD - -python setup.py build --cross-compile bdist_egg --exclude-source-files diff --git a/packages/python/system/redis-py/install b/packages/python/system/redis-py/install deleted file mode 100755 index d2be73015e..0000000000 --- a/packages/python/system/redis-py/install +++ /dev/null @@ -1,30 +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 - -PKG_SRC_DIR=`ls -d $PKG_BUILD` - -PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`" -export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages" - -$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg diff --git a/packages/python/system/redis-py/meta b/packages/python/system/redis-py/meta deleted file mode 100644 index b8ca73e808..0000000000 --- a/packages/python/system/redis-py/meta +++ /dev/null @@ -1,36 +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 -################################################################################ - -PKG_NAME="redis-py" -PKG_VERSION="2.2.4" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="https://github.com/andymccurdy/redis-py" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="Python distribute redis" -PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross" -PKG_PRIORITY="optional" -PKG_SECTION="python/system" -PKG_SHORTDESC="redis-py: the Python interface to the Redis key-value store" -PKG_LONGDESC="This is the Python interface to the Redis key-value store." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" From d023dde2fc5921ee782bd6ce113e54654c1d491b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 10 Jun 2011 15:34:37 +0200 Subject: [PATCH 10/13] redis: remove package 'redis' Signed-off-by: Stephan Raue --- packages/sysutils/redis/build | 30 --------------------- packages/sysutils/redis/init.d/58_redis | 30 --------------------- packages/sysutils/redis/install | 33 ----------------------- packages/sysutils/redis/meta | 36 ------------------------- 4 files changed, 129 deletions(-) delete mode 100755 packages/sysutils/redis/build delete mode 100644 packages/sysutils/redis/init.d/58_redis delete mode 100755 packages/sysutils/redis/install delete mode 100644 packages/sysutils/redis/meta diff --git a/packages/sysutils/redis/build b/packages/sysutils/redis/build deleted file mode 100755 index ce39c77de2..0000000000 --- a/packages/sysutils/redis/build +++ /dev/null @@ -1,30 +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 - -cd $PKG_BUILD - -make - -$STRIP src/redis-server -$STRIP src/redis-cli diff --git a/packages/sysutils/redis/init.d/58_redis b/packages/sysutils/redis/init.d/58_redis deleted file mode 100644 index 2f4e8de0a4..0000000000 --- a/packages/sysutils/redis/init.d/58_redis +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# Copyright (C) 2009-2010 OpenELEC.tv -# http://www.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 -################################################################################ - -# Starting Redis Server -# -# runlevels: openelec, textmode - -( - wait_for_network - - progress "starting Redis server" - /usr/sbin/redis-server /etc/redis.conf -)& diff --git a/packages/sysutils/redis/install b/packages/sysutils/redis/install deleted file mode 100755 index 97203fe750..0000000000 --- a/packages/sysutils/redis/install +++ /dev/null @@ -1,33 +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 $INSTALL/etc - cp -P $PKG_BUILD/redis.conf $INSTALL/etc - -mkdir -p $INSTALL/usr/bin - cp -P $PKG_BUILD/src/redis-cli $INSTALL/usr/bin - -mkdir -p $INSTALL/usr/sbin - cp -P $PKG_BUILD/src/redis-server $INSTALL/usr/sbin - diff --git a/packages/sysutils/redis/meta b/packages/sysutils/redis/meta deleted file mode 100644 index e31d42bdd4..0000000000 --- a/packages/sysutils/redis/meta +++ /dev/null @@ -1,36 +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 -################################################################################ - -PKG_NAME="redis" -PKG_VERSION="2.2.4" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OpenSource" -PKG_SITE="http://www.redis.io" -PKG_URL="http://redis.googlecode.com/files/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="sysutils" -PKG_SHORTDESC="redis: an open source, advanced key-value store" -PKG_LONGDESC="Redis is an open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" From 743a0c84b6857f232b3f44270f29720f69c49a62 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 10 Jun 2011 16:12:38 +0200 Subject: [PATCH 11/13] xbmc: add python callback error handling fix (https://github.com/xbmc/xbmc/pull/189) Signed-off-by: Stephan Raue --- ...thon_callback_error_handling_fix-0.1.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch new file mode 100644 index 0000000000..3ed7413e44 --- /dev/null +++ b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch @@ -0,0 +1,39 @@ +From 4bcbf6a4a0fde61c18d8de66a8d05aa441ab6fc9 Mon Sep 17 00:00:00 2001 +From: Jim Carroll +Date: Thu, 9 Jun 2011 14:34:24 -0400 +Subject: [PATCH] Allow python error information from callbacks to make it to + the log. + +--- + xbmc/lib/libPython/xbmcmodule/pyutil.cpp | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/xbmc/lib/libPython/xbmcmodule/pyutil.cpp b/xbmc/lib/libPython/xbmcmodule/pyutil.cpp +index 9a98cdf..041f332 100644 +--- a/xbmc/lib/libPython/xbmcmodule/pyutil.cpp ++++ b/xbmc/lib/libPython/xbmcmodule/pyutil.cpp +@@ -28,6 +28,7 @@ + #include "CriticalSection.h" + #include "SingleLock.h" + #include "Application.h" ++#include "utils/log.h" + + using namespace std; + +@@ -203,6 +204,13 @@ void _PyXBMC_MakePendingCalls() + lock.Leave(); + if (p.func) + p.func(p.args); ++ ++ if (PyErr_Occurred()) ++ { ++ CLog::Log(LOGERROR,"Exception in python callback"); ++ PyErr_Print(); ++ } ++ + //(*((*iter).first))((*iter).second); + lock.Enter(); + iter = g_callQueue.begin(); +-- +1.7.5.4 + From 4a5a34f7056c98d0dfdd3e863a2eb4eb75c57ce0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 10 Jun 2011 17:07:18 +0200 Subject: [PATCH 12/13] hts-tvheadend: update to hts-tvheadend-ca68ed4 Signed-off-by: Stephan Raue --- .../addons/service/multimedia/hts-tvheadend/changelog.txt | 3 +++ packages/addons/service/multimedia/hts-tvheadend/meta | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt index b37ad49d4c..9533695ab5 100644 --- a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt +++ b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt @@ -1,3 +1,6 @@ +0.99.5 +- update to hts-tvheadend-ca68ed4 + 0.99.4 - change icon diff --git a/packages/addons/service/multimedia/hts-tvheadend/meta b/packages/addons/service/multimedia/hts-tvheadend/meta index 8bd7b801e6..30e4146356 100644 --- a/packages/addons/service/multimedia/hts-tvheadend/meta +++ b/packages/addons/service/multimedia/hts-tvheadend/meta @@ -19,8 +19,8 @@ ################################################################################ PKG_NAME="hts-tvheadend" -PKG_VERSION="90e3570" -PKG_REV="4" +PKG_VERSION="ca68ed4" +PKG_REV="5" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html" @@ -31,7 +31,7 @@ PKG_BUILD_DEPENDS="toolchain libiconv avahi openssl" PKG_PRIORITY="optional" PKG_SECTION="service/multimedia" PKG_SHORTDESC="hts-tvheadend: a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources." -PKG_LONGDESC="HTS-Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes" +PKG_LONGDESC="HTS-Tvheadend is a TV streaming server for Linux supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources. It also comes with a powerful and easy to use web interface both used for configuration and day-to-day operations, such as searching the EPG and scheduling recordings. Even so, the most notable feature of Tvheadend is how easy it is to set up: Install it, navigate to the web user interface, drill into the TV adapters tab, select your current location and Tvheadend will start scanning channels and present them to you in just a few minutes. If installing as an Addon a reboot is needed" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.service" From f47d42e7056930536212e260bd1f71830df660af Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 10 Jun 2011 21:59:59 +0200 Subject: [PATCH 13/13] xbmc: update patch to fix python callback error handling Signed-off-by: Stephan Raue --- ...thon_callback_error_handling_fix-0.1.patch | 55 +++++++++---------- 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch index 3ed7413e44..d2c8afac28 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-10.1-Dharma-407-python_callback_error_handling_fix-0.1.patch @@ -1,39 +1,34 @@ -From 4bcbf6a4a0fde61c18d8de66a8d05aa441ab6fc9 Mon Sep 17 00:00:00 2001 -From: Jim Carroll -Date: Thu, 9 Jun 2011 14:34:24 -0400 -Subject: [PATCH] Allow python error information from callbacks to make it to - the log. - ---- - xbmc/lib/libPython/xbmcmodule/pyutil.cpp | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/xbmc/lib/libPython/xbmcmodule/pyutil.cpp b/xbmc/lib/libPython/xbmcmodule/pyutil.cpp -index 9a98cdf..041f332 100644 ---- a/xbmc/lib/libPython/xbmcmodule/pyutil.cpp -+++ b/xbmc/lib/libPython/xbmcmodule/pyutil.cpp -@@ -28,6 +28,7 @@ - #include "CriticalSection.h" - #include "SingleLock.h" - #include "Application.h" +diff -Naur xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/pyutil.cpp xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/pyutil.cpp +--- xbmc-10.1-Dharma/xbmc/lib/libPython/xbmcmodule/pyutil.cpp 2011-03-08 02:49:14.000000000 +0100 ++++ xbmc-10.1-Dharma.patch/xbmc/lib/libPython/xbmcmodule/pyutil.cpp 2011-06-10 21:14:07.881047162 +0200 +@@ -23,6 +23,7 @@ + #include + #include + #include "addons/Skin.h" +#include "utils/log.h" - - using namespace std; - -@@ -203,6 +204,13 @@ void _PyXBMC_MakePendingCalls() + #include "tinyXML/tinyxml.h" + #include "utils/CharsetConverter.h" + #include "CriticalSection.h" +@@ -202,7 +203,22 @@ + g_callQueue.erase(iter); lock.Leave(); if (p.func) ++ { p.func(p.args); + -+ if (PyErr_Occurred()) -+ { -+ CLog::Log(LOGERROR,"Exception in python callback"); -+ PyErr_Print(); -+ } ++ // Since the callback is likely to make it into python, and since ++ // not all of the callback functions handle errors, the error state ++ // may remain set from the previous call. As a result subsequent calls ++ // to callback functions exhibit odd behavior difficult to debug. ++ if (PyErr_Occurred()) ++ { ++ CLog::Log(LOGERROR,"Exception in python script callback execution"); + ++ // This clears the python error state and prints it to the log ++ PyErr_Print(); ++ } ++ ++ } //(*((*iter).first))((*iter).second); lock.Enter(); iter = g_callQueue.begin(); --- -1.7.5.4 -