Merge pull request OpenELEC#16 from jenkins101/rTorrent-3.2.1

rTorrent version 3.2.1

addons/service/downloadmanager/rTorrent/changelog.txt

@@ -1,21 +1,30 @@
+4.0.1
+- ruTorrent upgraded to 3.6 old version is gone! Changelog: http://code.google.com/p/rutorrent/wiki/Versions
+- fixed rutorrent label sort on complete action, multiple slashes and spaces now works in labels!
+- fixed downloaddirs/watchdirs  now takes precedence over labels.
+
 4.0.0
 - rebuild for OpenELEC-4.0
 
 3.1.9
 - fixed sort series with sNNeNN in name and added option to switch on/off, default is off
 - added sort based on rutorrent labels function, allways on!!
 - added RPi tunning to rtorrent.rc
+
 3.1.8
 - Fixed php sqlite problem
 - added mkdir for series with sNNeNN in name
 - added remove lock file if rtorrent is dead
+
 3.0.7
 - added new patch from @sallyswiss: fixes for ipv4_filter now includes logging.
 - changed defaults of rTorrent and ruTorrent to enabled, easier to install and run.
+
 3.0.6
 - added patch from @sallyswiss: fixes ipv4_filter high memory usage.
 - ipv4_filter now supports lists in p2p format.
 - compile optimizations.
+
 3.0.5
 - upgraded to rtorrent to 0.9.3: fixed announcement interval issue and more
 - upgraded to rutorrent to 3.5: new features and fixes, release notes comming...
@@ -25,8 +34,10 @@
 - changed low_diskspace limit on RPi to 100MB and 500MB on others
 - dont try to sort downloads not in correct dirs
 - OpenELEC 3.0 support
+
 2.1.4
 - OpenELEC 2.0 support
+
 2.1.3
 - addon name changed form rtorrent to rTorrent, uninstall old addon is needed.
 - added rtorrent upnp support whit miniupnpc
@@ -43,7 +54,10 @@
 - fix rtorrent move on complete not working
 - cleanup of config screan
 - script fixes/cleanups
+
 2.1.2
 - added rutorrent-3.4 web gui
+
 2.1.1
 - initial version of rtorrent-0.9.2
+

addons/service/downloadmanager/rTorrent/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="rTorrent"
-PKG_VERSION="3.1"
-PKG_REV="0"
+PKG_VERSION="4.0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://libtorrent.rakshasa.no"

addons/service/downloadmanager/rTorrent/source/bin/complete.sh

@@ -28,25 +28,28 @@ FROM="${FROM%/}"
 
 NAME=${FROM##*/}
 
-# Do we have a label?
-RTORRENT_DIR=$(xmlrpc2scgi.py -p 'scgi://localhost:5000' d.get_custom1 $HASH |sed 's/%20/ /;s/%2F/\//')
-if [ "$RTORRENT_DIR" ];then
-   STORE=${RTORRENT_COMPLETE_DIR}${RTORRENT_DIR} 
-else
-   MATCH=${FROM%/*}
-   MATCH=${MATCH##*/}
+# Do we have a MATCH
+MATCH=${FROM%/*}
+MATCH=${MATCH##*/}
 
-   # Determin where to store...
-   for RTORRENT_DIR in ${RTORRENT_DIRS//,/ } ;do
-      if [[ "$MATCH" == "$RTORRENT_DIR" ]];then
-         STORE=${RTORRENT_COMPLETE_DIR}${RTORRENT_DIR}
-      fi
-   done 
+# Do we have a watch dir match, if do use it.
+for RTORRENT_DIR in ${RTORRENT_DIRS//,/ } ;do
+   if [[ "$MATCH" == "$RTORRENT_DIR" ]];then
+      STORE=${RTORRENT_COMPLETE_DIR}${RTORRENT_DIR}
+   fi
+done
+
+# if we dont have a watch dir match use the rutorrent label
+if [ -z "$STORE" ] ;then
+   RTORRENT_DIR=$(xmlrpc2scgi.py -p 'scgi://localhost:5000' d.get_custom1 $HASH |sed 's/%20/ /g;s/%2F/\//g')
+   if [ "$RTORRENT_DIR" ];then
+      STORE=${RTORRENT_COMPLETE_DIR}${RTORRENT_DIR}
+   fi
 fi
 
-# Do on complete action
+# Do on complete action if we have STORE var here and
+# RTORRENT_ON_COMPLETE is Move or Link, else do nothing.
 if [ "$STORE" ] ;then
-
    # Make sure series are in a dir with series.name.sNN, if possible.
    if [ "$RTORRENT_SORT_SERIES" == "true" ];then
       echo $NAME |grep -qi s[0-9][0-9]e[0-9][0-9]
@@ -58,6 +61,7 @@ if [ "$STORE" ] ;then
       fi
    fi
 
+   # Should we run complete action if so run it.
    if [ $RTORRENT_ON_COMPLETE == Move ] ;then
       mkdir -p "$STORE"
       xmlrpc2scgi.py -p 'scgi://localhost:5000' d.set_directory $HASH "$STORE"
@@ -66,9 +70,8 @@ if [ "$STORE" ] ;then
       mkdir -p "$STORE"
       ln -sf "$FROM" "$STORE"
    fi
-
 fi
 
-# Notify user
+# Notify xbmc user
 xbmc-send -a "Notification(rTorrent - Download Completed,$NAME,10000)"
 

web/rutorrent/build

@@ -29,7 +29,7 @@ cd $PKG_BUILD
 # install some useful plugins
 for plugin in $install_plugins ;do
    echo "Installing rutorrent plugin: $plugin-$PKG_VERSION..."
-   wget -q http://rutorrent.googlecode.com/files/$plugin-$PKG_VERSION.tar.gz 
+   wget -q http://dl.bintray.com/novik65/generic/plugins/$plugin-$PKG_VERSION.tar.gz 
    tar zxf $plugin-$PKG_VERSION.tar.gz -C plugins/
    rm -f $plugin-$PKG_VERSION.tar.gz
 done
@@ -39,6 +39,3 @@ wget -q http://rutorrent-tadd-labels.googlecode.com/files/lbll-suite_0.8.1.tar.g
 tar zxf lbll-suite_0.8.1.tar.gz -C plugins/
 rm -f lbll-suite_0.8.1.tar.gz
 
-# Set rss updateInterval to 10 minutes insted of 30
-sed -i -e 's/updateInterval = 30/updateInterval = 10/g' plugins/rss/conf.php
-

web/rutorrent/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="rutorrent"
-PKG_VERSION="3.5"
-PKG_REV="3"
+PKG_VERSION="3.6"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://rutorrent.googlecode.com/"
-PKG_URL="http://rutorrent.googlecode.com/files/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://dl.bintray.com/novik65/generic/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"