Changeset 3657

Timestamp:

28/10/08 18:18:34 (2 months ago)

Author:

dmeyer

Message:

revert beacon.Query.monitor to be a function again

Location:

trunk

Files:

• DEPRECATED/player/test/baloo.py (modified) (1 diff)
• beacon/bin/beacon-search (modified) (1 diff)
• beacon/doc/query.rst (modified) (1 diff)
• beacon/src/client.py (modified) (2 diffs)
• beacon/src/fusefs.py (modified) (1 diff)
• beacon/src/query.py (modified) (6 diffs)
• beacon/test/beacon_gtk.py (modified) (1 diff)
• popcorn/test/baloo.py (modified) (1 diff)

trunk/DEPRECATED/player/test/baloo.py

@@ -58 +58 @@
         self.search = kaa.beacon.query(type='audio', keywords=string)
         self.search.signals['changed'].connect(self.update_playlist)
-        self.search.monitor = True
+        self.search.monitor()
         self.update_playlist()
         if self.current:

trunk/beacon/bin/beacon-search

@@ -281 +281 @@
     result.signals['progress'].connect(progress)
     result.signals['up-to-date'].connect(uptodate)
-    result.monitor = True
+    result.monitor()
 
 if __name__ == '__main__':

trunk/beacon/doc/query.rst

@@ -29 +29 @@
 FIXME: Describe monitoring here
 
-.. autoattribute:: beacon.Query.monitor
+.. automethod:: beacon.Query.monitor
 .. autofunction:: beacon.monitor
 

trunk/beacon/src/client.py

@@ -262 +262 @@
             if query != None and query._beacon_monitoring:
                 query._beacon_monitoring = False
-                query.monitor = True
+                query.monitor()
 
         return False
@@ -384 +384 @@
             if query._beacon_monitoring:
                 query._beacon_monitoring = False
-                query.monitor = True
+                query.monitor()
         for m in new_media:
             if not m.mountpoint == '/':

trunk/beacon/src/fusefs.py

@@ -70 +70 @@
         self._query_update_time = 0
         query.signals["changed"].connect_weak(self._query_changed)
-        query.monitor = True
+        query.monitor()
 
         fuse.Fuse.__init__(self, *args, **kw)

trunk/beacon/src/query.py

@@ -37 +37 @@
 # kaa imports
 import kaa
-from kaa.utils import property
 
 # kaa.beacon imports
@@ -108 +107 @@
         return self._async
 
-    @property
-    def monitor(self):
+    def monitor(self, enable=True):
         """
         Turn on/off query monitoring
         """
-        return self._beacon_monitoring
-
-    @monitor.setter
-    def monitor(self, status):
-        """
-        Turn on/off query monitoring
-        """
-        if self._beacon_monitoring == status:
+        if self._beacon_monitoring == enable:
             # Nothing to do
             return
@@ -126 +117 @@
             # If the client is not connected yet, it will do this later.
             # Rememeber that we wanted to connect
-            self._beacon_monitoring = status
+            self._beacon_monitoring = enable
             return
-        if status:
+        if enable:
             query = copy.copy(self._query)
             if 'parent' in query:
@@ -135 +126 @@
                     # We need the get the id first. Call the function again
                     # when there is an id.
-                    parent.scan().connect(self.monitor, status)
+                    parent.scan().connect(self.monitor, enable)
                     return
                 query['parent'] = parent._beacon_id
@@ -142 +133 @@
             self._rpc('monitor.remove', self._client.id, self.id)
         # Store current status
-        self._beacon_monitoring = status
+        self._beacon_monitoring = enable
 
 
@@ -251 +242 @@
         # queries. There is already a weakref in client.py
         if self._beacon_monitoring:
-            self.monitor = False
+            self.monitor(False)
 
 

trunk/beacon/test/beacon_gtk.py

@@ -123 +123 @@
         self.search = yield kaa.beacon.query(keywords=data.get_text(), type='audio')
         self.search.signals['changed'].connect(self._update_list)
-        self.search.monitor = True
+        self.search.monitor()
         self._update_list()
 

trunk/popcorn/test/baloo.py

@@ -58 +58 @@
         self.search = yield kaa.beacon.query(type='audio', keywords=string)
         self.search.signals['changed'].connect(self.update_playlist)
-        self.search.monitor = True
+        self.search.monitor()
         self.update_playlist()
         if self.current: