From 2eed97086f379225f0b8b732095b455e26e9f41c Mon Sep 17 00:00:00 2001
From: flupe <lucas@escot.me>
Date: Thu, 8 Oct 2020 00:42:10 +0200
Subject: [PATCH] now retrieving thumbnail sizes

---
 src/Main.hs      |  1 -
 src/Templates.hs |  1 -
 src/Visual.hs    | 32 ++++++++++++++++++++++++--------
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/Main.hs b/src/Main.hs
index 57ab3b9..6951c4b 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -63,4 +63,3 @@ build showDrafts = do
     Projects.build
     Posts.build showDrafts
     Readings.build
-
diff --git a/src/Templates.hs b/src/Templates.hs
index 65eb9a0..5a6cf01 100644
--- a/src/Templates.hs
+++ b/src/Templates.hs
@@ -76,7 +76,6 @@ outerWith SiteConfig{title,..} content = doctypehtml_ do
                 a_ [ href_ "/visual.html"   ] "Visual"
                 a_ [ href_ "/readings.html" ] "Readings"
                 a_ [ href_ "/quid.html"     ] "Quid"
-                a_ [ href_ "/atom.xml"      ] "Feed"
 
         main_ content
 
diff --git a/src/Visual.hs b/src/Visual.hs
index 6dcaeb1..5ede041 100644
--- a/src/Visual.hs
+++ b/src/Visual.hs
@@ -9,20 +9,36 @@ build :: Task IO ()
 build = do
     pictures <- match "visual/*" \src -> do
       copyFile src
-      callCommandWith
-         (\a b -> "convert -resize 740x " <> a <> " " <> b)
-         (-<.> "thumb.png")
-         src
-      <&> timestamped
+      src' <- toAbsolute src
+      size <- (resized . read)
+              <$> readCommand "identify" ["-ping", "-format", "(%w, %h)", src']
+      processMagick src
+        <&> timestamped
+        <&> fmap (size,) 
 
     watch pictures $ match_ "./visual.rst" \src -> do
         intro <- compilePandoc src
         write "visual.html" $ renderVisual intro (recentFirst pictures)
 
-renderVisual :: Text -> [Timestamped FilePath] -> Html ()
+resized :: (Int, Int) -> (Int, Int)
+resized (width, height) = (710, round $ fi height * 710.0 / fi width)
+    where
+        fi :: Int -> Float
+        fi = fromIntegral
+
+renderVisual :: Text -> [Timestamped ((Int, Int), FilePath)] -> Html ()
 renderVisual txt imgs =
     outerWith def {title = "visual"} do
         toHtmlRaw txt
         hr_ []
-        section_ $ forM_ imgs \ (Timestamped _ p) ->
-            figure_ $ img_ [ src_ (fromString p), loading_ "lazy" ]
+        section_ $ forM_ imgs \ (Timestamped _ ((width, height), p)) ->
+            figure_ $ img_
+                [ src_ (fromString p)
+                , width_ (fromString $ show width)
+                , height_ (fromString $ show height)
+                , loading_ "lazy" ]
+
+processMagick :: FilePath -> Task IO FilePath
+processMagick = callCommandWith
+    (\a b -> "convert -resize 710x " <> a <> " " <> b)
+    (-<.> "thumb.webp")