From 9a8403917af4fca2cb4d34c08ea6c7e4dfe2400a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Sat, 6 Apr 2024 03:24:51 +0200
Subject: [PATCH] restore LD_LIBRARY_PATH for PyInstaller builds (#5421)

---
 gallery_dl/cookies.py              |  2 +-
 gallery_dl/postprocessor/exec.py   |  5 ++---
 gallery_dl/postprocessor/ugoira.py |  2 +-
 gallery_dl/util.py                 | 29 ++++++++++++++++++++++++++++-
 test/test_postprocessor.py         |  8 ++++----
 5 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/gallery_dl/cookies.py b/gallery_dl/cookies.py
index 478abb63..092a9415 100644
--- a/gallery_dl/cookies.py
+++ b/gallery_dl/cookies.py
@@ -857,7 +857,7 @@ class DatabaseConnection():
 
 
 def Popen_communicate(*args):
-    proc = subprocess.Popen(
+    proc = util.Popen(
         args, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
     try:
         stdout, stderr = proc.communicate()
diff --git a/gallery_dl/postprocessor/exec.py b/gallery_dl/postprocessor/exec.py
index e7ed2f69..7d2be2b9 100644
--- a/gallery_dl/postprocessor/exec.py
+++ b/gallery_dl/postprocessor/exec.py
@@ -10,7 +10,6 @@
 
 from .common import PostProcessor
 from .. import util, formatter
-import subprocess
 import os
 import re
 
@@ -80,14 +79,14 @@ class ExecPP(PostProcessor):
 
     def _exec(self, args, shell):
         self.log.debug("Running '%s'", args)
-        retcode = subprocess.Popen(args, shell=shell).wait()
+        retcode = util.Popen(args, shell=shell).wait()
         if retcode:
             self.log.warning("'%s' returned with non-zero exit status (%d)",
                              args, retcode)
 
     def _exec_async(self, args, shell):
         self.log.debug("Running '%s'", args)
-        subprocess.Popen(args, shell=shell)
+        util.Popen(args, shell=shell)
 
     def _replace(self, match):
         name = match.group(1)
diff --git a/gallery_dl/postprocessor/ugoira.py b/gallery_dl/postprocessor/ugoira.py
index b713c6f3..5fbc1a55 100644
--- a/gallery_dl/postprocessor/ugoira.py
+++ b/gallery_dl/postprocessor/ugoira.py
@@ -171,7 +171,7 @@ class UgoiraPP(PostProcessor):
     def _exec(self, args):
         self.log.debug(args)
         out = None if self.output else subprocess.DEVNULL
-        retcode = subprocess.Popen(args, stdout=out, stderr=out).wait()
+        retcode = util.Popen(args, stdout=out, stderr=out).wait()
         if retcode:
             print()
             self.log.error("Non-zero exit status when running %s (%s)",
diff --git a/gallery_dl/util.py b/gallery_dl/util.py
index bc9418f5..0e6f04a9 100644
--- a/gallery_dl/util.py
+++ b/gallery_dl/util.py
@@ -339,7 +339,7 @@ def extract_headers(response):
 @functools.lru_cache(maxsize=None)
 def git_head():
     try:
-        out, err = subprocess.Popen(
+        out, err = Popen(
             ("git", "rev-parse", "--short", "HEAD"),
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
@@ -579,6 +579,33 @@ GLOBALS = {
 }
 
 
+if EXECUTABLE and hasattr(sys, "_MEIPASS"):
+    # https://github.com/pyinstaller/pyinstaller/blob/develop/doc
+    # /runtime-information.rst#ld_library_path--libpath-considerations
+    _popen_env = os.environ.copy()
+
+    orig = _popen_env.get("LD_LIBRARY_PATH_ORIG")
+    if orig is None:
+        _popen_env.pop("LD_LIBRARY_PATH", None)
+    else:
+        _popen_env["LD_LIBRARY_PATH"] = orig
+
+    orig = _popen_env.get("DYLD_LIBRARY_PATH_ORIG")
+    if orig is None:
+        _popen_env.pop("DYLD_LIBRARY_PATH", None)
+    else:
+        _popen_env["DYLD_LIBRARY_PATH"] = orig
+
+    del orig
+
+    class Popen(subprocess.Popen):
+        def __init__(self, args, **kwargs):
+            kwargs["env"] = _popen_env
+            subprocess.Popen.__init__(self, args, **kwargs)
+else:
+    Popen = subprocess.Popen
+
+
 def compile_expression(expr, name="<expr>", globals=None):
     code_object = compile(expr, name, "eval")
     return functools.partial(eval, code_object, globals or GLOBALS)
diff --git a/test/test_postprocessor.py b/test/test_postprocessor.py
index 0ee7cdb2..6e76f07a 100644
--- a/test/test_postprocessor.py
+++ b/test/test_postprocessor.py
@@ -172,7 +172,7 @@ class ExecTest(BasePostprocessorTest):
             "command": "echo {} {_path} {_directory} {_filename} && rm {};",
         })
 
-        with patch("subprocess.Popen") as p:
+        with patch("gallery_dl.util.Popen") as p:
             i = Mock()
             i.wait.return_value = 0
             p.return_value = i
@@ -192,7 +192,7 @@ class ExecTest(BasePostprocessorTest):
                         "\fE _directory.upper()"],
         })
 
-        with patch("subprocess.Popen") as p:
+        with patch("gallery_dl.util.Popen") as p:
             i = Mock()
             i.wait.return_value = 0
             p.return_value = i
@@ -212,7 +212,7 @@ class ExecTest(BasePostprocessorTest):
             "command": "echo {}",
         })
 
-        with patch("subprocess.Popen") as p:
+        with patch("gallery_dl.util.Popen") as p:
             i = Mock()
             i.wait.return_value = 123
             p.return_value = i
@@ -230,7 +230,7 @@ class ExecTest(BasePostprocessorTest):
             "command": "echo {}",
         })
 
-        with patch("subprocess.Popen") as p:
+        with patch("gallery_dl.util.Popen") as p:
             i = Mock()
             p.return_value = i
             self._trigger(("after",))