Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1040/src/util

Modified Files:
        tv_util.py 
Log Message:
getProgFilename() now returns the entire filename (path) including 
TV_RECORD_DIR and TV_RECORDFILE_SUFFIX.


Index: tv_util.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/tv_util.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tv_util.py  20 Jun 2004 13:56:54 -0000      1.3
--- tv_util.py  22 Jun 2004 01:03:25 -0000      1.4
***************
*** 7,10 ****
--- 7,14 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.4  2004/06/22 01:03:25  rshortt
+ # getProgFilename() now returns the entire filename (path) including
+ # TV_RECORD_DIR and TV_RECORDFILE_SUFFIX.
+ #
  # Revision 1.3  2004/06/20 13:56:54  dischi
  # remove -_ at the end of the filename
***************
*** 70,74 ****
  
  
- 
  def getKey(prog=None):
      if not prog:
--- 74,77 ----
***************
*** 78,85 ****
  
    
! def progRunning(prog=None):
!     if not prog:
!         return 'ERROR: no prog'
! 
      now = time.time()
      if prog.start <= now and prog.stop >= now:
--- 81,85 ----
  
    
! def progRunning(prog):
      now = time.time()
      if prog.start <= now and prog.stop >= now:
***************
*** 88,102 ****
  
  
! def getProgFilename(prog=None):
!     if not prog:
!         return 'ERROR: no prog'
!     
!     mask = config.TV_RECORDFILE_MASK   # '%%m-%%d %%H:%%M %(progname)s - %(title)s'
      filename_array = { 'progname': String(prog.title),
                         'title'   : String(prog.sub_title) }
  
!     filemask = mask % filename_array
      filemask = time.strftime(filemask, time.localtime(prog.start))
!     filename = progname2filename(filemask)
      return filename.rstrip(' -_:')
  
--- 88,100 ----
  
  
! def getProgFilename(prog):
      filename_array = { 'progname': String(prog.title),
                         'title'   : String(prog.sub_title) }
  
!     filemask = config.TV_RECORDFILE_MASK % filename_array
      filemask = time.strftime(filemask, time.localtime(prog.start))
!     filename = os.path.join(config.TV_RECORD_DIR, 
!                             progname2filename(filemask) + 
!                             config.TV_RECORDFILE_SUFFIX)
      return filename.rstrip(' -_:')
  



-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to