From 435939cd9b0af4fc88d5a750b0819f724735dbf6 Mon Sep 17 00:00:00 2001 From: Ketok Date: Wed, 16 Aug 2023 15:16:29 +0200 Subject: [PATCH] Higher upload size --- src/main.py | 2 +- src/speedtest.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main.py b/src/main.py index e8ddcdc..1966115 100644 --- a/src/main.py +++ b/src/main.py @@ -68,7 +68,7 @@ def on_start_action(self, widget, _): self.worker.start() def on_back_action(self, widget, _): - self.worker.stop_event.set() # TODO: wait for the thread to stop? + self.worker.stop_event.set() self.win.view_switcher.set_visible_child(self.win.start_view) self.win.back_button.set_visible(False) diff --git a/src/speedtest.py b/src/speedtest.py index ccca88a..d6bc142 100644 --- a/src/speedtest.py +++ b/src/speedtest.py @@ -6,8 +6,8 @@ from urllib.parse import urljoin -CHUNK_SIZE = 100 # in MB -UPLOAD_SIZE = 1024 # in KiB +DOWNLOAD_SIZE = 100 +UPLOAD_SIZE = 10 REQUEST_COUNT = 3 DURATION = 15 @@ -16,7 +16,7 @@ "User-Agent": "ketok-speedtest/dev", } -garbage = os.urandom(UPLOAD_SIZE * 1024) +garbage = os.urandom(UPLOAD_SIZE * 1000 * 1000) class Server: def __init__(self, name, server, pingURL, dlURL, ulURL, **_): @@ -104,10 +104,9 @@ async def ping(server): #TODO: jitter and other stuff return sum(pings) / len(pings) * 1000 async def download(server, total): - print(server.downloadURL) async with aiohttp.ClientSession() as session: while True: - async with session.get(server.downloadURL + "?ckSize=" + str(CHUNK_SIZE), headers=HEADERS) as response: + async with session.get(server.downloadURL + "?ckSize=" + str(DOWNLOAD_SIZE), headers=HEADERS) as response: async for data in response.content.iter_any(): total[0] += len(data)