diff --git a/analyze_wotb_replays.py b/analyze_wotb_replays.py index be8976a..528130b 100644 --- a/analyze_wotb_replays.py +++ b/analyze_wotb_replays.py @@ -361,12 +361,6 @@ async def main(argv): DB_CERT = configDB.get('db_ssl_cert_file', None) DB_CA = configDB.get('db_ssl_ca_file', None) - bu.debug('DB_SERVER: ' + DB_SERVER) - bu.debug('DB_PORT: ' + str(DB_PORT)) - bu.debug('DB_SSL: ' + "True" if DB_SSL else "False") - bu.debug('DB_AUTH: ' + DB_AUTH) - bu.debug('DB_NAME: ' + DB_NAME) - TASK_N = 7 parser = argparse.ArgumentParser(description='Analyze Blitz replay JSONs from WoTinspector.com') @@ -374,7 +368,7 @@ async def main(argv): parser.add_argument('-id', dest='accountID', type=int, default=None, help='WG account_id to analyze') parser.add_argument('-a', '--account', dest='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('-s', '--stats', action='store_true', default=False, help='Print player stats (WR/battles)') + parser.add_argument('--hist', action='store_true', default=False, help='Print player histograms (WR/battles)') parser.add_argument('--stat_func', default='tank_tier', choices=STAT_FUNC.keys(), help='Select how to calculate for ally/enemy performance: tank-tier stats, global player stats') parser.add_argument('-u', '--url', dest= 'url', action='store_true', default=False, help='Print replay URLs') parser.add_argument('--tankfile', type=str, default='tanks.json', help='JSON file to read Tankopedia from. Default is "tanks.json"') @@ -383,20 +377,28 @@ async def main(argv): parser.add_argument('--db', action='store_true', default=False, 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') parser.add_argument('files', metavar='FILE1 [FILE2 ...]', type=str, nargs='+', help='Files to read. Use \'-\' for STDIN"') args = parser.parse_args() - bu.set_verbose(args.verbose) - bu.set_debug(args.debug) + bu.set_log_level(args.silent, args.verbose, args.debug) + bu.set_progress_step(30) # Set the frequency of the progress dots. + wg = await WG.create(WG_APP_ID, args.tankfile, args.mapfile, True) wi = WoTinspector() - bu.set_progress_step(30) # Set the frequency of the progress dots. + if args.account != None: args.accountID = await wg.get_account_id(args.account) bu.debug('WG account_id: ' + str(args.accountID)) #### Connect to MongoDB (TBD) + bu.debug('DB_SERVER: ' + DB_SERVER) + bu.debug('DB_PORT: ' + str(DB_PORT)) + bu.debug('DB_SSL: ' + "True" if DB_SSL else "False") + bu.debug('DB_AUTH: ' + DB_AUTH) + bu.debug('DB_NAME: ' + DB_NAME) + client = None db = None if args.db: diff --git a/blitzutils.py b/blitzutils.py index b7121f3..f2134e8 100644 --- a/blitzutils.py +++ b/blitzutils.py @@ -13,7 +13,7 @@ SILENT = 0 NORMAL = 1 VERBOSE = 2 DEBUG = 3 -_log_level = 1 +_log_level = NORMAL ## Progress dots _progress_N = 100 @@ -38,9 +38,27 @@ def set_silent(silent: bool): _log_level = SILENT -def set_log_level(level = NORMAL): +def set_log_level_normal(): global _log_level - _log_level = level + _log_level = NORMAL + +def set_log_level(silent: bool,verbose: bool, debug: bool): + global _log_level + _log_level = NORMAL + if silent: _log_level = SILENT + if verbose: _log_level = VERBOSE + if debug: _log_level = DEBUG + + +def get_log_level() -> int: + return _log_level + + +def get_log_level_str() -> str: + for log_level in LOG_LEVELS: + if _log_level == LOG_LEVELS[log_level]: + return log_level + error('Unknown log level: ' + str(_log_level)) def verbose(msg = "", id = None): diff --git a/extract_tankopedia.py b/extract_tankopedia.py index 1331dd3..7b32096 100644 --- a/extract_tankopedia.py +++ b/extract_tankopedia.py @@ -26,11 +26,11 @@ async def main(argv): parser.add_argument('maps', type=str, default='maps.json', nargs='?', metavar='MAPS_FILE', help='File to write map names') 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') args = parser.parse_args() + bu.set_log_level(args.silent, args.verbose, args.debug) - bu.set_verbose(args.verbose) - bu.set_debug(args.debug) wg = WG() tasks = [] diff --git a/get_tankopedia.py b/get_tankopedia.py index ba68873..1aa41f8 100644 --- a/get_tankopedia.py +++ b/get_tankopedia.py @@ -56,12 +56,12 @@ async def main(argv): parser = argparse.ArgumentParser(description='Retrieve Tankopedia from WoTinspector.com') parser.add_argument('--file', dest="outfile", help='Write Tankopedia to file') - parser.add_argument('--debug', '-d', action='store_true', default=False, help='Debug mode') - parser.add_argument('--verbose', '-v', action='store_true', default=False, help='Verbose mode') + 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') args = parser.parse_args() - bu.set_verbose(args.verbose) - bu.set_debug(args.debug) + bu.set_log_level(args.silent, args.verbose, args.debug) wi = WoTinspector() diff --git a/upload_wotb_replays.py b/upload_wotb_replays.py index 395ebc1..98ceb1c 100644 --- a/upload_wotb_replays.py +++ b/upload_wotb_replays.py @@ -65,14 +65,13 @@ async def main(argv): 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('-d', '--debug', action='store_true', default=False, help='Debug mode') - parser.add_argument('-v', '--verbose', action='store_true', default=True, help='Verbose mode') - parser.add_argument('-s', '--silent', action='store_true', default=False, help='Silent 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') parser.add_argument('files', metavar='FILE1 [FILE2 ...]', type=str, nargs='+', help='Files to read. Use \'-\' for STDIN"') args = parser.parse_args() bu.set_verbose(args.verbose) - bu.set_debug(args.debug) - bu.set_silent(args.silent) + bu.set_log_level(args.silent, args.verbose, args.debug) wg = WG(WG_appID, args.tankopedia, args.mapfile) wi = WoTinspector()