Initial simple search has been implemented

2023-04-11 16:39:44 +02:00 · 2023-04-11 16:39:44 +02:00 · c0d0e91dc4
commit c0d0e91dc4
parent 081820e5ca
7 changed files with 79 additions and 7 deletions
--- a/app/Main.hs
+++ b/app/Main.hs
@ -1,12 +1,13 @@

 module Main (main) where
 import System.Environment   
-
+import Site.Host
 import Lib

+
 main :: IO ()
 main = do
    args <- getArgs
    case args of
        ["--seed"] -> seedData
-        _ -> putStrLn "Run the main app"
+        _ -> host
--- a/mtgsearch.cabal
+++ b/mtgsearch.cabal
@ -25,8 +25,10 @@ source-repository head

 library
  exposed-modules:
+      Algorithm.Search
      Config
      Lib
+      Site.Host
  other-modules:
      Paths_mtgsearch
  hs-source-dirs:
@ -36,6 +38,8 @@ library
      aeson
    , base >=4.7 && <5
    , bytestring
+    , directory
+    , scotty
    , sqlite-simple
    , text
  default-language: Haskell2010
@ -51,7 +55,9 @@ executable mtgsearch-exe
      aeson
    , base >=4.7 && <5
    , bytestring
+    , directory
    , mtgsearch
+    , scotty
    , sqlite-simple
    , text
  default-language: Haskell2010
@ -68,7 +74,9 @@ test-suite mtgsearch-test
      aeson
    , base >=4.7 && <5
    , bytestring
+    , directory
    , mtgsearch
+    , scotty
    , sqlite-simple
    , text
  default-language: Haskell2010
--- a/package.yaml
+++ b/package.yaml
@ -25,7 +25,8 @@ dependencies:
 - text
 - bytestring
 - sqlite-simple
-
+- scotty
+- directory

 ghc-options:
 - -Wall
--- a/src/Algorithm/Search.hs
+++ b/src/Algorithm/Search.hs
@ -0,0 +1,29 @@
+{-# LANGUAGE OverloadedStrings #-}
+module Algorithm.Search
+    ( search
+    ) where
+import Database.SQLite.Simple
+import Config (getDbPath)
+import Web.Scotty.Internal.Types
+import Control.Monad
+import qualified Data.Text as T
+
+
+data TestField = TestField Int T.Text deriving (Show)
+
+instance FromRow TestField where
+  fromRow = TestField <$> field <*> field
+
+instance ToRow TestField where
+  toRow (TestField id_ str) = toRow (id_, str)
+
+search :: String -> IO String
+search q = do
+    simpleSearch q
+
+simpleSearch :: String -> IO String
+simpleSearch q = do
+    dbPath <- getDbPath
+    conn <- open dbPath
+    res <-  queryNamed conn "select id, name from card where name like :name" [":name" := ("%"++q++"%")] :: IO [TestField]
+    return (show res)
--- a/src/Lib.hs
+++ b/src/Lib.hs
@ -52,10 +52,7 @@ seedData = do
    conn <- open dbPath
    execute_ conn "CREATE TABLE IF NOT EXISTS card (id INTEGER PRIMARY KEY, scryfall_id TEXT, lang TEXT, name TEXT, oracle_text TEXT)"
    
-    -- If d is Left, the JSON was malformed.
-    -- In that case, we report the error.
-    -- Otherwise, we perform the operation of
-    -- our choice. In this case, just print it.
+
    case d of
        Left err -> putStrLn err
        Right ps -> insertCards conn ps
--- a/src/Site/Host.hs
+++ b/src/Site/Host.hs
@ -0,0 +1,18 @@
+{-# LANGUAGE DeriveGeneric, OverloadedStrings #-}
+module Site.Host
+    ( host
+    ) where
+import Web.Scotty
+
+import Algorithm.Search
+import Control.Monad.IO.Class (MonadIO(liftIO))
+import Data.Text.Lazy (pack)
+
+host = scotty 3000 $ do
+  post "/api/req" $ do
+            query <-  param "query"
+            result <- liftIO (search query)
+            html $ mconcat ["<h1>", pack result, "</h1>"]
+  get "/" $ file "src/Site/Static/index.html"
+  
+
--- a/src/Site/Static/index.html
+++ b/src/Site/Static/index.html
@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<body>
+
+<h1>This is a heading</h1>
+
+<p>This site will be to search for magic the gathering cards using a custom sort of DSL!</p>
+
+
+<form method="POST" action="/api/req"> 
+    <input name="query"/>
+    <button type="submit">SHIP IT!</button>
+</form>
+
+</body>
+</html>
+
+