From: Dirk M. <di...@fr...> - 2006-10-31 16:47:15
|
Author: dmeyer Date: Tue Oct 31 16:46:58 2006 New Revision: 1944 Added: trunk/beacon/src/media.py - copied, changed from r1943, /trunk/beacon/src/hwmon/media.py trunk/beacon/src/server/ trunk/beacon/src/server/crawl.py - copied, changed from r1943, /trunk/beacon/src/crawl.py trunk/beacon/src/server/fusefs.py - copied, changed from r1943, /trunk/beacon/src/fusefs.py trunk/beacon/src/server/monitor.py - copied, changed from r1943, /trunk/beacon/src/monitor.py trunk/beacon/src/server/parser.py - copied, changed from r1943, /trunk/beacon/src/parser.py trunk/beacon/src/server/plugins/ - copied from r1943, /trunk/beacon/src/plugins/ trunk/beacon/src/server/server.py - copied, changed from r1943, /trunk/beacon/src/server.py trunk/beacon/src/utils.py - copied unchanged from r1943, /trunk/beacon/src/hwmon/utils.py Removed: trunk/beacon/src/crawl.py trunk/beacon/src/fusefs.py trunk/beacon/src/hwmon/media.py trunk/beacon/src/hwmon/utils.py trunk/beacon/src/monitor.py trunk/beacon/src/parser.py trunk/beacon/src/plugins/ trunk/beacon/src/server.py Modified: trunk/beacon/src/__init__.py trunk/beacon/src/client.py trunk/beacon/src/db.py trunk/beacon/src/hwmon/__init__.py trunk/beacon/src/hwmon/cdrom.py trunk/beacon/src/hwmon/hal.py trunk/beacon/src/hwmon/hwmon.py trunk/beacon/src/item.py Log: move some files around (part 1) Modified: trunk/beacon/src/__init__.py ============================================================================== --- trunk/beacon/src/__init__.py (original) +++ trunk/beacon/src/__init__.py Tue Oct 31 16:46:58 2006 @@ -47,7 +47,7 @@ from thumbnail import LARGE as THUMBNAIL_LARGE from query import register_filter, wrap, Query from item import Item -from hwmon import medialist as media +from media import medialist as media from kaa.db import QExpr, ATTR_SIMPLE, ATTR_SEARCHABLE, ATTR_IGNORE_CASE, \ ATTR_INDEXED, ATTR_INDEXED_IGNORE_CASE, ATTR_KEYWORDS Modified: trunk/beacon/src/client.py ============================================================================== --- trunk/beacon/src/client.py (original) +++ trunk/beacon/src/client.py Tue Oct 31 16:46:58 2006 @@ -48,7 +48,7 @@ # kaa.beacon imports from db import Database from query import Query -from hwmon import medialist +from media import medialist # get logging object log = logging.getLogger('beacon') Modified: trunk/beacon/src/db.py ============================================================================== --- trunk/beacon/src/db.py (original) +++ trunk/beacon/src/db.py Tue Oct 31 16:46:58 2006 @@ -45,7 +45,7 @@ # beacon imports from item import Item -from hwmon import medialist +from media import medialist # get logging object log = logging.getLogger('beacon.db') Modified: trunk/beacon/src/hwmon/__init__.py ============================================================================== --- trunk/beacon/src/hwmon/__init__.py (original) +++ trunk/beacon/src/hwmon/__init__.py Tue Oct 31 16:46:58 2006 @@ -4,7 +4,7 @@ import kaa.notifier from hwmon import Client as _Client -from media import medialist +from kaa.beacon.media import medialist _client = None Modified: trunk/beacon/src/hwmon/cdrom.py ============================================================================== --- trunk/beacon/src/hwmon/cdrom.py (original) +++ trunk/beacon/src/hwmon/cdrom.py Tue Oct 31 16:46:58 2006 @@ -38,7 +38,7 @@ from kaa.ioctl import ioctl import kaa.metadata -from utils import fstab +from kaa.beacon.utils import fstab # get logging object log = logging.getLogger('beacon.hal') Modified: trunk/beacon/src/hwmon/hal.py ============================================================================== --- trunk/beacon/src/hwmon/hal.py (original) +++ trunk/beacon/src/hwmon/hal.py Tue Oct 31 16:46:58 2006 @@ -18,7 +18,7 @@ # use gtk main loop kaa.notifier.init('gtk', x11=False) -from utils import fstab +from kaa.beacon.utils import fstab from cdrom import eject # get logging object Modified: trunk/beacon/src/hwmon/hwmon.py ============================================================================== --- trunk/beacon/src/hwmon/hwmon.py (original) +++ trunk/beacon/src/hwmon/hwmon.py Tue Oct 31 16:46:58 2006 @@ -4,8 +4,8 @@ import kaa.rpc -from media import medialist -import utils +from kaa.beacon.media import medialist +import kaa.beacon.utils as utils # get logging object log = logging.getLogger('beacon.hwmon') Modified: trunk/beacon/src/item.py ============================================================================== --- trunk/beacon/src/item.py (original) +++ trunk/beacon/src/item.py Tue Oct 31 16:46:58 2006 @@ -38,7 +38,7 @@ # kaa.beacon imports from thumbnail import Thumbnail -from hwmon.utils import get_title +from utils import get_title # get logging object log = logging.getLogger('beacon') Copied: trunk/beacon/src/media.py (from r1943, /trunk/beacon/src/hwmon/media.py) ============================================================================== --- /trunk/beacon/src/hwmon/media.py (original) +++ trunk/beacon/src/media.py Tue Oct 31 16:46:58 2006 @@ -8,7 +8,7 @@ import utils # get logging object -log = logging.getLogger('beacon.hwmon') +log = logging.getLogger('beacon') class Media(object): Copied: trunk/beacon/src/server/crawl.py (from r1943, /trunk/beacon/src/crawl.py) ============================================================================== --- /trunk/beacon/src/crawl.py (original) +++ trunk/beacon/src/server/crawl.py Tue Oct 31 16:46:58 2006 @@ -37,10 +37,10 @@ # kaa imports import kaa.notifier from kaa.notifier import Timer, OneShotTimer, WeakOneShotTimer, YieldFunction +from kaa.inotify import INotify # kaa.beacon imports from parser import parse -from kaa.inotify import INotify # get logging object log = logging.getLogger('beacon.crawler') Copied: trunk/beacon/src/server/fusefs.py (from r1943, /trunk/beacon/src/fusefs.py) ============================================================================== --- /trunk/beacon/src/fusefs.py (original) +++ trunk/beacon/src/server/fusefs.py Tue Oct 31 16:46:58 2006 @@ -41,7 +41,6 @@ import errno import kaa.notifier -import kaa.beacon import kaa.utils # get logging object Copied: trunk/beacon/src/server/monitor.py (from r1943, /trunk/beacon/src/monitor.py) ============================================================================== --- /trunk/beacon/src/monitor.py (original) +++ trunk/beacon/src/server/monitor.py Tue Oct 31 16:46:58 2006 @@ -38,8 +38,10 @@ from kaa.notifier import OneShotTimer, Timer, yield_execution, YieldContinue # kaa.beacon imports +from kaa.beacon.item import Item + +# kaa.beacon server imports import parser -from item import Item # get logging object log = logging.getLogger('beacon.monitor') Copied: trunk/beacon/src/server/parser.py (from r1943, /trunk/beacon/src/parser.py) ============================================================================== --- /trunk/beacon/src/parser.py (original) +++ trunk/beacon/src/server/parser.py Tue Oct 31 16:46:58 2006 @@ -42,8 +42,10 @@ from kaa.strutils import str_to_unicode import kaa.metadata import kaa.imlib2 -import thumbnail -import hwmon.utils + +# kaa.beacon imports +import kaa.beacon.thumbnail as thumbnail +from kaa.beacon.utils import get_title # get logging object log = logging.getLogger('beacon.parser') @@ -223,7 +225,7 @@ if not metadata.get('title'): # try to set a good title - title = hwmon.utils.get_title(item._beacon_data['name']) + title = get_title(item._beacon_data['name']) metadata['title'] = str_to_unicode(title) # add kaa.metadata results, the db module will add everything known Copied: trunk/beacon/src/server/server.py (from r1943, /trunk/beacon/src/server.py) ============================================================================== --- /trunk/beacon/src/server.py (original) +++ trunk/beacon/src/server/server.py Tue Oct 31 16:46:58 2006 @@ -42,11 +42,13 @@ from kaa.config import Config, Var, List, Dict # kaa.beacon imports +from kaa.beacon.db import * +import kaa.beacon.hwmon +from kaa.beacon.media import medialist + +# kaa.beacon server imports import parser -from db import * from monitor import Monitor -import hwmon -from hwmon import medialist from crawl import Crawler # get logging object @@ -156,7 +158,7 @@ 'volume.mount_point': '/' } - hwmon.set_database(self, self._db, rootfs) + kaa.beacon.hwmon.set_database(self, self._db, rootfs) self._db.commit() for dir in config.monitors: |