From 14b163190947a57615789b0ace82ae6b03012689 Mon Sep 17 00:00:00 2001 From: Jylpah Date: Fri, 21 Feb 2020 00:03:00 +0200 Subject: [PATCH 1/3] Updated the list of required python modules --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4f4c854..f93b54d 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,11 @@ Python scripts to analyze WoT Blitz replays and stats. All the scripts require [ 1. Install [Python 3.8](https://www.python.org/downloads/) on to your computer/laptop 1. Download all the files including the [maps.json](maps.json) and [tanks.json](tanks.json) files -1. Install the required Python modules: aiohttp, aioconsole, aiofiles, beautifulsoup4, lxml, xmltodict +1. Install the required Python modules: motor, aiohttp, aioconsole, aiofiles, aiosqlite, beautifulsoup4, lxml, xmltodict, progress ``` # Remember to run the command with a Python interpreter >= 3.7 -python3.8 -m pip install motor aiohttp aioconsole aiofiles aiosqlite beautifulsoup4 lxml xmltodict progress +python3.8 -m pip install motor aiohttp aioconsole aiofiles aiosqlite beautifulsoup4 lxml xmltodict progress ``` 4. Upload your replays. Run _python.exe .\wotbreplay_uploader.py --help_ (Windows) or _./wotbreplay_uploader.py --help_ (Linux) From 1b656c87ee17125bfb9d5cc899322b94fd073a64 Mon Sep 17 00:00:00 2001 From: Jylpah Date: Sun, 23 Feb 2020 01:04:18 +0200 Subject: [PATCH 2/3] Update 6.8 --- maps.json | 1 + tanks.json | 113 +++++++++++++++++++++++++++++++++-------------------- 2 files changed, 71 insertions(+), 43 deletions(-) diff --git a/maps.json b/maps.json index 20ff83f..66d9fc4 100644 --- a/maps.json +++ b/maps.json @@ -26,6 +26,7 @@ "ordeal": "Trial by Fire", "pliego": "Castilla", "port": "Port Bay", + "rift": "Hellas", "rock": "Mayan Ruins", "rudniki": "Mines", "savanna": "Oasis Palms", diff --git a/tanks.json b/tanks.json index 8cbb7eb..7d704bb 100644 --- a/tanks.json +++ b/tanks.json @@ -1,7 +1,7 @@ { "status": "ok", "meta": { - "count": 426 + "count": 429 }, "data": { "1": { @@ -37,12 +37,12 @@ "name": "Type 59" }, "81": { - "is_premium": false, - "name": "Vickers Medium Mk. I", - "nation": "uk", "tank_id": 81, + "nation": "uk", "tier": 1, - "type": "mediumTank" + "is_premium": false, + "type": "mediumTank", + "name": "Vickers Medium Mk. I" }, "113": { "tank_id": 113, @@ -117,12 +117,12 @@ "name": "Tiger I" }, "545": { - "is_premium": false, - "name": "T1 Cunningham", - "nation": "usa", "tank_id": 545, + "nation": "usa", "tier": 1, - "type": "lightTank" + "is_premium": false, + "type": "lightTank", + "name": "T1 Cunningham" }, "577": { "tank_id": 577, @@ -418,7 +418,7 @@ "tier": 7, "is_premium": true, "type": "AT-SPG", - "name": "Helsing H0" + "name": "Helsing" }, "1665": { "tank_id": 1665, @@ -757,12 +757,12 @@ "name": "Black Prince" }, "3329": { - "is_premium": false, - "name": "MS-1", - "nation": "ussr", "tank_id": 3329, + "nation": "ussr", "tier": 1, - "type": "lightTank" + "is_premium": false, + "type": "lightTank", + "name": "MS-1" }, "3345": { "tank_id": 3345, @@ -2624,7 +2624,7 @@ "tank_id": 20257, "nation": "usa", "tier": 10, - "is_premium": true, + "is_premium": false, "type": "lightTank", "name": "XM551 Sheridan" }, @@ -3186,7 +3186,7 @@ "tier": 7, "is_premium": true, "type": "mediumTank", - "name": "T6 Dracula" + "name": "Dracula" }, "63841": { "tank_id": 63841, @@ -3194,7 +3194,7 @@ "tier": 5, "is_premium": true, "type": "mediumTank", - "name": "Panzer IV Anko Special" + "name": "Panzer IV Ankou Special" }, "64001": { "tank_id": 64001, @@ -3285,12 +3285,12 @@ "name": "IS-6 Fearless" }, "64785": { - "is_premium": false, - "name": "Pz.Kpfw. II", - "nation": "germany", "tank_id": 64785, - "tier": 2, - "type": "lightTank" + "nation": "germany", + "tier": 1, + "is_premium": false, + "type": "lightTank", + "name": "Pz.Kpfw. II" }, "64801": { "tank_id": 64801, @@ -3317,20 +3317,20 @@ "name": "MS-1" }, "65041": { - "is_premium": false, - "name": "Leichttraktor", - "nation": "germany", "tank_id": 65041, + "nation": "germany", "tier": 1, - "type": "lightTank" + "is_premium": false, + "type": "lightTank", + "name": "Leichttraktor" }, "65057": { - "is_premium": false, - "name": "T1 Cunningham", - "nation": "usa", "tank_id": 65057, + "nation": "usa", "tier": 1, - "type": "lightTank" + "is_premium": false, + "type": "lightTank", + "name": "T1 Cunningham" }, "65105": { "tank_id": 65105, @@ -3341,20 +3341,20 @@ "name": "Vickers Medium Mk. I" }, "65281": { - "is_premium": false, - "name": "MS-1", - "nation": "ussr", "tank_id": 65281, + "nation": "ussr", "tier": 1, - "type": "lightTank" + "is_premium": false, + "type": "lightTank", + "name": "MS-1" }, "65297": { - "is_premium": false, - "name": "Leichttraktor", - "nation": "germany", "tank_id": 65297, + "nation": "germany", "tier": 1, - "type": "lightTank" + "is_premium": false, + "type": "lightTank", + "name": "Leichttraktor" }, "65313": { "tank_id": 65313, @@ -3373,12 +3373,12 @@ "name": "Type 62" }, "65361": { - "is_premium": false, - "name": "Vickers Medium Mk. I", - "nation": "uk", "tank_id": 65361, + "nation": "uk", "tier": 1, - "type": "mediumTank" + "is_premium": false, + "type": "mediumTank", + "name": "Vickers Medium Mk. I" }, "65377": { "tank_id": 65377, @@ -3411,6 +3411,30 @@ "is_premium": true, "type": "AT-SPG", "name": "SU-130PM" + }, + "18769": { + "tank_id": 18769, + "nation": "uk", + "tier": 8, + "is_premium": true, + "type": "heavyTank", + "name": "Caernarvon Action X" + }, + "19281": { + "tank_id": 19281, + "nation": "uk", + "tier": 10, + "is_premium": true, + "type": "heavyTank", + "name": "Super Conqueror" + }, + "19537": { + "tank_id": 19537, + "nation": "uk", + "tier": 10, + "is_premium": true, + "type": "lightTank", + "name": "Vickers Light 105" } }, "userStr": { @@ -3825,6 +3849,9 @@ "S04_Lago-I": "Lago", "A99_T92E1": "T92E1", "GB_Centurion_MkDF": "Defender Mk. 1", - "R159_SU_130PM": "SU-130PM" + "R159_SU_130PM": "SU-130PM", + "GB91_Super_Conqueror": "Super Conqueror", + "GB93_Caernarvon_AX": "Caernarvon Action X", + "GB_Vickers_Light_105": "Vickers Light 105" } } \ No newline at end of file From 4908693eaa401940ca70f07be9890f9829d31b35 Mon Sep 17 00:00:00 2001 From: Jylpah Date: Sun, 23 Feb 2020 01:49:53 +0200 Subject: [PATCH 3/3] Change verbosity of posted replay logging --- blitzutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blitzutils.py b/blitzutils.py index b98c29d..90d7ebb 100644 --- a/blitzutils.py +++ b/blitzutils.py @@ -1197,7 +1197,7 @@ class WoTinspector: error(msg_str +' : ' + title + ' : Received invalid JSON') elif (json_resp['status'] == 'ok'): debug('Response data read') - verbose(msg_str + title + ' posted') + verbose_std(msg_str + title + ' posted') return json_resp elif (json_resp['status'] == 'error'): error(msg_str + json_resp['error']['message'] + ' : ' + title)