From eebf4b537072fe397d5f7408668cbbc695f258a8 Mon Sep 17 00:00:00 2001
From: Sergio Costas <rastersoft@gmail.com>
Date: Sat, 18 Jan 2025 20:26:12 +0100
Subject: [PATCH] Use regexp to detect version number

---
 src/devedeng/devedeng.py | 6 ++++--
 src/devedeng/ffmpeg.py   | 9 ++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/devedeng/devedeng.py b/src/devedeng/devedeng.py
index a8c1fbc..9b9c43a 100644
--- a/src/devedeng/devedeng.py
+++ b/src/devedeng/devedeng.py
@@ -38,9 +38,11 @@ if config_data is None:
 
 Gtk.init(sys.argv)
 
-locale.bindtextdomain(config_data.gettext_domain, config_data.share_locale)
-locale.textdomain(config_data.gettext_domain)
 gettext.install(config_data.gettext_domain, localedir=config_data.share_locale)
+locale.setlocale(locale.LC_ALL, "")
+locale.bindtextdomain(config_data.gettext_domain, config_data.share_locale)
+locale.bind_textdomain_codeset(config_data.gettext_domain, "UTF-8")
+locale.textdomain(config_data.gettext_domain)
 
 def py():
     global config_data
diff --git a/src/devedeng/ffmpeg.py b/src/devedeng/ffmpeg.py
index 45ac3d5..01e02ef 100644
--- a/src/devedeng/ffmpeg.py
+++ b/src/devedeng/ffmpeg.py
@@ -18,6 +18,7 @@
 
 import subprocess
 import os
+import re
 import devedeng.configuration_data
 import devedeng.executor
 import devedeng.mux_dvd_menu
@@ -112,7 +113,7 @@ class ffmpeg(devedeng.executor.executor):
         devedeng.executor.executor.__init__(self)
         self.config = devedeng.configuration_data.configuration.get_config()
         try:
-            version_number = 0
+            version_number = 7
             handle = subprocess.Popen(
                 ["ffmpeg", "-version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             (stdout, stderr) = handle.communicate()
@@ -120,10 +121,12 @@ class ffmpeg(devedeng.executor.executor):
                 for line in stdout.decode("latin-1").split("\n"):
                     line = line.strip()
                     if line.startswith("ffmpeg version "):
-                        version_number = int(line[15:].split(".")[0])
+                        version_number = int(re.search(r"[0-9]+", line).group())
+                        break
         except:
+            version_number = 7
             pass
-        print(version_number)
+        print(f"Detected ffmpeg version number: {version_number}")
         if version_number <= 6:
             self._filter_sep = ",fifo,"
         else: