5 files changed, 52 insertions, 36 deletions

diff --git a/compiler/ldgallery.1.md b/compiler/ldgallery.1.md
index a60a3b1..2fbddc5 100644
--- a/compiler/ldgallery.1.md
+++ b/compiler/ldgallery.1.md
@@ -67,22 +67,24 @@ 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 "_directory", with any image file extension, inside of directories.
+Thumbnails can be associated to items by suffixing their name with "_thumbnail", followed by an image file extension.
+Directory thumbnails can be placed within their repsective directories themselves, without any prefix.
 
 An example input gallery directory structure could be as follows:
 
 ```
 ./example-gallery
-├── DSC0001.jpg --------- a picture
-├── DSC0001.jpg.yaml ---- its associated sidecar metadata file
-├── Some directory ------ a directory grouping gallery items
-│   ├── _directory.jpg -- a thumbnail for its parent directory
-│   ├── _directory.yaml - directory sidecar metadata file
+├── DSC0001.jpg ----------------- a picture
+├── DSC0001.jpg.yaml ------------ its associated sidecar metadata file
+├── Some directory -------------- a directory grouping gallery items
+│   ├── _directory.yaml --------- directory sidecar metadata file
+│   ├── _thumbnail.jpg ---------- a thumbnail for its parent directory
 │   ├── DSC0002.jpg
 │   ├── DSC0002.jpg.yaml
-│   ├── DSC0003.jpg
-│   └── DSC0003.jpg.yaml
-└── gallery.yaml -------- gallery settings file
+│   ├── song.ogg
+│   ├── song.ogg.yaml
+│   └── song.ogg_thumbnail.jpg -- a thumbnail for song.ogg
+└── gallery.yaml -888------------ gallery settings file
 ```
 
 
diff --git a/compiler/src/Input.hs b/compiler/src/Input.hs
index 2480f5b..48931ec 100644
--- a/compiler/src/Input.hs
+++ b/compiler/src/Input.hs
@@ -30,11 +30,12 @@ import Data.Function ((&))
 import Data.Functor ((<&>))
 import Data.Maybe (catMaybes, fromMaybe)
 import Data.Bool (bool)
-import Data.List (find)
+import Data.List (find, isSuffixOf)
 import Data.Time.Clock (UTCTime)
 import Data.Time.LocalTime (ZonedTime)
 import Data.Yaml (ParseException, decodeFileEither)
 import Data.Aeson (FromJSON)
+import qualified Data.Map.Strict as Map
 import System.FilePath (isExtensionOf, dropExtension)
 import System.Directory (doesFileExist, getModificationTime)
 
@@ -55,12 +56,13 @@ data InputTree =
     InputFile
       { path :: Path
       , modTime :: UTCTime
-      , sidecar :: Sidecar }
+      , sidecar :: Sidecar
+      , thumbnailPath :: Maybe Path }
     | InputDir
       { path :: Path
       , modTime :: UTCTime
       , sidecar :: Sidecar
-      , dirThumbnailPath :: Maybe Path
+      , thumbnailPath :: Maybe Path
       , items :: [InputTree] }
   deriving Show
 
@@ -81,6 +83,9 @@ emptySidecar = Sidecar
 sidecarExt :: String
 sidecarExt = "yaml"
 
+thumbnailSuffix :: String
+thumbnailSuffix = "_thumbnail"
+
 dirPropFile :: String
 dirPropFile = "_directory"
 
@@ -99,40 +104,49 @@ readInputTree (AnchoredFSNode _ File{}) =
   throw $ AssertionFailed "Input directory is a file"
 readInputTree (AnchoredFSNode anchor root@Dir{}) = mkDirNode root
   where
-    mkInputNode :: FSNode -> IO (Maybe InputTree)
-    mkInputNode file@File{path}
-      | not (isSidecar file) && not (isThumbnail file) =
-        do
-          sidecar <- readSidecarFile $ localPath (anchor /> path <.> sidecarExt)
-          modTime <- getModificationTime $ localPath (anchor /> path)
-          return $ Just $ InputFile path modTime sidecar
-    mkInputNode File{} = return Nothing
-    mkInputNode dir@Dir{} = Just <$> mkDirNode dir
+    mkInputNode :: Map.Map FileName FSNode -> FSNode -> IO (Maybe InputTree)
+    mkInputNode dir file@File{path} | not (isSidecar file) && not (isThumbnail file) =
+      do
+        sidecar <- readSidecarFile $ localPath (anchor /> path <.> sidecarExt)
+        modTime <- getModificationTime $ localPath (anchor /> path)
+        let thumbnail = findFileThumbnail (fromMaybe "" $ fileName path) dir
+        return $ Just $ InputFile path modTime sidecar thumbnail
+    mkInputNode _ File{} = return Nothing
+    mkInputNode _ dir@Dir{} = Just <$> mkDirNode dir
 
     mkDirNode :: FSNode -> IO InputTree
     mkDirNode File{} = throw $ AssertionFailed "Input directory is a file"
     mkDirNode Dir{path, items} =
       do
