FSFE/fsfe-website
31
33
Fork 96
Code Issues 65 Pull Requests 19 Wiki Activity

chore: simplify the xmllists generation (#5535)
continuous-integration/drone/push Build is passing
Details

Browse Source 
Co-authored-by: Darragh Elliott <me@delliott.net>
Reviewed-on: #5535
Co-authored-by: delliott <delliott@fsfe.org>
Co-committed-by: delliott <delliott@fsfe.org>
This commit was merged in pull request #5535.
This commit is contained in:
delliott
2025-12-02 07:28:49 +00:00
committed by tobiasd
parent 1a2951e0be
commit d558468c6b
1 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/fsfe_website_build/phase1/update_xmllists.py
+24 -35
View File
@@ -66,37 +66,34 @@ def _update_for_base( # noqa: PLR0913
if tag_search_result is not None
else ""
)
for xml_file in filter(
lambda xml_file:
matching_files.update(
str(xml_file.relative_to(source))
for xml_file in all_xml
if
# Matches glob pattern
fnmatch.fnmatchcase(str(xml_file.relative_to(source)), pattern)
# contains tag if tag in pattern
and (
any(
(
etree.parse(xml_file_with_ending).find(
f".//tag[@key='{tag}']"
)
is not None
for xml_file_with_ending in xml_file.parent.glob(
f"{xml_file.name}.*.xml"
)
),
etree.parse(xml_file_with_ending).find(
f".//tag[@key='{tag}']"
)
is not None
for xml_file_with_ending in xml_file.parent.glob(
f"{xml_file.name}.*.xml"
)
)
if tag != ""
else True
),
all_xml,
):
matching_files.add(str(xml_file.relative_to(source)))
)
)
for file in base.parent.glob(f"{base.name}.??.xhtml"):
xslt_root = etree.parse(file)
for module in xslt_root.xpath("//module"):
matching_files.add(
f"{source}/global/data/modules/{module.get('id').strip()}"
)
matching_files.update(
f"{source}/global/data/modules/{module.get('id').strip()}"
for module in xslt_root.xpath("//module")
)
update_if_changed(
Path(f"{base.parent}/.{base.name}.xmllist"),
"\n".join(sorted(matching_files)) + "\n" if matching_files else "",
@@ -114,24 +111,17 @@ def _update_module_xmllists(
# Get all the bases and stuff before multithreading the update bit
all_xml = {
get_basepath(path)
for path in sorted(
filter(
lambda path: lang_from_filename(path) in languages,
(
*source_dir.glob("**/*.*.xml"),
*source.joinpath("global/").glob("**/*.*.xml"),
),
)
for path in (
*source_dir.glob("**/*.*.xml"),
*source.joinpath("global/").glob("**/*.*.xml"),
)
if lang_from_filename(path) in languages
}
source_bases = {path.with_suffix("") for path in source_dir.glob("**/*.sources")}
module_bases = {
get_basepath(path)
for path in filter(
lambda path: lang_from_filename(path) in languages
and etree.parse(path).xpath("//module"),
source_dir.glob("**/*.*.xhtml"),
)
for path in source_dir.glob("**/*.*.xhtml")
if lang_from_filename(path) in languages and etree.parse(path).xpath("//module")
}
all_bases = source_bases | module_bases
nextyear = str(datetime.datetime.today().year + 1)
@@ -149,8 +139,7 @@ def _check_xmllist_deps(source: Path, file: Path) -> None:
with file.open(mode="r") as fileobj:
for line in fileobj:
path_line = source.joinpath(line.strip())
for newfile in path_line.parent.glob(path_line.name + ".??.xml"):
xmls.add(newfile)
xmls.update(path_line.parent.glob(path_line.name + ".??.xml"))
touch_if_newer_dep(file, list(xmls))