diff --git a/pyproject.toml b/pyproject.toml index 134ceb1..4e8afaa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "blitz-models" -version = "1.1.2" +version = "1.1.3" authors = [{ name = "Jylpah", email = "jylpah@gmail.com" }] description = "Pydantic models for Wargaming's World of Tanks Blitz game " readme = "README.md" diff --git a/src/blitzmodels/replay.py b/src/blitzmodels/replay.py index cd0a498..c6d41ae 100644 --- a/src/blitzmodels/replay.py +++ b/src/blitzmodels/replay.py @@ -61,7 +61,8 @@ def update_title(self, tankopedia: WGApiWoTBlitzTankopedia, maps: Maps) -> str: map_name = maps[self.mapName].name else: map_name = self.mapName - self.title = f"{tank_name} @ {map_name} by {self.playerName}" + # self.title = f"{tank_name} @ {map_name} by {self.playerName}" + self.title = f"{tank_name} @ {map_name}" return self.title diff --git a/src/blitzmodels/wotinspector/wi_apiv2.py b/src/blitzmodels/wotinspector/wi_apiv2.py index 0353723..ac7d028 100644 --- a/src/blitzmodels/wotinspector/wi_apiv2.py +++ b/src/blitzmodels/wotinspector/wi_apiv2.py @@ -811,7 +811,6 @@ def __init__( self.session = ThrottledClientSession( rate_limit=rate_limit, filters=[("GET", re.compile(self.URL_REPLAYS + r"(\?.*)?$"))], - re_filter=False, limit_filtered=True, headers=headers, ) diff --git a/tests/05_Maps_new.json b/tests/05_Maps_new.json index 6d0e664..06652c9 100644 --- a/tests/05_Maps_new.json +++ b/tests/05_Maps_new.json @@ -1 +1,350 @@ -{"Random": {"key": "Random", "name": "Random map", "id": -1, "mode": 1}, "amigosville": {"key": "amigosville", "name": "Falls Creek", "id": -1, "mode": 1}, "amigosville_02": {"key": "amigosville_02", "name": "Falls Creek - Bridge", "id": -1, "mode": 3}, "amigosville_03": {"key": "amigosville_03", "name": "Falls Creek - Factory", "id": -1, "mode": 3}, "asia": {"key": "asia", "name": "Lost Temple", "id": -1, "mode": 1}, "canal": {"key": "canal", "name": "Canal", "id": -1, "mode": 1}, "canal_01": {"key": "canal_01", "name": "Canal - Factory", "id": -1, "mode": 3}, "canyon": {"key": "canyon", "name": "Canyon", "id": -1, "mode": 1}, "desert_train": {"key": "desert_train", "name": "Desert Sands", "id": -1, "mode": 1}, "desert_train_02": {"key": "desert_train_02", "name": "Desert Sands - Town", "id": -1, "mode": 3}, "desert_train_03": {"key": "desert_train_03", "name": "Desert Sands - Dunes", "id": -1, "mode": 3}, "erlenberg": {"key": "erlenberg", "name": "Middleburg", "id": -1, "mode": 1}, "erlenberg_01": {"key": "erlenberg_01", "name": "Middleburg - Town", "id": -1, "mode": 3}, "erlenberg_02": {"key": "erlenberg_02", "name": "Middleburg - Hill", "id": -1, "mode": 3}, "faust": {"key": "faust", "name": "Faust", "id": -1, "mode": 1}, "forgecity": {"key": "forgecity", "name": "New Bay", "id": -1, "mode": 1}, "fort": {"key": "fort", "name": "Fort Despair", "id": -1, "mode": 1}, "grossberg": {"key": "grossberg", "name": "Dynasty's Pearl", "id": -1, "mode": 1}, "himmelsdorf": {"key": "himmelsdorf", "name": "Himmelsdorf", "id": -1, "mode": 1}, "holland": {"key": "holland", "name": "Molendijk", "id": -1, "mode": 1}, "holmeisk": {"key": "holmeisk", "name": "Wasteland", "id": -1, "mode": 1}, "iceworld": {"key": "iceworld", "name": "Everfrost", "id": -1, "mode": 2}, "idle": {"key": "idle", "name": "Yukon", "id": -1, "mode": 1}, "italy": {"key": "italy", "name": "Vineyards", "id": -1, "mode": 1}, "karelia": {"key": "karelia", "name": "Rockfield", "id": -1, "mode": 1}, "karieri": {"key": "karieri", "name": "Copperfield", "id": -1, "mode": 1}, "lake": {"key": "lake", "name": "Mirage", "id": -1, "mode": 1}, "lumber": {"key": "lumber", "name": "Horrorstadt", "id": -1, "mode": 1}, "lumber_01": {"key": "lumber_01", "name": "Alpenstadt - Town", "id": -1, "mode": 3}, "malinovka": {"key": "malinovka", "name": "Winter Malinovka", "id": -1, "mode": 1}, "medvedkovo": {"key": "medvedkovo", "name": "Dead Rail", "id": -1, "mode": 1}, "medvedkovo_02": {"key": "medvedkovo_02", "name": "Dead Rail - Valley", "id": -1, "mode": 3}, "medvedkovo_03": {"key": "medvedkovo_03", "name": "Dead Rail - Railroad", "id": -1, "mode": 3}, "milbase": {"key": "milbase", "name": "Yamato Harbor", "id": -1, "mode": 1}, "milbase_02": {"key": "milbase_02", "name": "Yamato Harbor - Battleship", "id": -1, "mode": 3}, "milbase_03": {"key": "milbase_03", "name": "Yamato Harbor - Hills", "id": -1, "mode": 3}, "milbase_04": {"key": "milbase_04", "name": "Yamato Harbor - Center", "id": -1, "mode": 3}, "milbase_05": {"key": "milbase_05", "name": "Yamato Harbor - Dock", "id": -1, "mode": 3}, "moon": {"key": "moon", "name": "Sea of Tranquility", "id": -1, "mode": 2}, "mountain": {"key": "mountain", "name": "Black Goldville", "id": -1, "mode": 1}, "neptune": {"key": "neptune", "name": "Normandy", "id": -1, "mode": 1}, "neptune_01": {"key": "neptune_01", "name": "Normandy - Hills", "id": -1, "mode": 3}, "neptune_02": {"key": "neptune_02", "name": "Normandy - Beach", "id": -1, "mode": 3}, "north": {"key": "north", "name": "North", "id": -1, "mode": 1}, "ordeal": {"key": "ordeal", "name": "Trial by Fire", "id": -1, "mode": 1}, "plant": {"key": "plant", "name": "Ghost Factory", "id": -1, "mode": 1}, "pliego": {"key": "pliego", "name": "Castilla", "id": -1, "mode": 1}, "port": {"key": "port", "name": "Port Bay", "id": -1, "mode": 1}, "rift": {"key": "rift", "name": "Hellas", "id": -1, "mode": 1}, "rock": {"key": "rock", "name": "Mayan Ruins", "id": -1, "mode": 1}, "rudniki": {"key": "rudniki", "name": "Mines", "id": -1, "mode": 1}, "rudniki_01": {"key": "rudniki_01", "name": "Mines - Hill", "id": -1, "mode": 3}, "rudniki_02": {"key": "rudniki_02", "name": "Mines - Village", "id": -1, "mode": 3}, "rudniki_03": {"key": "rudniki_03", "name": "Mines - Center", "id": -1, "mode": 3}, "savanna": {"key": "savanna", "name": "Oasis Palms", "id": -1, "mode": 1}, "skit": {"key": "skit", "name": "Naval Frontier", "id": -1, "mode": 1}, "test": {"key": "test", "name": "World of Ducks", "id": -1, "mode": 2}, "tutorial": {"key": "tutorial", "name": "Proving Grounds", "id": -1, "mode": 0}} \ No newline at end of file +{ + "Random": { + "key": "Random", + "name": "Random map", + "id": -1, + "mode": 1 + }, + "amigosville": { + "key": "amigosville", + "name": "Falls Creek", + "id": -1, + "mode": 1 + }, + "amigosville_02": { + "key": "amigosville_02", + "name": "Falls Creek - Bridge", + "id": -1, + "mode": 3 + }, + "amigosville_03": { + "key": "amigosville_03", + "name": "Falls Creek - Factory", + "id": -1, + "mode": 3 + }, + "asia": { + "key": "asia", + "name": "Lost Temple", + "id": -1, + "mode": 1 + }, + "canal": { + "key": "canal", + "name": "Canal", + "id": -1, + "mode": 1 + }, + "canal_01": { + "key": "canal_01", + "name": "Canal - Factory", + "id": -1, + "mode": 3 + }, + "canyon": { + "key": "canyon", + "name": "Canyon", + "id": -1, + "mode": 1 + }, + "desert_train": { + "key": "desert_train", + "name": "Desert Sands", + "id": -1, + "mode": 1 + }, + "desert_train_02": { + "key": "desert_train_02", + "name": "Desert Sands - Town", + "id": -1, + "mode": 3 + }, + "desert_train_03": { + "key": "desert_train_03", + "name": "Desert Sands - Dunes", + "id": -1, + "mode": 3 + }, + "erlenberg": { + "key": "erlenberg", + "name": "Middleburg", + "id": -1, + "mode": 1 + }, + "erlenberg_01": { + "key": "erlenberg_01", + "name": "Middleburg - Town", + "id": -1, + "mode": 3 + }, + "erlenberg_02": { + "key": "erlenberg_02", + "name": "Middleburg - Hill", + "id": -1, + "mode": 3 + }, + "faust": { + "key": "faust", + "name": "Faust", + "id": -1, + "mode": 1 + }, + "forgecity": { + "key": "forgecity", + "name": "New Bay", + "id": -1, + "mode": 1 + }, + "fort": { + "key": "fort", + "name": "Fort Despair", + "id": -1, + "mode": 1 + }, + "grossberg": { + "key": "grossberg", + "name": "Dynasty's Pearl", + "id": -1, + "mode": 1 + }, + "himmelsdorf": { + "key": "himmelsdorf", + "name": "Himmelsdorf", + "id": -1, + "mode": 1 + }, + "holland": { + "key": "holland", + "name": "Molendijk", + "id": -1, + "mode": 1 + }, + "holmeisk": { + "key": "holmeisk", + "name": "Wasteland", + "id": -1, + "mode": 1 + }, + "iceworld": { + "key": "iceworld", + "name": "Everfrost", + "id": -1, + "mode": 2 + }, + "idle": { + "key": "idle", + "name": "Yukon", + "id": -1, + "mode": 1 + }, + "italy": { + "key": "italy", + "name": "Vineyards", + "id": -1, + "mode": 1 + }, + "karelia": { + "key": "karelia", + "name": "Rockfield", + "id": -1, + "mode": 1 + }, + "karieri": { + "key": "karieri", + "name": "Copperfield", + "id": -1, + "mode": 1 + }, + "lake": { + "key": "lake", + "name": "Mirage", + "id": -1, + "mode": 1 + }, + "lumber": { + "key": "lumber", + "name": "Horrorstadt", + "id": -1, + "mode": 1 + }, + "lumber_01": { + "key": "lumber_01", + "name": "Alpenstadt - Town", + "id": -1, + "mode": 3 + }, + "malinovka": { + "key": "malinovka", + "name": "Winter Malinovka", + "id": -1, + "mode": 1 + }, + "medvedkovo": { + "key": "medvedkovo", + "name": "Dead Rail", + "id": -1, + "mode": 1 + }, + "medvedkovo_02": { + "key": "medvedkovo_02", + "name": "Dead Rail - Valley", + "id": -1, + "mode": 3 + }, + "medvedkovo_03": { + "key": "medvedkovo_03", + "name": "Dead Rail - Railroad", + "id": -1, + "mode": 3 + }, + "milbase": { + "key": "milbase", + "name": "Yamato Harbor", + "id": -1, + "mode": 1 + }, + "milbase_02": { + "key": "milbase_02", + "name": "Yamato Harbor - Battleship", + "id": -1, + "mode": 3 + }, + "milbase_03": { + "key": "milbase_03", + "name": "Yamato Harbor - Hills", + "id": -1, + "mode": 3 + }, + "milbase_04": { + "key": "milbase_04", + "name": "Yamato Harbor - Center", + "id": -1, + "mode": 3 + }, + "milbase_05": { + "key": "milbase_05", + "name": "Yamato Harbor - Dock", + "id": -1, + "mode": 3 + }, + "moon": { + "key": "moon", + "name": "Sea of Tranquility", + "id": -1, + "mode": 2 + }, + "mountain": { + "key": "mountain", + "name": "Black Goldville", + "id": -1, + "mode": 1 + }, + "neptune": { + "key": "neptune", + "name": "Normandy", + "id": -1, + "mode": 1 + }, + "neptune_01": { + "key": "neptune_01", + "name": "Normandy - Hills", + "id": -1, + "mode": 3 + }, + "neptune_02": { + "key": "neptune_02", + "name": "Normandy - Beach", + "id": -1, + "mode": 3 + }, + "north": { + "key": "north", + "name": "North", + "id": -1, + "mode": 1 + }, + "ordeal": { + "key": "ordeal", + "name": "Trial by Fire", + "id": -1, + "mode": 1 + }, + "plant": { + "key": "plant", + "name": "Ghost Factory", + "id": -1, + "mode": 1 + }, + "pliego": { + "key": "pliego", + "name": "Castilla", + "id": -1, + "mode": 1 + }, + "port": { + "key": "port", + "name": "Port Bay", + "id": -1, + "mode": 1 + }, + "rift": { + "key": "rift", + "name": "Hellas", + "id": -1, + "mode": 1 + }, + "rock": { + "key": "rock", + "name": "Mayan Ruins", + "id": -1, + "mode": 1 + }, + "rudniki": { + "key": "rudniki", + "name": "Mines", + "id": -1, + "mode": 1 + }, + "rudniki_01": { + "key": "rudniki_01", + "name": "Mines - Hill", + "id": -1, + "mode": 3 + }, + "rudniki_02": { + "key": "rudniki_02", + "name": "Mines - Village", + "id": -1, + "mode": 3 + }, + "rudniki_03": { + "key": "rudniki_03", + "name": "Mines - Center", + "id": -1, + "mode": 3 + }, + "savanna": { + "key": "savanna", + "name": "Oasis Palms", + "id": -1, + "mode": 1 + }, + "skit": { + "key": "skit", + "name": "Naval Frontier", + "id": -1, + "mode": 1 + }, + "test": { + "key": "test", + "name": "World of Ducks", + "id": -1, + "mode": 2 + }, + "tutorial": { + "key": "tutorial", + "name": "Proving Grounds", + "id": -1, + "mode": 0 + } +}