waveterm/backup
0
0
Fork 0
mirror of https://github.com/wavetermdev/backup.git synced 2026-08-05 13:57:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

add screenupdates

Browse Source
This commit is contained in:
sawka
2023-03-25 12:54:56 -07:00
parent 4aa2bab06e
commit 9ffb672062
4 changed files with 68 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/migrations/000015_lineupdates.down.sql
+1 -1
View File
@@ -1,4 +1,4 @@
DROP TABLE screenupdates;
DROP TABLE screenupdate;
ALTER TABLE screen DROP COLUMN webshareopts;
db/migrations/000015_lineupdates.up.sql
+1 -1
View File
@@ -1,4 +1,4 @@
CREATE TABLE screenupdates (
CREATE TABLE screenupdate (
updateid integer PRIMARY KEY,
screenid varchar(36) NOT NULL,
lineid varchar(36) NOT NULL,
pkg/cmdrunner/cmdrunner.go
+2 -2
View File
@@ -2224,7 +2224,7 @@ func LineSetCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (ssto
if err = validateRenderer(renderer); err != nil {
return nil, fmt.Errorf("invalid renderer value: %w", err)
}
err = sstore.UpdateLineRenderer(ctx, lineId, renderer)
err = sstore.UpdateLineRenderer(ctx, ids.ScreenId, lineId, renderer)
if err != nil {
return nil, fmt.Errorf("error changing line renderer: %v", err)
}
@@ -2489,7 +2489,7 @@ func LineArchiveCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (
if len(pk.Args) >= 2 {
shouldArchive = resolveBool(pk.Args[1], true)
}
err = sstore.SetLineArchivedById(ctx, lineId, shouldArchive)
err = sstore.SetLineArchivedById(ctx, ids.ScreenId, lineId, shouldArchive)
if err != nil {
return nil, fmt.Errorf("/line:archive error updating hidden status: %v", err)
}
pkg/sstore/dbops.go
+64 -8
View File
@@ -2,6 +2,7 @@ package sstore
import (
"context"
"errors"
"fmt"
"strconv"
"strings"
@@ -790,6 +791,9 @@ INSERT INTO cmd ( screenid, cmdid, remoteownerid, remoteid, remotename, cmdstr,
`
tx.NamedExec(query, cmdMap)
}
if isWebShare(tx, line.ScreenId) {
insertScreenUpdate(tx, line.ScreenId, line.LineId, UpdateType_LineNew)
}
return nil
})
}
@@ -814,15 +818,20 @@ func UpdateCmdDoneInfo(ctx context.Context, ck base.CommandKey, doneInfo *CmdDon
if ck.IsEmpty() {
return nil, fmt.Errorf("cannot update cmddoneinfo, empty ck")
}
screenId := ck.GetGroupId()
var rtnCmd *CmdType
txErr := WithTx(ctx, func(tx *TxWrap) error {
query := `UPDATE cmd SET status = ?, doneinfo = ? WHERE screenid = ? AND cmdid = ?`
tx.Exec(query, CmdStatusDone, quickJson(doneInfo), ck.GetGroupId(), ck.GetCmdId())
tx.Exec(query, CmdStatusDone, quickJson(doneInfo), screenId, ck.GetCmdId())
var err error
rtnCmd, err = GetCmdByScreenId(tx.Context(), ck.GetGroupId(), ck.GetCmdId())
rtnCmd, err = GetCmdByScreenId(tx.Context(), screenId, ck.GetCmdId())
if err != nil {
return err
}
if isWebShare(tx, screenId) {
insertScreenUpdateByCmdId(tx, screenId, ck.GetCmdId(), UpdateType_CmdDoneInfo)
insertScreenUpdateByCmdId(tx, screenId, ck.GetCmdId(), UpdateType_CmdStatus)
}
return nil
})
if txErr != nil {
@@ -838,9 +847,13 @@ func UpdateCmdRtnState(ctx context.Context, ck base.CommandKey, statePtr ShellSt
if ck.IsEmpty() {
return fmt.Errorf("cannot update cmdrtnstate, empty ck")
}
screenId := ck.GetGroupId()
txErr := WithTx(ctx, func(tx *TxWrap) error {
query := `UPDATE cmd SET rtnbasehash = ?, rtndiffhasharr = ? WHERE screenid = ? AND cmdid = ?`
tx.Exec(query, statePtr.BaseHash, quickJsonArr(statePtr.DiffHashArr), ck.GetGroupId(), ck.GetCmdId())
tx.Exec(query, statePtr.BaseHash, quickJsonArr(statePtr.DiffHashArr), screenId, ck.GetCmdId())
if isWebShare(tx, screenId) {
insertScreenUpdateByCmdId(tx, screenId, ck.GetCmdId(), UpdateType_CmdRtnState)
}
return nil
})
if txErr != nil {
@@ -853,9 +866,13 @@ func AppendCmdErrorPk(ctx context.Context, errPk *packet.CmdErrorPacketType) err
if errPk == nil || errPk.CK.IsEmpty() {
return fmt.Errorf("invalid cmderror packet (no ck)")
}
screenId := errPk.CK.GetGroupId()
return WithTx(ctx, func(tx *TxWrap) error {
query := `UPDATE cmd SET runout = json_insert(runout, '$[#]', ?) WHERE screenid = ? AND cmdid = ?`
tx.Exec(query, quickJson(errPk), errPk.CK.GetGroupId(), errPk.CK.GetCmdId())
tx.Exec(query, quickJson(errPk), screenId, errPk.CK.GetCmdId())
if isWebShare(tx, screenId) {
insertScreenUpdateByCmdId(tx, screenId, errPk.CK.GetCmdId(), UpdateType_CmdRunOut)
}
return nil
})
}
@@ -1816,10 +1833,13 @@ func UpdateLineHeight(ctx context.Context, lineId string, heightVal int) error {
return nil
}
func UpdateLineRenderer(ctx context.Context, lineId string, renderer string) error {
func UpdateLineRenderer(ctx context.Context, screenId string, lineId string, renderer string) error {
return WithTx(ctx, func(tx *TxWrap) error {
query := `UPDATE line SET renderer = ? WHERE lineid = ?`
tx.Exec(query, renderer, lineId)
if isWebShare(tx, screenId) {
insertScreenUpdate(tx, screenId, lineId, UpdateType_LineRenderer)
}
return nil
})
}
@@ -1842,10 +1862,13 @@ func GetLineById(ctx context.Context, screenId string, lineId string) (*LineType
return rtn, nil
}
func SetLineArchivedById(ctx context.Context, lineId string, archived bool) error {
func SetLineArchivedById(ctx context.Context, screenId string, lineId string, archived bool) error {
txErr := WithTx(ctx, func(tx *TxWrap) error {
query := `UPDATE line SET archived = ? WHERE lineid = ?`
tx.Exec(query, archived, lineId)
if isWebShare(tx, screenId) {
insertScreenUpdate(tx, screenId, lineId, UpdateType_LineArchived)
}
return nil
})
return txErr
@@ -1862,6 +1885,7 @@ func purgeCmdByScreenId(ctx context.Context, screenId string, cmdId string) erro
func PurgeLinesByIds(ctx context.Context, screenId string, lineIds []string) error {
txErr := WithTx(ctx, func(tx *TxWrap) error {
isWS := isWebShare(tx, screenId)
for _, lineId := range lineIds {
query := `SELECT cmdid FROM line WHERE screenid = ? AND lineid = ?`
cmdId := tx.GetString(query, screenId, lineId)
@@ -1875,6 +1899,9 @@ func PurgeLinesByIds(ctx context.Context, screenId string, lineIds []string) err
return err
}
}
if isWS {
insertScreenUpdate(tx, screenId, lineId, UpdateType_LineDel)
}
}
return nil
})
@@ -2333,7 +2360,7 @@ func ScreenWebShareStart(ctx context.Context, screenId string, shareOpts ScreenW
}
query = `UPDATE screen SET sharemode = ?, webshareopts = ? WHERE screenid = ?`
tx.Exec(query, ShareModeWeb, quickJson(shareOpts), screenId)
query = `INSERT INTO screenupdates (screenid, lineid, updatetype, updatets)
query = `INSERT INTO screenupdate (screenid, lineid, updatetype, updatets)
SELECT screenid, lineid, ?, ? FROM line WHERE screenid = ? ORDER BY linenum`
tx.Exec(query, UpdateType_LineNew, time.Now().UnixMilli(), screenId)
return nil
@@ -2352,7 +2379,7 @@ func ScreenWebShareStop(ctx context.Context, screenId string) error {
}
query = `UPDATE screen SET sharemode = ?, webshareopts = ? WHERE screenid = ?`
tx.Exec(query, ShareModeLocal, "null", screenId)
query = `DELETE FROM screenupdates WHERE screenid = ?`
query = `DELETE FROM screenupdate WHERE screenid = ?`
tx.Exec(query, screenId)
return nil
})
@@ -2361,3 +2388,32 @@ func ScreenWebShareStop(ctx context.Context, screenId string) error {
func isWebShare(tx *TxWrap, screenId string) bool {
return tx.Exists(`SELECT screenid FROM screen WHERE screenid = ? AND sharemode = ?`, screenId, ShareModeWeb)
}
func insertScreenUpdate(tx *TxWrap, screenId string, lineId string, updateType string) {
if screenId == "" {
tx.SetErr(errors.New("invalid screen-update, screenid is empty"))
return
}
if lineId == "" {
tx.SetErr(errors.New("invalid screen-update, lineid is empty"))
return
}
query := `INSERT INTO screenupdate (screenid, lineid, updatetype, updatets) VALUES (?, ?, ?, ?)`
tx.Exec(query, screenId, lineId, updateType, time.Now().UnixMilli())
}
func insertScreenUpdateByCmdId(tx *TxWrap, screenId string, cmdId string, updateType string) {
if screenId == "" {
tx.SetErr(errors.New("invalid screen-update, screenid is empty"))
return
}
if cmdId == "" {
tx.SetErr(errors.New("invalid screen-update, cmdid is empty"))
return
}
query := `SELECT lineid FROM line WHERE screenid = ? AND cmdid = ?`
lineId := tx.GetString(query, screenId, cmdId)
if lineId != "" {
insertScreenUpdate(tx, screenId, lineId, updateType)
}
}