More typing and simplify TDraw system checks

src/tauon/t_modules/t_draw.py

@@ -26,8 +26,8 @@
 from ctypes import c_int, pointer
 from typing import TYPE_CHECKING
 
-from PIL import Image
 import sdl3
+from PIL import Image
 
 from tauon.t_modules.t_extra import Timer, alpha_blend, coll_rect
 
@@ -50,23 +50,23 @@
 	import os
 	os.environ["PANGOCAIRO_BACKEND"] = "fc"
 
-if system == "Linux":
-	import struct
-
-	import cairo
-	import gi
-	gi.require_version("Pango", "1.0")
-	gi.require_version("PangoCairo", "1.0")
-	from gi.repository import Pango, PangoCairo
+#if system == "Linux":
+import struct
 
-else:
-	import struct
-	from ctypes import CFUNCTYPE, POINTER, byref, c_void_p, windll
+import cairo
+import gi
+gi.require_version("Pango", "1.0")
+gi.require_version("PangoCairo", "1.0")
+from gi.repository import Pango, PangoCairo
 
-	import win32api
-	import win32con
-	import win32gui
-	import win32ui
+#else:
+#	import struct
+#	from ctypes import CFUNCTYPE, POINTER, byref, c_void_p, windll
+#
+#	import win32api
+#	import win32con
+#	import win32gui
+#	import win32ui
 
 
 
@@ -135,7 +135,7 @@ def draw(self, x: int, y: int) -> bool | None:
 		return True
 
 # TODO(Martin): This block never executes - https://github.com/Taiko2k/Tauon/issues/1318
-if system == "Windows":
+if sys.platform == "win32":
 	class RECT(ctypes.Structure):
 		_fields_ = [
 			("left", ctypes.c_long),
@@ -304,7 +304,7 @@ def __del__(self) -> None:
 
 class TDraw:
 
-	def __init__(self, renderer: sdl3.SDL_Renderer | None = None) -> None:
+	def __init__(self, renderer: sdl3.LP_SDL_Renderer | None = None) -> None:
 
 		# All
 		self.renderer = renderer

src/tauon/t_modules/t_main.py

@@ -4573,8 +4573,8 @@ class MenuItem:
 		"sub_menu_width",  # 14
 	]
 	def __init__(
-		self, title, func, render_func=None, no_exit=False, pass_ref=False, hint=None, icon=None, show_test=None,
-		pass_ref_deco=False, disable_test=None, set_ref=None, is_sub_menu=False, args=None, sub_menu_number=None, sub_menu_width=0,
+		self, title: str, func, render_func=None, no_exit=False, pass_ref=False, hint=None, icon=None, show_test=None,
+		pass_ref_deco: bool = False, disable_test=None, set_ref=None, is_sub_menu: bool = False, args=None, sub_menu_number=None, sub_menu_width: int = 0,
 	):
 		self.title = title
 		self.is_sub_menu = is_sub_menu
@@ -4718,7 +4718,7 @@ def is_item_disabled(self, item):
 			return item.disable_test()
 		return None
 
-	def render_icon(self, x: float, y: float, icon, selected, fx):
+	def render_icon(self, x: float, y: float, icon: MenuIcon | None, selected: bool, fx) -> None:
 		colours = self.colours
 		gui     = self.gui
 		if colours.lm:
@@ -5259,7 +5259,7 @@ def worker_render(self) -> bool:
 			return True
 		return False
 
-	def render(self, track: TrackClass, location, size=None, force_offset=None) -> bool | None:
+	def render(self, track: TrackClass, location, size: int | None = None, force_offset=None) -> bool | None:
 		if self.tauon.gallery_load_delay.get() < 0.5:
 			return None
 
@@ -6302,19 +6302,19 @@ def fix_encoding(self, index: int, mode: int, enc :str) -> None:
 			if old_star is not None:
 				self.star_store.remove(todo[q])
 
-			if enc_field == "All" or enc_field == "Artist":
+			if enc_field in ("All", "Artist"):
 				line = self.pctl.master_library[todo[q]].artist
 				line = line.encode("Latin-1", "ignore")
 				line = line.decode(enc, "ignore")
 				self.pctl.master_library[todo[q]].artist = line
 
-			if enc_field == "All" or enc_field == "Album":
+			if enc_field in ("All", "Album"):
 				line = self.pctl.master_library[todo[q]].album
 				line = line.encode("Latin-1", "ignore")
 				line = line.decode(enc, "ignore")
 				self.pctl.master_library[todo[q]].album = line
 
-			if enc_field == "All" or enc_field == "Title":
+			if enc_field in ("All", "Title"):
 				line = self.pctl.master_library[todo[q]].title
 				line = line.encode("Latin-1", "ignore")
 				line = line.decode(enc, "ignore")
@@ -7137,7 +7137,7 @@ def finish_current(self) -> None:
 				self.pctl.playlist_playing_position,
 				self.pctl.pl_to_id(self.pctl.active_playlist_playing), 1, 1))
 
-	def add_album_to_queue(self, ref, position=None, playlist_id=None) -> None:
+	def add_album_to_queue(self, ref: int, position: int | None = None, playlist_id: int | None = None) -> None:
 		if position is None:
 			position = self.pctl.r_menu_position
 		if playlist_id is None:
