fix: Replace Popen in mediainfo_json decoder

Author: seakrueger

tagstudio/src/qt/helpers/silent_popen.py

@@ -6,4 +6,4 @@ def promptless_Popen(args, bufsize=-1, executable=None, stdin=None, stdout=None,
     if sys.platform == "win32":
         creation_flags = subprocess.CREATE_NO_WINDOW
 
-    return subprocess.Popen(args=args, bufsize=bufsize, executable=executable, stdin=stdin, stdout=stdout, stderr=stderr, preexec_fn=preexec_fn, close_fds=close_fds, shell=shell, cwd=cwd, env=env, universal_newlines=universal_newlines, startupinfo=startupinfo, creationflags=creation_flags, restore_signals=restore_signals, start_new_session=start_new_session, pass_fds=pass_fds, group=group, extra_groups=extra_groups, user=user, umask=umask, encoding=encoding, errors=errors, text=text, pipesize=pipesize, process_group=process_group)
+    return subprocess.Popen(args=args, bufsize=bufsize, executable=executable, stdin=stdin, stdout=stderr, stderr=stderr, preexec_fn=preexec_fn, close_fds=close_fds, shell=shell, cwd=cwd, env=env, universal_newlines=universal_newlines, startupinfo=startupinfo, creationflags=creation_flags, restore_signals=restore_signals, start_new_session=start_new_session, pass_fds=pass_fds, group=group, extra_groups=extra_groups, user=user, umask=umask, encoding=encoding, errors=errors, text=text, pipesize=pipesize, process_group=process_group)

tagstudio/src/qt/helpers/vendored/ffmpeg.py

@@ -23,10 +23,6 @@ def _probe(filename, cmd='ffprobe', timeout=None, **kwargs):
     args += ffmpeg._utils.convert_kwargs_to_cmd_line_args(kwargs)
     args += [filename]
 
-    creation_flags = 0
-    if sys.platform == "win32":
-        creation_flags = subprocess.CREATE_NO_WINDOW
-
     # PATCHED
     p = promptless_Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     communicate_kwargs = {}

tagstudio/src/qt/helpers/vendored/audio_segment.py renamed to tagstudio/src/qt/helpers/vendored/pydub/audio_segment.py

@@ -12,7 +12,7 @@
 import sys
 import struct
 from pydub.logging_utils import log_conversion, log_subprocess_output
-from pydub.utils import mediainfo_json, fsdecode
+from pydub.utils import fsdecode
 import base64
 from collections import namedtuple
 from io import StringIO, BytesIO
@@ -40,6 +40,7 @@
     MissingAudioParameter,
 )
 
+from src.qt.helpers.vendored.pydub.utils import _mediainfo_json
 from src.qt.helpers.silent_popen import promptless_Popen
 
 if sys.version_info >= (3, 0):
@@ -726,7 +727,8 @@ def is_format(f):
         if codec:
             info = None
         else:
-            info = mediainfo_json(orig_file, read_ahead_limit=read_ahead_limit)
+            # PATCHED
+            info = _mediainfo_json(orig_file, read_ahead_limit=read_ahead_limit)
         if info:
             audio_streams = [x for x in info['streams']
                              if x['codec_type'] == 'audio']

tagstudio/src/qt/helpers/vendored/pydub/utils.py

@@ -0,0 +1,88 @@
+import json
+import re
+import subprocess
+
+from pydub.utils import (
+    get_prober_name,
+    fsdecode,
+    _fd_or_path_or_tempfile,
+    get_extra_info,
+)
+
+from src.qt.helpers.silent_popen import promptless_Popen
+
+def _mediainfo_json(filepath, read_ahead_limit=-1):
+    """Return json dictionary with media info(codec, duration, size, bitrate...) from filepath
+    """
+    prober = get_prober_name()
+    command_args = [
+        "-v", "info",
+        "-show_format",
+        "-show_streams",
+    ]
+    try:
+        command_args += [fsdecode(filepath)]
+        stdin_parameter = None
+        stdin_data = None
+    except TypeError:
+        if prober == 'ffprobe':
+            command_args += ["-read_ahead_limit", str(read_ahead_limit),
+                             "cache:pipe:0"]
+        else:
+            command_args += ["-"]
+        stdin_parameter = subprocess.PIPE
+        file, close_file = _fd_or_path_or_tempfile(filepath, 'rb', tempfile=False)
+        file.seek(0)
+        stdin_data = file.read()
+        if close_file:
+            file.close()
+
+    command = [prober, '-of', 'json'] + command_args
+    # PATCHED
+    res = promptless_Popen(command, stdin=stdin_parameter, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    output, stderr = res.communicate(input=stdin_data)
+    output = output.decode("utf-8", 'ignore')
+    stderr = stderr.decode("utf-8", 'ignore')
+
+    try:
+        info = json.loads(output)
+    except  json.decoder.JSONDecodeError:
+        # If ffprobe didn't give any information, just return it
+        # (for example, because the file doesn't exist)
+        return None
+    if not info:
+        return info
+
+    extra_info = get_extra_info(stderr)
+
+    audio_streams = [x for x in info['streams'] if x['codec_type'] == 'audio']
+    if len(audio_streams) == 0:
+        return info
+
+    # We just operate on the first audio stream in case there are more
+    stream = audio_streams[0]
+
+    def set_property(stream, prop, value):
+        if prop not in stream or stream[prop] == 0:
+            stream[prop] = value
+
+    for token in extra_info[stream['index']]:
+        m = re.match(r'([su]([0-9]{1,2})p?) \(([0-9]{1,2}) bit\)$', token)
+        m2 = re.match(r'([su]([0-9]{1,2})p?)( \(default\))?$', token)
+        if m:
+            set_property(stream, 'sample_fmt', m.group(1))
+            set_property(stream, 'bits_per_sample', int(m.group(2)))
+            set_property(stream, 'bits_per_raw_sample', int(m.group(3)))
+        elif m2:
+            set_property(stream, 'sample_fmt', m2.group(1))
+            set_property(stream, 'bits_per_sample', int(m2.group(2)))
+            set_property(stream, 'bits_per_raw_sample', int(m2.group(2)))
+        elif re.match(r'(flt)p?( \(default\))?$', token):
+            set_property(stream, 'sample_fmt', token)
+            set_property(stream, 'bits_per_sample', 32)
+            set_property(stream, 'bits_per_raw_sample', 32)
+        elif re.match(r'(dbl)p?( \(default\))?$', token):
+            set_property(stream, 'sample_fmt', token)
+            set_property(stream, 'bits_per_sample', 64)
+            set_property(stream, 'bits_per_raw_sample', 64)
+    return info

tagstudio/src/qt/widgets/thumb_renderer.py

@@ -28,8 +28,7 @@
 from PIL.Image import DecompressionBombError
 from pillow_heif import register_avif_opener, register_heif_opener
 from pydub import exceptions
-from src.qt.helpers.vendored.audio_segment import _AudioSegment as AudioSegment
-from src.qt.helpers.blender_thumbnailer import blend_thumb
+from src.qt.helpers.vendored.pydub.audio_segment import _AudioSegment as AudioSegment
 from PySide6.QtCore import QObject, QSize, Qt, Signal
 from PySide6.QtGui import QGuiApplication, QPixmap
 from src.core.constants import FONT_SAMPLE_SIZES, FONT_SAMPLE_TEXT