2023-12-29, udpate fot ticket-plus

master
unknown 2024-01-08 14:19:54 +08:00
parent d946a48dea
commit 9851824e46
5 changed files with 60 additions and 28 deletions

View File

@ -54,7 +54,7 @@ import webbrowser
import chromedriver_autoinstaller import chromedriver_autoinstaller
CONST_APP_VERSION = "MaxBot (2023.12.28)" CONST_APP_VERSION = "MaxBot (2023.12.29)"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"
CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt"
@ -11602,7 +11602,7 @@ def ticketplus_order_ocr(driver, config_dict, ocr, Captcha_Browser):
is_captcha_sent = False is_captcha_sent = False
previous_answer = None previous_answer = None
last_url, is_quit_bot = get_current_url(driver) last_url, is_quit_bot = get_current_url(driver)
for redo_ocr in range(999): for redo_ocr in range(19):
is_need_redo_ocr, previous_answer, is_form_sumbited = ticketplus_auto_ocr(driver, config_dict, ocr, previous_answer, Captcha_Browser) is_need_redo_ocr, previous_answer, is_form_sumbited = ticketplus_auto_ocr(driver, config_dict, ocr, previous_answer, Captcha_Browser)
# TODO: must ensure the answer is corrent... # TODO: must ensure the answer is corrent...
@ -11839,6 +11839,7 @@ def ticketplus_keyin_captcha_code(driver, answer = "", auto_submit = False):
is_form_sumbited = False is_form_sumbited = False
if not form_verifyCode is None: if not form_verifyCode is None:
print("answer:", answer)
if len(answer) > 0: if len(answer) > 0:
#answer=answer.upper() #answer=answer.upper()
@ -11851,14 +11852,41 @@ def ticketplus_keyin_captcha_code(driver, answer = "", auto_submit = False):
if is_visible: if is_visible:
try: try:
# make focus()
form_verifyCode.click() form_verifyCode.click()
is_verifyCode_editing = True is_verifyCode_editing = True
except Exception as exc: except Exception as exc:
pass pass
# plan B.
try:
#print("use plan b to focus()")
js="""$("#banner").hide();
$('input[placeholder="請輸入驗證碼"]').focus();"""
driver.set_script_timeout(0.1)
driver.execute_script(js)
except Exception as exc:
pass
try: try:
form_verifyCode.clear() form_verifyCode.clear()
form_verifyCode.send_keys(answer) form_verifyCode.send_keys(answer)
except Exception as exc:
print("send_keys ocr answer fail")
pass
# ticketplus not able to send enter key by javascript.
"""
try:
print("use plan b to input()")
inputed_value = form_verifyCode.get_attribute('value')
if len(inputed_value)==0:
js="arguments[0].value = '%s';" % answer
driver.set_script_timeout(0.1)
driver.execute_script(js, form_verifyCode)
except Exception as exc:
pass
"""
if auto_submit: if auto_submit:
# ticketplus not able to send enter key. # ticketplus not able to send enter key.
@ -11871,15 +11899,12 @@ def ticketplus_keyin_captcha_code(driver, answer = "", auto_submit = False):
# for style_1 # for style_1
my_css_selector = "div.order-footer > div.container > div.row > div > div.row > div > button.nextBtn" my_css_selector = "div.order-footer > div.container > div.row > div > div.row > div > button.nextBtn"
is_form_sumbited = force_press_button(driver, By.CSS_SELECTOR, my_css_selector) is_form_sumbited = force_press_button(driver, By.CSS_SELECTOR, my_css_selector)
if is_form_sumbited:
# must delay 0.5 second wait ajax return.
time.sleep(0.5)
is_verifyCode_editing = False is_verifyCode_editing = False
else:
print("select all captcha text")
driver.execute_script("arguments[0].select();", form_verifyCode)
if len(answer) > 0:
#tixcraft_toast(driver, "※ 按 Enter 如果答案是: " + answer)
pass
except Exception as exc:
print("send_keys ocr answer fail.")
return is_verifyCode_editing, is_form_sumbited return is_verifyCode_editing, is_form_sumbited
@ -12097,8 +12122,9 @@ def ticketplus_main(driver, url, config_dict, ocr, Captcha_Browser, ticketplus_d
is_button_pressed = ticketplus_accept_order_fail(driver) is_button_pressed = ticketplus_accept_order_fail(driver)
is_reloading = False is_reloading = False
# move below code to extension. # move below code to chrome extension.
#is_reloading = ticketplus_order_auto_reload_coming_soon(driver) if config_dict["browser"] in ["firefox", "edge", "safari"]:
is_reloading = ticketplus_order_auto_reload_coming_soon(driver)
if not is_reloading: if not is_reloading:
is_captcha_sent, ticketplus_dict = ticketplus_order(driver, config_dict, ocr, Captcha_Browser, ticketplus_dict) is_captcha_sent, ticketplus_dict = ticketplus_order(driver, config_dict, ocr, Captcha_Browser, ticketplus_dict)

View File

@ -22,7 +22,7 @@ import sys
import threading import threading
import webbrowser import webbrowser
CONST_APP_VERSION = "MaxBot (2023.12.28)" CONST_APP_VERSION = "MaxBot (2023.12.29)"
CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json" CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"

View File

@ -34,7 +34,7 @@ import ssl
ssl._create_default_https_context = ssl._create_unverified_context ssl._create_default_https_context = ssl._create_unverified_context
CONST_APP_VERSION = "MaxBot (2023.12.28)" CONST_APP_VERSION = "MaxBot (2023.12.29)"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"
CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt"

View File

@ -27,7 +27,7 @@ import pyperclip
import tornado import tornado
from tornado.web import Application from tornado.web import Application
CONST_APP_VERSION = "MaxBot (2023.12.28)" CONST_APP_VERSION = "MaxBot (2023.12.29)"
CONST_MAXBOT_QUESTION_FILE = "MAXBOT_QUESTION.txt" CONST_MAXBOT_QUESTION_FILE = "MAXBOT_QUESTION.txt"

View File

@ -26412,7 +26412,13 @@ function ajax_return_done(data, real_event_id, real_session_id) {
} }
if(data.result.session[0].status=="onsale") { if(data.result.session[0].status=="onsale") {
// bingo. ^_^ //console.log("bingo ^_^, onsale")
//$(function() {
// console.log("hello ^_^, onsale");
//let $captcha = $("input[required='required']");
//console.log($captcha.length);
//});
} }
} }