Update blitzutils.py

blitzutils.py

@@ -1,5 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.8
-## PYTHON VERSION MUST BE 3.7 OR HIGHER
 
 import sys, os, json, time,  base64, urllib, inspect, hashlib, re, string, random
 import asyncio, aiofiles, aiohttp, aiosqlite, lxml
@@ -22,12 +21,7 @@ _log_level = NORMAL
 LOG         = False
 LOGGER      = None
 
-MODE_TANK_STATS         = 'tank_stats'
+## Progress display
-MODE_PLAYER_STATS       = 'player_stats'
-MODE_PLAYER_ACHIEVEMENTS= 'player_achievements'
-MODE_TANKOPEDIA			= 'tankopedia'
-
-# Progress display
 _progress_N = 100
 _progress_i = 0
 _progress_id = None
@@ -36,10 +30,9 @@ _progress_obj = None
 UMASK= os.umask(0)
 os.umask(UMASK)
 
-# -----------------------------------------------------------
+## -----------------------------------------------------------
-# Class ThrottledClientSession(aiohttp.ClientSession)
+#### Class ThrottledClientSession(aiohttp.ClientSession)
-# -----------------------------------------------------------
+## -----------------------------------------------------------
-
 
 class ThrottledClientSession(aiohttp.ClientSession):
     """Rate-throttled client session class inherited from aiohttp.ClientSession)""" 
@@ -61,28 +54,31 @@ class ThrottledClientSession(aiohttp.ClientSession):
             self._queue = asyncio.Queue(min(2, int(rate_limit)+1))
             self._fillerTask = asyncio.create_task(self._filler())
         
+     
+
     def _get_sleep(self) -> list:
         if self.rate_limit == None:
             return None
         else:
             return 1/self.rate_limit
 
+
     def get_rate(self) -> float:
         """Return rate of requests"""
         return self._count / (time.time() - self._start_time)
 
+
     def get_stats(self):
         """Get session statistics"""
-        res = {'rate': self.get_rate(), 'rate_limit': self.rate_limit,
+        res = {'rate' : self.get_rate(), 'rate_limit': self.rate_limit, 'count' : self._count }
-                                     'count': self._count}
         return res
         
+
     def get_stats_str(self):
         """Print session statistics"""
         return 'rate limit: ' + str(self.rate_limit if self.rate_limit != None else '-') + \
-                ' rate: ' + \
+                ' rate: ' +  "{0:.1f}".format(self.get_rate()) + ' requests: ' + str(self._count)
-                    "{0:.1f}".format(self.get_rate()) + \
+
-                                     ' requests: ' + str(self._count)
 
     def reset_counters(self):
         """Reset rate counters and return current results"""
@@ -91,12 +87,14 @@ class ThrottledClientSession(aiohttp.ClientSession):
         self._count = 0
         return res
 
+
     def set_rate_limit(self, rate_limit: float = 1):
         if rate_limit >= 0:
             self.rate_limit = rate_limit
             return self.rate_limit
         return None
 
+
     async def close(self) -> None:
         """Close rate-limiter's "bucket filler" task"""
         # DEBUG 
@@ -105,10 +103,11 @@ class ThrottledClientSession(aiohttp.ClientSession):
             if self._fillerTask != None:
                 self._fillerTask.cancel()
             await asyncio.wait_for(self._fillerTask, timeout= 0.5)
-        except (asyncio.CancelledError, asyncio.TimeoutError):
+        except (asyncio.exceptions.CancelledError, asyncio.TimeoutError):
             pass
         await super().close()
 
+
     async def _filler_simple(self):
         """Filler task to fill the leaky bucket algo"""
         try:
@@ -123,6 +122,7 @@ class ThrottledClientSession(aiohttp.ClientSession):
         except Exception as err:
             error(exception=err)
 
+
     async def _filler(self):
         """Filler task to fill the leaky bucket algo"""
         try:
@@ -141,18 +141,18 @@ class ThrottledClientSession(aiohttp.ClientSession):
                     increment = self.rate_limit * (now - updated_at)
                     fraction += increment % 1
                     extra_increment = fraction // 1
-                    items_2_add = int(
+                    items_2_add = int(min(self._queue.maxsize - self._queue.qsize(), int(increment) + extra_increment))
-                        min(self._queue.maxsize - self._queue.qsize(), int(increment) + extra_increment))
                     fraction = fraction % 1
                     for i in range(0,items_2_add):
                         self._queue.put_nowait(i)
                     updated_at = now
                 await asyncio.sleep(sleep)
-        except asyncio.CancelledError:
+        except (asyncio.exceptions.CancelledError, asyncio.CancelledError):
             debug('Cancelled')
         except Exception as err:
             error(exception=err)
 
+
     async def _request(self, *args,**kwargs):
         """Throttled _request()"""
         if self._queue != None:
@@ -164,12 +164,12 @@ class ThrottledClientSession(aiohttp.ClientSession):
 
 class AsyncLogger():
     """Async file logger"""
-
     def __init__(self) -> None: 
         self._queue = asyncio.Queue()
         self._task = None
         self._file = None
 
+
     async def open(self, logfn: str = None):
         """Set logging to file"""
         if logfn == None:
@@ -183,6 +183,7 @@ class AsyncLogger():
             self._file = None
         return False
 
+
     async def logger(self):
         """Async file logger"""
         if self._file == None:
@@ -198,12 +199,14 @@ class AsyncLogger():
             except Exception as err:
                 error(exception=err)
             
+
     def log(self, msg: str  = ''):
         self._queue.put_nowait(msg)
         
+
     async def close(self):
         try:
-            # empty queue & close
+            ## empty queue & close
             await self._queue.join()
             self._task.cancel()
             self._file.close()
@@ -211,10 +214,9 @@ class AsyncLogger():
             error('Error closing log file', err)
         return None 
         
-# -----------------------------------------------------------
+## -----------------------------------------------------------
-# Utils
+#### Utils
-# -----------------------------------------------------------
+## -----------------------------------------------------------
-
 
 def set_debug(debug: bool):
     global _log_level
@@ -298,7 +300,6 @@ async def close_file_logging():
     await LOGGER.close()
     LOGGER = None
 
-
 def _randomword(length):
    letters = string.ascii_lowercase
    return ''.join(random.choice(letters) for i in range(length))
@@ -316,7 +317,7 @@ def verbose_std(msg="", id=None) -> bool:
 
 def warning(msg = "", id = None, force: bool = False) -> bool:
     """Print a warning message"""
-    return _print_log_msg('', 'Warning: ' + msg, None, id, print_msg=(force or (_log_level >= NORMAL)))
+    return _print_log_msg('Warning', msg, None, id, print_msg= (force or (_log_level >= NORMAL)) )        
 
 
 def debug(msg = "", id = None, exception = None, force: bool = False) -> bool:
@@ -336,21 +337,6 @@ def log(msg="", id=None, exception=None) -> bool:
     return _print_log_msg('LOG', msg=msg, exception=exception, id=id, print_msg=(_log_level >= DEBUG))
 
 
-## Copy with pride: https://stackoverflow.com/questions/2203424/python-how-to-retrieve-class-information-from-a-frame-object
-def get_class_from_frame(fr):
-    args, _, _, value_dict = inspect.getargvalues(fr)
-    # we check the first parameter for the frame function is
-    # named 'self'
-    if len(args) and args[0] == 'self':
-        # in that case, 'self' will be referenced in value_dict
-        instance = value_dict.get('self', None)
-        if instance:
-            # return its class
-            return getattr(instance, '__class__', None)
-    # return None otherwise
-    return None
-
-
 def _print_log_msg(prefix = 'LOG', msg = '', exception = None, id = None, print_msg : bool = True):
     # Use empty prefix to determine standard verbose messages
     if not (print_msg or LOG):
