From 87cbd484ce930faa98b238d51143d00d2fe53a02 Mon Sep 17 00:00:00 2001 From: Fred Boniface Date: Thu, 3 Oct 2024 11:50:03 +0100 Subject: [PATCH] Add fallback where CRS is unable to be obtained --- .gitignore | 1 + pyvenv.cfg | 4 ++-- src/local_mode.py | 11 ++++++----- src/owlboard_connector.py | 9 ++++++--- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index c874351..939e799 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ env_conf include *.docx +*.pdf git run.sh diff --git a/pyvenv.cfg b/pyvenv.cfg index cb99d2e..06931fc 100644 --- a/pyvenv.cfg +++ b/pyvenv.cfg @@ -1,5 +1,5 @@ home = /usr/bin include-system-site-packages = false -version = 3.11.8 -executable = /usr/bin/python3.11 +version = 3.12.3 +executable = /usr/bin/python3.12 command = /usr/bin/python -m venv /home/fred.boniface/Desktop/diagrams-to-parse/diagram-parser diff --git a/src/local_mode.py b/src/local_mode.py index 1c2ee6b..a11f416 100644 --- a/src/local_mode.py +++ b/src/local_mode.py @@ -6,9 +6,6 @@ def start(): if not owlboard_connector.check_connection(): print("Exiting") sys.exit(1) - #if not gitea_connector.check_connection(): - # print("Exiting") - # sys.exit(1) working_directory = os.getcwd() print("Working directory: ", working_directory) @@ -36,7 +33,7 @@ def start(): get_detail.append({ 'pis': code['pis'], 'services': services, - 'diagram_file': code['file'], + 'diagram_file': code['source_file'], 'date': code['date'], 'headcode': code['headcode'], }) @@ -58,7 +55,11 @@ def start(): formatted_additions = formatter.humanYaml(details) print(formatted_additions) - + out = open("pis_output", "a") + f.write('\n---\n') + f.write(formatted_additions) + f.close() + gitea_connector.clone_repository() gitea_connector.commit_and_push_changes(formatted_additions,"From owlbot diagram-parser") diff --git a/src/owlboard_connector.py b/src/owlboard_connector.py index 06e5295..4e75cb6 100644 --- a/src/owlboard_connector.py +++ b/src/owlboard_connector.py @@ -62,8 +62,9 @@ def get_service_detail(trainUid, date): 'vstp': json_res.get('vstp', False) } organised = organise_svc(svc_detail) - print(res.text) - print(organised) + #print(res.text) + #print(organised) + print("Service Details Found") return organised else: print("Service Not Found") @@ -94,4 +95,6 @@ def convert_tiploc_to_crs(tiploc): json_res = res.json() if json_res: crs = json_res[0]['3ALPHA'] - return crs.lower() + return crs.lower() + else: + return "NO_CRS"