Author: dmeyer
Date: Mon Feb 4 08:43:56 2008
New Revision: 3020
Log:
revert latest changes, listdir is also needed in the client
Removed:
trunk/beacon/src/server/file.py
Modified:
trunk/beacon/src/file.py
trunk/beacon/src/server/db.py
Modified: trunk/beacon/src/file.py
==============================================================================
--- trunk/beacon/src/file.py (original)
+++ trunk/beacon/src/file.py Mon Feb 4 08:43:56 2008
@@ -31,6 +31,8 @@
# python imports
import os
+import stat
+import time
import logging
import kaa
@@ -98,6 +100,7 @@
self._beacon_overlay = overlay
self._beacon_isdir = isdir
self._beacon_islink = False
+ self._beacon_listdir_cache = None
self.filename = filename
if isdir:
ovdir = filename[len(media.mountpoint):]
@@ -144,3 +147,133 @@
else:
s += ' (type=%s)' % str(self._beacon_data.get('type'))
return s + '>'
+
+
+ # -------------------------------------------------------------------------
+ # Internal API
+ # -------------------------------------------------------------------------
+
+ def _beacon_listdir(self, cache=False):
+ """
+ Internal function to list all files in the directory and the overlay
+ directory. The result is a pair of entries and file map with entries
+ being a list of basename, full filename, is_overlay and stat result.
+ """
+ if self._beacon_listdir_cache and cache and \
+ self._beacon_listdir_cache[0] + 3 > time.time():
+ # use cached result if we have and caching time is less than
+ # three seconds ago
+ return self._beacon_listdir_cache[1:]
+
+ # FIXME: this could block for everything except media 1. So this
+ # should be done in the hwmon process. But the server doesn't like
+ # an InProgress return in the function.
+ try:
+ # Try to list the overlay directory
+ overlay_results = os.listdir(self._beacon_ovdir)
+ except OSError:
+ # No overlay
+ overlay_results = []
+
+ try:
+ # Try to list the directory. If that fails for some reason,
+ # return an empty list
+ fs_results = os.listdir(self.filename)
+ except OSError, e:
+ log.warning(e)
+ self._beacon_listdir_cache = time.time(), [], {}
+ return [], {}
+
+ results_file_map = {}
+ timer = time.time()
+
+ for is_overlay, prefix, results in \
+ ((False, self.filename, fs_results),
+ (True, self._beacon_ovdir, overlay_results)):
+ for r in results:
+ if (is_overlay and r in results_file_map) or r[0] == ".":
+ continue
+ fullpath = prefix + r
+ try:
+ # append stat information to every result
+ statinfo = os.stat(fullpath)
+ if is_overlay and stat.S_ISDIR(statinfo[stat.ST_MODE]):
+ # dir in overlay, ignore
+ log.warning('skip overlay dir %s' % r[1])
+ continue
+ except (OSError, IOError), e:
+ # unable to stat file, remove it from list
+ log.error(e)
+ continue
+ results_file_map[r] = (r, fullpath, is_overlay, statinfo)
+
+ # We want to avoid lambda on large data sets, so we sort the keys,
+ # which is just a list of files. This is the common case that sort()
+ # is optimized for.
+ keys = results_file_map.keys()
+ keys.sort()
+ result = [ results_file_map[x] for x in keys ]
+ # store in cache
+ self._beacon_listdir_cache = time.time(), result, results_file_map
+ return result, results_file_map
+
+
+ def _beacon_mtime(self):
+ """
+ Return modification time of the item itself. This function is only
+ used by the server part of beacon.
+
+ mtime is the the mtime for all files having the same base. E.g. the
+ mtime of foo.jpg is the sum of the mtime of foo.jpg and foo.jpg.xml
+ or for foo.mp3 the mtime is the sum of foo.mp3 and foo.jpg.
+ """
+ if self._beacon_isdir:
+ # Directory handling. Maybe add directory cover images
+ # to the mtime list. But in most cases it is not needed. A
+ # new file for the cover would also effect the directory
+ # mtime itself.
+ try:
+ mtime = os.stat(self.filename)[stat.ST_MTIME]
+ except (OSError, IOError):
+ return None
+ try:
+ return max(os.stat(self._beacon_ovdir)[stat.ST_MTIME], mtime)
+ except (OSError, IOError):
+ return mtime
+
+ # Normal file
+ fullname = self._beacon_data['name']
+ basename, ext = fullname, ''
+ pos = basename.rfind('.')
+ if pos > 0:
+ ext = basename[pos:]
+ basename = basename[:pos]
+
+ # FIXME: move this logic to kaa.metadata. The best way would be to
+ # use the info modules for that kind of information, but we may not
+ # know the type here. This code here is only for testing.
+ # FIXME: this also only supports ext in lower case
+ if ext in ('.avi',):
+ # subtitles for avi + cover
+ special_exts = ( '.srt', '.png', '.jpg' )
+ elif ext in ('.gif', '.png', '.jpg', '.jpeg'):
+ # bins xml files
+ special_exts = ( '.xml', )
+ else:
+ # cover
+ special_exts = ( '.png', '.jpg' )
+
+ listdir_file_map = self._beacon_parent._beacon_listdir(cache=True)[1]
+ # calculate the new modification time
+ try:
+ mtime = listdir_file_map[fullname][3][stat.ST_MTIME]
+ except KeyError:
+ return 0
+ for ext in special_exts:
+ fname = listdir_file_map.get(basename+ext)
+ if fname:
+ mtime += fname[3][stat.ST_MTIME]
+ fname = listdir_file_map.get(fullname+ext)
+ if fname:
+ mtime += fname[3][stat.ST_MTIME]
+ return mtime
Modified: trunk/beacon/src/server/db.py
==============================================================================
--- trunk/beacon/src/server/db.py (original)
+++ trunk/beacon/src/server/db.py Mon Feb 4 08:43:56 2008
@@ -45,11 +45,6 @@
from kaa.beacon.item import Item
from kaa.beacon.db import Database as RO_Database
-# Update db File object
-import kaa.beacon.db
-from file import File
-kaa.beacon.db.File = File
-
# get logging object
log = logging.getLogger('beacon.db')
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
