diff --git a/make-pages/Info.hs b/make-pages/Info.hs
index 63a1ef7..6d07873 100644
--- a/make-pages/Info.hs
+++ b/make-pages/Info.hs
@@ -1,6 +1,7 @@
{-# OPTIONS_GHC -Wno-orphans #-}
module Info
- (Info (..), Artist (..), Image (..), Link (..),
+ (Info (..), tagsFor, descFor, imagesFor, linksFor,
+ Artist (..), Image (..), Link (..),
GalleryInfo (..), GalleryFilters (..), ArtistFilter (..), NsfwFilter (..),
IndexInfo (..),
readArtistFilter, matchArtist, readNsfwFilter, matchNsfw, matchFilters,
@@ -14,7 +15,7 @@ import Control.Applicative
import Data.Foldable (find)
import qualified Data.HashSet as HashSet
import qualified Data.Map.Strict as Map
-import Data.Maybe (isJust, isNothing)
+import Data.Maybe (isJust, isNothing, fromMaybe)
import Data.Ord (comparing)
import Data.String (IsString)
import Data.Text (Text)
@@ -78,6 +79,11 @@ instance HasField "allSfw" Info Bool where getField = null . #nsfwImages
instance HasField "anySfw" Info Bool where getField = not . #allNsfw
instance HasField "anyNsfw" Info Bool where getField = not . #allSfw
+instance HasField "sfwLinks" Info [Link] where
+ getField = filter #sfw . #links
+instance HasField "nsfwLinks" Info [Link] where
+ getField = filter #nsfw . #links
+
instance HasField "thumb" Info (Maybe FilePath) where
getField (Info {thumb', images}) = thumb' <|> #path <$> find #sfw images
@@ -90,6 +96,19 @@ instance HasField "year" Info Integer where getField = #first . #dmy
instance HasField "month" Info Int where getField = #second . #dmy
instance HasField "day" Info Int where getField = #third . #dmy
+descFor :: Bool -> Info -> Text
+descFor nsfw i = if nsfw then desc <> "\n" <> nsfwDesc else desc
+ where desc = fromMaybe "" $ #desc i; nsfwDesc = fromMaybe "" $ #nsfwDesc i
+
+tagsFor :: Bool -> Info -> [Text]
+tagsFor nsfw i = if nsfw then #tags i <> #nsfwTags i else #tags i
+
+imagesFor :: Bool -> Info -> [Image]
+imagesFor nsfw = if nsfw then #images else #sfwImages
+
+linksFor :: Bool -> Info -> [Link]
+linksFor nsfw = if nsfw then #links else #sfwLinks
+
instance Ord Info where
compare = comparing \Info {date, title} -> (date, title)
diff --git a/make-pages/SinglePage.hs b/make-pages/SinglePage.hs
index e4d31d9..c29995b 100644
--- a/make-pages/SinglePage.hs
+++ b/make-pages/SinglePage.hs
@@ -6,13 +6,10 @@ import BuilderQQ
import Records ()
import Control.Exception
-import Control.Monad
import Data.Maybe (fromMaybe)
import qualified Data.Text as Strict
import qualified Data.Text.Lazy as Lazy
import qualified Data.Time.Calendar as Time
-import qualified Data.Char as Char
-import qualified Data.List as List
import System.FilePath (joinPath, splitPath)
@@ -30,8 +27,7 @@ make :: Bool -> FilePath -> Info -> Lazy.Text
make nsfw dir = toLazyText . make' nsfw dir
make' :: Bool -> FilePath -> Info -> Builder
-make' nsfw dir (Info {date, title, artist, tags, nsfwTags,
- desc, nsfwDesc, images = allImages, links}) = [b|@0
+make' nsfw dir info@(Info {date, title, artist}) = [b|@0
@@ -79,9 +75,6 @@ make' nsfw dir (Info {date, title, artist, tags, nsfwTags,
where
artistTag = ifJust artist makeArtist
- images | nsfw = allImages
- | otherwise = filter #sfw allImages
-
formattedDate = formatDate date
buttonBar = makeButtonBar title images
@@ -90,9 +83,10 @@ make' nsfw dir (Info {date, title, artist, tags, nsfwTags,
download0 = fromMaybe path0 (#download image0)
path0' = pageFile path0
- descSection = makeDesc nsfw desc nsfwDesc
- tagsList = makeTags nsfw tags nsfwTags
- linksList = extLinks nsfw links
+ images = imagesFor nsfw info
+ descSection = makeDesc $ descFor nsfw info
+ tagsList = makeTags $ tagsFor nsfw info
+ linksList = extLinks $ linksFor nsfw info
prefetches = map makePrefetch $ tail images
makePrefetch (Image {path}) = [b||]
@@ -112,19 +106,15 @@ makeArtist (Artist {name, url}) =
Just u -> [b|$*name|]
Nothing -> [b|$*name|]
-makeDesc :: Bool -> Maybe Strict.Text -> Maybe Strict.Text -> Builder
-makeDesc nsfw desc nsfwDesc = [b|@4
-
- about
-
- $8*desc'
- $8*nsfwDesc'
-
-
+makeDesc :: Strict.Text -> Builder
+makeDesc desc = [b|@4
+
|]
- where
- desc' = fromMaybe "" desc
- nsfwDesc' = fromMaybe "" $ guard nsfw *> nsfwDesc
makeButtonBar :: Strict.Text -> [Image] -> Builder
makeButtonBar title images =
@@ -162,8 +152,8 @@ escId = foldMap esc1 . Strict.unpack where
| c < 'ΓΏ' && not (Char.isAlphaNum c || c == '-') = "_"
| otherwise = [b|$'c|]
-makeTags :: Bool -> [Strict.Text] -> [Strict.Text] -> Builder
-makeTags nsfw sfwTags nsfwTags =
+makeTags :: [Strict.Text] -> Builder
+makeTags tags =
if null tags then "" else [b|@4