monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CommonClient.py: move in gui_enabled

This commit is contained in:
Fabian Dill 2021-08-20 22:31:17 +02:00
parent 72610d8c2f
commit 6dc2000638
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CommonClient.py
View File

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

9
FactorioClient.py
View File

@ -4,14 +4,13 @@ import logging
import json import json
import string import string
import copy import copy
import sys
import subprocess import subprocess
import factorio_rcon import factorio_rcon
import colorama import colorama
import asyncio import asyncio
from queue import Queue 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 from MultiServer import mark_raw
import Utils import Utils
@ -22,16 +21,14 @@ from worlds.factorio import Factorio
os.makedirs("logs", exist_ok=True) 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, logging.basicConfig(format='[%(name)s]: %(message)s', level=logging.INFO,
filename=os.path.join("logs", "FactorioClient.txt"), filemode="w", force=True) filename=os.path.join("logs", "FactorioClient.txt"), filemode="w", force=True)
else: else:
logging.basicConfig(format='[%(name)s]: %(message)s', level=logging.INFO, force=True) logging.basicConfig(format='[%(name)s]: %(message)s', level=logging.INFO, force=True)
logging.getLogger().addHandler(logging.FileHandler(os.path.join("logs", "FactorioClient.txt"), "w")) 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): class FactorioCommandProcessor(ClientCommandProcessor):
ctx: FactorioContext ctx: FactorioContext

7
LttPClient.py
View File

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