From dc78efe1d829b79d4e2fb37c4147a1eea13fa5ae Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Mon, 30 Dec 2024 11:03:22 -0600
Subject: [PATCH] fix bbstring handling

---
 src/hwylterm/spin.nim | 60 +++++++++++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/hwylterm/spin.nim b/src/hwylterm/spin.nim
index 40180c7..3063a88 100644
--- a/src/hwylterm/spin.nim
+++ b/src/hwylterm/spin.nim
@@ -25,10 +25,10 @@ type
 
 var spinnyChannel: Channel[SpinnyEvent]
 
-proc newSpinny*(text: string | Bbstring, s: Spinner): Spinny =
+proc newSpinny*(text: Bbstring, s: Spinner): Spinny =
   let style = "bold blue"
   Spinny(
-    text: bb(text),
+    text: text,
     running: true,
     frames: s.frames,
     bbFrames: mapIt(s.frames, bb(bbEscape(it), style)),
@@ -38,6 +38,9 @@ proc newSpinny*(text: string | Bbstring, s: Spinner): Spinny =
     file: stderr,
   )
 
+proc newSpinny*(text: string, s: Spinner): Spinny =
+  newSpinny(bb(text), s)
+
 proc newSpinny*(text: string | Bbstring, spinType: SpinnerKind): Spinny =
   newSpinny(text, Spinners[spinType])
 
@@ -110,28 +113,51 @@ proc stop*(spinny: Spinny) =
   spinny.stop(Stop)
 
 template withSpinner*(msg: string = "", body: untyped): untyped =
-  var spinner {.inject.} = newSpinny(msg, Dots)
-  if isatty(spinner.file): # don't spin if it's not a tty
-    start spinner
-    body
-    stop spinner
-  else:
-    body
+  block:
+    var spinner {.inject.} = newSpinny(msg, Dots)
+    if isatty(spinner.file): # don't spin if it's not a tty
+      start spinner
+      body
+      stop spinner
+    else:
+      body
+
+template withSpinner*(msg: BbString = bb"", body: untyped): untyped =
+  block:
+    var spinner {.inject.} = newSpinny(msg, Dots)
+    if isatty(spinner.file): # don't spin if it's not a tty
+      start spinner
+      body
+      stop spinner
+    else:
+      body
+
 
 template withSpinner*(body: untyped): untyped =
   withSpinner("", body)
 
 template with*(kind: SpinnerKind, msg: string, body: untyped): untyped = 
-  var spinner {.inject.} = newSpinny(msg, kind)
-  if isatty(spinner.file): # don't spin if it's not a tty
-    start spinner
-    body
-    stop spinner
-  else:
-    body
+  block:
+    var spinner {.inject.} = newSpinny(msg, kind)
+    if isatty(spinner.file): # don't spin if it's not a tty
+      start spinner
+      body
+      stop spinner
+    else:
+      body
+
+template with*(kind: SpinnerKind, msg: BbString, body: untyped): untyped = 
+  block:
+    var spinner {.inject.} = newSpinny(msg, kind)
+    if isatty(spinner.file): # don't spin if it's not a tty
+      start spinner
+      body
+      stop spinner
+    else:
+      body
+
 
 when isMainModule:
   for kind, _ in Spinners:
     with(kind, $kind):
       sleep 1 * 1000
-