Author: dmeyer
Date: Wed Mar 29 17:24:29 2006
New Revision: 1364
Modified:
trunk/beacon/src/client.py
trunk/beacon/src/server.py
Log:
remove autocrawler
Modified: trunk/beacon/src/client.py
==============================================================================
--- trunk/beacon/src/client.py (original)
+++ trunk/beacon/src/client.py Wed Mar 29 17:24:29 2006
@@ -65,7 +65,6 @@
# monitor function from the server to start a new monitor for a query
self._server = kaa.ipc.IPCClient('beacon').get_object('beacon')(db)
self._server_monitor = self._server.monitor
- self._crawler = self._server.crawl
# read only version of the database
self.database = Database(db, self)
# connect to server notifications
@@ -87,7 +86,6 @@
self._queries = []
self._server = None
self._server_monitor = None
- self._crawler = None
self.database = None
@@ -104,9 +102,6 @@
"""
filename = os.path.realpath(filename)
result = Query(self, filename=filename).result
- if result and result._beacon_isdir and \
- (not result._beacon_id or not result._beacon_data['mtime']):
- self._crawler(filename, __ipc_oneway=True, __ipc_noproxy_args=True)
return result
Modified: trunk/beacon/src/server.py
==============================================================================
--- trunk/beacon/src/server.py (original)
+++ trunk/beacon/src/server.py Wed Mar 29 17:24:29 2006
@@ -47,7 +47,6 @@
import parser
from db import *
from monitor import Monitor
-from crawl import Crawler
# get logging object
log = logging.getLogger('beacon')
@@ -118,12 +117,6 @@
# set up.
self._db.commit()
- # check the mountpoint for db changes
- for m in self._db.get_mountpoints(True):
- if m.directory == '/':
- Crawler(self._db).crawl(self._db._get_dir('/', m))
- break
-
def register_file_type_attrs(self, name, **kwargs):
"""
@@ -141,6 +134,22 @@
return self._db.register_object_type_attrs('track_%s' % name, **kwargs)
+ def monitor_dir(self, directory):
+ """
+ """
+ self._db.commit()
+ data = self._db.query(filename=directory)
+ items = []
+ for i in data._beacon_tree():
+ if i._beacon_id:
+ break
+ items.append(i)
+ while items:
+ parser.parse(self._db, items.pop(), store=True)
+ self._db.commit()
+ data._beacon_media.monitor(data)
+
+
def monitor(self, client_id, request_id, query):
"""
Create a monitor object to monitor a query for a client.
@@ -169,23 +178,6 @@
return None
- def crawl(self, directory):
- """
- Start crawling a directory.
- """
- self._db.commit()
- data = self._db.query(filename=directory)
- items = []
- for i in data._beacon_tree():
- if i._beacon_id:
- break
- items.append(i)
- while items:
- parser.parse(self._db, items.pop(), store=True)
- self._db.commit()
- Crawler(self._db).crawl(data)
-
-
def add_mountpoint(self, device, directory):
"""
Add a mountpoint to the system.
-------------------------------------------------------
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
