Merge pull request #2050 from C0rn3j/format

Ruff format, typing & linting

Author: Taiko2k

src/tauon/__main__.py

@@ -34,7 +34,9 @@
 from tauon.t_modules.t_bootstrap import Holder  # noqa: E402
 from tauon.t_modules.t_logging import CustomLoggingFormatter, LogHistoryHandler  # noqa: E402
 
-pyinstaller_mode = bool(hasattr(sys, "_MEIPASS") or getattr(sys, "frozen", False) or install_directory.name.endswith("_internal"))
+pyinstaller_mode = bool(
+	hasattr(sys, "_MEIPASS") or getattr(sys, "frozen", False) or install_directory.name.endswith("_internal")
+)
 
 log = LogHistoryHandler()
 formatter = logging.Formatter("[%(levelname)s] %(message)s")
@@ -46,7 +48,7 @@
 	handlers=[
 		logging.StreamHandler(),
 		log,
-#		logging.FileHandler('/tmp/tauon.log'),
+		# logging.FileHandler('/tmp/tauon.log'),
 	],
 )
 logging.getLogger().handlers[0].setFormatter(CustomLoggingFormatter())
@@ -55,13 +57,14 @@
 logging.captureWarnings(capture=True)
 if not sys.warnoptions:
 	import warnings
+
 	warnings.simplefilter("default")
-	os.environ["PYTHONWARNINGS"] = "default" # Also affect subprocesses
+	os.environ["PYTHONWARNINGS"] = "default"  # Also affect subprocesses
 
 if sys.platform != "win32":
 	import fcntl
 
-n_version = "9.1.0" # Should also be bumped in pyproject.toml, extra/*.appdata.xml
+n_version = "9.1.0"  # Should also be bumped in pyproject.toml, extra/*.appdata.xml
 t_version = "v" + n_version
 t_title = "Tauon"
 t_id = "tauonmb"
@@ -72,12 +75,15 @@
 
 logging.info(f"Started with arguments: {sys.argv}")
 
+
 def open_discord() -> None:
 	webbrowser.open("https://discord.gg/v4EmhES")
 
+
 def open_github() -> None:
 	webbrowser.open("https://github.com/Taiko2k/Tauon/issues")
 
+
 def open_crash_log(path: Path) -> None:
 	try:
 		if sys.platform == "win32":
@@ -89,24 +95,33 @@ def open_crash_log(path: Path) -> None:
 	except Exception:
 		webbrowser.open(path.as_uri())
 
+
 def main() -> None:
 	"""Launch Tauon by means of importing t_main.py"""
 	from tauon.t_modules.t_main import main as t_main
+
 	t_main(holder)
 
+
 def transfer_args_and_exit() -> None:
 	"""Early arg processing"""
 	import urllib.request
+
 	base = "http://localhost:7813/"
 
 	if len(sys.argv) <= 1:
 		url = base + "raise/"
 		urllib.request.urlopen(url)
 
 	for item in sys.argv:
-
-		if not item.endswith(".py") and not item.startswith("-") and not item.endswith("exe") and (item.startswith("file://") or Path(item).exists()):
+		if (
+			not item.endswith(".py")
+			and not item.startswith("-")
+			and not item.endswith("exe")
+			and (item.startswith("file://") or Path(item).exists())
+		):
 			import base64
+
 			url = base + "open/" + base64.urlsafe_b64encode(item.encode()).decode()
 			urllib.request.urlopen(url)
 		if item == "--play-pause":
@@ -141,7 +156,10 @@ def transfer_args_and_exit() -> None:
 	transfer_args_and_exit()
 
 # If we're installed, use home data locations
-install_mode = bool(str(install_directory).startswith(("/opt/", "/usr/", "/app/", "/snap/", "/nix/store/")) or sys.platform in ("darwin", "win32"))
+install_mode = bool(
+	str(install_directory).startswith(("/opt/", "/usr/", "/app/", "/snap/", "/nix/store/"))
+	or sys.platform in ("darwin", "win32")
+)
 
 # Assume that it's a classic Linux install, use standard paths
 if str(install_directory).startswith("/usr/") and Path("/usr/share/TauonMusicBox").is_dir():
@@ -157,13 +175,13 @@ def transfer_args_and_exit() -> None:
 
 # Handle regular install, running from a directory and finally a portable install, usually a venv
 if install_mode:
-#	logging.info("Running in installed mode")
+	# logging.info("Running in installed mode")
 	user_directory = Path(GLib.get_user_data_dir()) / "TauonMusicBox"
 elif install_directory.parent.name == "src":
-#	logging.info("Running in portable mode from cloned dir")
+	# logging.info("Running in portable mode from cloned dir")
 	user_directory = install_directory.parent.parent / "user-data"
 else:
-#	logging.info("Running in portable mode")
+	# logging.info("Running in portable mode")
 	user_directory = install_directory / "user-data"
 
 debug = bool((user_directory / "debug").is_file())
@@ -209,7 +227,7 @@ def transfer_args_and_exit() -> None:
 			# TODO(Martin): Silent crash
 			transfer_args_and_exit()
 	if pyinstaller_mode:
-		os.environ["FONTCONFIG_PATH"] = str(install_directory / "etc" / "fonts") #"C:\\msys64\\mingw64\\etc\\fonts"
+		os.environ["FONTCONFIG_PATH"] = str(install_directory / "etc" / "fonts")  # "C:\\msys64\\mingw64\\etc\\fonts"
 
 phone = False
 d = os.environ.get("XDG_CURRENT_DESKTOP")
@@ -219,7 +237,7 @@ def transfer_args_and_exit() -> None:
 
 os.environ["SDL_VIDEO_WAYLAND_ALLOW_LIBDECOR"] = "0"  # emergency crash workaround
 
-if pyinstaller_mode: # and sys.platform == 'darwin':
+if pyinstaller_mode:  # and sys.platform == 'darwin':
 	os.environ["SDL_BINARY_PATH"] = str(install_directory)
 
 fs_mode = False
@@ -271,7 +289,9 @@ def transfer_args_and_exit() -> None:
 # Test the first SetHint to catch if we loaded SDL3 correctly
 sethint_result = sdl3.SDL_SetHint(sdl3.SDL_HINT_VIDEO_ALLOW_SCREENSAVER, b"1")
 if sethint_result is None:
-	logging.error("Failed to run SetHint, probably due to https://github.com/Aermoss/PySDL3/issues/35, will try a workaround")
+	logging.error(
+		"Failed to run SetHint, probably due to https://github.com/Aermoss/PySDL3/issues/35, will try a workaround"
+	)
 	sys.exit(1)
 
 sdl3.SDL_SetHint(sdl3.SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, b"1")
@@ -286,8 +306,8 @@ def transfer_args_and_exit() -> None:
 	w = 720
 	h = 1800
 window_default_size: tuple[int, int] = (w, h)
-window_size:         list[int] = [w, h]
-logical_size:        list[int] = [w, h]
+window_size: list[int] = [w, h]
+logical_size: list[int] = [w, h]
 window_opacity = 1
 scale = 1
 if sys.platform == "darwin":
@@ -296,7 +316,7 @@ def transfer_args_and_exit() -> None:
 	scale = 1.3
 
 maximized = False
-old_window_position: tuple [int, int] | None = None
+old_window_position: tuple[int, int] | None = None
 
 window_p = user_directory / "window.p"
 if window_p.is_file() and not fs_mode:
@@ -347,8 +367,11 @@ def transfer_args_and_exit() -> None:
 if err and "GLX" in err.decode():
 	logging.error(f"SDL init error: {err.decode()}")
 	sdl3.SDL_ShowSimpleMessageBox(
-		sdl3.SDL_MESSAGEBOX_ERROR, b"Tauon Music Box failed to start :(",
-		b"Error: " + err + b".\n If you're using Flatpak, try running `$ flatpak update`", None)
+		sdl3.SDL_MESSAGEBOX_ERROR,
+		b"Tauon Music Box failed to start :(",
+		b"Error: " + err + b".\n If you're using Flatpak, try running `$ flatpak update`",
+		None,
+	)
 	sys.exit(1)
 
 window_title = t_title
