bring store_commit_filename variable from nexusformat#7

Author: lukaspie

script/generate_ontology.py

@@ -4,7 +4,7 @@
 import os
 import sys
 
-def main(full=False, testdata=False, nexus_def_path=None, def_commit=None):
+def main(full=False, testdata = False, nexus_def_path=None, def_commit=None, store_commit_filename = False):
     print(f"Debug: Generating ontology with full={full} and testdata={testdata}")
     local_dir = os.path.abspath(os.path.dirname(__file__))
     os.environ['NEXUS_DEF_PATH'] = nexus_def_path
@@ -29,7 +29,9 @@ def main(full=False, testdata=False, nexus_def_path=None, def_commit=None):
         fullsuffix = ''
 
     # Include the commit hash in the output file name
-    output_file_name = f"NeXusOntology{fullsuffix}_{def_commit}.owl"
+
+    def_commit_text = f"_{def_commit}" if store_commit_filename else ""
+    output_file_name = f"NeXusOntology{fullsuffix}{def_commit_text}.owl"
     output_path = os.path.join(local_dir, f"..{os.sep}ontology{os.sep}{output_file_name}")
     onto.save(file=output_path, format="rdfxml")
 
@@ -38,19 +40,24 @@ def main(full=False, testdata=False, nexus_def_path=None, def_commit=None):
     local_dir = os.path.abspath(os.path.dirname(__file__))
     one_up = os.path.join(local_dir, "..", "definitions")
     two_up = os.path.join(local_dir, "..", "..", "definitions")
-    if os.path.isdir(one_up):
-        nexus_def_path = one_up
-    elif os.path.isdir(two_up):
+    if os.path.isdir(two_up):
         nexus_def_path = two_up
+    elif os.path.isdir(one_up):
+        nexus_def_path = one_up
     else:
         raise FileNotFoundError("definitions folder not found one or two directories up from script location.")
-    commit_arg=1
-    full = len(sys.argv) > 1 and sys.argv[1] == 'full'
+    commit_arg = 1
+    full = len(sys.argv) > 1 and sys.argv[1] == "full"
     if full:
         commit_arg = 2
-    testdata = full and len(sys.argv) > 2 and sys.argv[2] == 'testdata'
+    testdata = full and len(sys.argv) > 2 and sys.argv[2] == "testdata"
     if testdata:
         commit_arg = 3
+    store_commit_filename = (
+        (testdata and len(sys.argv) > 3 and sys.argv[3] == "store_commit_filename") or
+        (full and not testdata and len(sys.argv) > 2 and sys.argv[2] == "store_commit_filename") or
+        (not full and len(sys.argv) > 1 and sys.argv[1] == "store_commit_filename")
+    )
     repo = pygit2.Repository(nexus_def_path)
     # Check for provided commit hash argument
     if len(sys.argv) > commit_arg:
@@ -68,4 +75,5 @@ def main(full=False, testdata=False, nexus_def_path=None, def_commit=None):
     else:
         # Use the current HEAD commit if no version is specified
         def_commit = str(repo.head.target)[:7]
-    main(full=full, testdata=testdata, nexus_def_path=nexus_def_path, def_commit=def_commit)
+
+    main(full=full, testdata=testdata, nexus_def_path=nexus_def_path, def_commit=def_commit, store_commit_filename=store_commit_filename)