From a84aea081b810c2af2c42fa1dca6d07c1c1b50f3 Mon Sep 17 00:00:00 2001
From: Rastersoft <rastersoft@gmail.com>
Date: Sun, 17 Dec 2023 20:28:25 +0000
Subject: [PATCH] Fix error when duration is N/A

---
 HISTORY.md             | 3 +++
 setup.py               | 2 +-
 src/devedeng/avconv.py | 7 +++++--
 src/devedeng/ffmpeg.py | 7 +++++--
 stpacman.cfg           | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 3731c7c..c4da33c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,8 @@
 # History of versions #
 
+* version 4.18.0 (2023-12-17)
+  * Fix stall when ffmpeg returns N/A as the time
+
 * version 4.17.0 (2021-12-28)
   * Added support for videos with "rotate" tag
 
diff --git a/setup.py b/setup.py
index 6bf4706..83d5c22 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ except:
 setup(
     name='devedeng',
 
-    version='4.17.0',
+    version='4.18.0',
 
     description='A video DVD creator',
     long_description="A program that allows to create video DVDs",
diff --git a/src/devedeng/avconv.py b/src/devedeng/avconv.py
index 0f892be..14183c2 100644
--- a/src/devedeng/avconv.py
+++ b/src/devedeng/avconv.py
@@ -598,8 +598,11 @@ class avconv(devedeng.avbase.avbase):
                 parts = data[0][pos:pos2].split(":")
                 t = 0.0
                 for e in parts:
-                    t *= 60.0
-                    t += float(e)
+                    try:
+                        v = float(e)
+                    except:
+                        continue
+                    t = t * 60.0 + v
                 t /= self.final_length
                 self.progress_bar[1].set_fraction(t)
                 self.progress_bar[1].set_text("%.1f%%" % (100.0 * t))
diff --git a/src/devedeng/ffmpeg.py b/src/devedeng/ffmpeg.py
index b3d46f0..8694ac2 100644
--- a/src/devedeng/ffmpeg.py
+++ b/src/devedeng/ffmpeg.py
@@ -590,8 +590,11 @@ class ffmpeg(devedeng.executor.executor):
                 parts = data[0][pos:pos2].split(":")
                 t = 0.0
                 for e in parts:
-                    t *= 60.0
-                    t += float(e)
+                    try:
+                        v = float(e)
+                    except:
+                        continue
+                    t = t * 60.0 + v
                 t /= self.final_length
                 self.progress_bar[1].set_fraction(t)
                 self.progress_bar[1].set_text("%.1f%%" % (100.0 * t))
diff --git a/stpacman.cfg b/stpacman.cfg
index 40d0304..506a682 100644
--- a/stpacman.cfg
+++ b/stpacman.cfg
@@ -1,2 +1,2 @@
 [DEFAULT]
-depends: python-setuptools, python-urllib3, python-gobject2, python-cairo, gobject-introspection, gobject-introspection-runtime, gtk3, ffmpeg, mplayer, vlc, dvdauthor, mkisolinux, vcdimager, libvorbis
+depends: python-setuptools, python-urllib3, python-gobject, python-cairo, gobject-introspection, gobject-introspection-runtime, gtk3, ffmpeg, mplayer, vlc, dvdauthor, cdrkit, vcdimager, libvorbis