Implement search

app/Main.hs

@@ -66,13 +66,14 @@ type API =
   :<|> "utf8" :> Capture "bytes" Text :> Get '[PlainText, HTML] Utf8Model
   :<|> "codepoints" :> Capture "codepoints" Text :> Get '[PlainText, HTML] CodepointsModel
   :<|> "text" :> Capture "text" Text :> Get '[PlainText, HTML] TextModel
+  :<|> "search" :> Capture "search" Text :> Get '[PlainText, HTML] SearchModel
 
 server :: Server API
 server =
-  rootR :<|> utf8R :<|> codepointsR :<|> textR
+  rootR :<|> utf8R :<|> codepointsR :<|> textR :<|> searchR
   where
-    rootR host = do
+    rootR host' = do
-      pure $ RootModel $ fromMaybe "" host
+      pure $ RootModel $ fromMaybe "" host'
 
     utf8R bytesP = do
       bytes <- Parsers.parseHexBytes bytesP `orThrow` const err400
@@ -85,6 +86,9 @@ server =
     textR textP = do
       pure $ TextModel textP
 
+    searchR searchP = do
+      pure $ mkSearchModel searchP
+
 -- /
 
 newtype RootModel = RootModel
@@ -224,28 +228,53 @@ newtype TextModel = TextModel
   }
 
 instance MimeRender HTML TextModel where
-  mimeRender _ model = renderHtml $ documentWithBody $ do
+  mimeRender _ model = charTableHtml $ Text.unpack model.text
-    H.table $ for_ (Text.unpack model.text) $ \c -> do
+instance MimeRender PlainText TextModel where
+  mimeRender _ model = charTableText $ Text.unpack model.text
+
+-- /search/<search>
+
+newtype SearchModel = SearchModel
+  { results :: [Char]
+  }
+
+mkSearchModel :: Text -> SearchModel
+mkSearchModel search = SearchModel $ searchAllChars search
+
+searchAllChars :: Text -> [Char]
+searchAllChars search = [c | c <- [minBound..maxBound], any (\name -> Text.toLower search `Text.isInfixOf` Text.toLower (Text.pack name)) (allNames c)]
+
+instance MimeRender HTML SearchModel where
+  mimeRender _ model = charTableHtml model.results
+
+instance MimeRender PlainText SearchModel where
+  mimeRender _ model = charTableText model.results
+
+-- Utilities
+
+charTableHtml :: [Char] -> BL.ByteString
+charTableHtml chars =
+  renderHtml $ documentWithBody $ do
+    H.table $ for_ chars $ \c -> do
       H.tr $ do
         H.td $ H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
         H.td $ H.code $ printfHtml "U+%04X" c
         H.td $ H.code $ H.toHtml $ intercalate ", " $ allNames c
         H.td $ H.code $ H.toHtml $ fromMaybe "" $ blockName c
 
-instance MimeRender PlainText TextModel where
+
-  mimeRender _ model = renderText $ Table.render "  "
+charTableText :: [Char] -> BL.ByteString
+charTableText chars =
+  renderText $ Table.render "  "
     [ map Table.cl
       [ Text.pack [c]
       , Text.pack $ printf "U+%04X" c
       , Text.pack $ intercalate ", " $ allNames c
       , Text.pack $ fromMaybe "" $ blockName c
       ]
-    | c <- Text.unpack model.text
+    | c <- chars
     ]
 
-
--- Utilities
-
 renderText :: Text -> BL.ByteString
 renderText = BL.fromStrict . Encoding.encodeUtf8
 

flake.lock

@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1680273054,
+        "lastModified": 1703693486,
-        "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=",
+        "narHash": "sha256-tuzNTOs+1zR2BEVKKrRRGdpR/n095AXIcT8Me1px2bI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3",
+        "rev": "671c2d3e1506a7ee1583515ca80cb3474fdc9c95",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixpkgs-unstable",
+        "ref": "release-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,15 +1,14 @@
 {
   description = "Unicode toy";
 
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/release-23.11";
 
   outputs = { self, nixpkgs }:
     let
-      overlay = import ./nix/overlay.nix;
       settings = import ./nix/settings.nix;
       haskellDeps = import ./nix/haskell-deps.nix;
 
-      pkgs = nixpkgs.legacyPackages.x86_64-linux.extend overlay;
+      pkgs = nixpkgs.legacyPackages.x86_64-linux;
       haskellPackages = pkgs.haskell.packages."${settings.ghc}";
 
       ghc = haskellPackages.ghcWithPackages haskellDeps;
@@ -37,7 +36,7 @@
         ({ mkDerivation }:
         mkDerivation {
           # Keep this in sync with package.yaml
-          version = "0.6";
+          version = "0.6.1";
           pname = "utoy";
           license = pkgs.lib.licenses.mit;
           src =

nix/overlay.nix

@@ -1,23 +0,0 @@
-let
-  settings = import ./settings.nix;
-
-  overlay = final: prev: {
-    haskell = prev.haskell // {
-      packages = prev.haskell.packages // {
-        "${settings.ghc}" = prev.haskell.packages."${settings.ghc}".override {
-          overrides = haskellOverlay prev;
-        };
-      };
-    };
-  };
-
-  haskellOverlay = pkgs: final: prev: {
-    attoparsec-iso8601 = prev.attoparsec-iso8601_1_1_0_0;
-    http-api-data = prev.http-api-data_0_5;
-    servant = pkgs.haskell.lib.doJailbreak prev.servant;
-    servant-server = pkgs.haskell.lib.doJailbreak prev.servant-server;
-    unicode-data = prev.unicode-data_0_4_0_1;
-    unicode-data-names = pkgs.haskell.lib.markUnbroken prev.unicode-data-names;
-  };
-in
-  overlay

package.yaml

@@ -2,7 +2,7 @@
 
 name:                utoy
 # Keep this in sync with the version in flake.nix.
-version:             0.6
+version:             0.6.1
 git:                 "https://git.pbrinkmeier.de/paul/utoy"
 license:             MIT
 author:              "Paul Brinkmeier"

utoy.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           utoy
-version:        0.6
+version:        0.6.1
 author:         Paul Brinkmeier
 maintainer:     hallo@pbrinkmeier.de
 copyright:      2023 Paul Brinkmeier