Reorganize pydora player code

3 files changed, 62 insertions, 59 deletions

diff --git a/pydora/mpg123.py b/pydora/mpg123.py
index 2c5e4d3..e60ab43 100644
--- a/pydora/mpg123.py
+++ b/pydora/mpg123.py
@@ -1,60 +1,6 @@
-import os
 import select
-import subprocess
 
-
-def iterate_forever(func, *args, **kwargs):
-    """Iterate over a finite iterator forever
-
-    When the iterator is exhausted will call the function again to generate a
-    new iterator and keep iterating.
-    """
-    output = func(*args, **kwargs)
-
-    while True:
-        try:
-            yield next(output)
-        except StopIteration:
-            output = func(*args, **kwargs)
-
-
-class SilentPopen(subprocess.Popen):
-    """A Popen varient that dumps it's output and error
-    """
-
-    def __init__(self, *args, **kwargs):
-        self._dev_null = open(os.devnull, "w")
-        kwargs["stdin"] = subprocess.PIPE
-        kwargs["stdout"] = subprocess.PIPE
-        kwargs["stderr"] = self._dev_null
-        super(SilentPopen, self).__init__(*args, **kwargs)
-
-    def __del__(self):
-        self._dev_null.close()
-        super(SilentPopen, self).__del__()
-
-
-class PlayerCallbacks(object):
-
-    def play(self, song):
-        """Called once when a song starts playing
-        """
-        pass
-
-    def pre_poll(self):
-        """Called before polling for process status
-        """
-        pass
-
-    def post_poll(self):
-        """Called after polling for process status
-        """
-        pass
-
-    def input(self, value, song):
-        """Called after user input during song playback
-        """
-        pass
+from .utils import iterate_forever, SilentPopen
 
 
 class Player(object):
diff --git a/pydora/player.py b/pydora/player.py
index 9b99c8c..8cbd7d2 100755
--- a/pydora/player.py
+++ b/pydora/player.py
@@ -16,6 +16,34 @@ from .mpg123 import Player
 from .utils import Colors, Screen
 
 
+class PlayerCallbacks(object):
+    """Interface for Player Callbacks
+
+    This class simply exists to document the interface for callback
+    implementers implementers need not extend this class.
+    """
+
+    def play(self, song):
+        """Called once when a song starts playing
+        """
+        pass
+
+    def pre_poll(self):
+        """Called before polling for process status
+        """
+        pass
+
+    def post_poll(self):
+        """Called after polling for process status
+        """
+        pass
+
+    def input(self, value, song):
+        """Called after user input during song playback
+        """
+        pass
+
+
 class PlayerApp(object):
 
     CMD_MAP = {
@@ -138,7 +166,3 @@ class PlayerApp(object):
 
 def main():
     PlayerApp().run()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/pydora/utils.py b/pydora/utils.py
index 92a15a3..fdbbf8d 100644
--- a/pydora/utils.py
+++ b/pydora/utils.py
@@ -1,8 +1,10 @@
 from __future__ import print_function
 
+import os
 import sys
 import termios
 import getpass
+import subprocess
 
 
 def input(prompt):
@@ -101,3 +103,34 @@ def clear_screen():
     """
     sys.stdout.write("\x1b[2J\x1b[H")
     sys.stdout.flush()
+
+
+def iterate_forever(func, *args, **kwargs):
+    """Iterate over a finite iterator forever
+
+    When the iterator is exhausted will call the function again to generate a
+    new iterator and keep iterating.
+    """
+    output = func(*args, **kwargs)
+
+    while True:
+        try:
+            yield next(output)
+        except StopIteration:
+            output = func(*args, **kwargs)
+
+
+class SilentPopen(subprocess.Popen):
+    """A Popen varient that dumps it's output and error
+    """
+
+    def __init__(self, *args, **kwargs):
+        self._dev_null = open(os.devnull, "w")
+        kwargs["stdin"] = subprocess.PIPE
+        kwargs["stdout"] = subprocess.PIPE
+        kwargs["stderr"] = self._dev_null
+        super(SilentPopen, self).__init__(*args, **kwargs)
+
+    def __del__(self):
+        self._dev_null.close()
+        super(SilentPopen, self).__del__()