sbire 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 584201d6ad6c79033ac7fd2531c95198d2e1dea4
-  data.tar.gz: ef3dd012fcef79e09cd29dda6fa502297290f75e
+  metadata.gz: 45e5f155d99a6a4463375d5a99e1c2ccb2dd68b3
+  data.tar.gz: 790ce32c63fe7fe79036bc06cd1f47d892fec57e
 SHA512:
-  metadata.gz: 7b73366ac9da504c1177c4ce2938bc4c6e7a162582bf1828b4bc9d7d5aeed985ef7504fad019f15cbe967ef441f85f8150e03b9d641f185d8ef1cac059e62b59
-  data.tar.gz: 4e7df1d3741837d0436ff9c6c71670d29a236d116c652a18b3f2eed70d24df73b7136709daa0063324c7cf0b26d712ff94fc82e298d6fd67dbe7f3498115b3ea
+  metadata.gz: e34a6dc1a39b55034e9134e9733b362565e60f52ab6ba7152c2f5ffd27d30a6bd79a96bb5b2bbce3e0ac82b0b804cf4f586927def1a13c0a82bc434b07449516
+  data.tar.gz: 1b0a5f9006a2e879e2df5a1f3b451e14dec9ca169932256b0f3fb42e9a694714f256fbb77f31fcfa0231f0901ae80299b306fb4223f57599540c87b5d18652d1

data/README.md

@@ -28,7 +28,7 @@ To write a text file :
   - Type `sbire start`
   - Say what you want ("This project rocks" for example)
   - Type `sbire save`
-  - A file will be created in `~\.sbire\sbire.txt`
+  - A file will be created in `~\.sbire\text`
 
 ## Configuration
 

data/lib/audio_converter.rb

@@ -19,22 +19,21 @@ class AudioConverter
   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
+      hypotheses = []
 
       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"
+        Thread.new(index) do |i|
+          if File.exist?(filename(i + 1))
+            index += 1
+            hypotheses[i - 1] = send_to_google(filename(i))
+            block.call(hypotheses, i - 1)
+            stop = true if ENV["mode"] == "test"
+          end
         end
         sleep 0.1
       end

data/lib/command_manager.rb

@@ -7,9 +7,10 @@ class CommandManager
     @commands = YAML.load_file(path) if File.exist?(path)
   end
 
-  def execute(hypotheses)
-    unless hypotheses.first.empty?
-      command = find(hypotheses)
+  def execute(hypotheses, index)
+    current_hypothese = hypotheses[index]
+    unless current_hypothese.first.empty?
+      command = find(current_hypothese)
       system("#{command} &")
       return command
     end

data/lib/save_manager.rb

@@ -1,11 +1,34 @@
 class SaveManager
-  attr_accessor :hypotheses
+  attr_accessor :last_index, :max_index
 
-  def initialize(hypotheses)
-    @hypotheses = hypotheses
+  def initialize
+    @last_index = 0
+    @max_index = 0
   end
 
-  def save
-    File.open(SbireConfig.text_file, 'w') {|file| file.write(hypotheses.first)}
+  def save(hypotheses, index)
+    compute_max_index(index)
+    hypotheses = current_hypotheses(hypotheses)
+    unless hypotheses.include?(nil)
+      append_to_file(hypotheses)
+      @last_index = index + 1
+    end
+  end
+
+  private
+
+  def compute_max_index(index)
+    @max_index = index if @max_index < index
+  end
+
+  def current_hypotheses(hypotheses)
+    hypotheses.map { |hypothese| hypothese.first }[last_index..max_index]
+  end
+
+  def append_to_file(hypotheses)
+    text = hypotheses.join(" ") + " "
+    if text != " "
+      File.open(SbireConfig.text_file, 'ab+') {|file| file.write(text)}
+    end
   end
 end

data/lib/sbire.rb

@@ -31,7 +31,9 @@ class Sbire
   def start
     show("Sbire is listening your voice")
     audio_recorder.start
-    audio_converter.start { |result| command_manager.execute(result) }
+    audio_converter.start do |results, index|
+      command_manager.execute(results, index)
+    end
   end
 
   def stop
@@ -42,12 +44,16 @@ class Sbire
   def save
     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 + " ") }
+    recreate_text_file
+    audio_converter.start do |results, index|
+      save_manager.save(results, index) if results
     end
   end
 
+  def recreate_text_file
+    File.write(SbireConfig.text_file, '')
+  end
+
   def command_manager
     @command_manager ||= CommandManager.new(SbireConfig.command_path)
   end
@@ -60,6 +66,10 @@ class Sbire
     @audio_converter ||= AudioConverter.new(pid_manager)
   end
 
+  def save_manager
+    @save_manager ||= SaveManager.new
+  end
+
   def show(message)
     Notifier.call(message)
   end

data/lib/sbire_config.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbire
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Guirec Corbel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client