diff --git a/jellyfin_mpv_shim/bulk_subtitle.py b/jellyfin_mpv_shim/bulk_subtitle.py index 4153ef31c2..2a48071911 100644 --- a/jellyfin_mpv_shim/bulk_subtitle.py +++ b/jellyfin_mpv_shim/bulk_subtitle.py @@ -29,7 +29,7 @@ def render_message(message, show_text): text = _("Selecting Tracks...") for message in messages[-6:]: text += "\n " + message - show_text(text, 2 ** 30, 1) + show_text(text, 2**30, 1) def process_series(mode, player: "PlayerManager_type", m_raid=None, m_rsid=None): diff --git a/jellyfin_mpv_shim/clients.py b/jellyfin_mpv_shim/clients.py index e78d124148..a2411544d1 100644 --- a/jellyfin_mpv_shim/clients.py +++ b/jellyfin_mpv_shim/clients.py @@ -24,7 +24,7 @@ def expo(max_value: Optional[int] = None): n = 0 while True: - a = 2 ** n + a = 2**n if max_value is None or a < max_value: yield a n += 1 diff --git a/jellyfin_mpv_shim/display_mirror/helpers.py b/jellyfin_mpv_shim/display_mirror/helpers.py index 0aae8488a9..32dc24e02f 100644 --- a/jellyfin_mpv_shim/display_mirror/helpers.py +++ b/jellyfin_mpv_shim/display_mirror/helpers.py @@ -19,7 +19,6 @@ # noinspection PyPep8Naming,PyPep8Naming def getUrl(serverAddress, name): - if not name: raise Exception("Url name cannot be empty") diff --git a/jellyfin_mpv_shim/gui_mgr.py b/jellyfin_mpv_shim/gui_mgr.py index e8605c24f5..d65953ce3b 100644 --- a/jellyfin_mpv_shim/gui_mgr.py +++ b/jellyfin_mpv_shim/gui_mgr.py @@ -45,7 +45,6 @@ def _show_file_win32(path: str): def open_config(): show_file(confdir(APP_NAME)) - except KeyError: open_config = None log.warning("Platform does not support opening folders.") diff --git a/jellyfin_mpv_shim/media.py b/jellyfin_mpv_shim/media.py index 185a76255a..a24defbd4c 100644 --- a/jellyfin_mpv_shim/media.py +++ b/jellyfin_mpv_shim/media.py @@ -172,7 +172,6 @@ def _get_url_from_source(self): and settings.direct_paths and (settings.remote_direct_paths or self.parent.is_local) ): - if platform.startswith("win32") or platform.startswith("cygwin"): # matches on SMB scheme match = re.search("(?:\\\\).+:.*@(.+)", self.media_source["Path"]) @@ -274,7 +273,8 @@ def get_hls_tile_images(self, width, count): for i in range(0, count): data = BytesIO() self.client.jellyfin._get_stream( - f"Videos/{self.item['Id']}/Trickplay/{width}/{i}.jpg?MediaSourceId={self.media_source['Id']}", data + f"Videos/{self.item['Id']}/Trickplay/{width}/{i}.jpg?MediaSourceId={self.media_source['Id']}", + data, ) yield data.getvalue() @@ -283,17 +283,19 @@ def get_bif(self, prefer_width=320): print(manifest) if ( manifest is not None - and manifest.get(self.media_source['Id']) is not None - and len(manifest[self.media_source['Id']]) > 0 + and manifest.get(self.media_source["Id"]) is not None + and len(manifest[self.media_source["Id"]]) > 0 ): - available_widths = [int(x) for x in manifest[self.media_source['Id']].keys()] + available_widths = [ + int(x) for x in manifest[self.media_source["Id"]].keys() + ] if prefer_width is not None: width = min(available_widths, key=lambda x: abs(x - prefer_width)) else: width = max(available_widths) - return manifest[self.media_source['Id']][str(width)] + return manifest[self.media_source["Id"]][str(width)] else: return None diff --git a/jellyfin_mpv_shim/menu.py b/jellyfin_mpv_shim/menu.py index 4d3692b6f1..787b88d872 100644 --- a/jellyfin_mpv_shim/menu.py +++ b/jellyfin_mpv_shim/menu.py @@ -108,7 +108,7 @@ def refresh_menu(self): fmt = "\n **{0}**" menu_text += fmt.format(item[0]) - self.playerManager.show_text(menu_text, 2 ** 30, 1) + self.playerManager.show_text(menu_text, 2**30, 1) def mouse_select(self, idx: int): if idx < 0 or idx > len(self.menu_list): diff --git a/jellyfin_mpv_shim/mpv_shim.py b/jellyfin_mpv_shim/mpv_shim.py index 3218f09a2d..cc025e5dc9 100755 --- a/jellyfin_mpv_shim/mpv_shim.py +++ b/jellyfin_mpv_shim/mpv_shim.py @@ -10,7 +10,12 @@ from .conf import settings from .clients import clientManager from .constants import APP_NAME -from .log_utils import configure_log, configure_log_file, enable_sanitization, root_logger +from .log_utils import ( + configure_log, + configure_log_file, + enable_sanitization, + root_logger, +) logging.getLogger("requests").setLevel(logging.CRITICAL) @@ -27,7 +32,7 @@ def main(): if settings.write_logs: log_file = conffile.get(APP_NAME, "log.txt") configure_log_file(log_file, settings.mpv_log_level) - + log = root_logger if sys.platform.startswith("darwin"): diff --git a/jellyfin_mpv_shim/player.py b/jellyfin_mpv_shim/player.py index 9d363d4dac..4912520522 100644 --- a/jellyfin_mpv_shim/player.py +++ b/jellyfin_mpv_shim/player.py @@ -476,7 +476,6 @@ def update(self): and self._player.playback_time > self._video.intro_start and self._player.playback_time < self._video.intro_end ): - if not self.is_in_intro: if settings.skip_intro_always and not self.intro_has_triggered: self.intro_has_triggered = True diff --git a/jellyfin_mpv_shim/trickplay.py b/jellyfin_mpv_shim/trickplay.py index f0e0e74d88..5d30aeaf0f 100644 --- a/jellyfin_mpv_shim/trickplay.py +++ b/jellyfin_mpv_shim/trickplay.py @@ -52,10 +52,7 @@ def run(self): video = self.player.get_video() try: data = video.get_bif(settings.thumbnail_preferred_size) - if ( - not self.player.has_video() - or video != self.player.get_video() - ): + if not self.player.has_video() or video != self.player.get_video(): # Video changed while we were getting the bif file continue @@ -72,9 +69,7 @@ def run(self): data["TileWidth"], data["TileHeight"], data["ThumbnailCount"], - video.get_hls_tile_images( - data["Width"], img_count - ), + video.get_hls_tile_images(data["Width"], img_count), fh, ) diff --git a/jellyfin_mpv_shim/utils.py b/jellyfin_mpv_shim/utils.py index a9bccdc30b..f116305f85 100644 --- a/jellyfin_mpv_shim/utils.py +++ b/jellyfin_mpv_shim/utils.py @@ -275,7 +275,7 @@ def get_profile( "Condition": "LessThanEqual", "Property": "Height", "Value": "1080", - } + }, ], } )