update for python 3.9 and latest dependency package versions

- pylint removed bad-whitespace error. http://pylint.pycqa.org/en/latest/whatsnew/2.6.html
- updating zeroconf from 0.24 to 0.28 required several changes in beacon.py
    - ServiceInfo address member was deprecated and then removed, addresses should now be used
    - ServiceInfo ctor argument order changed, and address was replaced by addresses
    - ServiceListeners will soon require an update_service method although it may do nothing
- python 3.9 plistlib module has removed the old API. It's used by metadata in a section of code that I do not think has ever been tested by me after updated from python 2 to 3. I've updated the code as I believe is needed, but it is *still* untested.
- python 3.9 xml.xmlparser expat is giving errors (I'm not totally sure these errors didn't exist before). Some googling also made me believe in this instance the pylint errors may be false positives.
    - `metadata.py:608:23: E1101: Instance of 'module' has no 'codes' member (no-member)`
    - `metadata.py:608:42: E1101: Instance of 'module' has no 'XML_ERROR_INVALID_TOKEN' member (no-member)`
- fixed a typo error in plugins/video/video.py

Author: mlippert

beacon.py

@@ -23,7 +23,7 @@ def bytes2str(data):
     """
     Convert bytes to str as utf-8. sequence values (and keys) will also be converted.
     """
-    # pylint: disable=bad-whitespace,multiple-statements
+    # pylint: disable=multiple-statements
 
     if isinstance(data, bytes):  return data.decode('utf-8')
     if isinstance(data, dict):   return dict(map(bytes2str, data.items()))
@@ -44,7 +44,7 @@ def log_serviceinfo(logger, info):
         log_level = logging.INFO
 
         log_info = {'name': info.name,
-                    'address': socket.inet_ntoa(info.address),
+                    'address': socket.inet_ntoa(info.addresses[0]),
                     'port': info.port}
         log_hdr = "\n  {address}:{port} {name}\n"
         log_fmt = log_hdr
@@ -69,14 +69,23 @@ def log_serviceinfo(logger, info):
 class ZCListener:
     # pylint: disable=redefined-builtin
 
-    def __init__(self, names):
+    def __init__(self, names, logger=None):
         self.names = names
+        self.logger = logger
+
+    def remove_service(self, server, type_, name):
+        self.names.remove(name.replace('.' + type_, ''))
 
-    def remove_service(self, server, type, name):
-        self.names.remove(name.replace('.' + type, ''))
+    def add_service(self, server, type_, name):
+        self.names.append(name.replace('.' + type_, ''))
+
+    def update_service(self, server, type_, name):
+        # method is required, but can be ignored if you don't care about updates. We don't.
+        if self.logger is not None:
+            # ex. WARNING:pyTivo.beacon:ZCListener.update_service name='Movies._tivo-videos._tcp.local.' type_='_tivo-videos._tcp.local.'
+            #     WARNING:pyTivo.beacon:ZCListener.update_service name='LivingRoomVox._tivo-videos._tcp.local.' type_='_tivo-videos._tcp.local.'
+            self.logger.debug(f'ZCListener.update_service {name=} {type_=}')
 
-    def add_service(self, server, type, name):
-        self.names.append(name.replace('.' + type, ''))
 
 class ZCBroadcast:
     def __init__(self, logger):
@@ -129,7 +138,7 @@ def __init__(self, logger):
 
                 info = zeroconf.ServiceInfo('_%s._tcp.local.' % tt,
                                             '%s._%s._tcp.local.' % (title, tt),
-                                            address, port, 0, 0, desc)
+                                            port=port, addresses=[address], properties=desc)
 
                 log_serviceinfo(self.logger, info)
                 self.rz.register_service(info)
@@ -144,7 +153,7 @@ def scan(self):
         self.logger.info('Scanning for TiVos...\n')
 
         # Get the names of servers offering TiVo videos
-        browser = zeroconf.ServiceBrowser(self.rz, VIDS, None, ZCListener(names))
+        browser = zeroconf.ServiceBrowser(self.rz, VIDS, None, ZCListener(names, logger=self.logger))
 
         # Give them a second (or more if no one has responded in the 1st second) to respond
         time.sleep(1)
@@ -164,13 +173,17 @@ def scan(self):
             log_serviceinfo(self.logger, info)
 
             if info:
