Skip to content

Commit 83f49b9

Browse files
committed
@mbridak cleanup rtc responses
1 parent 04bb6fe commit 83f49b9

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

not1mm/__main__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2475,14 +2475,12 @@ def save_contact(self) -> None:
24752475

24762476
def update_rtc_xml(self):
24772477
"""Update RTC XML"""
2478-
print("update the xml")
24792478
if self.pref.get("send_rtc_scores", False):
24802479
if self.contest is None:
24812480
return
24822481
if hasattr(self.contest, "online_score_xml"):
24832482
if self.rtc_service is not None:
24842483
self.rtc_service.xml = self.contest.online_score_xml(self)
2485-
print(f"{self.rtc_service.xml=}")
24862484

24872485
def new_contest_dialog(self) -> None:
24882486
"""
@@ -2941,6 +2939,7 @@ def readpreferences(self) -> None:
29412939
self.rtc_thread.finished.connect(self.rtc_service.deleteLater)
29422940
# self.rtc_service.poll_callback.connect(self.rtc_result)
29432941
self.rtc_thread.start()
2942+
self.rtc_service.rtc_callback.connect(self.rtc_response)
29442943

29452944
try:
29462945
if self.radio_thread.isRunning():
@@ -3098,6 +3097,9 @@ def dark_mode_state_changed(self) -> None:
30983097
self.write_preference()
30993098
self.setDarkMode(self.actionDark_Mode_2.isChecked())
31003099

3100+
def rtc_response(self, response):
3101+
print(f"{response=}")
3102+
31013103
def cw_macros_state_changed(self) -> None:
31023104
"""
31033105
Menu item to show/hide macro buttons.

not1mm/rtc_service.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
class RTCService(QObject):
2929
"""The RTC Service class."""
3030

31-
poll_callback = pyqtSignal(dict)
31+
rtc_callback = pyqtSignal(dict)
3232
delta = 2 # two minutes
3333
poll_time = datetime.datetime.now() + datetime.timedelta(minutes=delta)
3434
time_to_quit = False
@@ -44,6 +44,7 @@ def run(self) -> None:
4444
while not self.time_to_quit:
4545
# if self.pref.get("send_rtc_scores", False) is True:
4646
if datetime.datetime.now() > self.poll_time:
47+
response = ""
4748
self.poll_time = datetime.datetime.now() + datetime.timedelta(
4849
minutes=self.delta
4950
)
@@ -60,15 +61,15 @@ def run(self) -> None:
6061
),
6162
timeout=30,
6263
)
63-
print(f"{self.xml=}\n{result=}\n{result.text}")
64+
response = f"{result.status_code}|{result.reason}|{result.text}"
6465
except requests.exceptions.Timeout:
65-
print("RTC post timeout.")
66+
response = "RTC post timeout."
6667
except requests.exceptions.RequestException as e:
67-
print(f"An RTC post error occurred: {e}")
68+
response = f"An RTC post error occurred: {e}"
6869
else:
69-
print("No XML data")
70+
response = "No XML data"
7071
try:
71-
self.poll_callback.emit({"success": True})
72+
self.rtc_callback.emit({"result": response})
7273
except QEventLoop:
7374
...
7475
QThread.msleep(1)

0 commit comments

Comments
 (0)