GonnaHetzMe/blitz-tools
0
0 Fork 0
mirror of https://github.com/Jylpah/blitz-tools.git synced 2026-10-21 18:27:05 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3 from Jylpah/master

Browse Source 
Sync ddev to master...
This commit is contained in:
Jylpah authored and GitHub committed 2020-02-08 12:14:15 +02:00
2 parents aefad52aaa b4123c479d
commit 93f9218d94
2 files changed
+21 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

analyze_wotb_replays.py
+17 -16
View File
@@ -86,7 +86,10 @@ result_categories = {
result_categories_default = [
'total',
'battle_result',
'tank_tier'
'tank_tier',
'top_tier',
'tank_name',
'map_name'
]
RESULT_CAT_HEADER_FRMT = '{:_<17s}'
@@ -349,6 +352,12 @@ async def main(argv):
## Read config
config = configparser.ConfigParser()
config.read(FILE_CONFIG)
configGeneral = config['GENERAL']
# WG account id of the uploader:
# # Find it here: https://developers.wargaming.net/reference/all/wotb/account/list/
WG_ID = configGeneral.getint('wg_id', None)
USE_DB = configGeneral.getboolean('use_DB', False)
configDB = config['DATABASE']
DB_SERVER = configDB.get('db_server', 'localhost')
DB_PORT = configDB.getint('db_port', 27017)
@@ -365,7 +374,7 @@ async def main(argv):
parser = argparse.ArgumentParser(description='Analyze Blitz replay JSONs from WoTinspector.com')
parser.add_argument('--output', default='plain', choices=['json', 'plain', 'db'], help='Select output mode: JSON, plain text or database')
parser.add_argument('-id', dest='account_id', type=int, default=None, help='WG account_id to analyze')
parser.add_argument('-id', dest='account_id', type=int, default=WG_ID, help='WG account_id to analyze')
parser.add_argument('-a', '--account', type=str, default=None, help='WG account nameto analyze. Format: ACCOUNT_NAME@SERVER')
parser.add_argument('-x', '--extended', action='store_true', default=False, help='Print Extended stats')
parser.add_argument('--hist', action='store_true', default=False, help='Print player histograms (WR/battles)')
@@ -374,7 +383,7 @@ async def main(argv):
parser.add_argument('--tankfile', type=str, default='tanks.json', help='JSON file to read Tankopedia from. Default is "tanks.json"')
parser.add_argument('--mapfile', type=str, default='maps.json', help='JSON file to read Blitz map names from. Default is "maps.json"')
parser.add_argument('-o','--outfile', type=str, default='-', metavar="OUTPUT", help='File to write results. Default STDOUT')
parser.add_argument('--db', action='store_true', default=False, help='Use DB - You are unlikely to have it')
parser.add_argument('--db', action='store_true', default=USE_DB, help='Use DB - You are unlikely to have it')
parser.add_argument('-d', '--debug', action='store_true', default=False, help='Debug mode')
parser.add_argument('-v', '--verbose', action='store_true', default=False, help='Verbose mode')
parser.add_argument('-s', '--silent', action='store_true', default=False, help='Silent mode')
@@ -387,7 +396,6 @@ async def main(argv):
wg = await WG.create(WG_APP_ID, args.tankfile, args.mapfile, True)
wi = WoTinspector()
if args.account != None:
args.account_id = await wg.get_account_id(args.account)
bu.debug('WG account_id: ' + str(args.account_id))
@@ -414,9 +422,10 @@ async def main(argv):
bu.debug('No DB in use')
try:
replayQ = asyncio.Queue()
replayQ = asyncio.Queue(maxsize=1000)
reader_tasks = []
# Make replay Queue
scanner_task = asyncio.create_task(mk_replayQ(replayQ, args.files))
bu.debug('Replay scanner started')
# Start tasks to process the Queue
@@ -440,21 +449,13 @@ async def main(argv):
results.extend(res[0])
players.update(res[1])
# ## Remove battle_time from the player:tank data in case DB is not in use
# if db == None:
# players_tmp = set()
# for player in players:
# #bu.debug('playerID: ' + player + ' ==> ' + prune_stat_id(player))
# players_tmp.add(prune_stat_id(player))
# #bu.debug(str(len(players_tmp)))
# players = players_tmp
(player_stats, stat_id_map) = await process_player_stats(players, TASK_N, args, db)
bu.verbose('')
bu.debug('Number of player stats: ' + str(len(player_stats)))
teamresults = calc_team_stats(results, player_stats, stat_id_map, args)
process_battle_results(teamresults, args)
if args.stats:
if args.hist:
print('\nPlayer Historgrams______', end='', flush=True)
process_player_dist(results, player_stats, stat_id_map)
bu.debug('Finished. Cleaning up..................')
except Exception as err:
@@ -696,7 +697,7 @@ async def get_wg_tank_tier_stats(stat_id_str: str) -> dict:
hist_stats = [ 'all.' + x for x in histogram_fields.keys() ]
hist_stats.append('tank_id')
player_stats = await wg.get_player_tanks_stats(account_id, tier_tanks ,hist_stats)
player_stats = await wg.get_player_tank_stats(account_id, tier_tanks ,hist_stats)
#bu.debug('account_id: ' + str(account_id) + ' ' + str(player_stats))
return await tank_stats_helper(player_stats)
upload_wotb_replays.py
+4 -2
View File
@@ -53,9 +53,10 @@ async def main(argv):
# WG account id of the uploader:
# # Find it here: https://developers.wargaming.net/reference/all/wotb/account/list/
WG_ID = configGeneral.getint('wg_id', 0)
USE_DB = configGeneral.getint('use_DB', False)
parser = argparse.ArgumentParser(description='Post replays(s) to WoTinspector.com and retrieve battle data')
parser.add_argument('--output', default='single', choices=['file', 'files', 'db'] , help='Select output mode: single/multiple files or database')
#parser.add_argument('--output', default='file', choices=['file', 'files', 'db'] , help='Select output mode: single/multiple files or database')
parser.add_argument('-id', dest='accountID', type=int, default=WG_ID, help='WG account_id')
parser.add_argument('-a', '--account', dest='account', type=str, default=None, help='Uploader\'s WG account name. Format: ACCOUNT_NAME@SERVER')
parser.add_argument('-t','--title', type=str, default=None, help='Title for replays. Use NN for continous numbering. Default is filename-based numbering')
@@ -63,7 +64,7 @@ async def main(argv):
parser.add_argument('--tasks', dest='N_tasks', type=int, default=5, help='Number of worker threads')
parser.add_argument('--tankopedia', type=str, default='tanks.json', help='JSON file to read Tankopedia from. Default: "tanks.json"')
parser.add_argument('--mapfile', type=str, default='maps.json', help='JSON file to read Blitz map names from. Default: "maps.json"')
parser.add_argument('--db', action='store_true', default=False, help='Use DB - You are unlikely to have it')
parser.add_argument('--db', action='store_true', default=USE_DB, help='Use DB - You are unlikely to have it')
parser.add_argument('-d', '--debug', action='store_true', default=False, help='Debug mode')
parser.add_argument('-v', '--verbose', action='store_true', default=False, help='Verbose mode')
parser.add_argument('-s', '--silent', action='store_true', default=False, help='Silent mode')
@@ -198,6 +199,7 @@ async def replayWorker(queue: asyncio.Queue, db: motor.motor_asyncio.AsyncIOMoto
if wi.chk_JSON_replay(replay_json):
bu.verbose(msg_str + title + ' has already been posted. Skipping.' )
SKIPPED_N += 1
await saveReplay2DB(db, replay_json)
queue.task_done()
continue
else: