Merge pull request #1638 from C0rn3j/prep-for-wrap

Consolidate imports

Author: Taiko2k

src/tauon/t_modules/t_main.py

@@ -188,6 +188,61 @@
 	import gi
 	from gi.repository import GLib
 
+# Log to debug as we don't care at all when user does not have this
+try:
+	import colored_traceback.always
+	logging.debug("Found colored_traceback for colored crash tracebacks")
+except ModuleNotFoundError:
+	logging.debug("Unable to import colored_traceback, tracebacks will be dull.")
+except Exception:
+	logging.warning("Error trying to import colored_traceback, tracebacks will be dull.")
+
+try:
+	from jxlpy import JXLImagePlugin
+	# We've already logged this once to INFO from t_draw, so just log to DEBUG
+	logging.debug("Found jxlpy for JPEG XL support")
+except ModuleNotFoundError:
+	logging.warning("Unable to import jxlpy, JPEG XL support will be disabled.")
+except Exception:
+	logging.exception("Unknown error trying to import jxlpy, JPEG XL support will be disabled.")
+
+try:
+	import setproctitle
+except ModuleNotFoundError:
+	logging.warning("Unable to import setproctitle, won't be setting process title.")
+except Exception:
+	logging.exception("Unknown error trying to import setproctitle, won't be setting process title.")
+else:
+	setproctitle.setproctitle("tauonmb")
+
+# try:
+#	 import rpc
+#	 discord_allow = True
+# except Exception:
+#	logging.exception("Unable to import rpc, Discord Rich Presence will be disabled.")
+try:
+	from lynxpresence import Presence, ActivityType
+except ModuleNotFoundError:
+	logging.warning("Unable to import lynxpresence, Discord Rich Presence will be disabled.")
+except Exception:
+	logging.exception("Unknown error trying to import lynxpresence, Discord Rich Presence will be disabled.")
+else:
+	import asyncio
+
+try:
+	import opencc
+except ModuleNotFoundError:
+	logging.warning("Unable to import opencc, Traditional and Simplified Chinese searches will not be usable interchangeably.")
+except Exception:
+	logging.exception("Unknown error trying to import opencc, Traditional and Simplified Chinese searches will not be usable interchangeably.")
+
+try:
+	import natsort
+except ModuleNotFoundError:
+	logging.warning("Unable to import natsort, playlists may not sort as intended!")
+except Exception:
+	logging.exception("Unknown error trying to import natsort, playlists may not sort as intended!")
+
 if TYPE_CHECKING:
 	from ctypes import CDLL
 	from io import BufferedReader, BytesIO
@@ -202,6 +257,44 @@
 	from pylast import LastFMNetwork
 	from collections.abc import Callable
 
+# Detect platform
+macos = False
+msys = False
+system = "Linux"
+arch = platform.machine()
+platform_release = platform.release()
+platform_system = platform.system()
+win_ver = 0
+if platform_system == "Windows":
+	try:
+		win_ver = int(platform_release)
+	except Exception:
+		logging.exception("Failed getting Windows version from platform.release()")
+
+if sys.platform == "win32":
+	# system = 'Windows'
+	system = "Linux"
+	msys = True
+	if msys:
+		import gi
+		from gi.repository import GLib
+	else:
+		import win32con
+		import win32api
+		import win32gui
+		import win32ui
+		import comtypes
+		import atexit
+else:
+	system = "Linux"
+	import fcntl
+
+if sys.platform == "darwin":
+	macos = True
+
+if system == "Linux" and not macos and not msys:
+	from tauon.t_modules.t_dbus import Gnome
+
 CONTROL_CHAR_RE = re.compile(r"[\x00-\x08\x0B\x0C\x0E-\x1F]")
 
 class LoadImageAsset:
@@ -5390,6 +5483,9 @@ class Tauon:
 	"""Root class for everything Tauon"""
 
 	def __init__(self, holder: Holder, bag: Bag, gui: GuiVar) -> None:
+		self.use_cc                       = is_module_loaded("opencc")
+		self.use_natsort                  = is_module_loaded("natsort")
+
 		self.bag                          = bag
 		self.mpt                          = bag.mpt
 		self.gme                          = bag.gme
