The branch, dharma has been updated
via 29519fb844314f8ce2adbf7d0cc874ecc0b2e6be (commit)
from 9936974e261bbe4ff7ea307243ebcbef2ce2ac61 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=29519fb844314f8ce2adbf7d0cc874ecc0b2e6be
commit 29519fb844314f8ce2adbf7d0cc874ecc0b2e6be
Author: spiff <[email protected]>
Date: Mon Jul 11 08:34:17 2011 +0200
[plugin.program.rtorrent] updated to version 0.11.7
diff --git a/plugin.program.rtorrent/README b/plugin.program.rtorrent/README
index 357e567..d92de5d 100644
--- a/plugin.program.rtorrent/README
+++ b/plugin.program.rtorrent/README
@@ -6,5 +6,6 @@ Team-XBMC for the amazing XBMC (xbmc.org)
runkov for providing Russian translations
mad-max for providing German translations
Stijn Segers for providing Dutch translations
+trexx for reporting bugs
For anything to do with my addon, please visit it on GitHub to submit any
issues.
\ No newline at end of file
diff --git a/plugin.program.rtorrent/addon.xml
b/plugin.program.rtorrent/addon.xml
index 04ca1a5..b962fef 100644
--- a/plugin.program.rtorrent/addon.xml
+++ b/plugin.program.rtorrent/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.program.rtorrent"
name="rTorrent"
- version="0.10.4"
+ version="0.11.7"
provider-name="Daniel Jolly">
<requires>
<import addon="xbmc.python" version="1.0"/>
@@ -14,38 +14,8 @@
<summary lang="en">rTorrent Control Plugin</summary>
<summary lang="de">rTorrent Plugin</summary>
<summary lang="nl">Controleplugin voor rTorrent</summary>
- <description lang="en">Manages your rTorrent queue from within
XBMC!
-
-Quickly and easily start, stop, erase, play and change priority of torrents
managed in rTorrent.
-
-Instructions
-============
-1. Make sure you have the SCGI port or domain socket setup in your rTorrent
configuration
-2. Configure the plugin to suit!
-
-Any issues, ideas or any other comments, please visit:
-http://wiki.github.com/djcode/XBMC-rTorrent-Plugin/</description>
- <description lang="de">Verwalte deine rTorrent queue aus XBMC
heraus!
-
-Starte, stoppe, lösche, gebe wieder und ändere die Priorität deiner
Torrents von rTorrent.
-
-Anleitung
-============
-1. Stelle sicher, dass du den SCGI port oder domain socket in rTorrent
konfiguriert hast
-2. Konfiguriere das Plugin entsprechend!
-
-Bei Problemen, Fragen oder Anregungen, schaut bei:
-http://wiki.github.com/djcode/XBMC-rTorrent-Plugin/</description>
- <description lang="nl">Beheer uw rTorrentsessie vanuit XBMC!
-
-Met deze plugin kunt u snel en makkelijk torrents starten, stoppen en
verwijderen, en hun prioriteit wijzigen.
-
-Instructies
-============
-1. Zorg ervoor dat de SCGI-poort of domeinsocket in rTorrent werd ingesteld
-2. Configureer de plugin naar wens
-
-Indien u problemen, vragen of suggesties hebt, bezoek dan de site:
-http://wiki.github.com/djcode/XBMC-rTorrent-Plugin/</description>
+ <description lang="en">Manages your rTorrent queue from within
XBMC![CR]Quickly and easily start, stop, erase, play and change priorities of
torrents managed in rTorrent.[CR][CR]Instructions[CR]============[CR]1. Make
sure you have the SCGI port or domain socket setup in your rTorrent
configuration[CR]2. Configure the plugin to suit![CR][CR]Any issues, ideas or
any other comments, please
visit:[CR]http://wiki.github.com/djcode/XBMC-rTorrent-Plugin/</description>
+ <description lang="de">Verwalte deine rTorrent queue aus XBMC
heraus![CR][CR]Starte, stoppe, lösche, gebe wieder und ändere die Priorität
deiner Torrents von rTorrent.[CR][CR]Anleitung[CR]============[CR]1. Stelle
sicher, dass du den SCGI port oder domain socket in rTorrent konfiguriert
hast[CR]2. Konfiguriere das Plugin entsprechend![CR][CR]Bei Problemen, Fragen
oder Anregungen, schaut
bei:[CR]http://wiki.github.com/djcode/XBMC-rTorrent-Plugin/</description>
+ <description lang="nl">Beheer uw rTorrentsessie vanuit
XBMC![CR][CR]Met deze plugin kunt u snel en makkelijk torrents starten, stoppen
en verwijderen, en hun prioriteit
wijzigen.[CR][CR]Instructies[CR]============[CR]1. Zorg ervoor dat de
SCGI-poort of domeinsocket in rTorrent werd ingesteld[CR]2. Configureer de
plugin naar wens[CR][CR]Indien u problemen, vragen of suggesties hebt, bezoek
dan de
site:[CR]http://wiki.github.com/djcode/XBMC-rTorrent-Plugin/</description>
</extension>
</addon>
\ No newline at end of file
diff --git a/plugin.program.rtorrent/changelog.txt
b/plugin.program.rtorrent/changelog.txt
index 3116c3e..dc3262e 100644
--- a/plugin.program.rtorrent/changelog.txt
+++ b/plugin.program.rtorrent/changelog.txt
@@ -1,3 +1,12 @@
+0.11.7 - 2011/07/10
+* Moved to a x.<year>.<month> style of versioning.
+* Officially changed icons and now use an easier to understand colour scheme.
+* Removed icon from the fanart as it didn't look right on all skin
+* Fixed bug with torrents containing 0 byte files
+* Fixed bug with muliple TCPIP interfaces
+* Added missing "Connection Failed" strings to all languages
+* Fixed addon descriptions.
+
0.10.4 - 2011/02/11
* Fixed bug that will speed up viewing files.
diff --git a/plugin.program.rtorrent/fanart.jpg
b/plugin.program.rtorrent/fanart.jpg
index f01b6cc..a07cb78 100644
Binary files a/plugin.program.rtorrent/fanart.jpg and
b/plugin.program.rtorrent/fanart.jpg differ
diff --git a/plugin.program.rtorrent/icon.png b/plugin.program.rtorrent/icon.png
index 4dbeeb6..6ab89c7 100644
Binary files a/plugin.program.rtorrent/icon.png and
b/plugin.program.rtorrent/icon.png differ
diff --git a/plugin.program.rtorrent/resources/language/Dutch/strings.xml
b/plugin.program.rtorrent/resources/language/Dutch/strings.xml
index fc29ce8..62e030d 100644
--- a/plugin.program.rtorrent/resources/language/Dutch/strings.xml
+++ b/plugin.program.rtorrent/resources/language/Dutch/strings.xml
@@ -37,7 +37,9 @@
<string id="30152">Weet u zeker dat u het wilt afspelen?</string>
<string id="30153">Download verwijderen</string>
<string id="30154">Weet u zeker dat u deze download wilt
verwijderen?</string>
-
+ <string id="30155">Verbinding mislukt</string>
+ <string id="30156">Kan geen verbinding maken met rtorrent.</string>
+ <string id="30157">Wilt u uw instellingen te bevestigen?</string>
<!-- Errors -->
<string id="30900">Fout!</string>
</strings>
\ No newline at end of file
diff --git a/plugin.program.rtorrent/resources/language/English/strings.xml
b/plugin.program.rtorrent/resources/language/English/strings.xml
index 30c514a..565a4ca 100644
--- a/plugin.program.rtorrent/resources/language/English/strings.xml
+++ b/plugin.program.rtorrent/resources/language/English/strings.xml
@@ -37,7 +37,9 @@
<string id="30152">Are you sure you want to play it?</string>
<string id="30153">Delete Download</string>
<string id="30154">Are you sure you want to delete this
download?</string>
-
+ <string id="30155">Connection Failed</string>
+ <string id="30156">Could not connect to rTorrent.</string>
+ <string id="30157">Would you like to check your settings?</string>
<!-- Errors -->
<string id="30900">Error!</string>
</strings>
\ No newline at end of file
diff --git a/plugin.program.rtorrent/resources/language/German/strings.xml
b/plugin.program.rtorrent/resources/language/German/strings.xml
index 1e2ada8..216e273 100644
--- a/plugin.program.rtorrent/resources/language/German/strings.xml
+++ b/plugin.program.rtorrent/resources/language/German/strings.xml
@@ -37,7 +37,10 @@
<string id="30152">Soll diese Datei wiedergegeben werden?</string>
<string id="30153">Lösche Download</string>
<string id="30154">Soll dieser Download wirklich gelöscht
werden?</string>
-
- <!-- Errors -->
+ <string id="30155">Verbindung fehlgeschlagen</string>
+ <string id="30156">konnte keine Verbindung zum rTorrent.</string>
+ <string id="30157">Möchten Sie Ihre Einstellungen zu
überprüfen?</string>
+
+ <!-- Errors -->
<string id="30900">Fehler!</string>
</strings>
\ No newline at end of file
diff --git a/plugin.program.rtorrent/resources/language/Russian/strings.xml
b/plugin.program.rtorrent/resources/language/Russian/strings.xml
index 7f77fee..02e53b0 100644
--- a/plugin.program.rtorrent/resources/language/Russian/strings.xml
+++ b/plugin.program.rtorrent/resources/language/Russian/strings.xml
@@ -37,7 +37,10 @@
<string id="30152">ÐÑ ÑвеÑÐµÐ½Ñ ÑÑо Ñ
оÑиÑе
пÑодолжиÑÑ?</string>
<string id="30153">УдалиÑÑ Ð·Ð°Ð³ÑÑзкÑ</string>
<string id="30154">ÐÑ ÑвеÑÐµÐ½Ñ ÑÑо Ñ
оÑиÑе
ÑдалиÑÑ Ð·Ð°Ð³ÑÑзкÑ?</string>
-
+ <string id="30155">Сбой пÑи подклÑÑении</string>
+ <string id="30156">Ðевозможно подклÑÑиÑÑÑÑ Ðº
rTorrent.</string>
+ <string id="30157">ХоÑели Ð±Ñ ÐÑ, ÑÑобÑ
пÑовеÑиÑÑ Ð½Ð°ÑÑÑойки?</string>
+
<!-- Errors -->
<string id="30900">ÐШÐÐÐÐ!!!</string>
</strings>
\ No newline at end of file
diff --git a/plugin.program.rtorrent/resources/lib/functions.py
b/plugin.program.rtorrent/resources/lib/functions.py
index 727a5e2..d4a9b0a 100644
--- a/plugin.program.rtorrent/resources/lib/functions.py
+++ b/plugin.program.rtorrent/resources/lib/functions.py
@@ -33,28 +33,28 @@ def getIcon(isdir,active,complete,p):
p=p+3
if active==1:
if complete==1:
- iconcol = "green"
+ iconcol = "9"
else:
if p==0: #Don't Download
- iconcol = "red"
+ iconcol = "0"
elif p==1: #Normal
- iconcol = "blue"
+ iconcol = "3"
elif p==2: #High
- iconcol = "yellow"
+ iconcol = "4"
#Now for downloads, not files
elif p==3: #Idle
- iconcol = "orange"
+ iconcol = "1"
elif p==4: #Low
- iconcol = "purple"
+ iconcol = "2"
elif p==5: #Normal
- iconcol = "blue"
+ iconcol = "3"
elif p==6: #High
- iconcol = "yellow"
+ iconcol = "4"
else:
- iconcol = "red"
- return os.path.join(g.__icondir__,icon+'_'+iconcol+'.png')
+ iconcol = "0"
+ return os.path.join(g.__icondir__,icon+'_'+iconcol+'.jpg')
-# Colour scheme
+# Colour scheme - NO LONGER USED
# Dld & File Completed: Green
# Dld & File P: High : Yellow
# Dld & File P: Normal: Blue
diff --git a/plugin.program.rtorrent/resources/lib/mode_files.py
b/plugin.program.rtorrent/resources/lib/mode_files.py
index 23cd6f8..7180c64 100644
--- a/plugin.program.rtorrent/resources/lib/mode_files.py
+++ b/plugin.program.rtorrent/resources/lib/mode_files.py
@@ -16,7 +16,10 @@ def main(hash,numfiles):
f_completed_chunks = int(f[1])
f_size_chunks = int(f[2])
f_size_bytes = int(f[4])
- f_percent_complete = f_completed_chunks*100/f_size_chunks
+ if f_size_chunks<1:
+ f_percent_complete = 100
+ else:
+ f_percent_complete =
f_completed_chunks*100/f_size_chunks
f_priority = f[3]
if f_percent_complete==100:
f_complete = 1
diff --git a/plugin.program.rtorrent/resources/lib/xmlrpc2scgi.py
b/plugin.program.rtorrent/resources/lib/xmlrpc2scgi.py
index 8d0d454..441920f 100644
--- a/plugin.program.rtorrent/resources/lib/xmlrpc2scgi.py
+++ b/plugin.program.rtorrent/resources/lib/xmlrpc2scgi.py
@@ -87,7 +87,7 @@ class SCGIRequest(object):
if netloc:
addrinfo = socket.getaddrinfo(host, port, socket.AF_INET,
socket.SOCK_STREAM)
- assert len(addrinfo) == 1, "There's more than one? %r"%addrinfo
+ #assert len(addrinfo) == 1, "There's more than one? %r"%addrinfo
#~ print addrinfo
sock = socket.socket(*addrinfo[0][:3])
-----------------------------------------------------------------------
Summary of changes:
plugin.program.rtorrent/README | 1 +
plugin.program.rtorrent/addon.xml | 38 ++-----------------
plugin.program.rtorrent/changelog.txt | 9 +++++
plugin.program.rtorrent/fanart.jpg | Bin 120028 -> 34416 bytes
plugin.program.rtorrent/icon.png | Bin 79161 -> 88340 bytes
plugin.program.rtorrent/resources/icons/dir_0.jpg | Bin 0 -> 22356 bytes
plugin.program.rtorrent/resources/icons/dir_1.jpg | Bin 0 -> 22510 bytes
plugin.program.rtorrent/resources/icons/dir_2.jpg | Bin 0 -> 22905 bytes
plugin.program.rtorrent/resources/icons/dir_3.jpg | Bin 0 -> 23320 bytes
plugin.program.rtorrent/resources/icons/dir_4.jpg | Bin 0 -> 23658 bytes
plugin.program.rtorrent/resources/icons/dir_9.jpg | Bin 0 -> 22372 bytes
.../resources/icons/dir_blue.png | Bin 77562 -> 0 bytes
.../resources/icons/dir_green.png | Bin 77155 -> 0 bytes
.../resources/icons/dir_orange.png | Bin 77896 -> 0 bytes
.../resources/icons/dir_purple.png | Bin 77440 -> 0 bytes
.../resources/icons/dir_red.png | Bin 74951 -> 0 bytes
.../resources/icons/dir_yellow.png | Bin 74906 -> 0 bytes
plugin.program.rtorrent/resources/icons/file_0.jpg | Bin 0 -> 25512 bytes
plugin.program.rtorrent/resources/icons/file_1.jpg | Bin 0 -> 25839 bytes
plugin.program.rtorrent/resources/icons/file_2.jpg | Bin 0 -> 26213 bytes
plugin.program.rtorrent/resources/icons/file_3.jpg | Bin 0 -> 26592 bytes
plugin.program.rtorrent/resources/icons/file_4.jpg | Bin 0 -> 26956 bytes
plugin.program.rtorrent/resources/icons/file_9.jpg | Bin 0 -> 25403 bytes
.../resources/icons/file_blue.png | Bin 58005 -> 0 bytes
.../resources/icons/file_green.png | Bin 57823 -> 0 bytes
.../resources/icons/file_orange.png | Bin 58453 -> 0 bytes
.../resources/icons/file_purple.png | Bin 57988 -> 0 bytes
.../resources/icons/file_red.png | Bin 56162 -> 0 bytes
.../resources/icons/file_yellow.png | Bin 55781 -> 0 bytes
.../resources/language/Dutch/strings.xml | 4 ++-
.../resources/language/English/strings.xml | 4 ++-
.../resources/language/German/strings.xml | 7 +++-
.../resources/language/Russian/strings.xml | 5 ++-
plugin.program.rtorrent/resources/lib/functions.py | 22 ++++++------
.../resources/lib/mode_files.py | 5 ++-
.../resources/lib/xmlrpc2scgi.py | 2 +-
36 files changed, 45 insertions(+), 52 deletions(-)
create mode 100644 plugin.program.rtorrent/resources/icons/dir_0.jpg
create mode 100644 plugin.program.rtorrent/resources/icons/dir_1.jpg
create mode 100644 plugin.program.rtorrent/resources/icons/dir_2.jpg
create mode 100644 plugin.program.rtorrent/resources/icons/dir_3.jpg
create mode 100644 plugin.program.rtorrent/resources/icons/dir_4.jpg
create mode 100644 plugin.program.rtorrent/resources/icons/dir_9.jpg
delete mode 100644 plugin.program.rtorrent/resources/icons/dir_blue.png
delete mode 100644 plugin.program.rtorrent/resources/icons/dir_green.png
delete mode 100644 plugin.program.rtorrent/resources/icons/dir_orange.png
delete mode 100644 plugin.program.rtorrent/resources/icons/dir_purple.png
delete mode 100644 plugin.program.rtorrent/resources/icons/dir_red.png
delete mode 100644 plugin.program.rtorrent/resources/icons/dir_yellow.png
create mode 100644 plugin.program.rtorrent/resources/icons/file_0.jpg
create mode 100644 plugin.program.rtorrent/resources/icons/file_1.jpg
create mode 100644 plugin.program.rtorrent/resources/icons/file_2.jpg
create mode 100644 plugin.program.rtorrent/resources/icons/file_3.jpg
create mode 100644 plugin.program.rtorrent/resources/icons/file_4.jpg
create mode 100644 plugin.program.rtorrent/resources/icons/file_9.jpg
delete mode 100644 plugin.program.rtorrent/resources/icons/file_blue.png
delete mode 100644 plugin.program.rtorrent/resources/icons/file_green.png
delete mode 100644 plugin.program.rtorrent/resources/icons/file_orange.png
delete mode 100644 plugin.program.rtorrent/resources/icons/file_purple.png
delete mode 100644 plugin.program.rtorrent/resources/icons/file_red.png
delete mode 100644 plugin.program.rtorrent/resources/icons/file_yellow.png
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
