From b110f1cf133c048ffe3609a25f0fff3a9e5c7a62 Mon Sep 17 00:00:00 2001 From: Brian Pepple Date: Sun, 27 Sep 2020 11:10:51 -0400 Subject: [PATCH] Simplify boolean --- jellyfin_kodi/connect.py | 2 +- jellyfin_kodi/dialogs/context.py | 2 +- jellyfin_kodi/dialogs/loginmanual.py | 2 +- jellyfin_kodi/dialogs/resume.py | 2 +- jellyfin_kodi/dialogs/serverconnect.py | 2 +- jellyfin_kodi/dialogs/servermanual.py | 2 +- jellyfin_kodi/dialogs/usersconnect.py | 2 +- jellyfin_kodi/downloader.py | 2 +- jellyfin_kodi/objects/actions.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jellyfin_kodi/connect.py b/jellyfin_kodi/connect.py index 5c838fb0..ec2fa325 100644 --- a/jellyfin_kodi/connect.py +++ b/jellyfin_kodi/connect.py @@ -46,7 +46,7 @@ class Connect(object): if server['Id'] == server_id: credentials['Servers'] = [server] - server_select = True if server_id is None and not settings('SyncInstallRunDone.bool') else False + server_select = server_id is None and not settings('SyncInstallRunDone.bool') new_credentials = self.register_client(credentials, options, server_id, server_select) for server in servers: diff --git a/jellyfin_kodi/dialogs/context.py b/jellyfin_kodi/dialogs/context.py index 83b3eea0..df7543ad 100644 --- a/jellyfin_kodi/dialogs/context.py +++ b/jellyfin_kodi/dialogs/context.py @@ -41,7 +41,7 @@ class ContextMenu(xbmcgui.WindowXMLDialog): self._options = options def is_selected(self): - return True if self.selected_option else False + return bool(self.selected_option) def get_selected(self): return self.selected_option diff --git a/jellyfin_kodi/dialogs/loginmanual.py b/jellyfin_kodi/dialogs/loginmanual.py index 0852245b..eee28d41 100644 --- a/jellyfin_kodi/dialogs/loginmanual.py +++ b/jellyfin_kodi/dialogs/loginmanual.py @@ -40,7 +40,7 @@ class LoginManual(xbmcgui.WindowXMLDialog): setattr(self, key, value) def is_logged_in(self): - return True if self._user else False + return bool(self._user) def get_user(self): return self._user diff --git a/jellyfin_kodi/dialogs/resume.py b/jellyfin_kodi/dialogs/resume.py index 4cfca7ea..bee793f9 100644 --- a/jellyfin_kodi/dialogs/resume.py +++ b/jellyfin_kodi/dialogs/resume.py @@ -31,7 +31,7 @@ class ResumeDialog(xbmcgui.WindowXMLDialog): self._resume_point = time def is_selected(self): - return True if self.selected_option is not None else False + return self.selected_option is not None def get_selected(self): return self.selected_option diff --git a/jellyfin_kodi/dialogs/serverconnect.py b/jellyfin_kodi/dialogs/serverconnect.py index a6ddc5f2..c4c3afff 100644 --- a/jellyfin_kodi/dialogs/serverconnect.py +++ b/jellyfin_kodi/dialogs/serverconnect.py @@ -48,7 +48,7 @@ class ServerConnect(xbmcgui.WindowXMLDialog): setattr(self, key, value) def is_server_selected(self): - return True if self._selected_server else False + return bool(self._selected_server) def get_server(self): return self._selected_server diff --git a/jellyfin_kodi/dialogs/servermanual.py b/jellyfin_kodi/dialogs/servermanual.py index 641b6be6..803e706a 100644 --- a/jellyfin_kodi/dialogs/servermanual.py +++ b/jellyfin_kodi/dialogs/servermanual.py @@ -48,7 +48,7 @@ class ServerManual(xbmcgui.WindowXMLDialog): setattr(self, key, value) def is_connected(self): - return True if self._server else False + return bool(self._server) def get_server(self): return self._server diff --git a/jellyfin_kodi/dialogs/usersconnect.py b/jellyfin_kodi/dialogs/usersconnect.py index 57daecab..a361756d 100644 --- a/jellyfin_kodi/dialogs/usersconnect.py +++ b/jellyfin_kodi/dialogs/usersconnect.py @@ -39,7 +39,7 @@ class UsersConnect(xbmcgui.WindowXMLDialog): setattr(self, key, value) def is_user_selected(self): - return True if self._user else False + return bool(self._user) def get_user(self): return self._user diff --git a/jellyfin_kodi/downloader.py b/jellyfin_kodi/downloader.py index 22e533c4..fa67facc 100644 --- a/jellyfin_kodi/downloader.py +++ b/jellyfin_kodi/downloader.py @@ -69,7 +69,7 @@ def validate_view(library_id, item_id): LOG.exception(error) return False - return True if len(result['Items']) else False + return bool(len(result['Items'])) def get_single_item(parent_id, media): diff --git a/jellyfin_kodi/objects/actions.py b/jellyfin_kodi/objects/actions.py index 14b09702..a6f461b1 100644 --- a/jellyfin_kodi/objects/actions.py +++ b/jellyfin_kodi/objects/actions.py @@ -95,7 +95,7 @@ class Actions(object): if choice is None: raise Exception("User backed out of resume dialog.") - item["resumePlayback"] = False if not choice else True + item["resumePlayback"] = bool(choice) if settings('enableCinema.bool') and not item["resumePlayback"]: self._set_intros(item)