From f1c84e2e0d8bcda9b91fcb131df9ce82d13d2486 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Sat, 14 Mar 2020 13:18:48 +0000 Subject: [PATCH] added timestamp to outputs --- noinfo/wallets.py | 61 ++++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 22 deletions(-) mode change 100644 => 100755 noinfo/wallets.py diff --git a/noinfo/wallets.py b/noinfo/wallets.py old mode 100644 new mode 100755 index b0e58a829..d44917ed4 --- a/noinfo/wallets.py +++ b/noinfo/wallets.py @@ -1,43 +1,55 @@ #!/usr/bin/env python import sys, os, operator, urllib, json, re, time +from datetime import datetime # 2017 originally by Martin Green # 2018-08-27 edited Philip Sargent -# 2019-03-02 extended to take command line argument of loser_dir and set mod time of index.html to be sane as json file +# 2019-03-02 extended to take command line argument of loser_dir and set mod time of index.html to be same as json file # 2019-12-17 extra output of links to troggle-generated trip data +# 2019-12-31 bits to make website link-checker not barf so much. Added endswith() to .startswith() for notes, elev, plan filenames +# 2020-01-21 Now we are using Windows10-WSL1, +links to expedition logbook on every generated page +# 2020-03-14 Adding timestamp tovisible outputs -loser_dir = "/home/expo/loser/" -#loser_dir = "/mnt/d/CUCC-Expo/loser/" # when running on Win10/bash +loser_dir = "/home/expo/loser" +#loser_dir = "/mnt/d/CUCC-Expo/loser/" # when running on Win10-WSL1 #loser_dir = "/media/philip/SD-huge/CUCC-Expo/loser/" # when running on xubuntu laptop 'barbie' if len(sys.argv) > 1 : if sys.argv[1] != "": loser_dir = sys.argv[1] -print "Loser repo is assumed to be in: " + loser_dir +dateTimeObj=datetime.now(tz=None) +timestamp = dateTimeObj.strftime("%d-%b-%Y (%H:%M)") + +print "Loser repo (for svx files) is assumed to be in: " + loser_dir + "/" + +drawings_dir = loser_dir[0:len(loser_dir)-5] + "drawings" +print "Drawings repo (for drawings files) is assumed to be in: " + drawings_dir + "/" html_base = "%(body)s" -html_year_index = html_base % {"body": "

%(year)s surveys: wallets status

\n

List of trips: expedition/%(year)s - troggle-processed .svx files and logbook entries on server

\n

Persons

\n\n

Wallets

\n%(wallets)s
\n

Needing Scanning

\n\n

Website (Guidebook description) needing updating\n

\n\n"} +html_year_index = html_base % {"body": "

%(year)s surveys: wallets status

\n

List of trips: expedition/%(year)s - troggle-processed .svx files and logbook entries on server

\nAs of %(timestamp)s\n

Persons

\n\n

Wallets

\n%(wallets)s
\n

Needing Scanning

\n\n

Website (Guidebook description) needing updating\n

\n\n"} html_year_person = "
  • %(person)s
    • \n" html_year_wallet_entry = "%(walletname)s %(cave)s %(name)s %(complaints)s\n" html_person_wallet_entry = "
  • %(walletname)s
    • \n" html_year_scanning_entry = "
  • %(walletname)s %(cave)s %(name)s
    • \n" html_wallet_file_entry = "
  • %(filename)s
    • \n" -html_wallet_index = html_base % {"body": "

    %(title)s : %(cave)s : %(name)s

    \n

    Date: %(date)s

    People: %(people)s

    \n

    Cave Guidebook description - %(description_needed)s \n

    Survex file:
      Local (Windows): %(loser_dirw)s%(survex)s
      Local (Linux): %(loser_dir)s%(survex)s
      Server:            %(survex)s

    Wallet index for this year

    \n

    Issues

    \n%(complaints)s\n

    Files

    \n\n"} +html_wallet_index = html_base % {"body": "

    %(title)s : %(cave)s : %(name)s

    \n

    List of trips: expedition/%(year)s - troggle-processed .svx files and logbook entries on server

    \n

    Date: %(date)s

    People: %(people)s

    \n

    Cave Guidebook description - %(description_needed)s \n

    Survex file:
      
       Local:      file:///%(loser_dir)s/%(survex)s
     Server:      http://expo.survex.com/survexfile/%(survex)s

    Wallet index for this year
    Local location for ::loser:: repo specified on command line is %(loser_dir)s.

    \n

    Issues

    \n%(complaints)s\n

    Files

    \n\n"} html_survex_required = {True: "Survex ", False: ""} html_plan_scanned = {True: "", False: "Plan "} html_elev_scanned = {True: "", False: "Elev "} html_description_written = {True: "", False: "Desc "} html_qms_written = {True: "", False: "QMs "} html_status = {True: "Issues: ", False: ""} -html_person = html_base % {"body": "

    %(person)s

    Outstanding Wallets

    "} +html_person = html_base % {"body": "

    %(person)s

    \n

    List of trips: expedition/%(year)s - troggle-processed .svx files and logbook entries on server

    \n

    Outstanding Wallets

    \nAs of %(timestamp)s\n"} html_complaint_items = "
  • %(count)i %(complaint)s
    • " html_items = "
  • %s
    • " + + blank_json = { "cave": "", "date": "", - "description url": "", + "description url": "/caves", "description written": False, "electronic survey": False, "elev drawn": False, @@ -53,6 +65,7 @@ blank_json = { "survex not required": False, "website updated": False} + #need to use wallets as a dict/tuple (id,cave,name) - not sure how. wallets = [] wallets_needing_scanning = set() @@ -106,7 +119,8 @@ for item in sorted(os.listdir(".")): print "Writing file %s" % (contents_path) json_file = open(contents_path, "w") json.dump(data, json_file, indent = 1) - json_file.close() + json_file.close() + # Get modification time of contents.json # print("json last modified: %s" % time.ctime(os.path.getmtime(contents_path))) json_mtime = os.path.getmtime(contents_path) @@ -131,36 +145,39 @@ for item in sorted(os.listdir(".")): #Notes notes_scanned = reduce(operator.or_, [f.startswith("note") for f in files], False) + notes_scanned = reduce(operator.or_, [f.endswith("note") for f in files], notes_scanned) if not notes_scanned: - complaints.append("The notes needs scanning (no noteN.jpg file found)") + complaints.append("The notes needs scanning (no noteNN.jpg or XXnote.jpg file found)") wallets_needing_scanning.add(item) #Plan drawing required plan_scanned = reduce(operator.or_, [f.startswith("plan") for f in files], False) + plan_scanned = reduce(operator.or_, [f.endswith("plan") for f in files], plan_scanned) plan_drawing_required = not (plan_scanned or data["plan drawn"]) if plan_drawing_required: - complaints.append("The plan needs drawing (no planN.jpg file found)") - person_complaints.append(" plan(s) needs drawing (no planN.jpg file found)") + complaints.append("The plan needs drawing (no planNN.jpg or XXplan.jpg file found)") + person_complaints.append(" plan(s) needs drawing (no planNN.jpg or XXplan.jpg file found)") if not plan_drawing_required and not plan_scanned: - complaints.append("The plan needs scanning (no planN.jpg file found)") + complaints.append("The plan needs scanning (no planNN.jpg or XXplan.jpg file found)") wallets_needing_scanning.add(item) #Elev drawing required elev_scanned = reduce(operator.or_, [f.startswith("elev") for f in files], False) + elev_scanned = reduce(operator.or_, [f.endswith("elev") for f in files], elev_scanned) elev_drawing_required = not (elev_scanned or data["elev drawn"]) if elev_drawing_required: - complaints.append("The elev needs drawing (no elevN.jpg file found)") - person_complaints.append(" elev(s) needs drawing (no elevN.jpg file found)") + complaints.append("The elev needs drawing (no elevNN.jpg or XXelev.jpg file found)") + person_complaints.append(" elev(s) needs drawing (no elevNN.jpg or XXelev.jpg file found)") if not elev_drawing_required and not elev_scanned: - complaints.append("The elev needs scanning (no elevN.jpg file found)") + complaints.append("The elev needs scanning (no elevNN.jpg or XXelev.jpg file found)") wallets_needing_scanning.add(item) #Description if not data["description written"]: complaints.append("The description needs writing") person_complaints.append(" description(s) needs writing") - description_needed = "Not present, needs doing." + description_needed = "A description is indicated as being needed, so may need adding into this cave page." #QMS @@ -170,12 +187,12 @@ for item in sorted(os.listdir(".")): #Website if not data["website updated"]: - complaints.append("The guidebook description on the website needs updating") + complaints.append("The website is marked as needing updating (using the guidebook description)") website_needing_updating.add(item) #Electronic Surveys if not data["electronic survey"]: - complaints.append("Tunnel / Therion files need drawing") + complaints.append("Tunnel / Therion drawing files need drawing") if data["survex file"]: survex_description = data["survex file"] @@ -183,7 +200,7 @@ for item in sorted(os.listdir(".")): survex_description = "Not specified" wallet_index_file = open(os.path.join(item, "index.html"), "w") - wallet_index_file.write(html_wallet_index % {"title": item, + wallet_index_file.write(html_wallet_index % {"title": item, "year": year, "cave": data["cave"], "name": data["name"], "date": data["date"], @@ -237,7 +254,7 @@ for person, person_wallets in people.items(): person_summary = dict(person_summary) year_index_file = open("index.html", "w") -year_index_file.write(html_year_index % {"year": year, "persons": reduce(operator.add, [html_year_person % {"person": person, +year_index_file.write(html_year_index % {"year": year, "timestamp": timestamp, "persons": reduce(operator.add, [html_year_person % {"person": person, "complaints": reduce(operator.add, [html_complaint_items % {"complaint": complaint, "count": count} @@ -270,7 +287,7 @@ year_index_file.close() for person, item_complaint_list in people.items(): person_file = open(person + ".html", "w") - person_file.write(html_person % {"person": person, + person_file.write(html_person % {"person": person, "year": year, "timestamp": timestamp, "wallets": reduce(operator.add, [html_person_wallet_entry % {"walletname": wallet, "walletindex": urllib.quote(wallet) + "/index.html", "complaints": reduce(operator.add,