Refactor some things

1 files changed, 6 insertions, 35 deletions

diff --git a/main.py b/main.py
index c72147c..7c41d7b 100755
--- a/main.py
+++ b/main.py
@@ -1,47 +1,18 @@
 #!/usr/bin/env python3
 
-from dial import DialManager, DialThread
-from hangup import HangUpThread
-
-from time import sleep
-from queue import Queue
-from threading import Event
+from phone import Phone
 
 if __name__ == "__main__":
-    queue = Queue()
-    phone_held = Event()
-    phone_hung_up = Event()
-    processing_event = Event()
-
-    # start phone as on hook
-    phone_held.clear()
-    phone_hung_up.set()
-    processing_event.clear()
-
-    dial_thread = DialThread(queue, phone_held, processing_event)
-    dial_thread.start()
-    dial_manager = DialManager(phone_held, phone_hung_up)
-
-    hang_up_thread = HangUpThread(phone_held, phone_hung_up, dial_manager)
-    hang_up_thread.start()
-    
+    phone = Phone.get_instance()
     print("Ready")
     while True:
         try:
             # Wait for phone to be picked up
-            phone_held.wait()
+            phone.wait_until_answered()
             # Dial a number
-            try:
-                dialed = queue.get(block=True, timeout=0.1)
-            except:
-                continue
-            response = dial_manager.dial(dialed)
-            # If we matched a sequence, play out event
-            if response is not None:
-                processing_event.set()
-                response.run()
+            phone.process_dial()
         except Exception as e:
             print(e)
+            raise e
         finally:
-            processing_event.clear()
-
+            phone.clear_event()