From d35864e36732d0d986199b5ed324efdb9fa8a14d Mon Sep 17 00:00:00 2001
From: laurentheirendt <laurent.heirendt@uni.lu>
Date: Mon, 21 Feb 2022 07:51:47 +0100
Subject: [PATCH] split generation of whitelist into separate function
---
.ci/generateIndex.py | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/.ci/generateIndex.py b/.ci/generateIndex.py
index 51a92134..1402f8a9 100644
--- a/.ci/generateIndex.py
+++ b/.ci/generateIndex.py
@@ -147,7 +147,7 @@ def remove_header(localroot, root, filename):
return n
-def generate_header(folder, permalink, shortcut, order):
+def generate_header(folder, permalink, shortcut, order, legacy_from):
header = "---\n"
if len(order) > 0:
@@ -163,7 +163,7 @@ def generate_header(folder, permalink, shortcut, order):
if "handbook-annexes" in permalink or "handbook-additional" in permalink:
header += " - /cards/" + root_handbook(shortcut) + "\n"
header += " - /" + folder + "/cards/" + root_handbook(shortcut) + "\n"
- # after moving lab cards
+ # separate lab section
if "lab-software" in permalink or "lab-equipment" in permalink or "lab-hsa" in permalink:
header += " - /cards/" + root_lab(shortcut) + "\n"
header += " - /" + folder + "/cards/" + root_lab(shortcut) + "\n"
@@ -176,6 +176,21 @@ def generate_header(folder, permalink, shortcut, order):
return header
+def generate_whitelist_entry(folder, permalink, shortcut):
+ wl_entry = permalink + "\n"
+ wl_entry += "/?" + shortcut + "\n"
+ wl_entry += "/cards/" + shortcut + "\n"
+ wl_entry += "/" + folder + "/cards/" + shortcut + "\n"
+ if "handbook-annexes" in permalink or "handbook-additional" in permalink:
+ wl_entry += "/cards/" + root_handbook(shortcut) + "\n"
+ wl_entry += "/" + folder + "/cards/" + root_handbook(shortcut) + "\n"
+ # separate lab section
+ if "lab-software" in permalink or "lab-equipment" in permalink or "lab-hsa" in permalink:
+ wl_entry += "/cards/" + root_lab(shortcut) + "\n"
+ wl_entry += "/" + folder + "/cards/" + root_lab(shortcut) + "\n"
+
+ return wl_entry
+
# loop through the entire internal tree
localroot = os.getcwd()
@@ -274,20 +289,10 @@ for folder in cardDirs:
orderArr[indexS] = []
# generate the header for each card
- header = generate_header(folder, permalink, shortcut, order)
+ header = generate_header(folder, permalink, shortcut, order, legacy_from)
# add autogenerated links to whitelist
- whiteList += permalink + "\n"
- whiteList += "/?" + shortcut + "\n"
- whiteList += "/cards/" + shortcut + "\n"
- whiteList += "/" + folder + "/cards/" + shortcut + "\n"
- if "handbook-annexes" in permalink or "handbook-additional" in permalink:
- whiteList += " - /cards/" + root_handbook(shortcut) + "\n"
- whiteList += " - /" + folder + "/cards/" + root_handbook(shortcut) + "\n"
- # after moving lab cards
- if "lab-software" in permalink or "lab-equipment" in permalink or "lab-hsa" in permalink:
- whiteList += " - /cards/" + root_lab(shortcut) + "\n"
- whiteList += " - /" + folder + "/cards/" + root_lab(shortcut) + "\n"
+ whiteList += generate_whitelist_entry(folder, permalink, shortcut)
# add the header properly speaking
line_prepender(fileName, header)
--
GitLab