add pyutils

Fix --filters and improve performance when filtering

.gitignore

@@ -0,0 +1,15 @@
+__pycache__/
+BlitzApp
+tmp/
+ssl/
+*.ini
+*.swp
+*.code-workspace
+*.sqlite3
+.vscode/
+*.sqlite3-journal
+.gitattributes
+export*
+*.csv
+!/stats/*.csv
+!*.py

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "pyutils"]
+	path = pyutils
+	url = https://github.com/Jylpah/pyutils.git

README.md

@@ -1,5 +1,5 @@
 # blitz-tools
-Python scripts to analyze WoT Blitz replays and stats. All the scripts require [Python 3.7](https://www.python.org/downloads/) or higher. I am using 3.8 myself so you may have to change the Python interpreter version in the scripts' first line. 
+Python scripts to analyze WoT Blitz replays and stats. All the scripts require [Python 3.7](https://www.python.org/downloads/) or later. 
 
 ### Replays
 * [upload_wotb_replays.py](upload_wotb_replays.py): An asynchronous replay uploader. 
@@ -13,46 +13,48 @@ Python scripts to analyze WoT Blitz replays and stats. All the scripts require [
 * [blitzutils.py](blitzutils.py): A utils class for various Blitz related to functions. *Other scripts use this*, so you need to place it to the same folder with the other scripts
 
 ### Data
-* [tanks.json](tanks.json): Tankopedia in WG JSON format extracted from the Blitz app files with [extract_tankopedia.py]](extractTankopedia.py]). Contains only limited information required by the scripts. 
+* [tanks.json](tanks.json): Tankopedia in WG JSON format extracted from the Blitz app files with [extract_tankopedia.py](extractTankopedia.py). Contains only limited information required by the scripts. 
-* [maps.json](maps.json): Blitz map names extracted from the Blitz app files with [extract_tankopedia.py]](extract_tankopedia.py]). 
+* [maps.json](maps.json): Blitz map names extracted from the Blitz app files with [extract_tankopedia.py](extract_tankopedia.py). 
 
 ### Quick instructions
 
-1. Install [Python 3.8](https://www.python.org/downloads/) on to your computer/laptop
+1. Install [Python 3.8](https://www.python.org/downloads/) or later to your computer/laptop
-2. Install the required Python modules: motor, aiohttp, aioconsole, aiofiles, aiosqlite, beautifulsoup4, lxml, xmltodict, progress
+2. Install the required Python modules (see [requirements.txt](requirements.txt): motor, aiohttp, aioconsole, aiofiles, aiosqlite, beautifulsoup4, lxml, xmltodict, progress
 ```
-# Remember to run the command with a Python interpreter >= 3.7
+python -m pip install -r requirements.txt
-python -m pip install motor aiohttp aioconsole aiofiles aiosqlite beautifulsoup4 lxml xmltodict progress 
 ```
-3. Download all the files including the [maps.json](maps.json) and [tanks.json](tanks.json) files. **The recommened way** is to install the scipts via `git clone`: [GitHub Desktop](https://desktop.github.com/) is an excellent GUI for git. This makes it easy to receive the updates via `git pull`. 
+3. Clone the repository. [GitHub Desktop](https://desktop.github.com/) is an excellent GUI for `git`. This makes it easy to receive the updates via `git pull`. 
-
-4. Upload your replays. 
 ```
-# Windows, run directly from Command Prompt or Powershell
+git clone https://github.com/Jylpah/blitz-tools.git
-# Check the options
+```
+4. Upload your replays with `upload_wotb_replays.py` 
+```
+## Check the options
+# Windows Command Prompt or Powershell
 python.exe .\upload_wotb_replays.py --help
 
-# Syntax
+# Linux or Windows Subsystem for Linux (WSL)
-python.exe .\upload_wotb_replays.py REPLAY_FILE.wotbreplay
+./upload_wotb_replays.py --help
+
+# Upload replays (Windows)
+python.exe .\upload_wotb_replays.py REPLAY_FILE.wotbreplay  DIR_WITH_REPLAYS
 
 # example
 python.exe .\upload_wotb_replays.py 20200223_0122__jylpah_T-54_grossberg.wotbreplay
-
-# Linux
-./upload_wotb_replays.py --help
 ```
-5. Analyze replays. 
+5. Analyze replays with `analyze_wotb_replays.py`
 ```
-# Windows, run directly from Command Prompt or Powershell
+## Check options
+# Windows Command Prompt or Powershell
 python.exe .\analyze_wotb_replays.py --help
 
-# Syntax
+# Syntax (Windows)
-python.exe .\analyze_wotb_replays.py REPLAY_FILE.wotbreplay.json
+python.exe .\analyze_wotb_replays.py REPLAY_FILE.wotbreplay.json [DIR_WITH_REPLAYS ...]
 
-# Example
+# Example (Windows)
 python.exe .\analyze_wotb_replays.py 20200223_0122__jylpah_T-54_grossberg.wotbreplay.json
 
-# Linux
+# Linux or Windows Subsystem for Linux (WSL)
 ./analyze_wotb_replays.py --help
 ```
 

blitzutils.py

@@ -486,6 +486,16 @@ def NOW() -> int:
     return int(time.time())
 
 
+def get_date_str(timestamp:int = NOW(), date_format = '%Y%m%d_%H%M%S'):
+    """Return YYYYMMDD_HHmm date string"""
+    try:
+        ts = datetime.fromtimestamp(timestamp)
+        return ts.strftime(date_format)
+    except Exception as err:
+        error(exception=err)
+    return None
+
+
 def rebase_file_args(current_dir, files):
     """REbase file command line params after moving working dir to the script's dir""" 
     if isinstance(files, list):    
@@ -633,6 +643,14 @@ def get_JSON_value(json, key : str = None, keys : list = None, keypath = None):
     raise KeyError('Key not found: ' + get_JSON_keypath(keypath, keys[0]))
 
 
+def sort_dict(d: dict, number: bool = False) -> dict:
+    """Sort a dict by keys"""
+    if number:
+        return dict(sorted(d.items(), key=lambda item: int(item[0])))
+    else:
+        return dict(sorted(d.items(), key=lambda item: item[0]))
+
+
 # -----------------------------------------------------------
 # Class SlowBar 
 # -----------------------------------------------------------
@@ -916,33 +934,18 @@ class WG:
 
 
     @classmethod
-    def get_map(cls, map_str: str) -> str:
+    def get_map(self, map_str: str) -> str:
         """Return map name from short map string in replays"""
         try:
-            return cls.maps[map_str]
+            return self.maps[map_str]
         except:
             error('Map ' + map_str + ' not found')
         return None
     
 
     @classmethod
-    def get_map_user_strs(cls) -> str:
+    def get_tank_user_strs(self) -> str:
-        return cls.maps.keys()
+        return self.tanks["userStr"].keys()
-
-
-    @classmethod
-    def tank_str2name(cls, tank_str: str) -> str:
-        """Return tank name from short tank string in replays"""
-        try:
-            return cls.tanks["userStr"][tank_str]
-        except:
-            error('Tank ' + tank_str + ' not found')
-        return tank_str
-
-
-    @classmethod
-    def get_tank_user_strs(cls) -> str:
-        return cls.tanks["userStr"].keys()
 
 
     @classmethod
@@ -1079,10 +1082,14 @@ class WG:
         """Load tanks from tankopedia JSON"""
         if tankopedia_fn == None:
             return False
-
         try:
             with open(tankopedia_fn, 'rt', encoding='utf8') as f:
                 self.tanks = json.loads(f.read())
+                self.tanks['tankStr'] = dict()
+                p = re.compile('.+_short$')
+                for usr_str in self.tanks['userStr']:
+                    if p.match(usr_str) == None:
+                        self.tanks['tankStr'][self.tanks['userStr'][usr_str]] = usr_str
                 self.tanks_by_tier = dict()
                 for tier in range(1,11):
                     self.tanks_by_tier[str(tier)] = list()
@@ -1094,6 +1101,43 @@ class WG:
         return False     
     
 
+    def get_replay_filename(self, replay: dict):
+        try:
+            summary = replay['data']['summary']
+            timestamp   = int(summary['battle_start_timestamp'])
+            timestamp    = get_date_str(timestamp, date_format='%Y%m%d_%H%M')
+            player      = summary['player_name']
+            arena_id    = int(summary['arena_unique_id'])
+            vehicle     = self.name2tank_str(summary['vehicle'])
+            vehicle.replace(' ','_')
+
+            return '{:s}_{:s}_{:s}_{:d}.wotbreplay.json'.format(timestamp, player, vehicle, arena_id)
+        except Exception as err:
+            error('Unexpected Exception', err) 
+            return None 
+
+    def get_map_user_strs(self) -> str:
+        return self.maps.keys()
+
+
+    def tank_str2name(self, tank_str: str) -> str:
+        """Return tank name from short tank string in replays"""
+        try:
+            return self.tanks["userStr"][tank_str]
+        except:
+            error('Tank ' + tank_str + ' not found')
+        return tank_str
+
+    
+    def name2tank_str(self, name: str) -> str:
+        """Return shorttank string from tank string in replays"""
+        try:
+            return self.tanks["tankStr"][name]
+        except:
+            debug('Tank ' + name + ' not found')
+        return name
+
+
     def get_tanks_by_tier(self, tier: int) -> list():
         """Returns tank_ids by tier"""
         try:
@@ -1831,6 +1875,8 @@ class WoTinspector:
             except Exception as err:
                 debug(exception=err, id=N)
             await asyncio.sleep(SLEEP)
+            _id  = self.read_replay_id(json_resp)
+            json_resp['_id']  =  _id
             
         debug(' Could not post replay: ' + title, id=N)
         return json_resp

extract_tankopedia.py

@@ -3,6 +3,7 @@
 
 # Extract tankopedia data in WG API JSON format from Blitz app files (Android APK unzipped)
 
+from os import path
 import sys, argparse, json, os, inspect, aiohttp, asyncio, aiofiles, re, logging, time, xmltodict, collections, configparser
 import blitzutils as bu
 from blitzutils import WG
@@ -11,9 +12,11 @@ logging.getLogger("asyncio").setLevel(logging.DEBUG)
 
 FILE_CONFIG 	= 'blitzstats.ini'
 
-BLITZAPP_STRINGS='/assets/Data/Strings/en.yaml'
+# BLITZAPP_STRINGS='/assets/Data/Strings/en.yaml'
-BLITZAPP_VEHICLES_DIR='/assets/Data/XML/item_defs/vehicles/'
+# BLITZAPP_VEHICLES_DIR='/assets/Data/XML/item_defs/vehicles/'
-BLITZAPP_VEHICLE_FILE='/list.xml'
+BLITZAPP_STRINGS='Data/Strings/en.yaml'
+BLITZAPP_VEHICLES_DIR='Data/XML/item_defs/vehicles/'
+BLITZAPP_VEHICLE_FILE='list.xml'
 
 wg = None
 
@@ -79,8 +82,8 @@ async def main(argv):
         tankopedia = collections.OrderedDict()
         tankopedia['status'] = 'ok'
         tankopedia['meta'] = { "count":  len(tanks) }
-        tankopedia['data'] = tanks
+        tankopedia['data'] = bu.sort_dict(tanks, number=True)
-        tankopedia['userStr'] = userStrs
+        tankopedia['userStr'] = bu.sort_dict(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))
@@ -104,8 +107,11 @@ async def main(argv):
 async def extract_tanks(blitz_app_base : str, nation: str):
 
     tanks = []
-    list_xml_file = blitz_app_base + BLITZAPP_VEHICLES_DIR + nation + BLITZAPP_VEHICLE_FILE
+    # WG has changed the location of Data directory - at least in steam client
-    if not os.path.isfile(list_xml_file): 
+    if path.isdir(path.join(blitz_app_base, 'assets')):
+        blitz_app_base = path.join(blitz_app_base, 'assets')
+    list_xml_file = path.join(blitz_app_base, BLITZAPP_VEHICLES_DIR ,nation ,BLITZAPP_VEHICLE_FILE)
+    if not path.isfile(list_xml_file): 
         print('ERROR: cannot open ' + list_xml_file)
         return None
     bu.debug('Opening file: ' + list_xml_file + ' (Nation: ' + nation + ')')
@@ -132,7 +138,7 @@ async def read_user_strs(blitz_app_base : str) -> dict:
     """Read user strings to convert map and tank names"""
     tank_strs = {}
     map_strs = {}
-    filename = blitz_app_base + BLITZAPP_STRINGS
+    filename = path.join(blitz_app_base, BLITZAPP_STRINGS)
     bu.debug('Opening file: ' + filename + ' for reading UserStrings')
     try:
         async with aiofiles.open(filename, 'r', encoding="utf8") as f:

get_tankopedia.py

@@ -1,4 +1,4 @@
-#!/usr/local/bin/python3.7
+#!/usr/bin/env python3
 
 # Get Tankpedia from WoTinspector.com
 

maps.json

@@ -18,6 +18,7 @@
     "fort": "Fort Despair",
     "grossberg": "Dynasty's Pearl",
     "himmelsdorf": "Himmelsdorf",
+    "holland": "Molendijk",
     "holmeisk": "Wasteland",
     "iceworld": "Everfrost",
     "idle": "Yukon",
@@ -43,6 +44,7 @@
     "neptune_02": "Normandy - Beach",
     "north": "North",
     "ordeal": "Trial by Fire",
+    "plant": "Ghost Factory",
     "pliego": "Castilla",
     "port": "Port Bay",
     "rift": "Hellas",

releases.md

@@ -1,83 +1,96 @@
 # WoT Blitz releases 
 
-| Release | Date     | Notes       | Inaccurate? |
+| Release | Date     | Notes       |
-|:-------:|:--------:|-------------|-----|
+|:-------:|:--------:|-------------|
-| 7.9 | 2021-04-27 | Mines rework, new tutorial, colorblind mode, JgPz E100 legendary camo |  |
+| 9.1 | 2022-07-14 | Releases updated via DLC, graphics updates for Object 140, Patton 46 |
-| 7.8 | 2021-03-24 | Mid-tier balance changes, Grille line new consumables  |  |
+| 9.0 | 2022-06-08 | Japanies heavies, Castilla graphics update, new garage |
-| 7.7 | 2021-02-24 | Czechoslovakian medium tanks  |  |
+| 8.10 | 2022-04-28 | New battle results screen, new "Operation" mechanics |
-| 7.6 | 2021-01-27 | AMC 13 90, TOG II buffs, free replay camera  |  |
+| 8.9 | 2022-03-23 | "Free" camo resupply, VK 72.01 supplies |
-| 7.5 | 2020-12-09 | ATGM removal, Batchat, Kpz70, T-2020 buff |  |
+| 8.8 | 2022-02-16 | Molendijk map |
-| 7.4 | 2020-11-12 | TD buffs, Clan missions |  |
+| 8.7 | 2022-01-19 | Soviet Light Tanks |
-| 7.3 | 2020-10-08 | Swedish HT line |  |
+| 8.6 | 2021-12-15 | Joining Light and Medium Tank classes in MM |
-| 7.2 | 2020-08-19 | Balance changes, added tier X ammo capa, new aiming reticles |  |
+| 8.5 | 2021-11-17 | New national crew voices, economy update |
-| 7.1 | 2020-07-15 | New Yukon map, IS-6, KV-4, Patton 48 armor buff, Grille DPM buff, SP IC, AMZ 13 75, M41 Bulldog mobility buff  |  |
+| 8.4 | 2021-10-20 | Polish heavy tanks |
-| 7.0 | 2020-06-17 | British LTs, graphics improvements, ATGM nerf, Sheridan nerf, map fixes |  |
+| 8.3 | 2021-09-16 | FV4005, FV4022, VK 91.01 (P) and WZ-121 legendary camos, -5 deg gun depression to WZ-120 |
-| 6.10 | 2020-04-29 | T92E1 nerf, Tier V-IX heavy HP buff, Battle Pass, map fixes |  |
+| 8.2 | 2021-08-18 | Ghost Factory map, XP/credits nerf for inactive players, new store UI |
-| 6.9 | 2020-03-25 | Japanese TDs, Tier X heavy HP buff |  |
+| 8.1 | 2021-07-15 | Armor highlighting updated |
-| 6.8 | 2020-02-19 | ATGM nerf, Hellas map |  |
+| 8.0 | 2021-06-08 | American experimental heavies (Yoh-line), PBR camos |
-| 6.7 | 2020-01-15 | ATGM US Lights |  | 
+| 7.9 | 2021-04-27 | Mines rework, new tutorial, colorblind mode, JgPz E100 legendary camo |
-| 6.6 | 2019-12-18 | T-62A + Leo buffs |  | 
+| 7.8 | 2021-03-24 | Mid-tier balance changes, Grille line new consumables |
-| 6.5 | 2019-11-21 | New UI |  | 
+| 7.7 | 2021-02-24 | Czechoslovakian medium tanks |
-| 6.4 | 2019-10-16 | Halloween map, mid-tier HT buff... |  | 
+| 7.6 | 2021-01-27 | AMC 13 90, TOG II buffs, free replay camera |
-| 6.3 | 2019-09-18 | European line |  | 
+| 7.5 | 2020-12-09 | ATGM removal, Batchat, Kpz70, T-2020 buff |
-| 6.2 | 2019-08-14 | New MM |  | 
+| 7.4 | 2020-11-12 | TD buffs, Clan missions |
-| 6.1 | 2019-07-10 | Autoloader buff |  | 
+| 7.3 | 2020-10-08 | Swedish HT line |
-| 6.0 | 2019-06-05 | UK TD line #2 |   | 
+| 7.2 | 2020-08-19 | Balance changes, added tier X ammo capa, new aiming reticles |
-| 5.10 | 2019-04-24 | new missions |   | 
+| 7.1 | 2020-07-15 | New Yukon map, IS-6, KV-4, Patton 48 armor buff, Grille DPM buff, SP IC, AMZ 13 75, M41 Bulldog mobility buff  |
-| 5.9 | 2019-03-27 | New shell tracers, minor fixes |  | 
+| 7.0 | 2020-06-17 | British LTs, graphics improvements, ATGM nerf, Sheridan nerf, map fixes |
-| 5.8 | 2019-02-21 | Chinese TD line |  | 
+| 6.10 | 2020-04-29 | T92E1 nerf, Tier V-IX heavy HP buff, Battle Pass, map fixes |
-| 5.7 | 2019-01-16 | Avatars |  | 
+| 6.9 | 2020-03-25 | Japanese TDs, Tier X heavy HP buff |
-| 5.6 | 2018-12-05 | Normandy map |   | 
+| 6.8 | 2020-02-19 | ATGM nerf, Hellas map |
-| 5.5 | 2018-11-13 | Low-tier clean-up |  | 
+| 6.7 | 2020-01-15 | ATGM US Lights |
-| 5.4 | 2018-10-10 | MM "rigging" adjusted |   | 
+| 6.6 | 2019-12-18 | T-62A + Leo buffs |
-| 5.3 | 2018-09-12 | MM "rigging" started, Newbie queue added |   | 
+| 6.5 | 2019-11-21 | New UI |
-| 5.2 | 2018-08-22 | Faust map |  | 
+| 6.4 | 2019-10-16 | Halloween map, mid-tier HT buff... |
-| 5.1 | 2018-07-31 | New MM: vehicle class matching |   | 
+| 6.3 | 2019-09-18 | European line |
-| 5.0 | 2018-06-30 | Vineyeards map update, Spare Parts killed |   | 
+| 6.2 | 2019-08-14 | New MM |
-| 4.10 | 2018-05-24 | Alpenstadt map |   | 
+| 6.1 | 2019-07-10 | Autoloader buff |
-| 4.9 | 2018-04-25 | Chinese heavy tanks |  | 
+| 6.0 | 2019-06-05 | UK TD line #2 | 
-| 4.8 | 2018-03-28 | Choice of battle modes, crew skills accelerator |   | 
+| 5.10 | 2019-04-24 | new missions | 
-| 4.7 | 2018-02-28 | New minimap |   | 
+| 5.9 | 2019-03-27 | New shell tracers, minor fixes |
-| 4.6 | 2018-01-31 | Chinese nation |   | 
+| 5.8 | 2019-02-21 | Chinese TD line |
-| 4.5 | 2017-12-19 | Dynasty's Pearl map |  | 
+| 5.7 | 2019-01-16 | Avatars |
-| 4.4 | 2017-11-09 | New British tanks |   | 
+| 5.6 | 2018-12-05 | Normandy map |
-| 4.3 | 2017-10-10 | Level 7 screw skills |   | 
+| 5.5 | 2018-11-13 | Low-tier clean-up :-( |
-| 4.2 | 2017-09-12 | French LTs, Naval Frontier map |   | 
+| 5.4 | 2018-10-10 | MM "rigging" adjusted |
-| 4.1 | 2017-08-16 | New markers |   | 
+| 5.3 | 2018-09-12 | MM "rigging" started, Newbie queue added | 
-| 4.0 | 2017-07-13 | Rating battles |  Y | 
+| 5.2 | 2018-08-22 | Faust map |
-| 3.10 | 2017-06-15 | Fixes | Y | 
+| 5.1 | 2018-07-31 | New MM: vehicle class matching |
-| 3.9 | 2017-05-19 | Military Honor, Mayan Ruins | Y | 
+| 5.0 | 2018-06-30 | Vineyeards map update, Spare Parts removed ! |
-| 3.8 | 2017-04-24 | Spare Parts, New 9-slot Equipment system | Y |
+| 4.10 | 2018-05-24 | Alpenstadt map | 
-| 3.7 | 2017-03-22 | Balance changes, Tournaments | Y |
+| 4.9 | 2018-04-25 | Chinese heavy tanks |
-| 3.6 | 2017-02-16 | Vehicle Enrichment | Y |
+| 4.8 | 2018-03-28 | Choice of battle modes, crew skills accelerator |
-| 3.5 | 2017-01-13 | Boosters, Dead rail update | Y |
+| 4.7 | 2018-02-28 | New minimap |
-| 3.4 | 2016-11-28 | Canyon map, USA T57 line |  |
+| 4.6 | 2018-01-31 | Chinese nation |
-| 3.3 | 2016-11-01 | Updated Mines map |  |
+| 4.5 | 2017-12-19 | Dynasty's Pearl map |
-| 3.2 | 2016-10-04 | Copperfield update |  |
+| 4.4 | 2017-11-09 | New British tanks | 
-| 3.1 | 2016-09-03 | Clan tournaments, Yamato Harbor map | Y |
+| 4.3 | 2017-10-10 | Level 7 screw skills |
-| 3.0 | 2016-07-20 | Supremacy mode, Falls Creek update | Y |
+| 4.2 | 2017-09-12 | French LTs, Naval Frontier map |
-| 2.11 | 2016-06-28 | Vineyeards map, Oasis Palms update, German paper TDs | |
+| 4.1 | 2017-08-16 | New markers |
-| 2.10 | 2016-06-07 | Rockfield map update, Tank birthdays, high-pen gun for IS-6 |  |
+| 4.0 | 2017-07-13 | Rating battles (date uncertain) | 
-| 2.9 | 2016-05-03 | Training rooms, +/-1 Matchmaker | Y |
+| 3.10 | 2017-06-15 | Fixes (date uncertain) |
-| 2.8 | 2016-04-04 | New Russian TD line, new consumables system | Y |
+| 3.9 | 2017-05-19 | Military Honor, Mayan Ruins (date uncertain) |
-| 2.7 | 2016-03-07 | Mirage map | Y |
+| 3.8 | 2017-04-24 | Spare Parts, New 9-slot Equipment system (date uncertain) |
-| 2.6 | 2016-02-10 | German LTs, shooting through obstacles | Y |
+| 3.7 | 2017-03-22 | Balance changes, Tournaments (date uncertain) |
-| 2.5 | 2016-01-11 | Camouflages, Clan supply | Y |
+| 3.6 | 2017-02-16 | Vehicle Enrichment (date uncertain) |
-| 2.4 | 2015-12-09 | Additional Japanese tanks, windows version | Y |
+| 3.5 | 2017-01-13 | Boosters, Dead rail update (date uncertain) |
-| 2.3 | 2015-11-12 | Canal map | Y |
+| 3.4 | 2016-11-28 | Canyon map, USA T57 line |
-| 2.2 | 2015-10-05 | Desert Sands map update | Y |
+| 3.3 | 2016-11-01 | Updated Mines map |
-| 2.1 | 2015-09-07 | UK TDs, Clan Chat | Y |
+| 3.2 | 2016-10-04 | Copperfield update |
-| 2.0 | 2015-08-05 | Clans, Oasis Palms updated | |
+| 3.1 | 2016-09-03 | Clan tournaments, Yamato Harbor map (date uncertain) |
-| 1.11 | 2015-07-13 | KV-2, KV-13, Sherman Jumbo | Y |
+| 3.0 | 2016-07-20 | Supremacy mode, Falls Creek update (date uncertain) |
-| 1.10 | 2015-06-11 | Port Bay map | Y |
+| 2.11 | 2016-06-28 | Vineyeards map, Oasis Palms update, German paper TDs |
-| 1.9 | 2015-05-13 | New German medium tanks (Leo) | Y |
+| 2.10 | 2016-06-07 | Rockfield map update, Tank birthdays, high-pen gun for IS-6 |
-| 1.8 | 2015-04-14 | Game tutorial, Bot map for new players  | Y |
+| 2.9 | 2016-05-03 | Training rooms, +/-1 Matchmaker (date uncertain) |
-| 1.7 | 2015-02-16 | US Turreted TDs | Y |
+| 2.8 | 2016-04-04 | New Russian TD line, new consumables system (date uncertain) |
-| 1.6 | 2015-01-19 | Castilla map, UK HT line | Y |
+| 2.7 | 2016-03-07 | Mirage map (date uncertain) |
-| 1.5 | 2014-12-01 | UK Nation | Y |
+| 2.6 | 2016-02-10 | German LTs, shooting through obstacles (date uncertain) |
-| 1.4 | 2014-10-29 | German HT line (Maus) | Y |
+| 2.5 | 2016-01-11 | Camouflages, Clan supply (date uncertain) |
-| 1.3 | 2014-10-02 | USSR IS-4 line, Lost Temple, Black Goldville maps | Y |
+| 2.4 | 2015-12-09 | Additional Japanese tanks, windows version (date uncertain) |
-| 1.2 | 2014-08-20 | Oasis Palms map | Y |
+| 2.3 | 2015-11-12 | Canal map (date uncertain) |
-| 1.1.1 | 2014-07-23 | Fixes :-) |  |
+| 2.2 | 2015-10-05 | Desert Sands map update (date uncertain) |
-| 1.0 | 2014-06-26 | Worldwide launch |  | 
+| 2.1 | 2015-09-07 | UK TDs, Clan Chat (date uncertain) |
-| 0.9 | 2014-05-05 | Nordic soft launch |   |
+| 2.0 | 2015-08-05 | Clans, Oasis Palms updated |
+| 1.11 | 2015-07-13 | KV-2, KV-13, Sherman Jumbo (date uncertain) |
+| 1.10 | 2015-06-11 | Port Bay map (date uncertain) |
+| 1.9 | 2015-05-13 | New German medium tanks (Leo) (date uncertain) |
+| 1.8 | 2015-04-14 | Game tutorial, Bot map for new players  (date uncertain) |
+| 1.7 | 2015-02-16 | US Turreted TDs (date uncertain) |
+| 1.6 | 2015-01-19 | Castilla map, UK HT line (date uncertain) |
+| 1.5 | 2014-12-01 | UK Nation (date uncertain) |
+| 1.4 | 2014-10-29 | German HT line (Maus) (date uncertain) |
+| 1.3 | 2014-10-02 | USSR IS-4 line, Lost Temple, Black Goldville maps (date uncertain) |
+| 1.2 | 2014-08-20 | Oasis Palms map (date uncertain) |
+| 1.1.1 | 2014-07-23 | Fixes :-) |
+| 1.0 | 2014-06-26 | Worldwide launch | 
+| 0.9 | 2014-05-05 | Nordic soft launch |

upload_wotb_replays.py

@@ -195,7 +195,7 @@ async def replayWorker(queue: asyncio.Queue, workerID: int, account_id: int, pri
 						bu.verbose_std(msg_str + title + ' has already been posted. Skipping.' )
 					else:
 						os.remove(replay_json_fn)
-						bu.debug(msg_str + "Replay JSON not valid: Deleting " + replay_json_fn, id=workerID)
+						bu.debug(msg_str + "Replay JSON not valid/complete: Deleting " + replay_json_fn, id=workerID)
 					SKIPPED_N += 1						
 					queue.task_done()						
 					continue
@@ -216,13 +216,13 @@ async def replayWorker(queue: asyncio.Queue, workerID: int, account_id: int, pri
 							if not bu.debug(msg_str + 'Replay saved OK: ' + filename):
 								bu.verbose_std(msg_str + title + ' posted')
 						else:
-							bu.warning(msg_str +'Replay file is not valid: ' + filename)
+							bu.warning(msg_str +'Replay file is not valid/complete: ' + filename)
 							ERROR_N += 1
 					else:
 						bu.error(msg_str + 'Error saving replay: ' + filename)
 						ERROR_N += 1
 				else:
-					bu.error(msg_str + 'Replay file is not valid: ' + filename)
+					bu.error(msg_str + 'Replay file is not valid/complete: ' + filename)
 					ERROR_N += 1	
 		except Exception as err:
 			bu.error(msg_str + 'Unexpected Exception: ' + str(type(err)) + ' : ' + str(err) )
@@ -287,13 +287,13 @@ def getTitle(replayfile: str, title: str = None, i : int = 0) -> str:
 					try:
 						metadata_json = json.load(meta)
 						#player = metadata_json['playerName']						
-						tank = wg.tank_str2name(metadata_json['playerVehicleName'])
+						tank_name = wg.get_tank_name(metadata_json['vehicleCompDescriptor'])
 						map_name = wg.get_map(metadata_json['mapName'])
-						bu.debug('Tank: ' + tank +  ' Map: ' + map_name)
+						bu.debug('Tank: ' + tank_name if tank_name != None else "NOT FOUND IN tanks.json" +  ' Map: ' + map_name)
 					except Exception as err:
 						bu.error(exception = err)
-			if (tank != None) and  (map_name != None):
+			if (tank_name != None) and  (map_name != None):
-				title = tank + ' @ ' + map_name
+				title = tank_name + ' @ ' + map_name
 			else:
 				title = re.sub('\\.wotbreplay$', '', filename)
 		except Exception as err: