The branch, dharma has been updated
via 1b3de5e0319bfc9e143b9eb71e552bac30e27d03 (commit)
from 2753c8bd6f0f114518cc773cdd2813c5e2468b35 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=1b3de5e0319bfc9e143b9eb71e552bac30e27d03
commit 1b3de5e0319bfc9e143b9eb71e552bac30e27d03
Author: amet <[email protected]>
Date: Thu Mar 15 11:30:29 2012 +0400
[script.transmission] -v 0.6.3
* Added Apple TV remote MENU key support to close dialogs (submitted by
Filipe Pina <[email protected]>)
* Removed btjunkie.org search
* Updated The Pirate Bay search to use the new hostname and magnet links
diff --git a/script.transmission/addon.xml b/script.transmission/addon.xml
index 589faaf..a5e73cb 100644
--- a/script.transmission/addon.xml
+++ b/script.transmission/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.transmission"
name="Transmission"
- version="0.6.2"
+ version="0.6.3"
provider-name="Correl Roush">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/script.transmission/changelog.txt
b/script.transmission/changelog.txt
index 1a25959..c7de257 100644
--- a/script.transmission/changelog.txt
+++ b/script.transmission/changelog.txt
@@ -1,3 +1,9 @@
+Version 0.6.3
+ (Changes backported from 0.7.1)
+ * Added Apple TV remote MENU key support to close dialogs
+ (submitted by Filipe Pina <[email protected]>)
+ * Removed btjunkie.org search
+ * Updated The Pirate Bay search to use the new hostname and magnet links
Version 0.6.2
* Updated transmissionrpc library to 0.8 (Now supports Transmission
2.40+)
Version 0.6.1
diff --git a/script.transmission/resources/language/English/strings.xml
b/script.transmission/resources/language/English/strings.xml
index 208966f..841ea95 100644
--- a/script.transmission/resources/language/English/strings.xml
+++ b/script.transmission/resources/language/English/strings.xml
@@ -17,7 +17,6 @@
<!-- Adding / Search -->
<string id="200">Browse for torrent file</string>
- <string id="201">Search BTJunkie.org</string>
<string id="202">Search ThePirateBay.org</string>
<string id="203">Search Mininova.org</string>
<string id="204">Search Torrentreactor.net</string>
diff --git a/script.transmission/resources/lib/gui.py
b/script.transmission/resources/lib/gui.py
index a528d11..eecc901 100644
--- a/script.transmission/resources/lib/gui.py
+++ b/script.transmission/resources/lib/gui.py
@@ -4,7 +4,6 @@
import os
import sys
import base64
-import urllib2
import xbmc
import xbmcgui
from basictypes.bytes import Bytes
@@ -16,11 +15,11 @@ __settings__ = sys.modules[ "__main__" ].__settings__
KEY_BUTTON_BACK = 275
KEY_KEYBOARD_ESC = 61467
+KEY_MENU_ID = 92
EXIT_SCRIPT = ( 6, 10, 247, 275, 61467, 216, 257, 61448, )
CANCEL_DIALOG = EXIT_SCRIPT + ( 216, 257, 61448, )
-
class TransmissionGUI(xbmcgui.WindowXMLDialog):
def __init__(self, strXMLname, strFallbackPath, strDefaultName,
bforeFallback=0):
self.list = {}
@@ -110,7 +109,6 @@ class TransmissionGUI(xbmcgui.WindowXMLDialog):
# Add torrent
engines = [
(_(200), None),
- (_(201), search.BTJunkie),
(_(202), search.TPB),
(_(203), search.Mininova),
(_(204), search.TorrentReactor),
@@ -149,9 +147,7 @@ class TransmissionGUI(xbmcgui.WindowXMLDialog):
if selected < 0:
return
try:
- f = urllib2.urlopen(results[selected]['url'])
- data = base64.b64encode(f.read())
- self.transmission.add(data)
+ self.transmission.add_uri(results[selected]['url'])
except:
xbmcgui.Dialog().ok(_(0), _(293))
return
@@ -191,7 +187,7 @@ class TransmissionGUI(xbmcgui.WindowXMLDialog):
pass
def onAction( self, action ):
- if ( action.getButtonCode() in CANCEL_DIALOG ):
+ if ( action.getButtonCode() in CANCEL_DIALOG ) or (action.getId() ==
KEY_MENU_ID):
self.close()
def close(self):
if self.repeater:
@@ -245,7 +241,7 @@ class TorrentInfoGUI(xbmcgui.WindowXMLDialog):
self.repeater.stop()
super(TorrentInfoGUI, self).close()
def onAction(self, action):
- if (action.getButtonCode() in CANCEL_DIALOG):
+ if (action.getButtonCode() in CANCEL_DIALOG) or (action.getId() ==
KEY_MENU_ID):
self.close()
pass
def onClick(self, controlID):
diff --git a/script.transmission/resources/lib/search.py
b/script.transmission/resources/lib/search.py
index ba1f34c..6ab67e2 100644
--- a/script.transmission/resources/lib/search.py
+++ b/script.transmission/resources/lib/search.py
@@ -11,27 +11,6 @@ class Search:
def search(terms):
return NotImplemented
-class BTJunkie(Search):
- def __init__(self):
- self.search_uri = 'http://btjunkie.org/rss.xml?query=%s&o=52'
- def search(self, terms):
- torrents = []
- url = self.search_uri % '+'.join(terms.split(' '))
- f = urlopen(url)
- soup = BeautifulStoneSoup(f.read())
- for item in soup.findAll('item'):
- (name, seeds, leechers) =
re.findall('(.*?)\s+\[(\d+|X)\/(\d+|X)\]$', item.title.text)[0]
- if seeds == 'X':
- seeds = 0
- if leechers == 'X':
- leechers = 0
- torrents.append({
- 'url': item.enclosure['url'],
- 'name': name,
- 'seeds': int(seeds),
- 'leechers': int(leechers),
- })
- return torrents
class Mininova(Search):
def __init__(self):
self.search_uri = 'http://www.mininova.org/rss/%s'
@@ -51,7 +30,7 @@ class Mininova(Search):
return torrents
class TPB(Search):
def __init__(self):
- self.search_uri = 'http://thepiratebay.org/search/%s/'
+ self.search_uri = 'http://thepiratebay.se/search/%s/'
def search(self, terms):
torrents = []
url = self.search_uri % '+'.join(terms.split(' '))
@@ -59,7 +38,7 @@ class TPB(Search):
soup = BeautifulSoup(f.read())
for details in soup.findAll('a', {'class': 'detLink'}):
name = details.text
- url = details.findNext('a', {'href':
re.compile('^http:\/\/torrents\.thepiratebay\.org\/')})['href']
+ url = details.findNext('a', {'href':
re.compile('^magnet:')})['href']
td = details.findNext('td')
seeds = int(td.text)
td = td.findNext('td')
-----------------------------------------------------------------------
Summary of changes:
script.transmission/addon.xml | 2 +-
script.transmission/changelog.txt | 6 ++++
.../resources/language/English/strings.xml | 1 -
script.transmission/resources/lib/gui.py | 12 +++------
script.transmission/resources/lib/search.py | 25 +------------------
5 files changed, 13 insertions(+), 33 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
