2023-06-30, change version code
parent
94f937c000
commit
92af079920
|
@ -53,7 +53,7 @@ import webbrowser
|
||||||
import argparse
|
import argparse
|
||||||
import itertools
|
import itertools
|
||||||
|
|
||||||
CONST_APP_VERSION = "MaxBot (2023.6.29) ver3"
|
CONST_APP_VERSION = "MaxBot (2023.6.30)"
|
||||||
|
|
||||||
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"
|
||||||
|
@ -2748,6 +2748,14 @@ def tixcraft_get_ocr_answer(driver, ocr, ocr_captcha_image_source, Captcha_Brows
|
||||||
|
|
||||||
if ocr_captcha_image_source == CONST_OCR_CAPTCH_IMAGE_SOURCE_CANVAS:
|
if ocr_captcha_image_source == CONST_OCR_CAPTCH_IMAGE_SOURCE_CANVAS:
|
||||||
image_id = 'TicketForm_verifyCode-image'
|
image_id = 'TicketForm_verifyCode-image'
|
||||||
|
image_element = None
|
||||||
|
try:
|
||||||
|
my_css_selector = "#" + image_id
|
||||||
|
image_element = driver.find_elements(By.CSS_SELECTOR, my_css_selector)
|
||||||
|
except Exception as exc:
|
||||||
|
pass
|
||||||
|
|
||||||
|
if not image_element is None:
|
||||||
if 'indievox.com' in domain_name:
|
if 'indievox.com' in domain_name:
|
||||||
#image_id = 'TicketForm_verifyCode-image'
|
#image_id = 'TicketForm_verifyCode-image'
|
||||||
pass
|
pass
|
||||||
|
@ -7756,6 +7764,14 @@ def ibon_auto_ocr(driver, config_dict, ocr, away_from_keyboard_enable, previous_
|
||||||
img_base64 = base64.b64decode(Captcha_Browser.Request_Captcha())
|
img_base64 = base64.b64decode(Captcha_Browser.Request_Captcha())
|
||||||
if ocr_captcha_image_source == CONST_OCR_CAPTCH_IMAGE_SOURCE_CANVAS:
|
if ocr_captcha_image_source == CONST_OCR_CAPTCH_IMAGE_SOURCE_CANVAS:
|
||||||
image_id = 'chk_pic'
|
image_id = 'chk_pic'
|
||||||
|
image_element = None
|
||||||
|
try:
|
||||||
|
my_css_selector = "#" + image_id
|
||||||
|
image_element = driver.find_elements(By.CSS_SELECTOR, my_css_selector)
|
||||||
|
except Exception as exc:
|
||||||
|
pass
|
||||||
|
|
||||||
|
if not image_element is None:
|
||||||
try:
|
try:
|
||||||
form_verifyCode_base64 = driver.execute_async_script("""
|
form_verifyCode_base64 = driver.execute_async_script("""
|
||||||
var canvas = document.createElement('canvas');
|
var canvas = document.createElement('canvas');
|
||||||
|
@ -9748,6 +9764,14 @@ def kham_auto_ocr(driver, config_dict, ocr, away_from_keyboard_enable, previous_
|
||||||
img_base64 = base64.b64decode(Captcha_Browser.Request_Captcha())
|
img_base64 = base64.b64decode(Captcha_Browser.Request_Captcha())
|
||||||
if ocr_captcha_image_source == CONST_OCR_CAPTCH_IMAGE_SOURCE_CANVAS:
|
if ocr_captcha_image_source == CONST_OCR_CAPTCH_IMAGE_SOURCE_CANVAS:
|
||||||
image_id = 'chk_pic'
|
image_id = 'chk_pic'
|
||||||
|
image_element = None
|
||||||
|
try:
|
||||||
|
my_css_selector = "#" + image_id
|
||||||
|
image_element = driver.find_elements(By.CSS_SELECTOR, my_css_selector)
|
||||||
|
except Exception as exc:
|
||||||
|
pass
|
||||||
|
|
||||||
|
if not image_element is None:
|
||||||
try:
|
try:
|
||||||
form_verifyCode_base64 = driver.execute_async_script("""
|
form_verifyCode_base64 = driver.execute_async_script("""
|
||||||
var canvas = document.createElement('canvas');
|
var canvas = document.createElement('canvas');
|
||||||
|
@ -10627,6 +10651,14 @@ def ticketplus_auto_ocr(driver, config_dict, ocr, previous_answer, Captcha_Brows
|
||||||
img_base64 = base64.b64decode(Captcha_Browser.Request_Captcha())
|
img_base64 = base64.b64decode(Captcha_Browser.Request_Captcha())
|
||||||
if ocr_captcha_image_source == CONST_OCR_CAPTCH_IMAGE_SOURCE_CANVAS:
|
if ocr_captcha_image_source == CONST_OCR_CAPTCH_IMAGE_SOURCE_CANVAS:
|
||||||
image_id = 'span.captcha-img'
|
image_id = 'span.captcha-img'
|
||||||
|
image_element = None
|
||||||
|
try:
|
||||||
|
my_css_selector = image_id
|
||||||
|
image_element = driver.find_elements(By.CSS_SELECTOR, my_css_selector)
|
||||||
|
except Exception as exc:
|
||||||
|
pass
|
||||||
|
|
||||||
|
if not image_element is None:
|
||||||
try:
|
try:
|
||||||
form_verifyCode_base64 = driver.execute_async_script("""
|
form_verifyCode_base64 = driver.execute_async_script("""
|
||||||
function svgToPng(svg, callback) {
|
function svgToPng(svg, callback) {
|
||||||
|
|
|
@ -22,7 +22,7 @@ import base64
|
||||||
import threading
|
import threading
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
CONST_APP_VERSION = "MaxBot (2023.6.29)"
|
CONST_APP_VERSION = "MaxBot (2023.6.30)"
|
||||||
|
|
||||||
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"
|
||||||
|
|
|
@ -34,7 +34,7 @@ ssl._create_default_https_context = ssl._create_unverified_context
|
||||||
|
|
||||||
import socket
|
import socket
|
||||||
|
|
||||||
CONST_APP_VERSION = "MaxBot (2023.6.29) ver3"
|
CONST_APP_VERSION = "MaxBot (2023.6.30)"
|
||||||
|
|
||||||
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"
|
||||||
|
|
|
@ -28,7 +28,7 @@ import asyncio
|
||||||
import tornado
|
import tornado
|
||||||
from tornado.web import Application
|
from tornado.web import Application
|
||||||
|
|
||||||
CONST_APP_VERSION = "MaxBot (2023.6.29)"
|
CONST_APP_VERSION = "MaxBot (2023.6.30)"
|
||||||
|
|
||||||
CONST_MAXBOT_QUESTION_FILE = "MAXBOT_QUESTION.txt"
|
CONST_MAXBOT_QUESTION_FILE = "MAXBOT_QUESTION.txt"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue