projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7f9ced6
)
[motherless] Simplify
author
Philipp Hagemeister
<phihag@phihag.de>
Fri, 24 Oct 2014 17:53:48 +0000
(19:53 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Fri, 24 Oct 2014 17:53:48 +0000
(19:53 +0200)
youtube_dl/extractor/motherless.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/motherless.py
b/youtube_dl/extractor/motherless.py
index 50083bd4a6072578e03fd9ebb74725262fc6a4a4..3621ff99e76da1bffabda1a81f6181fd4a6ed61c 100644
(file)
--- a/
youtube_dl/extractor/motherless.py
+++ b/
youtube_dl/extractor/motherless.py
@@
-5,7
+5,7
@@
import re
from .common import InfoExtractor
from ..utils import (
from .common import InfoExtractor
from ..utils import (
-
int_or_none
,
+
str_to_int
,
unified_strdate,
)
unified_strdate,
)
@@
-57,30
+57,34
@@
class MotherlessIE(InfoExtractor):
}
]
}
]
- def _real_extract(self,url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
-
+ def _real_extract(self, url):
+ video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
webpage = self._download_webpage(url, video_id)
- title = self._html_search_regex(r'id="view-upload-title">\s+([^<]+)<', webpage, 'title')
-
- video_url = self._html_search_regex(r'setup\(\{\s+"file".+: "([^"]+)",', webpage, 'video_url')
+ title = self._html_search_regex(
+ r'id="view-upload-title">\s+([^<]+)<', webpage, 'title')
+ video_url = self._html_search_regex(
+ r'setup\(\{\s+"file".+: "([^"]+)",', webpage, 'video URL')
age_limit = self._rta_search(webpage)
age_limit = self._rta_search(webpage)
-
- view_count = self._html_search_regex(r'<strong>Views</strong>\s+([^<]+)<', webpage, 'view_count')
+ view_count = str_to_int(self._html_search_regex(
+ r'<strong>Views</strong>\s+([^<]+)<',
+ webpage, 'view count', fatal=False))
+ like_count = str_to_int(self._html_search_regex(
+ r'<strong>Favorited</strong>\s+([^<]+)<',
+ webpage, 'like count', fatal=False))
- upload_date = self._html_search_regex(r'<strong>Uploaded</strong>\s+([^<]+)<', webpage, 'upload_date')
+ upload_date = self._html_search_regex(
+ r'<strong>Uploaded</strong>\s+([^<]+)<', webpage, 'upload date')
if 'Ago' in upload_date:
days = int(re.search(r'([0-9]+)', upload_date).group(1))
upload_date = (datetime.datetime.now() - datetime.timedelta(days=days)).strftime('%Y%m%d')
else:
upload_date = unified_strdate(upload_date)
if 'Ago' in upload_date:
days = int(re.search(r'([0-9]+)', upload_date).group(1))
upload_date = (datetime.datetime.now() - datetime.timedelta(days=days)).strftime('%Y%m%d')
else:
upload_date = unified_strdate(upload_date)
- like_count = self._html_search_regex(r'<strong>Favorited</strong>\s+([^<]+)<', webpage, 'like_count')
-
comment_count = webpage.count('class="media-comment-contents"')
comment_count = webpage.count('class="media-comment-contents"')
- uploader_id = self._html_search_regex(r'"thumb-member-username">\s+<a href="/m/([^"]+)"', webpage, 'uploader_id')
+ uploader_id = self._html_search_regex(
+ r'"thumb-member-username">\s+<a href="/m/([^"]+)"',
+ webpage, 'uploader_id')
categories = self._html_search_meta('keywords', webpage)
if categories:
categories = self._html_search_meta('keywords', webpage)
if categories:
@@
-93,8
+97,8
@@
class MotherlessIE(InfoExtractor):
'uploader_id': uploader_id,
'thumbnail': self._og_search_thumbnail(webpage),
'categories': categories,
'uploader_id': uploader_id,
'thumbnail': self._og_search_thumbnail(webpage),
'categories': categories,
- 'view_count':
int_or_none(view_count.replace(',', ''))
,
- 'like_count':
int_or_none(like_count.replace(',', ''))
,
+ 'view_count':
view_count
,
+ 'like_count':
like_count
,
'comment_count': comment_count,
'age_limit': age_limit,
'url': video_url,
'comment_count': comment_count,
'age_limit': age_limit,
'url': video_url,