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

Fix empty fields in dailymotion plugin

Browse source 
Change extension from flv to mp4, cause all quality formats are h264/mp4

Signed-off-by: Vincent Texier <vit@free.fr>
Signed-off-by: Romain Bignon <romain@symlink.me>
This commit is contained in:
Vincent Texier 2014-01-12 12:06:01 +01:00 • committed by Romain Bignon
commit a79ccec8bb
2 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

33
modules/dailymotion/pages.py
View file

@ -86,12 +86,37 @@ class VideoPage(BasePage):
if video is None:
video = DailymotionVideo(self.group_dict['id'])
div = self.parser.select(self.document.getroot(), 'div#content', 1)
head = self.parser.select(self.document.getroot(), 'head', 1)
video.title = unicode(self.parser.select(head, 'meta[property="og:title"]', 1).get("content")).strip()
video.author = unicode(self.parser.select(head, 'meta[name="author"]', 1).get("content")).strip()
url = unicode(self.parser.select(head, 'meta[property="og:image"]', 1).get("content")).strip()
# remove the useless anti-caching
url = re.sub('\?\d+', '', url)
video.thumbnail = BaseImage(url)
video.thumbnail.url = video.thumbnail.id
video.title = unicode(self.parser.select(div, 'div, meta[itemprop=name]', 1).get("content")).strip()
video.author = unicode(self.parser.select(div, 'div, meta[itemprop=author]', 1).get("content")).strip()
try:
video.description = html2text(self.parser.tostring(self.parser.select(div, 'div, meta[itemprop=description]', 1))).strip() or unicode()
parts = self.parser.select(head, 'meta[property="video:duration"]', 1).get("content").strip().split(':')
except BrokenPageError:
# it's probably a live, np.
video.duration = NotAvailable
else:
if len(parts) == 1:
seconds = parts[0]
hours = minutes = 0
elif len(parts) == 2:
minutes, seconds = parts
hours = 0
elif len(parts) == 3:
hours, minutes, seconds = parts
else:
raise BrokenPageError('Unable to parse duration %r' % parts)
video.duration = datetime.timedelta(hours=int(hours), minutes=int(minutes), seconds=int(seconds))
try:
video.description = html2text(self.parser.select(head, 'meta[property="og:description"]', 1).get("content")).strip() or unicode()
except BrokenPageError:
video.description = u''

2
modules/dailymotion/video.py
View file

@ -27,7 +27,7 @@ __all__ = ['DailymotionVideo']
class DailymotionVideo(BaseVideo):
def __init__(self, *args, **kwargs):
BaseVideo.__init__(self, *args, **kwargs)
self.ext = u'flv'
self.ext = u'mp4'
@classmethod
def id2url(cls, _id):