From 18a44086fc9ea2afd0d059b75d6e26732a4b5f3e Mon Sep 17 00:00:00 2001 From: sawka Date: Mon, 16 Oct 2023 13:30:10 -0700 Subject: [PATCH] rename imports for wavesrv --- wavesrv/cmd/main-server.go | 22 +++++++++++----------- wavesrv/go.mod | 8 +++++--- wavesrv/pkg/cmdrunner/cmdrunner.go | 24 ++++++++++++------------ wavesrv/pkg/cmdrunner/resolver.go | 6 +++--- wavesrv/pkg/cmdrunner/shparse.go | 8 ++++---- wavesrv/pkg/cmdrunner/termopts.go | 10 +++++----- wavesrv/pkg/comp/comp.go | 8 ++++---- wavesrv/pkg/comp/simplecomp.go | 6 +++--- wavesrv/pkg/pcloud/pcloud.go | 8 ++++---- wavesrv/pkg/pcloud/pclouddata.go | 6 +++--- wavesrv/pkg/remote/openai/openai.go | 4 ++-- wavesrv/pkg/remote/remote.go | 14 +++++++------- wavesrv/pkg/remote/updatequeue.go | 2 +- wavesrv/pkg/rtnstate/rtnstate.go | 10 +++++----- wavesrv/pkg/scbase/scbase.go | 2 +- wavesrv/pkg/scpacket/scpacket.go | 6 +++--- wavesrv/pkg/scws/scws.go | 12 ++++++------ wavesrv/pkg/shparse/comp.go | 2 +- wavesrv/pkg/shparse/extend.go | 2 +- wavesrv/pkg/shparse/shparse.go | 2 +- wavesrv/pkg/shparse/shparse_test.go | 2 +- wavesrv/pkg/sstore/dbops.go | 10 +++++----- wavesrv/pkg/sstore/fileops.go | 4 ++-- wavesrv/pkg/sstore/migrate.go | 2 +- wavesrv/pkg/sstore/quick.go | 2 +- wavesrv/pkg/sstore/sstore.go | 10 +++++----- wavesrv/pkg/sstore/sstore_migrate.go | 2 +- 27 files changed, 98 insertions(+), 96 deletions(-) diff --git a/wavesrv/cmd/main-server.go b/wavesrv/cmd/main-server.go index 69ebfb1c..62806737 100644 --- a/wavesrv/cmd/main-server.go +++ b/wavesrv/cmd/main-server.go @@ -25,17 +25,17 @@ import ( "github.com/google/uuid" "github.com/gorilla/mux" - "github.com/commandlinedev/apishell/pkg/packet" - "github.com/commandlinedev/apishell/pkg/server" - "github.com/commandlinedev/prompt-server/pkg/cmdrunner" - "github.com/commandlinedev/prompt-server/pkg/pcloud" - "github.com/commandlinedev/prompt-server/pkg/remote" - "github.com/commandlinedev/prompt-server/pkg/rtnstate" - "github.com/commandlinedev/prompt-server/pkg/scbase" - "github.com/commandlinedev/prompt-server/pkg/scpacket" - "github.com/commandlinedev/prompt-server/pkg/scws" - "github.com/commandlinedev/prompt-server/pkg/sstore" - "github.com/commandlinedev/prompt-server/pkg/wsshell" + "github.com/wavetermdev/waveterm/waveshell/pkg/packet" + "github.com/wavetermdev/waveterm/waveshell/pkg/server" + "github.com/wavetermdev/waveterm/wavesrv/pkg/cmdrunner" + "github.com/wavetermdev/waveterm/wavesrv/pkg/pcloud" + "github.com/wavetermdev/waveterm/wavesrv/pkg/remote" + "github.com/wavetermdev/waveterm/wavesrv/pkg/rtnstate" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scbase" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scpacket" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scws" + "github.com/wavetermdev/waveterm/wavesrv/pkg/sstore" + "github.com/wavetermdev/waveterm/wavesrv/pkg/wsshell" ) type WebFnType = func(http.ResponseWriter, *http.Request) diff --git a/wavesrv/go.mod b/wavesrv/go.mod index a51314ea..2260f484 100644 --- a/wavesrv/go.mod +++ b/wavesrv/go.mod @@ -1,11 +1,11 @@ -module github.com/commandlinedev/prompt-server +module github.com/wavetermdev/waveterm/wavesrv go 1.18 require ( + github.com/wavetermdev/waveterm/waveshell v0.0.0 github.com/alessio/shellescape v1.4.1 github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 - github.com/commandlinedev/apishell v0.0.0 github.com/creack/pty v1.1.18 github.com/golang-migrate/migrate/v4 v4.16.2 github.com/google/uuid v1.3.0 @@ -25,4 +25,6 @@ require ( github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect go.uber.org/atomic v1.7.0 // indirect -) \ No newline at end of file +) + +replace github.com/wavetermdev/waveterm/waveshell => ../waveshell diff --git a/wavesrv/pkg/cmdrunner/cmdrunner.go b/wavesrv/pkg/cmdrunner/cmdrunner.go index 10f5f99e..16822107 100644 --- a/wavesrv/pkg/cmdrunner/cmdrunner.go +++ b/wavesrv/pkg/cmdrunner/cmdrunner.go @@ -18,18 +18,18 @@ import ( "time" "unicode" - "github.com/commandlinedev/apishell/pkg/base" - "github.com/commandlinedev/apishell/pkg/packet" - "github.com/commandlinedev/apishell/pkg/shexec" - "github.com/commandlinedev/prompt-server/pkg/comp" - "github.com/commandlinedev/prompt-server/pkg/dbutil" - "github.com/commandlinedev/prompt-server/pkg/pcloud" - "github.com/commandlinedev/prompt-server/pkg/remote" - "github.com/commandlinedev/prompt-server/pkg/remote/openai" - "github.com/commandlinedev/prompt-server/pkg/scbase" - "github.com/commandlinedev/prompt-server/pkg/scpacket" - "github.com/commandlinedev/prompt-server/pkg/sstore" - "github.com/commandlinedev/prompt-server/pkg/utilfn" + "github.com/wavetermdev/waveterm/waveshell/pkg/base" + "github.com/wavetermdev/waveterm/waveshell/pkg/packet" + "github.com/wavetermdev/waveterm/waveshell/pkg/shexec" + "github.com/wavetermdev/waveterm/wavesrv/pkg/comp" + "github.com/wavetermdev/waveterm/wavesrv/pkg/dbutil" + "github.com/wavetermdev/waveterm/wavesrv/pkg/pcloud" + "github.com/wavetermdev/waveterm/wavesrv/pkg/remote" + "github.com/wavetermdev/waveterm/wavesrv/pkg/remote/openai" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scbase" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scpacket" + "github.com/wavetermdev/waveterm/wavesrv/pkg/sstore" + "github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn" "github.com/google/uuid" ) diff --git a/wavesrv/pkg/cmdrunner/resolver.go b/wavesrv/pkg/cmdrunner/resolver.go index 7142a369..fabd0e87 100644 --- a/wavesrv/pkg/cmdrunner/resolver.go +++ b/wavesrv/pkg/cmdrunner/resolver.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "github.com/commandlinedev/prompt-server/pkg/remote" - "github.com/commandlinedev/prompt-server/pkg/scpacket" - "github.com/commandlinedev/prompt-server/pkg/sstore" + "github.com/wavetermdev/waveterm/wavesrv/pkg/remote" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scpacket" + "github.com/wavetermdev/waveterm/wavesrv/pkg/sstore" "github.com/google/uuid" ) diff --git a/wavesrv/pkg/cmdrunner/shparse.go b/wavesrv/pkg/cmdrunner/shparse.go index 6b7e4ed7..a37ec7c7 100644 --- a/wavesrv/pkg/cmdrunner/shparse.go +++ b/wavesrv/pkg/cmdrunner/shparse.go @@ -6,10 +6,10 @@ import ( "regexp" "strings" - "github.com/commandlinedev/apishell/pkg/shexec" - "github.com/commandlinedev/apishell/pkg/simpleexpand" - "github.com/commandlinedev/prompt-server/pkg/scpacket" - "github.com/commandlinedev/prompt-server/pkg/utilfn" + "github.com/wavetermdev/waveterm/waveshell/pkg/shexec" + "github.com/wavetermdev/waveterm/waveshell/pkg/simpleexpand" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scpacket" + "github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn" "mvdan.cc/sh/v3/expand" "mvdan.cc/sh/v3/syntax" ) diff --git a/wavesrv/pkg/cmdrunner/termopts.go b/wavesrv/pkg/cmdrunner/termopts.go index 563690c3..365a7a26 100644 --- a/wavesrv/pkg/cmdrunner/termopts.go +++ b/wavesrv/pkg/cmdrunner/termopts.go @@ -5,11 +5,11 @@ import ( "strconv" "strings" - "github.com/commandlinedev/apishell/pkg/base" - "github.com/commandlinedev/apishell/pkg/packet" - "github.com/commandlinedev/apishell/pkg/shexec" - "github.com/commandlinedev/prompt-server/pkg/remote" - "github.com/commandlinedev/prompt-server/pkg/sstore" + "github.com/wavetermdev/waveterm/waveshell/pkg/base" + "github.com/wavetermdev/waveterm/waveshell/pkg/packet" + "github.com/wavetermdev/waveterm/waveshell/pkg/shexec" + "github.com/wavetermdev/waveterm/wavesrv/pkg/remote" + "github.com/wavetermdev/waveterm/wavesrv/pkg/sstore" ) // PTERM=MxM,Mx25 diff --git a/wavesrv/pkg/comp/comp.go b/wavesrv/pkg/comp/comp.go index 610043ae..4d0041da 100644 --- a/wavesrv/pkg/comp/comp.go +++ b/wavesrv/pkg/comp/comp.go @@ -11,10 +11,10 @@ import ( "unicode" "unicode/utf8" - "github.com/commandlinedev/apishell/pkg/simpleexpand" - "github.com/commandlinedev/prompt-server/pkg/shparse" - "github.com/commandlinedev/prompt-server/pkg/sstore" - "github.com/commandlinedev/prompt-server/pkg/utilfn" + "github.com/wavetermdev/waveterm/waveshell/pkg/simpleexpand" + "github.com/wavetermdev/waveterm/wavesrv/pkg/shparse" + "github.com/wavetermdev/waveterm/wavesrv/pkg/sstore" + "github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn" "mvdan.cc/sh/v3/syntax" ) diff --git a/wavesrv/pkg/comp/simplecomp.go b/wavesrv/pkg/comp/simplecomp.go index b094eb5f..41b104bc 100644 --- a/wavesrv/pkg/comp/simplecomp.go +++ b/wavesrv/pkg/comp/simplecomp.go @@ -6,9 +6,9 @@ import ( "sync" "github.com/google/uuid" - "github.com/commandlinedev/apishell/pkg/packet" - "github.com/commandlinedev/prompt-server/pkg/remote" - "github.com/commandlinedev/prompt-server/pkg/utilfn" + "github.com/wavetermdev/waveterm/waveshell/pkg/packet" + "github.com/wavetermdev/waveterm/wavesrv/pkg/remote" + "github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn" ) var globalLock = &sync.Mutex{} diff --git a/wavesrv/pkg/pcloud/pcloud.go b/wavesrv/pkg/pcloud/pcloud.go index 89b69802..672de624 100644 --- a/wavesrv/pkg/pcloud/pcloud.go +++ b/wavesrv/pkg/pcloud/pcloud.go @@ -15,10 +15,10 @@ import ( "sync" "time" - "github.com/commandlinedev/prompt-server/pkg/dbutil" - "github.com/commandlinedev/prompt-server/pkg/rtnstate" - "github.com/commandlinedev/prompt-server/pkg/scbase" - "github.com/commandlinedev/prompt-server/pkg/sstore" + "github.com/wavetermdev/waveterm/wavesrv/pkg/dbutil" + "github.com/wavetermdev/waveterm/wavesrv/pkg/rtnstate" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scbase" + "github.com/wavetermdev/waveterm/wavesrv/pkg/sstore" ) const PCloudEndpoint = "https://api.getprompt.dev/central" diff --git a/wavesrv/pkg/pcloud/pclouddata.go b/wavesrv/pkg/pcloud/pclouddata.go index 87e43b4b..a865bd0c 100644 --- a/wavesrv/pkg/pcloud/pclouddata.go +++ b/wavesrv/pkg/pcloud/pclouddata.go @@ -5,9 +5,9 @@ import ( "encoding/json" "fmt" - "github.com/commandlinedev/prompt-server/pkg/remote" - "github.com/commandlinedev/prompt-server/pkg/rtnstate" - "github.com/commandlinedev/prompt-server/pkg/sstore" + "github.com/wavetermdev/waveterm/wavesrv/pkg/remote" + "github.com/wavetermdev/waveterm/wavesrv/pkg/rtnstate" + "github.com/wavetermdev/waveterm/wavesrv/pkg/sstore" ) type NoTelemetryInputType struct { diff --git a/wavesrv/pkg/remote/openai/openai.go b/wavesrv/pkg/remote/openai/openai.go index a2f646b5..fe7cee68 100644 --- a/wavesrv/pkg/remote/openai/openai.go +++ b/wavesrv/pkg/remote/openai/openai.go @@ -6,8 +6,8 @@ import ( "io" openaiapi "github.com/sashabaranov/go-openai" - "github.com/commandlinedev/apishell/pkg/packet" - "github.com/commandlinedev/prompt-server/pkg/sstore" + "github.com/wavetermdev/waveterm/waveshell/pkg/packet" + "github.com/wavetermdev/waveterm/wavesrv/pkg/sstore" ) // https://github.com/tiktoken-go/tokenizer diff --git a/wavesrv/pkg/remote/remote.go b/wavesrv/pkg/remote/remote.go index 5fcdb409..25692dba 100644 --- a/wavesrv/pkg/remote/remote.go +++ b/wavesrv/pkg/remote/remote.go @@ -19,13 +19,13 @@ import ( "time" "github.com/armon/circbuf" - "github.com/commandlinedev/apishell/pkg/base" - "github.com/commandlinedev/apishell/pkg/packet" - "github.com/commandlinedev/apishell/pkg/shexec" - "github.com/commandlinedev/apishell/pkg/statediff" - "github.com/commandlinedev/prompt-server/pkg/scbase" - "github.com/commandlinedev/prompt-server/pkg/scpacket" - "github.com/commandlinedev/prompt-server/pkg/sstore" + "github.com/wavetermdev/waveterm/waveshell/pkg/base" + "github.com/wavetermdev/waveterm/waveshell/pkg/packet" + "github.com/wavetermdev/waveterm/waveshell/pkg/shexec" + "github.com/wavetermdev/waveterm/waveshell/pkg/statediff" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scbase" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scpacket" + "github.com/wavetermdev/waveterm/wavesrv/pkg/sstore" "github.com/creack/pty" "github.com/google/uuid" "golang.org/x/mod/semver" diff --git a/wavesrv/pkg/remote/updatequeue.go b/wavesrv/pkg/remote/updatequeue.go index c93ae6f6..1a66549b 100644 --- a/wavesrv/pkg/remote/updatequeue.go +++ b/wavesrv/pkg/remote/updatequeue.go @@ -1,7 +1,7 @@ package remote import ( - "github.com/commandlinedev/apishell/pkg/base" + "github.com/wavetermdev/waveterm/waveshell/pkg/base" ) func startCmdWait(ck base.CommandKey) { diff --git a/wavesrv/pkg/rtnstate/rtnstate.go b/wavesrv/pkg/rtnstate/rtnstate.go index 2a27f0c0..2fddb803 100644 --- a/wavesrv/pkg/rtnstate/rtnstate.go +++ b/wavesrv/pkg/rtnstate/rtnstate.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/alessio/shellescape" - "github.com/commandlinedev/apishell/pkg/packet" - "github.com/commandlinedev/apishell/pkg/shexec" - "github.com/commandlinedev/apishell/pkg/simpleexpand" - "github.com/commandlinedev/prompt-server/pkg/sstore" - "github.com/commandlinedev/prompt-server/pkg/utilfn" + "github.com/wavetermdev/waveterm/waveshell/pkg/packet" + "github.com/wavetermdev/waveterm/waveshell/pkg/shexec" + "github.com/wavetermdev/waveterm/waveshell/pkg/simpleexpand" + "github.com/wavetermdev/waveterm/wavesrv/pkg/sstore" + "github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn" "mvdan.cc/sh/v3/syntax" ) diff --git a/wavesrv/pkg/scbase/scbase.go b/wavesrv/pkg/scbase/scbase.go index 7907746e..91a63828 100644 --- a/wavesrv/pkg/scbase/scbase.go +++ b/wavesrv/pkg/scbase/scbase.go @@ -18,7 +18,7 @@ import ( "sync" "time" - "github.com/commandlinedev/apishell/pkg/base" + "github.com/wavetermdev/waveterm/waveshell/pkg/base" "github.com/google/uuid" "golang.org/x/mod/semver" "golang.org/x/sys/unix" diff --git a/wavesrv/pkg/scpacket/scpacket.go b/wavesrv/pkg/scpacket/scpacket.go index 88255b9e..a6ef1a31 100644 --- a/wavesrv/pkg/scpacket/scpacket.go +++ b/wavesrv/pkg/scpacket/scpacket.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/alessio/shellescape" - "github.com/commandlinedev/apishell/pkg/base" - "github.com/commandlinedev/apishell/pkg/packet" - "github.com/commandlinedev/prompt-server/pkg/sstore" + "github.com/wavetermdev/waveterm/waveshell/pkg/base" + "github.com/wavetermdev/waveterm/waveshell/pkg/packet" + "github.com/wavetermdev/waveterm/wavesrv/pkg/sstore" ) const FeCommandPacketStr = "fecmd" diff --git a/wavesrv/pkg/scws/scws.go b/wavesrv/pkg/scws/scws.go index 57b1c65d..360c0e35 100644 --- a/wavesrv/pkg/scws/scws.go +++ b/wavesrv/pkg/scws/scws.go @@ -8,12 +8,12 @@ import ( "time" "github.com/google/uuid" - "github.com/commandlinedev/apishell/pkg/packet" - "github.com/commandlinedev/prompt-server/pkg/mapqueue" - "github.com/commandlinedev/prompt-server/pkg/remote" - "github.com/commandlinedev/prompt-server/pkg/scpacket" - "github.com/commandlinedev/prompt-server/pkg/sstore" - "github.com/commandlinedev/prompt-server/pkg/wsshell" + "github.com/wavetermdev/waveterm/waveshell/pkg/packet" + "github.com/wavetermdev/waveterm/wavesrv/pkg/mapqueue" + "github.com/wavetermdev/waveterm/wavesrv/pkg/remote" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scpacket" + "github.com/wavetermdev/waveterm/wavesrv/pkg/sstore" + "github.com/wavetermdev/waveterm/wavesrv/pkg/wsshell" ) const WSStatePacketChSize = 20 diff --git a/wavesrv/pkg/shparse/comp.go b/wavesrv/pkg/shparse/comp.go index 28ddde7b..257341df 100644 --- a/wavesrv/pkg/shparse/comp.go +++ b/wavesrv/pkg/shparse/comp.go @@ -3,7 +3,7 @@ package shparse import ( "strings" - "github.com/commandlinedev/prompt-server/pkg/utilfn" + "github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn" ) const ( diff --git a/wavesrv/pkg/shparse/extend.go b/wavesrv/pkg/shparse/extend.go index 8da19810..8642e430 100644 --- a/wavesrv/pkg/shparse/extend.go +++ b/wavesrv/pkg/shparse/extend.go @@ -5,7 +5,7 @@ import ( "unicode" "unicode/utf8" - "github.com/commandlinedev/prompt-server/pkg/utilfn" + "github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn" ) var noEscChars []bool diff --git a/wavesrv/pkg/shparse/shparse.go b/wavesrv/pkg/shparse/shparse.go index e96fe3d9..5757f845 100644 --- a/wavesrv/pkg/shparse/shparse.go +++ b/wavesrv/pkg/shparse/shparse.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/commandlinedev/prompt-server/pkg/utilfn" + "github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn" ) // diff --git a/wavesrv/pkg/shparse/shparse_test.go b/wavesrv/pkg/shparse/shparse_test.go index 16c8a83a..ee7ca093 100644 --- a/wavesrv/pkg/shparse/shparse_test.go +++ b/wavesrv/pkg/shparse/shparse_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/commandlinedev/prompt-server/pkg/utilfn" + "github.com/wavetermdev/waveterm/wavesrv/pkg/utilfn" ) // $(ls f[*]); ./x diff --git a/wavesrv/pkg/sstore/dbops.go b/wavesrv/pkg/sstore/dbops.go index abfcbb90..658a25af 100644 --- a/wavesrv/pkg/sstore/dbops.go +++ b/wavesrv/pkg/sstore/dbops.go @@ -10,11 +10,11 @@ import ( "sync" "time" - "github.com/commandlinedev/apishell/pkg/base" - "github.com/commandlinedev/apishell/pkg/packet" - "github.com/commandlinedev/apishell/pkg/shexec" - "github.com/commandlinedev/prompt-server/pkg/dbutil" - "github.com/commandlinedev/prompt-server/pkg/scbase" + "github.com/wavetermdev/waveterm/waveshell/pkg/base" + "github.com/wavetermdev/waveterm/waveshell/pkg/packet" + "github.com/wavetermdev/waveterm/waveshell/pkg/shexec" + "github.com/wavetermdev/waveterm/wavesrv/pkg/dbutil" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scbase" "github.com/google/uuid" "github.com/jmoiron/sqlx" "github.com/sawka/txwrap" diff --git a/wavesrv/pkg/sstore/fileops.go b/wavesrv/pkg/sstore/fileops.go index 953b5673..57fd5292 100644 --- a/wavesrv/pkg/sstore/fileops.go +++ b/wavesrv/pkg/sstore/fileops.go @@ -10,8 +10,8 @@ import ( "os" "path" - "github.com/commandlinedev/apishell/pkg/cirfile" - "github.com/commandlinedev/prompt-server/pkg/scbase" + "github.com/wavetermdev/waveterm/waveshell/pkg/cirfile" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scbase" "github.com/google/uuid" ) diff --git a/wavesrv/pkg/sstore/migrate.go b/wavesrv/pkg/sstore/migrate.go index 0a26264b..06d8d51d 100644 --- a/wavesrv/pkg/sstore/migrate.go +++ b/wavesrv/pkg/sstore/migrate.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - sh2db "github.com/commandlinedev/prompt-server/db" + sh2db "github.com/wavetermdev/waveterm/wavesrv/db" _ "github.com/golang-migrate/migrate/v4/database/sqlite3" _ "github.com/golang-migrate/migrate/v4/source/file" "github.com/golang-migrate/migrate/v4/source/iofs" diff --git a/wavesrv/pkg/sstore/quick.go b/wavesrv/pkg/sstore/quick.go index c19ce8a0..84aae134 100644 --- a/wavesrv/pkg/sstore/quick.go +++ b/wavesrv/pkg/sstore/quick.go @@ -1,7 +1,7 @@ package sstore import ( - "github.com/commandlinedev/prompt-server/pkg/dbutil" + "github.com/wavetermdev/waveterm/wavesrv/pkg/dbutil" ) var quickSetStr = dbutil.QuickSetStr diff --git a/wavesrv/pkg/sstore/sstore.go b/wavesrv/pkg/sstore/sstore.go index cd77c255..6ff4c42d 100644 --- a/wavesrv/pkg/sstore/sstore.go +++ b/wavesrv/pkg/sstore/sstore.go @@ -17,11 +17,11 @@ import ( "sync" "time" - "github.com/commandlinedev/apishell/pkg/base" - "github.com/commandlinedev/apishell/pkg/packet" - "github.com/commandlinedev/apishell/pkg/shexec" - "github.com/commandlinedev/prompt-server/pkg/dbutil" - "github.com/commandlinedev/prompt-server/pkg/scbase" + "github.com/wavetermdev/waveterm/waveshell/pkg/base" + "github.com/wavetermdev/waveterm/waveshell/pkg/packet" + "github.com/wavetermdev/waveterm/waveshell/pkg/shexec" + "github.com/wavetermdev/waveterm/wavesrv/pkg/dbutil" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scbase" "github.com/google/uuid" "github.com/jmoiron/sqlx" "github.com/sawka/txwrap" diff --git a/wavesrv/pkg/sstore/sstore_migrate.go b/wavesrv/pkg/sstore/sstore_migrate.go index b77bacd7..15036ff1 100644 --- a/wavesrv/pkg/sstore/sstore_migrate.go +++ b/wavesrv/pkg/sstore/sstore_migrate.go @@ -7,7 +7,7 @@ import ( "os" "time" - "github.com/commandlinedev/prompt-server/pkg/scbase" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scbase" ) const MigrationChunkSize = 10