angoosh/Alkator
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unify register and main py worker

Browse Source
This commit is contained in:
Martin Quarda 2025-04-01 09:35:20 +02:00
parent 2e9c11d73b
commit 586bd3dc84
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
SW/PC/Stopwatch/main.py
View File

@ -9,6 +9,7 @@ import requests
import json import json
gi.require_version('Gtk', '4.0') gi.require_version('Gtk', '4.0')
from queue import Queue
from gi.repository import Gtk, Gio, Gdk from gi.repository import Gtk, Gio, Gdk
from requests.adapters import HTTPAdapter, Retry from requests.adapters import HTTPAdapter, Retry
from usbcardreader import UsbCardReader from usbcardreader import UsbCardReader
@ -63,26 +64,27 @@ def refreshDbEvery3mins():
threading.Thread(target=refreshDbEvery3mins).start() threading.Thread(target=refreshDbEvery3mins).start()
log = []
def sendQueueToSend():
global queue_to_send with open('log.json', 'r') as f:
log = json.loads(f.read())
queue = Queue()
def worker():
while True: while True:
if len(queue_to_send) > 0: item = queue.get()
to_send = queue_to_send.pop() log.append(item)
with open('log.json', 'w') as f:
response = session.post(config['host'] + '/api/station/register', f.write(json.dumps(log))
json=to_send response = session.post(item['url'], json=item['json'])
) print(item, response)
if response.status_code != 200:
if response.status_code == 400:
continue
queue_to_send.append(to_send) #try again later
time.sleep(1)
else:
time.sleep(1)
threading.Thread(target=sendQueueToSend).start() threading.Thread(target=worker).start()
def callbackOnCard(card_id): def callbackOnCard(card_id):
@ -131,11 +133,11 @@ class GridRow():
countdown=threading.Thread(target=self.updateTime) countdown=threading.Thread(target=self.updateTime)
countdown.start() countdown.start()
queue_to_send.append({ queue.put({'url': config['host'] + '/api/station/register', 'json': {
'card_id': racer['card_id'], 'card_id': racer['card_id'],
'station_id': config['station_id'], 'station_id': config['station_id'],
'time': datetime.datetime.now().strftime('%d.%m.%Y %H:%M:%S.%f') 'time': datetime.datetime.now().strftime('%d.%m.%Y %H:%M:%S.%f')
}) }})
def printIndex(self, button): def printIndex(self, button):
print(self.index) print(self.index)

14
SW/PC/Stopwatch/registrace.py
View File

@ -21,7 +21,7 @@ session = requests.Session()
session.post(config['host'] + '/api/login', {'email':config['login'], 'password': config['password']}) session.post(config['host'] + '/api/login', {'email':config['login'], 'password': config['password']})
retries = Retry(total=3, retries = Retry(total=10,
backoff_factor=1, backoff_factor=1,
status_forcelist=[ 500, 502, 503, 504 ],) status_forcelist=[ 500, 502, 503, 504 ],)
@ -36,11 +36,11 @@ response = session.get(config['host'] + '/api/racers')
racers = response.json() racers = response.json()
db = [] log = []
with open('db.json', 'r') as f: with open('log.json', 'r') as f:
db = json.loads(f.read()) log = json.loads(f.read())
queue = Queue() queue = Queue()
@ -49,9 +49,9 @@ queue = Queue()
def worker(): def worker():
while True: while True:
item = queue.get() item = queue.get()
db.append(item) log.append(item)
with open('db.json', 'w') as f: with open('log.json', 'w') as f:
f.write(json.dumps(db)) f.write(json.dumps(log))
response = session.post(item['url'], json=item['json']) response = session.post(item['url'], json=item['json'])
print(item, response) print(item, response)