@@ -5410,7 +5506,6 @@ def __init__(self, holder: Holder, bag: Bag, gui: GuiVar) -> None:
 		self.download_directories         = bag.download_directories
 		self.launch_prefix                = bag.launch_prefix
 		self.overlay_texture_texture      = bag.overlay_texture_texture
-		self.use_natsort                  = bag.use_natsort
 		self.de_notify_support            = bag.de_notify_support
 		self.old_window_position          = bag.old_window_position
 		self.cache_directory              = bag.dirs.cache_directory
@@ -16684,7 +16779,7 @@ def key_fullpath(self, index: int):
 	def sort_path_pl(self, pl: int, custom_list: list[int] | None = None) -> None:
 		target = self.pctl.multi_playlist[pl].playlist_ids if custom_list is None else custom_list
 
-		if self.bag.use_natsort and False:
+		if self.use_natsort and False:
 			target[:] = natsort.os_sorted(target, key=self.key_fullpath)
 		else:
 			target.sort(key=self.key_filepath)
@@ -36132,7 +36227,6 @@ class Bag:
 	last_fm_enable:          bool
 	de_notify_support:       bool
 	wayland:                 bool
-	use_natsort:             bool
 	should_save_state:       bool
 	desktop:                 str | None
 	system:                  str
@@ -36186,7 +36280,12 @@ class Formats:
 	Archive: set[str]
 
 
-def is_module_loaded(module_name: str) -> bool:
+def is_module_loaded(module_name: str, object_name: str = "") -> bool:
+	"""Check if a module is loaded, to determine which features we should enable
+
+	See https://stackoverflow.com/a/30483269/8962143 for more details"""
+	if object_name:
+		return module_name in sys.modules and object_name in sys.modules[module_name]
 	return module_name in sys.modules
 
 def get_cert_path(holder: Holder) -> str:
@@ -37481,6 +37580,9 @@ def worker4(tauon: Tauon) -> None:
 			return
 
 def worker2(tauon: Tauon) -> None:
+	if tauon.use_cc:
+		s2t = opencc.OpenCC("s2t")
+		t2s = opencc.OpenCC("t2s")
 	search_over = tauon.search_over
 	while True:
 		tauon.worker2_lock.acquire()
@@ -37552,7 +37654,7 @@ def worker2(tauon: Tauon) -> None:
 					year_mode = True
 
 				cn_mode = False
-				if use_cc and re.search(r"[\u4e00-\u9fff\u3400-\u4dbf\u20000-\u2a6df\u2a700-\u2b73f\u2b740-\u2b81f\u2b820-\u2ceaf\uf900-\ufaff\u2f800-\u2fa1f]", o_text):
+				if tauon.use_cc and re.search(r"[\u4e00-\u9fff\u3400-\u4dbf\u20000-\u2a6df\u2a700-\u2b73f\u2b740-\u2b81f\u2b820-\u2ceaf\uf900-\ufaff\u2f800-\u2fa1f]", o_text):
 					t_cn = s2t.convert(o_text)
 					s_cn = t2s.convert(o_text)
 					cn_mode = True
@@ -38374,7 +38476,7 @@ def gets(direc: str, force_scan: bool = False) -> None:
 
 		try:
 			items_in_dir = os.listdir(direc)
-			if use_natsort:
+			if tauon.use_natsort:
 				items_in_dir = natsort.os_sorted(items_in_dir)
 			else:
 				items_in_dir.sort()
@@ -38803,111 +38905,6 @@ def menu_is_open() -> bool:
 			return True
 	return False
 
