Added a speedtest thread, lot of refactoring and cleanups

uplink/speedtest.py

@@ -18,7 +18,9 @@
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
 # OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import speedtest
+import calendar
+import requests
+import time
 
 from logging import getLogger
 
@@ -30,13 +32,53 @@ class Speedtest:
     def __init__(self, configuration):
         self.__configuration = configuration
 
-        self.download = None
-        self.upload = None
+        self.speedtest_maximum_speed = None
+        self.speedtest_average_speed = None
+        self.speedtest_time_elapsed = None
 
-    def run(self):
-        speed = speedtest.Speedtest()
-        self.download = speed.download()
-        self.upload = speed.upload()
+    def run_speedtest(self):
+        while True:
+            tmp_time = time.localtime(calendar.timegm(time.gmtime()))
+            self.__configuration.set_env_var('_speedtest_last_run_date',
+                                             time.strftime('%Y-%m-%d %H:%M:%S',
+                                                           tmp_time))
+
+            self.__configuration.set_env_var('_speedtest_last_run_timestamp',
+                                             calendar.timegm(time.gmtime()))
+
+            start = time.perf_counter()
+            request = requests.get(self.__configuration.get_speedtest_url(), stream=True)
+            size = int(request.headers.get('Content-Length'))
+            downloaded = 0.0
+            total_mbps = 0.0
+            maximum_speed = 0.0
+            total_chunks = 0.0
+
+            if size is not None:
+                for chunk in request.iter_content(1024 * 1024):
+                    downloaded += len(chunk)
+                    # megabytes per second
+                    mbps = downloaded / (time.perf_counter() - start) / (1024 * 1024)
+                    if mbps > maximum_speed:
+                        maximum_speed = mbps
+                    total_chunks += 1
+                    total_mbps += mbps
+
+                self.speedtest_maximum_speed = maximum_speed
+                self.__configuration.set_env_var('_speedtest_maximum_speed_megabyte_per_second',
+                                                 str(round(self.speedtest_maximum_speed)))
+
+                self.speedtest_average_speed = total_mbps / total_chunks
+                self.__configuration.set_env_var('_speedtest_average_speed_megabyte_per_second',
+                                                 str(round(self.speedtest_average_speed)))
+
+                self.speedtest_time_elapsed = time.perf_counter() - start
+                self.__configuration.set_env_var('_speedtest_time_elapsed',
+                                                 str(self.speedtest_time_elapsed))
+            else:
+                logger.warning("could not calculate download speed!")
+
+            time.sleep(self.__configuration.get_speedtest_interval())
 
     def write_to_db(self):
         return