compiler: unify directory special files

6 files changed, 13 insertions, 11 deletions

diff --git a/compiler/src/Input.hs b/compiler/src/Input.hs
index e0fc8ef..75d1ed3 100644
--- a/compiler/src/Input.hs
+++ b/compiler/src/Input.hs
@@ -80,8 +80,11 @@ emptySidecar = Sidecar
 sidecarExt :: String
 sidecarExt = "yaml"
 
-dirSidecar :: String
-dirSidecar = "directory." ++ sidecarExt
+dirPropFile :: String
+dirPropFile = "_directory"
+
+dirSidecar :: Path
+dirSidecar = Path [dirPropFile] <.> sidecarExt
 
 readSidecarFile :: FilePath -> IO Sidecar
 readSidecarFile filepath =
@@ -111,7 +114,7 @@ readInputTree (AnchoredFSNode anchor root@Dir{}) = mkDirNode root
       do
         dirItems <- mapM mkInputNode items
         modTime <- getModificationTime $ localPath (anchor /> path)
-        sidecar <- readSidecarFile $ localPath (anchor /> path </ dirSidecar)
+        sidecar <- readSidecarFile $ localPath (anchor /> path </> dirSidecar)
         return $ InputDir path modTime sidecar (findThumbnail items) (catMaybes dirItems)
 
     isSidecar :: FSNode -> Bool
@@ -125,7 +128,7 @@ readInputTree (AnchoredFSNode anchor root@Dir{}) = mkDirNode root
     isThumbnail File{path} =
       fileName path
       & fmap dropExtension
-      & (maybe False ("thumbnail" ==))
+      & (maybe False (dirPropFile ==))
 
     findThumbnail :: [FSNode] -> Maybe Path
     findThumbnail = (fmap Files.path) . (find isThumbnail)
diff --git a/example/readme.md b/example/readme.md
index eafdaf5..809ae68 100644
--- a/example/readme.md
+++ b/example/readme.md
@@ -13,12 +13,11 @@ Content
 ├── _DSC8808-1.jpg           -- a picture
 ├── _DSC8808-1.jpg.yaml      -- its associated sidecar metadata file
 ├── Glacier 3000             -- a directory grouping gallery items
-│   ├── thumbnail.jpg        -- a thumbnail for the "Glacier 3000" directory
-│   ├── directory.yaml       -- sidecar metadata file for the "Glacier 3000" directory
+│   ├── _directory.jpg       -- a thumbnail for the "Glacier 3000" directory
+│   ├── _directory.yaml      -- sidecar metadata file for the "Glacier 3000" directory
 │   ├── _DSC5475.jpg
 │   ├── _DSC5475.jpg.yaml
 │   ├── _DSC5542.jpg
 │   └── _DSC5542.jpg.yaml
-├── directory.yaml           -- sidecar metadata file for the root directory
 └── gallery.yaml             -- gallery settings file
 ```
diff --git a/example/src/Glacier 3000/thumbnail.jpg b/example/src/Glacier 3000/_directory.jpg
index 19a716e..19a716e 100644
--- a/example/src/Glacier 3000/thumbnail.jpg
+++ b/example/src/Glacier 3000/_directory.jpg
diff --git a/example/src/Glacier 3000/directory.yaml b/example/src/Glacier 3000/_directory.yaml
index 44674cf..44674cf 100644
--- a/example/src/Glacier 3000/directory.yaml
+++ b/example/src/Glacier 3000/_directory.yaml
diff --git a/example/src/directory.yaml b/example/src/_directory.yaml
index ab81bb2..ab81bb2 100644
--- a/example/src/directory.yaml
+++ b/example/src/_directory.yaml
diff --git a/ldgallery.1.md b/ldgallery.1.md
index 17056ce..91724a6 100644
--- a/ldgallery.1.md
+++ b/ldgallery.1.md
@@ -56,7 +56,7 @@ Available options are:
 
 A gallery source directory contains the gallery items and their sidecar metadata files, optionally grouped inside sub-directories.
 
-Directory thumbnails can be set by placing a picture file named "thumbnail", with any image file extension, inside of directories.
+Directory thumbnails can be set by placing a picture file named "_directory", with any image file extension, inside of directories.
 
 An example input gallery directory structure could be as follows:
 
@@ -65,8 +65,8 @@ An example input gallery directory structure could be as follows:
 ├── DSC0001.jpg --------- a picture
 ├── DSC0001.jpg.yaml ---- its associated sidecar metadata file
 ├── Some directory ------ a directory grouping gallery items
-│   ├── thumbnail.jpg --- a thumbnail for its parent directory
-│   ├── directory.yaml -- directory sidecar metadata file
+│   ├── _directory.jpg -- a thumbnail for its parent directory
+│   ├── _directory.yaml - directory sidecar metadata file
 │   ├── DSC0002.jpg
 │   ├── DSC0002.jpg.yaml
 │   ├── DSC0003.jpg
@@ -80,7 +80,7 @@ An example input gallery directory structure could be as follows:
 File metadata are read from sidecar files of the same name, with the ".yaml" extension appended.
 Metadata contained within item files themselves (e.g. Exif fields for pictures) are ignored.
 
-Directory metadata are read from sidecar files named "directory.yaml" located within the directory.
+Directory metadata are read from sidecar files named "_directory.yaml" located within the directory.
 
 When a sidecar file is absent or a particular key omitted, values are set as empty or to their fallback value specified below.