update for ticketmaster issue #279
parent
d499fa8af2
commit
7f5ca0ad4c
|
@ -44,7 +44,7 @@ except Exception as exc:
|
||||||
print(exc)
|
print(exc)
|
||||||
pass
|
pass
|
||||||
|
|
||||||
CONST_APP_VERSION = "MaxBot (2024.04.21)"
|
CONST_APP_VERSION = "MaxBot (2024.04.22)"
|
||||||
|
|
||||||
CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt"
|
CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt"
|
||||||
CONST_MAXBOT_CONFIG_FILE = "settings.json"
|
CONST_MAXBOT_CONFIG_FILE = "settings.json"
|
||||||
|
@ -1923,12 +1923,13 @@ def tixcraft_change_captcha(driver,url):
|
||||||
def tixcraft_toast(driver, message):
|
def tixcraft_toast(driver, message):
|
||||||
toast_element = None
|
toast_element = None
|
||||||
try:
|
try:
|
||||||
my_css_selector = ".remark-word"
|
my_css_selector = "p.remark-word"
|
||||||
toast_element = driver.find_element(By.CSS_SELECTOR, my_css_selector)
|
toast_element = driver.find_element(By.CSS_SELECTOR, my_css_selector)
|
||||||
if not toast_element is None:
|
if not toast_element is None:
|
||||||
driver.execute_script("arguments[0].innerHTML='%s';" % message, toast_element)
|
driver.execute_script("arguments[0].innerHTML='%s';" % message, toast_element)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
print("find toast element fail")
|
#print("find toast element fail")
|
||||||
|
pass
|
||||||
|
|
||||||
def tixcraft_keyin_captcha_code(driver, answer = "", auto_submit = False):
|
def tixcraft_keyin_captcha_code(driver, answer = "", auto_submit = False):
|
||||||
is_verifyCode_editing = False
|
is_verifyCode_editing = False
|
||||||
|
@ -1962,8 +1963,12 @@ def tixcraft_keyin_captcha_code(driver, answer = "", auto_submit = False):
|
||||||
is_visible = False
|
is_visible = False
|
||||||
|
|
||||||
if is_visible:
|
if is_visible:
|
||||||
|
is_text_clicked = False
|
||||||
|
|
||||||
|
if inputed_value == "":
|
||||||
try:
|
try:
|
||||||
form_verifyCode.click()
|
form_verifyCode.click()
|
||||||
|
is_text_clicked = True
|
||||||
is_verifyCode_editing = True
|
is_verifyCode_editing = True
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
print("click form_verifyCode fail, trying to use javascript.")
|
print("click form_verifyCode fail, trying to use javascript.")
|
||||||
|
@ -1978,6 +1983,8 @@ def tixcraft_keyin_captcha_code(driver, answer = "", auto_submit = False):
|
||||||
if len(answer) > 0:
|
if len(answer) > 0:
|
||||||
#print("start to fill answer.")
|
#print("start to fill answer.")
|
||||||
try:
|
try:
|
||||||
|
if not is_text_clicked:
|
||||||
|
form_verifyCode.click()
|
||||||
form_verifyCode.clear()
|
form_verifyCode.clear()
|
||||||
form_verifyCode.send_keys(answer)
|
form_verifyCode.send_keys(answer)
|
||||||
|
|
||||||
|
@ -1987,6 +1994,7 @@ def tixcraft_keyin_captcha_code(driver, answer = "", auto_submit = False):
|
||||||
is_form_sumbited = True
|
is_form_sumbited = True
|
||||||
else:
|
else:
|
||||||
driver.execute_script("document.getElementById(\"TicketForm_verifyCode\").select();")
|
driver.execute_script("document.getElementById(\"TicketForm_verifyCode\").select();")
|
||||||
|
# TODO: show text message on ticketmaster web page.
|
||||||
tixcraft_toast(driver, "※ 按 Enter 如果答案是: " + answer)
|
tixcraft_toast(driver, "※ 按 Enter 如果答案是: " + answer)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
print("send_keys ocr answer fail.")
|
print("send_keys ocr answer fail.")
|
||||||
|
@ -2118,7 +2126,6 @@ def tixcraft_auto_ocr(driver, ocr, away_from_keyboard_enable, previous_answer, C
|
||||||
else:
|
else:
|
||||||
if not away_from_keyboard_enable:
|
if not away_from_keyboard_enable:
|
||||||
tixcraft_keyin_captcha_code(driver)
|
tixcraft_keyin_captcha_code(driver)
|
||||||
tixcraft_toast(driver, "※ OCR辨識失敗Q_Q,驗證碼請手動輸入...")
|
|
||||||
else:
|
else:
|
||||||
is_need_redo_ocr = True
|
is_need_redo_ocr = True
|
||||||
if previous_answer != ocr_answer:
|
if previous_answer != ocr_answer:
|
||||||
|
|
|
@ -24,7 +24,7 @@ import webbrowser
|
||||||
|
|
||||||
import util
|
import util
|
||||||
|
|
||||||
CONST_APP_VERSION = "MaxBot (2024.04.21)"
|
CONST_APP_VERSION = "MaxBot (2024.04.22)"
|
||||||
|
|
||||||
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"
|
||||||
|
|
|
@ -32,7 +32,7 @@ except Exception as exc:
|
||||||
print(exc)
|
print(exc)
|
||||||
pass
|
pass
|
||||||
|
|
||||||
CONST_APP_VERSION = "MaxBot (2024.04.21)"
|
CONST_APP_VERSION = "MaxBot (2024.04.22)"
|
||||||
|
|
||||||
CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt"
|
CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt"
|
||||||
CONST_MAXBOT_CONFIG_FILE = "settings.json"
|
CONST_MAXBOT_CONFIG_FILE = "settings.json"
|
||||||
|
|
|
@ -39,7 +39,7 @@ try:
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
CONST_APP_VERSION = "MaxBot (2024.04.21)"
|
CONST_APP_VERSION = "MaxBot (2024.04.22)"
|
||||||
|
|
||||||
CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt"
|
CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt"
|
||||||
CONST_MAXBOT_CONFIG_FILE = "settings.json"
|
CONST_MAXBOT_CONFIG_FILE = "settings.json"
|
||||||
|
|
|
@ -34,7 +34,7 @@ try:
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
CONST_APP_VERSION = "MaxBot (2024.04.21)"
|
CONST_APP_VERSION = "MaxBot (2024.04.22)"
|
||||||
|
|
||||||
CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt"
|
CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt"
|
||||||
CONST_MAXBOT_CONFIG_FILE = "settings.json"
|
CONST_MAXBOT_CONFIG_FILE = "settings.json"
|
||||||
|
|
Loading…
Reference in New Issue