sciveo 0.1.70__tar.gz → 0.1.72__tar.gz

{sciveo-0.1.70 → sciveo-0.1.72}/PKG-INFO

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

{sciveo-0.1.70 → sciveo-0.1.72}/sciveo/media/capture/motion_detection.py

@@ -19,6 +19,7 @@ from sciveo.tools.logger import *
 from sciveo.tools.daemon import DaemonBase
 from sciveo.media.capture.readers import VideoReaderFFMPEG
 from sciveo.tools.queue import TouchedFilePathQueue
+from sciveo.tools.simple_counter import SimpleStat
 
 
 class MotionDetectorGrid:
@@ -71,6 +72,8 @@ class VideoMotionDetector:
     current_threshold = self.configuration["threshold_motion"] * k_motion_level
     motion_level = np.mean(fgmask)
 
+    self.stat.set(motion_level)
+
     if motion_level > current_threshold:
       self.count_motion_hold += 1
       if self.count_motion_hold >= self.configuration["threshold_motion_hold"]:
@@ -82,6 +85,11 @@ class VideoMotionDetector:
 
   def __call__(self, list_frames):
     self.count_motion_hold = 0
+    self.stat = SimpleStat()
+
+    if len(list_frames) > 0:
+      for i in range(10):
+        fgmask = self.apply(list_frames[0])
 
     for frame in list_frames:
       try:
@@ -126,21 +134,21 @@ class MotionDetectorDaemon(DaemonBase):
         file_name, file_path = self.queue.pop()
         debug("pop", file_name, file_path)
 
-        file_name_split = file_name.split("___")
-        if len(file_name_split) >= 3:
-          source_id = file_name_split[0]
-
-          if source_id in self.configuration:
-            configuration = self.configuration.get(source_id, { "threshold_motion": 5, "threshold_motion_hold": 5, "grid": [[0.0]] })
-            md = self.motion_detectors.get(source_id, VideoMotionDetector(source_id, configuration))
-            motion = md(VideoReaderFFMPEG.read(file_path, resolution=360, RGB=False, gpu_id=-1, framestep=5))
-
-            if motion:
-              self.on_motion(source_id, file_name, file_path, configuration)
-
-          os.remove(file_path)
-          debug("RM", file_path)
-
+        try:
+          file_name_split = file_name.split("___")
+          if len(file_name_split) >= 3:
+            source_id = file_name_split[0]
+            if source_id in self.configuration:
+              configuration = self.configuration.get(source_id, { "threshold_motion": 5, "threshold_motion_hold": 5, "grid": [[0.0]] })
+              md = self.motion_detectors.get(source_id, VideoMotionDetector(source_id, configuration))
+              motion = md(VideoReaderFFMPEG.read(file_path, resolution=360, RGB=False, gpu_id=-1, framestep=5))
+              debug("STAT", source_id, md.stat)
+              if motion:
+                self.on_motion(source_id, file_name, file_path, configuration)
+        except Exception as e:
+          exception(e)
+        os.remove(file_path)
+        debug("RM", file_path)
       except Exception as e:
         exception(e)
         time.sleep(5)

{sciveo-0.1.70 → sciveo-0.1.72}/sciveo/media/capture/nvr.py

@@ -179,7 +179,7 @@ class VideoRecorder:
     shutil.copy(file_path, video_file_path)
     debug("CP", file_path, "=>", video_file_path)
 
-    if "motion" in self.configuration:
+    if "motion" in self.configuration and cam_id in self.configuration["motion"]:
       motion_file_path = os.path.join(self.configuration["motion"]["src"], f"{cam_id}___{video_date}___{video_file_name}")
       shutil.move(file_path, motion_file_path)
       debug("MV", file_path, "=>", motion_file_path)

sciveo-0.1.72/sciveo/version.py

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

{sciveo-0.1.70 → sciveo-0.1.72}/sciveo.egg-info/PKG-INFO

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

sciveo-0.1.70/sciveo/version.py

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