Merge branch 'gst_thumbnailer'

Author: Wartybix

io.github.wartybix.Constrict.Devel.json

@@ -12,6 +12,10 @@
         "--socket=wayland",
         "--require-version=1.14.5"
     ],
+    "build-options" : {
+        "append-path" : "/usr/lib/sdk/rust-stable/bin",
+        "build-args": ["--share=network"]
+    },
     "cleanup-commands" : [
         "mkdir -p ${FLATPAK_DEST}/lib/ffmpeg"
     ],
@@ -40,29 +44,14 @@
             ]
         },
         {
-            "name" : "totem-pl-parser",
+            "name" : "gst-thumbnailers",
             "builddir" : true,
             "buildsystem" : "meson",
             "sources" : [
                 {
                     "type" : "archive",
-                    "url" : "https://gitlab.gnome.org/GNOME/totem-pl-parser/-/archive/V_3_26_6/totem-pl-parser-V_3_26_6.tar.gz",
-                    "mirror-urls" : [
-                        "https://github.com/GNOME/totem-pl-parser/archive/refs/tags/V_3_26_6.tar.gz"
-                    ],
-                    "sha256" : "7219272a4863f823e2dd6d997e78d725de9e6071b1af1b478870f207731a8234"
-                }
-            ]
-        },
-        {
-            "name" : "totem-video-thumbnailer",
-            "builddir" : true,
-            "buildsystem" : "meson",
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/totem-video-thumbnailer.git",
-                    "commit" : "6cb399918571a97591ff5a4a5a41d8e46b11027a"
+                    "url" : "https://gitlab.gnome.org/GNOME/gst-thumbnailers/-/archive/1.0.alpha.1/gst-thumbnailers-1.0.alpha.1.tar.gz",
+                    "sha256" : "a754bc1a21522a5315463b05fb4d3f02e7b824816b155c1826c77de8afe70e49"
                 }
             ]
         },

src/enums.py

@@ -41,7 +41,3 @@ class SourceState:
     INCOMPATIBLE = 5
     WARN = 6
 
-
-class Thumbnailer:
-    TOTEM = 0
-    FFMPEG = 1

src/sources_row.py

@@ -32,7 +32,7 @@
 from pathlib import Path
 from constrict.shared import get_tmp_dir, update_ui
 from constrict.constrict_utils import get_encode_settings, get_resolution, get_framerate, get_duration, get_audio_bitrate
-from constrict.enums import SourceState, Thumbnailer
+from constrict.enums import SourceState
 from constrict.progress_pie import ProgressPie
 from constrict.attempt_fail_box import AttemptFailBox
 from constrict.progress_popover_box import ProgressPopoverBox
@@ -377,59 +377,30 @@ def set_thumbnail(self, file_hash: int, daemon: bool) -> None:
         this row represents, and storing it named with the video's file hash
         in a temp directory
         """
-        bin_totem = 'totem-video-thumbnailer'
-        bin_ffmpeg = 'ffmpegthumbnailer'
-
+        bin_gst_thumbnailer = 'gst-video-thumbnailer'
         generic_icon = 'image-x-generic' if self.mime_type == 'image/gif' else 'video-x-generic'
 
-        # Check Totem thumbnailer is installed.
-        # Use FFMPEG thumbnailer as a fallback.
-        # Use video-x-generic icon as the fallback's fallback.
-
-        totem_exists = GLib.find_program_in_path(bin_totem)
-        thumbnailer = Thumbnailer.TOTEM
+        gst_thumbnailer_exists = GLib.find_program_in_path(bin_gst_thumbnailer)
 
-        if not totem_exists:
-            ffmpeg_exists = GLib.find_program_in_path(bin_ffmpeg)
-            thumbnailer = Thumbnailer.FFMPEG
-
-            if not ffmpeg_exists:
-                update_ui(
-                    self.thumbnail.set_from_icon_name,
-                    generic_icon,
-                    daemon
-                )
-                return
+        if not gst_thumbnailer_exists:
+            update_ui(self.thumbnail.set_from_icon_name, generic_icon, daemon)
+            return
 
         # Check tmp directory is available to write.
         tmp_dir = get_tmp_dir()
 
         if not tmp_dir:
-            update_ui(
-                self.thumbnail.set_from_icon_name,
-                generic_icon,
-                daemon
-            )
+            update_ui(self.thumbnail.set_from_icon_name, generic_icon, daemon)
             return
 
         thumb_filepath = str(tmp_dir / f'{file_hash}.jpg')
 
-        if thumbnailer == Thumbnailer.TOTEM:
-            subprocess.run([
-                bin_totem,
-                self.video_path,
-                thumb_filepath
-            ])
-        elif thumbnailer == Thumbnailer.FFMPEG:
-            subprocess.run([
-                bin_ffmpeg,
-                '-i',
-                self.video_path,
-                '-o',
-                thumb_filepath
-            ])
-        else:
-            raise Exception('Unknown thumbnailer set. Whoopsie daisies.')
+        subprocess.run([
+            bin_gst_thumbnailer,
+            '-p', self.video_path,
+            '-s', '128',
+            '-o', thumb_filepath
+        ])
 
         thumb_file = Gio.File.new_for_path(thumb_filepath)