[Freevo-cvslog] freevo/src/tv record_daemon.py,1.6,1.7 record_video.py,1.13,1.14

[<ou...@us...>]

Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1:/tmp/cvs-serv14894

Modified Files:
	record_daemon.py record_video.py 
Log Message:
An attempt to fix the daylight savings issue; it makes one potentially bad
assumption, that daylight savings time is one hour rather than more.


Index: record_daemon.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/record_daemon.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** record_daemon.py	22 Apr 2003 19:39:36 -0000	1.6
--- record_daemon.py	5 May 2003 01:19:48 -0000	1.7
***************
*** 39,42 ****
--- 39,44 ----
              t = time.strptime(start_time, '%Y-%m-%d %H:%M:%S')
              self.start_time = time.mktime(t)
+             if (time.localtime()[8]==1):
+                 self.start_time = self.start_time - 3600
          else:
              self.start_time = int(start_time)
***************
*** 150,155 ****
--- 152,165 ----
      '''Schedule a new recording. The start time is a unix timestamp.'''
  
+     if (time.localtime()[8]==1):
+         start_time_s = start_time_s - 3600
+ 
      ts = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(start_time_s))
+ 
      s = '%s,%s,%s,%s\n' % (ts, length_secs, cmd, channel_id)
+ 
+ 
+ 
+     
  
      schedule_init()

Index: record_video.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/tv/record_video.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** record_video.py	24 Apr 2003 19:56:41 -0000	1.13
--- record_video.py	5 May 2003 01:19:49 -0000	1.14
***************
*** 10,13 ****
--- 10,17 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.14  2003/05/05 01:19:49  outlyer
+ # An attempt to fix the daylight savings issue; it makes one potentially bad
+ # assumption, that daylight savings time is one hour rather than more.
+ #
  # Revision 1.13  2003/04/24 19:56:41  dischi
  # comment cleanup for 1.3.2-pre4
***************
*** 279,283 ****
      # Recording filename
      rec_name = recinfo.program_name.selected
!     ts_ch = time.strftime('%m-%d_%I:%M_-', time.localtime(start_time_s))
      if rec_name != recinfo.program_name.choices[0]:
          rec_name = ts_ch
--- 283,291 ----
      # Recording filename
      rec_name = recinfo.program_name.selected
!     start_time_f = start_time_s
!     if (time.localtime()[8]==1):
!             start_time_f = start_time_f - 3600
! 
!     ts_ch = time.strftime('%m-%d_%I:%M_-', time.localtime(start_time_f))
      if rec_name != recinfo.program_name.choices[0]:
          rec_name = ts_ch
***************
*** 302,310 ****
      # Build the commandline. The -frames option is added later by the daemon.
      sch_cmd = config.VCR_CMD % cl_options
!     print 'SCHEDULE: %s, %s, %s' % (tunerid, time.ctime(start_time_s), rec_name)
      print 'SCHEDULE: %s' % sch_cmd
      
      record_daemon.schedule_recording(start_time_s, len_secs, sch_cmd, recinfo.channel)
!     
      s = 'Scheduled recording:\n'
      s += 'Channel %s\n' % recinfo.channel
--- 310,319 ----
      # Build the commandline. The -frames option is added later by the daemon.
      sch_cmd = config.VCR_CMD % cl_options
!     print 'SCHEDULE: %s, %s, %s' % (tunerid, time.ctime(start_time_f), rec_name)
      print 'SCHEDULE: %s' % sch_cmd
      
      record_daemon.schedule_recording(start_time_s, len_secs, sch_cmd, recinfo.channel)
! 
! 
      s = 'Scheduled recording:\n'
      s += 'Channel %s\n' % recinfo.channel
***************
*** 312,315 ****
--- 321,325 ----
                             recinfo.length.selected)
      print '"%s"' % s
+ 
  
      pop = PopupBox(text=s)