refactor: mv cli folder

Thungghuan · Oct 3, 2022 · 4bd6122 · 4bd6122
1 parent 0faf694
commit 4bd6122
Show file tree

Hide file tree

Showing 5 changed files with 156 additions and 153 deletions.
diff --git a/bus.py b/bus.py
@@ -29,7 +29,6 @@ def ticket_detail(self, ticket_id):
 
         return result
 
-
     def get_bus_list(self, start_campus, end_campus, date):
         url = self.base_url + "/commuteOrder/frequencyChoice?PageNum=0&PageSize=0"
 

diff --git a/gzic_bus_cli/__init__.py b/gzic_bus_cli/__init__.py
@@ -0,0 +1 @@
+from gzic_bus_cli.cli import main
diff --git a/gzic_bus_cli/cli.py b/gzic_bus_cli/cli.py
@@ -0,0 +1,147 @@
+import os.path as path
+from datetime import datetime
+import questionary
+from gzic_bus_cli.console import clear, reset_console
+from get_token import get_token, check_token_expired
+from bus import Bus
+
+def load_token():
+    token = ""
+    print("读取token文件中...")
+
+    if path.exists("token"):
+        with open("token") as f:
+            token = f.read().strip()
+
+            if check_token_expired(token):
+                print("token过期")
+                login()
+            else:
+                print("token读取成功")
+    else:
+        token = login()
+
+    return token
+
+
+def login():
+    print("请先使用统一认证账号登陆获取token")
+    username = questionary.text("学号：").ask()
+    password = questionary.password("密码：").ask()
+
+    if not username or not password:
+        print("请输入用户名和密码")
+        exit()
+
+    token = get_token(username, password)
+    print("登陆成功，写入token文件")
+
+    with open("token", "w+") as f:
+        f.write(token)
+
+    return token
+
+
+def check_reserve(bus: Bus):
+    tickets = bus.list_reserve(status=1)["list"]
+    ticket_choices = []
+
+    for idx, bus in enumerate(tickets):
+        ticket_choices.append(
+            {
+                "name": "{}. {} {}".format(idx + 1, bus["ruteName"], bus["startTime"]),
+                "value": idx,
+            }
+        )
+
+    if len(ticket_choices) > 0:
+        choice = questionary.select(
+            "请选择班次：",
+            choices=ticket_choices,
+        ).ask()
+
+        print(choice)
+    else:
+        print("没有找到预约的校巴哦")
+
+
+def reserve_bus(bus: Bus):
+    campus = ["广州国际校区", "大学城校区", "五山校区"]
+
+    start_campus = questionary.select("请选择起点", choices=campus).ask()
+    end_campus = questionary.select(
+        "请选择终点", choices=list(filter(lambda x: x != start_campus, campus))
+    ).ask()
+
+    today = datetime.today().strftime("%Y/%m/%d")
+    date = questionary.text("请输入查询日期，格式为：yyyy/mm/dd".format(today), default=today).ask()
+
+    bus_list = bus.get_bus_list(start_campus, end_campus, date)
+    bus_choices = []
+
+    if len(bus_list) > 0:
+        for idx, bus in enumerate(bus_list):
+            bus_choices.append(
+                {
+                    "name": "{}. {}-{}".format(
+                        idx + 1, bus["startDate"], bus["endDate"]
+                    ),
+                    "value": idx,
+                    "disabled": bus["tickets"] == 0,
+                }
+            )
+
+        bus_idx = questionary.select(
+            "请选择班次（灰色为被预约完的班次）：",
+            choices=bus_choices,
+            style=questionary.Style(
+                [
+                    ("disabled", "#858585 italic"),
+                ]
+            ),
+        ).ask()
+
+        reset_console()
+        print(bus_list[bus_idx])
+
+    else:
+        print("{}已经没有校巴了".format(date))
+
+
+def quit():
+    clear()
+    print("88")
+
+
+def main():
+    reset_console()
+
+    token = load_token()
+    bus = Bus(token)
+
+    reset_console()
+
+    menu = ["查看已预约校巴", "预约校巴", "退出"]
+    menu_choices = []
+
+    function_list = [check_reserve, reserve_bus, quit]
+
+    for idx, choice in enumerate(menu):
+        menu_choices.append(
+            {
+                "name": "({}). {}".format(idx + 1, choice),
+                "value": idx,
+            }
+        )
+
+    choice = questionary.select(
+        "请选择功能：",
+        choices=menu_choices,
+    ).ask()
+
+    print(menu[choice])
+    function_list[choice](bus)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/gzic_bus_cli/console.py b/gzic_bus_cli/console.py
@@ -0,0 +1,7 @@
+def clear():
+    print("\033[H\033[J", end="")
+
+
+def reset_console():
+    clear()
+    print("gzic_bus / gzic校巴预约")
diff --git a/main.py b/main.py
@@ -1,155 +1,4 @@
-import os.path as path
-from datetime import datetime
-import questionary
-from get_token import get_token, check_token_expired
-from bus import Bus
-
-
-def clear():
-    print("\033[H\033[J", end="")
-
-
-def reset_console():
-    clear()
-    print("gzic_bus / gzic校巴预约")
-
-
-def load_token():
-    token = ""
-    print("读取token文件中...")
-
-    if path.exists("token"):
-        with open("token") as f:
-            token = f.read().strip()
-
-            if check_token_expired(token):
-                print("token过期")
-                login()
-            else:
-                print("token读取成功")
-    else:
-        token = login()
-
-    return token
-
-
-def login():
-    print("请先使用统一认证账号登陆获取token")
-    username = questionary.text("学号：").ask()
-    password = questionary.password("密码：").ask()
-
-    if not username or not password:
-        print("请输入用户名和密码")
-        exit()
-
-    token = get_token(username, password)
-    print("登陆成功，写入token文件")
-
-    with open("token", "w+") as f:
-        f.write(token)
-
-    return token
-
-
-def check_reserve(bus: Bus):
-    tickets = bus.list_reserve(status=1)["list"]
-    ticket_choices = []
-
-    for idx, bus in enumerate(tickets):
-        ticket_choices.append(
-            {
-                "name": "{}. {} {}".format(idx + 1, bus["ruteName"], bus["startTime"]),
-                "value": idx,
-            }
-        )
-
-    if len(ticket_choices) > 0:
-        choice = questionary.select(
-            "请选择班次：",
-            choices=ticket_choices,
-        ).ask()
-
-        print(choice)
-    else:
-        print("没有找到预约的校巴哦")
-
-
-def reserve_bus(bus: Bus):
-    campus = ["广州国际校区", "大学城校区", "五山校区"]
-
-    start_campus = questionary.select("请选择起点", choices=campus).ask()
-    end_campus = questionary.select(
-        "请选择终点", choices=list(filter(lambda x: x != start_campus, campus))
-    ).ask()
-
-    today = datetime.today().strftime("%Y/%m/%d")
-    date = questionary.text("请输入查询日期，格式为：yyyy/mm/dd".format(today), default=today).ask()
-
-    bus_list = bus.get_bus_list(start_campus, end_campus, date)
-    bus_choices = []
-
-    if len(bus_list) > 0:
-        for idx, bus in enumerate(bus_list):
-            bus_choices.append(
-                {
-                    "name": "{}. {}-{}".format(
-                        idx + 1, bus["startDate"], bus["endDate"]
-                    ),
-                    "value": idx,
-                    "disabled": bus["tickets"] == 0,
-                }
-            )
-
-        bus_idx = questionary.select(
-            "请选择班次（灰色为被预约完的班次）：",
-            choices=bus_choices,
-            style=questionary.Style(
-                [
-                    ("disabled", "#858585 italic"),
-                ]
-            ),
-        ).ask()
-
-        reset_console()
-        print(bus_list[bus_idx])
-
-    else:
-        print("{}已经没有校巴了".format(date))
-
-
-def quit():
-    clear()
-    print("88")
-
-
-def main():
-    reset_console()
-
-    token = load_token()
-    bus = Bus(token)
-
-    reset_console()
-
-    menu = ["查看已预约校巴", "预约校巴", "退出"]
-    menu_choices = []
-
-    function_list = [check_reserve, reserve_bus, quit]
-
-    for idx, choice in enumerate(menu):
-        menu_choices.append(
-            {
-                "name": "({}). {}".format(idx + 1, choice),
-                "value": idx,
-            }
-        )
-
-    choice = questionary.select(
-        "请选择功能：",
-        choices=menu_choices,
-    ).ask()
-
-    print(menu[choice])
-    function_list[choice](bus)
+from gzic_bus_cli import main
 
 
 if __name__ == "__main__":