projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[extractor/common] Print origin country for fake IP
[youtube-dl]
/
youtube_dl
/
extractor
/
hbo.py
diff --git
a/youtube_dl/extractor/hbo.py
b/youtube_dl/extractor/hbo.py
index 3606d64fd0949ea7b5de2626dfffaf00151398e1..8116ad9bd42f840bc5875070d5f40e8d904b7abb 100644
(file)
--- a/
youtube_dl/extractor/hbo.py
+++ b/
youtube_dl/extractor/hbo.py
@@
-120,7
+120,7
@@
class HBOIE(HBOBaseIE):
'id': '1437839',
'ext': 'mp4',
'title': 'Ep. 64 Clip: Encryption',
'id': '1437839',
'ext': 'mp4',
'title': 'Ep. 64 Clip: Encryption',
- 'thumbnail': 're:https?://.*\.jpg$',
+ 'thumbnail':
r
're:https?://.*\.jpg$',
'duration': 1072,
}
}
'duration': 1072,
}
}
@@
-138,11
+138,15
@@
class HBOEpisodeIE(HBOBaseIE):
'md5': '689132b253cc0ab7434237fc3a293210',
'info_dict': {
'id': '1439518',
'md5': '689132b253cc0ab7434237fc3a293210',
'info_dict': {
'id': '1439518',
+ 'display_id': 'ep-52-inside-the-episode',
'ext': 'mp4',
'title': 'Ep. 52: Inside the Episode',
'ext': 'mp4',
'title': 'Ep. 52: Inside the Episode',
- 'thumbnail': 're:https?://.*\.jpg$',
+ 'thumbnail':
r
're:https?://.*\.jpg$',
'duration': 240,
},
'duration': 240,
},
+ }, {
+ 'url': 'http://www.hbo.com/game-of-thrones/about/video/season-5-invitation-to-the-set.html?autoplay=true',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-154,4
+158,7
@@
class HBOEpisodeIE(HBOBaseIE):
r'(?P<q1>[\'"])videoId(?P=q1)\s*:\s*(?P<q2>[\'"])(?P<video_id>\d+)(?P=q2)',
webpage, 'video ID', group='video_id')
r'(?P<q1>[\'"])videoId(?P=q1)\s*:\s*(?P<q2>[\'"])(?P<video_id>\d+)(?P=q2)',
webpage, 'video ID', group='video_id')
- return self._extract_from_id(video_id)
+ info_dict = self._extract_from_id(video_id)
+ info_dict['display_id'] = display_id
+
+ return info_dict