]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[viki] Do not use a fallback language for title in the first try
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 11 Jun 2016 15:00:44 +0000 (23:00 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 11 Jun 2016 15:00:44 +0000 (23:00 +0800)
In test_Viki_3, 'titles' gives a Hebrew title.

youtube_dl/extractor/viki.py

index 70ce5de0e4d059790b65c6f698aa67ecbea26c77..efa15e0b633f56dc24c15eeb4e63889cbb084ab3 100644 (file)
@@ -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', {})