Merge pull request #232 from mathsman5133/feature/static-data-hash

Feature/static data hash

Author: lukasthaler

coc/__init__.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = "3.4.0"
+__version__ = "3.4.1"
 
 from .abc import BasePlayer, BaseClan
 from .clans import RankedClan, Clan

coc/static/buildings.json

@@ -49021,8 +49021,8 @@
         "DPS": [],
         "AltDPS": [],
         "Damage": [
-            55,
-            60
+            60,
+            65
         ],
         "PreferredTarget": [],
         "PreferredTargetDamageMod": [],

coc/static/characters.json

@@ -69471,9 +69471,9 @@
             150
         ],
         "Hitpoints": [
+            6300,
             6650,
-            7050,
-            7400
+            7000
         ],
         "TrainingTime": [
             220,
@@ -69515,9 +69515,9 @@
         ],
         "CoolDownOverride": [],
         "DPS": [
+            190,
             210,
-            230,
-            250
+            230
         ],
         "PreferedTargetDamageMod": [],
         "DamageRadius": [],

coc/static/update_static.py

@@ -9,6 +9,8 @@
 import zstandard
 import lzma
 import csv
+import os
+import zipfile
 from collections import defaultdict
 
 # Targets first index is the URL and the second is the filename. If filename
@@ -26,6 +28,7 @@
 ]
 FINGERPRINT = "c4e8c2976dcf42530d68dcb1fdfb61d071085abf"
 BASE_URL = f"https://game-assets.clashofclans.com/{FINGERPRINT}"
+APK_URL = "https://d.apkpure.net/b/APK/com.supercell.clashofclans?version=latest"
 
 
 def decompress(data):
@@ -69,6 +72,7 @@ def decompress(data):
         decompressed = lzma.LZMADecompressor().decompress(data)
     return decompressed
 
+
 def process_csv(data, file_path, save_name):
     decompressed = decompress(data)
 
@@ -128,6 +132,10 @@ def process_csv(data, file_path, save_name):
 
         jsonf.write(json.dumps(data, indent=4))
 
+    # clean up the .csv file, it is not used in coc.py
+    os.unlink(file_path)
+
+
 def check_header(data):
     if data[0] == 0x5D:
         return "csv"
@@ -137,6 +145,30 @@ def check_header(data):
         return "sig:"
     raise Exception("  Unknown header")
 
+
+def get_fingerprint():
+    import aiohttp
+    import asyncio
+
+    async def download():
+        async with aiohttp.request('GET', APK_URL) as fp:
+            c = await fp.read()
+        return c
+
+    data = asyncio.run(download())
+
+    with open("apk.zip", "wb") as f:
+        f.write(data)
+    zf = zipfile.ZipFile("apk.zip")
+    with zf.open('assets/fingerprint.json') as fp:
+        fingerprint = json.loads(fp.read())['sha']
+
+    # clean up apk
+    os.unlink("apk.zip")
+
+    return fingerprint
+
+
 def main():
     for target_file, target_save in TARGETS:
         target_save = target_file if target_save is None else target_save

docs/conf.py

@@ -15,7 +15,7 @@
 project = 'coc'
 copyright = '2022, mathsman5133'
 author = 'mathsman5133'
-release = '3.4.0'
+release = '3.4.1'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

docs/miscellaneous/changelog.rst

@@ -7,12 +7,20 @@ Changelog
 This page keeps a fairly detailed, human readable version
 of what has changed, and whats new for each version of the lib.
 
+v3.4.1
+------
+
+Additions:
+~~~~~~~~~~
+- added the missing achievements to :class:`coc.ACHIEVEMENT_ORDER`
+- updated static data to reflect the March 26th balance patch
+
 v3.4.0
 ------
 
 Additions:
 ~~~~~~~~~~
-- added the new Fireball equipment to `coc.EQUIPMENT`
+- added the new Fireball equipment to :class:`coc.EQUIPMENT`
 
 Bugs Fixed:
 ~~~~~~~~~~~

pyproject.toml

@@ -7,7 +7,7 @@ name = "coc.py"
 authors = [{ name = "mathsman5133" }]
 maintainers = [{ name = "majordoobie" }, { name = "MagicTheDev" }, { name = "Kuchenmampfer" },
     { name = "lukasthaler"}, { name = "doluk"}]
-version = "3.4.0"
+version = "3.4.1"
 description = "A python wrapper for the Clash of Clans API"
 requires-python = ">=3.7.3"
 readme = "README.rst"