diff --git a/src/search_engine/engines/btjunkie.py b/src/search_engine/engines/btjunkie.py index 9ea0c9370..2ff9cb553 100644 --- a/src/search_engine/engines/btjunkie.py +++ b/src/search_engine/engines/btjunkie.py @@ -1,4 +1,4 @@ -#VERSION: 1.12 +#VERSION: 1.13 #AUTHORS: Fabien Devaux (fab@gnux.info) # Redistribution and use in source and binary forms, with or without @@ -39,10 +39,11 @@ class btjunkie(object): res = 0 dat = urllib.urlopen(self.url+'/search?q=%s&o=52&p=%d'%(what,i)).read().decode('utf8', 'replace') # I know it's not very readable, but the SGML parser feels in pain - section_re = re.compile('(?s)href="http://dl.btjunkie.org/torrent/.*?') + section_re = re.compile('(?s)href="http://dl.btjunkie.org/torrent/.*?.*?[^"]+).*?' 'class="BlckUnd">(?P.*?).*?' '>(?P\d+MB).*?' + '>.*.*' '>(?P\d+).*?' '>(?P\d+)') for match in section_re.finditer(dat): @@ -50,7 +51,7 @@ class btjunkie(object): m = torrent_re.search(txt) if m: torrent_infos = m.groupdict() - torrent_infos['name'] = re.sub('', '', torrent_infos['name']) + torrent_infos['name'] = re.sub('<.*?>', '', torrent_infos['name']) torrent_infos['engine_url'] = self.url #torrent_infos['link'] = self.url+torrent_infos['link'] prettyPrinter(torrent_infos) diff --git a/src/search_engine/engines/versions.txt b/src/search_engine/engines/versions.txt index 75f15c0fa..1fe608695 100644 --- a/src/search_engine/engines/versions.txt +++ b/src/search_engine/engines/versions.txt @@ -1,5 +1,5 @@ isohunt: 1.01 torrentreactor: 1.02 -btjunkie: 1.12 +btjunkie: 1.13 mininova: 1.13 piratebay: 1.01