Skip to content

Commit 7ef1caa

Browse files
chatterchatschatterchats
committed
changed: a lot
1 parent a853691 commit 7ef1caa

File tree

6 files changed

+165
-369
lines changed

6 files changed

+165
-369
lines changed

‎src/cfg/settings.py‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"User-Agent": "Diveharder API - api.diverharder.com",
2323
"Authorization": os.environ["SESSION_TOKEN"],
2424
},
25-
"time_delay": 20,
25+
"time_delay": int(20),
2626
}
2727

2828

@@ -38,6 +38,7 @@
3838
"war_id": war_id_url,
3939
"planet_stats": base_url + os.environ["PLANET_STATS"],
4040
"major_order": base_url + os.environ["MAJOR_ORDER"],
41+
"personal_order": base_url + os.environ["PERSONAL_ORDER"],
4142
"news_feed": base_url + os.environ["NEWS_FEED"],
4243
"updates": os.environ["STEAM_NEWS"],
4344
"level_spec": base_url + os.environ["LEVEL_SPEC"],
@@ -49,6 +50,12 @@
4950
"season_pass_sv": base_url + os.environ["SEASON_PASS_SV"],
5051
"season_pass_ce": base_url + os.environ["SEASON_PASS_CE"],
5152
"season_pass_dd": base_url + os.environ["SEASON_PASS_DD"],
53+
"season_pass_pp": base_url + os.environ["SEASON_PASS_PP"],
54+
"season_pass_vc": base_url + os.environ["SEASON_PASS_VC"],
55+
"season_pass_ff": base_url + os.environ["SEASON_PASS_FF"],
56+
"season_pass_ca": base_url + os.environ["SEASON_PASS_CA"],
57+
"season_pass_te": base_url + os.environ["SEASON_PASS_TE"],
58+
"space_station_1": base_url + os.environ["SPACE_STATION_1"],
5259
"score_calc": base_url + os.environ["MISSION_SCORE_CALC_PARAMS"],
5360
"election_candidates": base_url + os.environ["ELECTION_CANDIDATES"],
5461
"election_terms": base_url + os.environ["ELECTION_TERMS"],

‎src/data/api/api.py‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ def __init__(self):
2020
self.urls = cfg.urls
2121

2222
self.update_time = 0
23-
self.time_delay = cfg.ahgs_api.get("time_delay")
23+
self.time_delay: int = cfg.ahgs_api.get("time_delay", 20)
2424

