aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-06-15 03:43:33 +0600
committerSergey M․ <dstftw@gmail.com>2015-06-15 03:43:33 +0600
commit67d95f177c7ffedfc8f8b086535013a1a7a48b29 (patch)
tree2186d6a255e802b1cb3df1f0616cddc0300a19af /youtube_dl
parent44773ad125001ee42cba3aaf85d98d40ff840981 (diff)
[niconico] Simplify format info
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/niconico.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/youtube_dl/extractor/niconico.py b/youtube_dl/extractor/niconico.py
index e10348004..0f8aa5ada 100644
--- a/youtube_dl/extractor/niconico.py
+++ b/youtube_dl/extractor/niconico.py
@@ -182,12 +182,6 @@ class NiconicoIE(InfoExtractor):
extension = xpath_text(video_info, './/movie_type')
if not extension:
extension = determine_ext(video_real_url)
- video_format = extension.upper()
-
- if video_real_url.endswith('low'):
- format_note = 'low'
- else:
- format_note = 'src'
thumbnail = (
xpath_text(video_info, './/thumbnail_url') or
@@ -246,8 +240,7 @@ class NiconicoIE(InfoExtractor):
'url': video_real_url,
'title': title,
'ext': extension,
- 'format': video_format,
- 'format_note' : format_note,
+ 'format_id': 'economy' if video_real_url.endswith('low') else 'normal',
'thumbnail': thumbnail,
'description': description,
'uploader': uploader,