-        dirItems <- mapM mkInputNode items
+        dirItems <- mapM (mkInputNode $ Map.fromList (map withBaseName items)) items
         modTime <- getModificationTime $ localPath (anchor /> path)
         sidecar <- readSidecarFile $ localPath (anchor /> path </> dirSidecar)
-        return $ InputDir path modTime sidecar (findThumbnail items) (catMaybes dirItems)
+        return $ InputDir path modTime sidecar (findDirThumbnail items) (catMaybes dirItems)
+
+    withBaseName :: FSNode -> (FileName, FSNode)
+    withBaseName node = (fromMaybe "" $ baseName $ Files.path node, node)
+
+    findFileThumbnail :: FileName -> Map.Map FileName FSNode -> Maybe Path
+    findFileThumbnail name dict = Files.path <$> Map.lookup (name ++ thumbnailSuffix) dict
 
     isSidecar :: FSNode -> Bool
     isSidecar Dir{} = False
-    isSidecar File{path} =
-      fileName path
-      & maybe False (isExtensionOf sidecarExt)
+    isSidecar File{path} = fileName path & maybe False (isExtensionOf sidecarExt)
+
+    baseName :: Path -> Maybe FileName
+    baseName = fmap dropExtension . fileName
 
     isThumbnail :: FSNode -> Bool
     isThumbnail Dir{} = False
-    isThumbnail File{path} =
-      fileName path
-      & fmap dropExtension
-      & maybe False (dirPropFile ==)
+    isThumbnail File{path} = baseName path & maybe False (thumbnailSuffix `isSuffixOf`)
+
+    isDirThumbnail :: FSNode -> Bool
+    isDirThumbnail Dir{} = False
+    isDirThumbnail File{path} = baseName path & (== Just thumbnailSuffix)
+
+    findDirThumbnail :: [FSNode] -> Maybe Path
+    findDirThumbnail = fmap Files.path . find isDirThumbnail
 
-    findThumbnail :: [FSNode] -> Maybe Path
-    findThumbnail = fmap Files.path . find isThumbnail
 
 -- | Filters an InputTree. The root is always returned.
 filterInputTree :: (InputTree -> Bool) -> InputTree -> InputTree
diff --git a/compiler/src/Resource.hs b/compiler/src/Resource.hs
index 6b4b44c..f59eed6 100644
--- a/compiler/src/Resource.hs
+++ b/compiler/src/Resource.hs
@@ -134,11 +134,11 @@ buildGalleryTree processItem processThumbnail tagsFromDirsConfig =
   mkGalleryItem []
   where
     mkGalleryItem :: [Tag] -> InputTree -> IO GalleryItem
-    mkGalleryItem inheritedTags InputFile{path, modTime, sidecar} =
+    mkGalleryItem inheritedTags InputFile{path, modTime, sidecar, thumbnailPath} =
       do
         let itemPath = "/" /> path
         properties <- processItem itemPath path
-        processedThumbnail <- processThumbnail itemPath path
+        processedThumbnail <- processThumbnail itemPath (thumbnailPath ?? path)
         return GalleryItem
           { title = Input.title sidecar ?? fileName path ?? ""
           , datetime = Input.datetime sidecar ?? toZonedTime modTime
@@ -148,12 +148,12 @@ buildGalleryTree processItem processThumbnail tagsFromDirsConfig =
           , thumbnail = processedThumbnail
           , properties = properties }
 
-    mkGalleryItem inheritedTags InputDir{path, modTime, sidecar, dirThumbnailPath, items} =
+    mkGalleryItem inheritedTags InputDir{path, modTime, sidecar, thumbnailPath, items} =
       do
         let itemPath = "/" /> path
         let dirTags = (Input.tags sidecar ?? []) ++ inheritedTags
         processedItems <- parallel $ map (mkGalleryItem dirTags) items
-        processedThumbnail <- maybeThumbnail itemPath dirThumbnailPath
+        processedThumbnail <- maybeThumbnail itemPath thumbnailPath
         return GalleryItem
           { title = Input.title sidecar ?? fileName path ?? ""
           , datetime = Input.datetime sidecar ?? mostRecentModTime processedItems
diff --git a/example/src/Misc Media/Beethoven - Fifth Symphony intro.ogg_thumbnail.jpg b/example/src/Misc Media/Beethoven - Fifth Symphony intro.ogg_thumbnail.jpg
new file mode 100644
index 0000000..7795eb9
--- /dev/null
+++ b/example/src/Misc Media/Beethoven - Fifth Symphony intro.ogg_thumbnail.jpg
diff --git a/example/src/Ormont-Dessus/_directory.jpg b/example/src/Ormont-Dessus/_thumbnail.jpg
index 19a716e..19a716e 100644
--- a/example/src/Ormont-Dessus/_directory.jpg
+++ b/example/src/Ormont-Dessus/_thumbnail.jpg