Huge GUI update

main.py

@@ -1,51 +1,18 @@
 from __future__ import annotations
 
-__version__ = 4
-
-import sys
-import json
-import ctypes
 import logging
-import asyncio
 import argparse
-import warnings
-import traceback
-import threading
-from typing import NoReturn
+from typing import Optional
 
 from twitch import Twitch
-from constants import JsonType, SETTINGS_PATH, TERMINATED_STR
-
-try:
-    import win32api
-    from win32con import CTRL_CLOSE_EVENT, CTRL_LOGOFF_EVENT, CTRL_SHUTDOWN_EVENT
-except (ImportError, ModuleNotFoundError):
-    raise ImportError("You have to run 'python -m pip install pywin32' first")
-
-# disable some warnings
-warnings.simplefilter("ignore", RuntimeWarning)
-warnings.simplefilter("ignore", DeprecationWarning)
-# nice console title
-try:
-    ctypes.windll.kernel32.SetConsoleTitleW(f"Twitch Drops Miner v{__version__} (by DevilXD)")
-except AttributeError:
-    # ensure we're on windows and there was no import problems
-    print("Only Windows supported!")
-    quit()
-assert sys.platform == "win32"
-
-
-def terminate() -> NoReturn:
-    forever = threading.Event()
-    print(f"\n{TERMINATED_STR}")
-    forever.wait()
-    raise RuntimeError("Uh oh")  # this will never run, solely for MyPy
+from version import __version__
 
 
 class ParsedArgs(argparse.Namespace):
     _verbose: int
     _debug_ws: bool
     _debug_gql: bool
+    game: Optional[str]
 
     @property
     def logging_level(self) -> int:
@@ -87,6 +54,7 @@ parser.add_argument("-V", "--version", action="version", version=f"v{__version__
 parser.add_argument("-v", dest="_verbose", action="count", default=0)
 parser.add_argument("--debug-ws", dest="_debug_ws", action="store_true")
 parser.add_argument("--debug-gql", dest="_debug_gql", action="store_true")
+parser.add_argument("-g", "--game", default=None)
 options: ParsedArgs = parser.parse_args(namespace=ParsedArgs())
 # handle logging stuff
 if options.logging_level > logging.DEBUG:
@@ -94,62 +62,9 @@ if options.logging_level > logging.DEBUG:
     # that aren't ours. This always runs, unless the main logging level is DEBUG or below.
     logging.getLogger().addHandler(logging.NullHandler())
 logger = logging.getLogger("TwitchDrops")
-handler = logging.StreamHandler(sys.stdout)
-handler.setFormatter(logging.Formatter("{levelname}: {message}", style='{'))
-logger.addHandler(handler)
 logger.setLevel(options.logging_level)
 logging.getLogger("TwitchDrops.gql").setLevel(options.debug_gql)
 logging.getLogger("TwitchDrops.websocket").setLevel(options.debug_ws)
-# handle settings
-try:
-    with open(SETTINGS_PATH, 'r', encoding="utf8") as file:
-        settings: JsonType = json.load(file)
-except json.JSONDecodeError as exc:
-    print(f"Error while reading the settings file:\n{str(exc)}")
-    terminate()
-except FileNotFoundError:
-    settings = {}
-# asyncio loop
-loop = asyncio.get_event_loop()
-# client init
-client = Twitch(settings.get("username"), settings.get("password"))
-# main task and it's close event
-main_task = loop.create_task(client.run(settings.get("channels")))
-close_event = threading.Event()
-
-
-def clean_exit(code: int):
-    if code not in (CTRL_CLOSE_EVENT, CTRL_LOGOFF_EVENT, CTRL_SHUTDOWN_EVENT):
-        # filter only events we want
-        return False
-    # cancel the main task - this triggers the cleanup
-    main_task.cancel()
-    # wait until cleanup completes
-    close_event.wait()
-    # tell OS that we're free to exit now
-    return True
-
-
-# ensures clean exit upon closing the console
-win32api.SetConsoleCtrlHandler(clean_exit, True)
-try:
-    loop.run_until_complete(main_task)
-except (asyncio.CancelledError, KeyboardInterrupt):
-    # KeyboardInterrupt causes run_until_complete to exit, but without cancelling the task.
-    # The loop stops and thus the task gets frozen, until the loop runs again.
-    # Because we don't want anything from there to actually run during cleanup,
-    # we need to explicitly cancel the task ourselves here.
-    main_task.cancel()
-    # main_task was cancelled due to program shutting down - do the cleanup
-    loop.run_until_complete(client.close())
-    # notify we're free to exit
-    close_event.set()
-except Exception:
-    # Remove the handler so it doesn't delay exit
-    win32api.SetConsoleCtrlHandler(clean_exit, False)
-    print("Fatal error encountered:\n")
-    traceback.print_exc()
-    terminate()
-finally:
-    loop.run_until_complete(loop.shutdown_asyncgens())
-    loop.close()
+# client run
+client = Twitch(options)
+client.start()