foxapi 1.3.1__tar.gz → 1.3.3__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {foxapi-1.3.1 → foxapi-1.3.3}/PKG-INFO +1 -1
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/foxapi.py +18 -14
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi.egg-info/PKG-INFO +1 -1
- {foxapi-1.3.1 → foxapi-1.3.3}/setup.py +1 -1
- {foxapi-1.3.1 → foxapi-1.3.3}/LICENSE +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/README.md +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/10.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/11.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/11COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/11WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/12.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/12COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/12WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/13.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/14.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/15.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/16.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/17.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/17COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/17WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/18.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/18COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/18WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/19.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/19COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/19WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/20.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/21.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/22.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/23.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/27.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/27COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/27WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/28.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/28COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/28WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/29.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/29COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/29WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/30.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/30COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/30WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/32.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/33.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/33COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/33WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/34.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/34COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/34WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/35.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/35COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/35WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/37.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/37COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/37WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/38.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/39.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/39COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/39WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/40.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/41.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/45.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/45COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/45WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/46.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/46COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/46WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/47.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/47COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/47WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/5.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/51.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/51COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/51WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/52.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/52COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/52WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/53.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/53COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/53WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/54.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/56.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/56COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/56WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/57.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/57COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/57WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/58.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/58COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/58WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/59COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/59WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/5COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/5WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/6.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/60COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/60WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/61.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/62.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/6COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/6WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/7.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/75.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/75COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/75WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/7COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/7WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/8.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/84COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/84WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/8COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/8WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/9.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/9COLONIALS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/9WARDENS.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/DebugIcon.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/MapIconCivicCenter.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/MapIconCoalFieldColor.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/MapIconFortCursed.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/MapIconHomeBaseHallColonial.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/MapIconHomeBaseHallWarden.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/MapIconOilFieldColor.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/MapIconSafehouse.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/MapIconScorchedTown.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/MapIconSulfurColor.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/MapIconTownHall.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/MapIconTownHallColonial.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/MapIconTownHallWarden.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/MapIconVictory.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/MapIconVictoryColonial.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapIcons/MapIconVictoryWarden.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapAcrithiaHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapAllodsBightHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapAshFieldsHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapBasinSionnachHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapCallahansPassageHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapCallumsCapeHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapClahstraHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapClansheadValleyHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapDeadLandsHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapDrownedValeHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapEndlessShoreHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapFarranacCoastHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapFishermansRowHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapGodcroftsHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapGreatMarchHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapHeartlandsHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapHomeRegionC.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapHomeRegionW.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapHowlCountyHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapKalokaiHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapKingsCageHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapLinnMercyHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapLochMorHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapMarbanHollow.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapMooringCountyHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapMorgensCrossingHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapNevishLineHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapOarbreakerHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapOriginHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapReachingTrailHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapReaversPassHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapRedRiverHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapSableportHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapShackledChasmHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapSpeakingWoodsHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapStemaLandingHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapStlicanShelfHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapStonecradleHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapTempestIslandHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapTerminusHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapTheFingersHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapUmbralWildwoodHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapViperPitHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapWeatheredExpanseHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/Images/MapsHex/MapWestgateHex.png +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/__init__.py +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi/utils.py +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi.egg-info/SOURCES.txt +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi.egg-info/dependency_links.txt +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi.egg-info/requires.txt +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/foxapi.egg-info/top_level.txt +0 -0
- {foxapi-1.3.1 → foxapi-1.3.3}/setup.cfg +0 -0
|
@@ -22,20 +22,24 @@ import os
|
|
|
22
22
|
|
|
23
23
|
class FoxAPI():
|
|
24
24
|
def __init__(self, shard: str = "", image_dir: str = None, safe_mode: bool = True):
|
|
25
|
-
if shard in [1, "1", "-1"]:
|
|
26
|
-
shard: str = ""
|
|
25
|
+
if shard in ["", 1, "1", "-1"]:
|
|
26
|
+
shard: str = "live"
|
|
27
27
|
|
|
28
28
|
elif shard in [2, "2", "-2"]:
|
|
29
|
-
shard: str = "-2"
|
|
29
|
+
shard: str = "live-2"
|
|
30
30
|
|
|
31
31
|
elif shard in [3, "3", "-3"]:
|
|
32
|
-
shard: str = "-3"
|
|
32
|
+
shard: str = "live-3"
|
|
33
33
|
|
|
34
|
-
|
|
34
|
+
elif shard in ["dev", "devbranch"]:
|
|
35
|
+
shard: str = "dev"
|
|
36
|
+
|
|
37
|
+
self.base_api: str = f"https://war-service-{shard}.foxholeservices.com/api/worldconquest"
|
|
35
38
|
self.session: requests.Session = requests.Session()
|
|
36
39
|
|
|
37
40
|
if image_dir is not None:
|
|
38
41
|
self._img_dir: str = pathlib.Path(image_dir)
|
|
42
|
+
|
|
39
43
|
else:
|
|
40
44
|
self._img_dir: str = os.path.join(Path(__file__).parent, "Images")
|
|
41
45
|
|
|
@@ -72,11 +76,11 @@ class FoxAPI():
|
|
|
72
76
|
REQUESTS SYNC
|
|
73
77
|
"""
|
|
74
78
|
|
|
75
|
-
def get_data_sync(self, endpoint: str, etag: str = None, use_cache: bool = False):
|
|
79
|
+
def get_data_sync(self, endpoint: str, etag: str = None, use_cache: bool = False) -> APIResponse:
|
|
76
80
|
hexagon: str = self._retrieve_hexagon_from_endpoint(endpoint)
|
|
77
81
|
|
|
78
82
|
if use_cache == True:
|
|
79
|
-
cached_data = self.cache.get(endpoint)
|
|
83
|
+
cached_data: dict = self.cache.get(endpoint)
|
|
80
84
|
|
|
81
85
|
if cached_data is not None:
|
|
82
86
|
return APIResponse(headers={}, json=cached_data, status_code=None, hexagon=hexagon, is_cache=True)
|
|
@@ -110,7 +114,7 @@ class FoxAPI():
|
|
|
110
114
|
hexagon: str = self._retrieve_hexagon_from_endpoint(endpoint)
|
|
111
115
|
|
|
112
116
|
if use_cache == True:
|
|
113
|
-
cached_data = self.cache.get(endpoint)
|
|
117
|
+
cached_data: dict = self.cache.get(endpoint)
|
|
114
118
|
|
|
115
119
|
if cached_data is not None:
|
|
116
120
|
return APIResponse(headers={}, json=cached_data, status_code=None, hexagon=hexagon, is_cache=True)
|
|
@@ -124,9 +128,8 @@ class FoxAPI():
|
|
|
124
128
|
async with aiohttp.ClientSession() as session:
|
|
125
129
|
async with session.get(f"{self.base_api}{endpoint}", headers=headers) as data:
|
|
126
130
|
self.etag[endpoint]: str = data.headers.get("ETag", self.etag.get(endpoint))
|
|
127
|
-
|
|
131
|
+
data_json = await data.json()
|
|
128
132
|
if data.status == 200:
|
|
129
|
-
data_json = await data.json()
|
|
130
133
|
self.cache[endpoint] = data_json
|
|
131
134
|
return APIResponse(headers=data.headers, json=data_json, status_code=data.status, hexagon=hexagon, is_cache=False)
|
|
132
135
|
|
|
@@ -137,10 +140,10 @@ class FoxAPI():
|
|
|
137
140
|
else:
|
|
138
141
|
async with session.get(f"{self.base_api}{endpoint}", headers=headers) as data:
|
|
139
142
|
self.etag[endpoint]: str = data.headers.get("ETag", self.etag.get(endpoint))
|
|
143
|
+
data_json: dict = await data.json()
|
|
140
144
|
|
|
141
145
|
if data.status == 200:
|
|
142
|
-
|
|
143
|
-
self.cache[endpoint] = data_json
|
|
146
|
+
self.cache[endpoint]: dict = data_json
|
|
144
147
|
return APIResponse(headers=data.headers, json=data_json, status_code=data.status, hexagon=hexagon, is_cache=False)
|
|
145
148
|
|
|
146
149
|
elif data.status == 304:
|
|
@@ -251,7 +254,7 @@ class FoxAPI():
|
|
|
251
254
|
dynamic: dict = await self.get_dynamic(hexagon)
|
|
252
255
|
|
|
253
256
|
if static is None or dynamic is None:
|
|
254
|
-
raise FoxAPIError("Please pass the required parameters (static and dynamic
|
|
257
|
+
raise FoxAPIError("Please pass the required parameters (hexagon or (static and dynamic))")
|
|
255
258
|
|
|
256
259
|
captured_towns: dict = {}
|
|
257
260
|
icons: list = [45, 46, 47, 56, 57, 58] # Town halls and relics
|
|
@@ -422,7 +425,7 @@ class FoxAPI():
|
|
|
422
425
|
hexagon: str = self._format_hexagon(hexagon=hexagon)
|
|
423
426
|
|
|
424
427
|
if war_report is None:
|
|
425
|
-
war_report: dict = self.
|
|
428
|
+
war_report: dict = self.get_war_report_sync(hexagon)
|
|
426
429
|
|
|
427
430
|
if war_report is None:
|
|
428
431
|
raise FoxAPIError("Please pass the required parameters (hexagon or war_report)")
|
|
@@ -538,6 +541,7 @@ class FoxAPI():
|
|
|
538
541
|
tasks.clear()
|
|
539
542
|
self.waiting_list.clear()
|
|
540
543
|
self.waiting_list: list = []
|
|
544
|
+
|
|
541
545
|
return answers
|
|
542
546
|
|
|
543
547
|
def run_task_sync(self, thread: bool = False):
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|