Changeset 3644
- Timestamp:
- 24/10/08 22:07:11 (3 months ago)
- Location:
- trunk/beacon
- Files:
-
- 15 modified
-
bin/beacon-daemon (modified) (5 diffs)
-
bin/beacon-mount (modified) (2 diffs)
-
bin/beacon-search (modified) (7 diffs)
-
bin/kaa-thumb (modified) (1 diff)
-
src/__init__.py (modified) (1 diff)
-
src/db.py (modified) (1 diff)
-
src/server/__init__.py (modified) (1 diff)
-
src/server/cdrom.py (modified) (1 diff)
-
src/server/db.py (modified) (1 diff)
-
src/server/hal.py (modified) (1 diff)
-
src/server/parser.py (modified) (1 diff)
-
src/server/server.py (modified) (1 diff)
-
src/server/videothumb.py (modified) (1 diff)
-
src/thumbnail.py (modified) (1 diff)
-
src/utils.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/beacon/bin/beacon-daemon
r3611 r3644 132 132 if mode == 'stop': 133 133 # stop a running beacon 134 134 135 135 def shutdown(client): 136 136 client.rpc('beacon.shutdown') … … 199 199 # close fifo from daemonize 200 200 daemonize_lock.ignore() 201 201 202 202 # loop 203 203 kaa.main.run() … … 205 205 sys.exit(0) 206 206 207 207 208 208 # beacon server 209 209 import kaa.beacon.thumbnail … … 232 232 log.info('monitor %s', dirname) 233 233 server.monitor_dir(dirname) 234 234 235 235 # start garbage collector 236 236 kaa.Timer(garbage_collect).start(10) … … 248 248 sys.exit(0) 249 249 return True 250 250 251 251 log.info('set autoshutdown timer') 252 252 kaa.Timer(autoshutdown_poll).start(1) -
trunk/beacon/bin/beacon-mount
r3475 r3644 36 36 import getopt 37 37 import time 38 import fcntl39 import termios40 import struct41 42 38 import logging 43 from logging.handlers import RotatingFileHandler44 39 45 40 # FIXME: most of this list should probably be kept in kaa.db … … 157 152 main() 158 153 kaa.main.run() 159 -
trunk/beacon/bin/beacon-search
r3627 r3644 39 39 import termios 40 40 import struct 41 42 41 import logging 43 from logging.handlers import RotatingFileHandler44 42 45 43 # FIXME: most of this list should probably be kept in kaa.db 46 44 IGNORE_KEYS = [ 'name', 'parent', 'parent_id', 'parent_type', 'media', 'mtime', 47 'computed_id', 'type', 'id' ] 45 'computed_id', 'type', 'id' ] 48 46 49 47 # insert kaa path information … … 96 94 if not isinstance(results.get(), (list, tuple)): 97 95 results = [ results.get() ] 98 96 99 97 if len(results) == 0: 100 98 print 'No results.' … … 202 200 print 'beacon-daemon not running.' 203 201 sys.exit(1) 204 202 205 203 206 204 if mode == 'info': … … 227 225 print '%4d %s %s' % (m['id'], m['name'], available) 228 226 sys.exit(0) 229 227 230 228 231 229 if mode == 'del-media': … … 239 237 sys.exit(1) 240 238 yield kaa.beacon.delete_media(media) 241 sys.exit(0) 239 sys.exit(0) 242 240 243 241 query = {} … … 272 270 else: 273 271 result = yield kaa.beacon.query(**query) 274 272 275 273 t2 = time.time() 276 274 print_results(result, details) … … 288 286 if not main().finished: 289 287 kaa.main.run() 290 -
trunk/beacon/bin/kaa-thumb
r2974 r3644 29 29 print 30 30 sys.exit(0) 31 31 32 32 33 33 size = kaa.vfs.NORMAL -
trunk/beacon/src/__init__.py
r3631 r3644 41 41 import os 42 42 import logging 43 import time44 45 # kaa imports46 import kaa47 43 48 44 # kaa.beacon imports -
trunk/beacon/src/db.py
r3628 r3644 35 35 import os 36 36 import stat 37 import threading38 37 import logging 39 38 import time -
trunk/beacon/src/server/__init__.py
r3607 r3644 30 30 # ----------------------------------------------------------------------------- 31 31 32 __all__ = [ 'config', 'BeaconServer', 'Thumbnailer' ] 33 32 34 from config import config 33 35 -
trunk/beacon/src/server/cdrom.py
r3612 r3644 33 33 34 34 import os 35 import sys36 35 import re 37 36 import array 38 37 import struct 39 import fcntl40 38 import copy 41 39 -
trunk/beacon/src/server/db.py
r3617 r3644 31 31 32 32 # python imports 33 import os34 import stat35 import threading36 33 import logging 37 34 import time -
trunk/beacon/src/server/hal.py
r3618 r3644 33 33 __all__ = [ 'signals', 'Device', 'start' ] 34 34 35 import sys36 35 import os 37 import time38 import signal39 36 import logging 40 37 -
trunk/beacon/src/server/parser.py
r3611 r3644 35 35 # Python imports 36 36 import os 37 import stat38 37 import logging 39 38 import time -
trunk/beacon/src/server/server.py
r3614 r3644 37 37 38 38 # kaa imports 39 from kaa import OneShotTimer, Timer, Callback40 39 import kaa.rpc 41 from kaa.net.url import add_password42 40 43 41 # kaa.beacon server imports -
trunk/beacon/src/server/videothumb.py
r3611 r3644 48 48 49 49 # kaa.beacon imports 50 from .._libthumb import epeg, png, failed50 from .._libthumb import png 51 51 import cpuinfo 52 52 -
trunk/beacon/src/thumbnail.py
r3631 r3644 41 41 import logging 42 42 import stat 43 import socket44 43 45 44 # kaa imports -
trunk/beacon/src/utils.py
r3609 r3644 31 31 32 32 # python imports 33 import os34 33 import re 35 34
