Add trailing slash to directories on /directory

src/lib.rs

@@ -46,7 +46,6 @@ use {
     display_secret::DisplaySecret,
     entries::Entries,
     entry::Entry,
-    entry_type::EntryType,
     envelope::Envelope,
     file::File,
     format::Format,
@@ -149,10 +148,11 @@ use {
 };
 
 pub use self::{
-  directory_tree::DirectoryTree, encode::Encode, encoder::Encoder, error::Error,
-  fingerprint::Fingerprint, hash::Hash, language_error::LanguageError, major_type::MajorType,
-  manifest::Manifest, map_encoder::MapEncoder, private_key::PrivateKey, public_key::PublicKey,
-  relative_path::RelativePath, signature::Signature, statement::Statement, tag_error::TagError,
+  directory_tree::DirectoryTree, encode::Encode, encoder::Encoder, entry_type::EntryType,
+  error::Error, fingerprint::Fingerprint, hash::Hash, language_error::LanguageError,
+  major_type::MajorType, manifest::Manifest, map_encoder::MapEncoder, private_key::PrivateKey,
+  public_key::PublicKey, relative_path::RelativePath, signature::Signature, statement::Statement,
+  tag_error::TagError,
 };
 
 #[cfg(test)]

templates/directory.html

@@ -12,7 +12,7 @@ <h1>Directory {{ self.hash }}</h1>
 %% for (name, entry) in &self.directory.entries {
 %% match entry.ty {
 %%   EntryType::Directory => {
-      <li><a href=/directory/{{ entry.hash }}>{{ name }}</a></li>
+      <li><a href=/directory/{{ entry.hash }}>{{ name }}/</a></li>
 %%   }
 %%   EntryType::File => {
       <li><a href=/file/{{ entry.hash }}>{{ name }}</a></li>

tests/lib.rs

@@ -1,7 +1,7 @@
 use {
   self::{child::Child, expected::Expected, test::Test},
   camino::{Utf8Path, Utf8PathBuf},
-  filepack::{Encoder, Hash, Manifest, PrivateKey, PublicKey, assert_matches},
+  filepack::{Encoder, EntryType, Hash, Manifest, PrivateKey, PublicKey, assert_matches},
   regex::Regex,
   reqwest::StatusCode,
   std::{

tests/upload.rs

@@ -483,13 +483,17 @@ fn upload_package_uploads_files() {
 
   let body = response.text().unwrap();
 
-  for (name, kind) in [
-    ("bar", "file"),
-    ("empty", "directory"),
-    ("foo", "file"),
-    ("sub", "directory"),
+  for (name, ty) in [
+    ("bar", EntryType::File),
+    ("empty", EntryType::Directory),
+    ("foo", EntryType::File),
+    ("sub", EntryType::Directory),
   ] {
-    let pattern = format!(r"<li><a href=/{kind}/[0-9a-f]{{64}}>{name}</a></li>");
+    let pattern = match ty {
+      EntryType::Directory => format!(r"<li><a href=/directory/[0-9a-f]{{64}}>{name}/</a></li>"),
+      EntryType::File => format!(r"<li><a href=/file/[0-9a-f]{{64}}>{name}</a></li>"),
+    };
+
     assert!(
       Regex::new(&pattern).unwrap().is_match(&body),
       "body missing `{name}`: {body}"