From 4a7d2387d0ebfe9247a886e2663e14ed1c41edc6 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Wed, 13 Jan 2021 14:48:29 -0600 Subject: [PATCH] Color errors discovered during initialization --- src/pgwui_bulk_upload/views/bulk_upload.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/pgwui_bulk_upload/views/bulk_upload.py b/src/pgwui_bulk_upload/views/bulk_upload.py index 385eb0c..b2c0a4e 100644 --- a/src/pgwui_bulk_upload/views/bulk_upload.py +++ b/src/pgwui_bulk_upload/views/bulk_upload.py @@ -303,13 +303,19 @@ class UploadDir(): except OSError as exp: errors.append(ex.CannotReadError(archive_path(name), exp)) else: - filedata.append(UploadBulkData(fh, - uf['upload_fmt'], - uf['upload_null'], - uf['null_rep'], - archive_path(name), - fmap['relation'], - trim=uf['trim_upload'])) + try: + filedata.append(UploadBulkData(fh, + uf['upload_fmt'], + uf['upload_null'], + uf['null_rep'], + archive_path(name), + fmap['relation'], + trim=uf['trim_upload'])) + except core_ex.PGWUIError as exp: + relation = fmap['relation'] + exp.color(map_description(name, relation), + name, relation) + errors.append(exp) if errors: raise core_ex.MultiError(errors) return filedata -- 2.34.1