+                # zeroconf v2.7 removed ServiceInfo address member says use addresses instead.
+                # Some debug logging to see if there is always at least the currently assumed 1 address (and maybe more?)
+                self.logger.debug(f'Found zeroconf.ServiceInfo with {len(info.addresses)} IP addresses\n')
+
                 tsn = info.properties.get(b'TSN')
                 if config.get_togo('all'):
                     tsn = info.properties.get(b'tsn', tsn)
                 if tsn:
                     if isinstance(tsn, bytes):
                         tsn = tsn.decode('utf-8')
-                    address = socket.inet_ntoa(info.address)
+                    address = socket.inet_ntoa(info.addresses[0])
                     port = info.port
                     config.tivos[tsn] = {'name': name, 'address': address,
                                          'port': port}

config.py

@@ -383,7 +383,6 @@ def get_tsn(name, tsn=None, raw=False):
 # For example, 2K==2000, 2Ki==2048, 2MB==16000000, 2MiB==16777216
 # Algorithm: http://svn.mplayerhq.hu/ffmpeg/trunk/libavcodec/eval.c
 def strtod(value):
-    # pylint: disable=bad-whitespace
     prefixes = {'y': -24, 'z': -21, 'a': -18, 'f': -15, 'p': -12,
                 'n': -9,  'u': -6,  'm': -3,  'c': -2,  'd': -1,
                 'h': 2,   'k': 3,   'K': 3,   'M': 6,   'G': 9,

metadata.py

@@ -10,6 +10,7 @@
 from datetime import datetime
 from xml.dom import minidom
 from xml.parsers import expat
+
 try:
     import plistlib
 except:
@@ -265,7 +266,9 @@ def from_moov(full_path):
                 # I don't know if the returned data is still in the same format
                 # AND readPlistFromBytes is deprecated, should use loads, so work
                 # to do when what this does is better understood and can be tested. -mjl 2017-07-14
-                data = plistlib.readPlistFromBytes(value)
+                # 3.9 removed the old api, so w/o any testing, I'm changing this to loads -mjl 2021-02-21
+                #data = plistlib.readPlistFromBytes(value)
+                data = plistlib.loads(value)
             except:
                 pass
             else:
@@ -275,7 +278,9 @@ def from_moov(full_path):
         elif (key == '----:com.pyTivo.pyTivo:tiVoINFO' and
               'plistlib' in sys.modules):
             try:
-                data = plistlib.readPlistFromBytes(value)
+                # 3.9 removed the old api, so w/o any testing, I'm changing this to loads -mjl 2021-02-21
+                #data = plistlib.readPlistFromBytes(value)
+                data = plistlib.loads(value)
             except:
                 pass
             else:
@@ -354,7 +359,10 @@ def from_eyetv(full_path):
     eyetvp = [x for x in os.listdir(path) if x.endswith('.eyetvp')][0]
     eyetvp = os.path.join(path, eyetvp)
     try:
-        eyetv = plistlib.readPlist(eyetvp)
+        # 3.9 removed the old api, so w/o any testing, I'm changing this to load -mjl 2021-02-21
+        #eyetv = plistlib.readPlist(eyetvp)
+        with open(eyetvp, 'rb') as eyetvfp:
+            eyetv = plistlib.load(eyetvfp)
     except:
         return metadata
     if 'epg info' in eyetv:
@@ -597,7 +605,7 @@ def _parse_nfo(nfo_path, nfo_data=None):
     try:
         xmldoc = minidom.parseString(os.linesep.join(nfo_data))
     except expat.ExpatError as err:
-        if expat.ErrorString(err.code) == expat.errors.XML_ERROR_INVALID_TOKEN:
+        if err.code == expat.errors.codes[expat.errors.XML_ERROR_INVALID_TOKEN]:
             # might be a URL outside the xml
             while len(nfo_data) > err.lineno:
                 if len(nfo_data[-1]) == 0:

plugins/video/video.py

@@ -106,7 +106,7 @@ def GetActiveTransferCount(self, handler, query):
         json_config['count'] = count
         handler.send_json(json.dumps(json_config))
 
-    def GetTransferStatus(selfself, handler, query):
+    def GetTransferStatus(self, handler, query):
         """
         HTTP command handler to return the status of current uploads to TiVos
         as a json object

showinfo.py

@@ -10,7 +10,6 @@
 
 # I want to line up the values in dicts, lists and tuples such as
 # the ShowInfo.FieldInfo default_val in metafields so:
-# pylint: disable=bad-whitespace
 
 # Various TV ratings strings associated with their rating value
 TV_RATINGS = {1: ('Y7',    'TV-Y7', 'X1',    'TVY7'),