electric_eye 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33c71e7271287c8eefaed7c21b11e5dbfa8f2e8e
-  data.tar.gz: d95da73de1f27d44012389bc7d6b18516ef0f15a
+  metadata.gz: 4ecf642c699ff3a4a565dad774c7ceec948bae69
+  data.tar.gz: 57c68395cb6e192f8c379cb3cd0e2a8bb27eae60
 SHA512:
-  metadata.gz: da2bfd5d2e5366b3e8a3929613207aa2ae489577baea1d99abc85a2626e6843b2b4ee4d8e85f69ba53a36e2147c1649f1ccde2054fed9ecad4c851d80c86dc86
-  data.tar.gz: 7c9e5f484dfc4e6dd4d179fa2982a2c2dced25645bc2e51a418ffebcd08415bb0c94aff473e4ca92702550fabd47d62f9b6cb1f71120ad795c7c161efcf1aba3
+  metadata.gz: 44593cfa1f41f8ab98880d83ea1608ea181adc07e3d5860701df37a4795a26d6860fa0ad0bd2c354ea12840404bdc65658a973dbb2cce2234064e931ccd28eeb
+  data.tar.gz: df339343fee4e10616918e16eb6e433ec49f487d2cd7754233fcc6bfcfd736100412b91dec98ca3e9267d1d0315726ca1edba976a8c8526f1133e274e51474c4

data/lib/electric_eye/record.rb

@@ -23,25 +23,20 @@ module ElectricEye
         # until stop_recording
         path = "#{path(camera)}"
         listfile = "#{path}.list"
-        debug "Recording #{camera[:name]} to #{path}.mjpeg..."
+        debug "Recording #{camera[:name]} to #{path}.mpeg..."
         
         # Set a recording going using vlc, hold onto the process till it's finished.
         # segment_time = how much time to record in each segment in seconds, ie: 3600 = 1hr
         # sgement_wrap = how many copies
         loglevel = "-loglevel panic" if logger.level >= 1
-        cmd="ffmpeg -f mjpeg -i #{camera[:url]} #{loglevel} -acodec copy -vcodec copy -y -f segment -segment_list #{listfile} -segment_time #{@configEye.config.duration} -segment_wrap #{@configEye.config.wrap}  #{path}%03d.mjpeg"
+        cmd="ffmpeg -f mjpeg -i #{camera[:url]} #{loglevel} -acodec copy -vcodec copy -y -f segment -segment_list #{listfile} -segment_time #{@configEye.config.duration} -segment_wrap #{@configEye.config.wrap}  #{path}%03d.mpeg"
 
         # Run command and add to our pids to make it easy for electric_eye to clean up.
         info "Starting to record #{camera[:name]}"
         pids << Process.spawn(cmd)
 
         # Start the motion detection for this camera
-        puts "before thread: #{path}"
-
-        pids << fork do 
-          `echo "path: #{dir(camera)}" >> #{listfile}.log`
-          start_motion_detection(camera)
-        end
+        pids << fork {start_motion_detection(camera)} 
       end
 
       store_pids(pids)
@@ -57,14 +52,14 @@ module ElectricEye
       path = path(camera)
 
       # Watch the directory & read from the list file
-      filewatcher = FileWatcher.new("#{path}*.mjpeg")
+      filewatcher = FileWatcher.new("#{path}*.mpeg")
       filewatcher.watch do |f|
         file = read_listfile("#{path}.list")
         if file
           debug "Processing #{file}"
-          loglevel = "-loglevel panic" if logger.level >= 1
 
           # Run motion detection on the file, make sure that we output to a different file.
+          loglevel = "-loglevel panic" if logger.level >= 1
           cmd="ffmpeg -i #{dir}/#{file} #{loglevel} -y -vf \"select=gt(scene\\,0.003),setpts=N/(25*TB)\" #{dir}/motion-#{file}"
 
           # Run command and add to our pids to make it easy for electric_eye to clean up.
@@ -81,9 +76,9 @@ module ElectricEye
 
     # Remove a recording
     def remove(path)
-      debug "REMOVE #{path}.mjpeg (no motion)"
+      debug "REMOVE #{path}.mpeg (no motion)"
       File.delete("#{path}.log")
-      File.delete("#{path}.mjpeg")
+      File.delete("#{path}.mpeg")
     end
     
     def stop

data/lib/electric_eye/version.rb

@@ -1,3 +1,3 @@
 module ElectricEye
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: electric_eye
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael Pope