Update of /cvsroot/freevo/freevo/src/video
In directory sc8-pr-cvs1:/tmp/cvs-serv16015
Modified Files:
xml_parser.py
Log Message:
only parse existing files with mmpython
Index: xml_parser.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/xml_parser.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** xml_parser.py 4 Oct 2003 19:51:04 -0000 1.41
--- xml_parser.py 4 Nov 2003 11:49:09 -0000 1.42
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.42 2003/11/04 11:49:09 dischi
+ # only parse existing files with mmpython
+ #
# Revision 1.41 2003/10/04 19:51:04 dischi
# copy info to prevent mmpython from storing the fxd infos in the cache
***************
*** 265,272 ****
if variant:
if len(variant['parts']) > 1:
! vitem = VideoItem('', parent)
for part in variant['parts']:
part_ref = part['ref']
! subitem = VideoItem(video['items'][part_ref]['data'], vitem)
subitem.mode = video['items'][part_ref]['type']
subitem.name = variant['name']
--- 268,280 ----
if variant:
if len(variant['parts']) > 1:
! vitem = VideoItem('', parent, parse=False)
for part in variant['parts']:
part_ref = part['ref']
! f = video['items'][part_ref]['data']
! if os.path.isfile(f):
! subitem = VideoItem(f, vitem)
! else:
! subitem = VideoItem(f, vitem, parse=False)
!
subitem.mode = video['items'][part_ref]['type']
subitem.name = variant['name']
***************
*** 291,295 ****
elif len(variant['parts']) == 1:
part_ref = variant['parts'][0]['ref']
! vitem = VideoItem(video['items'][part_ref]['data'], parent)
vitem.mode = video['items'][part_ref]['type']
vitem.media_id = video['items'][part_ref]['media-id']
--- 299,307 ----
elif len(variant['parts']) == 1:
part_ref = variant['parts'][0]['ref']
! f = video['items'][part_ref]['data']
! if os.path.isfile(f):
! vitem = VideoItem(f, parent)
! else:
! vitem = VideoItem(f, parent, parse=False)
vitem.mode = video['items'][part_ref]['type']
vitem.media_id = video['items'][part_ref]['media-id']
***************
*** 313,320 ****
if not video.has_key('items-list'):
video['items-list'] = []
! vitem = VideoItem('', None)
elif len(video['items-list']) == 0:
! vitem = VideoItem('', None)
vitem.mplayer_options = ''
if video['mplayer-options']:
--- 325,332 ----
if not video.has_key('items-list'):
video['items-list'] = []
! vitem = VideoItem('', None, parse=False)
elif len(video['items-list']) == 0:
! vitem = VideoItem('', None, parse=False)
vitem.mplayer_options = ''
if video['mplayer-options']:
***************
*** 322,328 ****
elif len(video['items-list']) > 1:
! vitem = VideoItem('', parent)
for v in video['items-list']:
! subitem = VideoItem(video['items'][v]['data'], vitem)
subitem.mode = video['items'][v]['type']
subitem.media_id = video['items'][v]['media-id']
--- 334,344 ----
elif len(video['items-list']) > 1:
! vitem = VideoItem('', parent, parse=False)
for v in video['items-list']:
! f = video['items'][v]['data']
! if os.path.isfile(f):
! subitem = VideoItem(f, vitem)
! else:
! subitem = VideoItem(f, vitem, parse=False)
subitem.mode = video['items'][v]['type']
subitem.media_id = video['items'][v]['media-id']
***************
*** 339,343 ****
else:
ref = video['items-list'][0]
! vitem = VideoItem(video['items'][ref]['data'], parent)
vitem.mode = video['items'][ref]['type']
vitem.media_id = video['items'][ref]['media-id']
--- 355,363 ----
else:
ref = video['items-list'][0]
! f = video['items'][ref]['data']
! if os.path.isfile(f):
! vitem = VideoItem(f, parent)
! else:
! vitem = VideoItem(f, parent, parse=False)
vitem.mode = video['items'][ref]['type']
vitem.media_id = video['items'][ref]['media-id']
***************
*** 465,469 ****
if disc_set:
! dsitem = VideoItem('', parent)
dsitem.name = disc_set['title']
dsitem.image = disc_set['cover']
--- 485,489 ----
if disc_set:
! dsitem = VideoItem('', parent, parse=False)
dsitem.name = disc_set['title']
dsitem.image = disc_set['cover']
-------------------------------------------------------
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
