From a190826ad15c302a315b655980f0af5a0a00c81c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Odd=20Str=C3=A5b=C3=B8?= Date: Wed, 7 Feb 2024 09:01:52 +0000 Subject: [PATCH] Fix lints --- build.py | 1 - jellyfin_kodi/entrypoint/default.py | 2 +- jellyfin_kodi/helper/translate.py | 2 +- jellyfin_kodi/helper/wrapper.py | 4 ++-- jellyfin_kodi/helper/xmls.py | 1 + jellyfin_kodi/monitor.py | 1 - jellyfin_kodi/objects/kodi/queries.py | 2 +- jellyfin_kodi/objects/obj.py | 2 +- jellyfin_kodi/views.py | 6 +++--- tox.ini | 2 +- 10 files changed, 11 insertions(+), 12 deletions(-) diff --git a/build.py b/build.py index 518f1225..d0dfd4c8 100755 --- a/build.py +++ b/build.py @@ -113,7 +113,6 @@ def folder_filter(folder_name: str) -> bool: return True - if __name__ == '__main__': parser = argparse.ArgumentParser(description='Build flags:') parser.add_argument( diff --git a/jellyfin_kodi/entrypoint/default.py b/jellyfin_kodi/entrypoint/default.py index d8f6c049..fe7cecb9 100644 --- a/jellyfin_kodi/entrypoint/default.py +++ b/jellyfin_kodi/entrypoint/default.py @@ -345,7 +345,7 @@ def browse(media, view_id=None, folder=None, server_id=None, api_client=None): actions = Actions(server_id, api_client) list_li = [] - listing = listing if type(listing) == list else listing.get('Items', []) + listing = listing if isinstance(listing, list) else listing.get('Items', []) for item in listing: diff --git a/jellyfin_kodi/helper/translate.py b/jellyfin_kodi/helper/translate.py index 2714e9ee..04d6b9ca 100644 --- a/jellyfin_kodi/helper/translate.py +++ b/jellyfin_kodi/helper/translate.py @@ -18,7 +18,7 @@ def translate(string): ''' Get add-on string. Returns in unicode. ''' - if type(string) != int: + if not isinstance(string, int): string = STRINGS[string] result = xbmcaddon.Addon('plugin.video.jellyfin').getLocalizedString(string) diff --git a/jellyfin_kodi/helper/wrapper.py b/jellyfin_kodi/helper/wrapper.py index 1b814da1..294be59c 100644 --- a/jellyfin_kodi/helper/wrapper.py +++ b/jellyfin_kodi/helper/wrapper.py @@ -27,7 +27,7 @@ def progress(message=None): dialog = xbmcgui.DialogProgressBG() - if item and type(item) == dict: + if item and isinstance(item, dict): dialog.create(translate('addon_name'), "%s %s" % (translate('gathering'), item['Name'])) LOG.info("Processing %s: %s", item['Name'], item['Id']) @@ -72,7 +72,7 @@ def jellyfin_item(func): ''' Wrapper to retrieve the jellyfin_db item. ''' def wrapper(self, item, *args, **kwargs): - e_item = self.jellyfin_db.get_item_by_id(item['Id'] if type(item) == dict else item) + e_item = self.jellyfin_db.get_item_by_id(item['Id'] if isinstance(item, dict) else item) return func(self, item, e_item=e_item, *args, **kwargs) diff --git a/jellyfin_kodi/helper/xmls.py b/jellyfin_kodi/helper/xmls.py index 0831514b..0e107091 100644 --- a/jellyfin_kodi/helper/xmls.py +++ b/jellyfin_kodi/helper/xmls.py @@ -72,6 +72,7 @@ def advanced_settings(): return True + def verify_kodi_defaults(): ''' Make sure we have the kodi default folder in place. ''' diff --git a/jellyfin_kodi/monitor.py b/jellyfin_kodi/monitor.py index b2d2bc8d..fd463bd6 100644 --- a/jellyfin_kodi/monitor.py +++ b/jellyfin_kodi/monitor.py @@ -179,7 +179,6 @@ class Monitor(xbmc.Monitor): self.additional_users(server) - def additional_users(self, server): ''' Setup additional users images. diff --git a/jellyfin_kodi/objects/kodi/queries.py b/jellyfin_kodi/objects/kodi/queries.py index 71459e2c..e966683a 100644 --- a/jellyfin_kodi/objects/kodi/queries.py +++ b/jellyfin_kodi/objects/kodi/queries.py @@ -399,7 +399,7 @@ VALUES (?, ?, ?) # Resulting in duplicates insert_link_if_not_exists = """ INSERT INTO {LinkType}(actor_id, media_id, media_type) -SELECT ?, ?, ? +SELECT ?, ?, ? WHERE NOT EXISTS(SELECT 1 FROM {LinkType} WHERE actor_id = ? AND media_id = ? AND media_type = ?) """ update_movie = """ diff --git a/jellyfin_kodi/objects/obj.py b/jellyfin_kodi/objects/obj.py index 4e3f4718..f42eb3c5 100644 --- a/jellyfin_kodi/objects/obj.py +++ b/jellyfin_kodi/objects/obj.py @@ -108,7 +108,7 @@ class Objects(object): continue if obj_key: - obj = [d[obj_key] for d in obj if d.get(obj_key)] if type(obj) == list else obj.get(obj_key) + obj = [d[obj_key] for d in obj if d.get(obj_key)] if isinstance(obj, list) else obj.get(obj_key) self.mapped_item[key] = obj break diff --git a/jellyfin_kodi/views.py b/jellyfin_kodi/views.py index 8569cb1e..9c38ca45 100644 --- a/jellyfin_kodi/views.py +++ b/jellyfin_kodi/views.py @@ -411,7 +411,7 @@ class Views(object): etree.SubElement(xml, 'content') label = xml.find('label') - label.text = str(name) if type(name) == int else name + label.text = str(name) if isinstance(name, int) else name content = xml.find('content') content.text = view['Media'] @@ -772,7 +772,7 @@ class Views(object): else: window_path = "ActivateWindow(Videos,%s,return)" % path - node_label = translate(node_label) if type(node_label) == int else node_label + node_label = translate(node_label) if isinstance(node_label, int) else node_label node_label = node_label or view['Name'] if node in ('all', 'music'): @@ -824,7 +824,7 @@ class Views(object): else: window_path = "ActivateWindow(Videos,%s,return)" % path - node_label = translate(node_label) if type(node_label) == int else node_label + node_label = translate(node_label) if isinstance(node_label, int) else node_label node_label = node_label or view['Name'] if node == 'all': diff --git a/tox.ini b/tox.ini index e8ea3d1c..01f62154 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [flake8] max-line-length = 9999 import-order-style = pep8 -exclude = .git,.vscode,libraries,build.py,.github +exclude = .git,.vscode,libraries,.github extend-ignore = I202 per-file-ignores =