feat: selector improvements

.gitignore

@@ -2,13 +2,10 @@
 /dist
 /bin
 
-# atlas
-src/nim.cfg
-*.workspace
-
 # nimble
 nimbledeps
 nimble.develop
 nimble.paths
 
 result
+src/selector

config.nims

@@ -2,19 +2,19 @@ import std/[strformat, strutils]
 
 
 task debugSelect, "debug select":
-  exec "nim -d:debug c -r src/selector.nim"
+  exec "nim -d:debugSelect c -r src/selector.nim"
 
 task build, "build app":
   selfExec "c -o:bin/tsm src/tsm.nim"
 
-task buildRelease, "build app":
+task buildRelease, "build release app":
   selfExec "c -d:release -o:bin/tsm src/tsm.nim"
 
-task release, "build release assets":
+task release, "build release assets w/forge":
   version = (gorgeEx "git describe --tags --always --match 'v*'").output
   exec &"forge release -v {version} -V"
 
-task bundle, "package build assets":
+task bundle, "package forge build assets":
   withDir "dist":
     for dir in listDirs("."):
       echo dir

src/project.nim

@@ -13,7 +13,7 @@ type
 proc pathToName(path: string): string =
   splitPath(path)[1].replace(".", "_")
 
-proc newProject(path: string, open: bool, name = "", named: bool = false): Project =
+proc newProject*(path: string, open: bool, name = "", named: bool = false): Project =
   result.location = path
   result.name =
     if name != "":
@@ -24,7 +24,7 @@ proc newProject(path: string, open: bool, name = "", named: bool = false): Proje
   result.open = open
   result.named = named
 
-proc newUnknownProject(name: string): Project =
+proc newUnknownProject*(name: string): Project =
   result.name = name
   result.open = true
 

src/selector.nim

@@ -1,4 +1,4 @@
-import std/[enumerate, os, strformat, strutils, terminal]
+import std/[enumerate, os, strformat, strutils, terminal, sequtils]
 from illwill import illwillDeinit, illwillInit, getKey, Key
 import term, project
 
@@ -22,10 +22,10 @@ type
     max: Natural
 
   Buffer = object
-    height: int
+    height: Natural
-    width: int
+    width: Natural
     buffer: string
-    inputPad: int = 3
+    inputPad: Natural = 3
 
   State = object
     buffer: Buffer
@@ -37,30 +37,39 @@ type
 
 var state = State()
 
-proc addLine(b: var Buffer, text: string) =
+func addLine(b: var Buffer, text: string) =
   b.buffer.add ("  " & text).alignLeft(b.width) & "\n"
 
-proc addDivider(b: var Buffer) =
+func addDivider(b: var Buffer) =
   b.addLine "─".repeat(b.width - 2)
 
 proc addInput(b: var Buffer) =
   b.addLine "$ " & state.input
 
-proc numLines(b: Buffer): int =
+func numLines(b: Buffer): int =
   b.buffer.count '\n'
 
+func clip(
+  s: string,
+  width: int = state.buffer.width - 3
+): string =
+  result =
+    if s.len > width: s[0..width]
+    else: s
+
 proc draw(b: var Buffer) =
   while b.numLines < b.height:
     b.addLine ""
-
   stdout.write(b.buffer)
 
-  when defined(debug):
+  when defined(debugSelect):
     stdout.writeLine ""
-    stdout.writeLine "DEBUG INFO -------------"
+    stdout.writeLine "DEBUG INFO:"
     stdout.writeLine $state.cursor
-    stdout.writeLine(alignLeft("Key: " & $(state.lastKey), b.Buffer.width))
+    stdout.writeLine alignLeft("Key: " & $(state.lastKey), b.Buffer.width)
-    stdout.cursorUp(b.numLines + 4)
+    stdout.writeLine "(w: $1, h: $2)" % [$b.width, $b.height]
+    stdout.writeLine "-".repeat(b.width)
+    stdout.cursorUp  b.numLines + 6
   else:
     stdout.cursorUp(b.numLines)
   stdout.flushFile()
@@ -87,11 +96,11 @@ proc down() =
   elif state.cursor.y == state.cursor.max:
     scrollDown()
 
-proc backspace(s: string): string =
+func backspace(s: string): string =
   if s != "":
     result = s[0..^2]
 
-proc match(project: Project): Project =
+func match(project: Project): Project =
   result = project
   result.matched = true
 
@@ -111,27 +120,16 @@ proc sortProjects(): seq[Project] =
   return priority & rest
 
 proc getProject(): Project =
+  # NOTE: do i need to call sortProjects again here?
   let projects = sortProjects()
   var idx = state.cursor.y - state.cursor.min + state.projectIdx
   return projects[idx]
 
-proc clip(s: string): string =
+func highlight(p: Project): string =
-  let maxWidth = state.buffer.width - 2
+  if p.location == "": "green"
-  result =
+  elif p.open: "yellow"
-    if s.len > maxWidth:
+  elif p.named: "bold cyan"
-      s[0..^maxWidth]
+  else: "default"
-    else:
-      s
-
-proc highlight(p: Project): string =
-  if p.location == "":
-    "green"
-  elif p.open:
-    "yellow"
-  elif p.named:
-    "bold cyan"
-  else:
-    "default"
 
 proc addProject(b: var Buffer, project: Project, selected: bool) =
   let
@@ -148,15 +146,14 @@ proc addProject(b: var Buffer, project: Project, selected: bool) =
   else:
     b.addLine(cur & $name.bb(project.highlight))
 
-proc addProjectCount(b: var Buffer) =
+proc addInfoLine(b: var Buffer) =
   let
     maxNumProjects = state.buffer.height - state.buffer.inputPad
     numProjects = state.projects.len
-  # TODO: use variables here for readability
-  let
     low = state.projectIdx + 1
     high = state.projectIdx + min(maxNumProjects, numProjects)
-  b.addLine $(fmt"[[{low}-{high}/{numProjects}]".bb("faint"))
+    infoLine = fmt"[[{low}-{high}/{numProjects}] Ctrl+E to new session"
+  b.addLine $(infoLine.clip(state.buffer.width - 2).bb("faint"))
 
 proc addProjects(b: var Buffer) =
   let
@@ -178,7 +175,7 @@ proc draw() =
   var buffer = state.buffer
   buffer.addInput
   buffer.addDivider
-  buffer.addProjectCount
+  buffer.addInfoLine
   buffer.addProjects
   buffer.draw
 
@@ -230,8 +227,16 @@ proc selectProject*(projects: seq[Project]): Project =
       up()
     of Key.Down:
       down()
+    of Key.CtrlE:
+      exitProc()
+      return newProject(
+        path = getCurrentDir(),
+        name = state.input,
+        open = false,
+      )
     of
-        Key.CtrlA..Key.CtrlL,
+        Key.CtrlA..Key.CtrlD,
+        Key.CtrlF..Key.CtrlL,
         Key.CtrlN..Key.CtrlZ,
         Key.CtrlRightBracket,
         Key.CtrlBackslash,
@@ -252,6 +257,6 @@ proc selectProject*(projects: seq[Project]): Project =
     sleep(10)
 
 when isMainModule:
-  projects = findProjects(open)
+  let projects = findProjects(false)
   let selected = selectProject(projects)
-  echo "selected project -> " & $selected.name
+  echo "selected project -> " & $selected

todo.md

@@ -0,0 +1,5 @@
+# tsm todo's
+
+- [ ] add message about new keybind Ctrl+E
+
+<!-- generated with <3 by daylinmorgan/todo -->