Author: duncan
Date: Sat May 26 06:33:19 2007
New Revision: 9603
Modified:
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/local_conf.py.example
branches/rel-1/freevo/src/image/__init__.py
Log:
Changed IMAGE_EXCLUDE to default to None and handle it correctly
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Sat May 26 06:33:19 2007
@@ -1055,7 +1055,7 @@
# The viewer can exclude certain types of images based on the regular
expression list
# eg IMAGE_EXCLUDE = [('thm','tn_')]
-IMAGE_EXCLUDE = [ ]
+IMAGE_EXCLUDE = None
#
# Mode of the blending effect in the image viewer between two images
Modified: branches/rel-1/freevo/local_conf.py.example
==============================================================================
--- branches/rel-1/freevo/local_conf.py.example (original)
+++ branches/rel-1/freevo/local_conf.py.example Sat May 26 06:33:19 2007
@@ -740,7 +740,7 @@
# The viewer can exclude certain types of images based on the regular
expression list
# eg IMAGE_EXCLUDE = [('thm','tn_')]
-# IMAGE_EXCLUDE = [ ]
+# IMAGE_EXCLUDE = None
#
# Mode of the blending effect in the image viewer between two images
Modified: branches/rel-1/freevo/src/image/__init__.py
==============================================================================
--- branches/rel-1/freevo/src/image/__init__.py (original)
+++ branches/rel-1/freevo/src/image/__init__.py Sat May 26 06:33:19 2007
@@ -68,9 +68,14 @@
return a list of items based on the files
"""
items = []
- exclude_string = re.compile('|'.join(config.IMAGE_EXCLUDE))
+ if config.IMAGE_EXCLUDE:
+ exclude_string = re.compile('|'.join(config.IMAGE_EXCLUDE))
for file in util.find_matches(files, config.IMAGE_SUFFIX):
- if not re.search(exclude_string, file):
+ if config.IMAGE_EXCLUDE:
+ if not re.search(exclude_string, file):
+ items.append(ImageItem(file, parent))
+ files.remove(file)
+ else:
items.append(ImageItem(file, parent))
files.remove(file)
return items
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
