login should be two time faster

This commit is contained in:
piair338 2022-10-23 17:25:04 +00:00
parent a7d32b6064
commit c71aad15df
1 changed files with 10 additions and 16 deletions

26
V4.py
View File

@ -20,6 +20,9 @@ from selenium.common import exceptions
from selenium.webdriver.common.by import By from selenium.webdriver.common.by import By
from selenium.webdriver.common.keys import Keys from selenium.webdriver.common.keys import Keys
from selenium.webdriver.firefox.options import Options from selenium.webdriver.firefox.options import Options
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.support import expected_conditions as EC
from selenium.common.exceptions import TimeoutException, NoSuchElementException
import argparse import argparse
from modules.db import add_to_database from modules.db import add_to_database
@ -136,6 +139,11 @@ else :
g.close() g.close()
def WaitUntilVisible(by, id, to = 20, browser = driver):
try :
WebDriverWait(browser, to).until(EC.visibility_of_element_located((by,id)), "element not found")
except TimeoutException as e:
print(f"element not found after {to}s")
def Timer(text="undefined"): def Timer(text="undefined"):
@ -198,7 +206,6 @@ def claim_amazon():
LogError(f'problème dans la recuperation : {str(e)}') LogError(f'problème dans la recuperation : {str(e)}')
def setup_proxy(ip, port) : def setup_proxy(ip, port) :
PROXY = f"{ip}:{port}" PROXY = f"{ip}:{port}"
webdriver.DesiredCapabilities.FIREFOX['proxy'] = { webdriver.DesiredCapabilities.FIREFOX['proxy'] = {
@ -266,18 +273,6 @@ def CustomSleep(temps):
printf("attente annulée") printf("attente annulée")
def ListTabs(Mdriver=None):
tabs = []
if Mdriver:
ldriver = Mdriver
else:
ldriver = driver
for i in ldriver.window_handles:
ldriver.switch_to.window(i)
tabs.append(ldriver.current_url)
return tabs
def LogError(message, log=FULL_LOG, Mobdriver=None): def LogError(message, log=FULL_LOG, Mobdriver=None):
print(f"\n\n\033[93m Erreur : {str(message)} \033[0m\n\n") print(f"\n\n\033[93m Erreur : {str(message)} \033[0m\n\n")
if Mobdriver: if Mobdriver:
@ -595,11 +590,11 @@ def login():
except : except :
raise ValueError('already logged in') raise ValueError('already logged in')
CustomSleep(10) WaitUntilVisible(By.ID, "i0116")
mail = driver.find_element(By.ID, "i0116") mail = driver.find_element(By.ID, "i0116")
send_keys_wait(mail, _mail) send_keys_wait(mail, _mail)
mail.send_keys(Keys.ENTER) mail.send_keys(Keys.ENTER)
CustomSleep(10) WaitUntilVisible(By.ID, "i0118")
pwd = driver.find_element(By.ID, "i0118") pwd = driver.find_element(By.ID, "i0118")
send_keys_wait(pwd, _password) send_keys_wait(pwd, _password)
pwd.send_keys(Keys.ENTER) pwd.send_keys(Keys.ENTER)
@ -951,7 +946,6 @@ def LogPoint(account="unknown"): # log des points sur discord
add_to_database(account, points, sql_host, sql_usr, sql_pwd, sql_database) add_to_database(account, points, sql_host, sql_usr, sql_pwd, sql_database)
def Fidelite(): def Fidelite():
try: try:
while 1: #close all tabs while 1: #close all tabs