Hide extension.endpoint_id display for now

[ipypbx] / src / ipypbx / http.py

diff --git a/src/ipypbx/http.py b/src/ipypbx/http.py
index 4de39d5..3dfe0b8 100644 (file)
--- a/src/ipypbx/http.py
+++ b/src/ipypbx/http.py
@@ -23,14 +23,17 @@ class FreeswitchConfigServer(QtNetwork.QTcpServer):
     """
     TCP server that receives config requests from freeswitch.
     """
-    def __init__(self, parent=None):
+    def __init__(self, parent):
         super(FreeswitchConfigServer, self).__init__(parent)
 
         self.host = None
         self.port = None
         self.is_running = False
+        self.generators = [
+            GenClass(self.parent().model) for GenClass in (
+                SofiaConfGenerator,)]
         
-        self.httpRequestParser = HttpRequestParser()
+        self.httpRequestParser = HttpRequestParser(self)
         
     def setSocketData(self, host, port):
         """
@@ -47,7 +50,6 @@ class FreeswitchConfigServer(QtNetwork.QTcpServer):
 
         # Restart server if necessary.
         if needs_restart:
-            print 'restartin', self.host, self.port
             self.restartServer()
 
     def startServer(self):
@@ -99,11 +101,12 @@ class HttpRequestParser(object):
     """
     A simple state machine for parsing HTTP requests.
     """
-    HTTP_NONE, HTTP_REQUEST, HTTP_HEADERS, HTTP_EMPTY, HTTP_MESSAGE = range(5)
-    HTTP_STATES = ['NONE', 'REQUEST', 'HEADERS', 'EMPTY', 'MESSAGE']
+    HTTP_NONE, HTTP_REQUEST, HTTP_HEADERS, HTTP_EMPTY, HTTP_MESSAGE, \
+        HTTP_DONE = range(6)
+    HTTP_STATES = ['NONE', 'REQUEST', 'HEADERS', 'EMPTY', 'MESSAGE', 'DONE']
     
-    def __init__(self):
-        super(HttpRequestParser, self).__init__()
+    def __init__(self, parent):
+        self.parent = parent
         self.reset()
 
     def reset(self):
@@ -126,7 +129,6 @@ class HttpRequestParser(object):
         """
         for state in self.HTTP_STATES:
             if getattr(self, 'HTTP_%s' % state) == self.state:
-                print self.state, line
                 getattr(self, 'handle%s' % state.title())(line)
                 break
         else:
@@ -173,6 +175,13 @@ class HttpRequestParser(object):
             print k, '=>', v
         print
 
+        for generator in self.parent.generators:
+            if generator.canHandle(self.headers):
+                self.state += 1
+                print generator.generateConfig(self.headers)
+        else:
+            print 'No generator found'
+            
 
 
 class FreeswitchConfigGenerator(object):
@@ -186,24 +195,24 @@ class FreeswitchConfigGenerator(object):
     def __init__(self, model):
         self.model = model
 
-    def check_params(self, params):
+    def canHandle(self, params):
         for key, value in self.param_match.iteritems():
             if params.get(key, None) != value:
                 return False
         else:
             return True
 
-    def base_elements(self):
+    def baseElements(self):
         root_elt = etree.Element('document')
         section_elt = etree.SubElement(
             root_elt, 'section', name=self.section_name)
         return root_elt, section_elt
-    base_elements = property(base_elements)
+    baseElements = property(baseElements)
 
-    def generate_config(self, params):
+    def generateConfig(self, params):
         return NotImplemented
 
-    def add_params(parent_elt, params):
+    def addParams(parent_elt, params):
         for name, value in params:
             etree.SubElement(parent_elt, 'param', name=name, value=value)
             
@@ -216,9 +225,9 @@ class SofiaConfGenerator(FreeswitchConfigGenerator):
     section_name = 'configuration'
     config_name = 'sofia.conf'
 
-    def generate_config(self, params):
+    def generateConfig(self, params):
         # Get base elements.
-        root_elt, section_elt = self.base_elements
+        root_elt, section_elt = self.baseElements
 
         # Create configuration, settings and profiles elements.
         configuration_elt = etree.SubElement(