@@ -376,8 +399,10 @@ def transfer_args_and_exit() -> None:
 t_window = sdl3.SDL_CreateWindow(  # TODO(Taiko): use SDL_CreateWindowAndRenderer()
 	window_title,
 	# o_x, o_y,
-	logical_size[0], logical_size[1],
-	flags)
+	logical_size[0],
+	logical_size[1],
+	flags,
+)
 
 if not t_window:
 	logging.error("ERROR CREATING WINDOW!")
@@ -392,18 +417,20 @@ def transfer_args_and_exit() -> None:
 	if sdl_err and sdl_err.decode() == "x11 not available":
 		x11_path = user_directory / "x11"
 		if x11_path.exists():
-			logging.critical("Disabled Xwayland preference as X11 was not found - Known issue if on Flatpak - https://github.com/Taiko2k/Tauon/issues/1034")
+			logging.critical(
+				"Disabled Xwayland preference as X11 was not found - Known issue if on Flatpak - https://github.com/Taiko2k/Tauon/issues/1034"
+			)
 			x11_path.unlink()
 			# TODO(Martin): This does not seem to work on SDL3, it attempts to relaunch under x11 again
-			#os.environ["SDL_VIDEODRIVER"] = "wayland"
-			#t_window = sdl3.SDL_CreateWindow(
-			#	window_title,
-			#	o_x, o_y,
-			#	logical_size[0], logical_size[1],
-			#	flags)
-			#if not t_window:
-			#	logging.error(f"Failed to create Wayland fallback window - SDL Error: {sdl3.SDL_GetError()}")
-			#	sys.exit(1)
+			# os.environ["SDL_VIDEODRIVER"] = "wayland"
+			# t_window = sdl3.SDL_CreateWindow(
+			# 	window_title,
+			# 	o_x, o_y,
+			# 	logical_size[0], logical_size[1],
+			# 	flags)
+			# if not t_window:
+			# 	logging.error(f"Failed to create Wayland fallback window - SDL Error: {sdl3.SDL_GetError()}")
+			# 	sys.exit(1)
 			sys.exit(1)
 		else:
 			logging.critical(f"Failed to find {x11_path} but got 'x11 not available' error, hm?")
@@ -443,7 +470,9 @@ def transfer_args_and_exit() -> None:
 
 logging.info(f"SDL window system: {sdl3.SDL_GetCurrentVideoDriver().decode()}")
 
-sdl3.SDL_SetRenderVSync(renderer, 1) # 1 == enable vsync, 0 == disable, -1 == late swap tearing, 2 == second vertical refresh
+sdl3.SDL_SetRenderVSync(
+	renderer, 1
+)  # 1 == enable vsync, 0 == disable, -1 == late swap tearing, 2 == second vertical refresh
 
 i_x = pointer(c_int(0))
 i_y = pointer(c_int(0))
@@ -479,8 +508,6 @@ def transfer_args_and_exit() -> None:
 sdl3.SDL_RenderTexture(renderer, texture, None, rect)
 
 
-
-
 sdl3.SDL_RenderPresent(renderer)
 
 sdl3.SDL_DestroySurface(raw_image)

src/tauon/t_modules/t_db_migrate.py

@@ -2,15 +2,16 @@
 
 from __future__ import annotations
 
-import copy
 import logging
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 from tauon.t_modules.t_extra import RadioPlaylist, RadioStation, StarRecord, TauonPlaylist, TauonQueueItem
 
 if TYPE_CHECKING:
-	from tauon.t_modules.t_main import GuiVar, Prefs, StarStore, Tauon, TrackClass
+	from pathlib import Path
+
+	from tauon.t_modules.t_main import GuiVar, Prefs, Tauon, TrackClass
+
 
 def migrate_star_store_71(tauon: Tauon) -> None:
 	import pickle  # noqa: PLC0415
