albanpeignier-alsa-backup 0.0.4 → 0.0.5

data/History.txt

@@ -1,3 +1,7 @@
+== 0.0.5
+
+* Fixe half buffer writing in recording file
+
 == 0.0.4
 
 * Replace :int by :off_t in Sndfile#write_int prototype

data/alsa-backup.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{alsa-backup}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alban Peignier"]
-  s.date = %q{2009-05-22}
+  s.date = %q{2009-05-27}
   s.default_executable = %q{alsa.backup}
   s.description = %q{ALSA client to perform continuous recording}
   s.email = ["alban.peignier@free.fr"]

data/lib/alsa.rb

@@ -17,7 +17,7 @@ module ALSA
   def self.logger=(logger); @logger = logger; end
 
   def self.try_to(message, &block)
-    logger.debug('alsa') { message }
+    logger.debug { message }
     if ALSA::Native::error_code?(response = yield)
       raise "cannot #{message} (#{ALSA::Native::strerror(response)})"
     else
@@ -91,7 +91,7 @@ module ALSA
       end
 
       def read
-        ALSA.logger.debug('alsa') { "start read with #{hw_params.sample_rate}, #{hw_params.channels} channels"}
+        ALSA.logger.debug { "start read with #{hw_params.sample_rate}, #{hw_params.channels} channels"}
 
         # use an 500ms buffer
         frame_count = hw_params.sample_rate / 2 * hw_params.channels
@@ -107,7 +107,7 @@ module ALSA
         read_count = ALSA::try_to "read from audio interface" do
           response = ALSA::PCM::Native::readi(self.handle, buffer, frame_count)
           if ALSA::Native::error_code?(response)
-            ALSA.logger.debug('alsa') { "try to recover '#{ALSA::Native::strerror(response)}' on read"}
+            ALSA.logger.debug { "try to recover '#{ALSA::Native::strerror(response)}' on read"}
             ALSA::PCM::Native::pcm_recover(self.handle, response, 1)
           else
             response
@@ -116,7 +116,7 @@ module ALSA
 
         missing_frame_count = frame_count - read_count
         if missing_frame_count > 0
-          ALSA.logger.debug('alsa') { "re-read missing frame count: #{missing_frame_count}"}
+          ALSA.logger.debug { "re-read missing frame count: #{missing_frame_count}"}
           read_buffer_size = hw_params.buffer_size_for(read_count)
           # buffer[read_buffer_size] doesn't return a MemoryPointer
           read_buffer(buffer + read_buffer_size, missing_frame_count)

data/lib/alsa_backup.rb

@@ -10,7 +10,7 @@ require 'activesupport'
 require 'logger'
 
 module AlsaBackup
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 
   def self.recorder
     @recorder ||= AlsaBackup::Recorder.new

data/lib/alsa_backup/core_ext.rb

@@ -9,14 +9,6 @@ end
 
 class File
 
-  def self.extension(file)
-    if file =~ /(\.[^.]*)$/
-      $1
-    else
-      ""
-    end
-  end
-
   def self.suffix_basename(file, suffix)
     dirname = File.dirname(file)
     
@@ -28,7 +20,7 @@ class File
         dirname + "/"
       end
 
-    extension = File.extension(file)
+    extension = File.extname(file)
     dirname +
       File.basename(file, extension) +
       suffix +

data/lib/alsa_backup/recorder.rb

@@ -15,22 +15,37 @@ module AlsaBackup
     def start(seconds_to_record = nil)
       length_controller = self.length_controller(seconds_to_record)
 
-      Writer.open(directory, file, format(:format => "wav pcm_16")) do |writer|
-        ALSA::PCM::Capture.open("hw:0", self.format(:sample_format => :s16_le)) do |capture|
+      open_writer do |writer|
+        open_capture do |capture|
           capture.read do |buffer, frame_count|
-            writer.write buffer, frame_count
+            writer.write buffer, frame_count*format[:channels]
             length_controller.continue_after? frame_count
           end
         end
       end
-    rescue Interrupt
-      AlsaBackup.logger.debug('recorder interrupted')      
     rescue Exception => e
+      retry if handle_error(e, seconds_to_record.nil?)
+    end
+
+    def open_writer(&block)
+      Writer.open(directory, file, format(:format => "wav pcm_16"), &block)      
+    end
+
+    def open_capture(&block)
+      ALSA::PCM::Capture.open("hw:0", self.format(:sample_format => :s16_le), &block)      
+    end
+
+    def handle_error(e, try_to_continue = true)
+      if Interrupt === e
+        AlsaBackup.logger.debug('recorder interrupted')      
+        return false 
+      end
+
       AlsaBackup.logger.error(e)
       AlsaBackup.logger.debug { e.backtrace.join("\n") }
 
-      if seconds_to_record.nil? and continue_on_error?(e)
-        retry
+      if try_to_continue and continue_on_error?(e)
+        return true
       else
         raise e
       end

data/lib/sndfile.rb

@@ -40,7 +40,7 @@ module Sndfile
     end
 
     def write(buffer, frame_count)
-      ALSA.logger.debug('sndfile') { "write #{frame_count} frames in #{path}"}
+      ALSA.logger.debug { "write #{frame_count} frames in #{path}"}
       write_count = Sndfile::Native::write_int(@handle, buffer, frame_count) 
 
       unless write_count == frame_count

data/spec/alsa_backup/cli_spec.rb

@@ -15,11 +15,10 @@ describe AlsaBackup::CLI, "execute" do
   def execute_cli(options = {})
     options = { :file => @file, :length => 2 }.update(options)
     arguments = options.collect do |key,value| 
-      case value
-      when true: "--#{key}"
-      when nil: nil
-      else
-        "--#{key}=#{value}" 
+      if value
+        returning "--#{key}" do |argument|
+          argument << "=#{value}" unless value == true
+        end
       end
     end.compact
     
@@ -71,7 +70,7 @@ describe AlsaBackup::CLI, "execute" do
     IO.read(pid_file).strip.should == $$.to_s
   end
 
-  it "should write pid in specified file" do
+  it "should daemonize the process with option background" do
     Daemonize.should_receive(:daemonize)
     execute_cli :background => true
   end

data/spec/alsa_backup/core_ext_spec.rb

@@ -14,22 +14,6 @@ describe Time do
 end
 
 describe File do
-  
-  describe "extension" do
-    
-    it "should be .rb for test.rb" do
-      File.extension('test.rb').should == '.rb'
-    end
-
-    it "should be '.' for 'test.'" do
-      File.extension('test.').should == '.'
-    end
-
-    it "should be blank for 'test'" do
-      File.extension('test').should be_blank
-    end
-
-  end
 
   describe "suffix_basename" do
 

data/spec/spec_helper.rb

@@ -10,7 +10,9 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'alsa_backup'
 
 def test_directory
-  File.dirname(__FILE__) + '/../tmp'
+  directory = File.dirname(__FILE__) + '/../tmp'
+  Dir.mkdir(directory) unless File.exists?(directory)
+  directory
 end
 
 def test_file(name = 'test.wav')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: albanpeignier-alsa-backup
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Alban Peignier
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-22 00:00:00 -07:00
+date: 2009-05-27 00:00:00 -07:00
 default_executable: alsa.backup
 dependencies: 
 - !ruby/object:Gem::Dependency