From fd189c68b3c9c8d90851cf5237320735ab8e5c8f Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Thu, 15 Aug 2024 22:54:18 +0300 Subject: [PATCH] cleaner wallets import disgnostics --- parsers/logbooks.py | 2 +- parsers/scans.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/parsers/logbooks.py b/parsers/logbooks.py index 8f45956..8496699 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -59,7 +59,7 @@ LOGBOOK_PARSER_SETTINGS = { LOGBOOKS_DIR = "years" # subfolder of settings.EXPOWEB ENTRIES = { - "2024": 117, + "2024": 118, "2023": 131, "2022": 94, "2019": 55, diff --git a/parsers/scans.py b/parsers/scans.py index 206f645..5ba6f42 100644 --- a/parsers/scans.py +++ b/parsers/scans.py @@ -4,7 +4,7 @@ from pathlib import Path import settings from troggle.core.models.survex import SingleScan from troggle.core.models.troggle import DataIssue -from troggle.core.models.wallets import Wallet +from troggle.core.models.wallets import Wallet, archaic_wallets """Searches through all the survey scans directories (wallets) in expofiles, looking for images to be referenced. Loads all the wallets . @@ -142,10 +142,12 @@ def load_all_scans(): wjson = 0 seenlist = list(seen) seenlist.sort() - print("\n") + print(f"\n - modern wallets with sub-folders") for tag in seenlist: wjson += 1 - print(f" {tag} ", end="\n") + dirc, wall = tag + if wall not in archaic_wallets: + print(f" {wall} {dirc}", end="\n") print(f"\n - found and loaded {c:,} acceptable scan files in {len(wallets):,} wallets") # but we also need to check if JSON exists, even if there are no uploaded scan files.