Gracefully skip non-existent collection directories (#662)

Signed-off-by: Juan Cruz Viotti <[email protected]>

Author: jviotti

src/index/index.cc

@@ -169,6 +169,10 @@ static auto index_main(const std::string_view &program,
       continue;
     }
 
+    if (!std::filesystem::is_directory(collection->absolute_path)) {
+      continue;
+    }
+
     for (const auto &entry : std::filesystem::recursive_directory_iterator{
              collection->absolute_path}) {
       if (!entry.is_regular_file()) {

test/cli/CMakeLists.txt

@@ -55,6 +55,8 @@ if(ONE_INDEX)
   sourcemeta_one_test_cli(common index no-id)
   sourcemeta_one_test_cli(common index encoded-percentage)
   sourcemeta_one_test_cli(common index string-directory-overlap)
+  sourcemeta_one_test_cli(common index non-existent-collection-directory)
+  sourcemeta_one_test_cli(common index collection-path-is-file)
 
   if(ONE_ENTERPRISE)
     sourcemeta_one_test_cli(enterprise index no-options)

test/cli/index/common/collection-path-is-file.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+
+TMP="$(mktemp -d)"
+clean() { rm -rf "$TMP"; }
+trap clean EXIT
+
+touch "$TMP/schemas"
+
+cat << EOF > "$TMP/one.json"
+{
+  "url": "http://localhost:8000",
+  "html": false,
+  "contents": {
+    "example": {
+      "baseUri": "https://example.com",
+      "path": "./schemas"
+    }
+  }
+}
+EOF
+
+"$1" "$TMP/one.json" "$TMP/output"
+
+cd "$TMP/output"
+find . -mindepth 1 | LC_ALL=C sort > "$TMP/manifest.txt"
+cd - > /dev/null
+
+cat << 'EOF' > "$TMP/expected.txt"
+./configuration.json
+./dependency-tree.metapack
+./dependency-tree.metapack.deps
+./explorer
+./explorer/%
+./explorer/%/directory.metapack
+./explorer/%/directory.metapack.deps
+./explorer/%/search.metapack
+./explorer/%/search.metapack.deps
+./routes.bin
+./routes.bin.deps
+./version.json
+EOF
+
+diff "$TMP/manifest.txt" "$TMP/expected.txt"

test/cli/index/common/non-existent-collection-directory.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+
+TMP="$(mktemp -d)"
+clean() { rm -rf "$TMP"; }
+trap clean EXIT
+
+cat << EOF > "$TMP/one.json"
+{
+  "url": "http://localhost:8000",
+  "html": false,
+  "contents": {
+    "example": {
+      "baseUri": "https://example.com",
+      "path": "./schemas"
+    }
+  }
+}
+EOF
+
+"$1" "$TMP/one.json" "$TMP/output"
+
+cd "$TMP/output"
+find . -mindepth 1 | LC_ALL=C sort > "$TMP/manifest.txt"
+cd - > /dev/null
+
+cat << 'EOF' > "$TMP/expected.txt"
+./configuration.json
+./dependency-tree.metapack
+./dependency-tree.metapack.deps
+./explorer
+./explorer/%
+./explorer/%/directory.metapack
+./explorer/%/directory.metapack.deps
+./explorer/%/search.metapack
+./explorer/%/search.metapack.deps
+./routes.bin
+./routes.bin.deps
+./version.json
+EOF
+
+diff "$TMP/manifest.txt" "$TMP/expected.txt"