debian/patches/remove-autoupdate-mechanism.patch: Remove fewer things to avoid future...

[youtubedl] / youtube_dl / extractor / miomio.py

diff --git a/youtube_dl/extractor/miomio.py b/youtube_dl/extractor/miomio.py
index ec1b4c4fea111ded48f530c7020dd9aabd38dbb8..40f72d66f25eb33d2fdb75c8a03e37d873b26afe 100644 (file)
--- a/youtube_dl/extractor/miomio.py
+++ b/youtube_dl/extractor/miomio.py
@@ -51,6 +51,7 @@ class MioMioIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'マツコの知らない世界【劇的進化SP！ビニール傘＆冷凍食品2016】 1_2 - 16 05 31',
         },
             'ext': 'mp4',
             'title': 'マツコの知らない世界【劇的進化SP！ビニール傘＆冷凍食品2016】 1_2 - 16 05 31',
         },

+        'skip': 'Unable to load videos',

     }]
 
     def _extract_mioplayer(self, webpage, video_id, title, http_headers):
     }]
 
     def _extract_mioplayer(self, webpage, video_id, title, http_headers):


@@ -94,9 +95,18 @@ class MioMioIE(InfoExtractor):
 
         return entries
 
 
         return entries
 

+    def _download_chinese_webpage(self, *args, **kwargs):
+        # Requests with English locales return garbage
+        headers = {
+            'Accept-Language': 'zh-TW,en-US;q=0.7,en;q=0.3',
+        }
+        kwargs.setdefault('headers', {}).update(headers)
+        return self._download_webpage(*args, **kwargs)
+

     def _real_extract(self, url):
         video_id = self._match_id(url)
     def _real_extract(self, url):
         video_id = self._match_id(url)

-        webpage = self._download_webpage(url, video_id)
+        webpage = self._download_chinese_webpage(
+            url, video_id)

 
         title = self._html_search_meta(
             'description', webpage, 'title', fatal=True)
 
         title = self._html_search_meta(
             'description', webpage, 'title', fatal=True)


@@ -106,7 +116,7 @@ class MioMioIE(InfoExtractor):
 
         if '_h5' in mioplayer_path:
             player_url = compat_urlparse.urljoin(url, mioplayer_path)
 
         if '_h5' in mioplayer_path:
             player_url = compat_urlparse.urljoin(url, mioplayer_path)

-            player_webpage = self._download_webpage(
+            player_webpage = self._download_chinese_webpage(

                 player_url, video_id,
                 note='Downloading player webpage', headers={'Referer': url})
             entries = self._parse_html5_media_entries(player_url, player_webpage, video_id)
                 player_url, video_id,
                 note='Downloading player webpage', headers={'Referer': url})
             entries = self._parse_html5_media_entries(player_url, player_webpage, video_id)