CommonClient.py: move in gui_enabled

CommonClient.py

@@ -3,6 +3,7 @@ import logging
 import typing
 import asyncio
 import urllib.parse
+import sys
 
 import websockets
 
@@ -14,6 +15,7 @@ from worlds import network_data_package, AutoWorldRegister
 
 logger = logging.getLogger("Client")
 
+gui_enabled = Utils.is_frozen() or "--nogui" not in sys.argv
 
 class ClientCommandProcessor(CommandProcessor):
     def __init__(self, ctx: CommonContext):

FactorioClient.py

@@ -4,14 +4,13 @@ import logging
 import json
 import string
 import copy
-import sys
 import subprocess
 import factorio_rcon
 
 import colorama
 import asyncio
 from queue import Queue
-from CommonClient import CommonContext, server_loop, console_loop, ClientCommandProcessor, logger
+from CommonClient import CommonContext, server_loop, console_loop, ClientCommandProcessor, logger, gui_enabled
 from MultiServer import mark_raw
 
 import Utils
@@ -22,16 +21,14 @@ from worlds.factorio import Factorio
 
 os.makedirs("logs", exist_ok=True)
 
-# Log to file in gui case
-if getattr(sys, "frozen", False) and not "--nogui" in sys.argv:
+
+if gui_enabled:
     logging.basicConfig(format='[%(name)s]: %(message)s', level=logging.INFO,
                         filename=os.path.join("logs", "FactorioClient.txt"), filemode="w", force=True)
 else:
     logging.basicConfig(format='[%(name)s]: %(message)s', level=logging.INFO, force=True)
     logging.getLogger().addHandler(logging.FileHandler(os.path.join("logs", "FactorioClient.txt"), "w"))
 
-gui_enabled = Utils.is_frozen() or "--nogui" not in sys.argv
-
 
 class FactorioCommandProcessor(ClientCommandProcessor):
     ctx: FactorioContext

LttPClient.py

@@ -3,7 +3,6 @@ import atexit
 exit_func = atexit.register(input, "Press enter to close.")
 import threading
 import time
-import sys
 import multiprocessing
 import os
 import subprocess
@@ -25,7 +24,7 @@ from NetUtils import *
 from worlds.alttp import Regions, Shops
 from worlds.alttp import Items
 import Utils
-from CommonClient import CommonContext, server_loop, console_loop, ClientCommandProcessor
+from CommonClient import CommonContext, server_loop, console_loop, ClientCommandProcessor, gui_enabled
 
 snes_logger = logging.getLogger("SNES")
 
@@ -34,7 +33,7 @@ from MultiServer import mark_raw
 os.makedirs("logs", exist_ok=True)
 
 # Log to file in gui case
-if getattr(sys, "frozen", False) and not "--nogui" in sys.argv:
+if gui_enabled:
     logging.basicConfig(format='[%(name)s]: %(message)s', level=logging.INFO,
                         filename=os.path.join("logs", "LttPClient.txt"), filemode="w", force=True)
 else:
@@ -901,7 +900,7 @@ async def main():
     if ctx.server_task is None:
         ctx.server_task = asyncio.create_task(server_loop(ctx), name="ServerLoop")
 
-    if Utils.is_frozen() or "--nogui" not in sys.argv:
+    if gui_enabled:
         input_task = None
         from kvui import LttPManager
         ctx.ui = LttPManager(ctx)