rubysounds 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e2a5689b4a4620398f0996cca5195527fb57027
-  data.tar.gz: ed8321f4a97d9d98cce23929adc3cc501be7c7a9
+  metadata.gz: 677bcb73d8594a5fab7092c4852cfe94178d6b9f
+  data.tar.gz: 2b18a5e8809be35049129cef5a039c513022ccf0
 SHA512:
-  metadata.gz: bbcd8e6a47e7d9885da28dfe636d406a41a1d1763a221724b468afdb8a8bce1057b4b0d4526b1fa7c40bb8282a251ff64d2ec118e5caaf4e7c312ff9ecbbc8bf
-  data.tar.gz: f4ce4eed9c1c1703671bba7e4fde9e50047e1beaab48f231dda3f8531d6b0533de2023393df8e936cd2ba39eda6061531dd8d77112c6c326f63c13979cedbfd4
+  metadata.gz: 84ded87b8c1c86c0b0935bb03043b267a0cf9e0698ba2bd7a3eb3ff658834144ad5ac691185834dc16681bf7cf316e431359a654221a733501bb3339f4769d4c
+  data.tar.gz: 35b8d51c69a4404c861d40b7f4ae69642b7a6df13af81e475ce1a30c88673e3173c6f29731680017535dfe5aaee5441d58c5e4d7cbbb4d2a0ff584ab9b2bb3a3

data/lib/rubysounds.rb

@@ -1,31 +1,38 @@
-require 'net/http'
+require "net/http"
 
 # Check actual OS
-$operative_system = 'other'
+$operative_system = "other"
 if Gem.win_platform?
-	$operative_system = 'win'
+	$operative_system = "win"
 end
 
+$winlib = false
 # Import Windows-specific libraries
-if $operative_system == 'win'
-	require 'win32/sound'
-	include Win32
+if $operative_system == "win"
+	begin
+		require "win32/sound"
+		include Win32
+		$winlib = true
+	rescue LoadError
+		#puts "win32-sound gem not installed"
+		puts ""
+	end
 end
 
 # Class for text-to-speech using Google Translate
 class Speech
-	GOOGLE_TRANSLATE_URL = 'http://translate.google.com/translate_tts'.freeze
+	GOOGLE_TRANSLATE_URL = "http://translate.google.com/translate_tts".freeze
 
 	attr_accessor :text, :lang
 
-	def initialize(text, lang = 'en')
+	def initialize(text, lang = "en")
 	  @text = text
 	  @lang = lang
 	end
 
-	def self.load(file_path, lang = 'en')
+	def self.load(file_path, lang = "en")
 	  f = File.open(file_path)
-	  new f.read.encode('UTF-16be', invalid: :replace, replace: '?').encode('UTF-8'), lang
+	  new f.read.encode("UTF-16be", invalid: :replace, replace: "?").encode("UTF-8"), lang
 	end
 
 	def save(file_path)
@@ -39,14 +46,14 @@ class Speech
 
 	  sentences.each_with_index do |q, _idx|
 		uri.query = URI.encode_www_form(
-		  ie: 'UTF-8',
+		  ie: "UTF-8",
 		  q: q,
 		  tl: lang,
 		  total: sentences.length,
 		  idx: 0,
 		  textlen: q.length,
-		  client: 'tw-ob',
-		  prev: 'input'
+		  client: "tw-ob",
+		  prev: "input"
 		)
 
 		res = Net::HTTP.get_response(uri)
@@ -56,7 +63,7 @@ class Speech
 		response << res.body.force_encoding(Encoding::UTF_8)
 	  end
 
-	  File.open(file_path, 'wb') do |f|
+	  File.open(file_path, "wb") do |f|
 		f.write response.join
 		return f.path
 	  end
@@ -82,15 +89,69 @@ class Speech
 end
 
 
-def vlcplay(target)
-	system('vlc --play-and-exit --intf dummy ' + target)
+#########################################################
+
+
+# Array to store VLC sound processes
+$children_sounds = Array.new
+
+# Catching CTRL-C Keyboard Interrupt signal
+trap "SIGINT" do
+	puts "Exiting"
+	# Kill all children sounds	
+	for child_sound in $children_sounds	
+		#puts child_sound.pid
+		# Kill child process...
+		#Process.kill("QUIT", child_sound.pid)
+		if $operative_system == "win"
+			system("Taskkill /PID " + child_sound.pid.to_s + " /F")
+		else
+			system("kill " + child_sound.pid.to_s)
+		end
+		#$children_sounds.delete(child_sound)
+		# This prevents the process from becoming defunct
+		#child_sound.close
+	end	
+	# Kill main process
+	exit 130
 end
 
 
-def speak(text)
-	Speech.new(text).save('temp.wav')
-	system('vlc --play-and-exit --intf dummy temp.wav')
-	File.delete('temp.wav')
+def vlcplay(target, wait: true, bg: false, dummy: true)
+
+	# VLC command options
+	if $operative_system == "win"
+		vlccmd = "vlc "
+		if bg	
+			vlccmd += "-I null "
+		end
+		
+		vlccmd += "--play-and-exit "
+		
+		if (bg == false) && (dummy == true)
+			vlccmd += "--intf dummy "
+		end
+	else
+		vlccmd = "cvlc --play-and-exit "	
+	end
+	
+	io = IO.popen(vlccmd + target)
+	$children_sounds.push(io)
+	# Wait for the sound to end option
+	if wait
+		Process.wait(io.pid)
+	end
+	
+	#system(vlccmd + target)
+	#Thread.new { system(vlccmd + target) }
+	
+end
+
+
+def speak(text, language: "en", wait: true, bg: true)
+	Speech.new(text, language).save("temp.wav")
+	vlcplay("temp.wav", wait: wait, bg: bg)
+	File.delete("temp.wav")
 end
 
 
@@ -100,21 +161,29 @@ def dub(text)
 end
 
 
-def play(path)
-	vlcplay(path)
+def play(path, wait: true, bg: true)
+	vlcplay(path, wait: wait, bg: bg)
 end
 
 
 # Windows-specific methods
 def beep(a, b)
-	if $operative_system == 'win'
-		Sound.beep(a, b)
+	if $winlib
+		if $operative_system == "win"
+			Sound.beep(a, b)
+		else
+			dub("the beep method is only avaible on Windows operative system")
+		end
 	else
-		dub('the beep method is only avaible on Windows operative system')
+		dub("Beep is not avaible. You need to gem install win32-sounds")
 	end
 end
 
 
 def ms_win_play(path)
-	Sound.play(path)
+	if $winlib
+		Sound.play(path)
+	else
+		dub("Beep is not avaible. You need to gem install win32-sounds")
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysounds
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Alessandro Norfo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-10-14 00:00:00.000000000 Z
 dependencies: []
 description: Ruby library to manage sounds using Google Translate & command line VLC.
 email: ale.norfo@gmail.com