diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/report_ops/scotia.py | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/python/report_ops/scotia.py b/python/report_ops/scotia.py index 32379256..c81dad5c 100644 --- a/python/report_ops/scotia.py +++ b/python/report_ops/scotia.py @@ -13,12 +13,6 @@ from serenitas.analytics.dates import prev_business_day logger = logging.getLogger(__name__) -def wait(driver): - WebDriverWait(driver, 10).until( - lambda driver: driver.execute_script("return document.readyState") == "complete" - ) - - def download_report(account_username, password, report_dir, workdate): driver = create_driver(report_dir) login(driver, account_username, password) @@ -32,14 +26,13 @@ def download_report(account_username, password, report_dir, workdate): def login(driver, account_username, password): driver.get("https://web1.mail.scotiabank.com/webmail/do/Home") - wait(driver) - username_element = driver.find_element_by_id("username") + wait = WebDriverWait(driver, 10) + username_element = wait.until(EC.presence_of_element_located((By.ID, "username"))) username_element.send_keys(account_username) - password_element = driver.find_element_by_id("passwordid") + password_element = wait.until(EC.presence_of_element_located((By.ID, "passwordid"))) password_element.send_keys(password) - login_button = driver.find_element_by_id("loginbutton") + login_button = driver.find_element(By.ID, "loginbutton") login_button.click() - wait(driver) def navigate_to_inbox(driver, workdate): @@ -53,7 +46,7 @@ def navigate_to_inbox(driver, workdate): ) inbox_link.click() wait.until(EC.presence_of_element_located((By.CLASS_NAME, "zfolder-msg"))) - for msg in driver.find_elements_by_class_name("zfolder-msg"): + for msg in driver.find_elements(By.CLASS_NAME, "zfolder-msg"): date_string = re.search( r"\d{4}-\d{2}-\d{2}|\d{1,2}/\d{1,2}/\d{4}", msg.text ).group() @@ -69,12 +62,12 @@ def get_attachment_element(driver): attach = wait.until( EC.presence_of_element_located((By.CLASS_NAME, "zmessage-attachment-link")) ) - return driver.find_elements_by_class_name("zmessage-attachment-link")[0] + return driver.find_element(By.CLASS_NAME, "zmessage-attachment-link") def create_driver(download_dir): options = Options() - options.add_argument("--headless") + # options.add_argument("--headless") fp = webdriver.FirefoxProfile() fp.set_preference("browser.download.dir", str(download_dir)) fp.set_preference("browser.download.folderList", 2) |