X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fivi.py;h=b5a740a01e1d360ca667869edef88f85e3559842;hb=0c92f1e96b004fc7a04eac0759f115a535c8e03a;hp=0db023622dc0ce7287eb49682ee67c60835451c9;hpb=76d9eca43dd4fd7698d138b90ab6b2dd159559e0;p=youtube-dl
diff --git a/youtube_dl/extractor/ivi.py b/youtube_dl/extractor/ivi.py
index 0db023622..b5a740a01 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 (
@@ -91,11 +92,15 @@ class IviIE(InfoExtractor):
'contentid': video_id
}
]
- }).encode()
+ })
+
+ bundled = hasattr(sys, 'frozen')
for site in (353, 183):
- content_data = data % site
+ content_data = (data % site).encode()
if site == 353:
+ if bundled:
+ continue
try:
from Cryptodome.Cipher import Blowfish
from Cryptodome.Hash import CMAC
@@ -135,9 +140,13 @@ 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(
- 'pycryptodome not found. Please install it.',
+ 'pycryptodomex not found. Please install it.',
expected=True)
elif message:
extractor_msg += ': ' + message
@@ -230,7 +239,7 @@ class IviCompilationIE(InfoExtractor):
self.url_result(
'http://www.ivi.ru/watch/%s/%s' % (compilation_id, serie), IviIE.ie_key())
for serie in re.findall(
- r']+data-id="\1"' % compilation_id, html)]
+ r']+\bhref=["\']/watch/%s/(\d+)["\']' % compilation_id, html)]
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)