Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31231
Modified Files:
directory.py
Log Message:
some speed enhancements
Index: directory.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/directory.py,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** directory.py 10 Dec 2003 13:14:24 -0000 1.75
--- directory.py 12 Dec 2003 19:59:33 -0000 1.76
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.76 2003/12/12 19:59:33 dischi
+ # some speed enhancements
+ #
# Revision 1.75 2003/12/10 13:14:24 rshortt
# Fix a typo.
***************
*** 167,171 ****
self.menuw = None
self.menu = None
! self.name = vfs.basename(directory)
if name:
--- 170,174 ----
self.menuw = None
self.menu = None
! self.name = os.path.basename(directory)
if name:
***************
*** 173,180 ****
# variables only for DirItem
! self.dir = os.path.abspath(directory)
! self.display_type = display_type
! self.info = {}
! self.mountpoint = None
if add_args == None and hasattr(parent, 'add_args'):
--- 176,184 ----
# variables only for DirItem
! self.dir = os.path.abspath(directory)
! self.display_type = display_type
! self.info = {}
! self.mountpoint = None
! self.skin_settings = False
if add_args == None and hasattr(parent, 'add_args'):
***************
*** 190,194 ****
# Check for a cover in current dir
! image = util.getimage(vfs.join(directory, 'cover'))
if image:
self.image = image
--- 194,198 ----
# Check for a cover in current dir
! image = util.getimage(os.path.join(directory, 'cover'))
if image:
self.image = image
***************
*** 219,222 ****
--- 223,227 ----
parser = util.fxdparser.FXD(self.xml_file)
parser.set_handler('folder', self.read_folder_fxd)
+ parser.set_handler('skin', self.read_folder_fxd)
parser.parse()
except:
***************
*** 241,244 ****
--- 246,253 ----
'''
+ if node.name == 'skin':
+ self.skin_settings = True
+ return
+
global all_variables
set_all = self.xml_file == self.dir+'/folder.fxd'
***************
*** 249,254 ****
image = fxd.childcontent(node, 'cover-img')
! if image and vfs.isfile(vfs.join(self.dir, image)):
! self.image = vfs.join(self.dir, image)
# parse <info> tag
--- 258,263 ----
image = fxd.childcontent(node, 'cover-img')
! if image and vfs.isfile(os.path.join(self.dir, image)):
! self.image = os.path.join(self.dir, image)
# parse <info> tag
***************
*** 272,276 ****
self.modified_vars.append(v)
!
def write_folder_fxd(self, fxd, node):
"""
--- 281,286 ----
self.modified_vars.append(v)
!
!
def write_folder_fxd(self, fxd, node):
"""
***************
*** 300,306 ****
Playlist.copy(self, obj)
if obj.type == 'dir':
! self.dir = obj.dir
! self.display_type = obj.display_type
! self.info = obj.info
--- 310,317 ----
Playlist.copy(self, obj)
if obj.type == 'dir':
! self.dir = obj.dir
! self.display_type = obj.display_type
! self.info = obj.info
! self.skin_settings = obj.skin_settings
***************
*** 375,383 ****
has_dirs = False
! for f in vfs.listdir(self.dir):
! if vfs.isfile(f):
has_files = True
! if vfs.isdir(f) and not (f.endswith('CVS') or f.endswith('.xvpics') or \
! f.endswith('.thumbnails') or
f.endswith('.pics')):
has_dirs = True
if has_dirs and has_files:
--- 386,394 ----
has_dirs = False
! for f in os.listdir(self.dir):
! if os.path.isfile(f):
has_files = True
! if os.path.isdir(f) and not (f.endswith('CVS') or f.endswith('.xvpics')
or \
! f.endswith('.thumbnails') or
f.endswith('.pics')):
has_dirs = True
if has_dirs and has_files:
***************
*** 559,563 ****
pop = ProgressBox(text=_('Scanning disc, be patient...'),
full=num_changes)
else:
- print ProgressBox
pop = ProgressBox(text=_('Scanning directory, be patient...'),
full=num_changes)
--- 570,573 ----
***************
*** 584,588 ****
self.media.cached = True
-
# build play_items, pl_items and dir_items
for p in plugin.mimetype(display_type):
--- 594,597 ----
***************
*** 594,598 ****
else:
self.play_items.append(i)
!
# normal DirItems
for filename in files:
--- 603,607 ----
else:
self.play_items.append(i)
!
# normal DirItems
for filename in files:
***************
*** 602,606 ****
items = self.sort_items()
- title = self.name
if pop:
--- 611,614 ----
***************
*** 627,635 ****
else:
! item_menu = menu.Menu(title, items, reload_func=self.reload,
item_types = self.display_type,
force_skin_layout =
self.DIRECTORY_FORCE_SKIN_LAYOUT)
! if self.xml_file:
item_menu.skin_settings = skin.load(self.xml_file)
--- 635,643 ----
else:
! item_menu = menu.Menu(self.name, items, reload_func=self.reload,
item_types = self.display_type,
force_skin_layout =
self.DIRECTORY_FORCE_SKIN_LAYOUT)
! if self.skin_settings:
item_menu.skin_settings = skin.load(self.xml_file)
***************
*** 637,642 ****
menuw.pushmenu(item_menu)
! plugin.getbyname('Dirwatcher').cwd(menuw, self, item_menu, self.dir,
! self.all_files)
self.menu = item_menu
self.menuw = menuw
--- 645,649 ----
menuw.pushmenu(item_menu)
! dirwatcher.cwd(menuw, self, item_menu, self.dir, self.all_files)
self.menu = item_menu
self.menuw = menuw
***************
*** 648,654 ****
called when we return to this menu
"""
! plugin.getbyname('Dirwatcher').cwd(self.menuw, self, self.menu, self.dir,
! self.all_files)
! plugin.getbyname('Dirwatcher').scan(force=True)
# we changed the menu, don't build a new one
--- 655,660 ----
called when we return to this menu
"""
! dirwatcher.cwd(self.menuw, self, self.menu, self.dir, self.all_files)
! dirwatcher.scan(force=True)
# we changed the menu, don't build a new one
***************
*** 816,820 ****
# write folder.fxd
! self.xml_file = vfs.join(self.dir, 'folder.fxd')
try:
--- 822,826 ----
# write folder.fxd
! self.xml_file = os.path.join(self.dir, 'folder.fxd')
try:
***************
*** 920,922 ****
--- 926,929 ----
# and activate that DaemonPlugin
dirwatcher_thread = Dirwatcher()
+ dirwatcher = dirwatcher_thread
plugin.activate(dirwatcher_thread)
-------------------------------------------------------
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
