Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5443
Modified Files:
directory.py
Log Message:
move more info to the Mimetype
Index: directory.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/directory.py,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** directory.py 3 Dec 2003 21:52:07 -0000 1.70
--- directory.py 6 Dec 2003 13:44:11 -0000 1.71
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.71 2003/12/06 13:44:11 dischi
+ # move more info to the Mimetype
+ #
# Revision 1.70 2003/12/03 21:52:07 dischi
# rename some skin function calls
***************
*** 93,97 ****
import skin
import plugin
- import video
from item import Item
--- 96,99 ----
***************
*** 100,106 ****
from gui import PasswordInputBox, AlertBox, ProgressBox
- # Add support for bins album files
- from mmpython.image import bins
-
skin = skin.get_singleton()
--- 102,105 ----
***************
*** 155,158 ****
--- 154,161 ----
self.menuw = None
self.menu = None
+ self.name = vfs.basename(directory)
+
+ if name:
+ self.name = name
# variables only for Playlist
***************
*** 178,247 ****
self.modified_vars = []
- if name:
- self.name = name
- elif vfs.isfile(directory + '/album.xml'):
- try:
- self.name = bins.get_bins_desc(directory)['desc']['title']
- except:
- self.name = vfs.basename(directory)
- else:
- self.name = vfs.basename(directory)
-
-
- # check for image in album.xml
- if vfs.isfile(directory + '/album.xml'):
- try:
- image = bins.get_bins_desc(directory)['desc']['sampleimage']
- image = vfs.join(directory, image)
- if vfs.isfile(image):
- self.image = image
- self.handle_type = self.display_type
- except:
- pass
-
# Check for a cover in current dir
! image = util.getimage(directory+'/cover')
if image:
! self.image = image
self.handle_type = self.display_type
! if not self.image and self.display_type == 'audio':
! images = ()
! covers = ()
! files =()
! 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)
!
! # Pick an image if it is the only image in this dir, or it matches
! # the configurable regexp
! try:
! files = vfs.listdir(directory)
! except OSError:
! print "oops, os.listdir() error"
! traceback.print_exc()
! images = filter(image_filter, files)
! image = None
! if len(images) == 1:
! image = vfs.join(directory, images[0])
! elif len(images) > 1:
! covers = filter(cover_filter, images)
! if covers:
! image = vfs.join(directory, covers[0])
! self.image = image
!
! if not self.image and config.VIDEO_SHOW_DATA_DIR:
! self.image = util.getimage(vfs.join(config.VIDEO_SHOW_DATA_DIR,
! vfs.basename(directory).lower()))
!
! if video.tv_show_informations.has_key(vfs.basename(directory).lower()):
! tvinfo = video.tv_show_informations[vfs.basename(directory).lower()]
! self.info = tvinfo[1]
! if not self.image:
! self.image = tvinfo[0]
! if not self.xml_file:
! self.xml_file = tvinfo[3]
!
if vfs.isfile(directory+'/folder.fxd'):
self.xml_file = directory+'/folder.fxd'
--- 181,194 ----
self.modified_vars = []
# Check for a cover in current dir
! image = util.getimage(vfs.join(directory, 'cover'))
if image:
! self.image = image
self.handle_type = self.display_type
! # Check mimetype plugins if they want to add something
! for p in plugin.mimetype(display_type):
! p.dirinfo(self)
!
if vfs.isfile(directory+'/folder.fxd'):
self.xml_file = directory+'/folder.fxd'
***************
*** 252,255 ****
--- 199,203 ----
if self.DIRECTORY_SORT_BY_DATE == 2 and self.display_type != 'tv':
self.DIRECTORY_SORT_BY_DATE = 0
+
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
