modified the aplay and arecord

Author: namco1992

examples/raspi_assistant/handler.py

@@ -39,9 +39,8 @@ def __init__(self, baidu_token=None):
     def __repr__(self):
         return '<BaseHandler>'
 
-    def receive(self, sec=6):
+    def receive(self, sec=4):
         self.feedback(generate_response())
-        print 'arecord begin'
         self.audio_handler.arecord(sec)
         return self.bv.asr('record.wav')
 
@@ -52,7 +51,7 @@ def process(self, results):
 
     def execute(self, func_name, result):
         func = getattr(ActionHandler, func_name)
-        return func(self.bv, self.audio_handler, result)
+        return func(self, result)
 
     @cache
     def feedback(self, content=None):
@@ -75,7 +74,7 @@ class ActionHandler(object):
     """docstring for ActionHandler"""
 
     @staticmethod
-    def default(bv, audio_handler, result):
+    def default(base_handler, result):
         print 'turing run'
         robot = TuringRobot(BC.TURING_KEY)
         try:
@@ -87,54 +86,51 @@ def default(bv, audio_handler, result):
             return content
 
     @staticmethod
-    def _memo(date, bv, audio_handler):
-        audio_handler.aplay(bv.tts('请说出内容'))
-        f = BytesIO()
-        audio_handler.record(6, f)
+    def _memo(date, base_handler):
+        base_handler.feedback('请说出记录内容')
+        base_handler.audio_handler.arecord(6)
         cache_handler = CacheHandler()
         cache_handler.zset(date, f.read(), timestamp(), 86400*3)
         return '完成记录'
 
     @staticmethod
-    def memo_today(bv, audio_handler, result):
+    def memo_today(base_handler, result):
         return ActionHandler._memo(
             date=datetime.date.today().strftime('%Y-%m-%d'),
-            bv=bv,
-            audio_handler=audio_handler
+            base_handler=base_handler
             )
 
     @staticmethod
-    def memo_tomo(bv, audio_handler, result):
+    def memo_tomo(base_handler, result):
         return ActionHandler._memo(
             date=(datetime.date.today() + datetime.timedelta(days=1)).strftime('%Y-%m-%d'),
-            bv=bv,
-            audio_handler=audio_handler
+            base_handler=base_handler
             )
 
     @staticmethod
-    def play_memo(date, audio_handler):
+    def play_memo(date, base_handler):
         cache_handler = CacheHandler()
         audio = cache_handler.zget(date, 0, -1)
         if audio:
             for item in audio:
-                audio_handler.aplay(audio)
+                base_handler.audio_handler.aplay(audio)
             return '播放结束'
         else:
-            audio_handler.aplay('未找到记录')
+            base_handler.feedback('未找到记录')
             return None
 
     @staticmethod
-    def play_memo_tomo(bv, audio_handler, result):
+    def play_memo_tomo(base_handler, result):
         return ActionHandler.play_memo(
             date=(datetime.date.today() + datetime.timedelta(days=1)).strftime('%Y-%m-%d'),
-            audio_handler=audio_handler
+            base_handler=base_handler
             )
 
     @staticmethod
-    def play_memo_today(bv, audio_handler, result):
+    def play_memo_today(base_handler, result):
         return ActionHandler.play_memo(
             date=datetime.date.today().strftime('%Y-%m-%d'),
-            audio_handler=audio_handler
+            base_handler=base_handler
             )
 
     @staticmethod
@@ -144,35 +140,35 @@ def del_memo(date, start, end):
         return '删除成功'
 
     @staticmethod
-    def del_last_memo(bv, audio_handler, result):
+    def del_last_memo(base_handler, result):
         return ActionHandler.del_memo(
             date=datetime.date.today().strftime('%Y-%m-%d'),
             start=-1,
             end=-1
             )
 
     @staticmethod
-    def del_first_memo(bv, audio_handler, result):
+    def del_first_memo(base_handler, result):
         return ActionHandler.del_memo(
             date=datetime.date.today().strftime('%Y-%m-%d'),
             start=0,
             end=0
             )
 
     @staticmethod
-    def del_all_memo(bv, audio_handler, result):
+    def del_all_memo(base_handler, result):
         return ActionHandler.del_memo(
             date=datetime.date.today().strftime('%Y-%m-%d'),
             start=0,
             end=-1
             )
 
     @staticmethod
-    def weather_tomo(bv, audio_handler, result):
+    def weather_tomo(base_handler, result):
         return ActionHandler.query_weather('tomo')
 
     @staticmethod
-    def weather_today(bv, audio_handler, result):
+    def weather_today(base_handler, result):
         return ActionHandler.query_weather('today')
 
     @staticmethod

examples/raspi_assistant/utils.py

@@ -6,7 +6,7 @@
 import base64
 from functools import wraps
 from hashlib import md5
-from subprocess import Popen, STDOUT
+from subprocess import Popen, PIPE
 from io import BytesIO
 from tempfile import NamedTemporaryFile
 
@@ -148,18 +148,29 @@ def record(self, record_seconds, file_):
         wf.writeframes(''.join(frames))
         wf.close()
 
-    def arecord(self, record_seconds):
-        p = Popen(['arecord', '-r', '16000', '-D', 'plughw:1,0', '-f', 'S16_LE', '-d', str(record_seconds), 'record.wav'])
-        p.wait()
+    def arecord(self, record_seconds, is_temp=False, file_=BC.INPUT_NAME):
+        if is_temp:
+            p = Popen(
+                ['arecord', '-r', '16000', '-D', 'plughw:1,0', '-f', 'S16_LE', '-d', str(record_seconds), '-'],
+                stdout=PIPE,
+                stderr=PIPE)
+            stdin, _ = p.communicate()
+            return stdin
+        else:
+            p = Popen(
+                ['arecord', '-r', '16000', '-D', 'plughw:1,0', '-f', 'S16_LE', '-d', str(record_seconds), file_])
+            p.wait()
 
-    def aplay(self, file_):
-        p = Popen(['aplay', file_])
+    def aplay(self, is_temp=False, file_=BC.OUTPUT_NAME):
+        if is_temp:
+            p = Popen(['aplay', '-'], stdin=file_)
+        else:
+            p = Popen(['aplay', file_])
         p.wait()
 
     def play(self, file_):
         wf = wave.open(file_, 'rb')
         p = pyaudio.PyAudio()
-        print wf.getparams()
         stream = p.open(format=p.get_format_from_width(wf.getsampwidth()),
                         channels=wf.getnchannels(),
                         rate=wf.getframerate(),
@@ -206,7 +217,9 @@ def delete(self, name):
     def expire(self, name, ttl):
         return self.client.expire(name, ttl)
 
-    def zset(self, name, key, score, ttl=None):
+    def zset(self, name, key, score, ttl=None, is_audio=True):
+        if is_audio:
+            key = base64.b64encode(key)
         if ttl:
             pipeline = self.client.pipeline()
             pipeline.zadd(name, score, key)
@@ -215,8 +228,12 @@ def zset(self, name, key, score, ttl=None):
         else:
             self.client.zadd(name, score, key)
 
-    def zget(self, name, start, end):
-        return self.client.zrange(name, start, end)
+    def zget(self, name, start, end, is_audio=True):
+        ret = self.client.zrange(name, start, end)
+        if is_audio:
+            return base64.b64decode(ret)
+        else:
+            return ret
 
     def zdel(self, name, start, end):
         # zremrangebyrank