From 1d07efda84d077b4ff259ebd88860105c936d6c1 Mon Sep 17 00:00:00 2001 From: Sandeep Chayapathi Date: Thu, 11 Jul 2024 22:28:30 -0400 Subject: [PATCH] Added timeout option to choose and other patches (maybe) (#618) * Added timeout option to choose ref: https://github.com/charmbracelet/gum/issues/565 * Update 'charmbracelet/huh' dependency to main * removed the `replace ..` huh line * tidy'd the dependency tree! --- choose/command.go | 2 ++ go.mod | 3 ++- go.sum | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/choose/command.go b/choose/command.go index 3323ad1d0..6a97a1af6 100644 --- a/choose/command.go +++ b/choose/command.go @@ -76,6 +76,7 @@ func (o Options) Run() error { WithWidth(width). WithShowHelp(o.ShowHelp). WithTheme(theme). + WithTimeout(o.Timeout). Run() if err != nil { @@ -102,6 +103,7 @@ func (o Options) Run() error { WithWidth(width). WithTheme(theme). WithShowHelp(o.ShowHelp). + WithTimeout(o.Timeout). Run() if err != nil { diff --git a/go.mod b/go.mod index f860600fa..fa39d34bd 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/charmbracelet/bubbles v0.18.0 github.com/charmbracelet/bubbletea v0.26.4 github.com/charmbracelet/glamour v0.7.0 - github.com/charmbracelet/huh v0.4.2 + github.com/charmbracelet/huh v0.5.2-0.20240711191530-dbf5a5ac0510 github.com/charmbracelet/lipgloss v0.11.0 github.com/charmbracelet/log v0.4.0 github.com/mattn/go-isatty v0.0.20 @@ -38,6 +38,7 @@ require ( github.com/mattn/go-localereader v0.0.1 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect github.com/microcosm-cc/bluemonday v1.0.26 // indirect + github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect github.com/muesli/cancelreader v0.2.2 // indirect github.com/muesli/mango v0.2.0 // indirect diff --git a/go.sum b/go.sum index 5d7ab83ad..98d9ea8d6 100644 --- a/go.sum +++ b/go.sum @@ -22,8 +22,8 @@ github.com/charmbracelet/bubbletea v0.26.4 h1:2gDkkzLZaTjMl/dQBpNVtnvcCxsh/FCkim github.com/charmbracelet/bubbletea v0.26.4/go.mod h1:P+r+RRA5qtI1DOHNFn0otoNwB4rn+zNAzSj/EXz6xU0= github.com/charmbracelet/glamour v0.7.0 h1:2BtKGZ4iVJCDfMF229EzbeR1QRKLWztO9dMtjmqZSng= github.com/charmbracelet/glamour v0.7.0/go.mod h1:jUMh5MeihljJPQbJ/wf4ldw2+yBP59+ctV36jASy7ps= -github.com/charmbracelet/huh v0.4.2 h1:5wLkwrA58XDAfEZsJzNQlfJ+K8N9+wYwvR5FOM7jXFM= -github.com/charmbracelet/huh v0.4.2/go.mod h1:g9OXBgtY3zRV4ahnVih9bZE+1yGYN+y2C9Q6L2P+WM0= +github.com/charmbracelet/huh v0.5.2-0.20240711191530-dbf5a5ac0510 h1:6UCQYZ1/hxnYV++yMoVBHUVQJyyGgVtSzF9NdsBw8rk= +github.com/charmbracelet/huh v0.5.2-0.20240711191530-dbf5a5ac0510/go.mod h1:gs7b2brpzXkY0PBWUqJrlzvOowTCL0vNAR6OTItc+kA= github.com/charmbracelet/lipgloss v0.11.0 h1:UoAcbQ6Qml8hDwSWs0Y1cB5TEQuZkDPH/ZqwWWYTG4g= github.com/charmbracelet/lipgloss v0.11.0/go.mod h1:1UdRTH9gYgpcdNN5oBtjbu/IzNKtzVtb7sqN1t9LNn8= github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM= @@ -68,6 +68,8 @@ github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZ github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58= github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs= +github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4= +github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE= github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI= github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo= github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=