Initiate new release.

[youtubedl] / youtube_dl / extractor / funimation.py

diff --git a/youtube_dl/extractor/funimation.py b/youtube_dl/extractor/funimation.py
index 107f658baf2c393036dd4d2c770c01258e29e1a9..8bbedca269233b2ba4bdd02febf7d8e63007feb4 100644 (file)
--- a/youtube_dl/extractor/funimation.py
+++ b/youtube_dl/extractor/funimation.py
@@ -1,6 +1,9 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
 # coding: utf-8
 from __future__ import unicode_literals
 

+import random
+import string
+

 from .common import InfoExtractor
 from ..compat import compat_HTTPError
 from ..utils import (
 from .common import InfoExtractor
 from ..compat import compat_HTTPError
 from ..utils import (


@@ -51,7 +54,7 @@ class FunimationIE(InfoExtractor):
     }]
 
     def _login(self):
     }]
 
     def _login(self):

-        (username, password) = self._get_login_info()
+        username, password = self._get_login_info()

         if username is None:
             return
         try:
         if username is None:
             return
         try:


@@ -87,7 +90,7 @@ class FunimationIE(InfoExtractor):
 
         video_id = title_data.get('id') or self._search_regex([
             r"KANE_customdimensions.videoID\s*=\s*'(\d+)';",
 
         video_id = title_data.get('id') or self._search_regex([
             r"KANE_customdimensions.videoID\s*=\s*'(\d+)';",

-            r'<iframe[^>]+src="/player/(\d+)"',
+            r'<iframe[^>]+src="/player/(\d+)',

         ], webpage, 'video_id', default=None)
         if not video_id:
             player_url = self._html_search_meta([
         ], webpage, 'video_id', default=None)
         if not video_id:
             player_url = self._html_search_meta([


@@ -108,8 +111,10 @@ class FunimationIE(InfoExtractor):
             if self._TOKEN:
                 headers['Authorization'] = 'Token %s' % self._TOKEN
             sources = self._download_json(
             if self._TOKEN:
                 headers['Authorization'] = 'Token %s' % self._TOKEN
             sources = self._download_json(

-                'https://prod-api-funimationnow.dadcdigital.com/api/source/catalog/video/%s/signed/' % video_id,
-                video_id, headers=headers)['items']
+                'https://www.funimation.com/api/showexperience/%s/' % video_id,
+                video_id, headers=headers, query={
+                    'pinst_id': ''.join([random.choice(string.digits + string.ascii_letters) for _ in range(8)]),
+                })['items']

         except ExtractorError as e:
             if isinstance(e.cause, compat_HTTPError) and e.cause.code == 403:
                 error = self._parse_json(e.cause.read(), video_id)['errors'][0]
         except ExtractorError as e:
             if isinstance(e.cause, compat_HTTPError) and e.cause.code == 403:
                 error = self._parse_json(e.cause.read(), video_id)['errors'][0]