aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2019-11-22 01:10:24 +0700
committerSergey M․ <dstftw@gmail.com>2019-11-22 01:10:24 +0700
commit80a51fc2ef3ebb7d3e3d5fd0b6e9942bb4be6f4d (patch)
treeb368c5a82498dfe415adad59de3c94ce10eae548
parentf8015c15746e83394ecc395c6a13823d20971772 (diff)
[ivi] Skip s353 for bundled exe
See https://github.com/Legrandin/pycryptodome/issues/228
-rw-r--r--youtube_dl/extractor/ivi.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/youtube_dl/extractor/ivi.py b/youtube_dl/extractor/ivi.py
index 315ea03fa..a502e8806 100644
--- a/youtube_dl/extractor/ivi.py
+++ b/youtube_dl/extractor/ivi.py
@@ -1,8 +1,9 @@
# coding: utf-8
from __future__ import unicode_literals
-import re
import json
+import re
+import sys
from .common import InfoExtractor
from ..utils import (
@@ -93,9 +94,13 @@ class IviIE(InfoExtractor):
]
})
+ bundled = hasattr(sys, 'frozen')
+
for site in (353, 183):
content_data = (data % site).encode()
if site == 353:
+ if bundled:
+ continue
try:
from Cryptodome.Cipher import Blowfish
from Cryptodome.Hash import CMAC
@@ -135,6 +140,10 @@ class IviIE(InfoExtractor):
extractor_msg = 'Video %s does not exist'
elif site == 353:
continue
+ elif bundled:
+ raise ExtractorError(
+ 'This feature does not work from bundled exe. Run youtube-dl from sources.',
+ expected=True)
elif not pycryptodomex_found:
raise ExtractorError(
'pycryptodomex not found. Please install it.',