Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19797
Modified Files:
item.py
Log Message:
major speed enhancements
Index: item.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/item.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** item.py 30 Dec 2003 22:31:09 -0000 1.39
--- item.py 31 Dec 2003 16:40:49 -0000 1.40
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.40 2003/12/31 16:40:49 dischi
+ # major speed enhancements
+ #
# Revision 1.39 2003/12/30 22:31:09 dischi
# speedup
***************
*** 143,147 ****
self.type = None # e.g. video, audio, dir, playlist
self.name = '' # name in menu
- self.image = None # imagefile
self.icon = None
if info:
--- 146,149 ----
***************
*** 150,185 ****
self.info = {}
self.parent = parent # parent item to pass unmapped event
- self.fxd_file = None # skin informationes etc.
self.menuw = None
self.description = ''
- self.handle_type = None # handle item in skin as video, audio,
image
- # e.g. a directory has all video info
like
- # directories of a cdrom
-
- self.media = None
self.eventhandler_plugins = []
! try:
! if parent.DIRECTORY_USE_MEDIAID_TAG_NAMES:
! self.name = info['title']
!
! except (TypeError, AttributeError, KeyError):
! pass
if parent:
self.image = parent.image
if self.image and isinstance(self.image, str) and \
! self.image.find('watermark') > 0 and \
! self.image.find(config.IMAGE_DIR) == 0:
self.image = None
self.handle_type = parent.handle_type
self.fxd_file = parent.fxd_file
self.media = parent.media
- if hasattr(self.parent, 'fxd_file') and not self.fxd_file:
- self.fxd_file = self.parent.fxd_file
if hasattr(parent, '_'):
self._ = parent._
if skin_type:
import skin
--- 152,183 ----
self.info = {}
self.parent = parent # parent item to pass unmapped event
self.menuw = None
self.description = ''
self.eventhandler_plugins = []
! if info and parent.DIRECTORY_USE_MEDIAID_TAG_NAMES and hasattr(self.info,
'title'):
! self.name = self.info['title']
if parent:
self.image = parent.image
if self.image and isinstance(self.image, str) and \
! self.image.startswith(config.IMAGE_DIR) and \
! self.image.find('watermark') > 0:
self.image = None
self.handle_type = parent.handle_type
self.fxd_file = parent.fxd_file
self.media = parent.media
if hasattr(parent, '_'):
self._ = parent._
+ else:
+ self.image = None # imagefile
+ self.fxd_file = None # skin informationes etc.
+ self.handle_type = None # handle item in skin as video,
audio, image
+ # e.g. a directory has all video
info like
+ # directories of a cdrom
+ self.media = None
+
if skin_type:
import skin
***************
*** 197,201 ****
! def set_url(self, url, info=True):
"""
Set a new url to the item and adjust all attributes depending
--- 195,199 ----
! def set_url(self, url, info=True, search_image=True):
"""
Set a new url to the item and adjust all attributes depending
***************
*** 205,215 ****
self.url = url # the url itself
self.filename = '' # filename if it's a file:// url
- self.dirname = '' # directory of the file:// url
- self.mode = '' # the type of the url (file, http, dvd...)
- self.mimetype = '' # extention or mode
self.media_id = ''
if not url:
! self.files = None
return
--- 203,212 ----
self.url = url # the url itself
self.filename = '' # filename if it's a file:// url
self.media_id = ''
if not url:
! self.mode = '' # the type of the url (file, http, dvd...)
! self.files = None # FileInformation
! self.mimetype = '' # extention or mode
return
***************
*** 221,242 ****
self.files.read_only = True
! if self.url.startswith('file://'):
self.network_play = False
self.filename = self.url[7:]
! if os.path.isfile(self.filename):
self.files.append(self.filename)
! self.dirname = os.path.dirname(self.filename)
!
! image = util.getimage(self.filename[:self.filename.rfind('.')])
! if image:
! self.image = image
! self.files.image = image
! elif self.parent and self.parent.type != 'dir':
! self.image = util.getimage(self.dirname+'/cover', self.image)
else:
self.filename = ''
self.url = ''
return
if info and self.filename:
--- 218,253 ----
self.files.read_only = True
! self.mode = self.url[:self.url.find('://')]
!
! if self.mode == 'file':
self.network_play = False
self.filename = self.url[7:]
! if os.path.exists(self.filename):
self.files.append(self.filename)
! if search_image:
! image = util.getimage(self.filename[:self.filename.rfind('.')])
! if image:
! self.image = image
! self.files.image = image
! elif self.parent and self.parent.type != 'dir':
! self.image = util.getimage(os.path.dirname(self.filename)+\
! '/cover', self.image)
else:
self.filename = ''
self.url = ''
+ self.mimetype = ''
return
+
+ try:
+ self.mimetype = self.filename[self.filename.rfind('.')+1:].lower()
+ except:
+ self.mimetype = self.type
+
+ elif self.network_play:
+ self.mimetype = self.type
+ else:
+ self.mimetype = self.mode
+
if info and self.filename:
***************
*** 250,255 ****
if info:
self.info = info
!
!
if not self.name:
if self.filename:
--- 261,267 ----
if info:
self.info = info
! if self.parent.DIRECTORY_USE_MEDIAID_TAG_NAMES and hasattr(info,
'title'):
! self.name = info['title']
!
if not self.name:
if self.filename:
***************
*** 257,272 ****
else:
self.name = self.url
-
- self.mode = self.url[:self.url.find('://')]
-
- if self.mode == 'file':
- try:
- self.mimetype = self.filename[self.filename.rfind('.')+1:].lower()
- except:
- self.mimetype = self.type
- elif self.network_play:
- self.mimetype = self.type
- else:
- self.mimetype = self.url[:self.url.find('://')].lower()
--- 269,272 ----
-------------------------------------------------------
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
