sbire 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c3335ce18ab067308516df60def16e7c4c331c1
-  data.tar.gz: 90fbf28718ed3fa48dc57f20a77632ad90c1915b
+  metadata.gz: 584201d6ad6c79033ac7fd2531c95198d2e1dea4
+  data.tar.gz: ef3dd012fcef79e09cd29dda6fa502297290f75e
 SHA512:
-  metadata.gz: 8c2dec5cec66f79ca36428829768b21b9968150ceb1b6334ddbfd092294bc9d7eecfc6f3c733d64a19e8ff61c54ba42d699554385825ba46127246f1331281eb
-  data.tar.gz: 72d4d5f937a50444b003212efe844a9cd67521b240d4010a96ecbfd795f1ea076437e1d34f3b0bf6291cf92633da602cc138a6425259ea27bff2960e6d6e09bb
+  metadata.gz: 7b73366ac9da504c1177c4ce2938bc4c6e7a162582bf1828b4bc9d7d5aeed985ef7504fad019f15cbe967ef441f85f8150e03b9d641f185d8ef1cac059e62b59
+  data.tar.gz: 4e7df1d3741837d0436ff9c6c71670d29a236d116c652a18b3f2eed70d24df73b7136709daa0063324c7cf0b26d712ff94fc82e298d6fd67dbe7f3498115b3ea

data/README.md

@@ -6,7 +6,7 @@ In french, a "Sbire" is a henchman. It's the guy who do what you say. Sbire is p
 
 In Ubuntu :
 
-    sudo apt-get install ffmpeg notify-osd ruby1.9.1
+    sudo apt-get install sox notify-osd ruby1.9.1
     gem install sbire
     mkdir ~\.sbire\
 

data/lib/audio_converter.rb

@@ -1,15 +1,71 @@
-require 'curb'
 require 'json'
-require 'speech'
+require 'fileutils'
+require 'rest_client'
 
 class AudioConverter
-  attr_accessor :audio
+  attr_accessor :pid_manager
+  def initialize(pid_manager)
+    @pid_manager = pid_manager
+  end
+
+  def start(&block)
+    FileUtils.rm_rf("#{SbireConfig.out_path}/.")
+    pid = listen_audio(block)
+    pid_manager.store(self, pid)
+  end
+
+  def stop
+    pid_manager.kill(self)
+  end
+
+  private
+  def write_pid(pid)
+    File.open(SbireConfig.converter_pid_file, 'w') {|file| file.write(pid)}
+  end
+
+  def listen_audio(block)
+    fork do
+      index = 1
+      stop = false
+
+      while stop == false
+        if File.exist?(filename(index + 1))
+          hypotheses = send_to_google(filename(index))
+          block.call(hypotheses)
+          index += 1
+
+          stop = true if ENV["mode"] == "test"
+        end
+        sleep 0.1
+      end
+    end
+  end
+
+  def send_to_google(path)
+    file = File.read(path)
+    begin
+      response = RestClient.post url,
+        file,
+        content_type: 'audio/x-flac; rate=16000'
+      read_response(response.to_str) if response.code == 200
+    rescue => e
+      puts e
+      return [""]
+    end
+  end
+
+  def filename(index)
+    index = "%03d" % index
+    "#{SbireConfig.out_file}#{index}.flac"
+  end
 
-  def initialize(file_path)
-    @audio = Speech::AudioToText.new(file_path)
+  def read_response(text)
+    data = JSON.parse(text)
+    data['hypotheses'].map {|ut| [ut['utterance'], ut['confidence']] }.first
   end
 
-  def results
-    [audio.to_text(1, Sbire::CONFIG.lang)]
+  def url
+    lang = SbireConfig.lang
+    "https://www.google.com/speech-api/v1/recognize?lang=#{lang}"
   end
 end

data/lib/audio_recorder.rb

@@ -1,26 +1,21 @@
 class AudioRecorder
-  attr_accessor :path
-  def initialize(path)
+  attr_accessor :path, :pid_manager
+  def initialize(path, pid_manager)
     @path = path
+    @pid_manager = pid_manager
   end
 
   def start
     pid = record_audio
-    write_pid(pid)
+    pid_manager.store(self, pid)
   end
 
   def stop
-    pid = File.readlines(Sbire::PID_FILE)[0]
-    system("kill #{pid}")
+    pid_manager.kill(self)
   end
 
   private
-  def write_pid(pid)
-    File.open(Sbire::PID_FILE, 'w') {|file| file.write(pid)}
-  end
-
   def record_audio
-    fork { exec "ffmpeg -loglevel panic -f alsa -ac 2 -i pulse -y #{path} -r 22050 >/dev/null 2>&1" }
-    `ps aux | grep ffmpeg | grep Sl | grep -v grep | awk -F" " '{print $2}'`
+    fork { exec "sox -t alsa -r 22050 default #{path}.flac -q silence -l 1 0 1% 1 1.0 1% rate 16k : newfile : restart" }
   end
 end

data/lib/command_manager.rb

@@ -8,9 +8,11 @@ class CommandManager
   end
 
   def execute(hypotheses)
-    command = find(hypotheses)
-    system("#{command} &")
-    return command
+    unless hypotheses.first.empty?
+      command = find(hypotheses)
+      system("#{command} &")
+      return command
+    end
   end
 
   private