@@ -7155,7 +7155,7 @@ def add_album_to_queue(self, ref, position=None, playlist_id=None) -> None:
 		if self.prefs.stop_end_queue:
 			self.pctl.auto_stop = False
 
-	def add_album_to_queue_fc(self, ref) -> None:
+	def add_album_to_queue_fc(self, ref: int) -> None:
 		playing_object = self.pctl.playing_object()
 		if playing_object is None:
 			self.show_message("")
@@ -7206,7 +7206,7 @@ def cancel_import(self) -> None:
 			self.gui.stop_sync = True
 			self.gui.sync_progress = _("Aborting Sync")
 
-	def toggle_lyrics_show(self, a) -> bool:
+	def toggle_lyrics_show(self, _) -> bool:
 		return not self.gui.combo_mode
 
 	def toggle_side_art_deco(self):
@@ -7221,7 +7221,7 @@ def toggle_side_art_deco(self):
 
 		return [colour, self.colours.menu_background, line]
 
-	def toggle_lyrics_panel_position_deco(self):
+	def toggle_lyrics_panel_position_deco(self) -> list[list[int] | str | None]:
 		colour = self.colours.menu_text
 		if self.prefs.lyric_metadata_panel_top:
 			line = _("Panel Below Lyrics")
@@ -7242,7 +7242,7 @@ def lyrics_in_side_show(self, track_object: TrackClass) -> bool:
 	def toggle_side_art(self) -> None:
 		self.prefs.show_side_lyrics_art_panel ^= True
 
-	def toggle_lyrics_deco(self, track_object: TrackClass):
+	def toggle_lyrics_deco(self, track_object: TrackClass) -> list[list[int] | str | None]:
 		colour = self.colours.menu_text
 
 		if self.gui.combo_mode:
@@ -7427,7 +7427,7 @@ def toggle_synced_lyrics_deco(self, track):
 
 		return [line_colour, self.colours.menu_background, text]
 
-	def paste_lyrics_deco(self):
+	def paste_lyrics_deco(self) -> list[list[int] | None]:
 		if sdl3.SDL_HasClipboardText():
 			line_colour = self.colours.menu_text
 		else:
@@ -7438,7 +7438,7 @@ def paste_lyrics_deco(self):
 	def chord_lyrics_paste_show_test(self, _) -> bool:
 		return self.gui.combo_mode and self.prefs.guitar_chords
 
-	def copy_lyrics_deco(self, track_object: TrackClass):
+	def copy_lyrics_deco(self, track_object: TrackClass) -> list[list[int] | None]:
 		if track_object.lyrics:
 			line_colour = self.colours.menu_text
 		else:
@@ -7547,7 +7547,7 @@ def cycle_image_deco(self, track_object: TrackClass):
 
 		return [line_colour, self.colours.menu_background, None]
 
-	def cycle_image_gal_deco(self, track_object: TrackClass | int):
+	def cycle_image_gal_deco(self, track_object: TrackClass | int) -> list[list[int] | None]:
 		if type(track_object) is int:
 			track_object = self.pctl.master_library[track_object]
 		info = self.album_art_gen.get_info(track_object)
@@ -9866,7 +9866,7 @@ def toggle_spotify_like_row_deco(self):
 
 		return [self.colours.menu_text, self.colours.menu_background, text]
 
-	def spot_like_show_test(self, x) -> bool:
+	def spot_like_show_test(self, _) -> bool:
 		return self.spotify_show_test and self.pctl.get_track(self.pctl.r_menu_index).file_ext == "SPTY"
 
 	def spot_heart_menu_colour(self) -> list[int] | None:
@@ -10710,10 +10710,10 @@ def key_hl(self, index: int) -> int:
 			return 0
 		return 1
 
-	def sort_dec(self, h) -> None:
+	def sort_dec(self, h: int) -> None:
 		self.sort_ass(h, True)
 
-	def sort_ass(self, h, invert: bool = False, custom_list=None, custom_name: str = "") -> None:
+	def sort_ass(self, h: int, invert: bool = False, custom_list: list[int] | None = None, custom_name: str = "") -> None:
 		if custom_list is None:
 			if self.pl_is_locked(self.pctl.active_playlist_viewing):
 				self.show_message(_("Playlist is locked"))
@@ -12735,7 +12735,7 @@ def open_encode_out(self) -> None:
 			else:
 				subprocess.Popen(["xdg-open", self.prefs.encoder_output])
 
-	def g_open_encode_out(self, a, b, c) -> None:
+	def g_open_encode_out(self, _a, _b, _c) -> None:
 		self.open_encode_out()
 
 	def hide_set_bar(self) -> None:
@@ -12884,7 +12884,7 @@ def import_spotify_playlist(self) -> None:
 			self.reload_albums()
 		self.gui.pl_update += 1
 
-	def import_spotify_playlist_deco(self):
+	def import_spotify_playlist_deco(self) -> list[list[int] | None]:
 		clip = copy_from_clipboard()
 		if clip.startswith(("https://open.spotify.com/playlist/", "spotify:playlist:")):
 			return [self.colours.menu_text, self.colours.menu_background, None]