From 21aa4d1ae84ff1eddab5c1adfe666a60e711f05d Mon Sep 17 00:00:00 2001
From: sloane <1699281+sloanelybutsurely@users.noreply.github.com>
Date: Sat, 24 Feb 2024 21:11:19 -0500
Subject: [PATCH] picture element helper

---
 lib/sloane_sh/asset.ex                        |   2 +-
 lib/sloane_sh/assets/image.ex                 |  29 +++++++++++++--
 lib/sloane_sh/layouts/helpers.ex              |  33 ++++++++++++++++++
 lib/sloane_sh/layouts/partials.ex             |   5 ++-
 lib/sloane_sh/output_dirs.ex                  |   8 +++++
 mix.exs                                       |   3 +-
 mix.lock                                      |   6 ++++
 .../images/{favicon-32x32.png => heart.png}   | Bin
 priv/site/layouts/root.html.eex               |   2 +-
 9 files changed, 81 insertions(+), 7 deletions(-)
 rename priv/site/images/{favicon-32x32.png => heart.png} (100%)

diff --git a/lib/sloane_sh/asset.ex b/lib/sloane_sh/asset.ex
index c66749f..63fca9f 100644
--- a/lib/sloane_sh/asset.ex
+++ b/lib/sloane_sh/asset.ex
@@ -13,7 +13,7 @@ defmodule SloaneSH.Asset do
   @callback extensions(cfg :: Config.t()) :: [String.t()]
 
   @callback attrs(cfg :: Config.t(), path :: String.t(), data :: binary()) ::
