From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 11 Jun 2016 15:00:44 +0000 (+0800)
Subject: [viki] Do not use a fallback language for title in the first try
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=6d28c408cfb0ce42f591cc6e2bb67522c0812c72;p=youtube-dl

[viki] Do not use a fallback language for title in the first try

In test_Viki_3, 'titles' gives a Hebrew title.
---

diff --git a/youtube_dl/extractor/viki.py b/youtube_dl/extractor/viki.py
index 70ce5de0e..efa15e0b6 100644
--- a/youtube_dl/extractor/viki.py
+++ b/youtube_dl/extractor/viki.py
@@ -101,10 +101,13 @@ class VikiBaseIE(InfoExtractor):
             self.report_warning('Unable to get session token, login has probably failed')
 
     @staticmethod
-    def dict_selection(dict_obj, preferred_key):
+    def dict_selection(dict_obj, preferred_key, allow_fallback=True):
         if preferred_key in dict_obj:
             return dict_obj.get(preferred_key)
 
+        if not allow_fallback:
+            return
+
         filtered_dict = list(filter(None, [dict_obj.get(k) for k in dict_obj.keys()]))
         return filtered_dict[0] if filtered_dict else None
 
@@ -218,7 +221,7 @@ class VikiIE(VikiBaseIE):
 
         self._check_errors(video)
 
-        title = self.dict_selection(video.get('titles', {}), 'en')
+        title = self.dict_selection(video.get('titles', {}), 'en', allow_fallback=False)
         if not title:
             title = 'Episode %d' % video.get('number') if video.get('type') == 'episode' else video.get('id') or video_id
             container_titles = video.get('container', {}).get('titles', {})