From 72a3572d9527093290ebd600b538e2375e690861 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 21 Feb 2023 17:56:21 +0100
Subject: [PATCH] Revert "OP-4643 - split command line arguments to separate
 items"

This reverts commit deaad39437501f18fc3ba4be8b1fc5f0ee3be65d.
---
 openpype/lib/transcoding.py                |  3 ++-
 openpype/plugins/publish/extract_review.py | 27 +++++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py
index c0bda2aa37..e5e21195e5 100644
--- a/openpype/lib/transcoding.py
+++ b/openpype/lib/transcoding.py
@@ -1100,7 +1100,7 @@ def convert_colorspace(
         raise ValueError("Both screen and display must be set.")
 
     if additional_command_args:
-        oiio_cmd.extend(split_cmd_args(additional_command_args))
+        oiio_cmd.extend(additional_command_args)
 
     if target_colorspace:
         oiio_cmd.extend(["--colorconvert",
@@ -1132,3 +1132,4 @@ def split_cmd_args(in_args):
             continue
         splitted_args.extend(arg.split(" "))
     return splitted_args
+
diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py
index e80141fc4a..0f6dacba18 100644
--- a/openpype/plugins/publish/extract_review.py
+++ b/openpype/plugins/publish/extract_review.py
@@ -22,7 +22,6 @@ from openpype.lib.transcoding import (
     should_convert_for_ffmpeg,
     convert_input_paths_for_ffmpeg,
     get_transcode_temp_directory,
-    split_cmd_args
 )
 
 
@@ -671,7 +670,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
         res_filters = self.rescaling_filters(temp_data, output_def, new_repre)
         ffmpeg_video_filters.extend(res_filters)
 
-        ffmpeg_input_args = split_cmd_args(ffmpeg_input_args)
+        ffmpeg_input_args = self.split_ffmpeg_args(ffmpeg_input_args)
 
         lut_filters = self.lut_filters(new_repre, instance, ffmpeg_input_args)
         ffmpeg_video_filters.extend(lut_filters)
@@ -724,6 +723,28 @@ class ExtractReview(pyblish.api.InstancePlugin):
             ffmpeg_output_args
         )
 
+    def split_ffmpeg_args(self, in_args):
+        """Makes sure all entered arguments are separated in individual items.
+
+        Split each argument string with " -" to identify if string contains
+        one or more arguments.
+        """
+        splitted_args = []
+        for arg in in_args:
+            sub_args = arg.split(" -")
+            if len(sub_args) == 1:
+                if arg and arg not in splitted_args:
+                    splitted_args.append(arg)
+                continue
+
+            for idx, arg in enumerate(sub_args):
+                if idx != 0:
+                    arg = "-" + arg
+
+                if arg and arg not in splitted_args:
+                    splitted_args.append(arg)
+        return splitted_args
+
     def ffmpeg_full_args(
         self, input_args, video_filters, audio_filters, output_args
     ):
@@ -743,7 +764,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
         Returns:
             list: Containing all arguments ready to run in subprocess.
         """
-        output_args = split_cmd_args(output_args)
+        output_args = self.split_ffmpeg_args(output_args)
 
         video_args_dentifiers = ["-vf", "-filter:v"]
         audio_args_dentifiers = ["-af", "-filter:a"]