Update of /cvsroot/freevo/freevo/WIP/RobShortt/lib/vdrpylib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7161/WIP/RobShortt/lib/vdrpylib

Modified Files:
        vdr.py 
Log Message:
Some fixes I forgot to commit.  More work on this soon.


Index: vdr.py
===================================================================
RCS file: /cvsroot/freevo/freevo/WIP/RobShortt/lib/vdrpylib/vdr.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** vdr.py      19 Jul 2004 12:17:29 -0000      1.1
--- vdr.py      3 Sep 2004 12:13:13 -0000       1.2
***************
*** 22,27 ****
  import os.path
  import re
  
! import channel
  import event
  import recording
--- 22,28 ----
  import os.path
  import re
+ import string
  
! from channel import Channel
  import event
  import recording
***************
*** 123,126 ****
--- 124,130 ----
                recordings in the system.
                """
+               # XXX: this is so f#$#! broken, disabling
+               return [path]
+ 
                pat = re.compile('([^0-9]*)([0-9]+)')
                result = pat.match(self.videopath)
***************
*** 129,134 ****
                else:
                        paths = []
!                       basepath = result.groups(1)
!                       curnr = int(result.groups(2))
                        if basepath == None:
                                basepath = ''
--- 133,142 ----
                else:
                        paths = []
!                       #basepath = result.groups(1)
!                       basepath = result.group(1)
!                       print 'RLS: basepath is %s' % basepath
!                       print 'RLS: result is %s' % result.group(2)
!                       #curnr = int(result.groups(2))
!                       curnr = int(result.group(2))
                        if basepath == None:
                                basepath = ''
***************
*** 298,310 ****
                        if line[0] == 'C':
                                # channel start
!                               tokens = line.split(None, 2)
!                               ch_sid = int(tokens[1])
  
                                if self.channels.has_key(ch_sid):
                                        channel = self.channels[ch_sid]
                                else:
!                                       channel = channel.Channel()
                                        channel.sid = ch_sid
!                                       channel.name = tokens[2]
                        elif line[0] == 'E':
                                # event start
--- 306,319 ----
                        if line[0] == 'C':
                                # channel start
!                               tokens = string.split(line, '-')
!                               ch_sid = int(tokens[3])
!                               print 'RLS: ch_sid="%s"' % ch_sid
  
                                if self.channels.has_key(ch_sid):
                                        channel = self.channels[ch_sid]
                                else:
!                                       channel = Channel()
                                        channel.sid = ch_sid
!                                       channel.name = string.split(tokens[4])[1]
                        elif line[0] == 'E':
                                # event start



-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to