data/lib/pid_manager.rb

@@ -0,0 +1,12 @@
+class PidManager
+  def store(object, pid)
+    class_name = object.class.name
+    File.open("/tmp/#{class_name}.pid", 'w') {|file| file.write(pid)}
+  end
+
+  def kill(object)
+    class_name = object.class.name
+    pid = File.read("/tmp/#{class_name}.pid")
+    system("kill #{pid}")
+  end
+end

data/lib/save_manager.rb

@@ -6,6 +6,6 @@ class SaveManager
   end
 
   def save
-    File.open(Sbire::TEXT_FILE, 'w') {|file| file.write(hypotheses.first)}
+    File.open(SbireConfig.text_file, 'w') {|file| file.write(hypotheses.first)}
   end
 end

data/lib/sbire.rb

@@ -4,18 +4,11 @@ require_relative 'command_manager'
 require_relative 'audio_recorder'
 require_relative 'save_manager'
 require_relative 'sbire_config'
+require_relative 'pid_manager'
 require 'rest_client'
 
 class Sbire
 
-  BASE_DIRECTORY = "#{Dir.home}/.sbire"
-  OUT_FILE = "#{BASE_DIRECTORY}/.audiofile.wav"
-  PID_FILE = "#{BASE_DIRECTORY}/.pid"
-  TEXT_FILE = "#{BASE_DIRECTORY}/sbire.txt"
-  CONFIG_PATH = "#{BASE_DIRECTORY}/config.yml"
-  COMMAND_PATH = "#{BASE_DIRECTORY}/commands.yml"
-  CONFIG = SbireConfig.new(CONFIG_PATH)
-
   attr_accessor :command
 
   def self.run(argv)
@@ -36,38 +29,42 @@ class Sbire
 
   private
   def start
-    audio_recorder.start
     show("Sbire is listening your voice")
+    audio_recorder.start
+    audio_converter.start { |result| command_manager.execute(result) }
   end
 
   def stop
-    show("Sbire is analyzing your voice")
     audio_recorder.stop
-    hypotheses = audio_converter.results
-    show(command_manager.execute(hypotheses))
+    audio_converter.stop
   end
 
   def save
-    show("Sbire is writing what you said")
-    audio_recorder.stop
-    hypotheses = audio_converter.results
-    SaveManager.new(hypotheses).save
-    show("Sbire has ended to write your voice")
+    show("Sbire is listening your voice")
+    audio_recorder.start
+    FileUtils.rm(SbireConfig.text_file)
+    audio_converter.start do |result|
+      File.open(SbireConfig.text_file, 'ab+') {|f| f.write(result.first + " ") }
+    end
   end
 
   def command_manager
-    @command_manager ||= CommandManager.new(COMMAND_PATH)
+    @command_manager ||= CommandManager.new(SbireConfig.command_path)
   end
 
   def audio_recorder
-    @audio_recorder ||= AudioRecorder.new(OUT_FILE)
+    @audio_recorder ||= AudioRecorder.new(SbireConfig.out_file, pid_manager)
   end
 
   def audio_converter
-    @audio_converter ||= AudioConverter.new(OUT_FILE)
+    @audio_converter ||= AudioConverter.new(pid_manager)
   end
 
   def show(message)
     Notifier.call(message)
   end
+
+  def pid_manager
+    @pid_manager ||= PidManager.new
+  end
 end

data/lib/sbire_config.rb

@@ -1,18 +1,50 @@
 require 'yaml'
 
 class SbireConfig
-  def initialize(path)
-    if File.exist?(path)
-      @config = YAML.load_file(path)
+    def self.config_path
+      "#{base_directory}/config.yml"
     end
-  end
 
-  def lang
-    config["lang"] ||= "en-US"
-  end
+    def self.base_directory
+      "/home/dougui/.sbire"
+    end
+
+    def self.tmp_directory
+      "/tmp"
+    end
+
+    def self.lang
+      config["lang"] ||= "en-US"
+    end
 
-  private
-  def config
-    @config ||= {}
-  end
+    def self.out_path
+      config["out_path"] ||= "#{base_directory}/out/"
+    end
+
+    def self.out_file
+      config["out_file"] ||= "#{out_path}.audiofile"
+    end
+
+    def self.record_pid_file
+      config["record_pid_file"] ||= "#{tmp_directory}/.recorder.pid"
+    end
+
+    def self.converter_pid_file
+      config["converter_pid_file"] ||= "#{tmp_directory}/.converter.pid"
+    end
+
+    def self.text_file
+      config["text_file"] ||= "#{base_directory}/text"
+    end
+
+    def self.command_path
+      config["command_path"] ||= "#{base_directory}/commands.yml"
+    end
+
+    private
+
+    def self.config
+      return @config if @config
+      @config = YAML.load_file(config_path) || {}
+    end
 end

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: sbire
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Guirec Corbel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: curb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: speech2text
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -54,10 +40,11 @@ files:
 - lib/save_manager.rb
 - lib/sbire_config.rb
 - lib/notifier.rb
+- lib/pid_manager.rb
 - README.md
 homepage: https://github.com/GCorbel/sbire
 licenses:
-- license.md
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []