Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-02-07 00:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

add ephemeral to line

Browse Source
This commit is contained in:
sawka 2022-08-23 13:14:14 -07:00
parent 429c41cfd0
commit 709920ad8e
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/migrations/000001_init.up.sql
View File

@ -66,6 +66,7 @@ CREATE TABLE line (
linetype varchar(10) NOT NULL,
text text NOT NULL,
cmdid varchar(36) NOT NULL,
ephemeral boolean NOT NULL,
PRIMARY KEY (sessionid, windowid, lineid)
);

4
pkg/cmdrunner/cmdrunner.go
View File

@ -386,6 +386,10 @@ func evalCommandInternal(ctx context.Context, pk *scpacket.FeCommandPacketType)
MetaSubCmd: metaSubCmd,
Kwargs: pk.Kwargs,
}
if strings.HasSuffix(commandStr, " ?") {
newPk.Kwargs["ephemeral"] = "1"
commandStr = commandStr[0 : len(commandStr)-2]
}
if metaCmd == "run" || metaCmd == "comment" {
newPk.Args = []string{commandStr}
} else if (metaCmd == "setenv" || metaCmd == "unset") && metaSubCmd == "" {

4
pkg/sstore/dbops.go
View File

@ -398,8 +398,8 @@ func InsertLine(ctx context.Context, line *LineType, cmd *CmdType) error {
if !hasWindow {
return fmt.Errorf("window not found, cannot insert line[%s/%s]", line.SessionId, line.WindowId)
}
query = `INSERT INTO line ( sessionid, windowid, lineid, ts, userid, linetype, text, cmdid)
VALUES (:sessionid,:windowid,:lineid,:ts,:userid,:linetype,:text,:cmdid)`
query = `INSERT INTO line ( sessionid, windowid, lineid, ts, userid, linetype, text, cmdid, ephemeral)
VALUES (:sessionid,:windowid,:lineid,:ts,:userid,:linetype,:text,:cmdid,:ephemeral)`
tx.NamedExecWrap(query, line)
if cmd != nil {
cmdMap := cmd.ToMap()

1
pkg/sstore/sstore.go
View File

@ -278,6 +278,7 @@ type LineType struct {
LineType string `json:"linetype"`
Text string `json:"text,omitempty"`
CmdId string `json:"cmdid,omitempty"`
Ephemeral bool `json:"ephemeral,omitempty"`
Remove bool `json:"remove,omitempty"`
}