Merge pull request #15 from FlorianEagox/main

Adding the ability to specify a desired path

Author: zackees

static_ffmpeg/_add_paths.py

@@ -13,14 +13,14 @@ def _has(name: str) -> bool:
     return shutil.which(name) is not None
 
 
-def add_paths(weak=False) -> bool:
+def add_paths(weak=False, download_dir=None) -> bool:
     """Add the ffmpeg executable to the path"""
     if weak:
         has_ffmpeg = _has("ffmpeg") is not None
         has_ffprobe = _has("ffprobe") is not None
         if has_ffmpeg and has_ffprobe:
             return False
-    ffmpeg, _ = get_or_fetch_platform_executables_else_raise()
+    ffmpeg, _ = get_or_fetch_platform_executables_else_raise(download_dir=download_dir)
     ffmpeg_path = os.path.dirname(ffmpeg)
     if ffmpeg_path not in os.environ["PATH"]:
         os.environ["PATH"] = os.pathsep.join([ffmpeg_path, os.environ["PATH"]])

static_ffmpeg/run.py

@@ -72,28 +72,32 @@ def download_file(url, local_path):
 
 def get_or_fetch_platform_executables_else_raise(
     fix_permissions=True,
+    download_dir=None
 ) -> Tuple[str, str]:
     """Either get the executable or raise an error"""
     lock = FileLock(LOCK_FILE, timeout=TIMEOUT)  # pylint: disable=E0110
     try:
         with lock.acquire():
             return _get_or_fetch_platform_executables_else_raise_no_lock(
-                fix_permissions=fix_permissions
+                fix_permissions=fix_permissions,
+                download_dir=download_dir
             )
     except Timeout:
         sys.stderr.write(
             f"{__file__}: Warning, could not acquire lock at {LOCK_FILE}\n"
         )
         return _get_or_fetch_platform_executables_else_raise_no_lock(
-            fix_permissions=fix_permissions
+            fix_permissions=fix_permissions,
+            download_dir=download_dir
         )
 
 
 def _get_or_fetch_platform_executables_else_raise_no_lock(
     fix_permissions=True,
+    download_dir=None
 ) -> Tuple[str, str]:
     """Either get the executable or raise an error, internal api"""
-    exe_dir = get_platform_dir()
+    exe_dir = download_dir if download_dir else get_platform_dir()
     installed_crumb = os.path.join(exe_dir, "installed.crumb")
     if not os.path.exists(installed_crumb):
         # All zip files store their platform executables in a folder