Update of /cvsroot/freevo/freevo/src/video
In directory sc8-pr-cvs1:/tmp/cvs-serv22878/video
Modified Files:
fxdimdb.py videoitem.py xml_parser.py
Log Message:
some adjustments to the missing testfiles
Index: fxdimdb.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/fxdimdb.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** fxdimdb.py 20 Sep 2003 09:50:07 -0000 1.14
--- fxdimdb.py 20 Sep 2003 15:08:26 -0000 1.15
***************
*** 12,15 ****
--- 12,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.15 2003/09/20 15:08:26 dischi
+ # some adjustments to the missing testfiles
+ #
# Revision 1.14 2003/09/20 09:50:07 dischi
# cleanup
***************
*** 231,234 ****
--- 234,241 ----
"""
+ datadir = config.MOVIE_DATA_DIR
+ if not datadir:
+ datadir = '/tmp/'
+
if fxdfilename:
if os.path.splitext(fxdfilename)[1] == '.fxd':
***************
*** 238,242 ****
else:
if self.isdiscset == True:
! self.fxdfile = os.path.join(config.MOVIE_DATA_DIR, 'disc-set',
self.getmedia_id(self.device))
else:
--- 245,249 ----
else:
if self.isdiscset == True:
! self.fxdfile = os.path.join(datadir, 'disc-set',
self.getmedia_id(self.device))
else:
***************
*** 244,249 ****
type, none, device, none, file = self.video[0]
if type == 'file' and device == None: self.fxdfile =
os.path.splitext(file)[0]
! else: self.fxdfile = os.path.join(config.MOVIE_DATA_DIR ,
! self.getmedia_id(device))
if overwrite == False:
--- 251,255 ----
type, none, device, none, file = self.video[0]
if type == 'file' and device == None: self.fxdfile =
os.path.splitext(file)[0]
! else: self.fxdfile = os.path.join(datadir, self.getmedia_id(device))
if overwrite == False:
***************
*** 322,325 ****
--- 328,334 ----
"post bugreport, tracebacks and fxd file.""")
except (IOError, FxdImdb_IO_Error), error:
+ if not config.MOVIE_DATA_DIR:
+ raise FxdImdb_IO_Error('error saving the file: %s' % str(error))
+
self.fxdfile = os.path.abspath(self.fxdfile)
Index: videoitem.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/videoitem.py,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** videoitem.py 20 Sep 2003 12:59:31 -0000 1.85
--- videoitem.py 20 Sep 2003 15:08:26 -0000 1.86
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.86 2003/09/20 15:08:26 dischi
+ # some adjustments to the missing testfiles
+ #
# Revision 1.85 2003/09/20 12:59:31 dischi
# do not match urls as tv shows
***************
*** 127,131 ****
# find image for tv show and build new title
! if config.TV_SHOW_REGEXP_MATCH(self.name) and filename.find('://') == -1:
show_name = config.TV_SHOW_REGEXP_SPLIT(self.name)
if show_name[0] and show_name[1] and show_name[2] and show_name[3]:
--- 130,135 ----
# find image for tv show and build new title
! if config.TV_SHOW_REGEXP_MATCH(self.name) and filename.find('://') == -1 and
\
! config.TV_SHOW_DATA_DIR:
show_name = config.TV_SHOW_REGEXP_SPLIT(self.name)
if show_name[0] and show_name[1] and show_name[2] and show_name[3]:
***************
*** 150,154 ****
# find image for this file
# First check in COVER_DIR
! self.image = util.getimage(config.COVER_DIR+self.basename, self.image)
# Then check for episode in TV_SHOW_DATA_DIR
--- 154,159 ----
# find image for this file
# First check in COVER_DIR
! if config.COVER_DIR:
! self.image = util.getimage(config.COVER_DIR+self.basename, self.image)
# Then check for episode in TV_SHOW_DATA_DIR
Index: xml_parser.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/xml_parser.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** xml_parser.py 14 Sep 2003 20:09:37 -0000 1.36
--- xml_parser.py 20 Sep 2003 15:08:26 -0000 1.37
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.37 2003/09/20 15:08:26 dischi
+ # some adjustments to the missing testfiles
+ #
# Revision 1.36 2003/09/14 20:09:37 dischi
# removed some TRUE=1 and FALSE=0 add changed some debugs to _debug_
***************
*** 483,496 ****
# find the realdir in case this file is in MOVIE_DATA_DIR
! if dir.find(config.MOVIE_DATA_DIR) == 0:
! realdir = os.path.join('/', dir[len(config.MOVIE_DATA_DIR):])
! if realdir.find('/disc/') == 0:
! realdir = realdir[6:]
! for c in config.REMOVABLE_MEDIA:
! if realdir.find(c.id) == 0:
! realdir = os.path.join(c.mountdir, realdir[len(c.id)+1:])
! break
! else:
! realdir = dir
for movie_child in node.children:
--- 486,500 ----
# find the realdir in case this file is in MOVIE_DATA_DIR
! if config.MOVIE_DATA_DIR:
! if dir.find(config.MOVIE_DATA_DIR) == 0:
! realdir = os.path.join('/', dir[len(config.MOVIE_DATA_DIR):])
! if realdir.find('/disc/') == 0:
! realdir = realdir[6:]
! for c in config.REMOVABLE_MEDIA:
! if realdir.find(c.id) == 0:
! realdir = os.path.join(c.mountdir, realdir[len(c.id)+1:])
! break
! else:
! realdir = dir
for movie_child in node.children:
***************
*** 647,673 ****
config.MOVIE_INFORMATIONS_LABEL += [(l_re, info)]
! for file in util.recursefolders(config.MOVIE_DATA_DIR,1,
! '*'+config.SUFFIX_VIDEO_DEF_FILES[0],1):
! infolist = parseMovieFile(file)
! for info in infolist:
! config.MOVIE_INFORMATIONS += [ info ]
! if info.rom_id:
! for i in info.rom_id:
! config.MOVIE_INFORMATIONS_ID[i] = info
! if info.rom_label:
! for l in info.rom_label:
! l_re = re.compile(l)
! config.MOVIE_INFORMATIONS_LABEL += [(l_re, info)]
! if info.files_options:
! for fo in info.files_options:
! config.DISC_SET_INFORMATIONS_ID[fo['file-id']] =
fo['mplayer-options']
! for file in util.recursefolders(config.TV_SHOW_DATA_DIR,1,
! '*'+config.SUFFIX_VIDEO_DEF_FILES[0],1):
! infolist = parseMovieFile(file)
! for info in infolist:
! k = os.path.splitext(os.path.basename(file))[0]
! config.TV_SHOW_INFORMATIONS[k] = (info.image, info.info,
info.mplayer_options,
! file)
_debug_('done')
--- 651,679 ----
config.MOVIE_INFORMATIONS_LABEL += [(l_re, info)]
! if config.MOVIE_DATA_DIR:
! for file in util.recursefolders(config.MOVIE_DATA_DIR,1,
! '*'+config.SUFFIX_VIDEO_DEF_FILES[0],1):
! infolist = parseMovieFile(file)
! for info in infolist:
! config.MOVIE_INFORMATIONS += [ info ]
! if info.rom_id:
! for i in info.rom_id:
! config.MOVIE_INFORMATIONS_ID[i] = info
! if info.rom_label:
! for l in info.rom_label:
! l_re = re.compile(l)
! config.MOVIE_INFORMATIONS_LABEL += [(l_re, info)]
! if info.files_options:
! for fo in info.files_options:
! config.DISC_SET_INFORMATIONS_ID[fo['file-id']] =
fo['mplayer-options']
! if config.TV_SHOW_DATA_DIR:
! for file in util.recursefolders(config.TV_SHOW_DATA_DIR,1,
! '*'+config.SUFFIX_VIDEO_DEF_FILES[0],1):
! infolist = parseMovieFile(file)
! for info in infolist:
! k = os.path.splitext(os.path.basename(file))[0]
! config.TV_SHOW_INFORMATIONS[k] = (info.image, info.info,
! info.mplayer_options, file)
_debug_('done')
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
