Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv402
Modified Files:
directory.py
Log Message:
o fix umount while scanning the dir
o shorten name if they start similar
Index: directory.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/directory.py,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** directory.py 25 Feb 2004 17:57:11 -0000 1.121
--- directory.py 27 Feb 2004 20:11:19 -0000 1.122
***************
*** 10,13 ****
--- 10,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.122 2004/02/27 20:11:19 dischi
+ # o fix umount while scanning the dir
+ # o shorten name if they start similar
+ #
# Revision 1.121 2004/02/25 17:57:11 dischi
# bugfix: call parse() for fxd files
***************
*** 396,401 ****
--- 400,408 ----
if not num_timestamp or num_timestamp < timestamp:
+ need_umount = False
if self.media:
+ need_umount = not self.media.is_mounted()
self.media.mount()
+
num_dir_items = 0
num_play_items = 0
***************
*** 417,421 ****
self['num_dir_items'] = num_dir_items
self['num_%s_timestamp' % name] = timestamp
! if self.media:
self.media.umount()
--- 424,429 ----
self['num_dir_items'] = num_dir_items
self['num_%s_timestamp' % name] = timestamp
!
! if need_umount:
self.media.umount()
***************
*** 597,601 ****
files = vfs.listdir(self.dir, include_overlay=True)
num_changes = mediainfo.check_cache(self.dir)
!
pop = None
callback=None
--- 605,609 ----
files = vfs.listdir(self.dir, include_overlay=True)
num_changes = mediainfo.check_cache(self.dir)
!
pop = None
callback=None
***************
*** 634,641 ****
--- 642,665 ----
# normal DirItems
for filename in files:
+ print filename
if os.path.isdir(filename):
d = DirItem(filename, self, display_type = self.display_type)
self.dir_items.append(d)
+ # remove same begiing from all play_items
+ substr = ''
+ if len(self.play_items) > 4 and len(self.play_items[0].name) > 5:
+ substr = self.play_items[0].name[:-5].lower()
+ for i in self.play_items[1:]:
+ if len(i.name) > 5:
+ substr = util.find_start_string(i.name.lower(), substr)
+ if not substr:
+ break
+ else:
+ break
+ else:
+ for i in self.play_items:
+ i.name = util.remove_start_string(i.name, substr)
+
#
# sort all items
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
