GonnaHetzMe/blitz-tools
0
0 Fork 0
mirror of https://github.com/Jylpah/blitz-tools.git synced 2026-10-24 03:29:54 +02:00
Code Issues Projects Releases Wiki Activity

Add replay file name to error messages

Browse Source
This commit is contained in:
Jylpah committed 2020-07-10 12:37:43 +03:00
1 parent 001d73f3ae
commit bbfc732aae
1 file changed
+10 -9
Download Patch File Download Diff File Expand all files Collapse all files
analyze_wotb_replays.py
+10 -9
View File
@@ -1159,7 +1159,7 @@ async def mk_replayQ(queue : asyncio.Queue, args : argparse.Namespace, db : moto
if (p_replayfile.match(line) != None): if (p_replayfile.match(line) != None):
replay_json = await bu.open_JSON(line, wi.chk_JSON_replay) replay_json = await bu.open_JSON(line, wi.chk_JSON_replay)
await queue.put(await mk_readerQ_item(replay_json)) await queue.put(await mk_readerQ_item(replay_json, line))
except Exception as err: except Exception as err:
bu.error(exception=err) bu.error(exception=err)
else: else:
@@ -1170,7 +1170,7 @@ async def mk_replayQ(queue : asyncio.Queue, args : argparse.Namespace, db : moto
fn = fn[:-1] fn = fn[:-1]
if os.path.isfile(fn) and (p_replayfile.match(fn) != None): if os.path.isfile(fn) and (p_replayfile.match(fn) != None):
replay_json = await bu.open_JSON(fn, wi.chk_JSON_replay) replay_json = await bu.open_JSON(fn, wi.chk_JSON_replay)
await queue.put(await mk_readerQ_item(replay_json)) await queue.put(await mk_readerQ_item(replay_json, fn))
bu.debug('File added to queue: ' + fn) bu.debug('File added to queue: ' + fn)
Nreplays += 1 Nreplays += 1
elif os.path.isdir(fn): elif os.path.isdir(fn):
@@ -1179,7 +1179,7 @@ async def mk_replayQ(queue : asyncio.Queue, args : argparse.Namespace, db : moto
if entry.is_file() and (p_replayfile.match(entry.name) != None): if entry.is_file() and (p_replayfile.match(entry.name) != None):
bu.debug(entry.name) bu.debug(entry.name)
replay_json = await bu.open_JSON(entry.path, wi.chk_JSON_replay) replay_json = await bu.open_JSON(entry.path, wi.chk_JSON_replay)
await queue.put(await mk_readerQ_item(replay_json)) await queue.put(await mk_readerQ_item(replay_json, fn))
bu.debug('File added to queue: ' + entry.path) bu.debug('File added to queue: ' + entry.path)
Nreplays += 1 Nreplays += 1
except Exception as err: except Exception as err:
@@ -1188,11 +1188,11 @@ async def mk_replayQ(queue : asyncio.Queue, args : argparse.Namespace, db : moto
return Nreplays return Nreplays
async def mk_readerQ_item(replay_json) -> list: async def mk_readerQ_item(replay_json, filename : str = None) -> list:
"""Make an item to replay queue""" """Make an item to replay queue"""
global REPLAY_N global REPLAY_N
REPLAY_N +=1 REPLAY_N +=1
return [replay_json, REPLAY_N] return [replay_json, REPLAY_N, os.path.basename(filename) ]
async def replay_reader(queue: asyncio.Queue, readerID: int, args : argparse.Namespace): async def replay_reader(queue: asyncio.Queue, readerID: int, args : argparse.Namespace):
@@ -1203,13 +1203,14 @@ async def replay_reader(queue: asyncio.Queue, readerID: int, args : argparse.Nam
try: try:
while True: while True:
item = await queue.get() item = await queue.get()
replay_json = item[0] replay_json = item[0]
replayID = item[1] replayID = item[1]
replay_file = item[2]
try: try:
msg_str = 'Replay[' + str(replayID) + ']: ' msg_str = 'Replay[' + str(replayID) + ']: '
if replay_json == None: if replay_json == None:
bu.warning(msg_str + 'Invalid replay. Skipping.' ) bu.warning(msg_str + 'Invalid replay. Skipping: ' + (replay_file if replay_file != None else '') )
#SKIPPED_N += 1 #SKIPPED_N += 1
queue.task_done() queue.task_done()
continue continue
@@ -1219,7 +1220,7 @@ async def replay_reader(queue: asyncio.Queue, readerID: int, args : argparse.Nam
result = await read_replay_JSON(replay_json, args) result = await read_replay_JSON(replay_json, args)
bu.print_progress() bu.print_progress()
if result == None: if result == None:
bu.warning(msg_str + 'Invalid replay', id=readerID) bu.warning(msg_str + 'Invalid replay' + (replay_file if replay_file != None else '') )
queue.task_done() queue.task_done()
continue continue