@@ -25,9 +26,7 @@ def migrate_star_store_71(tauon: Tauon) -> None:
 	old_record: list[int | str] = []  # Here just for typing
 	for key, old_record in tauon.star_store.db.items():
 		if isinstance(old_record, StarRecord):
-			logging.warning(
-				f"Record {old_record} was already a StarRecord, skipping this migration over…"
-			)
+			logging.warning(f"Record {old_record} was already a StarRecord, skipping this migration over…")
 			break
 		new_record = StarRecord()
 		new_record.playtime = old_record[0]

src/tauon/t_modules/t_dbus.py

@@ -42,11 +42,11 @@
 
 	from tauon.t_modules.t_main import GuiVar, PlayerCtl, Tauon
 
-class MPRIS(dbus.service.Object):
 
+class MPRIS(dbus.service.Object):
 	def __init__(self, object_path: str, tauon: Tauon) -> None:
-		self.tauon:    Tauon = tauon
-		self.gui:     GuiVar = tauon.gui
+		self.tauon: Tauon = tauon
+		self.gui: GuiVar = tauon.gui
 		self.pctl: PlayerCtl = tauon.pctl
 		bus = dbus.Bus(dbus.Bus.TYPE_SESSION)
 		self.bus_name = dbus.service.BusName("org.mpris.MediaPlayer2.tauon", bus)  # This object must be kept alive
@@ -161,18 +161,12 @@ def update(self, force: bool = False) -> None:
 			self.player_properties["Metadata"] = dbus.Dictionary(d, signature="sv")
 			changed["Metadata"] = self.player_properties["Metadata"]
 
-			if (
-				self.pctl.playing_state == PlayingState.URL_STREAM
-				and self.player_properties["CanPause"] is True
-			):
+			if self.pctl.playing_state == PlayingState.URL_STREAM and self.player_properties["CanPause"] is True:
 				self.player_properties["CanPause"] = False
 				self.player_properties["CanSeek"] = False
 				changed["CanPause"] = self.player_properties["CanPause"]
 				changed["CanSeek"] = self.player_properties["CanSeek"]
-			elif (
-				self.pctl.playing_state == PlayingState.PLAYING
-				and self.player_properties["CanPause"] is False
-			):
+			elif self.pctl.playing_state == PlayingState.PLAYING and self.player_properties["CanPause"] is False:
 				self.player_properties["CanPause"] = True
 				self.player_properties["CanSeek"] = True
 				changed["CanPause"] = self.player_properties["CanPause"]
@@ -208,9 +202,7 @@ def update_shuffle(self) -> None:
 
 	def update_loop(self) -> None:
 		self.player_properties["LoopStatus"] = self.get_loop_status()
-		self.PropertiesChanged(
-			"org.mpris.MediaPlayer2.Player", {"LoopStatus": self.get_loop_status()}, []
-		)
+		self.PropertiesChanged("org.mpris.MediaPlayer2.Player", {"LoopStatus": self.get_loop_status()}, [])
 
 	def get_loop_status(self) -> str:
 		if self.pctl.repeat_mode:
@@ -309,7 +301,7 @@ def Seek(self, offset: int) -> None:
 		self.pctl.seek_time(self.pctl.playing_time + (offset / 1000000))
 
 	@dbus.service.method(dbus_interface="org.mpris.MediaPlayer2.Player")
-	def SetPosition(self, id: int, position: str) -> None:
+	def SetPosition(self, id: str, position: int) -> None:
 		self.pctl.seek_time(position / 1000000)
 
 		self.player_properties["Position"] = dbus.Int64(int(position))

src/tauon/t_modules/t_enums.py

@@ -50,6 +50,7 @@ class GuiMode(IntEnum):
 	MAIN = 1
 	MINI = 3
 
+
 class QueueType(IntEnum):
 	TRACK = 0
 	ALBUM = 1