Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1:/tmp/cvs-serv20449
Modified Files:
fileops.py misc.py vfs.py
Log Message:
major speed enhancements
Index: fileops.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/fileops.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** fileops.py 30 Dec 2003 15:28:34 -0000 1.9
--- fileops.py 31 Dec 2003 16:43:49 -0000 1.10
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.10 2003/12/31 16:43:49 dischi
+ # major speed enhancements
+ #
# Revision 1.9 2003/12/30 15:28:34 dischi
# support for OVERLAY_DIR_STORE_THUMBNAILS
***************
*** 244,248 ****
filter(lambda x: os.path.splitext(x)[1].lower()[1:] in suffix_list, files)
but this one should also work and is _much_ faster. On a Duron 800, Python 2.2
! and 700 photos 0.01 secs insteat of 0.2.
"""
return filter(lambda x: x[x.rfind('.')+1:].lower() in suffix_list, files)
--- 247,251 ----
filter(lambda x: os.path.splitext(x)[1].lower()[1:] in suffix_list, files)
but this one should also work and is _much_ faster. On a Duron 800, Python 2.2
! and 700 photos 0.01 secs instead of 0.2.
"""
return filter(lambda x: x[x.rfind('.')+1:].lower() in suffix_list, files)
Index: misc.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/misc.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** misc.py 30 Dec 2003 22:30:50 -0000 1.10
--- misc.py 31 Dec 2003 16:43:49 -0000 1.11
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.11 2003/12/31 16:43:49 dischi
+ # major speed enhancements
+ #
# Revision 1.10 2003/12/30 22:30:50 dischi
# major speedup in vfs using
***************
*** 170,176 ****
If not return the default
"""
! for suffix in ('png', 'jpg', 'gif'):
! if vfs_abspath(base+'.'+suffix):
! return vfs_abspath(base+'.'+suffix)
return default
--- 173,180 ----
If not return the default
"""
! for suffix in ('.png', '.jpg', '.gif'):
! image = vfs_abspath(base+suffix)
! if image:
! return image
return default
***************
*** 184,188 ****
name = os.path.basename(file)
! name = name[:name.rfind('.'):].capitalize()
while FILENAME_REGEXP.match(name):
--- 188,193 ----
name = os.path.basename(file)
! name = name[:name.rfind('.'):]
! name = name[0].upper() + name[1:]
while FILENAME_REGEXP.match(name):
Index: vfs.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/vfs.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** vfs.py 30 Dec 2003 22:30:50 -0000 1.6
--- vfs.py 31 Dec 2003 16:43:49 -0000 1.7
***************
*** 17,20 ****
--- 17,23 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.7 2003/12/31 16:43:49 dischi
+ # major speed enhancements
+ #
# Revision 1.6 2003/12/30 22:30:50 dischi
# major speedup in vfs using
***************
*** 84,88 ****
"""
if os.path.exists(name):
! return os.path.abspath(name)
overlay = getoverlay(name)
if overlay and os.path.isfile(overlay):
--- 87,93 ----
"""
if os.path.exists(name):
! if not name.startswith('/'):
! return os.path.abspath(name)
! return name
overlay = getoverlay(name)
if overlay and os.path.isfile(overlay):
***************
*** 166,182 ****
"""
try:
! files = ([ os.path.join(directory, fname)
! for fname in os.listdir(directory) ])
overlay = getoverlay(directory)
if overlay and os.path.isdir(overlay):
! for f in ([ os.path.join(overlay, fname)
! for fname in os.listdir(overlay) ]):
! if not os.path.isdir(f):
files.append(f)
-
- # remove unwanted directories
- for f in copy.copy(files):
- if vfs.basename(f) in ('CVS', '.xvpics', '.thumbnails', '.pics', '.',
'..'):
- files.remove(f)
return files
--- 171,186 ----
"""
try:
! if not directory.endswith('/'):
! directory = directory + '/'
!
! files = []
! for f in os.listdir(directory):
! if not f in ('CVS', '.xvpics', '.thumbnails', '.pics', '.', '..'):
! files.append(directory + f)
overlay = getoverlay(directory)
if overlay and os.path.isdir(overlay):
! for f in ([ overlay + fname for fname in os.listdir(overlay) ]):
! if not os.path.isdir(f) and not f.endswith('.raw'):
files.append(f)
return files
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
