diff --git a/main.py b/main.py index 08df316..31feede 100644 --- a/main.py +++ b/main.py @@ -51,7 +51,7 @@ def main(driver: Chrome, logger = logging.getLogger('main')): RUNNING = 2 STANDBY = 3 CLOSING = 4 - + class ColumnMapping: def __init__(self, email=None, recipient=None, code=None, region=None, sent=None, variables=None): self.email = email or '邮箱' @@ -60,7 +60,7 @@ def main(driver: Chrome, logger = logging.getLogger('main')): self.region = region or '国家地区' self.sent = sent or '已发送' self.variables = variables or '变量值' - + status = Status.IDLE options = dict() headers = list() @@ -89,7 +89,7 @@ def main(driver: Chrome, logger = logging.getLogger('main')): status = Status.RUNNING driver.switch_to.window(driver.current_window_handle) timer.start() - + def unique(header: str): result = dict() col = headers.index(header) + 1 @@ -144,11 +144,11 @@ def main(driver: Chrome, logger = logging.getLogger('main')): if char.isdigit() or (category(char).startswith('L') and not name(char, '').startswith('LATIN')): return True return False - + def ready(driver: Chrome): busy = driver.find_element(By.CSS_SELECTOR, ".io-ox-busy") return busy - + def catch(predicate: Callable[[Chrome], WebElement]): wait = WebDriverWait(driver, timeout=parameters['interval']) return wait.until(predicate, 'Timeout') @@ -194,7 +194,7 @@ def main(driver: Chrome, logger = logging.getLogger('main')): return subject except: return None - + def get_address(): try: element = locate("header div.from", wait=False) @@ -202,7 +202,7 @@ def main(driver: Chrome, logger = logging.getLogger('main')): return address except: return None - + def cell(row: int, header: str): result = wb.active.cell(row, headers.index(header) + 1) return result @@ -296,7 +296,7 @@ def main(driver: Chrome, logger = logging.getLogger('main')): for col in range(1, wb.active.max_column + 1): value = str(wb.active.cell(1, col).value) headers.append(value) - + logger.info('Done') flow.allow(Cancel) status = Status.READY diff --git a/requirements.txt b/requirements.txt index c623624..0885c56 100644 Binary files a/requirements.txt and b/requirements.txt differ