diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-09-28 08:53:52 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-09-28 08:53:52 +0200 |
| commit | f4b1c7adb81555fde0dff390b48e4139438b4071 (patch) | |
| tree | 75d322031629fbc955b6b83c0c7b93b071c1729f | |
| parent | c95eeb7b80e5007259df260b64874b675a802431 (diff) | |
| download | youtube-dl-f4b1c7adb81555fde0dff390b48e4139438b4071.tar.gz youtube-dl-f4b1c7adb81555fde0dff390b48e4139438b4071.tar.xz youtube-dl-f4b1c7adb81555fde0dff390b48e4139438b4071.zip | |
[muenchentv] Move live title generation to common
| -rw-r--r-- | youtube_dl/extractor/common.py | 7 | ||||
| -rw-r--r-- | youtube_dl/extractor/muenchentv.py | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 60cab6f4e..403791e6b 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals import base64 +import datetime import hashlib import json import netrc @@ -705,6 +706,12 @@ class InfoExtractor(object): self._sort_formats(formats) return formats + def _live_title(self, name): + """ Generate the title for a live video """ + now = datetime.datetime.now() + now_str = now.strftime("%Y-%m-%d %H:%M") + return name + ' ' + now_str + class SearchInfoExtractor(InfoExtractor): """ diff --git a/youtube_dl/extractor/muenchentv.py b/youtube_dl/extractor/muenchentv.py index 3a938861b..7cb6749be 100644 --- a/youtube_dl/extractor/muenchentv.py +++ b/youtube_dl/extractor/muenchentv.py @@ -1,7 +1,6 @@ # coding: utf-8 from __future__ import unicode_literals -import datetime import json from .common import InfoExtractor @@ -33,9 +32,7 @@ class MuenchenTVIE(InfoExtractor): 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:', |