From d79b1cdbddc3e09ea13b033542007f474c85bcf7 Mon Sep 17 00:00:00 2001
From: Fabian Ihle <fabi@ihlecloud.de>
Date: Wed, 29 Jun 2022 16:04:50 +0200
Subject: [PATCH] Cache guild tag to recude gw2api calls

---
 gw2rpc/gw2rpc.py | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/gw2rpc/gw2rpc.py b/gw2rpc/gw2rpc.py
index 96ba789..4056b5e 100644
--- a/gw2rpc/gw2rpc.py
+++ b/gw2rpc/gw2rpc.py
@@ -127,6 +127,8 @@ def fetch_support_invite():
         self.game = None
         self.mumble_links = self.get_mumble_links()
         self.mumble_objects = self.create_mumble_objects()
+        self.timeticks = 0
+        self.prev_char = None
         # Select the first mumble object as initially in focus
         if len(self.mumble_objects) > 0:
             self.game = self.mumble_objects[0][0]
@@ -438,13 +440,24 @@ def update_mumble_links():
             else:
                 map_info = api.get_map_info(map_id)
                 self.last_map_info = map_info
-            character = Character(data)
+            if (not self.prev_char) or ((self.prev_char and data["name"] != self.prev_char.name)) or (self.timeticks % 12000 == 0):
+                # Query GW2API on character swap or every 20 minutes for guild info
+                character = Character(data)
+                # Keep the guild tag from the old character
+                tag = character.guild_tag
+            else:
+                # Else just create a char object without API calls, keep guild tag
+                character = Character(data, query_guild=False)
+                character.guild_tag = self.prev_char.guild_tag
+                tag = self.prev_char.guild_tag if self.prev_char else character.guild_tag
+            self.prev_char = character
         except APIError:
             log.error("API Error!")
             self.last_map_info = None
             return None
         state, map_asset = self.get_map_asset(map_info, mount_index=mount_index)
-        tag = character.guild_tag if config.display_tag else ""
+
+        tag = tag if config.display_tag else ""
         try:
             if map_id in self.no_pois or "continent_id" not in map_info:
                 raise APIError(404)
@@ -516,6 +529,8 @@ def update_mumble_links():
     def in_character_selection(self):
         activity = {
             "state": _("in character selection") + " / " + _("loading screen"),
+            "details": "",
+            "timestamps": None,
             "assets": {
                 "large_image":
                 "default",
@@ -674,14 +689,6 @@ def update_gw2_process():
             self.process = None
             raise GameNotRunningError
 
-        def start_rpc():
-            while True:
-                try:
-                    self.rpc.start()
-                    break
-                except (FileNotFoundError, PermissionError) as e:
-                    time.sleep(10)
-
         def check_for_running_rpc():
             count = 0
             try:
@@ -737,6 +744,7 @@ def check_for_running_rpc():
                         self.sdk.close()
                         log.debug("Killing SDK")
                 time.sleep(1/10)
+                self.timeticks = (self.timeticks + 1) % 12000
         except Exception as e:
             log.critical("GW2RPC has crashed", exc_info=e)
             create_msgbox(