Fix SDIO launcher when SDIO_SERVER not defined
This commit is contained in:
parent
1f984f5b77
commit
5c6c123daa
2 changed files with 19 additions and 14 deletions
|
|
@ -7,7 +7,7 @@ import sys
|
|||
os.chdir(os.path.dirname(os.path.realpath(__file__)))
|
||||
sys.path.append(os.getcwd())
|
||||
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
|
||||
MOUNT_EXCEPTIONS = (
|
||||
|
|
@ -35,11 +35,16 @@ def try_again():
|
|||
|
||||
def use_network_sdio():
|
||||
"""Try to mount SDIO server."""
|
||||
use_network = False
|
||||
def _mount_server():
|
||||
print('Connecting to server... (Press CTRL+c to use local copy)')
|
||||
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:
|
||||
try:
|
||||
proc = _mount_server()
|
||||
|
|
@ -67,20 +72,20 @@ def use_network_sdio():
|
|||
if __name__ == '__main__':
|
||||
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
|
||||
use_network = False
|
||||
USE_NETWORK = False
|
||||
|
||||
# Try to mount server
|
||||
try:
|
||||
use_network = use_network_sdio()
|
||||
USE_NETWORK = use_network_sdio()
|
||||
except KeyboardInterrupt:
|
||||
wk.std.abort()
|
||||
|
||||
# Run SDIO
|
||||
exe_path = SDIO_LOCAL_PATH
|
||||
if use_network:
|
||||
exe_path = SDIO_REMOTE_PATH
|
||||
EXE_PATH = SDIO_LOCAL_PATH
|
||||
if USE_NETWORK:
|
||||
EXE_PATH = SDIO_REMOTE_PATH
|
||||
print('Using network copy!')
|
||||
else:
|
||||
print('Using local copy!')
|
||||
cmd = [exe_path, '-log_dir', log_dir]
|
||||
wk.exe.run_program(cmd, check=False, cwd=exe_path.parent)
|
||||
cmd = [EXE_PATH, '-log_dir', log_dir]
|
||||
wk.exe.run_program(cmd, check=False, cwd=EXE_PATH.parent)
|
||||
|
|
|
|||
|
|
@ -29,11 +29,11 @@ CRASH_SERVER = {
|
|||
#'Headers': {'X-Requested-With': 'XMLHttpRequest'},
|
||||
}
|
||||
SDIO_SERVER = {
|
||||
#'Address': '10.0.0.10',
|
||||
#'Share': 'Share',
|
||||
#'Path': 'SDIO',
|
||||
#'RO-User': '',
|
||||
#'RO-Pass': '',
|
||||
'Address': '',
|
||||
'Share': '',
|
||||
'Path': '',
|
||||
'RO-User': '',
|
||||
'RO-Pass': '',
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue