Fix microphone streaming and bump version

Author: Uberi

setup.py

@@ -22,7 +22,13 @@ def run(self):
             if os.path.basename(output_path) in FILES_TO_MARK_EXECUTABLE:
                 log.info("setting executable permissions on {}".format(output_path))
                 stat_info = os.stat(output_path)
-                os.chmod(output_path, stat_info.st_mode | stat.S_IEXEC)
+                os.chmod(
+                    output_path,
+                    stat_info.st_mode |
+                    stat.S_IRUSR | stat.S_IXUSR | # owner can read/execute
+                    stat.S_IRGRP | stat.S_IXGRP | # group can read/execute
+                    stat.S_IROTH | stat.S_IXOTH # everyone else can read/execute
+                )
 
 setup(
     name = "SpeechRecognition",

speech_recognition/__init__.py

@@ -3,7 +3,7 @@
 """Library for performing speech recognition with support for Google Speech Recognition, Wit.ai, IBM Speech to Text, and AT&T Speech to Text."""
 
 __author__ = "Anthony Zhang (Uberi)"
-__version__ = "3.3.1"
+__version__ = "3.3.2"
 __license__ = "BSD"
 
 import io, os, subprocess, wave, base64
@@ -107,10 +107,12 @@ def __enter__(self):
         assert self.stream is None, "This audio source is already inside a context manager"
         self.audio = self.pyaudio_module.PyAudio()
         try:
-            self.stream = self.audio.open(
-                input_device_index = self.device_index, channels = 1,
-                format = self.format, rate = self.SAMPLE_RATE, frames_per_buffer = self.CHUNK,
-                input = True, # stream is an input stream
+            self.stream = Microphone.MicrophoneStream(
+                self.audio.open(
+                    input_device_index = self.device_index, channels = 1,
+                    format = self.format, rate = self.SAMPLE_RATE, frames_per_buffer = self.CHUNK,
+                    input = True, # stream is an input stream
+                )
             )
         except:
             self.audio.terminate()
@@ -119,14 +121,25 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_value, traceback):
         try:
-            if not self.stream.is_stopped():
-                self.stream.stop_stream()
+            self.stream.close()
         finally:
+            self.stream = None
+            self.audio.terminate()
+
+    class MicrophoneStream(object):
+        def __init__(self, pyaudio_stream):
+            self.pyaudio_stream = pyaudio_stream
+
+        def read(self, size):
+            return self.pyaudio_stream.read(size, exception_on_overflow = False)
+
+        def close(self):
             try:
-                self.stream.close()
+                # sometimes, if the stream isn't stopped, closing the stream throws an exception
+                if not self.pyaudio_stream.is_stopped():
+                    self.pyaudio_stream.stop_stream()
             finally:
-                self.stream = None
-                self.audio.terminate()
+                self.pyaudio_stream.close()
 
 class WavFile(AudioSource):
     """
@@ -374,7 +387,7 @@ def listen(self, source, timeout = None):
                 if timeout and elapsed_time > timeout: # handle timeout if specified
                     raise WaitTimeoutError("listening timed out")
 
-                buffer = source.stream.read(source.CHUNK, exception_on_overflow = False)
+                buffer = source.stream.read(source.CHUNK)
                 if len(buffer) == 0: break # reached end of the stream
                 frames.append(buffer)
                 if len(frames) > non_speaking_buffer_count: # ensure we only keep the needed amount of non-speaking buffers
@@ -395,7 +408,7 @@ def listen(self, source, timeout = None):
             while True:
                 elapsed_time += seconds_per_buffer
 
-                buffer = source.stream.read(source.CHUNK, exception_on_overflow = False)
+                buffer = source.stream.read(source.CHUNK)
                 if len(buffer) == 0: break # reached end of the stream
                 frames.append(buffer)
                 phrase_count += 1