Update of /cvsroot/freevo/freevo/src/video
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25905/src/video
Modified Files:
database.py
Log Message:
fix disc-set database scanning
Index: database.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/database.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** database.py 1 May 2005 17:46:15 -0000 1.7
--- database.py 30 Jun 2005 18:02:22 -0000 1.8
***************
*** 89,96 ****
files = []
! if not config.VIDEO_ONLY_SCAN_DATADIR:
! if len(config.VIDEO_ITEMS) == 2:
! for name,dir in config.VIDEO_ITEMS:
! files += util.recursefolders(dir,1,'*.fxd',1)
if config.VIDEO_SHOW_DATA_DIR:
--- 89,99 ----
files = []
!
! discset = config.OVERLAY_DIR + '/disc-set'
! if os.path.isdir(discset):
! listing = Listing(discset)
! if listing.num_changes:
! listing.update()
! files += listing.match_suffix(['fxd'])
if config.VIDEO_SHOW_DATA_DIR:
***************
*** 98,112 ****
if listing.num_changes:
listing.update()
! for info in fxditem.mimetype.parse(None,
listing.match_suffix(['fxd']), [],
! display_type='video'):
! if info.type != 'video':
! continue
! k = os.path.splitext(os.path.basename(info.files.fxd_file))[0]
! tv_shows[k] = (info.image, info.info,
! info.mplayer_options, info.skin_fxd)
! if hasattr(info, '__fxd_rom_info__'):
! for fo in info.__fxd_files_options__:
! discset[fo['file-id']] = fo['mplayer-options']
!
log.info('done')
return 1
--- 101,121 ----
if listing.num_changes:
listing.update()
! files += listing.match_suffix(['fxd'])
!
! for info in fxditem.mimetype.parse(None, files, [], display_type='video'):
! if info.type != 'video':
! continue
! k = os.path.splitext(os.path.basename(info.files.fxd_file))[0]
! tv_shows[k] = (info.image, info.info,
! info.mplayer_options, info.skin_fxd)
! if hasattr(info, '__fxd_rom_info__'):
! for fo in info.__fxd_files_options__:
! discset[fo['file-id']] = fo['mplayer-options']
! if hasattr(info, '__fxd_rom_label__'):
! # FIXME: add to fxd['label']
! pass
! if hasattr(info, '__fxd_rom_id__'):
! for id in info.__fxd_rom_id__:
! fxd['id'][id] = info
log.info('done')
return 1
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
