Wrap main

Author: C0rn3j

src/tauon/__main__.py

@@ -31,7 +31,7 @@
 
 from tauon.t_modules.logging import CustomLoggingFormatter, LogHistoryHandler
 
-from tauon.t_modules import t_bootstrap
+from tauon.t_modules.t_bootstrap import Holder
 
 
 log = LogHistoryHandler()
@@ -413,32 +413,33 @@ def transfer_args_and_exit() -> None:
 sdl3.SDL_DestroySurface(raw_image)
 sdl3.SDL_DestroyTexture(texture)
 
-holder                        = t_bootstrap.holder
-holder.t_window               = t_window
-holder.renderer               = renderer
-holder.logical_size           = logical_size
-holder.window_size            = window_size
-holder.window_default_size    = window_default_size
-holder.scale                  = scale
-holder.maximized              = maximized
-holder.transfer_args_and_exit = transfer_args_and_exit
-holder.draw_border            = draw_border
-holder.window_opacity         = window_opacity
-holder.old_window_position    = old_window_position
-holder.install_directory      = install_directory
-holder.user_directory         = user_directory
-holder.pyinstaller_mode       = pyinstaller_mode
-holder.phone                  = phone
-holder.window_title           = window_title
-holder.fs_mode                = fs_mode
-holder.t_title                = t_title
-holder.n_version              = n_version
-holder.t_version              = t_version
-holder.t_id                   = t_id
-holder.t_agent                = t_agent
-holder.dev_mode               = dev_mode
-holder.instance_lock          = fp
-holder.log                    = log
+holder = Holder(
+	t_window=t_window,
+	renderer=renderer,
+	logical_size=logical_size,
+	window_size=window_size,
+	window_default_size=window_default_size,
+	scale=scale,
+	maximized=maximized,
+	transfer_args_and_exit=transfer_args_and_exit,
+	draw_border=draw_border,
+	window_opacity=window_opacity,
+	old_window_position=old_window_position,
+	install_directory=install_directory,
+	user_directory=user_directory,
+	pyinstaller_mode=pyinstaller_mode,
+	phone=phone,
+	window_title=window_title,
+	fs_mode=fs_mode,
+	t_title=t_title,
+	n_version=n_version,
+	t_version=t_version,
+	t_id=t_id,
+	t_agent=t_agent,
+	dev_mode=dev_mode,
+	instance_lock=fp,
+	log=log,
+)
 
 del raw_image
 del texture
@@ -451,7 +452,8 @@ def transfer_args_and_exit() -> None:
 
 def main() -> None:
 	"""Launch Tauon by means of importing t_main.py"""
-	from tauon.t_modules import t_main
+	from tauon.t_modules.t_main import main as t_main
+	t_main(holder)
 
 if __name__ == "__main__":
 	main()

src/tauon/t_modules/t_bootstrap.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-#from dataclasses import dataclass
+from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -11,7 +11,7 @@
 
 	from tauon.__main__ import LogHistoryHandler
 
-#@dataclass
+@dataclass
 class Holder:
 	"""Class that holds variables for forwarding them from __main__.py to t_main.py"""
 
@@ -40,5 +40,3 @@ class Holder:
 	dev_mode:               bool
 	instance_lock:          TextIOWrapper | None
 	log:                    LogHistoryHandler
-
-holder = Holder()