input/projects/3d-printing.md

@@ -3,6 +3,7 @@ description: Reports of my different endeavours in 3D printing
 parent: projects
 position: 10
 child-id: 3d-printing
+sort-order: position
 ---
 
 In 2016 I've started experimenting with 3D printers.
@@ -10,7 +11,7 @@ In the meantime, I've modified my printers quite a bit and also written about it
 Here are all the articles that are part of my 3D printing series:
 
 <!--%
-print3DPrintingMenu()
+printMenu()
 %-->
 
 If you're interested in my 3D print designs, take a look [at my Thingiverse account](https://www.thingiverse.com/xythobuz/designs) or my [Git Repository](https://git.xythobuz.de/thomas/3d-print-designs).

input/projects/input_devices.md

@@ -3,17 +3,19 @@ description: Mechanical Keyboards and other Human-Machine-Interfaces
 parent: projects
 position: 15
 child-id: input_devices
+sort-order: date
 ---
 
 One of the recurring topics in my projects are different kind of input devices.
 Here you can find all pages in this category.
 
 <!--%
-printInputDevicesMenu()
+printMenu()
 %-->
 
 The following pages are also related to this topic.
 
 <!--%
-printInputDevicesRelatedMenu()
+mpages = [p for p in pages if p.get("show_in_input_devices", "false") == "true"]
+printMenuDate(mpages)
 %-->

input/projects/quadcopters.md

@@ -3,6 +3,7 @@ description: My self-made Quadcopters and other model stuff
 parent: projects
 position: 20
 child-id: quadcopters
+sort-order: position
 ---
 
 In the last couple of years I built multiple quadcopters and some other related flying remote-controlled model vehicles.
@@ -12,13 +13,14 @@ All of these I'm flying with [FatShark Dominator v3 Camo Blue](https://hobbyking
 Of course I'm not flying illegally, I have a model flight insurance and I am a registered UAV pilot in the European Union! 👮
 
 <!--%
-printQuadcopterMenu()
+printMenu()
 %-->
 
 The following projects and blog posts are also related to my Quadcopter endeavours.
 
 <!--%