-# BEGIN CODE
-
-# Log to debug as we don't care at all when user does not have this
-try:
-	import colored_traceback.always
-	logging.debug("Found colored_traceback for colored crash tracebacks")
-except ModuleNotFoundError:
-	logging.debug("Unable to import colored_traceback, tracebacks will be dull.")
-except Exception:
-	logging.warning("Error trying to import colored_traceback, tracebacks will be dull.")
-
-try:
-	from jxlpy import JXLImagePlugin
-	# We've already logged this once to INFO from t_draw, so just log to DEBUG
-	logging.debug("Found jxlpy for JPEG XL support")
-except ModuleNotFoundError:
-	logging.warning("Unable to import jxlpy, JPEG XL support will be disabled.")
-except Exception:
-	logging.exception("Unknown error trying to import jxlpy, JPEG XL support will be disabled.")
-
-try:
-	import setproctitle
-except ModuleNotFoundError:
-	logging.warning("Unable to import setproctitle, won't be setting process title.")
-except Exception:
-	logging.exception("Unknown error trying to import setproctitle, won't be setting process title.")
-else:
-	setproctitle.setproctitle("tauonmb")
-
-# try:
-#	 import rpc
-#	 discord_allow = True
-# except Exception:
-#	logging.exception("Unable to import rpc, Discord Rich Presence will be disabled.")
-discord_allow = False
-try:
-	from lynxpresence import Presence, ActivityType
-except ModuleNotFoundError:
-	logging.warning("Unable to import lynxpresence, Discord Rich Presence will be disabled.")
-except Exception:
-	logging.exception("Unknown error trying to import lynxpresence, Discord Rich Presence will be disabled.")
-else:
-	import asyncio
-	discord_allow = True
-
-use_cc = False
-try:
-	import opencc
-except ModuleNotFoundError:
-	logging.warning("Unable to import opencc, Traditional and Simplified Chinese searches will not be usable interchangeably.")
-except Exception:
-	logging.exception("Unknown error trying to import opencc, Traditional and Simplified Chinese searches will not be usable interchangeably.")
-else:
-	s2t = opencc.OpenCC("s2t")
-	t2s = opencc.OpenCC("t2s")
-	use_cc = True
-
-use_natsort = False
-try:
-	import natsort
-except ModuleNotFoundError:
-	logging.warning("Unable to import natsort, playlists may not sort as intended!")
-except Exception:
-	logging.exception("Unknown error trying to import natsort, playlists may not sort as intended!")
-else:
-	use_natsort = True
-
-# Detect platform
-macos = False
-msys = False
-system = "Linux"
-arch = platform.machine()
-platform_release = platform.release()
-platform_system = platform.system()
-win_ver = 0
-if platform_system == "Windows":
-	try:
-		win_ver = int(platform_release)
-	except Exception:
-		logging.exception("Failed getting Windows version from platform.release()")
-
-if sys.platform == "win32":
-	# system = 'Windows'
-	system = "Linux"
-	msys = True
-	if msys:
-		import gi
-		from gi.repository import GLib
-	else:
-		import win32con
-		import win32api
-		import win32gui
-		import win32ui
-		import comtypes
-		import atexit
-else:
-	system = "Linux"
-	import fcntl
-
-if sys.platform == "darwin":
-	macos = True
-
-if system == "Linux" and not macos and not msys:
-	from tauon.t_modules.t_dbus import Gnome
-
 holder                 = t_bootstrap.holder
 t_window               = holder.t_window
 renderer               = holder.renderer
@@ -38937,7 +38934,6 @@ def menu_is_open() -> bool:
 logging.info(f"Window size: {window_size}; Logical size: {logical_size}")
 
 tls_context = setup_tls(holder)
-
 try:
 	# Pylast needs to be imported AFTER setup_tls() else pyinstaller breaks
 	import pylast
@@ -38946,11 +38942,13 @@ def menu_is_open() -> bool:
 	logging.exception("PyLast module not found, last fm will be disabled.")
 	last_fm_enable = False
 
+discord_allow = is_module_loaded("lynxpresence", "ActivityType")
+ctypes = sys.modules.get("ctypes")  # Fetch from loaded modules
+
 if sys.platform == "win32" and msys:
 	font_folder = str(install_directory / "fonts")
 	if os.path.isdir(font_folder):
 		logging.info(f"Fonts directory:           {font_folder}")
-		import ctypes
 
 		fc = ctypes.cdll.LoadLibrary("libfontconfig-1.dll")
 		fc.FcConfigReference.restype = ctypes.c_void_p
@@ -39498,7 +39496,6 @@ def menu_is_open() -> bool:
 	mac_minimize=mac_minimize,
 	msys=msys,
 	phone=phone,
-	use_natsort=use_natsort,
 	should_save_state=True,
 	old_window_position=old_window_position,
 	xdpi=xdpi,