From 3eb76ced712083e1502e78c5c40b7be9fe13bd8e Mon Sep 17 00:00:00 2001
From: Francois Daoust <fd@tidoust.net>
Date: Tue, 17 Dec 2024 17:06:10 +0100
Subject: [PATCH] Adjust clean jobs for CDDL extracts

The clean jobs did not expect multiple extracts per property and would happily
have dropped CDDL extracts.
---
 tools/clean-abandoned-files.js     | 5 ++++-
 tools/clean-dropped-specs-files.js | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/clean-abandoned-files.js b/tools/clean-abandoned-files.js
index 6e458dad4db9..c43c9c7d4ee4 100644
--- a/tools/clean-abandoned-files.js
+++ b/tools/clean-abandoned-files.js
@@ -15,7 +15,10 @@ function checkDir(path, index) {
   const dir = fs.readdirSync(path);
   for (let filename of dir) {
     const subdir = path.split("/")[1];
-    if (!index.results.find(spec => spec[subdir] === subdir + "/" + filename)) {
+    const fullname = subdir + "/" + filename
+    if (!index.results.find(spec =>
+          spec[subdir] === fullname ||
+          spec[subdir]?.find(extract => extract.file === fullname))) {
       fs.unlinkSync(path + "/" + filename);
     }
   }
diff --git a/tools/clean-dropped-specs-files.js b/tools/clean-dropped-specs-files.js
index 2a080f857742..69a23dc9ca06 100644
--- a/tools/clean-dropped-specs-files.js
+++ b/tools/clean-dropped-specs-files.js
@@ -26,7 +26,11 @@ async function cleanExtractFolder(folder, crawlResults) {
   for (const filename of dir) {
     const specname = path.basename(filename, path.extname(filename));
     const spec = crawlResults
-      .find(s => s.shortname === specname || s.series?.shortname === specname);
+      .find(s => s.shortname === specname ||
+        s.series?.shortname === specname ||
+        // CDDL extracts may end with CDDL module name
+        s.shortname.startsWith(specname + '-')
+      );
     if (!spec) {
       const fileToDrop = path.join(folder, filename);
       await fs.unlink(fileToDrop);