Browse Source

Fix search inconsistency between Python versions

Closes #2012
adaptive-webui-19844
Bruno Barbieri 10 years ago
parent
commit
f288162e99
  1. 4
      src/searchengine/nova/engines/btdigg.py
  2. 2
      src/searchengine/nova/engines/versions.txt
  3. 5
      src/searchengine/nova/nova2.py
  4. 4
      src/searchengine/nova3/engines/btdigg.py
  5. 2
      src/searchengine/nova3/engines/versions.txt
  6. 4
      src/searchengine/nova3/nova2.py

4
src/searchengine/nova/engines/btdigg.py

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
#VERSION: 1.22 #VERSION: 1.23
#AUTHORS: BTDigg team (research@btdigg.org) #AUTHORS: BTDigg team (research@btdigg.org)
# #
# GNU GENERAL PUBLIC LICENSE # GNU GENERAL PUBLIC LICENSE
@ -66,7 +66,7 @@ class btdigg(object):
pass pass
def search(self, what, cat='all'): def search(self, what, cat='all'):
req = what.replace('+', ' ') req = urllib.unquote(what)
u = urllib2.urlopen('https://api.btdigg.org/api/public-8e9a50f8335b964f/s01?%s' % (urllib.urlencode(dict(q = req)),)) u = urllib2.urlopen('https://api.btdigg.org/api/public-8e9a50f8335b964f/s01?%s' % (urllib.urlencode(dict(q = req)),))
try: try:

2
src/searchengine/nova/engines/versions.txt

@ -4,5 +4,5 @@ piratebay: 2.00
vertor: 1.3 vertor: 1.3
extratorrent: 1.2 extratorrent: 1.2
kickasstorrents: 1.24 kickasstorrents: 1.24
btdigg: 1.22 btdigg: 1.23
legittorrents: 1.02 legittorrents: 1.02

5
src/searchengine/nova/nova2.py

@ -26,7 +26,7 @@
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
#VERSION: 1.31 #VERSION: 1.32
# Author: # Author:
# Fabien Devaux <fab AT gnux DOT info> # Fabien Devaux <fab AT gnux DOT info>
@ -41,6 +41,7 @@ import sys
import threading import threading
import os import os
import glob import glob
import urllib
import fix_encoding import fix_encoding
@ -138,7 +139,7 @@ if __name__ == '__main__':
if cat not in CATEGORIES: if cat not in CATEGORIES:
raise SystemExit('Invalid category!') raise SystemExit('Invalid category!')
what = '+'.join(sys.argv[3:]) what = urllib.quote(' '.join(sys.argv[3:]))
threads = [] threads = []
for engine in engines_list: for engine in engines_list:

4
src/searchengine/nova3/engines/btdigg.py

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
#VERSION: 1.21 #VERSION: 1.23
#AUTHORS: BTDigg team (research@btdigg.org) #AUTHORS: BTDigg team (research@btdigg.org)
# #
# GNU GENERAL PUBLIC LICENSE # GNU GENERAL PUBLIC LICENSE
@ -36,7 +36,7 @@ class btdigg(object):
pass pass
def search(self, what, cat='all'): def search(self, what, cat='all'):
req = urllib.parse.unquote(what).replace('+', ' ') req = urllib.parse.unquote(what)
u = urllib.request.urlopen('https://api.btdigg.org/api/public-8e9a50f8335b964f/s01?%s' % (urllib.parse.urlencode(dict(q = req)),)) u = urllib.request.urlopen('https://api.btdigg.org/api/public-8e9a50f8335b964f/s01?%s' % (urllib.parse.urlencode(dict(q = req)),))
try: try:

2
src/searchengine/nova3/engines/versions.txt

@ -4,5 +4,5 @@ piratebay: 2.00
vertor: 1.3 vertor: 1.3
extratorrent: 1.2 extratorrent: 1.2
kickasstorrents: 1.24 kickasstorrents: 1.24
btdigg: 1.21 btdigg: 1.23
legittorrents: 1.02 legittorrents: 1.02

4
src/searchengine/nova3/nova2.py

@ -26,7 +26,7 @@
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
#VERSION: 1.23 #VERSION: 1.24
# Author: # Author:
# Fabien Devaux <fab AT gnux DOT info> # Fabien Devaux <fab AT gnux DOT info>
@ -134,7 +134,7 @@ if __name__ == '__main__':
if cat not in CATEGORIES: if cat not in CATEGORIES:
raise SystemExit('Invalid category!') raise SystemExit('Invalid category!')
what = urllib.parse.quote('+'.join(sys.argv[3:])) what = urllib.parse.quote(' '.join(sys.argv[3:]))
threads = [] threads = []
for engine in engines_list: for engine in engines_list:

Loading…
Cancel
Save