Changeset 3629

Timestamp:

17/10/08 20:01:46 (3 months ago)

Author:

dmeyer

Message:

make monitoring a property

Location:

trunk/beacon/src

Files:

• client.py (modified) (3 diffs)
• query.py (modified) (6 diffs)

trunk/beacon/src/client.py

@@ -260 +260 @@
         # Reset monitors to queries
         for query in self._queries:
-            if query != None and query.monitoring:
-                query.monitoring = False
+            if query != None and query._beacon_monitoring:
+                query._beacon_monitoring = False
                 query.monitor(True)
 
@@ -274 +274 @@
         for q in self._queries:
             if q != None:
-                q.monitoring = False
+                q._beacon_monitoring = False
         self._queries = []
         self.rpc = None
@@ -382 +382 @@
                 self._queries.remove(query)
                 continue
-            if query.monitoring:
-                query.monitoring = False
+            if query._beacon_monitoring:
+                query._beacon_monitoring = False
                 query.monitor(True)
         for m in new_media:

trunk/beacon/src/query.py

@@ -37 +37 @@
 # kaa imports
 import kaa
+from kaa.utils import property
 
 # kaa.beacon imports
@@ -83 +84 @@
         Query.NEXT_ID += 1
         # public variables
-        self.monitoring = False
+        self._beacon_monitoring = False
         self.result = []
         # internal variables
@@ -109 +110 @@
 
     def monitor(self, status=True):
+        log.warning('query.monitor is deprectated')
+        self.monitoring = status
+
+    @property
+    def monitoring(self):
         """
         Turn on/off query monitoring
-
-        @param status: True to turn on monitoring, False to turn it off.
-        """
-        if self.monitoring == status:
+        """
+        return self._beacon_monitoring
+
+    @monitoring.setter
+    def monitoring(self, status)
+        """
+        Turn on/off query monitoring
+        """
+        if self._beacon_monitoring == status:
             # Nothing to do
             return
@@ -120 +131 @@
             # If the client is not connected yet, it will do this later.
             # Rememeber that we wanted to connect
-            self.monitoring = status
+            self._beacon_monitoring = status
             return
         if status:
@@ -136 +147 @@
             self._rpc('monitor.remove', self._client.id, self.id)
         # Store current status
-        self.monitoring = status
+        self._beacon_monitoring = status
 
 
@@ -246 +257 @@
         # FIXME: replace the __del__ with a weakref monitoring all
         # queries. There is already a weakref in client.py
-        if self.monitoring:
+        if self._beacon_monitoring:
             self.monitor(False)