diff --git a/go.mod b/go.mod index 54d4687..b1d04fd 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.25.7 require ( github.com/glebarez/go-sqlite v1.22.0 github.com/go-sql-driver/mysql v1.10.0 - github.com/hymkor/csvi v1.23.2 + github.com/hymkor/csvi v1.24.0 github.com/hymkor/go-multiline-ny v0.23.1 github.com/hymkor/go-shellcommand v0.0.2 github.com/hymkor/struct2flag v0.0.4 @@ -14,7 +14,7 @@ require ( github.com/mattn/go-isatty v0.0.22 github.com/microsoft/go-mssqldb v1.10.0 github.com/nyaosorg/go-box/v3 v3.1.1 - github.com/nyaosorg/go-readline-ny v1.15.1 + github.com/nyaosorg/go-readline-ny v1.16.1 github.com/nyaosorg/go-ttyadapter v0.7.0 github.com/nyaosorg/go-windows-dbg v0.1.0 github.com/sijms/go-ora/v2 v2.8.22 diff --git a/go.sum b/go.sum index 0f2c0b0..00f3bbb 100644 --- a/go.sum +++ b/go.sum @@ -32,8 +32,8 @@ github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlG github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hymkor/csvi v1.23.2 h1:ULizLfbcVEed2+PTvbauP+Ims3hqAwIbHDB+LcuJRW4= -github.com/hymkor/csvi v1.23.2/go.mod h1:IuuXAyOItsq3PYZqpm0IdJ503LLyxevL1vQFIuU4Imk= +github.com/hymkor/csvi v1.24.0 h1:1YzU4AnjOoTtrrWCdjidc4pJKvf+AkmMHWsRZdbZuRU= +github.com/hymkor/csvi v1.24.0/go.mod h1:SCbnfXbSx9RMOlDef3IOfVSxVWKGdTAj94XEscyJeRc= github.com/hymkor/go-multiline-ny v0.23.1 h1:IULtIWsQHhGVxy7ferWNtRav9FZFX19K46GSdC2R2z4= github.com/hymkor/go-multiline-ny v0.23.1/go.mod h1:uwuSgo/xlV0UODTd88wNlllw+fjb+P8dlHvh7dlMqT4= github.com/hymkor/go-safewrite v0.4.0 h1:ppq0/DPwYo+ETRvIeaNMfRBKeFL0U3g3pJAbJNiwm1E= @@ -62,8 +62,8 @@ github.com/nyaosorg/go-box/v3 v3.1.1 h1:iTWE0MOTlD52yEySfhdN6nonX7Uagkn985xQZM6s github.com/nyaosorg/go-box/v3 v3.1.1/go.mod h1:kuRLL+x9n7kqIAiSZRXgNxP+HJVelsCKplo2TQSnWIo= github.com/nyaosorg/go-inline-animation v0.3.1 h1:AXjYkjyK4AEXXDNGQ8yd1RFY4aCKf7b9/cH6CcVHPps= github.com/nyaosorg/go-inline-animation v0.3.1/go.mod h1:GLb7BXeLMuA12LMN3c8l69GQcmlAxit3oZRKILztOsU= -github.com/nyaosorg/go-readline-ny v1.15.1 h1:12TFVSqjkhkzJ1z3CSpLjC/+bFPKChnNo9vvwTu6Zvk= -github.com/nyaosorg/go-readline-ny v1.15.1/go.mod h1:2VID1NHwImx7IASi6gNrR2WOwsFTlQ79p2D/oL1rsJ0= +github.com/nyaosorg/go-readline-ny v1.16.1 h1:Jc2UcLF5mYIunaWCT2OBQRMCR/eIZgmd/X51d3h/ktg= +github.com/nyaosorg/go-readline-ny v1.16.1/go.mod h1:RzGwcAMFaVrCtX/NAagyDuOeP0m8rWTqQm2CiXOpIk0= github.com/nyaosorg/go-readline-skk v0.6.2 h1:UUBt4qS0UwEaqKgaju8yQOogSF0Ozs4KXHDEhEsqjDM= github.com/nyaosorg/go-readline-skk v0.6.2/go.mod h1:afNC+dqTeuu+5KHNFjbv/up7bfehvHp6HULXljTzvyw= github.com/nyaosorg/go-ttyadapter v0.7.0 h1:iBOlx7WJ+A0Fn1x28qYJNedjiFt/kWivlrn1+PTSViU= diff --git a/spread/view.go b/spread/view.go index 5549b2b..143c27c 100644 --- a/spread/view.go +++ b/spread/view.go @@ -87,6 +87,10 @@ func (viewer *Viewer) edit(title string, validate func(*csvi.CellValidatedEvent) return &csvi.CommandResult{}, nil } + noOpe := func(app *csvi.KeyEventArgs) (*csvi.CommandResult, error) { + return &csvi.CommandResult{Message: "Sort is disabled"}, nil + } + quit := func(app *csvi.KeyEventArgs) (*csvi.CommandResult, error) { if !app.IsDirty() && !myDirty { io.WriteString(app, "\n") @@ -113,6 +117,8 @@ func (viewer *Viewer) edit(title string, validate func(*csvi.CellValidatedEvent) keymap := map[string]func(*csvi.KeyEventArgs) (*csvi.CommandResult, error){ "q": quit, "x": setNull, + "s": noOpe, + "S": noOpe, } for _, p := range viewer.OnEvents { keymap[p.Key] = p.Handler