projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
release 2014.12.12.1
[youtube-dl]
/
youtube_dl
/
extractor
/
muenchentv.py
diff --git
a/youtube_dl/extractor/muenchentv.py
b/youtube_dl/extractor/muenchentv.py
index 3a938861bbfb38b70ee9ad18621769af8bf9c367..b4e8ad17e9003940e5753349e30b4857c4c8aa6a 100644
(file)
--- a/
youtube_dl/extractor/muenchentv.py
+++ b/
youtube_dl/extractor/muenchentv.py
@@
-1,7
+1,6
@@
# coding: utf-8
from __future__ import unicode_literals
# coding: utf-8
from __future__ import unicode_literals
-import datetime
import json
from .common import InfoExtractor
import json
from .common import InfoExtractor
@@
-23,6
+22,7
@@
class MuenchenTVIE(InfoExtractor):
'ext': 'mp4',
'title': 're:^münchen.tv-Livestream [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
'is_live': True,
'ext': 'mp4',
'title': 're:^münchen.tv-Livestream [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
'is_live': True,
+ 'thumbnail': 're:^https?://.*\.jpg$'
},
'params': {
'skip_download': True,
},
'params': {
'skip_download': True,
@@
-33,9
+33,7
@@
class MuenchenTVIE(InfoExtractor):
display_id = 'live'
webpage = self._download_webpage(url, display_id)
display_id = 'live'
webpage = self._download_webpage(url, display_id)
- now = datetime.datetime.now()
- now_str = now.strftime("%Y-%m-%d %H:%M")
- title = self._og_search_title(webpage) + ' ' + now_str
+ title = self._live_title(self._og_search_title(webpage))
data_js = self._search_regex(
r'(?s)\nplaylist:\s*(\[.*?}\]),related:',
data_js = self._search_regex(
r'(?s)\nplaylist:\s*(\[.*?}\]),related:',
@@
-73,5
+71,5
@@
class MuenchenTVIE(InfoExtractor):
'title': title,
'formats': formats,
'is_live': True,
'title': title,
'formats': formats,
'is_live': True,
+ 'thumbnail': thumbnail,
}
}
-