2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Fix SDIO launcher when SDIO_SERVER not defined

Browse source
This commit is contained in:
2Shirt 2022-10-22 20:35:05 -07:00
parent 1f984f5b77
commit 5c6c123daa
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
scripts/launch_sdio.py
View file

@ -7,7 +7,7 @@ import sys
os.chdir(os.path.dirname(os.path.realpath(__file__))) os.chdir(os.path.dirname(os.path.realpath(__file__)))
sys.path.append(os.getcwd()) sys.path.append(os.getcwd())
import wk # pylint: disable=wrong-import-position import wk # pylint: disable=wrong-import-position
from wk.cfg.net import SDIO_SERVER from wk.cfg.net import SDIO_SERVER # pylint: disable=wrong-import-position
# STATIC VARIABLES # STATIC VARIABLES
MOUNT_EXCEPTIONS = ( MOUNT_EXCEPTIONS = (
@ -35,11 +35,16 @@ def try_again():
def use_network_sdio(): def use_network_sdio():
"""Try to mount SDIO server.""" """Try to mount SDIO server."""
use_network = False
def _mount_server(): def _mount_server():
print('Connecting to server... (Press CTRL+c to use local copy)') print('Connecting to server... (Press CTRL+c to use local copy)')
return wk.net.mount_network_share(SDIO_SERVER, read_write=False) return wk.net.mount_network_share(SDIO_SERVER, read_write=False)
use_network = False # Bail early
if not SDIO_SERVER['Address']:
return use_network
# Main loop
while True: while True:
try: try:
proc = _mount_server() proc = _mount_server()
@ -67,20 +72,20 @@ def use_network_sdio():
if __name__ == '__main__': if __name__ == '__main__':
wk.std.set_title(f'{wk.cfg.main.KIT_NAME_FULL}: Snappy Driver Installer Origin Launcher') wk.std.set_title(f'{wk.cfg.main.KIT_NAME_FULL}: Snappy Driver Installer Origin Launcher')
log_dir = wk.log.format_log_path(tool=True).parent log_dir = wk.log.format_log_path(tool=True).parent
use_network = False USE_NETWORK = False
# Try to mount server # Try to mount server
try: try:
use_network = use_network_sdio() USE_NETWORK = use_network_sdio()
except KeyboardInterrupt: except KeyboardInterrupt:
wk.std.abort() wk.std.abort()
# Run SDIO # Run SDIO
exe_path = SDIO_LOCAL_PATH EXE_PATH = SDIO_LOCAL_PATH
if use_network: if USE_NETWORK:
exe_path = SDIO_REMOTE_PATH EXE_PATH = SDIO_REMOTE_PATH
print('Using network copy!') print('Using network copy!')
else: else:
print('Using local copy!') print('Using local copy!')
cmd = [exe_path, '-log_dir', log_dir] cmd = [EXE_PATH, '-log_dir', log_dir]
wk.exe.run_program(cmd, check=False, cwd=exe_path.parent) wk.exe.run_program(cmd, check=False, cwd=EXE_PATH.parent)

10
scripts/wk/cfg/net.py
View file

@ -29,11 +29,11 @@ CRASH_SERVER = {
#'Headers': {'X-Requested-With': 'XMLHttpRequest'}, #'Headers': {'X-Requested-With': 'XMLHttpRequest'},
} }
SDIO_SERVER = { SDIO_SERVER = {
#'Address': '10.0.0.10', 'Address': '',
#'Share': 'Share', 'Share': '',
#'Path': 'SDIO', 'Path': '',
#'RO-User': '', 'RO-User': '',
#'RO-Pass': '', 'RO-Pass': '',
} }