@@ -359,13 +345,8 @@ def _print_log_msg(prefix = 'LOG', msg = '', exception = None, id = None, print_
     if prefix != '':
         curframe = inspect.currentframe()
         calframe = inspect.getouterframes(curframe)
-        class_name = get_class_from_frame(curframe)
         caller = calframe[2].function
-        if class_name != None:
+        prefix = prefix + ': ' + caller + '(): '
-            prefix = prefix + ': ' + class_name + '.' + caller
-        else:
-            prefix = prefix + ': ' + caller
-        prefix = prefix + '(): '
     
     if id != None:
         prefix = prefix + '[' + str(id) + ']: '
@@ -423,14 +404,12 @@ def set_progress_bar(heading: str, max_value: int, step: int = None, slow: bool
     return
 
 
-def set_counter(heading: str, step = None):
+def set_counter(heading: str):
     global _progress_obj, _progress_i
     _progress_i = 0
     if _progress_obj != None:
         finish_progress_bar()
-    _progress_obj = Counter(heading + ': ')
+    _progress_obj = Counter(heading)
-    if step != None:
-        set_progress_step(step)
     return 
 
 
@@ -555,7 +534,7 @@ async def get_url_JSON(session: aiohttp.ClientSession, url: str, chk_JSON_func =
         if url == None:
             return None
         
-        # To avoid excessive use of servers            
+        ## To avoid excessive use of servers            
         for retry in range(1,max_tries+1):
             try:
                 async with session.get(url) as resp:
@@ -633,9 +612,9 @@ def get_JSON_value(json, key : str = None, keys : list = None, keypath = None):
     raise KeyError('Key not found: ' + get_JSON_keypath(keypath, keys[0]))
 
 
-# -----------------------------------------------------------
+## -----------------------------------------------------------
-# Class SlowBar 
+#### Class SlowBar 
-# -----------------------------------------------------------
+## -----------------------------------------------------------
 
 class SlowBar(IncrementalBar):
     suffix = '%(index)d/%(max)d %(percent)d%% ETA %(remaining_hours).0f h %(remaining_mins).0f mins'
@@ -648,17 +627,19 @@ class SlowBar(IncrementalBar):
         return (self.eta - (self.eta // 3600)*3600) // 60
  
 
-# -----------------------------------------------------------
+## -----------------------------------------------------------
-# Class StatsNotFound 
+#### Class StatsNotFound 
-# -----------------------------------------------------------
+## -----------------------------------------------------------
 
 class StatsNotFound(Exception):
     pass
 
 
-# -----------------------------------------------------------
+
-# Class WG 
+
-# -----------------------------------------------------------
+## -----------------------------------------------------------
+#### Class WG 
+## -----------------------------------------------------------
 
 class WG:
 
@@ -691,7 +672,7 @@ class WG:
     #                                 WHERE account_id = {} AND stat = {} 
     #                                 AND date >= {} LIMIT 1;"""
           
-    # TANK_STATS
+    
     SQL_TANK_STATS_TBL          = 'tank_stats'
 
     SQL_TANK_STATS_CREATE_TBL   = 'CREATE TABLE IF NOT EXISTS ' + SQL_TANK_STATS_TBL + \
@@ -705,7 +686,6 @@ class WG:
 
     SQL_TANK_STATS_UPDATE       = 'REPLACE INTO ' + SQL_TANK_STATS_TBL + '(account_id, tank_id, update_time, stats) VALUES(?,?,?,?)'
 
-    # PLAYER_STATS
     SQL_PLAYER_STATS_TBL        = 'player_stats'
 
     SQL_PLAYER_STATS_CREATE_TBL = 'CREATE TABLE IF NOT EXISTS ' + SQL_PLAYER_STATS_TBL + \
@@ -719,7 +699,6 @@ class WG:
 
     SQL_PLAYER_STATS_CACHED     = 'SELECT * FROM ' +  SQL_PLAYER_STATS_TBL + ' WHERE account_id = ? AND update_time > ?'
 
-    # PLAYER_ACHIEVEMENTS
     SQL_PLAYER_ACHIEVEMENTS_TBL  = 'player_achievements'
 
     SQL_PLAYER_ACHIEVEMENTS_CREATE_TBL = 'CREATE TABLE IF NOT EXISTS ' + SQL_PLAYER_ACHIEVEMENTS_TBL + \
@@ -727,12 +706,11 @@ class WG:
                                     update_time INTEGER NOT NULL, 
                                     stats TEXT)"""
 
-    SQL_PLAYER_ACHIEVEMENTS_COUNT      = 'SELECT COUNT(*) FROM ' + SQL_PLAYER_ACHIEVEMENTS_TBL
-    
     SQL_PLAYER_ACHIEVEMENTS_CACHED     = 'SELECT * FROM ' +  SQL_PLAYER_ACHIEVEMENTS_TBL + ' WHERE account_id = ? AND update_time > ?'
 
     SQL_PLAYER_ACHIEVEMENTS_UPDATE     = 'REPLACE INTO ' + SQL_PLAYER_ACHIEVEMENTS_TBL + '(account_id, update_time, stats) VALUES(?,?,?)'
 
+    SQL_PLAYER_ACHIEVEMENTS_COUNT      = 'SELECT COUNT(*) FROM ' + SQL_PLAYER_ACHIEVEMENTS_TBL
 
     SQL_TABLES                  = [ SQL_PLAYER_STATS_TBL, SQL_TANK_STATS_TBL, SQL_PLAYER_ACHIEVEMENTS_TBL ]
 
@@ -740,7 +718,7 @@ class WG:
 
     SQL_PRUNE_CACHE             = """DELETE from {} WHERE update_time < {}""" 
 
-# Default data. Please use the latest maps.json
+## Default data. Please use the latest maps.json
 
     maps = {
         "Random": "Random map",
@@ -889,7 +867,7 @@ class WG:
             error(exception=err)
 
         
-    # Class methods  ----------------------------------------------------------
+    ## Class methods  ----------------------------------------------------------
 
     @classmethod
     def get_server(cls, account_id: int) -> str:
@@ -1074,7 +1052,7 @@ class WG:
         return False
 
 
-    # Methods --------------------------------------------------
+    ## Methods --------------------------------------------------
     def load_tanks(self, tankopedia_fn: str):
         """Load tanks from tankopedia JSON"""
         if tankopedia_fn == None:
@@ -1269,7 +1247,7 @@ class WG:
                 #debug('JSON Response received: ' + str(json_data))
                 stats = json_data['data'][str(account_id)]
                 if cache:
-                    await self.save_tank_stats(account_id, tank_ids, stats)
+                    await self.put_2_statsQ('tank_stats', [account_id, tank_ids], stats)
                 return stats
         except Exception as err:
             error(exception=err)
@@ -1302,7 +1280,7 @@ class WG:
                 #debug('JSON Response received: ' + str(json_data))
                 stats = json_data['data'][str(account_id)]
                 if cache:
-                    await self.save_player_stats(account_id, stats)
+                    await self.put_2_statsQ('player_stats', [account_id], stats)
                 return stats
         except Exception as err:
             error(exception=err)
@@ -1341,7 +1319,7 @@ class WG:
                 for account_id in json_data['data'].keys():
                     stats[account_id] = json_data['data'][account_id]
                     if cache:
-                        await self.save_player_achievements(int(account_id), json_data['data'][account_id])
+                        await self.put_2_statsQ('player_achievements', [int(account_id)], json_data['data'][account_id])
                 return stats
         except Exception as err:
             error(exception=err)
@@ -1448,7 +1426,7 @@ class WG:
         return None
 
 
-    async def save_stats(self, statsType: str, key: list, stats: list):
+    async def put_2_statsQ(self, statsType: str, key: list, stats: list):
         """Save stats to a async queue to be saved by the stat_saver -task"""
         if self.statsQ == None:
             return False
@@ -1457,30 +1435,6 @@ class WG:
             return True
 
 
-    async def save_player_stats(self, account_id: int, stats: dict):
-        try:
-            await self.save_stats(MODE_PLAYER_STATS, [int(account_id)], stats)
-        except Exception as err:
-            error(exception=err)
-        return None
-
-
-    async def save_player_achievements(self, account_id: int, stats: dict):
-        try:
-            await self.save_stats(MODE_PLAYER_ACHIEVEMENTS, [int(account_id)], stats)
-        except Exception as err:
-            error(exception=err)
-        return None
-
-
-    async def save_tank_stats(self, account_id: int, tank_ids: list, stats: dict):
-        try:
-            await self.save_stats(MODE_TANK_STATS, [int(account_id), tank_ids], stats)
-        except Exception as err:
-            error(exception=err)
-        return None
-
-
     async def stat_saver(self): 
         """Async task for saving stats into cache in background"""
 
@@ -1489,20 +1443,15 @@ class WG:
             return None
         try:
             self.cache = await aiosqlite.connect(WG.CACHE_DB_FILE)
-            # Create cache tables table
+            ## Create cache tables table
             await self.cache.execute(WG.SQL_TANK_STATS_CREATE_TBL)
             await self.cache.execute(WG.SQL_PLAYER_STATS_CREATE_TBL)
             await self.cache.execute(WG.SQL_PLAYER_ACHIEVEMENTS_CREATE_TBL)
 
             await self.cache.commit()
             
-            if is_debug():
-                async with self.cache.execute(WG.SQL_PLAYER_STATS_COUNT) as cursor:
-                    debug('Cache contains: ' + str((await cursor.fetchone())[0]) + ' player stat records' )
-                async with self.cache.execute(WG.SQL_PLAYER_ACHIEVEMENTS_COUNT) as cursor:
-                    debug('Cache contains: ' + str((await cursor.fetchone())[0]) + ' player achievement records' )
             async with self.cache.execute(WG.SQL_TANK_STATS_COUNT) as cursor:
-                    debug('Cache contains: ' + str((await cursor.fetchone())[0]) + ' player tank stat records' )
+                debug('Cache contains: ' + str((await cursor.fetchone())[0]) + ' cached player tank stat records' )
         except Exception as err:
             error(exception=err)
             sys.exit(1)
@@ -1511,22 +1460,21 @@ class WG:
             try:
                 stats = await self.statsQ.get()
             
-                stat_type  = stats[0]
+                stats_type  = stats[0]
                 key         = stats[1]
                 stats_data  = stats[2]
                 update_time = stats[3]
 
-                #debug('stat_type: ' + stat_type + ', key: ' + str(key))
+                if stats_type == 'tank_stats':
-                if stat_type == MODE_TANK_STATS:
                     await self.store_tank_stats(key, stats_data, update_time)
-                elif stat_type == MODE_PLAYER_STATS:
+                elif stats_type == 'player_stats':
                     await self.store_player_stats(key, stats_data, update_time)
-                elif stat_type == MODE_PLAYER_ACHIEVEMENTS:
+                elif stats_type == 'player_achievements':
                     await self.store_player_achievements(key, stats_data, update_time)
                 else: 
-                    error('Function to saves stats type \'' + stat_type + '\' is not implemented yet')
+                    error('Function to saves stats type \'' + stats_type + '\' is not implemented yet')
             
-            except asyncio.CancelledError:
+            except (asyncio.CancelledError):
                 # this is an eternal loop that will wait until cancelled	
                 return None
 
@@ -1559,7 +1507,7 @@ class WG:
                 for stat in stats_data:
                     tank_id = stat['tank_id']
                     await self.cache.execute(WG.SQL_TANK_STATS_UPDATE, (account_id, tank_id, update_time, json.dumps(stat)))
-                    tank_ids.discard(tank_id)
+                    tank_ids.remove(tank_id)
             # no stats found => Add None to mark that
             for tank_id in tank_ids:
                 await self.cache.execute(WG.SQL_TANK_STATS_UPDATE, (account_id, tank_id, update_time, None))
@@ -1706,9 +1654,9 @@ class WG:
         return None
 
 
-# -----------------------------------------------------------
+## -----------------------------------------------------------
-# Class WoTinspector 
+#### Class WoTinspector 
-# -----------------------------------------------------------
+## -----------------------------------------------------------
 
 class WoTinspector:
     URL_WI          = 'https://replays.wotinspector.com'
@@ -1791,7 +1739,7 @@ class WoTinspector:
             hash.update(data)
             replay_id = hash.hexdigest()
 
-            # Testing if the replay has already been posted
+            ##  Testing if the replay has already been posted
             json_resp = await self.get_replay_JSON(replay_id)
             if json_resp != None:
                 debug('Already uploaded: ' + title, id=N)
@@ -1890,7 +1838,7 @@ class WoTinspector:
             # FIX The replay can have allies/enemies i.e. be useful for 
             # team composition analysis, but does not have player contribution
             if ('status' in json_resp) and json_resp['status'] == 'ok' and \
-                (get_JSON_value(json_resp, key='data.summary.winner_team') != None) :
+                (get_JSON_value(json_resp, key='data.summary.allies') != None) :
                 debug("JSON check OK")
                 return True 
         except KeyError as err:
@@ -1900,6 +1848,192 @@ class WoTinspector:
         return False      
 
 
+## -----------------------------------------------------------
+#### Class WoTinspector 
+## -----------------------------------------------------------
+
+class WIReplay:
+
+    replayI = 1
+    STATUS_UNINIT       = 'uninitialized'
+    STATUS_ERROR        = 'error'
+    STATUS_INCOMPLETE   = 'teams only'
+    STATUS_OK           = 'OK'
+    STATUS_PROCESSED    = 'processed'
+
+    @classmethod
+    def warning(cls, msg: str = ''):
+        bu.warning('Replay[' + str(self.ID) + ']: ' + msg +  ': ' + (self.filename if self.filename != None else '') )
+
+
+    @classmethod
+    def check(cls, replay_json) -> str:
+        status = self.STATUS_ERROR
+        try:
+            if ('status' in json_resp) and (json_resp['status'] == 'ok'): 
+                if get_JSON_value(json_resp, key='data.summary.allies') != None :
+                debug("JSON check OK")
+            
+
+
+        except KeyError as err:
+            debug('Replay JSON check failed', exception=err)
+        except:
+            debug("Replay JSON check failed: " + str(json_resp))
+        return status    
+
+        
+
+
+    def __init__(self, replay_json, player_id : int = None, filename : str = None):
+        self.player_id = player_id
+        self.filename = filename
+        self.I = self.replayI
+        self.replayI += 1
+        self.status = WIReplay.STATUS_UNINIT
+        self.result = dict()
+        try:
+            self.status = self.check(replay_json)
+
+            if self.status == self.STATUS_ERROR:
+                self.warning('Invalid replay. Skipping')                
+                return
+		self.result['_id'] = replay_json['_id']
+		self.result['battle_start_timestamp'] = int(replay_json['data']['summary']['battle_start_timestamp'])
+		
+        protagonist = int(replay_json['data']['summary']['protagonist'])
+		
+		# For filtering replays per submitter
+		result['protagonist'] = protagonist
+
+		if account_id == None:
+			account_id = protagonist
+		elif protagonist != account_id:
+			if account_id in replay_json['data']['summary']['enemies']:
+				# switch the teams...
+				if replay_json['data']['summary']['battle_result'] != 2:
+					if replay_json['data']['summary']['battle_result'] == 0:
+						replay_json['data']['summary']['battle_result'] = 1
+					else: 
+						replay_json['data']['summary']['battle_result'] = 0
+				tmp = replay_json['data']['summary']['enemies']
+				replay_json['data']['summary']['enemies'] = replay_json['data']['summary']['allies']
+				replay_json['data']['summary']['allies'] = tmp
+			elif account_id in replay_json['data']['summary']['allies']:
+				pass 			
+			else:		
+				# looking for an account_id, but account_id not found in the teams => skipping the replay
+				return None
+		if url: 
+			result['url'] = replay_json['data']['view_url']
+				
+		for key in replay_summary_flds:
+			result[key] = replay_json['data']['summary'][key]
+	
+	except Exception as err:
+		bu.error(exception=err)
+		return None
+	try:	
+		#bu.debug('Part 2')
+		result['allies'] = set()
+		result['enemies'] = set()
+		result['allies_survived']  = 0 	# for steamroller stats
+		result['enemies_survived']  = 0	# for steamroller stats
+		btl_duration = 0
+		btl_tier = 0
+		protagonist_tank  = None
+		for player in replay_json['data']['summary']['details']:
+			btl_duration = max(btl_duration, player['time_alive'])
+			player_tank_tier = wg.get_tank_data(player['vehicle_descr'], 'tier')
+			btl_tier = max(btl_tier, player_tank_tier)
+
+			if (protagonist != None) and (player['dbid'] == protagonist):
+				protagonist_tank = player['vehicle_descr']
+
+			if player['dbid'] == account_id:
+				# player itself is not put in results['allies']
+				tmp = {}
+				tmp['account_id'] 	= account_id
+				tmp['tank_id'] 		= player['vehicle_descr']
+				tmp['tank_tier'] 	= player_tank_tier
+				tmp['tank_name']	= wg.get_tank_name(tmp['tank_id'])
+				tmp['tank_type']	= wg.get_tank_type_id(tmp['tank_id'])
+				tmp['tank_nation']	= wg.get_tank_nation_id(tmp['tank_id'])
+				tmp['is_premium']	= int(wg.is_premium(tmp['tank_id']))
+				tmp['squad_index'] 	= player['squad_index']
+				for key in replay_details_flds:
+					tmp[key] = player[key]
+				if player['hitpoints_left'] == 0:
+					tmp['survived'] = 0
+					tmp['destroyed'] = 1
+				else:
+					tmp['survived'] 	= 1
+					tmp['destroyed'] 	= 0
+					result['allies_survived'] += 1
+				for key in tmp.keys():
+					result[key] = tmp[key]				
+
+			else:
+				tmp_account_id 	= player['dbid']
+				tmp_tank_id 	= player['vehicle_descr']
+				tmp_battletime	= result['battle_start_timestamp']
+				if player['death_reason'] == -1:
+					survived = True
+				else:
+					survived = False
+				
+				if player['dbid'] in replay_json['data']['summary']['allies']: 
+					result['allies'].add(get_stat_id(tmp_account_id, tmp_tank_id, tmp_battletime))
+					if survived:
+						result['allies_survived'] += 1
+				else:
+					result['enemies'].add(get_stat_id(tmp_account_id, tmp_tank_id, tmp_battletime))
+					if survived:
+						result['enemies_survived'] += 1
+
+		## Rather use 'player' than incomprehensible 'protagonist'...		
+		result['player'] = get_stat_id(protagonist, protagonist_tank, result['battle_start_timestamp'])
+		bu.debug('Player stats_id: ' + result['player'])
+		# remove platoon buddy from stats 			
+		if result['squad_index'] != None:
+			for player in replay_json['data']['summary']['details']:
+				bu.debug(str(player))
+				if (player['squad_index'] == result['squad_index']) and (player['dbid'] in replay_json['data']['summary']['allies']) and (player['dbid'] != account_id):
+					# platoon buddy found 
+					tmp_account_id 	= player['dbid']
+					tmp_tank_id 	= player['vehicle_descr']
+					#tmp_tank_tier 	= str(wg.get_tank_tier(tmp_tank_id))
+					tmp_battletime	= result['battle_start_timestamp']
+					# platoon buddy removed from stats 
+					result['allies'].remove(get_stat_id(tmp_account_id, tmp_tank_id, tmp_battletime))
+					break
+		for ratio in BattleCategory.get_result_fields_ratio(all=True):
+			result[ratio] = BattleCategory.calc_ratio(ratio, result)
+
+		result['time_alive%'] = result['time_alive'] / btl_duration  
+		result['battle_tier'] = btl_tier
+		result['top_tier'] = 1 if (result['tank_tier'] == btl_tier) else 0
+		result['win'] = 1 if result['battle_result'] == 1 else 0
+		REPLAY_I += 1
+		result['battle_i'] = REPLAY_I
+
+            bu.print_progress()
+            if result == None:
+                bu.warning(msg_str + 'Invalid replay ' + (replay_file if replay_file != None else '') )
+                queue.task_done()
+                continue
+            
+            playerstanks.update(set(result['allies']))
+            playerstanks.update(set(result['enemies']))	
+            playerstanks.update(set([result['player']]))
+            
+            results.append(result)
+            bu.debug('Marking task ' + str(replayID) + ' done')
+
+
+
+
+
 class BlitzStars:
 
     URL_BLITZSTARS          = 'https://www.blitzstars.com'

extract_tankopedia.py

@@ -1,5 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.8
-## PYTHON VERSION MUST BE 3.7 OR HIGHER
 
 # Extract tankopedia data in WG API JSON format from Blitz app files (Android APK unzipped)
 
@@ -82,7 +81,6 @@ async def main(argv):
         tankopedia['data'] = tanks
         tankopedia['userStr'] = userStrs
         bu.verbose_std('New tankopedia \'' + args.tanks + '\' contains ' + str(len(tanks)) + ' tanks')
-        bu.verbose_std('New tankopedia \'' + args.tanks + '\' contains ' + str(len(userStrs)) + ' tank strings')        
         await outfile.write(json.dumps(tankopedia, ensure_ascii=False, indent=4, sort_keys=False))
     
     if args.maps != None:
@@ -114,14 +112,14 @@ async def extract_tanks(blitz_app_base : str, nation: str):
             tankList = xmltodict.parse(await f.read())
             for data in tankList['root'].keys():
                 tank_xml = tankList['root'][data]
-                tank = dict()
+                tank = {}
-                tank['is_premium'] = issubclass(type(tank_xml['price']), dict)
-                tank['nation']  = nation
                 tank['tank_id'] = await get_tank_id(nation, int(tank_xml['id']))
-                tank['tier']    = int(tank_xml['level'])
-                tank['type'] = await get_tank_type(tank_xml['tags'])
                 tank['userStr'] = tank_xml['userString']
-                #bu.debug('Reading tank string: ' + tank['userStr'], force=True)
+                tank['nation'] = nation
+                tank['tier'] = int(tank_xml['level'])
+                #debug(tank_xml['price'])
+                tank['is_premium'] = issubclass(type(tank_xml['price']), dict)
+                tank['type'] = await get_tank_type(tank_xml['tags'])
                 tanks.append(tank)
         except Exception as err:
             bu.error(err)
@@ -162,27 +160,9 @@ async def convert_tank_names(tanklist : list, tank_strs: dict) -> dict:
     try:
         for tank in tanklist:
             tank['name'] = tank_strs[tank['userStr']]
-            #userStrs[tank['userStr'].split(':')[1]] = tank['name']
+            userStrs[tank['userStr'].split(':')[1]] = tank['name']
             tank.pop('userStr', None)
-            tank_tmp = collections.OrderedDict()
+            tankopedia[str(tank['tank_id'])] = tank
-            for key in sorted(tank.keys()):
-                tank_tmp[key] = tank[key]
-            tankopedia[str(tank['tank_id'])] = tank_tmp
-
-        for tank_str in tank_strs:
-            skip = False
-            key = tank_str.split(':')[1]
-            bu.debug('Tank string: ' + key + ' = ' + tank_strs[tank_str])
-            re_strs = [r'^Chassis_', r'^Turret_', r'^_', r'_short$' ]
-            for re_str in re_strs:
-                p = re.compile(re_str)
-                if p.match(key):
-                    skip = True
-                    break
-            if skip:
-                continue
-            
-            userStrs[key] = tank_strs[tank_str]
 
         # sorting
         tankopedia_sorted = collections.OrderedDict()
@@ -192,7 +172,6 @@ async def convert_tank_names(tanklist : list, tank_strs: dict) -> dict:
         userStrs_sorted = collections.OrderedDict()
         for userStr in sorted(userStrs.keys()):
             userStrs_sorted[userStr] = userStrs[userStr]
-        # bu.debug('Tank strings: ' + str(len(userStrs_sorted)))
 
     except Exception as err:
         bu.error(err)

maps.json

@@ -19,7 +19,6 @@
     "grossberg": "Dynasty's Pearl",
     "himmelsdorf": "Himmelsdorf",
     "holmeisk": "Wasteland",
-    "iceworld": "Everfrost",
     "idle": "Yukon",
     "italy": "Vineyards",
     "karelia": "Rockfield",
@@ -48,9 +47,6 @@
     "rift": "Hellas",
     "rock": "Mayan Ruins",
     "rudniki": "Mines",
-    "rudniki_01": "Mines - Hill",
-    "rudniki_02": "Mines - Village",
-    "rudniki_03": "Mines - Center",
     "savanna": "Oasis Palms",
     "skit": "Naval Frontier",
     "test": "World of Ducks",

releases.md

@@ -2,11 +2,6 @@
 
 | Release | Date     | Notes       | Inaccurate? |
 |:-------:|:--------:|-------------|-----|
-| 7.9 | 2021-04-27 | Mines rework, new tutorial, colorblind mode, JgPz E100 legendary camo |  |
-| 7.8 | 2021-03-24 | Mid-tier balance changes, Grille line new consumables  |  |
-| 7.7 | 2021-02-24 | Czechoslovakian medium tanks  |  |
-| 7.6 | 2021-01-27 | AMC 13 90, TOG II buffs, free replay camera  |  |
-| 7.5 | 2020-12-09 | ATGM removal, Batchat, Kpz70, T-2020 buff |  |
 | 7.4 | 2020-11-12 | TD buffs, Clan missions |  |
 | 7.3 | 2020-10-08 | Swedish HT line |  |
 | 7.2 | 2020-08-19 | Balance changes, added tier X ammo capa, new aiming reticles |  |

stats/export_top_tier_20120228.csv

@@ -1,172 +0,0 @@
-,TOTAL,Battles,% Battles,WR,DPB,KPB,Spot,Top tier,DR,KDR,Hit rate,Pen rate,Surv%,Share live,Player WR,Allies WR,Enemies WR,No stats
-,Total,6942,100%,71.80%,2058,1.86,1.4,64%,2.3,5.4,86.10%,90.80%,65.30%,90%,57.08%,50.15%,50.12%,0.20%
-,,,,,,,,,,,,,,,,,,
-,Result,Battles,% Battles,WR,DPB,KPB,Spot,Top tier,DR,KDR,Hit rate,Pen rate,Surv%,Share live,Player WR,Allies WR,Enemies WR,No stats
-,Loss,1959,28%,0.00%,1715,1.12,1.3,61%,1.3,1.3,84.70%,88.60%,13.40%,78%,56.47%,49.56%,50.92%,0.10%
-,Win,4983,72%,100.00%,2193,2.16,1.4,65%,3,15.1,86.50%,91.40%,85.70%,95%,57.32%,50.39%,49.80%,0.20%
-,,,,,,,,,,,,,,,,,,
-,Battle Type,Battles,% Battles,WR,DPB,KPB,Spot,Top tier,DR,KDR,Hit rate,Pen rate,Surv%,Share live,Player WR,Allies WR,Enemies WR,No stats
-,Encounter,4652,67%,73.00%,1969,1.98,1.4,67%,2.5,6,85.70%,90.70%,66.80%,91%,57.43%,50.41%,50.33%,0.30%
-,Supremacy,2290,33%,69.30%,2238,1.63,1.2,60%,2,4.3,87.10%,91.20%,62.20%,89%,56.37%,49.63%,49.69%,0.00%
-,,,,,,,,,,,,,,,,,,
-,Tier,Battles,% Battles,WR,DPB,KPB,Spot,Top tier,DR,KDR,Hit rate,Pen rate,Surv%,Share live,Player WR,Allies WR,Enemies WR,No stats
-,Bottom tier,2480,36%,69.50%,1750,1.53,1.2,0%,2.2,3.9,85.40%,89.20%,60.70%,88%,56.91%,50.13%,49.99%,0.10%
-,Top tier,4462,64%,73.10%,2229,2.05,1.5,100%,2.4,6.4,86.50%,91.60%,67.90%,91%,57.18%,50.16%,50.19%,0.20%
-,,,,,,,,,,,,,,,,,,
-,Tank Tier,Battles,% Battles,WR,DPB,KPB,Spot,Top tier,DR,KDR,Hit rate,Pen rate,Surv%,Share live,Player WR,Allies WR,Enemies WR,No stats
-,1,89,1%,80.90%,678,1.89,1.9,40%,3,7.6,86.20%,91.80%,75.30%,95%,55.40%,48.80%,48.40%,0.00%
-,2,180,3%,77.80%,970,2.64,1.6,73%,3.3,9.1,82.90%,90.60%,71.10%,93%,56.04%,49.36%,49.46%,0.90%
-,3,540,8%,75.70%,1099,2.15,1.4,36%,3.1,7,83.60%,90.00%,69.10%,93%,57.55%,51.15%,50.16%,1.90%
-,4,628,9%,75.20%,1256,2.21,1.3,73%,3.1,7.4,85.00%,91.60%,70.20%,94%,55.72%,51.76%,51.65%,0.00%
-,5,626,9%,80.20%,1503,2.29,1.3,71%,3.2,8.3,86.90%,89.50%,72.20%,93%,55.69%,50.38%,49.95%,0.00%
-,6,1064,15%,74.20%,1801,1.97,1.4,62%,2.4,5.8,86.70%,92.20%,65.90%,90%,56.82%,49.24%,49.31%,0.00%
-,7,1141,16%,71.80%,2143,1.69,1.3,50%,2.5,4.9,85.70%,90.10%,65.80%,90%,58.48%,49.62%,49.60%,0.00%
-,8,1222,18%,68.20%,2371,1.59,1.4,67%,2.1,4.2,87.40%,90.90%,61.80%,89%,56.84%,49.80%,49.99%,0.00%
-,9,598,9%,64.70%,2806,1.61,1.2,49%,2.1,4,89.10%,91.90%,59.50%,87%,56.58%,50.13%,50.32%,0.00%
-,10,854,12%,65.60%,3270,1.62,1.5,100%,2,4,88.30%,90.20%,59.60%,88%,58.37%,50.83%,51.16%,0.00%
-,,,,,,,,,,,,,,,,,,
-,Tank Class,Battles,% Battles,WR,DPB,KPB,Spot,Top tier,DR,KDR,Hit rate,Pen rate,Surv%,Share live,Player WR,Allies WR,Enemies WR,No stats
-,Light Tank,1337,19%,74.40%,1589,1.88,1.9,59%,2.3,5.9,83.70%,89.20%,68.40%,90%,57.15%,50.20%,49.90%,0.70%
-,Medium Tank,1957,28%,73.10%,2181,1.99,1.7,67%,2.4,5.9,88.20%,91.40%,66.40%,90%,57.23%,50.26%,50.12%,0.10%
-,Heavy Tank,2032,29%,70.00%,2180,1.75,1.2,70%,1.9,5,87.20%,90.70%,65.20%,91%,56.72%,50.16%,50.23%,0.00%
-,Tank Destroyer,1616,23%,70.30%,2144,1.84,0.7,59%,3,4.8,85.10%,92.60%,61.50%,91%,57.31%,49.98%,50.16%,0.00%
-,,,,,,,,,,,,,,,,,,
-,Player WR,Battles,% Battles,WR,DPB,KPB,Spot,Top tier,DR,KDR,Hit rate,Pen rate,Surv%,Share live,Player WR,Allies WR,Enemies WR,No stats
-,35 - 45%,80,1%,43.80%,1255,0.93,1,55%,1.1,1.5,84.00%,87.10%,37.50%,82%,44.52%,49.84%,51.14%,0.00%
-,45 - 50%,584,8%,69.20%,1397,1.46,1.1,62%,1.8,3.8,81.20%,87.40%,61.30%,89%,47.86%,49.84%,49.86%,0.00%
-,50 - 55%,1970,28%,69.00%,1861,1.73,1.3,63%,2.1,4.3,85.40%,90.20%,60.20%,88%,53.06%,50.10%,49.99%,0.00%
-,55 - 65%,3677,53%,73.50%,2249,2.01,1.4,66%,2.5,6.3,87.50%,91.50%,68.10%,92%,58.78%,50.13%,50.14%,0.00%
-,65 -   %,631,9%,76.40%,2274,1.95,1.4,61%,2.8,7,84.60%,91.40%,72.10%,91%,69.92%,50.79%,50.51%,1.90%
-,,,,,,,,,,,,,,,,,,
-,Player Hit Rate,Battles,% Battles,WR,DPB,KPB,Spot,Top tier,DR,KDR,Hit rate,Pen rate,Surv%,Share live,Player WR,Allies WR,Enemies WR,No stats
-, 0 - 25%,32,0%,43.80%,1,0,1.6,47%,0,0,0.00%,    inf%,25.00%,57%,54.55%,50.15%,51.14%,0.00%
-,25 - 50%,47,1%,44.70%,693,0.34,1.3,51%,0.6,0.5,38.70%,90.50%,36.20%,77%,55.05%,50.14%,51.15%,0.00%
-,50 - 60%,172,2%,56.40%,876,0.6,1.2,58%,0.8,1.1,54.70%,87.80%,44.80%,81%,56.38%,50.61%,50.48%,0.00%
-,60 - 70%,461,7%,58.80%,1254,1.08,1.2,61%,1.4,2.4,65.40%,87.70%,54.20%,87%,56.29%,50.18%,50.50%,0.00%
-,70 - 80%,941,14%,70.50%,1691,1.59,1.3,63%,2,4.6,75.50%,89.10%,65.70%,91%,56.92%,50.36%,50.24%,0.00%
-,80 - 90%,2091,30%,74.00%,2071,1.98,1.4,66%,2.5,6.3,85.00%,90.60%,68.50%,93%,57.00%,50.10%,50.08%,0.10%
-,90 - 95%,1258,18%,81.00%,2561,2.52,1.5,66%,3.3,11,92.30%,92.00%,77.10%,96%,57.73%,50.08%,49.85%,0.30%
-,95 -   %,1940,28%,69.60%,2259,1.82,1.4,64%,2.2,4.5,99.00%,91.70%,59.80%,86%,57.17%,50.12%,50.11%,0.40%
-,,,,,,,,,,,,,,,,,,
-,Player Pen Rate,Battles,% Battles,WR,DPB,KPB,Spot,Top tier,DR,KDR,Hit rate,Pen rate,Surv%,Share live,Player WR,Allies WR,Enemies WR,No stats
-, 0 - 25%,49,1%,38.80%,6,0,1.5,39%,0,0,45.80%,10.50%,22.40%,56%,55.11%,49.96%,50.47%,0.00%
-,25 - 50%,43,1%,30.20%,447,0.19,1.7,44%,0.3,0.2,82.30%,38.40%,20.90%,66%,55.41%,50.75%,51.06%,0.00%
-,50 - 60%,110,2%,41.80%,642,0.27,1.5,60%,0.5,0.4,77.50%,53.10%,32.70%,70%,54.44%,50.46%,50.61%,0.00%
-,60 - 70%,210,3%,52.40%,1085,0.63,1.3,56%,0.9,1.1,81.00%,65.10%,40.00%,79%,55.71%,50.58%,50.39%,0.00%
-,70 - 80%,469,7%,65.00%,1669,1.33,1.4,61%,1.6,3.1,83.50%,75.40%,57.60%,89%,56.39%,50.24%,50.30%,0.00%
-,80 - 90%,1544,22%,71.60%,2076,1.86,1.4,61%,2.3,5.5,86.00%,85.30%,66.30%,92%,57.35%,50.17%,50.03%,0.20%
-,90 - 95%,1210,17%,79.30%,2509,2.53,1.5,66%,3.3,11,87.80%,92.40%,77.00%,96%,57.57%,50.00%,50.09%,0.20%
-,95 -   %,3307,48%,73.30%,2100,1.88,1.3,67%,2.4,5.5,86.30%,99.30%,65.60%,90%,57.11%,50.14%,50.10%,0.20%
-,,,,,,,,,,,,,,,,,,
-Server,account_id_anon,Battles,% Battles,WR,DPB,KPB,Spot,Top tier,DR,KDR,Hit rate,Pen rate,Surv%,Share live,Player WR,Allies WR,Enemies WR,No stats
-RU,1,33,0%,78.80%,3112,1.91,1.6,67%,2.5,7.9,89.60%,90.20%,75.80%,87%,71.43%,50.74%,51.07%,0.00%
-RU,2,23,0%,87.00%,3525,2.78,1.7,74%,4.3,32,90.40%,94.40%,91.30%,100%,59.39%,48.07%,48.75%,0.00%
-RU,3,81,1%,66.70%,1927,1.47,1,75%,1.9,3.1,82.30%,89.60%,53.10%,86%,69.59%,50.23%,50.85%,0.00%
-EU,4,26,0%,80.80%,4082,2.62,1.2,62%,4.1,17,91.10%,93.80%,84.60%,98%,53.92%,48.75%,49.31%,0.00%
-EU,5,79,1%,59.50%,1920,0.97,1.4,75%,1.4,2,80.20%,87.10%,50.60%,84%,59.06%,50.12%,51.22%,0.00%
-EU,6,92,1%,60.90%,1685,0.99,1.5,65%,1.3,1.8,87.80%,88.50%,45.70%,83%,57.79%,50.30%,50.77%,0.00%
-EU,7,50,1%,78.00%,2787,2.92,1.9,52%,4,16.2,90.60%,92.70%,82.00%,99%,64.87%,50.49%,50.50%,0.00%
-EU,8,69,1%,60.90%,1695,1.48,1.9,55%,1.5,3,87.80%,92.10%,50.70%,77%,54.73%,50.06%,49.81%,0.10%
-EU,9,33,0%,63.60%,1529,1.55,1.9,64%,2,3.6,82.10%,91.30%,57.60%,85%,52.48%,49.85%,50.92%,0.00%
-EU,10,22,0%,90.90%,2990,3.82,1,59%,3.6,42,85.60%,93.00%,90.90%,100%,57.27%,48.97%,49.67%,0.00%
-EU,11,35,1%,62.90%,1197,0.97,1.1,66%,1.3,2,85.20%,88.10%,51.40%,81%,55.89%,50.71%,49.97%,0.00%
-EU,12,20,0%,95.00%,4854,3.95,1.2,25%,4.9,79,94.40%,95.60%,95.00%,99%,56.71%,49.15%,49.81%,0.00%
-EU,13,80,1%,73.80%,2228,2.65,1.4,69%,3.3,8.5,92.10%,92.70%,68.80%,95%,58.83%,49.43%,49.21%,0.00%
-EU,14,30,0%,83.30%,2167,3.93,2,63%,4.2,19.7,87.90%,92.00%,80.00%,98%,62.43%,50.39%,49.69%,0.00%
-EU,15,305,4%,55.40%,2126,1.21,1.3,78%,1.6,2.4,85.80%,90.90%,49.50%,87%,58.91%,50.46%,50.47%,0.00%
-EU,16,49,1%,69.40%,2362,2.47,1.5,43%,4,7.1,90.20%,93.30%,65.30%,94%,62.94%,49.43%,49.50%,0.00%
-EU,17,22,0%,86.40%,1898,4.41,1.4,95%,4.8,48.5,90.60%,94.80%,90.90%,100%,57.61%,48.11%,49.25%,0.00%
-EU,18,96,1%,76.00%,1764,2.19,0.9,67%,3.2,7.2,89.40%,95.00%,69.80%,94%,56.39%,50.00%,49.58%,0.00%
-EU,19,23,0%,95.70%,1997,2.09,1.3,65%,3.8,16,90.70%,94.20%,87.00%,98%,70.96%,48.51%,49.66%,0.00%
-EU,20,256,4%,54.30%,1081,0.58,1.5,55%,0.9,0.8,81.10%,83.80%,28.10%,68%,52.29%,50.31%,49.81%,0.00%
-EU,21,73,1%,82.20%,1025,1.9,1.5,55%,2.7,6.3,84.20%,92.30%,69.90%,94%,58.95%,51.61%,50.45%,0.00%
-EU,22,53,1%,79.20%,1415,1.98,0.9,47%,3.2,7,87.40%,90.40%,71.70%,95%,57.15%,50.10%,49.76%,0.00%
-EU,23,70,1%,81.40%,2224,2.5,1.8,47%,4,9.7,89.20%,90.20%,74.30%,96%,61.99%,50.85%,50.17%,0.00%
-EU,24,83,1%,73.50%,3049,2.1,2,73%,3.2,7.2,89.60%,91.70%,71.10%,96%,60.48%,49.78%,49.51%,0.00%
-EU,25,127,2%,68.50%,1609,1.86,1.3,52%,2.4,4.5,83.40%,89.50%,59.10%,89%,54.64%,49.76%,49.35%,0.00%
-EU,26,52,1%,80.80%,2669,2.62,2.2,50%,3,11.3,87.80%,91.00%,76.90%,95%,62.66%,49.60%,49.65%,0.20%
-EU,27,30,0%,86.70%,4246,3.17,1.4,57%,3.6,23.8,88.10%,95.30%,86.70%,99%,56.38%,49.10%,49.54%,0.00%
-EU,28,24,0%,83.30%,2823,2.96,1.8,62%,4.9,17.8,89.30%,91.20%,83.30%,98%,64.91%,50.25%,51.06%,0.00%
-EU,29,29,0%,75.90%,1750,1.62,1.3,59%,2.2,3.6,88.10%,93.60%,55.20%,91%,54.39%,49.78%,49.34%,0.00%
-EU,30,26,0%,92.30%,2631,3.12,1.8,69%,3.1,27,92.90%,93.80%,88.50%,97%,57.57%,49.93%,49.96%,0.00%
-EU,31,31,0%,90.30%,2126,2.16,1.2,61%,3.4,13.4,85.20%,91.20%,83.90%,98%,52.31%,50.24%,49.30%,0.00%
-EU,32,44,1%,77.30%,1848,2.91,0.7,77%,3.4,14.2,85.40%,91.70%,79.50%,96%,50.22%,50.67%,50.91%,0.00%
-EU,33,74,1%,94.60%,1811,3.24,1.5,59%,4.1,48,86.80%,86.30%,93.20%,99%,56.08%,49.98%,49.17%,0.00%
-EU,34,158,2%,77.80%,1290,1.66,0.9,53%,2.4,4.4,78.40%,90.70%,62.70%,93%,49.45%,49.80%,50.05%,0.00%
-EU,35,21,0%,61.90%,1796,1.19,1.4,86%,1.5,2.5,77.00%,86.60%,52.40%,82%,48.99%,50.98%,50.38%,0.00%
-EU,36,120,2%,55.80%,1730,1.1,1.6,68%,1.3,2.2,85.30%,85.90%,49.20%,83%,60.61%,50.43%,49.95%,0.10%
-EU,37,25,0%,88.00%,5110,3.6,1.5,96%,3.7,45,94.90%,91.70%,92.00%,100%,60.44%,50.29%,51.16%,0.00%
-EU,38,350,5%,62.00%,1159,1.09,1.3,63%,1.2,2.3,83.10%,89.70%,52.30%,84%,52.65%,50.37%,50.42%,0.00%
-EU,39,25,0%,84.00%,4965,2.72,1.5,84%,3.6,13.6,89.40%,91.30%,80.00%,97%,54.95%,49.64%,50.59%,0.00%
-EU,40,22,0%,90.90%,4394,3.09,2.3,64%,4.2,34,92.60%,90.30%,90.90%,98%,52.49%,50.46%,50.63%,0.00%
-EU,41,57,1%,63.20%,3078,1.63,2.3,96%,2,3.3,85.40%,86.30%,50.90%,85%,60.62%,51.59%,52.10%,0.00%
-EU,42,22,0%,68.20%,2270,0.95,1.3,91%,1.6,1.9,85.20%,88.90%,50.00%,85%,59.46%,50.97%,50.61%,0.00%
-EU,43,45,1%,64.40%,1482,0.93,1.6,62%,1.2,1.8,83.00%,91.60%,48.90%,79%,50.40%,51.15%,50.79%,0.00%
-EU,44,56,1%,96.40%,1927,2.79,1.6,77%,5.4,31.2,85.60%,90.20%,91.10%,98%,54.95%,49.96%,49.62%,0.00%
-EU,45,28,0%,96.40%,4659,3.5,1.4,64%,3.8,49,89.00%,91.70%,92.90%,100%,54.81%,49.56%,49.85%,0.00%
-EU,46,134,2%,70.90%,1291,1.99,1,49%,3.3,5.6,82.90%,91.80%,64.20%,94%,55.71%,51.75%,51.64%,0.00%
-EU,47,51,1%,72.50%,1119,1.43,0.9,78%,1.9,3.8,89.20%,89.20%,62.70%,89%,52.58%,52.04%,52.06%,0.00%
-EU,48,45,1%,86.70%,2756,2.71,2.2,64%,4.1,12.2,90.10%,91.50%,77.80%,97%,63.68%,49.88%,49.92%,0.00%
-EU,49,35,1%,97.10%,5932,3.57,1.1,94%,5.7,41.7,88.10%,96.30%,91.40%,99%,70.46%,49.51%,50.42%,0.00%
-EU,50,186,3%,60.80%,1169,1.02,1.2,49%,1.2,2.1,80.20%,89.20%,52.20%,84%,56.65%,50.14%,50.07%,0.00%
-EU,51,25,0%,92.00%,2194,4.68,2.3,60%,4.9,117,86.20%,92.00%,96.00%,100%,70.74%,52.26%,51.76%,0.00%
-EU,52,93,1%,62.40%,1444,1.1,1.1,54%,1.7,2.9,88.00%,92.30%,62.40%,85%,72.96%,49.89%,50.29%,0.00%
-EU,53,25,0%,80.00%,2374,2.8,1.5,68%,3.5,11.7,86.80%,90.50%,76.00%,95%,60.96%,49.42%,48.68%,0.00%
-EU,54,30,0%,53.30%,2384,1.27,1.7,73%,1.6,2.5,85.00%,86.50%,50.00%,81%,54.58%,49.33%,50.27%,0.00%
-EU,55,29,0%,79.30%,2219,1.93,1.6,69%,2.1,5.1,88.30%,86.10%,62.10%,89%,47.58%,50.43%,49.39%,0.00%
-EU,56,73,1%,69.90%,2036,2.33,0.9,64%,3.2,8.5,90.80%,94.00%,72.60%,95%,52.47%,49.24%,49.05%,0.10%
-EU,57,26,0%,96.20%,949,3.08,2,50%,3.2,26.7,83.20%,87.10%,88.50%,97%,46.64%,49.42%,48.36%,0.00%
-EU,58,20,0%,65.00%,344,0.45,0.9,45%,0.7,1.3,75.50%,73.80%,65.00%,83%,45.36%,49.30%,49.03%,0.00%
-EU,59,149,2%,34.90%,1105,0.8,1.1,60%,0.9,1.1,82.80%,85.80%,28.90%,78%,45.21%,50.08%,51.28%,0.00%
-EU,60,22,0%,63.60%,1108,0.91,1,91%,1.3,1.4,78.70%,85.00%,36.40%,81%,54.54%,49.66%,49.03%,0.00%
-EU,61,36,1%,94.40%,2794,3.81,2.5,83%,6.2,45.7,85.30%,92.10%,91.70%,100%,63.28%,50.37%,50.28%,0.00%
-EU,62,32,0%,31.20%,1786,1.19,0.9,75%,1.8,2,90.60%,91.90%,40.60%,88%,61.60%,49.13%,50.35%,0.00%
-EU,63,21,0%,85.70%,2476,3.33,2,76%,4.8,35,91.50%,95.70%,90.50%,99%,53.93%,50.29%,49.74%,0.00%
-NA,64,23,0%,91.30%,2371,3.57,0.9,70%,4.8,20.5,86.10%,92.50%,82.60%,99%,58.19%,49.00%,50.44%,0.30%
-NA,65,25,0%,96.00%,4281,2.56,1.8,72%,4.1,64,90.20%,91.40%,96.00%,100%,62.10%,51.41%,50.28%,0.00%
-NA,66,238,3%,76.10%,2183,1.56,1.5,50%,2.8,5.7,79.70%,89.90%,72.70%,92%,68.48%,50.75%,50.57%,0.00%
-NA,67,56,1%,73.20%,2022,1.88,1.3,68%,2.5,6.6,85.20%,90.40%,71.40%,93%,55.31%,49.88%,49.73%,0.10%
-NA,68,25,0%,92.00%,6141,3.36,1.2,100%,3.5,28,92.20%,93.80%,88.00%,99%,62.64%,49.81%,50.96%,0.00%
-NA,69,44,1%,77.30%,4178,1.93,1.5,77%,3,12.1,92.10%,91.60%,84.10%,98%,53.67%,50.20%,50.23%,0.00%
-NA,70,26,0%,96.20%,3412,3.46,1.8,69%,3.6,90,92.20%,93.90%,96.20%,100%,65.85%,48.95%,49.25%,0.00%
-NA,71,58,1%,77.60%,1642,1.93,0.9,60%,2.2,5.6,86.00%,94.60%,65.50%,87%,46.03%,49.73%,50.08%,0.00%
-NA,72,197,3%,78.20%,2416,2.37,1.2,64%,3.3,10.8,86.30%,92.80%,78.20%,97%,56.68%,49.22%,49.50%,0.00%
-NA,73,23,0%,60.90%,3932,1.91,2,87%,3,4.9,89.50%,90.70%,60.90%,89%,60.65%,48.75%,50.51%,0.00%
-NA,74,42,1%,78.60%,1431,2.45,0.7,36%,2.2,6.9,84.50%,89.30%,64.30%,90%,50.81%,49.26%,49.33%,0.00%
-NA,75,21,0%,81.00%,3748,3.29,1.3,57%,4,17.2,91.90%,92.50%,81.00%,100%,61.77%,48.23%,48.98%,0.00%
-NA,76,34,0%,88.20%,2707,2.59,1.4,68%,3,44,84.50%,90.50%,94.10%,96%,55.79%,50.34%,49.42%,0.00%
-NA,77,115,2%,74.80%,2171,2.19,1.4,74%,2.9,8.4,89.00%,91.40%,73.90%,95%,59.53%,49.65%,49.88%,0.00%
-NA,78,23,0%,65.20%,1958,1.96,0.5,61%,2.3,5.6,89.80%,93.30%,65.20%,92%,62.10%,50.31%,49.85%,0.00%
-NA,79,218,3%,74.30%,1860,2.16,1.5,65%,2.6,7.2,85.90%,91.60%,70.20%,95%,53.76%,50.11%,49.84%,0.00%
-NA,80,35,1%,57.10%,3142,1.71,1.9,80%,2.3,3.2,90.00%,93.10%,45.70%,86%,56.23%,50.16%,51.49%,0.00%
-NA,81,32,0%,90.60%,3407,2.62,1.2,62%,3.6,16.8,85.80%,91.90%,84.40%,97%,54.91%,49.20%,49.43%,0.00%
-NA,82,20,0%,90.00%,4472,3.4,2.2,75%,4.1,34,86.20%,83.10%,90.00%,100%,50.16%,50.67%,50.02%,0.00%
-NA,83,51,1%,72.50%,1023,2.08,1.1,76%,2.2,5.6,88.30%,93.20%,62.70%,91%,73.85%,56.05%,50.69%,23.20%
-NA,84,47,1%,80.90%,3820,2.45,1.4,85%,3.7,12.8,93.20%,94.90%,80.90%,98%,61.01%,50.73%,50.39%,0.00%
-NA,85,71,1%,91.50%,3159,2.73,0.9,65%,3.9,27.7,89.40%,92.40%,90.10%,99%,55.39%,49.64%,50.01%,0.00%
-NA,86,28,0%,85.70%,4249,2.46,1.3,79%,3.1,23,91.90%,93.70%,89.30%,95%,61.07%,50.13%,50.15%,0.00%
-NA,87,24,0%,75.00%,3048,2.17,1.9,75%,2.7,10.4,85.40%,90.00%,79.20%,98%,55.74%,49.79%,50.05%,0.00%
-NA,88,34,0%,67.60%,3317,2.21,2.1,65%,3.6,6.8,90.50%,91.30%,67.60%,96%,61.83%,49.97%,49.88%,0.00%
-NA,89,23,0%,30.40%,1399,0.52,1.3,91%,0.9,0.8,87.30%,85.40%,30.40%,71%,49.58%,50.38%,51.69%,0.00%
-NA,90,20,0%,75.00%,1305,0.6,1.4,60%,1.1,1.7,88.10%,80.10%,65.00%,91%,48.23%,49.76%,49.40%,0.00%
-NA,91,24,0%,79.20%,2554,2.96,1.2,50%,5.6,17.8,93.30%,95.50%,83.30%,98%,58.79%,50.82%,51.10%,0.00%
-NA,92,48,1%,56.20%,1707,0.69,0.7,92%,0.8,1.4,81.30%,86.80%,52.10%,87%,55.85%,53.43%,53.97%,0.00%
-NA,93,130,2%,62.30%,1912,1.31,1.3,70%,1.3,2.9,89.00%,91.70%,55.40%,86%,59.63%,49.95%,50.11%,0.00%
-NA,94,35,1%,77.10%,3875,2.74,1.8,57%,3.6,12,89.60%,94.40%,77.10%,95%,59.73%,49.60%,50.04%,0.00%
-NA,95,23,0%,73.90%,2688,3.17,1,74%,3.4,14.6,92.50%,93.20%,78.30%,96%,51.21%,49.86%,50.33%,0.00%
-NA,96,26,0%,61.50%,1796,1.19,1.2,31%,1.6,2.8,75.60%,84.20%,57.70%,91%,54.00%,50.02%,50.03%,0.00%
-NA,97,21,0%,90.50%,1869,2.52,2.3,76%,3.2,17.7,85.40%,89.60%,85.70%,96%,56.43%,49.38%,49.01%,0.00%
-NA,98,101,1%,71.30%,1499,2,0.7,58%,2.7,5.3,83.30%,91.50%,62.40%,93%,52.60%,49.80%,49.63%,0.10%
-NA,99,20,0%,60.00%,1368,1,0.9,45%,1.4,2.9,83.50%,87.90%,65.00%,84%,54.73%,50.49%,50.26%,0.00%
-NA,100,24,0%,79.20%,1998,2.54,1.6,75%,3.4,20.3,85.30%,83.70%,87.50%,98%,53.43%,50.95%,50.42%,0.30%
-NA,101,26,0%,42.30%,1170,0.77,1.7,73%,1.3,1.2,75.50%,86.50%,34.60%,81%,46.59%,49.31%,50.13%,0.00%
-NA,102,26,0%,53.80%,1013,0.85,0.8,62%,1.1,1.2,74.20%,82.40%,26.90%,83%,52.75%,49.08%,49.42%,0.00%
-NA,103,23,0%,91.30%,3980,3,1.4,83%,3.1,34.5,86.00%,90.80%,91.30%,97%,63.72%,49.86%,49.82%,0.00%
-NA,104,57,1%,71.90%,1694,1.49,0.6,74%,2.8,4.7,82.80%,86.80%,68.40%,92%,46.26%,49.48%,48.84%,0.00%
-ASIA,105,330,5%,82.40%,2195,2.01,1.7,63%,2.7,7.5,89.80%,92.70%,73.00%,94%,57.98%,49.95%,49.71%,0.00%
-ASIA,106,132,2%,77.30%,1268,1.31,0.8,58%,2.2,3.5,82.20%,92.40%,62.10%,85%,62.78%,49.79%,50.26%,0.00%
-ASIA,107,21,0%,90.50%,3749,3.67,1.8,81%,4.1,38.5,90.70%,93.70%,90.50%,97%,53.77%,49.37%,50.06%,0.00%
-ASIA,108,35,1%,85.70%,4501,2.6,1.6,74%,4,15.2,89.10%,91.20%,82.90%,99%,54.47%,49.39%,49.24%,0.00%
-ASIA,109,67,1%,73.10%,1278,1.7,1.5,54%,2.8,5.7,83.80%,88.00%,70.10%,93%,55.23%,51.01%,50.11%,0.10%
-ASIA,110,70,1%,91.40%,1525,1.54,1.1,54%,3.5,54,78.50%,86.10%,97.10%,99%,49.45%,49.53%,48.75%,0.00%
-ASIA,111,49,1%,67.30%,2050,1.96,0.7,73%,2.7,5.3,85.70%,91.40%,63.30%,93%,52.58%,49.79%,49.79%,0.00%

upload_wotb_replays.py

@@ -1,5 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.8
-## PYTHON VERSION MUST BE 3.7 OR HIGHER
 
 import json, argparse, inspect, sys, os, io, base64, aiohttp, urllib, asyncio, aiofiles, aioconsole
 import logging, re, concurrent.futures, configparser, motor.motor_asyncio, ssl, zipfile