From: Sergey M․ <dstftw@gmail.com>
Date: Sun, 14 Jun 2015 21:43:33 +0000 (+0600)
Subject: [niconico] Simplify format info
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=67d95f177c7ffedfc8f8b086535013a1a7a48b29;p=youtube-dl.git

[niconico] Simplify format info
---

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,