]> jfr.im git - yt-dlp.git/commitdiff
[devscripts/pyinstaller] Analyze sub-modules of `Cryptodome`
authorpukkandan <redacted>
Thu, 9 Feb 2023 06:26:12 +0000 (11:56 +0530)
committerpukkandan <redacted>
Sat, 11 Feb 2023 21:37:32 +0000 (03:07 +0530)
Ref: https://github.com/yt-dlp/yt-dlp/issues/6185#issuecomment-1423523986

yt_dlp/__pyinstaller/hook-yt_dlp.py

index 66d1b636946cadcce617cbefb15e4275c091cbf7..057cfef2f9ca0d3d85460d2289349e6d9a2231f1 100644 (file)
@@ -1,9 +1,31 @@
+import ast
+import os
 import sys
+from pathlib import Path
 
 from PyInstaller.utils.hooks import collect_submodules
 
 
-def _pycryptodome_module():
+def find_attribute_accesses(node, name, path=()):
+    if isinstance(node, ast.Attribute):
+        path = [*path, node.attr]
+        if isinstance(node.value, ast.Name) and node.value.id == name:
+            yield path[::-1]
+    for child in ast.iter_child_nodes(node):
+        yield from find_attribute_accesses(child, name, path)
+
+
+def collect_used_submodules(name, level):
+    for dirpath, _, filenames in os.walk(Path(__file__).parent.parent):
+        for filename in filenames:
+            if not filename.endswith('.py'):
+                continue
+            with open(Path(dirpath) / filename, encoding='utf8') as f:
+                for submodule in find_attribute_accesses(ast.parse(f.read()), name):
+                    yield '.'.join(submodule[:level])
+
+
+def pycryptodome_module():
     try:
         import Cryptodome  # noqa: F401
     except ImportError:
@@ -17,13 +39,19 @@ def _pycryptodome_module():
     return 'Cryptodome'
 
 
-def _hidden_imports():
+def get_hidden_imports():
     yield 'yt_dlp.compat._legacy'
-    for m in [_pycryptodome_module(), 'websockets']:
-        yield from collect_submodules(m)
+    yield from collect_submodules('websockets')
+
+    crypto = pycryptodome_module()
+    for sm in set(collect_used_submodules('Cryptodome', 2)):
+        yield f'{crypto}.{sm}'
+
     # These are auto-detected, but explicitly add them just in case
     yield from ('mutagen', 'brotli', 'certifi')
 
 
-hiddenimports = list(_hidden_imports())
+hiddenimports = list(get_hidden_imports())
+print(f'Adding imports: {hiddenimports}')
+
 excludedimports = ['youtube_dl', 'youtube_dlc', 'test', 'ytdlp_plugins', 'devscripts']