F
This commit is contained in:
@@ -1508,27 +1508,21 @@ def main() -> int:
|
||||
|
||||
# 7. CLI Verification
|
||||
pb.update("Verifying CLI configuration...")
|
||||
# Check core dependencies (including mpv) before finalizing
|
||||
# Check core imports (skip optional python-mpv here because it depends on
|
||||
# the system libmpv shared library and is not required for the repo-local
|
||||
# MPV IPC integration; MPV executable availability is handled below.)
|
||||
try:
|
||||
# Check basic imports and specifically mpv
|
||||
missing = []
|
||||
for mod in ["importlib", "shutil", "subprocess", "mpv"]:
|
||||
for mod in ["importlib", "shutil", "subprocess"]:
|
||||
try:
|
||||
# Use run() for verification to ensure clean environment
|
||||
run([str(venv_python), "-c", f"import {mod}"], quiet=True)
|
||||
except Exception:
|
||||
missing.append(mod)
|
||||
|
||||
if missing:
|
||||
# If mpv is missing, it might be because python-mpv wasn't in requirements.txt
|
||||
# or failed to install. Try installing it explicitly.
|
||||
if "mpv" in missing:
|
||||
try:
|
||||
_run_cmd([str(venv_python), "-m", "pip", "install", "--no-cache-dir", "python-mpv"])
|
||||
missing.remove("mpv")
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
# Note: If the MPV executable is missing it will be handled by the
|
||||
# MPV installation step later in this script; do not attempt to
|
||||
# install the third-party `python-mpv` package here.
|
||||
if missing:
|
||||
print(f"\nWarning: The following packages were not importable in the venv: {', '.join(missing)}")
|
||||
except Exception:
|
||||
|
||||
@@ -1123,7 +1123,6 @@ def main(argv: Optional[list[str]] = None) -> int:
|
||||
"show-in-file-manager": "showinfm",
|
||||
"opencv-python-headless": "cv2",
|
||||
"mpv": "mpv",
|
||||
"python-mpv": "mpv",
|
||||
"pyside6": "PySide6",
|
||||
"pyside6-essentials": "PySide6",
|
||||
"pyside6-addons": "PySide6",
|
||||
@@ -1448,7 +1447,6 @@ def main(argv: Optional[list[str]] = None) -> int:
|
||||
"show-in-file-manager": "showinfm",
|
||||
"opencv-python-headless": "cv2",
|
||||
"mpv": "mpv",
|
||||
"python-mpv": "mpv",
|
||||
"pyside6": "PySide6",
|
||||
"pyside6-essentials": "PySide6",
|
||||
"pyside6-addons": "PySide6",
|
||||
|
||||
Reference in New Issue
Block a user