diff --git a/download_speed/__init__.py b/download_speed/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/config.py b/download_speed/config.py similarity index 100% rename from config.py rename to download_speed/config.py diff --git a/downloader.py b/download_speed/downloader.py similarity index 98% rename from downloader.py rename to download_speed/downloader.py index e1140a9..c0cce84 100644 --- a/downloader.py +++ b/download_speed/downloader.py @@ -1,7 +1,6 @@ import requests import datetime -import model -import config +from download_speed import config, model # file_size if byte diff --git a/model.py b/download_speed/model.py similarity index 96% rename from model.py rename to download_speed/model.py index 59a860c..4357d0b 100644 --- a/model.py +++ b/download_speed/model.py @@ -1,6 +1,6 @@ from peewee import * import datetime -import config +from download_speed import config config.init_config() mysql_addr = config.read_json() diff --git a/ping.py b/download_speed/ping.py similarity index 94% rename from ping.py rename to download_speed/ping.py index f270513..6135f8e 100644 --- a/ping.py +++ b/download_speed/ping.py @@ -1,37 +1,36 @@ -import config -import urllib.parse as parse -import ping3 -import model -import datetime - - -def ping(): - servers = config.get_servers() - execution_datetime = datetime.datetime.now() - print("Ping at {time}".format(time=execution_datetime)) - for server_name in servers: - server = servers[server_name] - url = server["url"] - named_tup = parse.urlparse(url) - netloc = named_tup.netloc - port_loc = netloc.find(":") - if port_loc > 0: - addr = netloc[0:port_loc] - else: - addr = netloc - ping_delay_sum = 0 - for i in range(4): - ping_delay_sum += ping3.ping(addr, timeout=5) * 1000 # in millionsecond - ping_delay = ping_delay_sum / 4 - print( - "Ping delay for {serv} is {ping_val}".format( - serv=server_name, ping_val=ping_delay - ) - ) - model.add_ping_record(execution_datetime, server_name, ping_delay) - - -if __name__ == "__main__": - config.init_config() - ping() - pass +from download_speed import config, model +import urllib.parse as parse +import ping3 +import datetime + + +def ping(): + servers = config.get_servers() + execution_datetime = datetime.datetime.now() + print("Ping at {time}".format(time=execution_datetime)) + for server_name in servers: + server = servers[server_name] + url = server["url"] + named_tup = parse.urlparse(url) + netloc = named_tup.netloc + port_loc = netloc.find(":") + if port_loc > 0: + addr = netloc[0:port_loc] + else: + addr = netloc + ping_delay_sum = 0 + for i in range(4): + ping_delay_sum += ping3.ping(addr, timeout=5) * 1000 # in millionsecond + ping_delay = ping_delay_sum / 4 + print( + "Ping delay for {serv} is {ping_val}".format( + serv=server_name, ping_val=ping_delay + ) + ) + model.add_ping_record(execution_datetime, server_name, ping_delay) + + +if __name__ == "__main__": + config.init_config() + ping() + pass diff --git a/ping_main.py b/download_speed/ping_main.py similarity index 73% rename from ping_main.py rename to download_speed/ping_main.py index 7759183..9e520b1 100644 --- a/ping_main.py +++ b/download_speed/ping_main.py @@ -1,7 +1,6 @@ #!/usr/bin/python -import config -import ping +from download_speed import config, ping if __name__ == "__main__": config.init_config() diff --git a/main.py b/main.py index 17efc2c..147e922 100644 --- a/main.py +++ b/main.py @@ -1,7 +1,6 @@ #!/usr/bin/python -import downloader -import config +from download_speed import downloader, config if __name__ == "__main__": config.init_config()