2525
self.raw_data = {
2626
"status": {"data": [], "update_time": 0, "auth": True},
2727
"war_info": {"data": [], "update_time": 0, "auth": True},
2828
"planet_stats": {"data": [], "update_time": 0, "auth": True},
2929
"major_order": {"data": [], "update_time": 0, "auth": True},
30+
"personal_order": {"data": [], "update_time": 0, "auth": True},
3031
"news_feed": {"data": [], "update_time": 0, "auth": True},
3132
"updates": {"data": [], "update_time": 0, "auth": False},
3233
"level_spec": {"data": [], "update_time": 0, "auth": True},
@@ -39,6 +40,12 @@ def __init__(self):
3940
"season_pass_sv": {"data": [], "update_time": 0, "auth": True},
4041
"season_pass_ce": {"data": [], "update_time": 0, "auth": True},
4142
"season_pass_dd": {"data": [], "update_time": 0, "auth": True},
43+
"season_pass_pp": {"data": [], "update_time": 0, "auth": True},
44+
"season_pass_vc": {"data": [], "update_time": 0, "auth": True},
45+
"season_pass_ff": {"data": [], "update_time": 0, "auth": True},
46+
"season_pass_ca": {"data": [], "update_time": 0, "auth": True},
47+
"season_pass_te": {"data": [], "update_time": 0, "auth": True},
48+
"space_station_1": {"data": [], "update_time": 0, "auth": False},
4249
"score_calc": {"data": [], "update_time": 0, "auth": True},
4350
"election_candidates": {"data": [], "update_time": 0, "auth": True},
4451
"election_terms": {"data": [], "update_time": 0, "auth": True},
@@ -66,9 +73,12 @@ async def update_all(self):
6673
self.raw_data[key]["data"] = responses[i]
6774
self.raw_data[key]["update_time"] = int(time())
6875
if key == "updates":
69-
self.raw_data[key]["data"] = await self.format_steam_news(
70-
self.raw_data[key]["data"]["appnews"]["newsitems"]
71-
)
76+
if not isinstance(self.raw_data[key]["data"], list):
77+
# If pulling from steam, we gotta format, otherwise you're probably using my shit, so it's already formatted
78+
# and we just leave it alone
79+
self.raw_data[key]["data"] = await self.format_steam_news(
80+
self.raw_data[key]["data"]["appnews"]["newsitems"]
81+
)
7282
self.update_time = int(time())
7383

7484
async def fetch_all(self):
@@ -94,7 +104,7 @@ async def fetch_data(self, info_name: str = ""):
94104
)
95105
)
96106
if update_needed:
97-
authed = self.raw_data.get(info_name)["auth"]
107+
authed = self.raw_data.get(info_name, {})["auth"]
98108
url = self.urls[info_name]
99109
self.raw_data[info_name]["update_time"] = int(time())
100110
self.raw_data[info_name]["data"] = await self.get_url(url, authed)
@@ -164,7 +174,8 @@ async def format_steam_news(self, all_news):
164174
news["contents"] = sub(r"\[b](.+?)\[/b]", r"\n**\1**", news["contents"])
165175
news["contents"] = sub(r"\[i](.+?)\[/i]", r"*\1*", news["contents"])
166176
news["contents"] = sub(r"\[u](.+?)\[/u]", r"\n__\1__", news["contents"])
167-
news["contents"] = sub(r"\[list](.+?)\[/list]", r"\1", news["contents"])
168-
news["contents"] = sub(r"\[\*]", r" - ", news["contents"])
177+
news["contents"] = sub(r"\[list]", r"", news["contents"])
178+
news["contents"] = sub(r"\[/list]", r"", news["contents"])
179+
news["contents"] = sub(r"\[\*]", r"- ", news["contents"])
169180
news["contents"] = news["contents"].replace("\n\n", "\n")
170181
return all_news

‎src/data/json_handler.py‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ def get_jsons_from_github():
1616
if not os.path.exists(path):
1717
log.msg("Clone JSON Repository")
1818
git.Repo.clone_from(git_url, path)
19-
else:
19+
"""else:
2020
log.msg("Pull JSON Repository")
2121
repo = git.Repo(path)
22-
repo.remotes.origin.pull()
22+
repo.remotes.origin.pull()"""
2323

2424

2525
def get_json_files():
@@ -70,6 +70,11 @@ def sort_json_dicts():
7070
"steeled_veterans": raw_json_data["warbonds_steeled_veterans"],
7171
"cutting_edge": raw_json_data["warbonds_cutting_edge"],
7272
"democratic_detonation": raw_json_data["warbonds_democratic_detonation"],
73+
"polar_patriots": raw_json_data["warbonds_polar_patriots"],
74+
"viper_commandos": raw_json_data["warbonds_viper_commandos"],
75+
"freedoms_flame": raw_json_data["warbonds_freedoms_flame"],
76+
"chemical_agents": raw_json_data["warbonds_chemical_agents"],
77+
"truth_enforcers": raw_json_data["warbonds_truth_enforcers"],
7378
},
7479
"factions": raw_json_data["factions"],
7580
}
@@ -160,7 +165,7 @@ def expand_json():
160165
page["assets"][item_id].update(
161166
json_data["items"]["weapons"]["grenades"][item_id]
162167
)
163-
page["assets"][item_id].update({"medal_cost": item["medal_cost"]})
168+
page["assets"][item_id].update({"medal_cost": item.get("medal_cost", 0)})
164169
page["items"] = page["assets"]
165170
page.pop("assets")
166171

0 commit comments

Comments
 (0)