Even More Bug fixes

Author: roDEV0

shared/utils.py

@@ -1,3 +1,5 @@
+import asyncio
+
 async def get_valid_data(requester, category, get_list, retries=3):
     check_list = await requester.post_request_batch(category, get_list)
     if not check_list:
@@ -6,5 +8,7 @@ async def get_valid_data(requester, category, get_list, retries=3):
         if retries <= 0:
             print(f"{len(get_list) - len(check_list)} objects were unable to be fetched")
             return check_list, (set(get_list) - {item["uuid"] for item in check_list})
+        print(f"Retrying {category}...")
+        await asyncio.sleep(1)
         return await get_valid_data(requester, category, get_list, retries - 1)
     return check_list, []

watcher/jobs/objective.py

@@ -63,13 +63,8 @@ async def check_sessions(requester, tracker):
             new_players = online_uuids - set(tracker.sessions)
             lost_players = set(tracker.sessions) - online_uuids
 
-            active_creations = []
-
             for player in new_players:
                 tracker.sessions[player] = await Session.create(player)
-                active_creations.append(tracker.sessions[player].active_obj)
-
-            await Active.bulk_create(active_creations, ignore_conflicts=True)
 
             # Get lost player data in batches of 100
             if not lost_players:
@@ -197,6 +192,9 @@ async def append_position(player: str, position: tuple, tracker):
 async def get_positions(requester, tracker):
     print("Getting positions...")
     online_data = await requester.map_request()
+    if not online_data:
+        print("Online data couldn't be fetched")
+        return
 
     tasks = [append_position(format_uuid(player["uuid"]), (player["x"], player["y"], player["z"]), tracker) for player in online_data["players"]]
 
@@ -259,13 +257,8 @@ async def clean_dead_sessions(requester):
     if not online_players:
         print("Online players couldn't be fetched")
         return
-    deleted_sessions = 0
-    for active in await Active.all():
-        if active.player not in {player["uuid"] for player in online_players["players"]}:
-            await active.delete()
-            deleted_sessions += 1
-
-    print(f"Removed {deleted_sessions} dead sessions")
+    await Active.filter(player__not_in={player["uuid"] for player in online_players["players"]}).delete()
+    print(f"Removed dead sessions")
 
 async def safe_rename(town_obj : Towns, new_name, requester):
     print(f"Renaming {town_obj.name} to {new_name}")

watcher/jobs/snapshots.py

@@ -3,14 +3,16 @@
 async def take_player_snapshot():
     snapshot_objects = []
     print("Taking player snapshots...")
-    for player in await Players.all():
+    sessions = await Sessions.all()
+    towns = await Towns.all()
 
-        sessions = await Sessions.filter(player=player.id)
+    for player in await Players.all():
 
-        player_town = await Towns.filter(id=player.town).first()
+        player_sessions = [session for session in sessions if session.player == player.id]
+        player_town = [town for town in towns if town.id == player.town][0]
 
         sessions_dict = {}
-        for session in sessions:
+        for session in player_sessions:
             sessions_dict[str(session.id)] = {
                 "positions": session.positions,
                 "start_date": session.start_date.strftime("%Y-%m-%d %H:%M:%S"),
@@ -33,8 +35,10 @@ async def take_town_snapshot():
     print("Taking town snapshots...")
     snapshot_objects = []
 
+    players = await Players.all()
+
     for town in await Towns.all():
-        citizens = await Players.filter(town=town.id)
+        citizens = [player for player in players if player.town == town.id]
 
         town_snapshot = TownSnapshot(
             town=town.id,

watcher/main.py

@@ -46,43 +46,50 @@ async def main():
     scheduler.add_job(
         check_sessions, "interval", minutes=5,
         args=[requester, tracker],
-        id="check_sessions",  # stable ID
-        replace_existing=True  # overwrite if already in store
+        id="check_sessions",
+        replace_existing=True,
+        max_instances=1
     )
     scheduler.add_job(
         get_positions, "interval", seconds=60,
         args=[requester, tracker],
         id="get_positions",
-        replace_existing=True
+        replace_existing=True,
+        max_instances=1
     )
     scheduler.add_job(
         update_map, "interval", hours=12,
         args=[requester],
         id="update_map",
-        replace_existing=True
+        replace_existing=True,
+        max_instances=1
     )
     scheduler.add_job(
         check_town_blocks, "interval", minutes=60,
         args=[requester],
         id="check_town_blocks",
-        replace_existing=True
+        replace_existing=True,
+        max_instances=1
     )
     scheduler.add_job(
         take_player_snapshot, "cron", hour=12, minute=0, second=0,
         id="player_snapshot",
-        replace_existing=True
+        replace_existing=True,
+        max_instances=1
     )
     scheduler.add_job(
         take_town_snapshot, "cron", hour=12, minute=0, second=0,
         id="town_snapshot",
-        replace_existing=True
+        replace_existing=True,
+        max_instances=1
     )
 
     scheduler.add_job(
         clean_dead_sessions, "interval", minutes=60,
         args=[requester],
         id="clean_dead_sessions",
-        replace_existing=True
+        replace_existing=True,
+        max_instances=1
     )
 
     await load_sessions(tracker)