diff --git a/Doc/source/Usage.rst b/Doc/source/Usage.rst index 1767bed..c56f370 100755 --- a/Doc/source/Usage.rst +++ b/Doc/source/Usage.rst @@ -57,7 +57,7 @@ .+--------+----------------+---------------------+------------------+------------------+----------+------------+ -| 车次 | 列车始发/终点站 | 余票情况 | 选择的始发／终点站 | 列车始发／终到时间 | 中途耗时 | 列车编号 | +| 车次 | 列车始发/终点站 | 余票情况 | 选择的始发／终点站 | 列车始发／终到时间 | 中途耗时 | 列车编号 | .+========+================+======================+=================+==================+==========+============+ diff --git a/README.md b/README.md index 5d78cb3..961aa41 100755 --- a/README.md +++ b/README.md @@ -41,4 +41,3 @@ python ./run.py ## 使用方式 （注：文档正在编写，但是可以先参阅[用法文档](https://github.com/F18-Maverick/EasyTicket/blob/main/Doc/source/Usage.rst)） - diff --git a/src/EasyTicket/__init__.py b/src/EasyTicket/__init__.py index 4beea2d..e99bf31 100755 --- a/src/EasyTicket/__init__.py +++ b/src/EasyTicket/__init__.py @@ -6,7 +6,3 @@ import app def main(): app.run_function() - - - - diff --git a/src/EasyTicket/all_threads.py b/src/EasyTicket/all_threads.py index e5b8de4..bf73d0b 100755 --- a/src/EasyTicket/all_threads.py +++ b/src/EasyTicket/all_threads.py @@ -26,15 +26,3 @@ def download_ticket_station_info_thread(self, computer_height, computer_width): target=get_ticket_info.get_ticket_station_info, args=(computer_height, computer_width), name="thread4", daemon=True) self.thread_station_info.start() - - - - - - - - - - - - diff --git a/src/EasyTicket/analyze_json/analyze_city_json.py b/src/EasyTicket/analyze_json/analyze_city_json.py index b41c7ef..a3c8c8b 100755 --- a/src/EasyTicket/analyze_json/analyze_city_json.py +++ b/src/EasyTicket/analyze_json/analyze_city_json.py @@ -13,7 +13,8 @@ def __init__(self): self.current_dir_this_file="" for j in self.dir_bar_list: self.current_dir_this_file+=j - self.city_json_path = os.path.join(self.current_dir_this_file, 'ticket_12306_prog_addition', 'city.json') + self.city_json_path = os.path.join( + self.current_dir_this_file, 'ticket_12306_prog_addition', 'city.json') self.city_data=None self.all_city=[] self.ad_code=[] @@ -41,8 +42,3 @@ def get_city_code(self): self.city_Code = city_info["cityCode"] self.city_code.append(self.city_Code) return self.city_code - - - - - diff --git a/src/EasyTicket/analyze_json/analyze_city_station_json.py b/src/EasyTicket/analyze_json/analyze_city_station_json.py index c1a2a71..5764672 100755 --- a/src/EasyTicket/analyze_json/analyze_city_station_json.py +++ b/src/EasyTicket/analyze_json/analyze_city_station_json.py @@ -13,7 +13,8 @@ def __init__(self): self.current_dir_this_file = "" for j in self.dir_bar_list: self.current_dir_this_file += j - self.city_station_json_path = os.path.join(self.current_dir_this_file, 'ticket_12306_prog_addition', 'cityTrain.json') + self.city_station_json_path = os.path.join( + self.current_dir_this_file, 'ticket_12306_prog_addition', 'cityTrain.json') self.city_data=None with open(self.city_station_json_path, 'r', encoding="utf-8") as self.city_station_json_file: self.city_data = json.load(self.city_station_json_file) @@ -53,11 +54,3 @@ def get_station_py_code(self): self.station_py_code=every_city_info["py_code"] self.station_py_code_list.append(self.station_py_code) return self.station_py_code_list - - - - - - - - diff --git a/src/EasyTicket/app.py b/src/EasyTicket/app.py index 92c169e..3eba38d 100755 --- a/src/EasyTicket/app.py +++ b/src/EasyTicket/app.py @@ -9,8 +9,3 @@ def __init__(self): self.entry_place = self.run_get_ticket.Entry_Function() self.entry_button = self.run_get_ticket.Windows_Button() self.Main_Loop = main_loop() - - - - - diff --git a/src/EasyTicket/bin/browsers_searcher/linux_browser_search.py b/src/EasyTicket/bin/browsers_searcher/linux_browser_search.py index b322af3..072282f 100755 --- a/src/EasyTicket/bin/browsers_searcher/linux_browser_search.py +++ b/src/EasyTicket/bin/browsers_searcher/linux_browser_search.py @@ -92,14 +92,3 @@ def browsers() -> Iterator[Browser]: yield Browser( browser_type=browser_type, path=executable_path, display_name=display_name, version=version ) - - - - - - - - - - - diff --git a/src/EasyTicket/bin/browsers_searcher/osx_browser_search.py b/src/EasyTicket/bin/browsers_searcher/osx_browser_search.py index 4fc5872..d7ca725 100755 --- a/src/EasyTicket/bin/browsers_searcher/osx_browser_search.py +++ b/src/EasyTicket/bin/browsers_searcher/osx_browser_search.py @@ -91,16 +91,3 @@ def _reverse_brave_version(version: str) -> str: major_minor, patch = version.split(".", 1) major, minor = divmod(int(major_minor), 100) return f"{major}.{minor}.{patch}" - - - - - - - - - - - - - diff --git a/src/EasyTicket/bin/browsers_searcher/windows_browser_search.py b/src/EasyTicket/bin/browsers_searcher/windows_browser_search.py index df1c114..5784bc4 100755 --- a/src/EasyTicket/bin/browsers_searcher/windows_browser_search.py +++ b/src/EasyTicket/bin/browsers_searcher/windows_browser_search.py @@ -107,13 +107,3 @@ def _get_file_version(file_path: str) -> str: revision = dw_file_version_ls & 0xFFFF return f"{major}.{minor}.{build}.{revision}" return "" - - - - - - - - - - diff --git a/src/EasyTicket/bin/deal_browser_driver.py b/src/EasyTicket/bin/deal_browser_driver.py index 2568b21..fedd4ae 100644 --- a/src/EasyTicket/bin/deal_browser_driver.py +++ b/src/EasyTicket/bin/deal_browser_driver.py @@ -233,17 +233,3 @@ def copy_file(): return False copy_btn = tkinter.Button(root, text="复制文件", command=copy_file, width=15) copy_btn.pack(pady=10) - - - - - - - - - - - - - - diff --git a/src/EasyTicket/bin/get_new_browser_driver_UI.py b/src/EasyTicket/bin/get_new_browser_driver_UI.py index 8f0fea9..6e6d24d 100644 --- a/src/EasyTicket/bin/get_new_browser_driver_UI.py +++ b/src/EasyTicket/bin/get_new_browser_driver_UI.py @@ -256,4 +256,3 @@ def on_confirm(self): self.window.destroy() else: messagebox.showerror("错误", "保存信息失败") - diff --git a/src/EasyTicket/bin/get_ticket_info.py b/src/EasyTicket/bin/get_ticket_info.py index 2f24719..8416381 100755 --- a/src/EasyTicket/bin/get_ticket_info.py +++ b/src/EasyTicket/bin/get_ticket_info.py @@ -20,7 +20,8 @@ def __init__(self, main_window_height, main_window_width): self.current_dir_this_file = "" for j in self.dir_bar_list: self.current_dir_this_file += j - self.ssl_context_dir=os.path.join(self.current_dir_this_file, "ticket_12306_prog_addition", "cacert.pem") + self.ssl_context_dir=os.path.join( + self.current_dir_this_file, "ticket_12306_prog_addition", "cacert.pem") self.temp_dir = os.path.join(self.current_dir_this_file, "temp") self.main_window_height=main_window_height self.main_window_width=main_window_width @@ -33,9 +34,12 @@ def __init__(self, main_window_height, main_window_width): self.end_city=None self.date_start=None if os.path.exists(self.temp_dir): - self.temp_dir_start = os.path.join(self.temp_dir, "data_socket_start_station.log") - self.temp_dir_end = os.path.join(self.temp_dir, "data_socket_end_station.log") - self.temp_dir_date = os.path.join(self.temp_dir, "data_socket_start_date.log") + self.temp_dir_start = os.path.join( + self.temp_dir, "data_socket_start_station.log") + self.temp_dir_end = os.path.join( + self.temp_dir, "data_socket_end_station.log") + self.temp_dir_date = os.path.join( + self.temp_dir, "data_socket_start_date.log") with open(self.temp_dir_start, "r", encoding="utf-8") as read_start: self.read_condition_start=read_start.read() with open(self.temp_dir_end, "r", encoding="utf-8") as read_end: @@ -66,8 +70,10 @@ def Download_get_station_info(self): self.station_name_url="https://kyfw.12306.cn/otn/resources/js/framework/station_name.js?station_version=1.9330" self.train_info_url=\ "https://kyfw.12306.cn/otn/leftTicket/queryO?leftTicketDTO.train_date={}&leftTicketDTO.from_station={}&leftTicketDTO.to_station={}&purpose_codes={}" - self.add_url_headers = urllib.request.Request(url=self.station_name_url, headers=self.header) - self.response_url=urllib.request.urlopen(self.add_url_headers, context=self.constant) + self.add_url_headers = urllib.request.Request( + url=self.station_name_url, headers=self.header) + self.response_url=urllib.request.urlopen( + self.add_url_headers, context=self.constant) self.station_name_info=self.response_url.read().decode("utf-8") self.count=0 self.count_1 = [] @@ -98,7 +104,8 @@ def Download_get_station_info(self): break for all_station_name_index in range(len(self.count_1)-1): self.station_name="" - for station_name_index in range(self.count_1[all_station_name_index]+1, self.count_1[all_station_name_index+1]): + for station_name_index in range( + self.count_1[all_station_name_index]+1, self.count_1[all_station_name_index+1]): self.station_name+=all_station[station_name_index] self.station_name_list.append(self.station_name) for symbol_index_1 in range(len(all_station)): @@ -111,11 +118,13 @@ def Download_get_station_info(self): break for all_station_symbol_index in range(len(self.count_4)-1): self.station_symbol="" - for station_symbol_index in range(self.count_4[all_station_symbol_index]+1, self.count_4[all_station_symbol_index+1]): + for station_symbol_index in range( + self.count_4[all_station_symbol_index]+1, self.count_4[all_station_symbol_index+1]): self.station_symbol+=all_station[station_symbol_index] self.station_symbol_list.append(self.station_symbol) for all_station_info_index in range(len(self.station_name_list)): - self.station_info_dict[self.station_name_list[all_station_info_index]]=self.station_symbol_list[all_station_info_index] + self.station_info_dict[ + self.station_name_list[all_station_info_index]]=self.station_symbol_list[all_station_info_index] if not os.path.exists(self.temp_dir): os.makedirs(self.temp_dir) with open(os.path.join(self.temp_dir, "station_name_info.json"), "w", encoding="utf-8") as datalog_write: @@ -138,9 +147,12 @@ def Download_get_station_info(self): message="请填写正确的购票信息(出发时间, 出发车站, 到达车站)") else: self.station_end_symbol=self.station_info_dict[self.end_city].upper() - self.train_info_url_compleat=self.train_info_url.format(self.date_start, self.station_start_symbol, self.station_end_symbol, "ADULT") - self.add_url_headers_train_info = urllib.request.Request(url=self.train_info_url_compleat, headers=self.header) - self.response_url_train = urllib.request.urlopen(self.add_url_headers_train_info, context=self.constant) + self.train_info_url_compleat=self.train_info_url.format( + self.date_start, self.station_start_symbol, self.station_end_symbol, "ADULT") + self.add_url_headers_train_info = urllib.request.Request( + url=self.train_info_url_compleat, headers=self.header) + self.response_url_train = urllib.request.urlopen( + self.add_url_headers_train_info, context=self.constant) self.statude_code=self.response_url_train.getcode() self.train_info = self.response_url_train.read().decode("utf-8") self.train_info_dict=json.loads(self.train_info) @@ -291,21 +303,3 @@ def Download_get_station_info(self): self.date_start, self.start_city, self.end_city, self.reflex_table), name="thread5", daemon=True) self.ticket_choose_interface_thread.start() - - - - - - - - - - - - - - - - - - diff --git a/src/EasyTicket/bin/get_train_code_ticket.py b/src/EasyTicket/bin/get_train_code_ticket.py index 3e52e6c..e4db301 100755 --- a/src/EasyTicket/bin/get_train_code_ticket.py +++ b/src/EasyTicket/bin/get_train_code_ticket.py @@ -60,8 +60,10 @@ def inital_vars(self, kwargs): "value": "ERLN34ss4QuQiVGSBZaJz35V5mfm37V7QotSqYowrxa7ljZeEnI-RQjWRUTV8qjMdb5w8sps-WX286eIS9RF7Y_TOr4Cj6wSa_4UIfjh8GwzQPfWOV6nz8EIIIEfX-3ciBnc11jpF14E5BBpRzAqtiV8gdANBiKr"}, {"name": "BIGipServerpool_passport", "value": "267190794.50215.0000"}, {"name": "route", "value": "495c805987d0f5c8c84b14f60212447d"}] - print(self.train_code, self.choose_start_station, self.choose_end_station, self.period_start_station, self.period_end_station, - self.train_go_date, self.condition, self.choose_index_train, self.train_start_time, self.train_code_list, self.reflex_table) + print(self.train_code, self.choose_start_station, self.choose_end_station, + self.period_start_station, self.period_end_station, self.train_go_date, + self.condition, self.choose_index_train, self.train_start_time, + self.train_code_list, self.reflex_table) def open_browsers(self): self.add_uknown_browser_driver_log=os.path.join( self.temp_dir, "data_socket_unknown_browser_driver_info.log") @@ -72,8 +74,10 @@ def open_browsers(self): "driver", "browser") self.count=0 self.abs_dir = os.path.dirname(os.path.abspath(__file__)) - self.inborn_driver_list=["firefox", "waterfox", "firefox-developer", "firefox-nightly", "msedge", "msedge-dev", "msedge-beta", - "msedge-canary", "chromium", "chrome", "chrome-canary", "chrome-dev", "ungoogled-chromium"] + self.inborn_driver_list=["firefox", "waterfox", "firefox-developer", + "firefox-nightly", "msedge", "msedge-dev", "msedge-beta", + "msedge-canary", "chromium", "chrome", "chrome-canary", + "chrome-dev", "ungoogled-chromium"] self.browsers_list=browsers_searcher.get() self.choosed_driver_type_list=[] self.choosed_driver_name_list=[] @@ -134,19 +138,20 @@ def add_new_browser_driver_to_list(): self.browsers_dir_list.append(self.browser_dir) if (self.system_type=="win32" or self.system_type=="cygwin" or self.system_type=="win64" or self.system_type=="windows" or self.system_type=="Windows"): - if (self.choosed_driver=="firefox" or self.choosed_driver=="waterfox" or self.choosed_driver=="firefox-developer" - or self.choosed_driver=="firefox-nightly"): + if (self.choosed_driver=="firefox" or self.choosed_driver=="waterfox" + or self.choosed_driver=="firefox-developer" or self.choosed_driver=="firefox-nightly"): self.choosed_driver_name="geckodriver.exe" self.choosed_driver_name_list.append(self.choosed_driver_name) self.choosed_driver_type_list.append(self.choosed_driver) self.choosed_browsers_dir_list.append(self.browser_dir) - elif (self.choosed_driver=="msedge" or self.choosed_driver=="msedge-dev" or self.choosed_driver=="msedge-beta" - or self.choosed_driver=="msedge-canary"): + elif (self.choosed_driver=="msedge" or self.choosed_driver=="msedge-dev" + or self.choosed_driver=="msedge-beta" or self.choosed_driver=="msedge-canary"): self.choosed_driver_name="msedgedriver.exe" self.choosed_driver_name_list.append(self.choosed_driver_name) self.choosed_driver_type_list.append(self.choosed_driver) self.choosed_browsers_dir_list.append(self.browser_dir) - elif self.choosed_driver=="chromium" or self.choosed_driver=="chrome" or self.choosed_driver=="chrome-canary": + elif (self.choosed_driver=="chromium" or self.choosed_driver=="chrome" + or self.choosed_driver=="chrome-canary"): self.choosed_driver_name="chromedriver.exe" self.choosed_driver_name_list.append(self.choosed_driver_name) self.choosed_driver_type_list.append(self.choosed_driver) @@ -166,8 +171,8 @@ def add_new_browser_driver_to_list(): self.choosed_driver_name_list.append(self.choosed_driver_name) self.choosed_driver_type_list.append(self.choosed_driver) self.choosed_browsers_dir_list.append(self.browser_dir) - elif (self.choosed_driver=="chrome" or self.choosed_driver=="chrome-dev" or self.choosed_driver=="chromium" - or self.choosed_driver=="ungoogled-chromium"): + elif (self.choosed_driver=="chrome" or self.choosed_driver=="chrome-dev" + or self.choosed_driver=="chromium" or self.choosed_driver=="ungoogled-chromium"): self.choosed_driver_name="chromedriver" self.choosed_driver_name_list.append(self.choosed_driver_name) self.choosed_driver_type_list.append(self.choosed_driver) @@ -179,22 +184,22 @@ def add_new_browser_driver_to_list(): elif self.system_type=="darwin": tkinter.messagebox.showinfo( title="提示", - message="本项目没有自带该系统的驱动程序，请手动下载并通过接下来的提示手动添加驱动程序") - if (self.choosed_driver_name=="firefox" or self.choosed_driver_name=="firefox-developer" or - self.choosed_driver_name=="firefox-nightly"): + message="本项目没有自带该系统的驱动程序, 请手动下载并通过接下来的提示手动添加驱动程序") + if (self.choosed_driver_name=="firefox" or self.choosed_driver_name=="firefox-developer" + or self.choosed_driver_name=="firefox-nightly"): self.choosed_driver_name = "geckodriver" self.choosed_driver_name_list.append(self.choosed_driver_name) self.choosed_driver_type_list.append(self.choosed_driver) self.choosed_browsers_dir_list.append(self.browser_dir) - elif (self.choosed_driver_name=="msedge" or self.choosed_driver_name=="msedge-beta" or - self.choosed_driver_name=="msedge-dev" or self.choosed_driver_name=="msedge-canary"): + elif (self.choosed_driver_name=="msedge" or self.choosed_driver_name=="msedge-beta" + or self.choosed_driver_name=="msedge-dev" or self.choosed_driver_name=="msedge-canary"): self.choosed_driver_name = "msedgedriver" self.choosed_driver_name_list.append(self.choosed_driver_name) self.choosed_driver_type_list.append(self.choosed_driver) self.choosed_browsers_dir_list.append(self.browser_dir) - elif (self.choosed_driver=="chrome" or self.choosed_driver=="chrome-beta" or self.choosed_driver=="chrome-canary" - or self.choosed_driver=="chrome-dev" or self.choosed_driver_name=="chrome-test" or - self.choosed_driver_name=="chromium"): + elif (self.choosed_driver=="chrome" or self.choosed_driver=="chrome-beta" + or self.choosed_driver=="chrome-canary" or self.choosed_driver=="chrome-dev" + or self.choosed_driver_name=="chrome-test" or self.choosed_driver_name=="chromium"): self.choosed_driver_name="chromedriver" self.choosed_driver_name_list.append(self.choosed_driver_name) self.choosed_driver_type_list.append(self.choosed_driver) @@ -206,9 +211,10 @@ def add_new_browser_driver_to_list(): else: tkinter.messagebox.showerror( title="不兼容", - message="如果您正在使用源码运行该项目，说明该源码暂时不兼容您的操作系统，请阅读readme文件并安装本项目以更好的兼容。如问题仍未解决，请发布issue") + message="如果您正在使用源码运行该项目, 说明该源码暂时不兼容您的操作系统, 请阅读readme文件并安装本项目以更好的兼容。如问题仍未解决, 请发布issue") add_new_browser_driver_to_list() - print(self.choosed_driver_type_list, "...", self.choosed_driver_name_list, "...", self.choosed_browsers_dir_list, "...", self.browsers_dir_list) + print(self.choosed_driver_type_list, "...", self.choosed_driver_name_list, + "...", self.choosed_browsers_dir_list, "...", self.browsers_dir_list) for index in range(len(self.choosed_driver_name_list)): self.driver_dir = os.path.join(self.abs_dir, "driver", self.choosed_driver_name_list[index]) try: @@ -284,7 +290,7 @@ def add_new_browser_driver_to_list(): self.web_get_ticket() else: tkinter.messagebox.showerror(title="调用错误", - message="未找到可用的浏览器驱动，请检查输入的浏览器类型是否正确") + message="未找到可用的浏览器驱动, 请检查输入的浏览器类型是否正确。") self.open_browsers() except: self.inital_vars(self.kwargs) @@ -295,7 +301,8 @@ def add_new_browser_driver_to_list(): self.record_result_file_dir=os.path.join( self.temp_dir, self.result_record_file_name) self.deal_result=None - tkinter.messagebox.showerror(title="错误", message="无法使用任何浏览器，请确保您的系统浏览器或浏览器驱动已升级到最新。") + tkinter.messagebox.showerror(title="错误", + message="无法使用任何浏览器, 请确保您的系统浏览器或浏览器驱动已升级到最新。") deal_func_init=deal_browser_driver.check_browsers_drivers_error( self.browsers_dir_copy_list, self.choosed_driver_name_list, self.computer_width, self.computer_high, self.temp_dir) @@ -310,7 +317,8 @@ def add_new_browser_driver_to_list(): if self.deal_result=="True": self.open_browsers() else: - tkinter.messagebox.showerror(title="未能解决", message="无法解决问题, 请阅读readme或发布issue") + tkinter.messagebox.showerror(title="未能解决", + message="无法解决问题, 请阅读readme或发布issue") else: pass else: @@ -393,12 +401,12 @@ def get_train_ticket_button(self): else: tkinter.messagebox.showerror( title="未知错误", - message="无法解决的问题，请在本项目的issues区发布issue") + message="无法解决的问题, 请在本项目的issues区发布issue") pass if self.is_already_error==True: tkinter.messagebox.showerror( title="未知错误", - message="无法解决的问题，请在本项目的issues区发布issue") + message="无法解决的问题, 请在本项目的issues区发布issue") else: pass def sign_in(self): @@ -471,12 +479,14 @@ def sign_in(self): self.is_statement_exit = True break except: - tkinter.messagebox.showerror(title="登录错误", message="请填写正确的登录信息") + tkinter.messagebox.showerror(title="登录错误", + message="请填写正确的登录信息") self.is_statement_exit=False self.valid_code_statement_text = self.driver.find_element(By.XPATH, self.sign_in_statement_xpath).text print(self.valid_code_statement_text) if self.valid_code_statement_text=="请输入正确的用户信息!": - tkinter.messagebox.showerror(title="登录错误", message="请输入正确的用户信息!") + tkinter.messagebox.showerror(title="登录错误", + message="请输入正确的用户信息!") os.remove(self.sign_in_socket_file) self.before_valid_code_button = WebDriverWait(self.driver, timeout=20).until( EC.element_to_be_clickable((By.XPATH, self.before_valid_code_xpath))) @@ -546,7 +556,8 @@ def get_sure_valid_code(self): if self.driver.find_element(By.XPATH, self.sign_in_statement_xpath).is_displayed()==True: self.valid_code_statement_text = self.driver.find_element(By.XPATH, self.sign_in_statement_xpath).text if self.valid_code_statement_text == "用户名或密码错误。": - tkinter.messagebox.showerror(title="登录错误", message="用户名或密码错误。") + tkinter.messagebox.showerror(title="登录错误", + message="用户名或密码错误。") os.remove(self.sign_in_socket_file) self.before_valid_code_button = WebDriverWait(self.driver, timeout=20).until( EC.element_to_be_clickable((By.XPATH, self.before_valid_code_xpath))) @@ -555,7 +566,8 @@ def get_sure_valid_code(self): if (self.valid_code_statement_text == "请输入正确验证码" or self.valid_code_statement_text=="很抱歉，您输入的短信验证码有误。" or self.valid_code_statement_text=="请输入验证码"): - tkinter.messagebox.showerror(title="登录错误", message="短信验证码有误。") + tkinter.messagebox.showerror(title="登录错误", + message="短信验证码有误。") os.remove(self.valid_code_socket_file) self.before_valid_code_button = WebDriverWait(self.driver, timeout=20).until( EC.element_to_be_clickable((By.XPATH, self.before_valid_code_xpath))) @@ -637,7 +649,8 @@ def ensure_ticket_info(self): self.label_index+=1 pass if self.label_index==len(self.passengers_name_list)-1: - tkinter.messagebox.showerror(title="选择乘车人错误", message="没有对应的乘车人，请确保已经在12306官网添加乘车人") + tkinter.messagebox.showerror(title="选择乘车人错误", + message="没有对应的乘车人, 请确保已经在12306官网添加乘车人") self.ensure_ticket_info() self.give_ticket_info_button = WebDriverWait(self.driver, timeout=20).until( EC.element_to_be_clickable((By.XPATH, self.give_ticket_info_xpath))) @@ -659,7 +672,8 @@ def ensure_ticket_info(self): except: pass self.is_statement_exit=False - tkinter.messagebox.showinfo(title="抢票成功", message="成功抢票，请在浏览器中完成订单支付") + tkinter.messagebox.showinfo(title="抢票成功", + message="成功抢票, 请在浏览器中完成订单支付") def web_get_ticket(self): self.from_station_input = WebDriverWait(self.driver, timeout=20).until( EC.element_to_be_clickable((By.ID, "fromStationText"))) @@ -685,24 +699,3 @@ def web_get_ticket(self): self.get_train_ticket_button() self.sign_in() self.ensure_ticket_info() - - - - - - - - - - - - - - - - - - - - - diff --git a/src/EasyTicket/bin/get_valid_code_UI.py b/src/EasyTicket/bin/get_valid_code_UI.py index a508503..42b12f8 100755 --- a/src/EasyTicket/bin/get_valid_code_UI.py +++ b/src/EasyTicket/bin/get_valid_code_UI.py @@ -96,20 +96,3 @@ def button_get_sign_in_info(self): self.windows_get_valid_code, text="确认", width=8, height=1, font=("Arial", 8, "underline")) self.button_sign_in_sure.pack(side=tkinter.BOTTOM) self.bind_func_sure = self.button_sign_in_sure.bind("", lambda event: self.get_data()) - - - - - - - - - - - - - - - - - diff --git a/src/EasyTicket/bin/select_ticket_buyer_UI.py b/src/EasyTicket/bin/select_ticket_buyer_UI.py index 2354763..ef54c60 100755 --- a/src/EasyTicket/bin/select_ticket_buyer_UI.py +++ b/src/EasyTicket/bin/select_ticket_buyer_UI.py @@ -12,9 +12,6 @@ def __init__(self, computer_info_width, computer_info_height, file_dir): self.x_entry = 50 self.y_entry = (80/3)-25 self.windows_buyer = tkinter.Toplevel() - # self.windows_buyer = tkinter.Tk() - # self.windows_choose_start_time_icon = self.windows_choose_start_time.iconbitmap( - # r"./ticket_12306_prog_addition/download_photo.ico") self.title_1 = self.windows_buyer.title("填写登录信息") self.windows_choose_buyer_height = 300 self.windows_choose_buyer_width = 500 @@ -79,22 +76,3 @@ def button_get_buyer_name_info(self): x=self.windows_choose_buyer_width, y=self.windows_choose_buyer_height, anchor="se") self.bind_func_delete_buyer=self.button_delete_buyer_input_field.bind( "", lambda event: self.delete_buyer_input_field()) - - -# if __name__=="__main__": -# buyer_selection(2560, 1600, r"D:\project\python\pythonProject1\Web_Crawler\Analyze_Number\Numers_Analyze_Beta\Analyze_number_mainfile\ticket_12306") -# tkinter.mainloop() - - - - - - - - - - - - - - diff --git a/src/EasyTicket/bin/sign_in_UI.py b/src/EasyTicket/bin/sign_in_UI.py index a0f2983..647fcd7 100755 --- a/src/EasyTicket/bin/sign_in_UI.py +++ b/src/EasyTicket/bin/sign_in_UI.py @@ -69,15 +69,3 @@ def button_get_sign_in_info(self): self.windows_sign_in, text="确认", width=8, height=1, font=("Arial", 8, "underline")) self.button_sign_in_sure.pack(side=tkinter.BOTTOM) self.bind_func_sure = self.button_sign_in_sure.bind("", lambda event: self.get_data()) - - - - - - - - - - - - diff --git a/src/EasyTicket/bin/train_info_interface.py b/src/EasyTicket/bin/train_info_interface.py index 81177ee..d16153b 100755 --- a/src/EasyTicket/bin/train_info_interface.py +++ b/src/EasyTicket/bin/train_info_interface.py @@ -219,14 +219,3 @@ def button_sure_ticket(self): self.button_get_train_code.place(x=self.x, y=self.y, anchor="ne") self.get_train_code = self.button_get_train_code.bind( "", lambda event: self.get_enter_contant()) - - - - - - - - - - - diff --git a/src/EasyTicket/choose_end_station_UI.py b/src/EasyTicket/choose_end_station_UI.py index 8bd9f81..f27d3ec 100755 --- a/src/EasyTicket/choose_end_station_UI.py +++ b/src/EasyTicket/choose_end_station_UI.py @@ -65,8 +65,3 @@ def button_sure_get_info(self): self.windows_choose_end_station, text="确认", width=8, height=1, font=("Arial", 8, "underline")) self.button_get_end_station_sure.pack(side=tkinter.BOTTOM) self.bind_func_sure = self.button_get_end_station_sure.bind("", lambda event: self.sure_button_operate()) - - - - - diff --git a/src/EasyTicket/choose_start_station_UI.py b/src/EasyTicket/choose_start_station_UI.py index fd5f965..9da530a 100755 --- a/src/EasyTicket/choose_start_station_UI.py +++ b/src/EasyTicket/choose_start_station_UI.py @@ -65,8 +65,3 @@ def button_sure_get_info(self): self.windows_choose_start_station, text="确认", width=8, height=1, font=("Arial", 8, "underline")) self.button_get_start_station_sure.pack(side=tkinter.BOTTOM) self.bind_func_sure=self.button_get_start_station_sure.bind("", lambda event: self.sure_button_operate()) - - - - - diff --git a/src/EasyTicket/choose_start_time_UI.py b/src/EasyTicket/choose_start_time_UI.py index c11267d..fcdb6f3 100755 --- a/src/EasyTicket/choose_start_time_UI.py +++ b/src/EasyTicket/choose_start_time_UI.py @@ -69,13 +69,3 @@ def button_get_start_time(self): self.windows_choose_start_time, text="确认", width=8, height=1, font=("Arial", 8, "underline")) self.button_get_start_time_sure.pack(side=tkinter.BOTTOM) self.bind_func_sure = self.button_get_start_time_sure.bind("", lambda event: self.get_data()) - - - - - - - - - - diff --git a/src/EasyTicket/get_ticket_interface.py b/src/EasyTicket/get_ticket_interface.py index 435af32..30f43b3 100755 --- a/src/EasyTicket/get_ticket_interface.py +++ b/src/EasyTicket/get_ticket_interface.py @@ -159,25 +159,3 @@ def Windows_Button(self): self.sign_in_control = self.button_sign_in.bind( "", lambda event_1: thread_all().user_sign_in_UI_thread( self.computer_info_width, self.computer_info_height, self.file_dir_name)) - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/EasyTicket/run.py b/src/EasyTicket/run.py index d44e412..75ca560 100755 --- a/src/EasyTicket/run.py +++ b/src/EasyTicket/run.py @@ -6,7 +6,3 @@ import app if __name__=="__main__": app.run_function() - - - -