From 68be3a9a64b34582083fb3fa1d1d7a3c5f1f1c1b Mon Sep 17 00:00:00 2001
From: facat <facat@facat.com>
Date: Sat, 22 Jun 2019 13:56:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8A=8A=E6=96=87=E4=BB=B6=E6=94=BE=E5=85=A5?=
 =?UTF-8?q?=E5=8D=95=E7=8B=AC=E7=9A=84=E5=8C=85=E4=B8=AD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 download_speed/__init__.py                    |  0
 config.py => download_speed/config.py         |  0
 downloader.py => download_speed/downloader.py |  3 +-
 model.py => download_speed/model.py           |  2 +-
 ping.py => download_speed/ping.py             | 73 +++++++++----------
 ping_main.py => download_speed/ping_main.py   |  3 +-
 main.py                                       |  3 +-
 7 files changed, 40 insertions(+), 44 deletions(-)
 create mode 100644 download_speed/__init__.py
 rename config.py => download_speed/config.py (100%)
 rename downloader.py => download_speed/downloader.py (98%)
 rename model.py => download_speed/model.py (96%)
 rename ping.py => download_speed/ping.py (94%)
 rename ping_main.py => download_speed/ping_main.py (73%)

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()