Author: duncan
Date: Sat Jun 9 14:35:23 2007
New Revision: 9679
Modified:
branches/rel-1/freevo/src/audio/__init__.py
branches/rel-1/freevo/src/audio/audioitem.py
branches/rel-1/freevo/src/directory.py
branches/rel-1/freevo/src/item.py
Log:
The cover image was not being selected when there was only a match
for AUDIO_COVER_REGEXP. Added a few level 2 debug messages
Modified: branches/rel-1/freevo/src/audio/__init__.py
==============================================================================
--- branches/rel-1/freevo/src/audio/__init__.py (original)
+++ branches/rel-1/freevo/src/audio/__init__.py Sat Jun 9 14:35:23 2007
@@ -42,7 +42,9 @@
def cover_filter(x):
- return re.search(config.AUDIO_COVER_REGEXP, x, re.IGNORECASE)
+ result = re.search(config.AUDIO_COVER_REGEXP, x, re.IGNORECASE)
+ if result: _debug_('cover_filter(%s): %r' % (x, result.group()), 2)
+ return result
class PluginInterface(plugin.MimetypePlugin):
@@ -85,6 +87,7 @@
"""
set information for a diritem based on the content, etc.
"""
+ _debug_('diritem.dir = "%s"' % (diritem.dir), 2)
if os.path.exists(diritem.dir):
timestamp = os.stat(diritem.dir)[stat.ST_MTIME]
if not diritem['coversearch_timestamp'] or \
@@ -101,7 +104,7 @@
diritem.image = os.path.join(diritem.dir, covers[0])
diritem.store_info('coversearch_timestamp', timestamp)
diritem.store_info('coversearch_result', diritem.image)
- elif not diritem['coversearch_result']:
+ elif diritem['coversearch_result']:
diritem.image = diritem['coversearch_result']
if not diritem.info.has_key('title') and diritem.parent:
Modified: branches/rel-1/freevo/src/audio/audioitem.py
==============================================================================
--- branches/rel-1/freevo/src/audio/audioitem.py (original)
+++ branches/rel-1/freevo/src/audio/audioitem.py Sat Jun 9 14:35:23 2007
@@ -80,7 +80,9 @@
def image_filter(x):
return re.match('.*(jpg|png)$', x, re.IGNORECASE)
def cover_filter(x):
- return re.search(config.AUDIO_COVER_REGEXP, x, re.IGNORECASE)
+ result = re.search(config.AUDIO_COVER_REGEXP, x, re.IGNORECASE)
+ if result: _debug_('cover_filter(%s): %r' % (x,
result.group()), 2)
+ return result
# Pick an image if it is the only image in this dir, or it matches
# the configurable regexp
Modified: branches/rel-1/freevo/src/directory.py
==============================================================================
--- branches/rel-1/freevo/src/directory.py (original)
+++ branches/rel-1/freevo/src/directory.py Sat Jun 9 14:35:23 2007
@@ -99,7 +99,7 @@
class for handling directories
"""
def __init__(self, directory, parent, name = '', display_type = None,
- add_args = None, create_metainfo=True):
+ add_args = None, create_metainfo = True):
self.autovars = [ ('num_dir_items', 0), ('show_all_items', False) ]
Playlist.__init__(self, parent=parent, display_type=display_type)
self.type = 'dir'
@@ -173,9 +173,11 @@
self.modified_vars = []
# Check for a cover in current dir
- image = util.getimage(os.path.join(directory, 'cover'))
if self.info['image']:
image = self.info['image']
+ else:
+ image = util.getimage(os.path.join(directory, 'cover'))
+ # if we have an image then use it
if image:
self.image = image
self.files.image = image
Modified: branches/rel-1/freevo/src/item.py
==============================================================================
--- branches/rel-1/freevo/src/item.py (original)
+++ branches/rel-1/freevo/src/item.py Sat Jun 9 14:35:23 2007
@@ -307,17 +307,15 @@
"""
store the key/value in metadata
"""
- #if not self.filename:
- # return
+ _debug_('key=%s value=%s info-class=%s' % (key, value,
self.info.__class__), 2)
+ if hasattr(self, 'filename'): _debug_('filename=%s' % (self.filename),
2)
if isinstance(self.info, mediainfo.Info):
if not self.info.store(key, value):
_debug_('cannot store \'%s\':\'%s\' for \'%s\'' % \
(key, value, self.filename), config.DINFO)
- #print '%s : %s' % (dir(self), type(self))
- _debug_('%s' % self.__dict__)
else:
- _debug_(u'cannot store \'%s\':\'%s\' for \'%s\' item' % \
+ _debug_('cannot store \'%s\':\'%s\' for \'%s\' item, not
mediainfo' % \
(key, value, self.filename), config.DINFO)
-------------------------------------------------------------------------
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
