From ee1dd879a5e90b1937168b32d85400cf84664cf6 Mon Sep 17 00:00:00 2001 From: puyral <7871851+puyral@users.noreply.github.com> Date: Sun, 27 Aug 2023 11:09:46 +0200 Subject: [PATCH 1/4] Update transcode.py --- pytranscoder/transcode.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pytranscoder/transcode.py b/pytranscoder/transcode.py index 815371a..c973a9c 100755 --- a/pytranscoder/transcode.py +++ b/pytranscoder/transcode.py @@ -439,10 +439,11 @@ def start(): # tmpfiles = files_from_file(configfile.default_queue_file) queue_path = configfile.default_queue_file - if cluster is None: - files.extend([(f, profile or template, mixins) for f in tmpfiles]) - else: - files.extend([(f, cluster, profile or template) for f in tmpfiles]) + files.extend([(f, profile or template, mixins) for f in tmpfiles]) + #if cluster is None: + # files.extend([(f, profile or template, mixins) for f in tmpfiles]) + #else: + # files.extend([(f, cluster, profile or template) for f in tmpfiles]) if len(files) == 0: print(crayons.yellow(f'Nothing to do')) From 266ab1f014f10d0fedaa0103d8c52c04a91a87f8 Mon Sep 17 00:00:00 2001 From: puyral <7871851+puyral@users.noreply.github.com> Date: Sun, 27 Aug 2023 11:12:26 +0200 Subject: [PATCH 2/4] Update transcode.py --- pytranscoder/transcode.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pytranscoder/transcode.py b/pytranscoder/transcode.py index c973a9c..210e4cb 100755 --- a/pytranscoder/transcode.py +++ b/pytranscoder/transcode.py @@ -439,11 +439,10 @@ def start(): # tmpfiles = files_from_file(configfile.default_queue_file) queue_path = configfile.default_queue_file - files.extend([(f, profile or template, mixins) for f in tmpfiles]) - #if cluster is None: - # files.extend([(f, profile or template, mixins) for f in tmpfiles]) - #else: - # files.extend([(f, cluster, profile or template) for f in tmpfiles]) + if cluster is None: + files.extend([(f, profile or template, mixins) for f in tmpfiles]) + else: + files.extend([(f, cluster, profile or template, mixins) for f in tmpfiles]) if len(files) == 0: print(crayons.yellow(f'Nothing to do')) From b0d86bb555955d156a7323957610301c284102d2 Mon Sep 17 00:00:00 2001 From: puyral <7871851+puyral@users.noreply.github.com> Date: Sun, 27 Aug 2023 11:17:12 +0200 Subject: [PATCH 3/4] Update processor.py --- pytranscoder/processor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytranscoder/processor.py b/pytranscoder/processor.py index dc08632..d11064a 100644 --- a/pytranscoder/processor.py +++ b/pytranscoder/processor.py @@ -33,7 +33,7 @@ def execute_and_monitor(self, params, event_callback, monitor) -> Optional[int]: stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, - shell=True) as p: + shell=False) as p: for stats in monitor(p): if event_callback is not None: From bd98fefbf23156518e675d024d82aefb53e0d08f Mon Sep 17 00:00:00 2001 From: puyral <7871851+puyral@users.noreply.github.com> Date: Sun, 27 Aug 2023 11:27:59 +0200 Subject: [PATCH 4/4] Update processor.py --- pytranscoder/processor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pytranscoder/processor.py b/pytranscoder/processor.py index d11064a..3b35c99 100644 --- a/pytranscoder/processor.py +++ b/pytranscoder/processor.py @@ -28,8 +28,8 @@ def run_remote(self, sshcli: str, user: str, ip: str, params: list, event_callba def execute_and_monitor(self, params, event_callback, monitor) -> Optional[int]: self.last_command = ' '.join([self.path, *params]) with subprocess.Popen( - # [self.path, *params], - self.last_command, + [self.path, *params], + #self.last_command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True,