From 327254d091bc71a425cee31fea2bc0ff8590b4db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= <gudni.m.g@gmail.com>
Date: Sat, 10 Dec 2022 12:09:42 +0000
Subject: [PATCH] Expand glob in update-pot on Windows only

---
 lang/lang-extract.py | 20 +++-----------------
 lang/update-pot.py   | 31 +++++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/lang/lang-extract.py b/lang/lang-extract.py
index 929b430b5..a5b74eb2c 100755
--- a/lang/lang-extract.py
+++ b/lang/lang-extract.py
@@ -7,9 +7,7 @@ import regex
 import os
 import sys
 import lib.charset as cs
-from pathlib import Path, PurePosixPath
-
-FILE_LIST: list[Path] = []
+from pathlib import Path
 
 # Absolute path
 BASE_DIR: Path = Path.absolute(Path(__file__).parent)
@@ -274,25 +272,13 @@ def main():
     ap.add_argument('file', nargs='+', help='Input files')
     args = ap.parse_args()
 
-    for path in args.file:
-        if not Path(path).exists():
-            # assume its regex, search for files that match pattern
-            for file in sorted(PO_DIR.glob(path)):
-                FILE_LIST.append(file)
-        else:
-            FILE_LIST.append(Path(path))
-
-    # Convert the path to relative and use Posix format
-    for index, absolute_path in enumerate(FILE_LIST[:]):
-        FILE_LIST[index] = PurePosixPath(absolute_path).relative_to(PO_DIR)
-
     # extract strings
     catalog = {}
-    for path in FILE_LIST:
+    for path in args.file:
         extract_file(path, catalog, warn_skipped=args.warn_skipped)
 
     # process backreferences in a 2nd pass
-    for path in FILE_LIST:
+    for path in args.file:
         extract_refs(path, catalog)
 
     # check the catalog entries
diff --git a/lang/update-pot.py b/lang/update-pot.py
index 7e305738e..13fda1167 100644
--- a/lang/update-pot.py
+++ b/lang/update-pot.py
@@ -15,14 +15,21 @@ import shutil
 import subprocess
 from subprocess import CalledProcessError
 
+# Constants
 BASE_DIR: Path = Path.absolute(Path(__file__).parent)
 PROJECT_DIR: Path = BASE_DIR.parent
 PO_DIR: Path = BASE_DIR / "po"
 
+# Regex pattern to search for source files
 SEARCH_REGEX: str = "[a-zA-Z]*.[ch]*"
+
+# Folders to search for messages
 SEARCH_PATHS: list[str] = ["./Firmware", "./Firmware/mmu2"]
 
+
 def main():
+    # List of source files to extract messages from
+    FILE_LIST: list[Path] = []
 
     # Start by creating a back-up of the current Firmware.pot
     shutil.copy(PO_DIR / "Firmware.pot", PO_DIR / "Firmware.pot.bak")
@@ -34,16 +41,33 @@ def main():
 
     # We want to search for the C/C++ files relative to the .po/ directory
     # Lets append to the search path an absolute path.
-    for index, search_path in enumerate(SEARCH_PATHS[:]):
+    for index, search_path in enumerate(SEARCH_PATHS.copy()):
         try:
             # Example: Converts ./Firmware to ../../Firmware
             SEARCH_PATHS[index] = PurePath(rel_path).joinpath(search_path)
 
             # Example: Convert ../../Firmware to ../../Firmware/[a-zA-Z]*.[ch]*
-            SEARCH_PATHS[index] = PurePosixPath(SEARCH_PATHS[index]).joinpath(SEARCH_REGEX)
+            SEARCH_PATHS[index] = PurePosixPath(SEARCH_PATHS[index]).joinpath(
+                SEARCH_REGEX
+            )
         except ValueError as error:
             print(error)
 
+    # If operating system is Windows, then the script must expand
+    # the regex expression with glob. On Linux and Mac, the operating
+    # system takes care of expanding the glob for you. We only need to
+    # do this manually on Windows.
+    if sys.platform == "win32":
+        for pattern in SEARCH_PATHS:
+            for file in sorted(PO_DIR.glob(str(pattern))):
+                FILE_LIST.append(file)
+
+        # Convert the path to relative and use Posix format
+        for index, absolute_path in enumerate(FILE_LIST.copy()):
+            FILE_LIST[index] = PurePosixPath(absolute_path).relative_to(PO_DIR)
+    else:
+        FILE_LIST = SEARCH_PATHS
+
     # Run the lang-extract.py script
     SCRIPT_PATH = BASE_DIR.joinpath("lang-extract.py")
     try:
@@ -55,8 +79,7 @@ def main():
                 "-s",
                 "-o",
                 "./Firmware.pot",
-                SEARCH_PATHS[0],
-                SEARCH_PATHS[1],
+                *FILE_LIST,
             ]
         )
     except CalledProcessError as error: