fix(operators): optimized the reserve information pre-check and more readable output

we only check the reservations and their status in
today's record, and return the checked renewable
record for the upcoming new feature 'Auto-Renew'

src/operators/AutoLib.py

@@ -186,22 +186,18 @@ class AutoLib(MsgBase):
         if run_mode["auto_reserve"]:
             if self.__lib_checker.canReserve(reserve_info.get("date")):
                 if self.__lib_reserve.reserve(reserve_info):
-                    self._showTrace(f"用户 {username} 预约成功 !")
                     result = 0
                 else:
-                    self._showTrace(f"用户 {username} 预约失败 !")
                     result = 1
             else:
                 self._showTrace(f"用户 {username} 无法预约，已跳过")
                 result = 2
         # checkin
         if run_mode["auto_checkin"] and result == 2:
-            if self.__lib_checker.canCheckin(reserve_info.get("date")):
+            if self.__lib_checker.canCheckin():
                 if self.__lib_checkin.checkin(username):
-                    self._showTrace(f"用户 {username} 签到成功 !")
                     result = 0
                 else:
-                    self._showTrace(f"用户 {username} 签到失败 !")
                     result = 1
             else:
                 self._showTrace(f"用户 {username} 无法签到，已跳过")

src/operators/LibChecker.py

@@ -25,7 +25,7 @@ class LibChecker(LibOperator):
         self,
         input_queue: queue.Queue,
         output_queue: queue.Queue,
-        driver
+        driver: any
     ):
 
         super().__init__(input_queue, output_queue)
@@ -270,11 +270,11 @@ class LibChecker(LibOperator):
 
 
     def canCheckin(
-        self,
-        date: str
+        self
     ) -> bool:
 
-        # have a reserved record in the given date
+        # only check the current date
+        date = time.strftime("%Y-%m-%d", time.localtime())
         record = self.__getReserveRecord(date, "已预约")
         if record is not None:
             begin_time = record["time"]["begin"]
@@ -307,11 +307,11 @@ class LibChecker(LibOperator):
 
 
     def canRenew(
-        self,
-        date: str
-    ) -> bool:
+        self
+    ):
 
-        # have a using record in the given date
+        # only check the current date
+        date = time.strftime("%Y-%m-%d", time.localtime())
         record = self.__getReserveRecord(date, "使用中")
         if record is not None:
             end_time = record["time"]["end"]
@@ -325,9 +325,9 @@ class LibChecker(LibOperator):
             )
             if abs(time_diff_seconds) < 120*60:
                 self._showTrace(f"{trace_msg}, 可以续约")
-                return True
+                return record
             else:
                 self._showTrace(f"{trace_msg}, 无法续约")
-                return False
+                return None
         self._showTrace(f"用户在 {date} 没有有效预约记录, 无法续约")
-        return False
+        return None

src/operators/LibCheckin.py

@@ -25,7 +25,7 @@ class LibCheckin(LibOperator):
         self,
         input_queue: queue.Queue,
         output_queue: queue.Queue,
-        driver
+        driver: any
     ):
 
         super().__init__(input_queue, output_queue)
@@ -54,7 +54,6 @@ class LibCheckin(LibOperator):
         except:
             self._showTrace("签到时发生未知错误 !")
             return False
-        print(result_message_element)
         result_message = result_message_element.text
         if "签到成功" in result_message:
             try:
@@ -73,14 +72,16 @@ class LibCheckin(LibOperator):
                         f"          {details[3]}\n"\
                         f"          {details[4]}")
             else:
-                self._showTrace(
+                self._showTrace(f"\n"\
                          "      签到成功 !\n"\
                          "          未获取到签到详情 !")
             ok_btn.click()
             return True
         else:
             failure_reason = result_message.replace("签到失败", "").strip()
-            self._showTrace(f"签到失败: {failure_reason}")
+            self._showTrace(f"\n"\
+                "      签到失败 !\n"\
+                f"          {failure_reason}")
             ok_btn.click()
             return False
 
@@ -104,4 +105,9 @@ class LibCheckin(LibOperator):
             self._showTrace("签到按钮不可用, 可能不在场馆内, 请连接图书馆网络后重试")
             return False
         checkin_btn.click()
-        return self._waitResponseLoad()
+        if self._waitResponseLoad():
+            self._showTrace(f"用户 {username} 签到成功 !")
+            return True
+        else:
+            self._showTrace(f"用户 {username} 签到失败 !")
+        return False

src/operators/LibCheckout.py

@@ -25,7 +25,7 @@ class LibCheckout(LibOperator):
         self,
         input_queue: queue.Queue,
         output_queue: queue.Queue,
-        driver
+        driver: any
     ):
 
         super().__init__(input_queue, output_queue)

src/operators/LibLogin.py

@@ -26,7 +26,7 @@ class LibLogin(LibOperator):
         self,
         input_queue: queue.Queue,
         output_queue: queue.Queue,
-        driver
+        driver: any
     ):
 
         super().__init__(input_queue, output_queue)

src/operators/LibLogout.py

@@ -22,7 +22,7 @@ class LibLogout(LibOperator):
         self,
         input_queue: queue.Queue,
         output_queue: queue.Queue,
-        driver
+        driver: any
     ):
 
         super().__init__(input_queue, output_queue)

src/operators/LibRenew.py

@@ -8,8 +8,14 @@ You may use, modify, and distribute this file under the terms of the MIT License
 See the LICENSE file for details.
 """
 import os
+import time
 import queue
 
+from datetime import datetime, timedelta
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+
 from base.LibOperator import LibOperator
 
 
@@ -19,7 +25,7 @@ class LibRenew(LibOperator):
         self,
         input_queue: queue.Queue,
         output_queue: queue.Queue,
-        driver
+        driver: any
     ):
 
         super().__init__(input_queue, output_queue)

src/operators/LibReserve.py

@@ -25,7 +25,7 @@ class LibReserve(LibOperator):
         self,
         input_queue: queue.Queue,
         output_queue: queue.Queue,
-        driver
+        driver: any
     ):
 
         super().__init__(input_queue, output_queue)
@@ -187,12 +187,13 @@ class LibReserve(LibOperator):
         reserve_info: dict
     ) -> bool:
 
-        if reserve_info.get("expect_duration") is None:
-            reserve_info["expect_duration"] = 4
-            self._showTrace("预约持续时间未指定, 使用默认时长为 4 小时")
         if reserve_info.get("satisfy_duration") is None:
             reserve_info["satisfy_duration"] = True
             self._showTrace("预约满足时长要求未指定, 默认满足")
+        if reserve_info["satisfy_duration"]:
+            if reserve_info.get("expect_duration") is None:
+                reserve_info["expect_duration"] = 4
+                self._showTrace("需要满足预约持续时间, 但未指定, 使用默认时长为 4 小时")
         return True
 
 
@@ -234,7 +235,7 @@ class LibReserve(LibOperator):
         # if end time is earlier than begin_time, exchange them
         if end_mins < begin_mins:
             self._showTrace(
-                f"结束时间 {end_time['time']} 早于开始时间 {begin_time['time']}, 自动交换"
+                f"结束时间 {end_time['time']} 早于开始时间 {begin_time['time']}, 尝试交换时间"
             )
             reserve_info["end_time"] = begin_time
             reserve_info["begin_time"] = end_time
@@ -261,10 +262,9 @@ class LibReserve(LibOperator):
             if end_mins - begin_mins > 8*60:
                 self._showTrace(
                     f"该用户未设置优先满足时长要求, 但是检查到预约持续时间 "
-                    f"{int((end_mins - begin_mins)/60)} 小时 "
+                    f"{float((end_mins - begin_mins)/60)} 小时 "
                     f"超出最大时长 8 小时, 自动设置为 8 小时"
                 )
-                reserve_info["expect_duration"] = 8
                 reserve_info["end_time"]["time"] = self.__minsToTime(begin_mins + 8*60)
         return True
 
@@ -577,6 +577,7 @@ class LibReserve(LibOperator):
         expect_begin_time = actual_begin_time = begin_time["time"]
         expect_end_time = actual_end_time = end_time["time"]
         expect_begin_mins = self.__timeToMins(expect_begin_time)
+        actual_begin_mins = expect_begin_mins
         expect_end_mins = self.__timeToMins(expect_end_time)
 
         # select the begin time
@@ -590,11 +591,18 @@ class LibReserve(LibOperator):
             return False
         else:
             actual_begin_time = self.__minsToTime(expect_begin_mins)
+            actual_begin_mins = self.__timeToMins(actual_begin_time)
         # if 'satisfy_duration' is True.
         # select the end time based on the begin time
         # (because it may be changed under the 'max time diff' strategy) and expect duration.
         if satisfy_duration:
-            expect_end_mins = int(expect_begin_mins + expct_duration*60)
+            expect_end_mins = int(actual_begin_mins + expct_duration*60)
+            if expect_end_mins > self.__timeToMins("23:30"):
+                expect_end_mins = self.__timeToMins("23:30")
+                self._showTrace(
+                    f"预约持续时间 {expct_duration} 小时, 超过最大预约时间 23:30, 自动调整为 23:30"
+                )
+            expect_end_time = self.__minsToTime(expect_end_mins)
             self._showTrace(
                 f"需要满足期望预约持续时间: {expct_duration} 小时, "\
                 f"根据开始时间 {actual_begin_time} 计算结束时间: {self.__minsToTime(expect_end_mins)}"
@@ -674,4 +682,8 @@ class LibReserve(LibOperator):
                 self._showTrace(f"预约提交失败 !")
         if not submit_reserve and have_hover_on_page:
             self.__driver.refresh()
+        if reserve_success:
+            self._showTrace(f"用户 {reserve_info['username']} 预约成功 !")
+        else:
+            self._showTrace(f"用户 {reserve_info['username']} 预约失败 !")
         return reserve_success