Ticket #317: filter.diff

__init__.py

@@ -131 +131 @@
-            # create our own media renderer
-            # but only if we have a matching Coherence package installed
-            if self.coherence_version < (0, 5, 2):
-
+e
-            else:
-                from coherence.upnp.devices.media_renderer import MediaRenderer
-                from MediaPlayer import RhythmboxPlayer
@@ -222 +222 @@
-        self.coherence_version = __version_info__
-
-        coherence_config = {
-#'logmode': 'info
+'logmode': 'warning
-            'controlpoint': 'yes',
-            'plugins': {},
-        }
@@ -315 +315 @@
-            table.attach(port_spinner, 1, 2, 0, 1,
-                         xoptions=gtk.FILL|gtk.EXPAND,yoptions=gtk.FILL|gtk.EXPAND,xpadding=5,ypadding=5)
-
-
+Network 
-            label.set_alignment(0,0.5)
-            table.attach(label, 0, 1, 1, 2)
-            interface_entry = gtk.Entry()

UpnpSource.py

@@ -22 +22 @@
-        'udn': (gobject.TYPE_PYOBJECT, 'udn', 'udn', gobject.PARAM_WRITABLE|gobject.PARAM_CONSTRUCT_ONLY),
-    }
-
+
-    def __init__(self):
-        rb.BrowserSource.__init__(self)
-        self.__db = None
-        self.__activated = False
-        self.container_watch = []
-
-
-
-
+
-
-    def do_set_property(self, property, value):
-        if property.name == 'plugin':
@@ -54 +52 @@
-            self.__entry_type = self.get_property('entry-type')
-
-            # load upnp db
-load_db(0
+browse_source(0, '', True
-            self.__client.content_directory.subscribe_for_variable('ContainerUpdateIDs', self.state_variable_change)
-            self.__client.content_directory.subscribe_for_variable('SystemUpdateID', self.state_variable_change)
-
-
-load_db(self, id
+browse_source(self, id, path, update_db
-        d = self.__client.content_directory.browse(id, browse_flag='BrowseDirectChildren', process_result=False, backward_compatibility=False)
-
+, path, update_db
-
+    def browse_item(self, id, path):
+        self.debug("browse_item called with id %s and path %s", id, path)
+        d = self.__client.content_directory.browse(id, browse_flag='BrowseMetadata', process_result=False)
+        d.addCallback(get_path, id, path)
-
+        def get_path(self, result, id, path):
+            elt = DIDLLite.DIDLElement.fromString(result['Result'])
+            for item in elt.getItems():
+                if item.upnp_class.startswith("object.container") and item.id != '0':
+                        d = self.__client.content_directory.browse(item.parentID, browse_flag='BrowseMetadata', process_result=False)
+                        d.addCallback(get_path, id, "/" + item.title + path)
+                else:
+                    self.debug("get_path got path %s", path)
+                    got_path(self, id, path)
+        
+        def got_path(self, id, path):
+            for filter in self.filters:
+                self.debug("browsing source with path %s, filtering on", path, filter)
+                self.browse_source(id, path, filter in path)
+
-    def state_variable_change(self, variable, udn=None):
-        self.info("%s changed from >%s< to >%s<", variable.name, variable.old_value, variable.value)
-        if variable.old_value == '':
-            return
-
-        if variable.name == 'SystemUpdateID':
-load_db(0
+browse_source(0, '', True
-        elif variable.name == 'ContainerUpdateIDs':
-            changes = variable.value.split(',')
-            while len(changes) > 1:
-                container = changes.pop(0).strip()
-                update_id = changes.pop(0).strip()
-                if container in self.container_watch:
-info
-load_db(container
+warning
+browse_item(container, ''
-
-
-
+
-        didl = DIDLLite.DIDLElement.fromString(results['Result'])
-        for item in didl.getItems():
-info
+debug
-            if item.upnp_class.startswith('object.container'):
-
-
+
-
+                self.debug("%s (%s) with %d items" % (current_path, item.id, item.childCount))
+
+                #browse subcontainers, only adding them if their path matches one of the specified filters
+                for filter in self.filters:
+                    self.browse_source(item.id, current_path, filter in current_path)
+                    
+            if item.upnp_class.startswith('object.item.audioItem') and update_db == True:
+
-                url = None
-                duration = None
-                size = None
@@ -96 +119 @@
-
-                for res in item.res:
-                    remote_protocol,remote_network,remote_content_format,remote_flags = res.protocolInfo.split(':')
-
+remote: 
-                    if remote_protocol == 'http-get':
-                        url = res.data
-                        duration = res.duration
@@ -105 +128 @@
-                        break
-
-                if url is not None:
-
+:
-
-                    entry = self.__db.entry_lookup_by_location (url)
-                    if entry == None:
@@ -133 +156 @@
-                    if duration is not None:
-                        h,m,s = duration.split(':')
-                        seconds = int(h)*3600 + int(m)*60 + float(s)
-
+Duration: 
-                        self.__db.set(entry, rhythmdb.PROP_DURATION, int(seconds))
-
-                    if size is not None:
-                        self.__db.set(entry, rhythmdb.PROP_FILE_SIZE,int(size))
-
-                    self.__db.commit()
-
-
+
+