From 291b2659645334987d38f8ad54e7bccb8435278c Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Wed, 2 Oct 2024 14:20:12 -0500 Subject: [PATCH] Log whether download happened --- src/pgwui_sql/views/sql.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/pgwui_sql/views/sql.py b/src/pgwui_sql/views/sql.py index 648a96e..f24746c 100644 --- a/src/pgwui_sql/views/sql.py +++ b/src/pgwui_sql/views/sql.py @@ -376,21 +376,23 @@ class SQLResultsHandler(pgwui_core.core.SessionDBHandler): return pgwui_core.core.DataLineProcessor(ue, self) -def log_response(response): +def log_response(response, download=False): if response['report_success']: if pgwui_core.utils.is_checked(response['csv_checked']): download_fmt = 'CSV' else: download_fmt = 'TAB' - if pgwui_core.utils.is_checked(response['one_file_checked']): - download_as = 'one file' + if not download: + download_as = 'Displayed on-screen' + elif pgwui_core.utils.is_checked(response['one_file_checked']): + download_as = 'Download as one file' else: - download_as = 'a zip file of one file per result set' + download_as = 'Download as a zip file of one file per result set' log.info(': '.join( [f'Successful sql: DB {response["db"]}', # ' File ({filename}):' f'Download Format {download_fmt}', - f'Download as {download_as}', + download_as, f'By user {response["user"]}'])) @@ -434,7 +436,7 @@ def sql_view(request): pmd_response.app_iter = codecs.iterencode(uh.tfile, 'utf_8') - log_response(response) + log_response(response, uh.uf['download']) return pmd_response else: settings = request.registry.settings -- 2.34.1