-              {:ok, map(), without_attrs :: binary()} | {:ok, map()} | :error | {:error, term()}
+              {:ok, map(), without_attrs :: term()} | {:ok, map()} | :error | {:error, term()}
 
   @callback render(
               cfg :: Config.t(),
diff --git a/lib/sloane_sh/assets/image.ex b/lib/sloane_sh/assets/image.ex
index 5dae625..1547660 100644
--- a/lib/sloane_sh/assets/image.ex
+++ b/lib/sloane_sh/assets/image.ex
@@ -8,12 +8,35 @@ defmodule SloaneSH.Assets.Image do
   def extensions(_cfg), do: ~w[.jpg .jpeg .png .webp .gif]
 
   @impl Asset
-  def attrs(_cfg, _path, _data) do
-    {:ok, %{}}
+  def attrs(_cfg, _path, data) do
+    {:ok, image} = Image.from_binary(data)
+
+    aspect = Image.aspect(image)
+    {width, height, _} = Image.shape(image)
+
+    {:ok, %{aspect: aspect, width: width, height: height}, image}
   end
 
   @impl Asset
   def render(cfg, _ctx, path, data, _attrs) do
-    {:ok, [{OutputDirs.image(cfg, path), data}]}
+    formats = ~w[.webp .png .jpg]
+
+    outputs =
+      for format <- formats do
+        format_path = OutputDirs.replace_ext(path, format)
+        output_path = OutputDirs.image(cfg, format_path)
+
+        {:ok, converted} =
+          Image.write(data, :memory,
+            suffix: format,
+            strip_metadata: true,
+            minimize_file_size: true,
+            quality: 80
+          )
+
+        {output_path, converted}
+      end
+
+    {:ok, outputs}
   end
 end
diff --git a/lib/sloane_sh/layouts/helpers.ex b/lib/sloane_sh/layouts/helpers.ex
index 8109509..603177b 100644
--- a/lib/sloane_sh/layouts/helpers.ex
+++ b/lib/sloane_sh/layouts/helpers.ex
@@ -1,5 +1,7 @@
 defmodule SloaneSH.Layouts.Helpers do
+  require Logger
   alias SloaneSH.Context
+  alias SloaneSH.OutputDirs
 
   def cx(classes) do
     classes
@@ -20,4 +22,35 @@ defmodule SloaneSH.Layouts.Helpers do
   def fmt_date(date) do
     Timex.format!(date, "{Mfull} {D}, {YYYY}")
   end
+
+  def picture(ctx, src, alt \\ "", class \\ "") do
+    image = Enum.find(ctx.images, fn i ->
+      output = OutputDirs.image(ctx.config, i.src)
+      src == OutputDirs.to_permalink(ctx.config, output)
+    end)
+
+    if is_nil(image) do
+      Logger.warning("Could not find #{inspect(src)} to make picture element")
+      ~s|<img src="#{src}" alt="#{alt}" class="#{class}">|
+    else
+      [{_, src} | srcsets] = [
+        {"image/jpg", ".jpg"},
+        {"image/webp", ".webp"},
+        {"image/png", ".png"},
+      ]
+        |> Enum.map(fn {type, ext} ->
+          {type, OutputDirs.replace_ext(src, ext)}
+        end)
+
+
+      EEx.eval_string(~S"""
+      <picture class="<%= class %>">
+        <%= for {type, srcset} <- srcsets do %>
+          <source srcset="<%= srcset %>" type="<%= type %>" />
+        <% end %>
+        <img src="<%= src %>" alt="<%= alt %>" />
+      </picture>
+      """, src: src, srcsets: srcsets, alt: alt, class: class)
+    end
+  end
 end
diff --git a/lib/sloane_sh/layouts/partials.ex b/lib/sloane_sh/layouts/partials.ex
index 6e62216..80113ae 100644
--- a/lib/sloane_sh/layouts/partials.ex
+++ b/lib/sloane_sh/layouts/partials.ex
@@ -16,7 +16,10 @@ defmodule SloaneSH.Layouts.Partials do
         <% end %>
       </div>
       <div class="flex flex-col gap-2 items-end">
-        <a href="/"><span class="text-lg font-bold">sloane.sh</span></a>
+        <div class="flex flex-row gap-2 items-center">
+          <a href="/"><span class="text-lg font-bold">sloane.sh</span></a>
+          <%= picture(ctx, "/assets/images/heart.png", "a purple heart emoji", "w-4 h-4") %>
+        </div>
         <nav class="flex flex-row gap-2">
           <a href="/" class="<%= cx(underline: attrs[:permalink] == "/") %>">home</a>
           <a href="/posts" class="<%= cx(underline: Map.get(attrs, :permalink, "") =~ ~r[^/posts]) %>">posts</a>
diff --git a/lib/sloane_sh/output_dirs.ex b/lib/sloane_sh/output_dirs.ex
index a311f6f..dcd7dee 100644
--- a/lib/sloane_sh/output_dirs.ex
+++ b/lib/sloane_sh/output_dirs.ex
@@ -44,4 +44,12 @@ defmodule SloaneSH.OutputDirs do
   def from_permalink(cfg, permalink) do
     Path.join([cfg.output_dir, permalink, "/index.html"])
   end
+
+  def replace_ext(path, new_ext) do
+    ext = Path.extname(path)
+    base = Path.basename(path, ext)
+    dir = Path.dirname(path)
+
+    Path.join(dir, base <> new_ext)
+  end
 end
diff --git a/mix.exs b/mix.exs
index 9f03277..f573059 100644
--- a/mix.exs
+++ b/mix.exs
@@ -31,7 +31,8 @@ defmodule SloaneSH.MixProject do
       {:tailwind, "~> 0.2"},
       {:toml, "~> 0.7"},
       {:esbuild, "~> 0.8"},
-      {:timex, "~> 3.7"}
+      {:timex, "~> 3.7"},
+      {:image, "~> 0.42"}
     ]
   end
 
