From a18786e70c79dd68e84422ba5f7cda390abeda45 Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Thu, 9 Jul 2020 21:48:29 +0200 Subject: [PATCH] skip nsfw stuff in non-nsfw singlepages --- make-pages/Main.hs | 8 ++++--- make-pages/SinglePage.hs | 47 ++++++++++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/make-pages/Main.hs b/make-pages/Main.hs index a927267..3179c5f 100644 --- a/make-pages/Main.hs +++ b/make-pages/Main.hs @@ -49,12 +49,14 @@ main :: IO () main = main2 =<< Opt.execParser optionsParser main2 :: Options -> IO () -main2 (SinglePage {file, includeNsfw, output}) = do +main2 s@(SinglePage {file, includeNsfw, output}) = do + print s txt <- ByteString.readFile file let Right info = YAML.decode1 txt - let page = make info + let page = make includeNsfw info case output of Nothing -> Text.putStr page Just out -> Text.writeFile out page -main2 (GalleryPage {}) = do +main2 g@(GalleryPage {}) = do + print g error "surprise! this doesn't exist yet" diff --git a/make-pages/SinglePage.hs b/make-pages/SinglePage.hs index 7cb6066..9a66d91 100644 --- a/make-pages/SinglePage.hs +++ b/make-pages/SinglePage.hs @@ -9,11 +9,11 @@ import qualified Data.Char as Char import qualified Data.Vector as Vector -make :: Info -> Lazy.Text -make = toLazyText . make' +make :: Bool -> Info -> Lazy.Text +make includeNsfw = toLazyText . make' includeNsfw -make' :: Info -> Builder -make' (Info {date, title, tags, description, images, links}) = +make' :: Bool -> Info -> Builder +make' includeNsfw (Info {date, title, tags, description, images, links}) = "\n" <> "\n" <> "\n" <> @@ -22,22 +22,14 @@ make' (Info {date, title, tags, description, images, links}) = "
\n" <> "

" <> esc title <> "

\n" <> "

" <> formatDate date <> "

\n" <> - " \n" <> + buttonBar includeNsfw images <> "
\n\n" <> "
\n" <> " path0 <> "\">\n" <> "
\n" <> indent 4 description <> "
\n\n" <> - "

links

\n" <> - " \n" <> + extLinks includeNsfw links <> "
\n\n" <> "