Author: dmeyer
Date: Sat Mar 25 19:24:22 2006
New Revision: 1345
Modified:
trunk/beacon/src/monitor.py
Log:
fix monitoring of non items results
Modified: trunk/beacon/src/monitor.py
==============================================================================
--- trunk/beacon/src/monitor.py (original)
+++ trunk/beacon/src/monitor.py Sat Mar 25 19:24:22 2006
@@ -43,6 +43,7 @@
# kaa.beacon imports
import parser
import cdrom
+from item import Item
# get logging object
log = logging.getLogger('beacon')
@@ -70,7 +71,8 @@
self._query = query
self._checker = None
self.items = self._db.query(**self._query)
- self._scan(True)
+ if self.items and isinstance(self.items[0], Item):
+ self._scan(True)
self._poll()
# if self._query.has_key('dirname') and \
@@ -98,13 +100,26 @@
current = self._db.query(**self._query)
if len(current) != len(self.items):
self.items = current
- self._scan(False)
- return True
- for pos, c in enumerate(current):
- if self.items[pos].url != c.url:
- self.items = current
+ if (current and isinstance(current[0], Item)) or \
+ (self.items and isinstance(self.items[0], Item)):
self._scan(False)
- return True
+ else:
+ self.callback('changed')
+ return True
+ if len(current) == 0:
+ return True
+ if isinstance(current[0], Item):
+ for pos, c in enumerate(current):
+ if self.items[pos].url != c.url:
+ self.items = current
+ self._scan(False)
+ return True
+ else:
+ for pos, c in enumerate(current):
+ if self.items[pos] != c:
+ self.items = current
+ self.callback('changed')
+ return True
return True
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
