From d7f44b948fdb3677c18e906d8232ea693db935ea Mon Sep 17 00:00:00 2001 From: msramalho <19508417+msramalho@users.noreply.github.com> Date: Tue, 10 May 2022 23:15:58 +0200 Subject: [PATCH] wayback fix --- archivers/wayback_archiver.py | 9 +++------ auto_archive.py | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/archivers/wayback_archiver.py b/archivers/wayback_archiver.py index b1e6824..10814dc 100644 --- a/archivers/wayback_archiver.py +++ b/archivers/wayback_archiver.py @@ -5,18 +5,15 @@ from bs4 import BeautifulSoup from storages import Storage from .base_archiver import Archiver, ArchiveResult -# @dataclass -# class WaybackConfig: -# key: str -# secret: str from configs import WaybackConfig # TODO: use WaybackConfig class WaybackArchiver(Archiver): name = "wayback" - def __init__(self, storage: Storage, driver): + def __init__(self, storage: Storage, driver, config: WaybackConfig): super(WaybackArchiver, self).__init__(storage, driver) + self.config = config self.seen_urls = {} def download(self, url, check_if_exists=False): @@ -25,7 +22,7 @@ class WaybackArchiver(Archiver): ia_headers = { "Accept": "application/json", - "Authorization": "LOW " + os.getenv('INTERNET_ARCHIVE_S3_KEY') + ":" + os.getenv('INTERNET_ARCHIVE_S3_SECRET') + "Authorization": f"LOW {self.config.key}:{self.config.secret}" } r = requests.post( diff --git a/auto_archive.py b/auto_archive.py index 749e912..833f944 100644 --- a/auto_archive.py +++ b/auto_archive.py @@ -95,7 +95,7 @@ def process_sheet(c: Config, sheet, header=1, columns=GWorksheet.COLUMN_NAMES): TiktokArchiver(storage, c.webdriver), YoutubeDLArchiver(storage, c.webdriver, c.facebook_cookie), TwitterArchiver(storage, c.webdriver), - WaybackArchiver(storage, c.webdriver) + WaybackArchiver(storage, c.webdriver, c.wayback_config) ] for archiver in active_archivers: