rhi/gallery
1
0
Fork 0
Code Issues 5 Pull requests 1 Releases Wiki Activity

allow extra images etc

Browse source
This commit is contained in:
Rhiannon Morris 2020-08-05 00:52:39 +02:00
parent 813d802fce
commit 6c84d4eb1c
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
make-pages/Info.hs
View file

@ -40,7 +40,8 @@ data Info =
nsfwDesc :: !(Maybe Text),
images :: ![Image],
thumb' :: !(Maybe FilePath),
links :: ![Link]
links :: ![Link],
extras :: ![FilePath]
}
deriving (Eq, Show)
@ -117,16 +118,17 @@ instance Ord Info where
instance FromYAML Info where
parseYAML = YAML.withMap "info" \m ->
Info <$> m .: "date"
<*> m .: "title"
<*> m .:? "artist"
<*> m .:? "tags" .!= []
<*> m .:? "nsfw-tags" .!= []
<*> m .:? "desc"
<*> m .:? "nsfw-desc"
Info <$> m .: "date"
<*> m .: "title"
<*> m .:? "artist"
<*> m .:? "tags" .!= []
<*> m .:? "nsfw-tags" .!= []
<*> m .:? "desc"
<*> m .:? "nsfw-desc"
<*> (m .: "images" >>= imageList)
<*> m .:? "thumb"
<*> m .:? "links" .!= []
<*> m .:? "thumb"
<*> m .:? "links" .!= []
<*> m .:? "extras" .!= []
instance FromYAML Artist where
parseYAML y = justName y <|> withUrl y where