From 0e24537f42b703bc8782951c1de86a348ffc4f98 Mon Sep 17 00:00:00 2001 From: Wesley Kerfoot Date: Sat, 18 Jan 2020 14:04:41 -0500 Subject: [PATCH] More refactoring --- deletefb/tools/chrome_driver.py | 42 +++++++++++++-------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/deletefb/tools/chrome_driver.py b/deletefb/tools/chrome_driver.py index 2069340..a0247d8 100644 --- a/deletefb/tools/chrome_driver.py +++ b/deletefb/tools/chrome_driver.py @@ -1,25 +1,21 @@ -import re -import zipfile -import os, sys, stat, platform -from urllib.request import urlretrieve -from collections import namedtuple - +from ..exceptions import UnknownOSException +from .common import NO_CHROME_DRIVER from clint.textui import puts, colored -import progressbar - +from collections import namedtuple from selenium import webdriver +from urllib.request import urlretrieve +from enum import Enum -from .common import NO_CHROME_DRIVER -from ..exceptions import UnknownOSException - - -_ = 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]) +import os, sys, stat, platform +import progressbar +import re +import zipfile +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 +67,8 @@ def get_webdriver(): else: # Download it according to the current machine - os_platform = platform.system() - if os_platform == 'Darwin': - chrome_webdriver = WebDriver.mac - elif os_platform == 'Linux': - chrome_webdriver = WebDriver.linux - elif os_platform == 'Windows': - chrome_webdriver = WebDriver.windows - else: + chrome_webdriver = chrome_drivers.get(platform.system(), False) + if not chrome_webdriver: raise UnknownOSException("Unknown Operating system platform") global total_size