Updated the help.

docker/run.sh

@@ -6,6 +6,10 @@ export DISPLAY=:10.0
 Xvfb :10 -ac 1>/tmp/xvfb.log 2>/tmp/xvfb.err &
 
 # run the webapp server
-python3 /app/vasl_templates/webapp/run_server.py \
+# IMPORTANT! This script runs as PID 1, which is the only process that will receive signals,
+# so we must replace it with the Python webserver process if it is to receive e.g. SIGTERM,
+# which we must handle if "docker stop" and scaling down in Kubernetes is to work (otherwise
+# things timeout and we get SIGKILL'ed).
+exec python3 /app/vasl_templates/webapp/run_server.py \
     --addr 0.0.0.0 \
     --force-init-delay 30

setup.py

@@ -28,7 +28,7 @@ def parse_requirements( fname ):
 
 setup(
     name = "vasl_templates",
-    version = "1.12", # nb: also update constants.py
+    version = "1.13", # nb: also update constants.py
     description = "Create HTML snippets for use in VASL.",
     license = "AGPLv3",
     url = "https://code.pacman-ghost.com/public/vasl-templates",

vasl_templates/webapp/__init__.py

@@ -129,8 +129,8 @@ def _is_flask_child_process():
 
 # ---------------------------------------------------------------------
 
-def _on_sigint( signum, stack ): #pylint: disable=unused-argument
-    """Clean up after a SIGINT."""
+def _on_sig( signum, stack ): #pylint: disable=unused-argument
+    """Clean up after a SIGINT/SIGTERM."""
 
     # FUDGE! Since we added gRPC test control, we want to shutdown properly and clean things up (e.g. temp files
     # created by the gRPC service), but the Flask reloader complicates what we have to do here horribly :-(
@@ -230,6 +230,7 @@ _set_config_from_env( "VASL_EXTNS_DIR" )
 _set_config_from_env( "BOARDS_DIR" )
 _set_config_from_env( "CHAPTER_H_NOTES_DIR" )
 _set_config_from_env( "USER_FILES_DIR" )
+_set_config_from_env( "ASL_RULEBOOK2_BASE_URL" )
 # NOTE: The Docker container also sets DEFAULT_TEMPLATE_PACK, but we read it directly from
 # the environment variable, since it is not something that is stored in app.config.
 
@@ -257,7 +258,10 @@ import vasl_templates.webapp.downloads #pylint: disable=cyclic-import
 import vasl_templates.webapp.lfa #pylint: disable=cyclic-import
 
 # install our signal handler (must be done in the main thread)
-signal.signal( signal.SIGINT, _on_sigint )
+signal.signal( signal.SIGINT, _on_sig )
+# NOTE: We must handle SIGTERM, so that "docker stop" and scaling down in Kubernetes
+# work properly (otherwise it times out and we get SIGKILL'ed :-/).
+signal.signal( signal.SIGTERM, _on_sig )
 
 # register startup initialization
 app.before_request( _on_request )

vasl_templates/webapp/config/constants.py

@@ -4,7 +4,7 @@ import sys
 import os
 
 APP_NAME = "VASL Templates"
-APP_VERSION = "v1.12" # nb: also update setup.py
+APP_VERSION = "v1.13" # nb: also update setup.py
 APP_DESCRIPTION = "Generate HTML for use in VASL scenarios."
 APP_HOME_URL = "https://vasl-templates.org"
 APP_ISSUES_URL = "https://code.pacman-ghost.com/public/vasl-templates/issues"

vasl_templates/webapp/data/vasl-6.6.8/expected-multiple-images.json

@@ -0,0 +1,72 @@
+{
+
+"1555": {
+    "name": "2pdr Portee",
+    "front_images": [ "br/vehicles/portee.gif", "br/vehicles/portee0.gif" ],
+    "back_images": null
+},
+
+"2212": {
+    "name": "76* INF FRC",
+    "front_images": [ "al/gun/alINF76.gif", "al/gun/alINF76u.gif" ],
+    "back_images": "al/gun/alINF76b.gif"
+},
+
+"2698": {
+    "name": "SPW 251/10",
+    "front_images": "ge/veh/spw25110.gif",
+    "back_images": [ "No_ATR.gif", "No_PSK.gif" ]
+},
+
+"6765": {
+    "name": "81* MTR Krh/32",
+    "front_images": "fi/gun/fi81mmMTR.png",
+    "back_images": [ "fi/gun/fi81mmMTR.png", "fi/gun/fi81mmMTRB.png" ]
+},
+
+"6782": {
+    "name": "81* MTR Savu M42",
+    "front_images": [ "fi/gun/fi81mmMTR SavuB.png", "fi/gun/fi81mmMTR Savu.png" ],
+    "back_images": "fi/gun/fi81mmMTR SavuB.png"
+},
+
+"6797": {
+    "name": "20L (4) AA (g)",
+    "front_images": [ "fi/gun/fi20L4.png", "fi/gun/fi20L4L.png" ]
+},
+
+"6801": {
+    "name": "20L (6) AA (g)",
+    "front_images": "fi/gun/fi20L6.png",
+    "back_images": [ "fi/gun/fi20L6.png", "fi/gun/fi20L6L.png" ]
+},
+
+"7409": {
+    "name": "76 ItK/28 B(s)",
+    "front_images": "fi/gun/fiAA76L.png",
+    "back_images": [ "fi/gun/fiAA76L.png", "fi/gun/fiAA76LB.png" ]
+},
+
+"adf:1828": {
+    "name": "105 ART wz.29",
+    "front_images": "po/gun/poARTwz29-BFP.png",
+    "back_images": [ "po/gun/poARTwz29-BFP.png", "po/gun/poARTwz29-BFPb.png" ]
+},
+"adf:1829": {
+    "name": "120* ART wz09.31",
+    "front_images": "po/gun/poARTwz0931-BFP.png",
+    "back_images": [ "po/gun/poARTwz0931-BFP.png", "po/gun/poARTwz0931-BFPb.png" ]
+},
+"adf:1830": {
+    "name": "155 ART wz.17",
+    "front_images": "po/gun/poARTwz17-BFP.png",
+    "back_images": [ "po/gun/poARTwz17-BFP.png", "po/gun/poARTwz17-BFPb.png" ]
+},
+
+"3b5:3676": {
+    "name": "M19A1 MGMC",
+    "front_images": [ "us/veh/usM19A1MGMC(trailer)KFW.png", "us/veh/usM19A1MGMC(KFW).png" ],
+    "back_images": null
+}
+
+}

vasl_templates/webapp/data/vasl-6.6.8/online-counter-images.json

@@ -0,0 +1,2 @@
+{
+}

vasl_templates/webapp/data/vasl-6.6.8/piece-info.json

@@ -0,0 +1,71 @@
+{
+"6996": {"is_small": true},
+"485": {"is_small": true},
+"850": {"is_small": true},
+"849": {"is_small": true},
+"12689": {"is_small": true},
+"856": {"is_small": true},
+"857": {"is_small": true},
+"11336": {"is_small": true},
+"858": {"is_small": true},
+"11337": {"is_small": true},
+"1149": {"is_small": true},
+"1153": {"is_small": true},
+"12687": {"is_small": true},
+"3b5:7613": {"is_small": true},
+"11359": {"is_small": true},
+"3b5:11259": {"is_small": true},
+"1632": {"is_small": true},
+"1633": {"is_small": true},
+"1648": {"is_small": true},
+"12830": {"is_small": true},
+"1982": {"is_small": true},
+"1983": {"is_small": true},
+"1984": {"is_small": true},
+"1985": {"is_small": true},
+"1986": {"is_small": true},
+"1987": {"is_small": true},
+"1988": {"is_small": true},
+"2172": {"is_small": true},
+"2173": {"is_small": true},
+"2176": {"is_small": true},
+"2179": {"is_small": true},
+"11391": {"is_small": true},
+"11392": {"is_small": true},
+"11395": {"is_small": true},
+"11396": {"is_small": true},
+"11440": {"is_small": true},
+"3b5:8401": {"is_small": true},
+"3b5:8402": {"is_small": true},
+"2465": {"is_small": true},
+"2474": {"is_small": true},
+"3252": {"is_small": true},
+"3253": {"is_small": true},
+"3263": {"is_small": true},
+"3422": {"is_small": true},
+"3428": {"is_small": true},
+"6730": {"is_small": true},
+"3605": {"is_small": true},
+"3608": {"is_small": true},
+"6763": {"is_small": true},
+"3679": {"is_small": true},
+"3680": {"is_small": true},
+"3681": {"is_small": true},
+"3682": {"is_small": true},
+"3691": {"is_small": true},
+"3692": {"is_small": true},
+"3959": {"is_small": true},
+"11558": {"is_small": true},
+"11559": {"is_small": true},
+"3b5:10150": {"is_small": true},
+"3b5:10151": {"is_small": true},
+"11600": {"is_small": true},
+"11604": {"is_small": true},
+"3b5:7871": {"is_small": true},
+"adf:1948": {"is_small": true},
+"adf:75": {"is_small": true},
+"adf:77": {"is_small": true},
+"adf:76": {"is_small": true},
+"adf:1407": {"is_small": true},
+"08d:75": {"is_small": true}
+}

vasl_templates/webapp/data/vasl-6.6.8/vasl-overrides.json

@@ -0,0 +1,147 @@
+{
+
+"2474": {
+    "expected": {
+        "name": "Goliath",
+        "front_images": [ "ge/gegol.gif", "ge/gegolb.gif" ],
+        "back_images": null
+    },
+    "updated": {
+        "front_images": "ge/gegol.gif"
+    }
+},
+
+"1555": {
+    "expected": {
+        "name": "2pdr Portee",
+        "front_images": "br/vehicles/portee.gif",
+        "back_images": [ "br/vehicles/portee.gif", "br/vehicles/portee0.gif" ]
+    },
+    "updated": {
+        "front_images": [ "br/vehicles/portee.gif", "br/vehicles/portee0.gif" ],
+        "back_images": null
+    }
+},
+
+"3463": {
+    "expected": {
+        "name": "75L AA 75/46",
+        "front_images": [ "it/gun/itAA7546.gif", "it/gun/itAA7546b.gif" ],
+        "back_images": [ "it/gun/itAA7546b.gif", "it/gun/itAA7546lb.gif" ]
+    },
+    "updated": {
+        "front_images": "it/gun/itAA7546.gif",
+        "back_images": "it/gun/itAA7546b.gif"
+    }
+},
+
+"3776": {
+    "expected": {
+        "name": "37* INF Skoda IG",
+        "front_images": [ "ax/gun/buIN37s.gif", "ax/gun/buIN37s2.gif" ],
+        "back_images": "ax/gun/buIN37sb.gif"
+    },
+    "updated": {
+        "front_images": "ax/gun/buIN37s.gif"
+    }
+},
+
+"3777": {
+    "expected": {
+        "name": "70* INF Skoda IG",
+        "front_images": [ "ax/gun/buIN37s.gif", "ax/gun/buIN37s2.gif" ],
+        "back_images": "ax/gun/buIN37sb.gif"
+    },
+    "updated": {
+        "front_images": "ax/gun/buIN37s2.gif"
+    }
+},
+
+"6802": {
+    "expected": {
+        "name": "20L (4) AA",
+        "front_images": [ "fi/gun/fi20L4 _2.png", "fi/gun/fi20L4 _2 LIM.png" ],
+        "back_images": null
+    },
+    "updated": {
+        "front_images": "fi/gun/fi20L4 _2.png"
+    }
+},
+
+"6803": {
+    "expected": {
+        "name": "20L VKT (12) AA",
+        "front_images": [ "fi/gun/fi20L12.png", "fi/gun/fi20L12L.png" ],
+        "back_images": null
+    },
+    "updated": {
+        "front_images": "fi/gun/fi20L12.png"
+    }
+},
+
+"6804": {
+    "expected": {
+        "name": "40L Bofors AA (s)",
+        "front_images": [ "fi/gun/fi40L.png", "fi/gun/fi40LL.png" ],
+        "back_images": null
+    },
+    "updated": {
+        "front_images": "fi/gun/fi40L.png"
+    }
+},
+
+"adf:1824": {
+    "expected": {
+        "name": "37L AT PTP obr. 30",
+        "front_images": "ru/gun/ruAT37L.gif",
+        "back_images": "ru/gun/ruAT37Lb.gif"
+    },
+    "updated": {
+        "front_images": "ru/gun/ru37LPTPobr30.png"
+    }
+},
+"adf:1822": {
+    "expected": {
+        "name": "37* INF PP obr. 15R",
+        "front_images": "ru/gun/ruINF37s.gif",
+        "back_images": "ru/gun/ruINF37sb.gif"
+    },
+    "updated": {
+        "front_images": "ru/gun/ru37PPobr15R.png"
+    }
+},
+"adf:1823": {
+    "expected": {
+        "name": "76* INF PP obr. 27",
+        "front_images": "ru/gun/ruINF76s.gif",
+        "back_images": "ru/gun/ruINF76sb.gif"
+    },
+    "updated": {
+        "front_images": "ru/gun/ru76PPobr27.png"
+    }
+},
+
+"3b5:10093": {
+    "expected": {
+        "name": "SL truck",
+        "front_images": [ "sh/SL3b(KFW).png", "sh/SL4b(KFW).png", "sh/SL5b(KFW).png", "sh/SL6b(KFW).png", "sh/SL1b(KFW).png", "sh/SL2b(KFW).png" ],
+        "back_images": [ "sh/SL3(KFW).png", "sh/SL4(KFW).png", "sh/SL5(KFW).png", "sh/SL6(KFW).png", "sh/SL1(KFW).png", "sh/SL2(KFW).png" ]
+    },
+    "updated": {
+        "front_images": "us/veh/usSearchlight(KFW).png",
+        "back_images": null
+    }
+},
+
+"08d:75": {
+    "expected": {
+        "name": "RCL 75*",
+        "front_images": "amrcl75-malf.png",
+        "back_images": "dm-75rcl.gif"
+    },
+    "updated": {
+        "front_images": "amrcl75.png"
+    }
+}
+
+}

vasl_templates/webapp/static/help/index.html

@@ -54,8 +54,8 @@ If you have Docker installed, the webapp can be run in a container e.g.
 <div class="code">
 ./run-container.sh \
     --port 5010 \
-    --vassal ~/vassal-3.7.5/ \
-    --vasl ~/vasl/vasl-6.6.7.vmod \
+    --vassal ~/vassal-3.7.9/ \
+    --vasl ~/vasl/vasl-6.6.8.vmod \
     --vasl-extensions ~/vasl/extensions/ \
     --boards ~/vasl/boards/ \
     --chapter-h ~/vasl/chapter-h/ \
@@ -166,11 +166,11 @@ Configuring the program
 
 <p> Choose <em>Settings</em> from the <em>File</em> menu and configure the highlighted settings. As a guide, here are some example settings:
 <table class="settings">
-    <tr> <td class="key"> VASSAL&nbsp;installation: </td> <td class="val"> <nobr>C:\Program Files\VASSAL-3.7.5\</nobr>
-    <tr> <td class="key"> VASL&nbsp;module: </td> <td class="val"> <nobr>C:\bin\vasl\vasl-6.6.7.vmod</nobr>
+    <tr> <td class="key"> VASSAL&nbsp;installation: </td> <td class="val"> <nobr>C:\Program Files\VASSAL-3.7.9\</nobr>
+    <tr> <td class="key"> VASL&nbsp;module: </td> <td class="val"> <nobr>C:\bin\vasl\vasl-6.6.8.vmod</nobr>
     <tr> <td class="key"> VASL&nbsp;extensions: </td> <td class="val"> <nobr>C:\bin\vasl\extensions\</nobr>
     <tr> <td class="key"> VASL&nbsp;boards: </td> <td class="val"> <nobr>C:\bin\vasl\boards\</nobr>
-    <tr> <td class="key" valign="top"> Java: </td> <td class="val"> <nobr>C:\Program Files\VASSAL-3.7.5\jre\bin\java.exe</nobr>
+    <tr> <td class="key" valign="top"> Java: </td> <td class="val"> <nobr>C:\Program Files\VASSAL-3.7.9\jre\bin\java.exe</nobr>
         <div class="hint" style="margin:0.5em 1em;"> Leave this field blank to use the Java that comes with VASSAL (Windows only), or on your PATH. </div>
     <tr> <td class="key"> Web&nbsp;driver: </td> <td class="val"> <nobr>C:\bin\geckodriver.exe</nobr>
 </table>

vasl_templates/webapp/vasl_mod.py

@@ -16,8 +16,10 @@ from vasl_templates.webapp.config.constants import DATA_DIR
 from vasl_templates.webapp.vo import get_vo_listings
 from vasl_templates.webapp.utils import compare_version_strings
 
-SUPPORTED_VASL_MOD_VERSIONS = [ "6.6.0", "6.6.1", "6.6.2", "6.6.3", "6.6.3.1", "6.6.4", "6.6.5", "6.6.6", "6.6.7" ]
-SUPPORTED_VASL_MOD_VERSIONS_DISPLAY = "6.6.0-.7, 6.6.3.1"
+SUPPORTED_VASL_MOD_VERSIONS = [
+    "6.6.0", "6.6.1", "6.6.2", "6.6.3", "6.6.3.1", "6.6.4", "6.6.5", "6.6.6", "6.6.7", "6.6.8"
+]
+SUPPORTED_VASL_MOD_VERSIONS_DISPLAY = "6.6.0-.8, 6.6.3.1"
 
 _zip_file_lock = threading.Lock()
 

vasl_templates/webapp/vassal.py

@@ -40,6 +40,7 @@ from vasl_templates.webapp.vasl_mod import get_reverse_remapped_gpid
 #   6.6.5 | 3.6.7   18.0.1
 #   6.6.6 | 3.6.14  19.0.2+7
 #   6.6.7 | 3.7.5   21 (2023-09-19 LTS)
+#   6.6.8 | 3.7.9   21.0.2 (2024-01-16 LTS)
 # NOTE: VASSAL+VASL back-compat has gone out the window :-/ We have to tie versions of VASL
 # to specific versions of VASSAL. Sigh...
 SUPPORTED_VASSAL_VERSIONS = {
@@ -50,7 +51,8 @@ SUPPORTED_VASSAL_VERSIONS = {
     "3.6.6": [ "6.6.0", "6.6.1", "6.6.2", "6.6.3", "6.6.3.1", "6.6.4", "6.6.5", "6.6.6", "6.6.7" ],
     "3.6.7": [ "6.6.0", "6.6.1", "6.6.2", "6.6.3", "6.6.3.1", "6.6.4", "6.6.5", "6.6.6", "6.6.7" ],
     "3.6.14": [ "6.6.0", "6.6.1", "6.6.2", "6.6.3", "6.6.3.1", "6.6.4", "6.6.5", "6.6.6", "6.6.7" ],
-    "3.7.5": [ "6.6.2", "6.6.3", "6.6.3.1", "6.6.4", "6.6.5", "6.6.6", "6.6.7" ],
+    "3.7.5": [ "6.6.2", "6.6.3", "6.6.3.1", "6.6.4", "6.6.5", "6.6.6", "6.6.7", "6.6.8" ],
+    "3.7.9": [ "6.6.2", "6.6.3", "6.6.3.1", "6.6.4", "6.6.5", "6.6.6", "6.6.7", "6.6.8" ],
 }
 SUPPORTED_VASSAL_VERSIONS_DISPLAY = "3.4.2, 3.4.6, 3.5.5, 3.5.8, 3.6.6, 3.6.7, 3.6.14"