electric_eye 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ecf642c699ff3a4a565dad774c7ceec948bae69
-  data.tar.gz: 57c68395cb6e192f8c379cb3cd0e2a8bb27eae60
+  metadata.gz: c334d34da5e715dafc4bf25b413633745f7ddc81
+  data.tar.gz: 2e36a9cfcf7292a8bebfba866321f9a4f5ef3508
 SHA512:
-  metadata.gz: 44593cfa1f41f8ab98880d83ea1608ea181adc07e3d5860701df37a4795a26d6860fa0ad0bd2c354ea12840404bdc65658a973dbb2cce2234064e931ccd28eeb
-  data.tar.gz: df339343fee4e10616918e16eb6e433ec49f487d2cd7754233fcc6bfcfd736100412b91dec98ca3e9267d1d0315726ca1edba976a8c8526f1133e274e51474c4
+  metadata.gz: 1ae7373bcd7de070a94709af9d6475b36cabedced738efe18b5b42cf8b84ad28db982099e595dd9df370122dd595067cb65e3e6f73ea9f75f3e1f7c8fa20abbb
+  data.tar.gz: 7336de5be6c21b4d9e2ac5302571322c80fe9daad713ea2623f7dd3f828f2bd8f30e48e8b8e68a180b36a7011da411f95791452011e6f061434c0b44fa1f29b5

data/.ruby-version

@@ -1 +1 @@
-2.2.4
+2.2.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    electric_eye (0.1.0)
+    electric_eye (0.1.1)
       construct
       filewatcher
       methadone (~> 1.9.0)

data/README.org

@@ -12,8 +12,9 @@ I started with VLC doing the recording up to 0.1.0 where I changed over to using
 
 ** Requirements
 
-- ffmpeg  - recording & motion detection
-- ruby
+- ffmpeg 3.x - recording & motion detection
+  We are using 3.x for it's reconnect features.
+- ruby 1.9.3 or above
 - Linux (Tested on Debian 7, Xubuntu 14.04)
 
 ** Installation
@@ -66,6 +67,10 @@ Files will be numbered up to your wrap figure. The wrap figure determines when t
 
 The default is going to be 10 minute blocks, this can be overridden with the duration variable above in minutes.
 
+** Rebooting cameras
+
+Some people reboot their cameras everynight. This does not work well with electric eye at the moment. As a work around you have to stop and start electric eye in your crontab.
+
 ** Usage
 
 First make sure you add your cameras
@@ -181,6 +186,9 @@ Example for cleaning up reception after 60days at 7pm everynight.
   Then just call 'electric_eye --remove-recordings' within crontab
   This would iterate over all my cameras and remove old recordings to keep a rolling set of days.
 
+- [ ] Adjust motion detection to date format
+  : <yyyymmdd>-<hhmm>-<camera name>.mpeg
+
 - [ ] Allow motion detection to be turned on/off (default: off)
 
 - [ ] Threshold should be per camera or have inside & outside thresholds

data/lib/electric_eye/record.rb

@@ -13,7 +13,7 @@ module ElectricEye
     end
 
     def start
-      @motion = Motion.new      # Create a new instance method to our motion library
+      # @motion = Motion.new      # Create a new instance method to our motion library
       
       pids = []
       # Start the recording for each camera
@@ -29,7 +29,9 @@ module ElectricEye
         # 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.mpeg"
+
+        # ffmpeg 3.0.1 used
+        cmd="ffmpeg -i #{camera[:url]} #{loglevel} -c copy -f segment -segment_list #{listfile} -segment_time #{@configEye.config.duration} -segment_wrap #{@configEye.config.wrap} -y -reconnect 1 -reconnect_at_eof 1 -reconnect_streamed 1 -reconnect_delay_max 300 #{path}%03d.mjpeg"
 
         # Run command and add to our pids to make it easy for electric_eye to clean up.
         info "Starting to record #{camera[:name]}"
@@ -52,7 +54,7 @@ module ElectricEye
       path = path(camera)
 
       # Watch the directory & read from the list file
-      filewatcher = FileWatcher.new("#{path}*.mpeg")
+      filewatcher = FileWatcher.new("#{path}*.mjpeg")
       filewatcher.watch do |f|
         file = read_listfile("#{path}.list")
         if file
@@ -60,7 +62,7 @@ module ElectricEye
 
           # 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}"
+          cmd="ffmpeg -i #{dir}/#{file} #{loglevel} -y -vf \"select=gt(scene\\,0.003),setpts=N/(25*TB)\" #{dir}/#{date_filename(camera)}.mpeg"
 
           # Run command and add to our pids to make it easy for electric_eye to clean up.
           Process.spawn(cmd)
@@ -74,13 +76,6 @@ module ElectricEye
       lines.last.chomp! unless lines.length == 0
     end
 
-    # Remove a recording
-    def remove(path)
-      debug "REMOVE #{path}.mpeg (no motion)"
-      File.delete("#{path}.log")
-      File.delete("#{path}.mpeg")
-    end
-    
     def stop
       stop_recordings(get_pids) if File.exist?(PID_FILE)
     end
@@ -101,6 +96,10 @@ module ElectricEye
       dir
     end
 
+    def date_filename(camera)
+      "#{Time.now.strftime('%Y%m%d-%H%M%S')}-#{camera[:name]}"
+    end
+
     def path(camera)
       "#{dir(camera)}/#{camera[:name]}"
     end

data/lib/electric_eye/version.rb

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

data/spec/record_spec.rb

@@ -27,7 +27,7 @@ describe "record" do
     end
   end
 
-  describe "#dir" do
+  describe "#date_filename" do
     before do
       Timecop.freeze(Time.local(2015,06,30,10,05,0))
     end
@@ -36,6 +36,13 @@ describe "record" do
       Timecop.return
     end
     
+    it "returns a filename with date" do
+      filename = @record.date_filename(@configEye.config.cameras.first)
+      expect(filename).to eq("20150630-100500-Reception")
+    end
+  end
+
+  describe "#dir" do
     it "returns a full dir" do
       dir = @record.dir(@configEye.config.cameras.first)
       expect(dir).to eq("~/recordings/Reception")
@@ -43,14 +50,6 @@ describe "record" do
   end
 
   describe "record_path" do
-    before do
-      Timecop.freeze(Time.local(2015,06,30,10,05,0))
-    end
-
-    after do
-      Timecop.return
-    end
-    
     it "returns a full path" do
       path = @record.path(@configEye.config.cameras.first)
       expect(path).to eq("~/recordings/Reception/Reception")
@@ -123,24 +122,4 @@ describe "record" do
       end    
     end
   end
-
-  describe "#remove" do
-    before do
-      @path = "/tmp/electric_eye"
-      File.new("#{@path}.log", "w")
-      File.new("#{@path}.mjpeg", "w")
-    end
-
-    it "removes recording" do
-      expect(File.exist?("#{@path}.mjpeg")).to equal(true)
-      @record.remove(@path)
-      expect(File.exist?("#{@path}.mjpeg")).to equal(false)
-    end
-
-    it "removes log" do
-      expect(File.exist?("#{@path}.log")).to equal(true)
-      @record.remove(@path)
-      expect(File.exist?("#{@path}.log")).to equal(false)
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: electric_eye
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Michael Pope
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: construct
@@ -283,3 +283,4 @@ test_files:
 - spec/motion_spec.rb
 - spec/record_spec.rb
 - spec/spec_helper.rb
+has_rdoc: