evanchen
/
tixcraft_bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to 2019-10-23

master
Max Yao 2019-10-23 10:53:20 +08:00
parent a20e0f626d
commit 17ed298710
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
chrome_tixcraft.py
View File

@ -39,7 +39,7 @@ logger = logging.getLogger('logger')
#附註1：沒有寫的很好，很多地方應該可以模組化。 #附註1：沒有寫的很好，很多地方應該可以模組化。
#附註2： #附註2：
CONST_APP_VERSION = u"MaxBot (2019.09.24)" CONST_APP_VERSION = u"MaxBot (2019.10.23)"
CONST_FROM_TOP_TO_BOTTOM = u"from top to bottom" CONST_FROM_TOP_TO_BOTTOM = u"from top to bottom"
CONST_FROM_BOTTOM_TO_TOP = u"from bottom to top" CONST_FROM_BOTTOM_TO_TOP = u"from bottom to top"
@ -190,7 +190,10 @@ if not config_dict is None:
Root_Dir = "" Root_Dir = ""
if browser == "chrome": if browser == "chrome":
chrome_options = None chrome_options = webdriver.ChromeOptions()
chrome_options.add_experimental_option("excludeSwitches", ['enable-automation'])
#chrome_options.add_argument("--disable-popup-blocking");
# default os is linux/mac # default os is linux/mac
chromedriver_path =Root_Dir+ "webdriver/chromedriver" chromedriver_path =Root_Dir+ "webdriver/chromedriver"
if platform.system()=="windows": if platform.system()=="windows":
@ -199,15 +202,11 @@ if not config_dict is None:
extension_path = Root_Dir + "webdriver/AdBlock.crx" extension_path = Root_Dir + "webdriver/AdBlock.crx"
extension_file_exist = os.path.isfile(extension_path) extension_file_exist = os.path.isfile(extension_path)
chrome_options = webdriver.ChromeOptions()
chrome_options.add_experimental_option("excludeSwitches", ['enable-automation'])
#chrome_options.add_argument("--disable-popup-blocking");
if extension_file_exist: if extension_file_exist:
chrome_options.add_extension(extension_path) chrome_options.add_extension(extension_path)
else: else:
print("extention not exist") print("extention not exist")
extension_path = Root_Dir + "webdriver/BlockYourselfFromAnalytics.crx" extension_path = Root_Dir + "webdriver/BlockYourselfFromAnalytics.crx"
extension_file_exist = os.path.isfile(extension_path) extension_file_exist = os.path.isfile(extension_path)
@ -234,6 +233,15 @@ if not config_dict is None:
chromedriver_path =Root_Dir+ "webdriver/geckodriver.exe" chromedriver_path =Root_Dir+ "webdriver/geckodriver.exe"
driver = webdriver.Firefox(executable_path=chromedriver_path) driver = webdriver.Firefox(executable_path=chromedriver_path)
try:
window_handles_count = len(driver.window_handles)
if window_handles_count >= 1:
driver.switch_to.window(driver.window_handles[1])
driver.close()
driver.switch_to.window(driver.window_handles[0])
except Exception as excSwithFail:
pass
driver.get(homepage) driver.get(homepage)
else: else:
print("Config error!") print("Config error!")

2
settings.py
View File

@ -16,7 +16,7 @@ import os
import sys import sys
import json import json
CONST_APP_VERSION = u"MaxBot (2019.09.24)" CONST_APP_VERSION = u"MaxBot (2019.10.23)"
CONST_FROM_TOP_TO_BOTTOM = u"from top to bottom" CONST_FROM_TOP_TO_BOTTOM = u"from top to bottom"
CONST_FROM_BOTTOM_TO_TOP = u"from bottom to top" CONST_FROM_BOTTOM_TO_TOP = u"from bottom to top"