diff options
| author | pukkandan <pukkandan@gmail.com> | 2021-01-28 15:45:32 +0530 |
|---|---|---|
| committer | pukkandan <pukkandan@gmail.com> | 2021-01-28 15:57:37 +0530 |
| commit | bf330f5f2932f1d13eb57851f307bd7ea7523c8e (patch) | |
| tree | 1718017630e570183a6a6615276d99cf09ac5328 | |
| parent | f6d7624f57b1034d07d06b49cc8d2dacd6407b06 (diff) | |
| download | hypervideo-pre-bf330f5f2932f1d13eb57851f307bd7ea7523c8e.tar.lz hypervideo-pre-bf330f5f2932f1d13eb57851f307bd7ea7523c8e.tar.xz hypervideo-pre-bf330f5f2932f1d13eb57851f307bd7ea7523c8e.zip | |
[anvato] Workaround for anvato_token_generator import failing (Closes #35)
:ci skip dl
| -rw-r--r-- | youtube_dlc/extractor/anvato.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/youtube_dlc/extractor/anvato.py b/youtube_dlc/extractor/anvato.py index a6410311c..9b3867605 100644 --- a/youtube_dlc/extractor/anvato.py +++ b/youtube_dlc/extractor/anvato.py @@ -9,7 +9,6 @@ import re import time from .common import InfoExtractor -from .anvato_token_generator import NFLTokenGenerator from ..aes import aes_encrypt from ..compat import compat_str from ..utils import ( @@ -22,6 +21,15 @@ from ..utils import ( unsmuggle_url, ) +# This import causes a ModuleNotFoundError on some systems for unknown reason. +# See issues: +# https://github.com/pukkandan/yt-dlp/issues/35 +# https://github.com/ytdl-org/youtube-dl/issues/27449 +# https://github.com/animelover1984/youtube-dl/issues/17 +try: + from .anvato_token_generator import NFLTokenGenerator +except ImportError: + NFLTokenGenerator = None def md5_text(s): if not isinstance(s, compat_str): @@ -267,7 +275,7 @@ class AnvatoIE(InfoExtractor): 'anvrid': anvrid, 'anvts': server_time, } - if access_key in self._TOKEN_GENERATORS: + if self._TOKEN_GENERATORS.get(access_key) is not None: api['anvstk2'] = self._TOKEN_GENERATORS[access_key].generate(self, access_key, video_id) else: api['anvstk'] = md5_text('%s|%s|%d|%s' % ( |