[vdrpylib-cvslog] vdrpylib/vdr channel.py,1.8,1.9

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

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

Modified Files:
	channel.py 
Log Message:
-Fix for missing RID.
-Add flags for tv/radio channels.
-Add flags to show if the channel was found in the EPG and/or channels.conf.


Index: channel.py
===================================================================
RCS file: /cvsroot/vdrpylib/vdrpylib/vdr/channel.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** channel.py	7 Jan 2005 12:37:00 -0000	1.8
--- channel.py	28 Apr 2005 01:23:30 -0000	1.9
***************
*** 91,95 ****
--- 91,100 ----
          self.tid = None
          self.rid = None
+         self.tv = False
+         self.radio = False
+         self.in_conf = False
+         self.in_epg = False
          self.events = []
+ 
          if line:
              self.parse_line(line)
***************
*** 98,101 ****
--- 103,117 ----
          if index:
              self.indexes.append(index)
+ 
+         if self.vpid == '0' and len(self.apids):
+             self.radio = True
+             self.tv = False
+         elif self.vpid == '0' and len(self.apids) == 0:
+             self.radio = False
+             self.tv = False
+         else:
+             self.radio = False
+             self.tv = True
+ 
          
      def __str__(self):
***************
*** 131,139 ****
          """
          tokens = definition.strip().split(':')
!         name=tokens[0]
!         nametokens=name.split(';')
          self.name = nametokens[0]
          if len(nametokens)>1:
              self.provider = nametokens[1]
          self.freq = int(tokens[1])
          self.pol = tokens[2]
--- 147,156 ----
          """
          tokens = definition.strip().split(':')
!         name = tokens[0]
!         nametokens = name.split(';')
          self.name = nametokens[0]
          if len(nametokens)>1:
              self.provider = nametokens[1]
+ 
          self.freq = int(tokens[1])
          self.pol = tokens[2]
***************
*** 148,158 ****
          self.tid = tokens[11]
          self.rid = tokens[12]
          tokens = apids.split(';')
          self.apids = map(str, tokens[0].split(','))
          if len(tokens) == 2:
              self.dpids = map(str, tokens[1].split(','))
          self.id = string.join([self.source, self.nid, self.tid,
                                         self.sid, self.rid], '-')
!  
   
      def parse_key(self, key):
--- 165,178 ----
          self.tid = tokens[11]
          self.rid = tokens[12]
+ 
          tokens = apids.split(';')
          self.apids = map(str, tokens[0].split(','))
+ 
          if len(tokens) == 2:
              self.dpids = map(str, tokens[1].split(','))
+ 
          self.id = string.join([self.source, self.nid, self.tid,
                                         self.sid, self.rid], '-')
! 
   
      def parse_key(self, key):
***************
*** 163,167 ****
          self.tid    = tokens[2]
          self.sid    = tokens[3]
!         self.rid    = tokens[4]
          self.id     = key
  
--- 183,192 ----
          self.tid    = tokens[2]
          self.sid    = tokens[3]
!         try:
!             self.rid    = tokens[4]
!         except:
!             print 'WARNING: %s contains no rid, setting to 0' % key
!             self.rid    = '0'
!           
          self.id     = key