mirror of
https://github.com/Jylpah/blitz-tools.git
synced 2026-10-24 03:29:54 +02:00
Fixed handling of tank/map codes not found in the the database
This commit is contained in:
1 parent
db712b4bd2
commit
deb907605d
2 files changed
+16
-3
No files matched your search
@@ -3297,6 +3297,7 @@
|
|||||||
"T32": "T32",
|
"T32": "T32",
|
||||||
"T34_hvy": "T34",
|
"T34_hvy": "T34",
|
||||||
"T34_hvy_Freedom": "T34 Independence",
|
"T34_hvy_Freedom": "T34 Independence",
|
||||||
|
"A94_T37": "T37",
|
||||||
"T37": "T37",
|
"T37": "T37",
|
||||||
"T40": "T40",
|
"T40": "T40",
|
||||||
"T49": "T67",
|
"T49": "T67",
|
||||||
|
|||||||
+15
-3
@@ -105,9 +105,13 @@ async def mkReplayQ(queue : asyncio.Queue, files : list, title : str):
|
|||||||
elif os.path.isdir(fn):
|
elif os.path.isdir(fn):
|
||||||
with os.scandir(fn) as dirEntry:
|
with os.scandir(fn) as dirEntry:
|
||||||
for entry in dirEntry:
|
for entry in dirEntry:
|
||||||
|
try:
|
||||||
|
bu.debug('Found: ' + entry.name)
|
||||||
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)
|
||||||
await queue.put(await mkQueueItem(entry.path, title))
|
await queue.put(await mkQueueItem(entry.path, title))
|
||||||
|
except Exception as err:
|
||||||
|
bu.error(str(err))
|
||||||
bu.debug('File added to queue: ' + fn)
|
bu.debug('File added to queue: ' + fn)
|
||||||
bu.debug('Finished')
|
bu.debug('Finished')
|
||||||
return None
|
return None
|
||||||
@@ -198,16 +202,24 @@ def getTitle(replayfile: str, title: str, i : int) -> str:
|
|||||||
if title == None:
|
if title == None:
|
||||||
try:
|
try:
|
||||||
filename = os.path.basename(replayfile)
|
filename = os.path.basename(replayfile)
|
||||||
# debug(filename)
|
bu.debug(filename)
|
||||||
map_usrStrs = wg.getMapUserStrs()
|
map_usrStrs = wg.getMapUserStrs()
|
||||||
p = re.compile('\\d{8}_\\d{4}_(.+)_(' + '|'.join(map_usrStrs) + ')(?:-\\d)?\\.wotbreplay$')
|
p = re.compile('\\d{8}_\\d{4}_(.+)_(' + '|'.join(map_usrStrs) + ')(?:-\\d)?\\.wotbreplay$')
|
||||||
m = p.match(filename)
|
m = p.match(filename)
|
||||||
if (m != None):
|
if (m != None):
|
||||||
if wg.tanks != None:
|
if wg.tanks != None:
|
||||||
tank = wg.tanks['userStr'][m.group(1)]
|
tank = m.group(1)
|
||||||
|
if tank in wg.tanks['userStr']:
|
||||||
|
tank = wg.tanks['userStr'][tank]
|
||||||
|
else:
|
||||||
|
bu.error('Tank code: "' + tank + '" not found from Tankopedia (tanks.json)')
|
||||||
else:
|
else:
|
||||||
tank = m.group(1)
|
tank = m.group(1)
|
||||||
blitz_map = wg.maps[m.group(2)]
|
blitz_map = m.group(2)
|
||||||
|
if blitz_map in wg.maps:
|
||||||
|
blitz_map = wg.maps[blitz_map]
|
||||||
|
else:
|
||||||
|
bu.error('Mapcode: "' + blitz_map + '" not found from map database (maps.json)')
|
||||||
title = tank + ' @ ' + blitz_map
|
title = tank + ' @ ' + blitz_map
|
||||||
else:
|
else:
|
||||||
title = re.sub('\\.wotbreplay$', '', filename)
|
title = re.sub('\\.wotbreplay$', '', filename)
|
||||||
|
|||||||
Reference in new issue
Block a user