diff --git a/Nodes/Flyff/__pycache__/flyff_EXP_current.cpython-312.pyc b/Nodes/Flyff/__pycache__/flyff_EXP_current.cpython-312.pyc index 9a01ad2..a8eac95 100644 Binary files a/Nodes/Flyff/__pycache__/flyff_EXP_current.cpython-312.pyc and b/Nodes/Flyff/__pycache__/flyff_EXP_current.cpython-312.pyc differ diff --git a/Nodes/Flyff/flyff_EXP_current.py b/Nodes/Flyff/flyff_EXP_current.py index 22ec090..3ca7595 100644 --- a/Nodes/Flyff/flyff_EXP_current.py +++ b/Nodes/Flyff/flyff_EXP_current.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ Flyff EXP Node (Final Combined Version) - - Polls the API at http://127.0.0.1:5000/data + - Pulls the EXP value directly from data_manager.py - Outputs only the "exp" value as a string - Uses color (48, 116, 143) for its output port - Displays "exp" in a text field labeled "Value" @@ -9,9 +9,9 @@ Flyff EXP Node (Final Combined Version) """ import time -import requests import traceback from OdenGraphQt import BaseNode +from Modules import data_manager # Importing data_manager from Modules class FlyffEXPCurrentNode(BaseNode): __identifier__ = 'bunny-lab.io.flyff_exp_current_node' @@ -26,50 +26,17 @@ class FlyffEXPCurrentNode(BaseNode): # 2) Output port also named "value" self.add_output('value', color=(48, 116, 143)) - self._api_down = True - self._last_api_attempt = 0.0 - self._retry_interval = 5.0 - self._last_error_printed = 0.0 - - self.set_name("Flyff - EXP (API Disconnected)") + self.set_name("Flyff - EXP") def process_input(self): - current_time = time.time() - if self._api_down and (current_time - self._last_api_attempt < self._retry_interval): - return - - self._last_api_attempt = current_time - try: - response = requests.get("http://127.0.0.1:5000/data", timeout=1) - status_code = response.status_code - - if status_code == 200: - try: - data = response.json() or {} - except ValueError: - data = {} - - if isinstance(data, list): - data = {} - - self._api_down = False - self.set_name("Flyff - EXP (API Connected)") - - new_value = data.get("exp", "N/A") - - new_value_str = str(new_value) - self.set_property('value', new_value_str) - self.transmit_data(new_value_str) - - else: - self._handle_api_error(f"HTTP {status_code} from FlyffEXPCurrentNode") - self._api_down = True - + new_value = data_manager.get_data().get("exp", "N/A") + new_value_str = str(new_value) + self.set_property('value', new_value_str) + self.transmit_data(new_value_str) except Exception as e: tb = traceback.format_exc() - self._handle_api_error(f"Exception in FlyffEXPCurrentNode: {e}\nTraceback:\n{tb}") - self._api_down = True + print(f"[ERROR] Exception in FlyffEXPCurrentNode: {e}\nTraceback:\n{tb}") def transmit_data(self, data): output_port = self.outputs().get('value') @@ -81,11 +48,3 @@ class FlyffEXPCurrentNode(BaseNode): connected_node.receive_data(data, source_port_name='value') except Exception as e: print(f"[ERROR] Error transmitting data to {connected_node}: {e}") - - def _handle_api_error(self, msg): - current_time = time.time() - if (current_time - self._last_error_printed) >= self._retry_interval: - print(f"[ERROR] {msg}") - self._last_error_printed = current_time - - self.set_name("Flyff - EXP (API Disconnected)")