Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3671
Modified Files:
cache.py callback.py fileops.py fxdparser.py
Log Message:
small bugfix
Index: fxdparser.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/fxdparser.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** fxdparser.py 28 Nov 2004 16:01:27 -0000 1.22
--- fxdparser.py 10 Apr 2005 18:04:26 -0000 1.23
***************
*** 73,77 ****
Class to parse and write fxd files
"""
! def __init__(self, filename):
"""
Load the file and parse it. If the file does not exists, create
--- 73,77 ----
Class to parse and write fxd files
"""
! def __init__(self, filename, use_cache=True):
"""
Load the file and parse it. If the file does not exists, create
***************
*** 79,82 ****
--- 79,83 ----
"""
qp_xml.Parser.__init__(self)
+ self.use_cache = use_cache
self.filename = filename
if not vfs.isfile(filename):
***************
*** 84,96 ****
else:
self.tree = None
! cachename = vfs.getoverlay(filename + '.raw')
! if os.path.isfile(filename) and os.path.isfile(cachename) and \
! fileops.mtime(cachename) >= fileops.mtime(filename):
! self.tree = cache.load(cachename)
if not self.tree:
f = vfs.open(filename)
self.tree = self.parse(f)
f.close()
! if self.tree:
cache.save(cachename, self.tree)
--- 85,98 ----
else:
self.tree = None
! if use_cache:
! cachename = vfs.getoverlay(filename + '.raw')
! if os.path.isfile(filename) and os.path.isfile(cachename) and
\
! fileops.mtime(cachename) >= fileops.mtime(filename):
! self.tree = cache.load(cachename)
if not self.tree:
f = vfs.open(filename)
self.tree = self.parse(f)
f.close()
! if self.tree and use_cache:
cache.save(cachename, self.tree)
***************
*** 128,132 ****
self.tree = self.parse(f)
f.close()
! if self.tree:
cache.save(vfs.getoverlay(filename + '.raw'), self.tree)
--- 130,134 ----
self.tree = self.parse(f)
f.close()
! if self.tree and self.use_cache:
cache.save(vfs.getoverlay(filename + '.raw'), self.tree)
***************
*** 180,188 ****
def __init__(self, filename):
self.tree = FXDtree(filename)
self.read_callback = {}
self.write_callback = {}
self.user_data = {}
self.is_skin_fxd = False
- self.filename = filename
--- 182,190 ----
def __init__(self, filename):
self.tree = FXDtree(filename)
+ self.filename = filename
self.read_callback = {}
self.write_callback = {}
self.user_data = {}
self.is_skin_fxd = False
Index: fileops.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/fileops.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** fileops.py 7 Feb 2005 17:53:26 -0000 1.39
--- fileops.py 10 Apr 2005 18:04:26 -0000 1.40
***************
*** 235,239 ****
help function for match_files_recursively
"""
! if dirname[dirname.rfind('/'):][1] == '.':
# ignore directories starting with a dot
# Note: subdirectories of that dir will still be searched
--- 235,239 ----
help function for match_files_recursively
"""
! if dirname != '/' and dirname[dirname.rfind('/'):][1] == '.':
# ignore directories starting with a dot
# Note: subdirectories of that dir will still be searched
***************
*** 242,246 ****
if not name in ('CVS', '.xvpics', '.thumbnails', '.pics',
'folder.fxd', 'lost+found'):
! fullpath = vfs.join(dirname, name)
result.append(fullpath)
return result
--- 242,246 ----
if not name in ('CVS', '.xvpics', '.thumbnails', '.pics',
'folder.fxd', 'lost+found'):
! fullpath = os.path.abspath(vfs.join(dirname, name))
result.append(fullpath)
return result
Index: cache.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/cache.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cache.py 21 Nov 2004 10:12:47 -0000 1.4
--- cache.py 10 Apr 2005 18:04:26 -0000 1.5
***************
*** 91,104 ****
"""
try:
if _isfile(file):
_unlink(file)
! f = _open(file, 'w')
! if version:
! cPickle.dump((version, data), f, PICKLE_PROTOCOL)
! else:
! cPickle.dump(data, f, PICKLE_PROTOCOL)
! f.close()
! except IOError, e:
! print 'cache.save: %s' % e
--- 91,108 ----
"""
try:
+ f = _open(file, 'w')
+ except (OSError, IOError):
if _isfile(file):
_unlink(file)
! try:
! f = _open(file, 'w')
! except (OSError, IOError), e:
! print 'cache.save: %s' % e
! return
! if version:
! cPickle.dump((version, data), f, PICKLE_PROTOCOL)
! else:
! cPickle.dump(data, f, PICKLE_PROTOCOL)
! f.close()
Index: callback.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/callback.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** callback.py 23 Feb 2005 21:02:09 -0000 1.4
--- callback.py 10 Apr 2005 18:04:26 -0000 1.5
***************
*** 58,64 ****
Call the callback function.
"""
# remove from callback
notifier.removeTimer(self.timer)
- del _callbacks[self.name]
# call callback function
self.function(*self.args, **self.kwargs)
--- 58,68 ----
Call the callback function.
"""
+ if not self.name in _callbacks:
+ # FIXME: notifier bug???
+ pass
+ else:
+ del _callbacks[self.name]
# remove from callback
notifier.removeTimer(self.timer)
# call callback function
self.function(*self.args, **self.kwargs)
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
