nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

new method BaseBrowser.buildurl()

Browse source
This commit is contained in:
Romain Bignon 2010-05-12 11:05:45 +02:00
commit 0dbf00f7ac
3 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
weboob/backends/gazelle/browser.py
View file

@ -22,7 +22,6 @@ from weboob.tools.browser import BaseBrowser
from .pages.index import IndexPage, LoginPage from .pages.index import IndexPage, LoginPage
from .pages.torrents import TorrentsPage from .pages.torrents import TorrentsPage
import urllib
__all__ = ['GazelleBrowser'] __all__ = ['GazelleBrowser']
@ -61,7 +60,7 @@ class GazelleBrowser(BaseBrowser):
return self.location('%s://%s/login.php' % (self.PROTOCOL, self.DOMAIN)) return self.location('%s://%s/login.php' % (self.PROTOCOL, self.DOMAIN))
def iter_torrents(self, pattern): def iter_torrents(self, pattern):
self.location('/torrents.php?searchstr=%s' % urllib.quote_plus(pattern)) self.location(self.buildurl('/torrents.php', searchstr=pattern))
assert self.is_on_page(TorrentsPage) assert self.is_on_page(TorrentsPage)
return self.page.iter_torrents() return self.page.iter_torrents()

4
weboob/backends/youporn/browser.py
View file

@ -18,8 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
""" """
import urllib
from weboob.tools.browser import BaseBrowser from weboob.tools.browser import BaseBrowser
from .pages.index import IndexPage from .pages.index import IndexPage
@ -47,7 +45,7 @@ class YoupornBrowser(BaseBrowser):
if not pattern: if not pattern:
self.home() self.home()
else: else:
self.location('/search/%s?query=%s' % (sortby, urllib.quote_plus(pattern))) self.location(self.buildurl('/search/%s' % sortby, query=pattern))
assert self.is_on_page(IndexPage) assert self.is_on_page(IndexPage)
return self.page.iter_videos() return self.page.iter_videos()

22
weboob/tools/browser.py
View file

@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
""" """
import mechanize import mechanize
import urllib
import urllib2 import urllib2
import ClientForm import ClientForm
import re import re
@ -305,6 +306,27 @@ class BaseBrowser(mechanize.Browser):
if self._cookie: if self._cookie:
self._cookie.save() self._cookie.save()
def buildurl(self, base, *args, **kwargs):
"""
Build an URL and escape arguments.
You can give a serie of tuples in *args (and the order is keept), or
a dict in **kwargs (but the order is lost).
Example:
>>> buildurl('/blah.php', ('a', '&'), ('c', '=')
'/blah.php?a=%26&b=%3D'
>>> buildurl('/blah.php', a='&', 'c'='=')
'/blah.php?b=%3D&a=%26'
"""
if not args:
args = kwargs
if not args:
return base
else:
return '%s?%s' % (base, urllib.urlencode(args))
def str(self, s): def str(self, s):
if isinstance(s, unicode): if isinstance(s, unicode):
s = s.encode('iso-8859-15', 'replace') s = s.encode('iso-8859-15', 'replace')