sciveo 0.1.56__tar.gz → 0.1.57__tar.gz

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

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

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

@@ -56,6 +56,11 @@ 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)
 
@@ -75,12 +80,9 @@ class VideoCameraCaptureDaemon(DaemonBase):
           if p.poll() is not None:
             break
 
-          current_files = [
-            f for f in os.listdir(self.dst_path)
-            if f.startswith(f"{self.cam_id}___") and f.endswith(".mp4")
-          ]
-          if current_files:
-            current_files.sort(key=lambda x: os.path.getmtime(os.path.join(self.dst_path, x)), reverse=True)
+          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)
@@ -96,6 +98,13 @@ class VideoCameraCaptureDaemon(DaemonBase):
               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)
 
@@ -104,7 +113,6 @@ class VideoCameraCaptureDaemon(DaemonBase):
       time.sleep(5)
 
 
-
 class VideoRecorder:
   def __init__(self, path_configuration):
     with open(path_configuration, 'r') as fp:

sciveo-0.1.57/sciveo/version.py

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

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

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

sciveo-0.1.56/sciveo/version.py

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