vidibus-recording 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,11 +1,9 @@
 PATH
   remote: .
   specs:
-    vidibus-recording (0.0.1)
+    vidibus-recording (0.0.2)
       delayed_job_mongoid
       mongoid (~> 2.0.0.beta.20)
-      open4
-      robustthread
       vidibus-uuid
 
 GEM
@@ -35,10 +33,8 @@ GEM
       mongo (~> 1.2)
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
-    open4 (1.0.1)
     rake (0.8.7)
     relevance-rcov (0.9.2.1)
-    robustthread (0.5.2)
     rr (1.0.2)
     rspec (2.0.1)
       rspec-core (~> 2.0.1)
@@ -65,10 +61,8 @@ DEPENDENCIES
   bundler (>= 1.0.0)
   delayed_job_mongoid
   mongoid (~> 2.0.0.beta.20)
-  open4
   rake
   relevance-rcov
-  robustthread
   rr
   rspec (~> 2.0.0.beta.20)
   vidibus-recording!

data/lib/vidibus-recording.rb

@@ -1,6 +1,5 @@
-require "open4"
+require "open3"
 require "yaml"
-require "robustthread"
 require "delayed_job_mongoid"
 require "active_support/core_ext"
 require "vidibus-uuid"

data/lib/vidibus/recording/backend/rtmpdump.rb

@@ -58,7 +58,7 @@ module Vidibus::Recording::Backend
     #
     def extract_metadata(std)
       if metadata = std.match(/Metadata\:\n\s+(.+)\Z/m)
-        tuples = $1.scan(/([^\n\s\d]+)\s*([^\n]+)\n/m)
+        tuples = $1.scan(/([^\n\ \d]+)\ +([^\ ][^\n]+)\n/mi)
         self.metadata = Hash[tuples]
       end
     end

data/lib/vidibus/recording/job.rb

@@ -1,7 +1,5 @@
 module Vidibus::Recording
   class Job
-    include Open4
-
     class ProcessError < StandardError; end
 
     attr_accessor :recording, :pid
@@ -12,7 +10,6 @@ module Vidibus::Recording
     end
 
     def start
-      start_logger
       self.pid = fork do
         start_thread
       end
@@ -48,56 +45,44 @@ module Vidibus::Recording
     protected
 
     def start_thread
-      stdin = ""
-      stdout = ""
-      stderr = ""
-      last_stderr = ""
-      last_stdout = ""
-      task = background(recording.backend.command, 0=>stdin, 1=>stdout, 2=>stderr)
-
-      waiter = Thread.new {y(task.pid => task.exitstatus)} # t.exitstatus is a blocking call!
       timeout = 5
-
-      while(status = task.status)
-        unless stderr == last_stderr
-          metadata = extract_metadata(stderr)
-          last_stderr = stderr
-        end
-
-        unless stdout == last_stdout
-          metadata = extract_metadata(stdout)
-          last_stdout = stdout
-        end
-
-        unless metadata
-          timeout -= 1
-          if timeout == 0
-            recording.fail("No Metadata has been received. This stream does not work.")
-            return
+      metadata = nil
+
+      Open3::popen3(recording.backend.command) do |stdin, stdout, stderr, waiter|
+        loop do
+          size = stderr.stat.blocks * stderr.stat.blksize
+          if size > 0
+            std = stderr.readpartial(size) rescue ""
+            log(std)
+            metadata = extract_metadata(std) unless metadata
           end
+          unless metadata
+            timeout -= 1
+            if timeout == 0
+              recording.fail("No Metadata has been received. This stream does not work.")
+              return
+            end
+          end
+          sleep 2
         end
-
-        sleep 2
       end
-
       waiter.join
     end
 
+    def log(msg)
+      File.open(recording.log_file, "a") do |f|
+        f.write(msg)
+      end
+    end
+
     def extract_metadata(std)
       metadata = recording.backend.extract_metadata(std)
       if metadata
-        File.open(recording.yml_file, "w") do |file|
-          file.write(metadata.to_yaml)
+        File.open(recording.yml_file, "w") do |f|
+          f.write(metadata.to_yaml)
         end
       end
       metadata
     end
