[vdrpylib-cvslog] vdrpylib/vdr vdr.py,1.4,1.5

[Rob S. <rs...@us...>]

Update of /cvsroot/vdrpylib/vdrpylib/vdr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31007

Modified Files:
	vdr.py 
Log Message:
-Update string handling.
-Debug and disable getvpaths until its fixed.


Index: vdr.py
===================================================================
RCS file: /cvsroot/vdrpylib/vdrpylib/vdr/vdr.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** vdr.py	25 Nov 2002 21:59:02 -0000	1.4
--- vdr.py	24 Nov 2004 17:21:08 -0000	1.5
***************
*** 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