Compare commits

..

2 commits

Author SHA1 Message Date
7c755099ef
bbansi was consumed by hwylterm 2024-09-17 18:56:51 -05:00
82cbff556e
syntax? 2024-09-17 16:27:00 -05:00
11 changed files with 19 additions and 156 deletions

View file

@ -36,7 +36,7 @@
"vt.default_blu=46,168,161,175,250,231,213,222,112,168,161,175,250,231,213,200" "vt.default_blu=46,168,161,175,250,231,213,222,112,168,161,175,250,231,213,200"
]; ];
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
boot.tmp.cleanOnBoot = true; boot.tmp.cleanOnBoot = true;
boot.loader = { boot.loader = {
systemd-boot = enabled // { systemd-boot = enabled // {

View file

@ -8,5 +8,5 @@ buildNimblePackage {
verions = "unstable"; verions = "unstable";
src = lib.cleanSource ./.; src = lib.cleanSource ./.;
nativeBuildInputs = [ openssl ]; nativeBuildInputs = [ openssl ];
nimbleDepsHash = "sha256-WeTbNoF+TuzWriqoHWk5DBVgBXtNBIBHMkwy8/+a2JA="; nimbleDepsHash = "sha256-U44sZSUcus9minOs/Euy4h071eU9Cn83RnYb5jiKibo=";
} }

View file

@ -1,16 +1,6 @@
{ {
"version": 2, "version": 2,
"packages": { "packages": {
"bbansi": {
"version": "0.1.1",
"vcsRevision": "9a85d9ed028f06f1ed1ee6851480a51408a6004e",
"url": "https://github.com/daylinmorgan/bbansi",
"downloadMethod": "git",
"dependencies": [],
"checksums": {
"sha1": "b338433f9a7a1b788b7583674c2b14096ced29ee"
}
},
"cligen": { "cligen": {
"version": "1.7.0", "version": "1.7.0",
"vcsRevision": "4193f802796f15559c81c6dd56724d6f20345917", "vcsRevision": "4193f802796f15559c81c6dd56724d6f20345917",
@ -21,6 +11,16 @@
"sha1": "300bd7fdb6e48d2d98e34ed0661206b50331e99c" "sha1": "300bd7fdb6e48d2d98e34ed0661206b50331e99c"
} }
}, },
"hwylterm": {
"version": "0.1.0",
"vcsRevision": "f743d4b2dc93e41d0e8b5bb0a3e5f26ffc2534e1",
"url": "https://github.com/daylinmorgan/hwylterm",
"downloadMethod": "git",
"dependencies": [],
"checksums": {
"sha1": "5a5e00533d5cf2660872738cabf8b7572128b05b"
}
},
"jsony": { "jsony": {
"version": "1.1.5", "version": "1.1.5",
"vcsRevision": "ea811bec7fa50f5abd3088ba94cda74285e93f18", "vcsRevision": "ea811bec7fa50f5abd3088ba94cda74285e93f18",

View file

@ -14,4 +14,4 @@ requires "nim >= 2.0.8"
requires "cligen" requires "cligen"
requires "jsony" requires "jsony"
requires "zippy" requires "zippy"
requires "https://github.com/daylinmorgan/bbansi#9a85d9e" requires "https://github.com/daylinmorgan/hwylterm#HEAD"

View file

@ -1,7 +1,7 @@
## nix begat oizys ## nix begat oizys
import std/[os, tables, sequtils, strformat,strutils] import std/[os, tables, sequtils, strformat,strutils]
import cligen, bbansi import cligen, hwylterm
import oizys/[context, github, nix, overlay, logging] import oizys/[context, github, nix, overlay, logging]

View file

@ -1,6 +1,6 @@
import std/[logging, os, strformat, strutils] import std/[logging, os, strformat, strutils]
from std/nativesockets import getHostname from std/nativesockets import getHostname
import bbansi import hwylterm
import ./logging import ./logging
type type

View file

@ -3,7 +3,7 @@ import std/[
strutils, streams, logging strutils, streams, logging
] ]
import ./spin import hwylterm
func addArgs*(cmd: var string, args: openArray[string]) = func addArgs*(cmd: var string, args: openArray[string]) =

View file

@ -1,5 +1,5 @@
import std/[httpclient,logging, os, strformat, strutils, json, tables, tempfiles] import std/[httpclient,logging, os, strformat, strutils, json, tables, tempfiles]
import jsony, bbansi, zippy/ziparchives import jsony, hwylterm, zippy/ziparchives
import ./[logging, exec, context] import ./[logging, exec, context]
# localPassC is used by zippy but the additional # localPassC is used by zippy but the additional

View file

@ -1,7 +1,7 @@
import std/[logging,strutils] import std/[logging,strutils]
export logging export logging
import bbansi import hwylterm
var var
handlers {.threadvar.}: seq[Logger] handlers {.threadvar.}: seq[Logger]

View file

@ -3,7 +3,7 @@ import std/[
enumerate, os, sequtils, strformat, enumerate, os, sequtils, strformat,
strutils, sugar, logging, tables strutils, sugar, logging, tables
] ]
import bbansi, jsony import hwylterm, jsony
import ./[context, exec, logging] import ./[context, exec, logging]

View file

@ -1,137 +0,0 @@
import std/[os, locks, sequtils, terminal]
import bbansi
type
SpinnerKind* = enum
Dots
Spinner* = object
interval*: int
frames*: seq[string]
proc makeSpinner*(interval: int, frames: seq[string]): Spinner =
Spinner(interval: interval, frames: frames)
const Spinners*: array[SpinnerKind, Spinner] = [
# Dots
Spinner(interval: 80, frames: @["","","","","","","","","",""]),
]
type
Spinny = ref object
t: Thread[Spinny]
lock: Lock
text: string
running: bool
frames: seq[string]
frame: string
interval: int
customSymbol: bool
style: string
EventKind = enum
Stop, SymbolChange, TextChange,
SpinnyEvent = object
kind: EventKind
payload: string
var spinnyChannel: Channel[SpinnyEvent]
proc newSpinny*(text: string, s: Spinner): Spinny =
let style = "bold blue"
Spinny(
text: text,
running: true,
frames: mapIt(s.frames, $bb(it, style)),
customSymbol: false,
interval: s.interval,
style: "bold blue"
)
proc newSpinny*(text: string, spinType: SpinnerKind): Spinny =
newSpinny(text, Spinners[spinType])
proc setSymbolColor*(spinny: Spinny, style: string) =
spinny.frames = mapIt(spinny.frames, $bb(it, style))
proc setSymbol*(spinny: Spinny, symbol: string) =
spinnyChannel.send(SpinnyEvent(kind: SymbolChange, payload: symbol))
proc setText*(spinny: Spinny, text: string) =
spinnyChannel.send(SpinnyEvent(kind: TextChange, payload: text))
proc handleEvent(spinny: Spinny, eventData: SpinnyEvent): bool =
result = true
case eventData.kind
of Stop:
result = false
of SymbolChange:
spinny.customSymbol = true
spinny.frame = eventData.payload
of TextChange:
spinny.text = eventData.payload
proc spinnyLoop(spinny: Spinny) {.thread.} =
var frameCounter = 0
while spinny.running:
let data = spinnyChannel.tryRecv()
if data.dataAvailable:
# If we received a Stop event
if not spinny.handleEvent(data.msg):
spinnyChannel.close()
# This is required so we can reopen the same channel more than once
# See https://github.com/nim-lang/Nim/issues/6369
spinnyChannel = default(typeof(spinnyChannel))
# TODO: Do we need spinny.running at all?
spinny.running = false
break
stdout.flushFile()
if not spinny.customSymbol:
spinny.frame = spinny.frames[frameCounter]
withLock spinny.lock:
eraseLine()
stdout.write(spinny.frame & " " & spinny.text)
stdout.flushFile()
sleep spinny.interval
if frameCounter >= spinny.frames.len - 1:
frameCounter = 0
else:
frameCounter += 1
proc start*(spinny: Spinny) =
initLock spinny.lock
spinnyChannel.open()
createThread(spinny.t, spinnyLoop, spinny)
proc stop(spinny: Spinny, kind: EventKind, payload = "") =
spinnyChannel.send(SpinnyEvent(kind: kind, payload: payload))
spinnyChannel.send(SpinnyEvent(kind: Stop))
joinThread spinny.t
eraseLine stdout
flushFile stdout
proc stop*(spinny: Spinny) =
spinny.stop(Stop)
template withSpinner*(msg: string = "", body: untyped): untyped =
var spinner {.inject.} = newSpinny(msg, Dots)
if isatty(stdout): # don't spin if it's not a tty
start spinner
body
if isatty(stdout):
stop spinner
template withSpinner*(body: untyped): untyped =
withSpinner("", body)