From e18a9779dbcebe248c1856695f7663a5c45e50c4 Mon Sep 17 00:00:00 2001 From: Dave Mateer Date: Mon, 9 May 2022 11:55:10 +0100 Subject: [PATCH 1/4] added log diretory and file creation --- auto_archive.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/auto_archive.py b/auto_archive.py index d3db9a2..9172b5d 100644 --- a/auto_archive.py +++ b/auto_archive.py @@ -5,15 +5,20 @@ import requests import shutil import gspread from loguru import logger -from dotenv import load_dotenv +# from dotenv import load_dotenv from selenium import webdriver import traceback import archivers from storages import S3Storage, S3Config from utils import GWorksheet, mkdir_if_not_exists +import sys -load_dotenv() +logger.add("logs/1trace.log", level="TRACE") +logger.add("logs/2info.log", level="INFO") +logger.add("logs/3success.log", level="SUCCESS") +logger.add("logs/4warning.log", level="WARNING") +logger.add("logs/5error.log", level="ERROR") def update_sheet(gw, row, result: archivers.ArchiveResult): @@ -86,7 +91,7 @@ def process_sheet(sheet, header=1, columns=GWorksheet.COLUMN_NAMES): # loop through worksheets to check for ii, wks in enumerate(sh.worksheets()): - logger.info(f'Opening worksheet {ii}: "{wks.title}" header={header}') + logger.info(f'Opening worksheet ii={ii}: {wks.title} header={header}') gw = GWorksheet(wks, header_row=header, columns=columns) if not gw.col_exists('url'): @@ -151,8 +156,9 @@ def process_sheet(sheet, header=1, columns=GWorksheet.COLUMN_NAMES): logger.success(f'Finshed worksheet {wks.title}') driver.quit() - +@logger.catch def main(): + logger.debug(f'Passed args:{sys.argv}') parser = argparse.ArgumentParser( description='Automatically archive social media videos from a Google Sheets document') parser.add_argument('--sheet', action='store', dest='sheet', help='the name of the google sheets document', required=True) From e3c0ae1d45e214a5fd3443ec6005bf24a382c206 Mon Sep 17 00:00:00 2001 From: Dave Mateer Date: Mon, 9 May 2022 11:57:54 +0100 Subject: [PATCH 2/4] dotenv --- auto_archive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto_archive.py b/auto_archive.py index 9172b5d..1342285 100644 --- a/auto_archive.py +++ b/auto_archive.py @@ -5,7 +5,7 @@ import requests import shutil import gspread from loguru import logger -# from dotenv import load_dotenv +from dotenv import load_dotenv from selenium import webdriver import traceback From f52d8cdef80c67e2017ee3bef0db9f3403d66d4f Mon Sep 17 00:00:00 2001 From: Dave Mateer Date: Mon, 9 May 2022 12:02:43 +0100 Subject: [PATCH 3/4] add back in d_dotenv() --- auto_archive.py | 1 + 1 file changed, 1 insertion(+) diff --git a/auto_archive.py b/auto_archive.py index 1342285..a529a82 100644 --- a/auto_archive.py +++ b/auto_archive.py @@ -20,6 +20,7 @@ logger.add("logs/3success.log", level="SUCCESS") logger.add("logs/4warning.log", level="WARNING") logger.add("logs/5error.log", level="ERROR") +load_dotenv() def update_sheet(gw, row, result: archivers.ArchiveResult): cell_updates = [] From 6e8eccefd82e48ceb095b8460ce34ac5beb9f6ab Mon Sep 17 00:00:00 2001 From: Miguel Sozinho Ramalho <19508417+msramalho@users.noreply.github.com> Date: Mon, 9 May 2022 15:59:35 +0100 Subject: [PATCH 4/4] self-documenting info message --- auto_archive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto_archive.py b/auto_archive.py index a529a82..322b069 100644 --- a/auto_archive.py +++ b/auto_archive.py @@ -92,7 +92,7 @@ def process_sheet(sheet, header=1, columns=GWorksheet.COLUMN_NAMES): # loop through worksheets to check for ii, wks in enumerate(sh.worksheets()): - logger.info(f'Opening worksheet ii={ii}: {wks.title} header={header}') + logger.info(f'Opening worksheet {ii=}: {wks.title=} {header=}') gw = GWorksheet(wks, header_row=header, columns=columns) if not gw.col_exists('url'):