nahuel
/
dublinbus-display
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix miscellaneous bugs

This commit is contained in:
Nahuel Lofeudo 2023-04-16 14:00:38 +01:00
parent 6b45e27539
commit df3e9aa992
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtfs_client.py
View File

@ -30,9 +30,10 @@ class GTFSClient():
self.stop_ids = self.__wanted_stop_ids() self.stop_ids = self.__wanted_stop_ids()
# Schedule refresh # Schedule refresh
self.update_queue = update_queue self._update_queue = update_queue
if update_interval_seconds and update_queue: if update_interval_seconds and update_queue:
self._refresh_thread = threading.Thread(target=lambda: every(self._update_interval_seconds, self.refresh)) self._update_interval_seconds = update_interval_seconds
self._refresh_thread = threading.Thread(target=lambda: every(update_interval_seconds, self.refresh))
def _read_feed(self, path: gk.Path, dist_units: str, stop_names: list[str]) -> gk.Feed: def _read_feed(self, path: gk.Path, dist_units: str, stop_names: list[str]) -> gk.Feed:
""" """
@ -226,8 +227,8 @@ class GTFSClient():
) )
arrivals.append(arrival) arrivals.append(arrival)
if self.update_queue: if self._update_queue:
self.update_queue.put(arrivals) self._update_queue.put(arrivals)
return arrivals return arrivals
@ -235,9 +236,9 @@ def every(delay, task) -> None:
""" Auxilliary function to schedule updates. """ Auxilliary function to schedule updates.
Taken from https://stackoverflow.com/questions/474528/what-is-the-best-way-to-repeatedly-execute-a-function-every-x-seconds Taken from https://stackoverflow.com/questions/474528/what-is-the-best-way-to-repeatedly-execute-a-function-every-x-seconds
""" """
next_time = time() + delay next_time = time.time() + delay
while True: while True:
time.sleep(max(0, next_time - time())) time.sleep(max(0, next_time - time.time()))
try: try:
task() task()
except Exception: except Exception:

3
main.py
View File

@ -44,7 +44,8 @@ window : pygame.Surface = None
font: pygame.font.Font = None font: pygame.font.Font = None
update_queue = queue.Queue(maxsize=10) update_queue = queue.Queue(maxsize=10)
#dublinbus_client = DublinBusSoapClient(stops=STOPS, update_queue=update_queue, update_interval_seconds=UPDATE_INTERVAL_SECONDS) #dublinbus_client = DublinBusSoapClient(stops=STOPS, update_queue=update_queue, update_interval_seconds=UPDATE_INTERVAL_SECONDS)
dublinbus_client = GTFSClient(feed_name='google_transit_combined.zip', stop_names=STOPS, update_queue=update_queue, update_interval_seconds=UPDATE_INTERVAL_SECONDS) dublinbus_client = GTFSClient(feed_url='https://www.transportforireland.ie/transitData/google_transit_combined.zip',
stop_names=STOPS, update_queue=update_queue, update_interval_seconds=UPDATE_INTERVAL_SECONDS)
def get_line_offset(line: int) -> int: def get_line_offset(line: int) -> int:
""" Calculate the Y offset within the display for a given text line """ """ Calculate the Y offset within the display for a given text line """