From 61ca9c3d7824f302e967b056ea6a207a6fedbf61 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 20 Oct 2023 17:07:52 +0200 Subject: fix(users/Profpatsch/openlab-tools): add source to table Change-Id: Ia272460d098d2b25d3890853a3cd8e29ffb31545 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9809 Autosubmit: Profpatsch Tested-by: BuildkiteCI Reviewed-by: Profpatsch --- users/Profpatsch/openlab-tools/src/OpenlabTools.hs | 33 ++++++++++++++++------ 1 file changed, 24 insertions(+), 9 deletions(-) (limited to 'users/Profpatsch/openlab-tools/src/OpenlabTools.hs') diff --git a/users/Profpatsch/openlab-tools/src/OpenlabTools.hs b/users/Profpatsch/openlab-tools/src/OpenlabTools.hs index 21909368bae7..ed5cc158589d 100644 --- a/users/Profpatsch/openlab-tools/src/OpenlabTools.hs +++ b/users/Profpatsch/openlab-tools/src/OpenlabTools.hs @@ -44,6 +44,9 @@ import Text.HTML.TagSoup qualified as Soup import UnliftIO import Prelude hiding (span, until) +mapallSpaceOla :: Text +mapallSpaceOla = "https://mapall.space/heatmap/show.php?id=OpenLab+Augsburg" + mainPage :: Html.Html mainPage = Html.docTypeHtml @@ -60,7 +63,7 @@ mainPage =

What’s there

@@ -105,25 +108,26 @@ runApp = withTracer $ \tracer -> do respond (Wai.responseLBS Http.status500 [] "") catchAppException $ do + let h res = respond . Wai.responseLBS Http.ok200 [("Content-Type", "text/html")] $ res case req & Wai.pathInfo & Text.intercalate "/" of - "" -> do - respond $ Wai.responseLBS Http.status200 [] (renderHtml mainPage) + "" -> h (renderHtml mainPage) "snips/table-opening-hours-last-week" -> do new <- runInIO $ updateCacheIfNewer cache heatmap - - respond $ Wai.responseLBS Http.status200 [] (new & toLazyBytes) + h (new & toLazyBytes) _ -> do respond $ Wai.responseLBS Http.status404 [] "nothing here (yet)" runReaderT appT.unAppT Context {..} heatmap :: AppT IO ByteString heatmap = do - Http.httpBS [fmt|GET https://mapall.space/heatmap/show.php?id=OpenLab+Augsburg|] + Http.httpBS [fmt|GET {mapallSpaceOla}|] <&> (.responseBody) <&> Soup.parseTags + <&> traceShowId <&> Soup.canonicalizeTags <&> findHeatmap - <&> fromMaybe "" + <&> fromMaybe (htmlToTags [hsx|

Uh oh! could not fetch the table from {mapallSpaceOla}

|]) + <&> Soup.renderTags where firstSection f t = t & Soup.sections f & listToMaybe match :: Soup.Tag ByteString -> Soup.Tag ByteString -> Bool @@ -133,17 +137,28 @@ heatmap = do & firstSection (match (Soup.TagOpen ("") [("class", "heatmap")])) >>= firstSection (match (Soup.TagOpen "table" [])) <&> getTable - <&> Soup.renderTags + <&> (<> htmlToTags [hsx|
source: mapall.space
|]) + <&> wrapTagStream (T2 (label @"el" "figure") (label @"attrs" [])) -- get the table from opening tag to closing tag (allowing nested tables) getTable = go 0 where go _ [] = [] go d (el : els) - | match (Soup.TagOpen "table" []) el = el : go (traceShowId $ d + 1) els + | match (Soup.TagOpen "table" []) el = el : go (d + 1) els | match (Soup.TagClose "table") el = if d <= 1 then [el] else el : go (traceShowId $ d - 1) els | otherwise = el : go d els + htmlToTags :: Html.Html -> [Soup.Tag ByteString] + htmlToTags h = h & Html.renderHtml & toStrictBytes & Soup.parseTags + + -- TODO: this is dog-slow because of the whole list recreation! + wrapTagStream :: + T2 "el" ByteString "attrs" [Soup.Attribute ByteString] -> + [Soup.Tag ByteString] -> + [Soup.Tag ByteString] + wrapTagStream tag inner = (Soup.TagOpen (tag.el) tag.attrs : inner) <> [Soup.TagClose tag.el] + main :: IO () main = runApp -- cgit 1.4.1