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

WebHost: Give user feedback if generator failed.

This commit is contained in:
Fabian Dill 2020-08-18 02:06:35 +02:00
parent 39f85aa291
commit e76887d0bf
2 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
WebHostLib/autolauncher.py
View File

@ -77,11 +77,6 @@ def handle_generation_failure(result: BaseException):
def launch_generator(pool: multiprocessing.pool.Pool, generation: Generation): def launch_generator(pool: multiprocessing.pool.Pool, generation: Generation):
@db_session
def handle_fail(result: BaseException):
generation.state = STATE_ERROR
handle_generation_failure(result)
logging.info(f"Generating {generation.id} for {len(generation.options)} players") logging.info(f"Generating {generation.id} for {len(generation.options)} players")
pool.apply_async(gen_game, (generation.options,), pool.apply_async(gen_game, (generation.options,),

77
WebHostLib/generate.py
View File

@ -48,45 +48,50 @@ def generate(race=False):
def gen_game(gen_options, race=False, owner=None, sid=None): def gen_game(gen_options, race=False, owner=None, sid=None):
target = tempfile.TemporaryDirectory() try:
playercount = len(gen_options) target = tempfile.TemporaryDirectory()
seed = get_seed() playercount = len(gen_options)
random.seed(seed) seed = get_seed()
random.seed(seed)
if race: if race:
random.seed() # reset to time-based random source random.seed() # reset to time-based random source
seedname = "M" + (f"{random.randint(0, pow(10, seeddigits) - 1)}".zfill(seeddigits)) seedname = "M" + (f"{random.randint(0, pow(10, seeddigits) - 1)}".zfill(seeddigits))
erargs = parse_arguments(['--multi', str(playercount)]) erargs = parse_arguments(['--multi', str(playercount)])
erargs.seed = seed erargs.seed = seed
erargs.name = {x: "" for x in range(1, playercount + 1)} # only so it can be overwrittin in mystery erargs.name = {x: "" for x in range(1, playercount + 1)} # only so it can be overwrittin in mystery
erargs.create_spoiler = not race erargs.create_spoiler = not race
erargs.race = race erargs.race = race
erargs.skip_playthrough = race erargs.skip_playthrough = race
erargs.outputname = seedname erargs.outputname = seedname
erargs.outputpath = target.name erargs.outputpath = target.name
erargs.teams = 1 erargs.teams = 1
erargs.progression_balancing = {} erargs.progression_balancing = {}
erargs.create_diff = True erargs.create_diff = True
for player, (playerfile, settings) in enumerate(gen_options.items(), 1): for player, (playerfile, settings) in enumerate(gen_options.items(), 1):
for k, v in settings.items(): for k, v in settings.items():
if v is not None: if v is not None:
getattr(erargs, k)[player] = v getattr(erargs, k)[player] = v
if not erargs.name[player]: if not erargs.name[player]:
erargs.name[player] = os.path.split(playerfile)[-1].split(".")[0] erargs.name[player] = os.path.split(playerfile)[-1].split(".")[0]
erargs.names = ",".join(erargs.name[i] for i in range(1, playercount + 1)) erargs.names = ",".join(erargs.name[i] for i in range(1, playercount + 1))
del (erargs.name) del (erargs.name)
erargs.skip_progression_balancing = {player: not balanced for player, balanced in erargs.skip_progression_balancing = {player: not balanced for player, balanced in
erargs.progression_balancing.items()} erargs.progression_balancing.items()}
del (erargs.progression_balancing) del (erargs.progression_balancing)
ERmain(erargs, seed) ERmain(erargs, seed)
return upload_to_db(target.name, owner, sid) return upload_to_db(target.name, owner, sid)
except BaseException:
with db_session:
Generation.get(id=sid).state = STATE_ERROR
raise
@app.route('/wait/<suuid:seed>') @app.route('/wait/<suuid:seed>')
@ -121,9 +126,9 @@ def upload_to_db(folder, owner, sid):
except Exception as e: except Exception as e:
flash(e) flash(e)
if multidata: if multidata:
seed = Seed(multidata=multidata, spoiler=spoiler, patches=patches, owner=owner, id=sid) with db_session:
for patch in patches: seed = Seed(multidata=multidata, spoiler=spoiler, patches=patches, owner=owner, id=sid)
patch.seed = seed for patch in patches:
Generation.get(id=sid).delete() patch.seed = seed
commit() Generation.get(id=sid).delete()
return seed.id return seed.id