aboutsummaryrefslogtreecommitdiff
path: root/lib/Daffm
diff options
context:
space:
mode:
authorAkshay Nair <phenax5@gmail.com>2025-10-08 10:22:41 +0530
committerAkshay Nair <phenax5@gmail.com>2025-10-08 13:10:40 +0530
commite173e1f105e72e06c6a3206b9b94f4f1da63b00f (patch)
treea1bd14e1da4deedf80a1837ab4f79650a43f47e5 /lib/Daffm
parenta9189b183b96634a6af335b447f9aa44263ac304 (diff)
downloaddaffm-e173e1f105e72e06c6a3206b9b94f4f1da63b00f.tar.gz
daffm-e173e1f105e72e06c6a3206b9b94f4f1da63b00f.zip
Add map command for creating keymaps
Diffstat (limited to 'lib/Daffm')
-rw-r--r--lib/Daffm/Action/Commands.hs8
-rw-r--r--lib/Daffm/State.hs2
-rw-r--r--lib/Daffm/Types.hs1
3 files changed, 9 insertions, 2 deletions
diff --git a/lib/Daffm/Action/Commands.hs b/lib/Daffm/Action/Commands.hs
index 35262df..a6a55e6 100644
--- a/lib/Daffm/Action/Commands.hs
+++ b/lib/Daffm/Action/Commands.hs
@@ -6,12 +6,15 @@ module Daffm.Action.Commands where
import qualified Brick as M
import Control.Monad (forM_)
import Control.Monad.IO.Class (MonadIO (liftIO))
+import Control.Monad.State (modify)
import Daffm.Action.Cmdline
import Daffm.Action.Core
+import Daffm.Keymap (parseKeySequence)
import Daffm.Types
import Daffm.Utils (trim, trimStart)
import Data.Bifunctor (Bifunctor (second))
import Data.Char (isSpace)
+import qualified Data.Map as Map
import Data.Maybe (fromMaybe)
import qualified Data.Text as Text
import qualified Data.Text.IO as Text
@@ -48,6 +51,10 @@ parseCommand cmd = mkCmd . splitCmdArgs $ trimStart cmd
("search", term) -> Just $ CmdSearch $ trim term
("search-next", _) -> Just $ CmdSearchNext 1
("search-prev", _) -> Just $ CmdSearchNext (-1)
+ ("map", Text.break isSpace -> (keysraw, cmdraw)) -> do
+ keys <- parseKeySequence keysraw
+ cmd' <- parseCommand $ trimStart cmdraw
+ pure $ CmdKeymapSet keys cmd'
_ -> Nothing
readCommandLines' :: Text.Text -> IO [Text.Text]
@@ -88,6 +95,7 @@ processCommand CmdGoBack = goBackToParentDir
processCommand (CmdChain chain) = forM_ chain processCommand
processCommand (CmdSearch term) = setSearchTerm term >> applySearch >> nextSearchMatch
processCommand (CmdSearchNext change) = updateSearchIndex (+ change) >> nextSearchMatch
+processCommand (CmdKeymapSet keys command) = modify $ \s -> s {stateKeyMap = Map.insert keys command $ stateKeyMap s}
processCommand CmdNoop = pure ()
evaluateCommand :: Text.Text -> AppEvent ()
diff --git a/lib/Daffm/State.hs b/lib/Daffm/State.hs
index 150f34b..98b9aa9 100644
--- a/lib/Daffm/State.hs
+++ b/lib/Daffm/State.hs
@@ -10,7 +10,6 @@ import Control.Exception (try)
import Control.Monad (filterM, forM)
import Daffm.Types
import Daffm.Utils (trim)
-import Data.Either (fromRight)
import Data.List (findIndex, sortBy)
import qualified Data.Map.Strict as Map
import Data.Maybe (fromMaybe)
@@ -18,7 +17,6 @@ import qualified Data.Set as Set
import qualified Data.Text as Text
import qualified Data.Text.Zipper.Generic as Zipper
import qualified Data.Vector as Vec
-import GHC.IO.Exception (IOException (IOError))
import System.Directory (doesDirectoryExist, doesPathExist, getCurrentDirectory, getHomeDirectory, getSymbolicLinkTarget, listDirectory, makeAbsolute, setCurrentDirectory)
import System.FilePath (joinPath, takeDirectory)
import System.PosixCompat (fileExist)
diff --git a/lib/Daffm/Types.hs b/lib/Daffm/Types.hs
index e7751c4..b916c79 100644
--- a/lib/Daffm/Types.hs
+++ b/lib/Daffm/Types.hs
@@ -77,6 +77,7 @@ data Command
| CmdChain [Command]
| CmdSearch Text.Text
| CmdSearchNext Int
+ | CmdKeymapSet [Key] Command
| CmdNoop
deriving (Show, Eq)