Skip to content

Commit

Permalink
Merge pull request #857 from ynput/bugfix/AY-6618_FFMPEG-thumbnail-cr…
Browse files Browse the repository at this point in the history
…eation-issue-for-ftrack-previews

Chore: Parenthesis in shell
  • Loading branch information
iLLiCiTiT authored Aug 28, 2024
2 parents d9cf63b + f9ec72d commit 8d9187f
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
14 changes: 14 additions & 0 deletions client/ayon_core/lib/execute.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,20 @@ def run_subprocess(*args, **kwargs):
| getattr(subprocess, "CREATE_NO_WINDOW", 0)
)

# Escape parentheses for bash
if (
kwargs.get("shell") is True
and len(args) == 1
and isinstance(args[0], str)
and os.getenv("SHELL") in ("/bin/bash", "/bin/sh")
):
new_arg = (
args[0]
.replace("(", "\\(")
.replace(")", "\\)")
)
args = (new_arg, )

# Get environents from kwarg or use current process environments if were
# not passed.
env = kwargs.get("env") or os.environ
Expand Down
1 change: 1 addition & 0 deletions client/ayon_core/plugins/publish/extract_thumbnail.py
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@ def _create_thumbnail_ffmpeg(self, src_path, dst_path):
# output file
jpeg_items.append(path_to_subprocess_arg(dst_path))
subprocess_command = " ".join(jpeg_items)

try:
run_subprocess(
subprocess_command, shell=True, logger=self.log
Expand Down

0 comments on commit 8d9187f

Please sign in to comment.