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

use to_unicode since ENCODING is None

Browse source
This commit is contained in:
Christophe Benz 2010-07-14 02:30:54 +02:00 • committed by Romain Bignon
commit 90756cddc9
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
weboob/backends/youjizz/browser.py
View file

@ -23,7 +23,7 @@ import urllib
from weboob.tools.browser import BaseBrowser, BrowserUnavailable from weboob.tools.browser import BaseBrowser, BrowserUnavailable
from weboob.tools.browser.decorators import check_domain, id2url from weboob.tools.browser.decorators import check_domain, id2url
from weboob.tools.misc import iter_fields from weboob.tools.misc import iter_fields, to_unicode
from .pages.index import IndexPage from .pages.index import IndexPage
from .video import YoujizzVideo from .video import YoujizzVideo
@ -42,8 +42,6 @@ class YoujizzBrowser(BaseBrowser):
@id2url(YoujizzVideo.id2url) @id2url(YoujizzVideo.id2url)
def get_video(self, url, video=None): def get_video(self, url, video=None):
if video is None:
video = YoujizzVideo()
try: try:
data = self.openurl(url.encode('utf-8')).read() data = self.openurl(url.encode('utf-8')).read()
except BrowserUnavailable: except BrowserUnavailable:
@ -58,14 +56,15 @@ class YoujizzBrowser(BaseBrowser):
return video_file_urls[0] return video_file_urls[0]
m = re.search(r'http://.*youjizz\.com/videos/(.+)\.html', url) m = re.search(r'http://.*youjizz\.com/videos/(.+)\.html', url)
_id = unicode(m.group(1)) if m else None _id = unicode(m.group(1)) if m else None
if video is None:
video = YoujizzVideo(_id)
m = re.search(r'<title>(.+)</title>', data) m = re.search(r'<title>(.+)</title>', data)
title = unicode(m.group(1)) if m else None title = to_unicode(m.group(1)) if m else None
m = re.search(r'<strong>.*Runtime.*</strong>(.+)<br.*>', data) m = re.search(r'<strong>.*Runtime.*</strong>(.+)<br.*>', data)
if m: if m:
minutes, seconds = (int(v) for v in unicode(m.group(1).strip()).split(':')) minutes, seconds = (int(v) for v in unicode(m.group(1).strip()).split(':'))
else: else:
minutes = seconds = 0 minutes = seconds = 0
video._id = _id
video.title = title video.title = title
video.url = _get_url() video.url = _get_url()
video.duration = datetime.timedelta(minutes=minutes, seconds=seconds) video.duration = datetime.timedelta(minutes=minutes, seconds=seconds)