expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-02-08 11:28:23 +00:00
Code Issues 18 Projects 3 Activity

nearly complete store logbook entries in separate JSON files

Browse Source
This commit is contained in:
Philip Sargent
2025-11-22 22:38:47 +02:00
parent 88833941b5
commit 0e6a3e457d
4 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
parsers/logbooks.py
View File

@@ -16,7 +16,7 @@ from parsers.people import GetPersonExpeditionNameLookup, known_foreigner, load_
from typing import Any, List, Tuple
from troggle.core.models.caves import GetCaveLookup
from troggle.core.models.logbooks import LogbookEntry, PersonLogEntry
from troggle.core.models.troggle import DataIssue, Expedition
from troggle.core.models.troggle import DataIssue, Expedition, Person, PersonExpedition
from troggle.core.utils import alphabet_suffix, get_process_memory, unique_slug
EPOCH = settings.EPOCH
@@ -305,7 +305,10 @@ def bulk_store_entries(entries):
logbook_objs = []
slug_to_entrydata = {}
for entry in entries:
other_people = ", ".join(entry.guests)
if isinstance(entry.guests, list):
other_people = ", ".join(entry.guests) # this idiom takes a list of strings and concatenates them into a single string
else:
other_people = entry.guests
# Ensure slug is unique, otherwise add suffix
slug = entry.tid
orig_slug = slug
@@ -682,20 +685,33 @@ def parse_logbook_for_expedition(expedition, blog=False):
return logentries
def parse_from_dict(entrydict):
ldate = entrydict["date"]
"""We have imported the JSON data, but this still needs turning into links to
actual live DJango objects that already exist: Expedition, Persons,
PersonExpedition etc.
"""
ldate = datetime.fromisoformat(entrydict["date"]).date()
place = entrydict["place"]
tripcave = entrydict["cave"]
triptitle = entrydict["title"]
tripcontent = entrydict["text"]
trippersons = None
author = entrydict["author"]["slug"]
guests = entrydict["other_people"]
expedition = entrydict["expedition"]
expedition = Expedition.objects.get(name=entrydict["expedition"]["name"])
tu = entrydict["time_underground"]
tid = entrydict["slug"] # Is this right ? Or is it the end txt?
tid = entrydict["slug"]
_author_person = Person.objects.get(slug=entrydict["author"]["slug"])
_author_nickname = entrydict["author"]["nickname"]
_author_tu = entrydict["author"]["tu"]
author = PersonExpedition.objects.get(person=_author_person, expedition=expedition) # not a tuple
trippersons = []
for tp in entrydict["trippersons"]:
_person = Person.objects.get(slug=tp["slug"])
_personexpo = PersonExpedition.objects.get(person=_person, expedition=expedition)
trippersons.append((_personexpo,tp["nickname"],tp["tu"]))
logentry = LogbookEntryData(ldate, place, tripcave, triptitle, tripcontent, trippersons, author, guests, expedition, tu, tid)
if ldate == "2025-07-08":
if entrydict["date"] == "2025-07-08":
print(f"PARSED from JSON\n",logentry,"\n")
return logentry
@@ -724,7 +740,7 @@ def parse_logbook_for_expedition(expedition, blog=False):
print(f" # WARNING year {year} has JSON-encoded logbook entries. Using these instead of the archive .html file.")
logentries = load_from_json()
logentries = []
logentries = [] # but don't actually use these.
# check_number_of_entries(logentries)
# return logentries
@@ -828,13 +844,6 @@ def LoadLogbook(year):
)
# Bulk store all entries at once
bulk_store_entries(logentries)
#for entry in logentries:
#date, place, tripcave, triptitle, text, trippersons, author, guests, expedition, tu, tid = entrytuple
#if expo == entry.expedition: # unneeded check, we zeroed it before filling it
# print(f" -- {triptitle}")
#store_entry_into_database(entry)
#else:
#print(f" ! unexpected log entry labelled as '{entry.expedition}' {entry.tid}" )
expo.save() # to save logbook name property
def LoadLogbooks():