mirror of
				https://github.com/ytdl-org/youtube-dl
				synced 2025-11-04 03:33:46 +00:00 
			
		
		
		
	[ivi] Skip s353 for bundled exe
See https://github.com/Legrandin/pycryptodome/issues/228
This commit is contained in:
		
							parent
							
								
									f8015c1574
								
							
						
					
					
						commit
						80a51fc2ef
					
				@ -1,8 +1,9 @@
 | 
				
			|||||||
# coding: utf-8
 | 
					# coding: utf-8
 | 
				
			||||||
from __future__ import unicode_literals
 | 
					from __future__ import unicode_literals
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import re
 | 
					 | 
				
			||||||
import json
 | 
					import json
 | 
				
			||||||
 | 
					import re
 | 
				
			||||||
 | 
					import sys
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from .common import InfoExtractor
 | 
					from .common import InfoExtractor
 | 
				
			||||||
from ..utils import (
 | 
					from ..utils import (
 | 
				
			||||||
@ -93,9 +94,13 @@ class IviIE(InfoExtractor):
 | 
				
			|||||||
            ]
 | 
					            ]
 | 
				
			||||||
        })
 | 
					        })
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        bundled = hasattr(sys, 'frozen')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        for site in (353, 183):
 | 
					        for site in (353, 183):
 | 
				
			||||||
            content_data = (data % site).encode()
 | 
					            content_data = (data % site).encode()
 | 
				
			||||||
            if site == 353:
 | 
					            if site == 353:
 | 
				
			||||||
 | 
					                if bundled:
 | 
				
			||||||
 | 
					                    continue
 | 
				
			||||||
                try:
 | 
					                try:
 | 
				
			||||||
                    from Cryptodome.Cipher import Blowfish
 | 
					                    from Cryptodome.Cipher import Blowfish
 | 
				
			||||||
                    from Cryptodome.Hash import CMAC
 | 
					                    from Cryptodome.Hash import CMAC
 | 
				
			||||||
@ -135,6 +140,10 @@ class IviIE(InfoExtractor):
 | 
				
			|||||||
                    extractor_msg = 'Video %s does not exist'
 | 
					                    extractor_msg = 'Video %s does not exist'
 | 
				
			||||||
                elif site == 353:
 | 
					                elif site == 353:
 | 
				
			||||||
                    continue
 | 
					                    continue
 | 
				
			||||||
 | 
					                elif bundled:
 | 
				
			||||||
 | 
					                    raise ExtractorError(
 | 
				
			||||||
 | 
					                        'This feature does not work from bundled exe. Run youtube-dl from sources.',
 | 
				
			||||||
 | 
					                        expected=True)
 | 
				
			||||||
                elif not pycryptodomex_found:
 | 
					                elif not pycryptodomex_found:
 | 
				
			||||||
                    raise ExtractorError(
 | 
					                    raise ExtractorError(
 | 
				
			||||||
                        'pycryptodomex not found. Please install it.',
 | 
					                        'pycryptodomex not found. Please install it.',
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user