Ticket #142: urlbase.patch

device.py

@@ -5 +5 @@
-# Copyright 2006, Frank Scholz <coherence@beebits.net>
-
-import urllib2
+from urlparse import urlparse,urljoin
-import time
-
-from twisted.internet import defer
@@ -79 +80 @@
-    def get_id(self):
-        return self.udn
-
+    def get_root_id(self):
+        if self.parent:
+            return self.parent.get_id()
+        return self.get_id()
+
-    def get_uuid(self):
-        return self.udn[5:]
-
+    def get_root_uuid(self):
+        if self.parent:
+            return self.parent.get_root_uuid()
+        return self.get_uuid()
+
-    def get_services(self):
-        return self.services
-
@@ -139 +150 @@
-
-    def parse_device(self, d):
-        self.device_type = unicode(d.findtext('./{%s}deviceType' % ns))
+        self.model_name = unicode(d.findtext('./{%s}modelName' % ns))
-        self.friendly_name = unicode(d.findtext('./{%s}friendlyName' % ns))
-        self.udn = d.findtext('.//{%s}UDN' % ns)
-
-        icon_list = d.find('./{%s}iconList' % ns)
-        if icon_list is not None:
-            import urllib2
-
+#
-            for icon in icon_list.findall('./{%s}icon' % ns):
-                try:
-                    i = {}
@@ -154 +166 @@
-                    i['height'] = icon.find('./{%s}height' % ns).text
-                    i['depth'] = icon.find('./{%s}depth' % ns).text
-                    i['url'] = icon.find('./{%s}url' % ns).text
-
-
+
+
+
-                    self.icons.append(i)
-                    self.debug("adding icon %r for %r" % (i,self.friendly_name))
-                except:
@@ -183 +196 @@
-                if len(controlUrl) == 0:
-                    self.warning("service has no uri for controling")
-                    continue
-location
+url_base
-                                         controlUrl,
-                                         eventSubUrl, presentationUrl, scpdUrl, self))
-
@@ -199 +212 @@
-    def get_location(self):
-        return self.parent.get_location()
-
+    def get_url_base(self):
+        return self.parent.get_url_base()
+
-    def get_usn(self):
-        return self.parent.get_usn()
-
@@ -231 +247 @@
-    def get_location(self):
-        return self.location
-
+    def get_url_base(self):
+        return self.url_base
+
-    def get_host(self):
-        return self.host
-
@@ -279 +298 @@
-            data, headers = x
-            tree = utils.parse_xml(data, 'utf-8').getroot()
-
+            # This is the base for all relative URLs
+            self.url_base = tree.findtext('./{%s}URLBase' % ns)
+            if self.url_base is None or len(self.url_base) == 0:
+                # not given in description so use location
+
+                # TODO should we parse out only protocol and host or use as is
+                # I think the url_base could contain part of a path as well.
+                parsed = urlparse(self.location)
+                # ensure has trailing slash
+                self.url_base = "%s://%s/" % (parsed[0], parsed[1])
+            self.debug("url_base %r" % self.url_base)
+
-            d = tree.find('.//{%s}device' % ns)
-            if d is not None:
-                self.parse_device(d) # root device

event.py

@@ -243 +243 @@
-    log_category = "event_protocol"
-    log.info(log_category, "event.subscribe, action: %r", action)
-
-
+
+
+
-    if host_port.find(':') != -1:
-        host,port = tuple(host_port.split(':'))
-        port = int(port)
@@ -253 +255 @@
-
-    def send_request(p, action):
-        log.info(log_category, "event.subscribe.send_request %r, action: %r %r",
-service.get_event_sub_url()
+path
-        if action == 'subscribe':
-            timeout = service.timeout
-            if timeout == 0:
-                timeout = 1800
-service.get_event_sub_url()
+path
-                        "HOST: %s:%d" % (host, port),
-                        "TIMEOUT: Second-%d" % timeout,
-                        ]
-            service.event_connection = p
-        else:
-service.get_event_sub_url()
+path
-                        "HOST: %s:%d" % (host, port),
-                        ]
-
@@ -293 +295 @@
-        #return d
-
-    def got_error(failure, action):
- % (action,service.get_base_url()
+, action,service.get_event_sub_url(
-        log.debug(log_category, failure)
-
-    def teardown_connection(c, d):

service.py

@@ -7 +7 @@
-import os
-
-import time
-
+
-from coherence.upnp.core import action
-from coherence.upnp.core import event
-from coherence.upnp.core import variable
@@ -41 +41 @@
-class Service(log.Loggable):
-    logCategory = 'service_client'
-
-location
+url_base
-                 event_sub_url, presentation_url, scpd_url, device):
-
-
-
-
-
-
-
-
-
+
-        self.service_type = service_type
-        self.detection_completed = False
-
-
-
-
-
+
+
+
+
+
+
+
-        self.device = device
-        self._actions = {}
-        self._variables = { 0: {}}
@@ -71 +65 @@
-
-        self.client = None
-
-        parsed = urllib2.urlparse.urlparse(location)
-        self.url_base = "%s://%s" % (parsed[0], parsed[1])
-
-        self.parse_actions()
-
+
+
+
+
+
-
-    def __repr__(self):
-        return "Service %s %s" % (self.service_type,self.id)
@@ -151 +146 @@
-        return self._actions
-
-    def get_action( self, name):
-
+
+
+
-
-    def get_state_variables(self, instance):
-stance
+t(instance)
-
-    def get_state_variable(self, name, instance=0):
-        instance = int(instance)
-        return self._variables.get(instance).get(name)
-
-    def get_control_url(self):
-url_base + self.
+
-
-    def get_event_sub_url(self):
-
-
+
-
-    def get_presentation_url(self):
-url_base + self.
+
-
-    def get_scpd_url(self):
-url_base + self.
+
-
-
-
+#
+#
-
-    def subscribe(self):
-        self.debug("subscribe %s", self.id)
@@ -215 +211 @@
-    def process_event(self,event):
-        self.info("process event %r" % self)
-        for var_name, var_value  in event.items():
-
-"
-
-
+
+ %s", var_value
+
+
-                namespace_uri, tag = tree.tag[1:].split( "}", 1)
-                for instance in tree.findall('{%s}InstanceID' % namespace_uri):
-                    instance_id = instance.attrib['val']
@@ -226 +222 @@
-                    for var in instance.getchildren():
-                        self.info("var %r" % var)
-                        namespace_uri, tag = var.tag[1:].split("}", 1)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        self.info("updated var %r" % var)
-            else:
-                self.get_state_variable(var_name, 0).update(var_value)
@@ -369 +384 @@
-        self._pending_notifications = {}
-
-    def get_action(self, action_name):
-
+
+
+
-
-    def get_actions(self):
-        return self._actions