diff --git a/mix.lock b/mix.lock
index b7ab378..199a838 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,10 +1,12 @@
 %{
   "bandit": {:hex, :bandit, "1.2.2", "569fe5d0efb107c9af37a1e37e25ce2ceec293101a2d4bc512876fc3207192b5", [:mix], [{:hpax, "~> 0.1.1", [hex: :hpax, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:thousand_island, "~> 1.0", [hex: :thousand_island, repo: "hexpm", optional: false]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "2f89adb7281c78d4e75733e0a9e1b24f46f84d2993963d6fa57d0eafadec5f03"},
   "castore": {:hex, :castore, "1.0.5", "9eeebb394cc9a0f3ae56b813459f990abb0a3dedee1be6b27fdb50301930502f", [:mix], [], "hexpm", "8d7c597c3e4a64c395980882d4bca3cebb8d74197c590dc272cfd3b6a6310578"},
+  "cc_precompiler": {:hex, :cc_precompiler, "0.1.9", "e8d3364f310da6ce6463c3dd20cf90ae7bbecbf6c5203b98bf9b48035592649b", [:mix], [{:elixir_make, "~> 0.7", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "9dcab3d0f3038621f1601f13539e7a9ee99843862e66ad62827b0c42b2f58a54"},
   "certifi": {:hex, :certifi, "2.12.0", "2d1cca2ec95f59643862af91f001478c9863c2ac9cb6e2f89780bfd8de987329", [:rebar3], [], "hexpm", "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"},
   "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"},
   "earmark": {:hex, :earmark, "1.4.46", "8c7287bd3137e99d26ae4643e5b7ef2129a260e3dcf41f251750cb4563c8fb81", [:mix], [], "hexpm", "798d86db3d79964e759ddc0c077d5eb254968ed426399fbf5a62de2b5ff8910a"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.39", "424642f8335b05bb9eb611aa1564c148a8ee35c9c8a8bba6e129d51a3e3c6769", [:mix], [], "hexpm", "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"},
+  "elixir_make": {:hex, :elixir_make, "0.7.8", "505026f266552ee5aabca0b9f9c229cbb496c689537c9f922f3eb5431157efc7", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.0", [hex: :certifi, repo: "hexpm", optional: true]}], "hexpm", "7a71945b913d37ea89b06966e1342c85cfe549b15e6d6d081e8081c493062c07"},
   "esbuild": {:hex, :esbuild, "0.8.1", "0cbf919f0eccb136d2eeef0df49c4acf55336de864e63594adcea3814f3edf41", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "25fc876a67c13cb0a776e7b5d7974851556baeda2085296c14ab48555ea7560f"},
   "expo": {:hex, :expo, "0.5.2", "beba786aab8e3c5431813d7a44b828e7b922bfa431d6bfbada0904535342efe2", [:mix], [], "hexpm", "8c9bfa06ca017c9cb4020fabe980bc7fdb1aaec059fd004c2ab3bff03b1c599c"},
   "file_system": {:hex, :file_system, "1.0.0", "b689cc7dcee665f774de94b5a832e578bd7963c8e637ef940cd44327db7de2cd", [:mix], [], "hexpm", "6752092d66aec5a10e662aefeed8ddb9531d79db0bc145bb8c40325ca1d8536d"},
@@ -13,14 +15,17 @@
   "hackney": {:hex, :hackney, "1.20.1", "8d97aec62ddddd757d128bfd1df6c5861093419f8f7a4223823537bad5d064e2", [:rebar3], [{:certifi, "~> 2.12.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~> 6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~> 1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~> 1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~> 1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"},
   "hpax": {:hex, :hpax, "0.1.2", "09a75600d9d8bbd064cdd741f21fc06fc1f4cf3d0fcc335e5aa19be1a7235c84", [:mix], [], "hexpm", "2c87843d5a23f5f16748ebe77969880e29809580efdaccd615cd3bed628a8c13"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
+  "image": {:hex, :image, "0.42.0", "aa561f15b53c40ac571e7880083cecf1419ff405fc45dc95675c58aa308eaa22", [:mix], [{:bumblebee, "~> 0.3", [hex: :bumblebee, repo: "hexpm", optional: true]}, {:evision, "~> 0.1.33", [hex: :evision, repo: "hexpm", optional: true]}, {:exla, "~> 0.5", [hex: :exla, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: true]}, {:kino, "~> 0.7", [hex: :kino, repo: "hexpm", optional: true]}, {:nx, "~> 0.5", [hex: :nx, repo: "hexpm", optional: true]}, {:nx_image, "~> 0.1", [hex: :nx_image, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 2.1 or ~> 3.2 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.13", [hex: :plug, repo: "hexpm", optional: true]}, {:rustler, "> 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:sweet_xml, "~> 0.7", [hex: :sweet_xml, repo: "hexpm", optional: false]}, {:vix, "~> 0.23", [hex: :vix, repo: "hexpm", optional: false]}], "hexpm", "19972043abadc40e2d77dc38fc57f52382859791f89a962b0f1425ae64262f7d"},
   "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
   "mime": {:hex, :mime, "2.0.5", "dc34c8efd439abe6ae0343edbb8556f4d63f178594894720607772a041b04b02", [:mix], [], "hexpm", "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"},
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},
   "parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
+  "phoenix_html": {:hex, :phoenix_html, "4.0.0", "4857ec2edaccd0934a923c2b0ba526c44a173c86b847e8db725172e9e51d11d6", [:mix], [], "hexpm", "cee794a052f243291d92fa3ccabcb4c29bb8d236f655fb03bcbdc3a8214b8d13"},
   "plug": {:hex, :plug, "1.15.3", "712976f504418f6dff0a3e554c40d705a9bcf89a7ccef92fc6a5ef8f16a30a97", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "cc4365a3c010a56af402e0809208873d113e9c38c401cabd88027ef4f5c01fd2"},
   "plug_crypto": {:hex, :plug_crypto, "2.0.0", "77515cc10af06645abbfb5e6ad7a3e9714f805ae118fa1a70205f80d2d70fe73", [:mix], [], "hexpm", "53695bae57cc4e54566d993eb01074e4d894b65a3766f1c43e2c61a1b0f45ea9"},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
+  "sweet_xml": {:hex, :sweet_xml, "0.7.4", "a8b7e1ce7ecd775c7e8a65d501bc2cd933bff3a9c41ab763f5105688ef485d08", [:mix], [], "hexpm", "e7c4b0bdbf460c928234951def54fe87edf1a170f6896675443279e2dbeba167"},
   "tailwind": {:hex, :tailwind, "0.2.2", "9e27288b568ede1d88517e8c61259bc214a12d7eed271e102db4c93fcca9b2cd", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}], "hexpm", "ccfb5025179ea307f7f899d1bb3905cd0ac9f687ed77feebc8f67bdca78565c4"},
   "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
   "thousand_island": {:hex, :thousand_island, "1.3.2", "bc27f9afba6e1a676dd36507d42e429935a142cf5ee69b8e3f90bff1383943cd", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "0e085b93012cd1057b378fce40cbfbf381ff6d957a382bfdd5eca1a98eec2535"},
@@ -29,5 +34,6 @@
   "typed_struct": {:hex, :typed_struct, "0.3.0", "939789e3c1dca39d7170c87f729127469d1315dcf99fee8e152bb774b17e7ff7", [:mix], [], "hexpm", "c50bd5c3a61fe4e198a8504f939be3d3c85903b382bde4865579bc23111d1b6d"},
   "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
+  "vix": {:hex, :vix, "0.26.0", "027f10b6969b759318be84bd0bd8c88af877445e4e41cf96a0460392cea5399c", [:make, :mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:cc_precompiler, "~> 0.1.4 or ~> 0.2", [hex: :cc_precompiler, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.7.3 or ~> 0.8", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:kino, "~> 0.7", [hex: :kino, repo: "hexpm", optional: true]}], "hexpm", "71b0a79ae7f199cacfc8e679b0e4ba25ee47dc02e182c5b9097efb29fbe14efd"},
   "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},
 }
diff --git a/priv/site/images/favicon-32x32.png b/priv/site/images/heart.png
similarity index 100%
rename from priv/site/images/favicon-32x32.png
rename to priv/site/images/heart.png
diff --git a/priv/site/layouts/root.html.eex b/priv/site/layouts/root.html.eex
index d34c136..1f84c73 100644
--- a/priv/site/layouts/root.html.eex
+++ b/priv/site/layouts/root.html.eex
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="icon" type="image/x-icon" sizes="32x32" href="/assets/img/favicon-32x32.png">
+    <link rel="icon" type="image/x-icon" sizes="32x32" href="/assets/images/heart.png">
     <title><%= prefix_title("sloane.sh", attrs[:page_title]) %></title>
     <link rel="stylesheet" href="/assets/css/app.css" />
   </head>