-
-    def start_logger
-      RobustThread.logger = Logger.new(recording.log_file)
-      RobustThread.exception_handler do |exception|
-        RobustThread.log exception
-      end
-    end
   end
 end

data/lib/vidibus/recording/mongoid.rb

@@ -151,7 +151,7 @@ module Vidibus::Recording
       if str = read_file(log_file)
         str.gsub!(/\A[^\n]+\n/, "") # remove first line
         unless str == ""
-          self.log = str
+          self.log = str.gsub(/\r\n?/, "\n")
         end
       end
     end

data/lib/vidibus/recording/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Recording
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/vidibus/recording/backend/rtmpdump_spec.rb

@@ -0,0 +1,62 @@
+require "spec_helper"
+require "recording/backend/rtmpdump"
+
+describe "Vidibus::Recording::Backend::Rtmpdump" do
+
+  let(:this) {Vidibus::Recording::Backend::Rtmpdump.new(:stream => "rtmp://test", :file => "test.rec")}
+  let(:log) do
+%(RTMPDump v2.2
+(c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL
+Connecting ...
+ERROR: rtmp server sent error
+Starting Live Stream
+Metadata:
+  author
+  copyright
+  description
+  keywords
+  rating
+  title
+  presetname            Custom
+  creationdate          Mon Jan 17 15:22:50 2011
+  videodevice           Osprey-210 Video Device 1
+  framerate             25.00
+  width                 680.00
+  height                394.00
+  videocodecid          avc1
+  videodatarate         650.00
+  avclevel              31.00
+  avcprofile            66.00
+  videokeyframe_frequency5.00
+  audiodevice           Osprey-210 Audio Device 1
+  audiosamplerate       22050.00
+  audiochannels         1.00
+  audioinputvolume      75.00
+  audiocodecid          .mp3
+  audiodatarate         48.00
+)
+  end
+
+  describe "extract_metadata" do
+    it "should extract relevant metadata" do
+      this.extract_metadata(log).should eql({
+        "presetname" => "Custom",
+        "creationdate" => "Mon Jan 17 15:22:50 2011",
+        "videodevice" => "Osprey-210 Video Device 1",
+        "framerate" => "25.00",
+        "width" => "680.00",
+        "height" => "394.00",
+        "videocodecid" => "avc1",
+        "videodatarate" => "650.00",
+        "avclevel" => "31.00",
+        "avcprofile" => "66.00",
+        "audiodevice" => "Osprey-210 Audio Device 1",
+        "audiosamplerate" => "22050.00",
+        "audiochannels" => "1.00",
+        "audioinputvolume" => "75.00",
+        "audiocodecid" => ".mp3",
+        "audiodatarate" => "48.00"
+      })
+    end
+  end
+end

data/vidibus-recording.gemspec

@@ -15,8 +15,6 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
 
   s.add_dependency "mongoid", "~> 2.0.0.beta.20"
-  s.add_dependency "open4"
-  s.add_dependency "robustthread"
   s.add_dependency "delayed_job_mongoid"
 
   s.add_dependency "vidibus-uuid"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-recording
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Andre Pankratz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-23 00:00:00 +01:00
+date: 2011-01-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,7 +37,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: open4
+  name: delayed_job_mongoid
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -51,7 +51,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: robustthread
+  name: vidibus-uuid
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -64,38 +64,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: delayed_job_mongoid
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: vidibus-uuid
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,11 +79,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,11 +93,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -139,11 +111,11 @@ dependencies:
         - 20
         version: 2.0.0.beta.20
   type: :development
-  version_requirements: *id008
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -153,11 +125,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: relevance-rcov
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -167,7 +139,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id008
 description: Allows recording of RTMP video streams. Uses RTMPdump.
 email: andre@vidibus.com
 executables: []
@@ -193,6 +165,7 @@ files:
 - lib/vidibus/recording/mongoid.rb
 - lib/vidibus/recording/version.rb
 - spec/spec_helper.rb
+- spec/vidibus/recording/backend/rtmpdump_spec.rb
 - spec/vidibus/recording/backend_spec.rb
 - spec/vidibus/recording/mongoid_spec.rb
 - vidibus-recording.gemspec