-printQuadcopterRelatedMenu()
+mpages = [p for p in pages if p.get("show_in_quadcopters", "false") == "true"]
+printMenuDate(mpages)
 %-->
 
 You can find all my Betaflight configuration dumps and related files [here](https://git.xythobuz.de/thomas/copter-configs).

input/projects/smarthome.md

@@ -3,6 +3,7 @@ description: Home automation without shady cloud companies
 parent: projects
 position: 50
 child-id: smarthome
+sort-order: position
 ---
 
 With the appearance of cheap WiFi-capable microcontrollers in recent years, like the ESP8266 and the ESP32, the Internet of Things and Smart Home automation have been on my mind.
@@ -12,5 +13,5 @@ And the data should also be hosted on machines I control.
 The pages in this category document different parts of my setup at home.
 
 <!--%
-printSmarthomeMenu()
+printMenu()
 %-->

input/projects/xyrobot.md

@@ -10,6 +10,7 @@ compat: rob
 date: 2011-07-28
 update: 2012-08-30
 child-id: xyrobot
+sort-order: position
 ---
 
 This is my robot project. A self-made PCB with an AtMega2560 controls everything. The robot has a [Bluetooth module][1], a [Gameboy Camera][2] and my [RAM module][3]. I bought the [RN-KeyLCD][4] and the [RN-VN2][5] from [Roboternetz][6].

macros.py

@@ -265,6 +265,11 @@ def printProjectsMenu():
 
         # print subpages for these top-level items
         subpages = [sub for sub in enpages if sub.get("parent", "none") == p.get("child-id", "unknown")]
+        order = p.get("sort-order", "date")
+        if order == "position":
+            subpages.sort(key=lambda p: p["position"])
+        else:
+            subpages.sort(key=lambda p: p["date"], reverse = True)
         if len(subpages) > 0:
             print("<ul>")
             for sp in subpages:
@@ -285,7 +290,11 @@ def printProjectsMenu():
 
         # print subpages for these top-level items
         subpages = [sub for sub in enpages if sub.get("parent", "none") == p.get("child-id", "unknown")]
-        subpages.sort(key=lambda p: [p.get("date", "9999-01-01")], reverse = True)
+        order = p.get("sort-order", "date")
+        if order == "position":
+            subpages.sort(key=lambda p: p["position"])
+        else:
+            subpages.sort(key=lambda p: p["date"], reverse = True)
         if len(subpages) > 0:
             print("<ul>")
             for sp in subpages:
@@ -294,59 +303,31 @@ def printProjectsMenu():
 
     print("</ul>")
 
-def print3DPrintingMenu():
-    mpages = [p for p in pages if p.get("parent", "") == "3d-printing" and p.lang == "en"]
-    mpages.sort(key=lambda p: int(p["position"]))
-
-    print("<ul id='menulist'>")
-    for p in mpages:
-        printMenuItem(p, False, True, True)
-    print("</ul>")
-
-def printInputDevicesMenu():
-    mpages = [p for p in pages if p.get("parent", "") == "input_devices" and p.lang == "en"]
-    mpages.sort(key=lambda p: [p.get("date", "9999-01-01")], reverse = True)
-
-    print("<ul id='menulist'>")
-    for p in mpages:
-        printMenuItem(p, False, True, True)
-    print("</ul>")
-
-def printInputDevicesRelatedMenu():
-    mpages = [p for p in pages if p.get("show_in_input_devices", "false") == "true"]
-    mpages.sort(key=lambda p: [p.get("date", "9999-01-01")], reverse = True)
-
-    print("<ul id='menulist'>")
-    for p in mpages:
-        printMenuItem(p, False, True, True)
-    print("</ul>")
-
-def printSmarthomeMenu():
-    mpages = [p for p in pages if p.get("parent", "") == "smarthome" and p.lang == "en"]
-    mpages.sort(key=lambda p: int(p["position"]))
-
-    print("<ul id='menulist'>")
-    for p in mpages:
-        printMenuItem(p, False, True, True)
-    print("</ul>")
-
-def printQuadcopterMenu():
-    mpages = [p for p in pages if p.get("parent", "") == "quadcopters" and p.lang == "en"]
-    mpages.sort(key=lambda p: int(p["position"]))
-
-    print("<ul id='menulist'>")
-    for p in mpages:
-        printMenuItem(p, False, True, True)
-    print("</ul>")
-
-def printQuadcopterRelatedMenu():
-    mpages = [p for p in pages if p.get("show_in_quadcopters", "false") == "true"]
-    mpages.sort(key=lambda p: [p.get("date", "9999-01-01")], reverse = True)
-
-    print("<ul id='menulist'>")
-    for p in mpages:
-        printMenuItem(p, False, True, True)
-    print("</ul>")
+def printMenuGeneric(mpages = None, sortKey = None, sortReverse = True):
+    if mpages == None:
+        mpages = [p for p in pages if p.get("parent", "__none__") == page["child-id"] and p.lang == "en"]
+    if sortKey != None:
+        mpages.sort(key = sortKey, reverse = sortReverse)
+
+    if len(mpages) > 0:
+        print("<ul id='menulist'>")
+        for p in mpages:
+            printMenuItem(p, False, True, True)
+        print("</ul>")
+
+def printMenuDate(mpages = None, sortReverse = True):
+    sortKey = lambda p: p["date"]
+    printMenuGeneric(mpages, sortKey, sortReverse)
+
+def printMenuPositional(mpages = None):
+    printMenuGeneric(mpages, lambda p: int(p["position"]), False)
+
+def printMenu(mpages = None):
+    order = page.get("sort-order", "date")
+    if order == "position":
+        printMenuPositional(mpages)
+    else:
+        printMenuDate(mpages)
 
 def printRobotMenuEnglish():
     mpages = [p for p in pages if p.get("parent", "") == "xyrobot" and p.lang == "en"]