GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

minor wording tweaks and a docstring

Browse source
This commit is contained in:
Damien Elmes 2021-11-23 12:17:10 +10:00
parent 6d0f7e7f05
commit 675155e025
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt/aqt/main.py
View file

@ -1680,7 +1680,7 @@ title="{}" {}>{}</button>""".format(
def setupMediaServer(self) -> None: def setupMediaServer(self) -> None:
self.mediaServer = aqt.mediasrv.MediaServer(self) self.mediaServer = aqt.mediasrv.MediaServer(self)
self.mediaServer.start() self.mediaServer.start()
self.mediaServer.wait_start_up() self.mediaServer.await_ready()
def baseHTML(self) -> str: def baseHTML(self) -> str:
return f'<base href="{self.serverURL()}">' return f'<base href="{self.serverURL()}">'

13
qt/aqt/mediasrv.py
View file

@ -141,11 +141,16 @@ class MediaServer(threading.Thread):
self._ready.wait() self._ready.wait()
return str(self.server.effective_host) # type: ignore return str(self.server.effective_host) # type: ignore
def wait_start_up(self) -> None: def await_ready(self) -> None:
self.check_server(self.getHost(), self.getPort(), "/favicon.ico") """Block until webserver can respond to requests.
Potentially solves a race condition at startup where some resources
fail to load.
https://github.com/ankitects/anki/pull/1369
"""
self._check_server(self.getHost(), self.getPort(), "/favicon.ico")
@classmethod @classmethod
def check_server( def _check_server(
cls, cls,
host: str, host: str,
port: int, port: int,
@ -160,7 +165,7 @@ class MediaServer(threading.Thread):
for index in range(retries): for index in range(retries):
if devMode or index > 0: if devMode or index > 0:
print( print(
f"{datetime.datetime.now()} waiting media server on {host}:{port}..." f"{datetime.datetime.now()} awaiting media server on {host}:{port}..."
) )
try: try:
with http_connection(host, port, timeout=timeout) as conn: with http_connection(host, port, timeout=timeout) as conn: