From 62b3f852f1d65286a650ac37fc0f8d479436d440 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 11 Feb 2020 14:01:56 +0100 Subject: [PATCH] use `get_path_to_ffmpeg` which checks if any of filled ffmpeg paths in FFMPEG_PATH exists --- pype/lib.py | 9 +++++++++ pype/plugins/global/publish/extract_jpeg.py | 3 ++- pype/plugins/global/publish/extract_review.py | 5 ++--- pype/plugins/global/publish/extract_review_slate.py | 3 ++- pype/plugins/global/publish/validate_ffmpeg_installed.py | 6 ++++-- .../standalonepublisher/publish/extract_review.py | 3 ++- .../standalonepublisher/publish/extract_thumbnail.py | 3 ++- pype/scripts/otio_burnin.py | 6 +++--- pype/standalonepublish/widgets/widget_drop_frame.py | 3 ++- 9 files changed, 28 insertions(+), 13 deletions(-) diff --git a/pype/lib.py b/pype/lib.py index f26395d930..9cde3bd3af 100644 --- a/pype/lib.py +++ b/pype/lib.py @@ -13,6 +13,15 @@ import avalon log = logging.getLogger(__name__) +def get_path_to_ffmpeg(): + paths = os.environ.get("FFMPEG_PATH") or "" + path_items = paths.split(os.pathsep) + for item in path_items: + item = os.path.normpath(item) + if os.path.exists(item): + return item + return "" + # Special naming case for subprocess since its a built-in method. def _subprocess(*args, **kwargs): """Convenience method for getting output errors for subprocess.""" diff --git a/pype/plugins/global/publish/extract_jpeg.py b/pype/plugins/global/publish/extract_jpeg.py index 4978649ba2..6a0d7905b0 100644 --- a/pype/plugins/global/publish/extract_jpeg.py +++ b/pype/plugins/global/publish/extract_jpeg.py @@ -3,6 +3,7 @@ import os import pyblish.api import clique import pype.api +import pype.lib class ExtractJpegEXR(pyblish.api.InstancePlugin): @@ -67,7 +68,7 @@ class ExtractJpegEXR(pyblish.api.InstancePlugin): jpeg_items = [] jpeg_items.append( - os.path.join(os.environ.get("FFMPEG_PATH"), "ffmpeg")) + os.path.join(pype.lib.get_path_to_ffmpeg(), "ffmpeg")) # override file if already exists jpeg_items.append("-y") # use same input args like with mov diff --git a/pype/plugins/global/publish/extract_review.py b/pype/plugins/global/publish/extract_review.py index 2e79d86c38..5895a8c423 100644 --- a/pype/plugins/global/publish/extract_review.py +++ b/pype/plugins/global/publish/extract_review.py @@ -313,9 +313,8 @@ class ExtractReview(pyblish.api.InstancePlugin): mov_args = [ os.path.join( - os.environ.get( - "FFMPEG_PATH", - ""), "ffmpeg"), + pype.lib.get_path_to_ffmpeg(), "ffmpeg" + ), " ".join(input_args), " ".join(output_args) ] diff --git a/pype/plugins/global/publish/extract_review_slate.py b/pype/plugins/global/publish/extract_review_slate.py index 9a720b77a9..5d4990a027 100644 --- a/pype/plugins/global/publish/extract_review_slate.py +++ b/pype/plugins/global/publish/extract_review_slate.py @@ -1,5 +1,6 @@ import os import pype.api +import pype.lib import pyblish @@ -21,7 +22,7 @@ class ExtractReviewSlate(pype.api.Extractor): suffix = "_slate" slate_path = inst_data.get("slateFrame") - ffmpeg_path = os.path.join(os.environ.get("FFMPEG_PATH", ""), "ffmpeg") + ffmpeg_path = os.path.join(pype.lib.get_path_to_ffmpeg(), "ffmpeg") to_width = 1920 to_height = 1080 diff --git a/pype/plugins/global/publish/validate_ffmpeg_installed.py b/pype/plugins/global/publish/validate_ffmpeg_installed.py index df7c330e95..643e0f1821 100644 --- a/pype/plugins/global/publish/validate_ffmpeg_installed.py +++ b/pype/plugins/global/publish/validate_ffmpeg_installed.py @@ -1,6 +1,7 @@ import pyblish.api import os import subprocess +import pype.lib try: import os.errno as errno except ImportError: @@ -28,9 +29,10 @@ class ValidateFfmpegInstallef(pyblish.api.Validator): def process(self, instance): self.log.info("ffmpeg path: `{}`".format( - os.environ.get("FFMPEG_PATH", ""))) + pype.lib.get_path_to_ffmpeg() + )) if self.is_tool( os.path.join( - os.environ.get("FFMPEG_PATH", ""), "ffmpeg")) is False: + pype.lib.get_path_to_ffmpeg(), "ffmpeg")) is False: self.log.error("ffmpeg not found in PATH") raise RuntimeError('ffmpeg not installed.') diff --git a/pype/plugins/standalonepublisher/publish/extract_review.py b/pype/plugins/standalonepublisher/publish/extract_review.py index f06d9bcde0..29e1fcaac0 100644 --- a/pype/plugins/standalonepublisher/publish/extract_review.py +++ b/pype/plugins/standalonepublisher/publish/extract_review.py @@ -4,6 +4,7 @@ import tempfile import pyblish.api import clique import pype.api +import pype.lib class ExtractReviewSP(pyblish.api.InstancePlugin): @@ -148,7 +149,7 @@ class ExtractReviewSP(pyblish.api.InstancePlugin): # output filename output_args.append(full_output_path) - ffmpeg_path = os.getenv("FFMPEG_PATH", "") + ffmpeg_path = pype.lib.get_path_to_ffmpeg() if ffmpeg_path: ffmpeg_path += "/ffmpeg" else: diff --git a/pype/plugins/standalonepublisher/publish/extract_thumbnail.py b/pype/plugins/standalonepublisher/publish/extract_thumbnail.py index 69a2e0fdad..b752419a35 100644 --- a/pype/plugins/standalonepublisher/publish/extract_thumbnail.py +++ b/pype/plugins/standalonepublisher/publish/extract_thumbnail.py @@ -3,6 +3,7 @@ import tempfile import subprocess import pyblish.api import pype.api +import pype.lib class ExtractThumbnailSP(pyblish.api.InstancePlugin): @@ -73,7 +74,7 @@ class ExtractThumbnailSP(pyblish.api.InstancePlugin): config_data.get("__default__", {}) ) - ffmpeg_path = os.getenv("FFMPEG_PATH", "") + ffmpeg_path = pype.lib.get_path_to_ffmpeg() if ffmpeg_path: ffmpeg_path += "/ffmpeg" else: diff --git a/pype/scripts/otio_burnin.py b/pype/scripts/otio_burnin.py index f128352974..1d589916e9 100644 --- a/pype/scripts/otio_burnin.py +++ b/pype/scripts/otio_burnin.py @@ -5,14 +5,14 @@ import json import opentimelineio_contrib.adapters.ffmpeg_burnins as ffmpeg_burnins from pypeapp.lib import config from pype import api as pype -from subprocess import Popen, PIPE +import pype.lib # FFmpeg in PATH is required log = pype.Logger().get_logger("BurninWrapper", "burninwrap") -ffmpeg_path = os.environ.get("FFMPEG_PATH") +ffmpeg_path = pype.lib.get_path_to_ffmpeg() if ffmpeg_path and os.path.exists(ffmpeg_path): # add separator "/" or "\" to be prepared for next part ffmpeg_path += os.path.sep @@ -267,7 +267,7 @@ class ModifiedBurnins(ffmpeg_burnins.Burnins): command = self.command(output=output, args=args, overwrite=overwrite) - proc = Popen(command, shell=True) + proc = subprocess.Popen(command, shell=True) proc.communicate() if proc.returncode != 0: raise RuntimeError("Failed to render '%s': %s'" diff --git a/pype/standalonepublish/widgets/widget_drop_frame.py b/pype/standalonepublish/widgets/widget_drop_frame.py index 73b9f0e179..aa3335fb78 100644 --- a/pype/standalonepublish/widgets/widget_drop_frame.py +++ b/pype/standalonepublish/widgets/widget_drop_frame.py @@ -4,6 +4,7 @@ import json import clique import subprocess from pypeapp import config +import pype.lib from . import QtWidgets, QtCore from . import DropEmpty, ComponentsList, ComponentItem @@ -224,7 +225,7 @@ class DropDataFrame(QtWidgets.QFrame): self._process_data(data) def load_data_with_probe(self, filepath): - ffprobe_path = os.getenv("FFMPEG_PATH", "") + ffprobe_path = pype.lib.get_path_to_ffmpeg() if ffprobe_path: ffprobe_path += '/ffprobe' else: