Merge pull request #104 from weskerfoot/refactor

Minor refactoring

deletefb/tools/chrome_driver.py

@@ -1,25 +1,19 @@
-import re
+from ..exceptions import UnknownOSException
-import zipfile
+from .common import NO_CHROME_DRIVER
-import os, sys, stat, platform
-from urllib.request import urlretrieve
-from collections import namedtuple
-
 from clint.textui import puts, colored
-import progressbar
-
 from selenium import webdriver
+from urllib.request import urlretrieve
 
-from .common import NO_CHROME_DRIVER
+import os, sys, stat, platform
-from ..exceptions import UnknownOSException
+import progressbar
-
+import re
-
+import zipfile
-_ = namedtuple('WebDrivers', 'mac linux windows')
-drivers = ['https://chromedriver.storage.googleapis.com/78.0.3904.70/chromedriver_mac64.zip',
-           'https://chromedriver.storage.googleapis.com/78.0.3904.70/chromedriver_linux64.zip',
-           'https://chromedriver.storage.googleapis.com/78.0.3904.70/chromedriver_win32.zip'
-           ]
-WebDriver = _(drivers[0], drivers[1], drivers[2])
 
+chrome_drivers = {
+    "Windows" : "https://chromedriver.storage.googleapis.com/78.0.3904.70/chromedriver_win32.zip",
+    "Darwin" : "https://chromedriver.storage.googleapis.com/78.0.3904.70/chromedriver_mac64.zip",
+    "Linux" : "https://chromedriver.storage.googleapis.com/78.0.3904.70/chromedriver_linux64.zip"
+}
 
 def extract_zip(filename):
     """
@@ -71,14 +65,8 @@ def get_webdriver():
     else:
         # Download it according to the current machine
 
-        os_platform = platform.system()
+        chrome_webdriver = chrome_drivers.get(platform.system(), False)
-        if os_platform == 'Darwin':
+        if not chrome_webdriver:
-            chrome_webdriver = WebDriver.mac
-        elif os_platform == 'Linux':
-            chrome_webdriver = WebDriver.linux
-        elif os_platform == 'Windows':
-            chrome_webdriver = WebDriver.windows
-        else:
             raise UnknownOSException("Unknown Operating system platform")
 
         global total_size

deletefb/tools/login.py

@@ -1,10 +1,9 @@
+from .chrome_driver import get_webdriver, setup_selenium
 from selenium.common.exceptions import NoSuchElementException
 from selenium.webdriver.chrome.options import Options
 
 import time
 
-from .chrome_driver import get_webdriver, setup_selenium
-
 def login(user_email_address,
           user_password,
           is_headless,
@@ -52,14 +51,9 @@ def login(user_email_address,
     login_button = "loginbutton"
     approvals_code = "approvals_code"
 
-    emailelement = driver.find_element_by_name(email)
+    driver.find_element_by_name(email).send_keys(user_email_address)
-    passwordelement = driver.find_element_by_name(password)
+    driver.find_element_by_name(password).send_keys(user_password)
-
+    driver.find_element_by_id(login_button).click()
-    emailelement.send_keys(user_email_address)
-    passwordelement.send_keys(user_password)
-
-    loginelement = driver.find_element_by_id(login_button)
-    loginelement.click()
 
     # Defaults to no 2fa
     has_2fa = False