Updated htspmon debug script to receive EPG info.

Author: adamsutton

Diff for: lib/py/tvh/htsp.py

@@ -29,7 +29,7 @@
 # HTSP Client
 # ###########################################################################
 
-HTSP_PROTO_VERSION = 5
+HTSP_PROTO_VERSION = 6
 
 # Create passwd digest
 def htsp_digest ( user, passwd, chal ):
@@ -76,10 +76,9 @@ def hello ( self ):
     self.send('hello', args)
     resp = self.recv()
 
-    # Validate
-    if resp['htspversion'] != HTSP_PROTO_VERSION:
-      raise Exception('version mismatch')
-    self._auth = resp['challenge']
+    # Store
+    self._version = min(HTSP_PROTO_VERSION, resp['htspversion'])
+    self._auth    = resp['challenge']
 
     # Return response
     return resp
@@ -95,8 +94,8 @@ def authenticate ( self, user, passwd = None ):
       raise Exception('Authentication failed')
 
   # Enable async receive
-  def enableAsyncMetadata ( self ):
-    self.send('enableAsyncMetadata')
+  def enableAsyncMetadata ( self, args = {} ):
+    self.send('enableAsyncMetadata', args)
 
 # ############################################################################
 # Editor Configuration

Diff for: support/htspmon

@@ -25,7 +25,6 @@ from optparse import OptionParser
 # System path
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'lib', 'py'))
 import tvh
-print sys.path
 
 # TVH imports
 from tvh.htsp import HTSPClient
@@ -35,28 +34,38 @@ try:
 
   # Command line
   optp = OptionParser()
-  optp.add_option('-t', '--host', default='localhost',
+  optp.add_option('-a', '--host', default='localhost',
                   help='Specify HTSP server hostname')
   optp.add_option('-o', '--port', default=9982, type='int',
                   help='Specify HTSP server port')
   optp.add_option('-u', '--user', default=None,
                   help='Specify HTSP authentication username')
   optp.add_option('-p', '--passwd', default=None,
                   help='Specify HTSP authentication password')
+  optp.add_option('-e', '--epg', default=False, action='store_true',
+                  help='Get async EPG updates')
+  optp.add_option('-t', '--update', default=None, type='int',
+                  help='Specify when to receive updates from')
   (opts, args) = optp.parse_args()
 
   # Connect
   htsp = HTSPClient((opts.host, opts.port))
   msg  = htsp.hello()
   log.info('connected to %s [%s]' % (msg['servername'], msg['serverversion']))
+  log.info('using protocol v%d' % htsp._version)
 
   # Authenticate
   if opts.user:
     htsp.authenticate(opts.user, opts.passwd)
     log.info('authenticated as %s' % opts.user)
 
   # Enable async
-  htsp.enableAsyncMetadata()
+  args = {}
+  if opts.epg:
+    args['epg']    = 1
+  if opts.update != None:
+    args['lastUpdate'] = opts.update
+  htsp.enableAsyncMetadata(args)
   log.info('enabled async data')
 
   # Process messages