sciveo 0.1.55__tar.gz → 0.1.57__tar.gz

{sciveo-0.1.55 → sciveo-0.1.57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.55
+Version: 0.1.57
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

{sciveo-0.1.55 → sciveo-0.1.57}/sciveo/media/tools/nvr.py

@@ -25,12 +25,13 @@ from sciveo.tools.simple_counter import RunCounter
 
 
 class VideoCameraCaptureDaemon(DaemonBase):
-  def __init__(self, cam_id, url, dst_path, max_video_len=60, transport="tcp"):
+  def __init__(self, cam_id, url, dst_path, max_video_len=60, transport="tcp", max_timeout=30):
     super().__init__()
     self.cam_id = cam_id
     self.url = url
     self.dst_path = dst_path
     self.max_video_len = max_video_len
+    self.max_timeout = max_timeout
     self.transport = transport
     self.cmd = [
       "ffmpeg",
@@ -42,10 +43,6 @@ class VideoCameraCaptureDaemon(DaemonBase):
       "-segment_time", f"{self.max_video_len}",
       "-reset_timestamps", "1",
       "-strftime", "1",
-      "-reconnect", "1",
-      "-reconnect_at_eof", "1",
-      "-reconnect_streamed", "1",
-      "-reconnect_delay_max", "5",
       f"{self.dst_path}/{self.cam_id}___%Y-%m-%d___%H-%M-%S.mp4"
     ]
 
@@ -59,13 +56,57 @@ class VideoCameraCaptureDaemon(DaemonBase):
         info("RM", file_path)
         os.remove(file_path)
 
+  def get_current_files(self):
+    current_files = [f for f in os.listdir(self.dst_path) if f.startswith(f"{self.cam_id}___") and f.endswith(".mp4")]
+    current_files.sort(key=lambda x: os.path.getmtime(os.path.join(self.dst_path, x)), reverse=True)
+    return current_files
+
   def loop(self):
     info("start", self.cam_id)
-    while(True):
+
+    while True:
       self.clear()
 
-      p = sp.Popen(self.cmd, stdout=sp.DEVNULL, stderr=sp.DEVNULL)
-      p.wait()
+      try:
+        last_known_file = None
+        last_mod_time = None
+        last_progress_time = time.time()
+
+        p = sp.Popen(self.cmd, stdout=sp.DEVNULL, stderr=sp.DEVNULL)
+
+        while True:
+          time.sleep(5)
+
+          if p.poll() is not None:
+            break
+
+          current_files = self.get_current_files()
+
+          if len(current_files) > 0:
+            newest_file = os.path.join(self.dst_path, current_files[0])
+
+            mod_time = os.path.getmtime(newest_file)
+            if newest_file == last_known_file:
+              if mod_time > last_mod_time:
+                last_progress_time = time.time()
+              elif time.time() - last_progress_time > self.max_timeout:
+                warning(self.cam_id, f"No file update for over {self.max_timeout} seconds, killing ffmpeg...")
+                p.kill()
+                break
+            else:
+              last_known_file = newest_file
+              last_mod_time = mod_time
+              last_progress_time = time.time()
+
+          else:
+            time.sleep(5)
+            current_files = self.get_current_files()
+            if len(current_files) == 0:
+              p.kill()
+              break
+
+      except Exception as e:
+        exception(e)
 
       self.clear()
       warning(self.cam_id, "streaming interrupted, wait to retry...")

sciveo-0.1.57/sciveo/version.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.1.57'

{sciveo-0.1.55 → sciveo-0.1.57}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.55
+Version: 0.1.57
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

sciveo-0.1.55/sciveo/version.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.1.55'