diff --git a/make-pages/BuilderQQ.hs b/make-pages/BuilderQQ.hs index c7cee73..e9633ad 100644 --- a/make-pages/BuilderQQ.hs +++ b/make-pages/BuilderQQ.hs @@ -19,8 +19,7 @@ import Data.List.NonEmpty (NonEmpty, toList) data Chunk = Lit String | Var String parseB :: String -> ExpQ -parseB = toExpQ . reverse . go "" [] . trim where - trim = dropWhileEnd isSpace . dropWhile (== '\n') +parseB = toExpQ . reverse . go "" [] . dropWhileEnd isSpace where go acc cs [] = addLit acc cs go acc cs ('$':'&':rest) = go acc cs rest -- $&: expands to nothing go acc cs ('$':'$':rest) = go ('$' : acc) cs rest -- $$: expands to one $ diff --git a/make-pages/RSS.hs b/make-pages/RSS.hs index 3739cda..dfa0e0e 100644 --- a/make-pages/RSS.hs +++ b/make-pages/RSS.hs @@ -25,18 +25,18 @@ make root name ginfo output infos = make' :: Strict.Text -> Strict.Text -> GalleryInfo -> Maybe FilePath -> [(FilePath, Info)] -> Builder make' root name ginfo@(GalleryInfo {title, desc, prefix}) output infos = [b| - - - - $name—$title - $link - $desc - $selflink + + + + $name—$title + $link + $desc + $selflink - $items - - -|] + $items + + + |] where link = [b|$root/$prefix|] nsfw = ginfo.nsfw @@ -45,7 +45,7 @@ make' root name ginfo@(GalleryInfo {title, desc, prefix}) output infos = [b| filter (not . (.unlisted) . snd) infos selflink = case output of Nothing -> "" - Just o -> [b||] + Just o -> [b||] makeItem :: Strict.Text -> FilePath -> Bool -> FilePath -> Info -> Builder makeItem root prefix nsfw path info@(Info {title}) = [b| diff --git a/make-pages/SinglePage.hs b/make-pages/SinglePage.hs index 8124b50..a4e6c9a 100644 --- a/make-pages/SinglePage.hs +++ b/make-pages/SinglePage.hs @@ -62,7 +62,7 @@ make' root siteName prefix nsfw _dataDir dir let updates = sort $ updatesFor nsfw info let updatesList = makeUpdates updates - let makePrefetch img = [b||] + let makePrefetch img = [b||] where path' = bigFile img let prefetches = map makePrefetch otherImages