projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[nrk] Improve _VALID_URL
[youtube-dl]
/
youtube_dl
/
extractor
/
cbslocal.py
diff --git
a/youtube_dl/extractor/cbslocal.py
b/youtube_dl/extractor/cbslocal.py
index 74adb38a6cbac2cdda2a87dff49876389c9cf75e..4bcd104af7463b1cc4b9c6c88673cafc9ad655e7 100644
(file)
--- a/
youtube_dl/extractor/cbslocal.py
+++ b/
youtube_dl/extractor/cbslocal.py
@@
-1,12
+1,10
@@
# coding: utf-8
from __future__ import unicode_literals
# coding: utf-8
from __future__ import unicode_literals
-import calendar
-import datetime
-
from .anvato import AnvatoIE
from .sendtonews import SendtoNewsIE
from ..compat import compat_urlparse
from .anvato import AnvatoIE
from .sendtonews import SendtoNewsIE
from ..compat import compat_urlparse
+from ..utils import unified_timestamp
class CBSLocalIE(AnvatoIE):
class CBSLocalIE(AnvatoIE):
@@
-43,13
+41,8
@@
class CBSLocalIE(AnvatoIE):
'url': 'http://cleveland.cbslocal.com/2016/05/16/indians-score-season-high-15-runs-in-blowout-win-over-reds-rapid-reaction/',
'info_dict': {
'id': 'GxfCe0Zo7D-175909-5588',
'url': 'http://cleveland.cbslocal.com/2016/05/16/indians-score-season-high-15-runs-in-blowout-win-over-reds-rapid-reaction/',
'info_dict': {
'id': 'GxfCe0Zo7D-175909-5588',
- 'ext': 'mp4',
- 'title': 'Recap: CLE 15, CIN 6',
- 'description': '5/16/16: Indians\' bats explode for 15 runs in a win',
- 'upload_date': '20160516',
- 'timestamp': 1463433840,
- 'duration': 49,
},
},
+ 'playlist_count': 9,
'params': {
# m3u8 download
'skip_download': True,
'params': {
# m3u8 download
'skip_download': True,
@@
-62,19
+55,15
@@
class CBSLocalIE(AnvatoIE):
sendtonews_url = SendtoNewsIE._extract_url(webpage)
if sendtonews_url:
sendtonews_url = SendtoNewsIE._extract_url(webpage)
if sendtonews_url:
- info_dict = {
- '_type': 'url_transparent',
- 'url': compat_urlparse.urljoin(url, sendtonews_url),
- }
- else:
- info_dict = self._extract_anvato_videos(webpage, display_id)
+ return self.url_result(
+ compat_urlparse.urljoin(url, sendtonews_url),
+ ie=SendtoNewsIE.ie_key())
+
+ info_dict = self._extract_anvato_videos(webpage, display_id)
time_str = self._html_search_regex(
r'class="entry-date">([^<]+)<', webpage, 'released date', fatal=False)
time_str = self._html_search_regex(
r'class="entry-date">([^<]+)<', webpage, 'released date', fatal=False)
- timestamp = None
- if time_str:
- timestamp = calendar.timegm(datetime.datetime.strptime(
- time_str, '%b %d, %Y %I:%M %p').timetuple())
+ timestamp = unified_timestamp(time_str)
info_dict.update({
'display_id': display_id,
info_dict.update({
'display_id': display_id,