From a7a555ea85bde0d80a014e676ae2f006d5c01146 Mon Sep 17 00:00:00 2001 From: msramalho <19508417+msramalho@users.noreply.github.com> Date: Tue, 14 Jun 2022 21:19:45 +0200 Subject: [PATCH] refactor configs --- configs/__init__.py | 5 +++-- configs/config.py | 10 ++-------- configs/selenium_config.py | 8 ++++++++ configs/telethon_config.py | 3 ++- configs/wayback_config.py | 3 ++- 5 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 configs/selenium_config.py diff --git a/configs/__init__.py b/configs/__init__.py index 4409847..5a693ca 100644 --- a/configs/__init__.py +++ b/configs/__init__.py @@ -1,3 +1,4 @@ from .config import Config -from .wayback_config import WaybackConfig -from .telethon_config import TelethonConfig \ No newline at end of file +from .selenium_config import SeleniumConfig +from .telethon_config import TelethonConfig +from .wayback_config import WaybackConfig \ No newline at end of file diff --git a/configs/config.py b/configs/config.py index 8095090..c0be658 100644 --- a/configs/config.py +++ b/configs/config.py @@ -3,21 +3,15 @@ import argparse, yaml, json import gspread from loguru import logger from selenium import webdriver -from dataclasses import dataclass, asdict +from dataclasses import asdict from utils import GWorksheet, getattr_or from .wayback_config import WaybackConfig from .telethon_config import TelethonConfig +from .selenium_config import SeleniumConfig from storages import Storage, S3Config, S3Storage, GDStorage, GDConfig, LocalStorage, LocalConfig -@dataclass -class SeleniumConfig: - timeout_seconds: int = 120 - window_width: int = 1400 - window_height: int = 2000 - - class Config: """ Controls the current execution parameters and manages API configurations diff --git a/configs/selenium_config.py b/configs/selenium_config.py new file mode 100644 index 0000000..8e060af --- /dev/null +++ b/configs/selenium_config.py @@ -0,0 +1,8 @@ +from dataclasses import dataclass + + +@dataclass +class SeleniumConfig: + timeout_seconds: int = 120 + window_width: int = 1400 + window_height: int = 2000 diff --git a/configs/telethon_config.py b/configs/telethon_config.py index 2109469..3099bb5 100644 --- a/configs/telethon_config.py +++ b/configs/telethon_config.py @@ -1,8 +1,9 @@ from dataclasses import dataclass + @dataclass class TelethonConfig: api_id: str api_hash: str - bot_token: str \ No newline at end of file + bot_token: str diff --git a/configs/wayback_config.py b/configs/wayback_config.py index 7f455ee..7770f66 100644 --- a/configs/wayback_config.py +++ b/configs/wayback_config.py @@ -1,7 +1,8 @@ from dataclasses import dataclass + @dataclass class WaybackConfig: key: str - secret: str \ No newline at end of file + secret: str