mirror of
https://codeberg.org/polarisfm/youtube-dl.git
synced 2024-12-24 16:51:36 +00:00
[ehow] Modernize
This commit is contained in:
parent
28acf5500a
commit
d26ebe990f
1 changed files with 20 additions and 23 deletions
|
@ -1,23 +1,25 @@
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
compat_urllib_parse,
|
compat_urllib_parse,
|
||||||
determine_ext
|
|
||||||
)
|
)
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
|
|
||||||
|
|
||||||
class EHowIE(InfoExtractor):
|
class EHowIE(InfoExtractor):
|
||||||
IE_NAME = u'eHow'
|
IE_NAME = 'eHow'
|
||||||
_VALID_URL = r'(?:https?://)?(?:www\.)?ehow\.com/[^/_?]*_(?P<id>[0-9]+)'
|
_VALID_URL = r'https?://(?:www\.)?ehow\.com/[^/_?]*_(?P<id>[0-9]+)'
|
||||||
_TEST = {
|
_TEST = {
|
||||||
u'url': u'http://www.ehow.com/video_12245069_hardwood-flooring-basics.html',
|
'url': 'http://www.ehow.com/video_12245069_hardwood-flooring-basics.html',
|
||||||
u'file': u'12245069.flv',
|
'md5': '9809b4e3f115ae2088440bcb4efbf371',
|
||||||
u'md5': u'9809b4e3f115ae2088440bcb4efbf371',
|
'info_dict': {
|
||||||
u'info_dict': {
|
'id': '12245069',
|
||||||
u"title": u"Hardwood Flooring Basics",
|
'ext': 'flv',
|
||||||
u"description": u"Hardwood flooring may be time consuming, but its ultimately a pretty straightforward concept. Learn about hardwood flooring basics with help from a hardware flooring business owner in this free video...",
|
'title': 'Hardwood Flooring Basics',
|
||||||
u"uploader": u"Erick Nathan"
|
'description': 'Hardwood flooring may be time consuming, but its ultimately a pretty straightforward concept. Learn about hardwood flooring basics with help from a hardware flooring business owner in this free video...',
|
||||||
|
'uploader': 'Erick Nathan',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,21 +28,16 @@ class EHowIE(InfoExtractor):
|
||||||
video_id = mobj.group('id')
|
video_id = mobj.group('id')
|
||||||
webpage = self._download_webpage(url, video_id)
|
webpage = self._download_webpage(url, video_id)
|
||||||
video_url = self._search_regex(r'(?:file|source)=(http[^\'"&]*)',
|
video_url = self._search_regex(r'(?:file|source)=(http[^\'"&]*)',
|
||||||
webpage, u'video URL')
|
webpage, 'video URL')
|
||||||
final_url = compat_urllib_parse.unquote(video_url)
|
final_url = compat_urllib_parse.unquote(video_url)
|
||||||
uploader = self._search_regex(r'<meta name="uploader" content="(.+?)" />',
|
uploader = self._html_search_meta('uploader', webpage)
|
||||||
webpage, u'uploader')
|
|
||||||
title = self._og_search_title(webpage).replace(' | eHow', '')
|
title = self._og_search_title(webpage).replace(' | eHow', '')
|
||||||
ext = determine_ext(final_url)
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'_type': 'video',
|
'id': video_id,
|
||||||
'id': video_id,
|
'url': final_url,
|
||||||
'url': final_url,
|
'title': title,
|
||||||
'ext': ext,
|
'thumbnail': self._og_search_thumbnail(webpage),
|
||||||
'title': title,
|
|
||||||
'thumbnail': self._og_search_thumbnail(webpage),
|
|
||||||
'description': self._og_search_description(webpage),
|
'description': self._og_search_description(webpage),
|
||||||
'uploader': uploader,
|
'uploader': uploader,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue