Player: handle exceptions when some record corrupted

+ dont kill player, just wait untill it exit
shelr · May 5, 2012 · 65ca50c · 65ca50c
1 parent c4746ef
commit 65ca50c
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/lib/shelr/player.rb b/lib/shelr/player.rb
@@ -29,8 +29,12 @@ def self.play_dump(file)
 
     def self.list
       (Dir[File.join(Shelr::DATA_DIR, "**")] - ['.', '..']).sort.each do |dir|
-        metadata = JSON.parse(IO.read(File.join(dir, 'meta')))
+        begin
-        puts "#{metadata["recorded_at"]} : #{metadata["title"]}"
+          metadata = JSON.parse(IO.read(File.join(dir, 'meta')))
+          puts "#{metadata["recorded_at"]} : #{metadata["title"]}"
+        rescue Errno::ENOENT
+          puts "Corrupted shellcast in #{dir}"
+        end
       end
     end
 
@@ -55,7 +59,7 @@ def play(options = {})
 
     def start_sound_player
       return unless File.exist?(record_file('sound.ogg'))
-      at_exit { system('stty echo') }
+      # at_exit { system('stty echo') }
       STDOUT.puts "=> Starting sound player..."
       @sox_pid = fork do
         `play #{record_file('sound.ogg')} 2>&1`
@@ -65,7 +69,7 @@ def start_sound_player
     def stop_sound_player
       return unless File.exist?(record_file('sound.ogg'))
       STDOUT.puts "=> Stopping sound player..."
-      Process.kill("HUP", @sox_pid)
+      Process.waitpid(@sox_pid)
     end
 
     def self.scriptreplay(typescript_file, timing_file)