diff --git a/.gitignore b/.gitignore index 5db8d9d..ee0c78d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,5 @@ service_account.json __pycache__/ ._* anu.html -geckodriver.log - +*.log +.pytest_cach \ No newline at end of file diff --git a/archivers/base_archiver.py b/archivers/base_archiver.py index 7a61ea7..d523e3f 100644 --- a/archivers/base_archiver.py +++ b/archivers/base_archiver.py @@ -6,7 +6,6 @@ from dataclasses import dataclass from abc import ABC, abstractmethod from urllib.parse import urlparse import hashlib -from selenium.common.exceptions import TimeoutException from loguru import logger import time import requests diff --git a/archivers/telegram_archiver.py b/archivers/telegram_archiver.py index 9e735bb..0bbb5a7 100644 --- a/archivers/telegram_archiver.py +++ b/archivers/telegram_archiver.py @@ -39,7 +39,7 @@ class TelegramArchiver(Archiver): images = [] for im in image_tags: - urls = [u.replace("'", "") for u in re.findall('url\((.*?)\)', im['style'])] + urls = [u.replace("'", "") for u in re.findall(r'url\((.*?)\)', im['style'])] images += urls page_cdn, page_hash, thumbnail = self.generate_media_page(images, url, html.escape(str(t.content))) diff --git a/storages/base_storage.py b/storages/base_storage.py index 050a8eb..7b026af 100644 --- a/storages/base_storage.py +++ b/storages/base_storage.py @@ -6,10 +6,10 @@ class Storage(ABC): def __init__(self, config): pass @abstractmethod - def get_cdn_url(self, path): pass + def get_cdn_url(self, key): pass @abstractmethod - def exists(self, path): pass + def exists(self, key): pass @abstractmethod def uploadf(self, file, key, **kwargs): pass diff --git a/utils/__init__.py b/utils/__init__.py index 9b58126..68010ab 100644 --- a/utils/__init__.py +++ b/utils/__init__.py @@ -1,3 +1,3 @@ # we need to explicitly expose the available imports here -from .gworksheet import GWorksheet +from .gworksheet import * from .misc import * \ No newline at end of file