Plain asio API

diff --git a/musicpdasio.py b/musicpdasio.py
index 665674d32df7456a96a867babfab10c776e8f124..8bd1ba447ed96c2ed6dee96d1603437a9fec9c1b 100644 (file)
--- a/musicpdasio.py
+++ b/musicpdasio.py
@@ -19,10 +19,16 @@
 try:
     import asyncio
 except ImportError:
 try:
     import asyncio
 except ImportError:

+    import sys

     print('Failed to import asyncio, need python >= 3.4')
     print('Failed to import asyncio, need python >= 3.4')

+    sys.exit(1)

 
 import logging
 
 
 import logging
 

+from os import environ
+if 'DEBUG' in environ or 'PYTHONASYNCIODEBUG' in environ:
+    logging.basicConfig(level=logging.DEBUG)
+

 HELLO_PREFIX = "OK MPD "
 ERROR_PREFIX = "ACK "
 SUCCESS = "OK"
 HELLO_PREFIX = "OK MPD "
 ERROR_PREFIX = "ACK "
 SUCCESS = "OK"


@@ -56,11 +62,9 @@ class Response:
     def __init__(self):
         self.version = None
         self.resp = ''
     def __init__(self):
         self.version = None
         self.resp = ''

-        self.err = None

 
     def __repr__(self):
 
     def __repr__(self):

-        return 'err:{0}, "{1}…" ({2})'.format(
-                self.err,
+        return '"{0}…" ({1})'.format(

                 ' '.join(self.resp.split('\n')[:2]),
                 self.version)
 
                 ' '.join(self.resp.split('\n')[:2]),
                 self.version)
 


@@ -90,6 +94,7 @@ class MPDProto(asyncio.Protocol):
 
         self.sess.resp += rcv
         if rcv.endswith(SUCCESS+'\n'):
 
         self.sess.resp += rcv
         if rcv.endswith(SUCCESS+'\n'):

+            logging.debug('set future result')

             self.transport.close()
             self.future.set_result(self.sess)
 
             self.transport.close()
             self.future.set_result(self.sess)
 


@@ -98,14 +103,15 @@ class MPDProto(asyncio.Protocol):
         if rcv.startswith(HELLO_PREFIX):
             logging.debug('consumed hello prefix')
             self.sess.version = rcv.split('\n')[0][len(HELLO_PREFIX):]
         if rcv.startswith(HELLO_PREFIX):
             logging.debug('consumed hello prefix')
             self.sess.version = rcv.split('\n')[0][len(HELLO_PREFIX):]

-            #print('consumed hello prefix: %s' % self.sess.version)

             return rcv[rcv.find('\n')+1:]
         return rcv
 
 class MPDClient:
             return rcv[rcv.find('\n')+1:]
         return rcv
 
 class MPDClient:

-    loop = asyncio.get_event_loop()

 
     def __init__(self, host='localhost', port=6600, cred=None):
 
     def __init__(self, host='localhost', port=6600, cred=None):

+        self.eloop = asyncio.get_event_loop()
+        self.asio = False
+        self.futures = []

         self._host = host
         self._port = port
         self._cred = cred
         self._host = host
         self._port = port
         self._cred = cred


@@ -116,6 +122,7 @@ class MPDClient:
         }
 
     def __getattr__(self, attr):
         }
 
     def __getattr__(self, attr):

+        #logging.debug(attr)

         command = attr
         wrapper = self._command
         if command not in self._commands:
         command = attr
         wrapper = self._command
         if command not in self._commands:


@@ -130,7 +137,7 @@ class MPDClient:
         # coroutine allowing Exception handling
         # src: http://comments.gmane.org/gmane.comp.python.tulip/1401
         try:
         # coroutine allowing Exception handling
         # src: http://comments.gmane.org/gmane.comp.python.tulip/1401
         try:

-            yield from MPDClient.loop.create_connection(lambda: proto,
+            yield from self.eloop.create_connection(lambda: proto,

                     host=self._host,
                     port=self._port)
         except Exception as err:
                     host=self._host,
                     port=self._port)
         except Exception as err:


@@ -142,6 +149,20 @@ class MPDClient:
         # kick off a task to create the connection to MPD
         coro = self._connect(MPDProto(future, payload, self._cred))
         asyncio.async(coro)
         # kick off a task to create the connection to MPD
         coro = self._connect(MPDProto(future, payload, self._cred))
         asyncio.async(coro)

-        MPDClient.loop.run_until_complete(future)
-        # return once completed.
-        return future.result().resp
+        self.futures.append(future)
+        if not self.asio:
+            # return once completed.
+            self.eloop.run_until_complete(future)
+        return future
+        # alternative w/ callback
+        #if not self.asio:
+        #    future.add_done_callback(lambda ftr: MPDClient.loop.stop())
+        #    self.eloop.run_forever()
+        #return future
+
+    def run(self):
+        if self.futures:
+           self.eloop.run_until_complete(asyncio.gather(*self.futures))
+           self.futures = []
+        else:
+            logging.info('No task found in queue, need to set self.asio?')