Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-22 16:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

use generic resolver for screens

Browse Source
This commit is contained in:
sawka 2022-08-26 17:29:32 -07:00
parent ca29e28c85
commit 9b6d4e928d
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cmdrunner/cmdrunner.go
View File

@ -241,11 +241,11 @@ func ScreenCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (sstor
if firstArg == "" { if firstArg == "" {
return nil, fmt.Errorf("usage /screen [screen-name|screen-index|screen-id], no param specified") return nil, fmt.Errorf("usage /screen [screen-name|screen-index|screen-id], no param specified")
} }
screenIdArg, err := resolveSessionScreen(ctx, ids.SessionId, firstArg) ritem, err := resolveSessionScreen(ctx, ids.SessionId, firstArg, pk.Kwargs["screen"])
if err != nil { if err != nil {
return nil, err return nil, err
} }
update, err := sstore.SwitchScreenById(ctx, ids.SessionId, screenIdArg) update, err := sstore.SwitchScreenById(ctx, ids.SessionId, ritem.Id)
if err != nil { if err != nil {
return nil, err return nil, err
} }

37
pkg/cmdrunner/resolver.go
View File

@ -61,6 +61,17 @@ func sessionsToResolveItems(sessions []*sstore.SessionType) []ResolveItem {
return rtn return rtn
} }
func screensToResolveItems(screens []*sstore.ScreenType) []ResolveItem {
if len(screens) == 0 {
return nil
}
rtn := make([]ResolveItem, len(screens))
for idx, screen := range screens {
rtn[idx] = ResolveItem{Name: screen.Name, Id: screen.ScreenId}
}
return rtn
}
func resolveByPosition(items []ResolveItem, curId string, posStr string) *ResolveItem { func resolveByPosition(items []ResolveItem, curId string, posStr string) *ResolveItem {
if len(items) == 0 { if len(items) == 0 {
return nil return nil
@ -155,25 +166,13 @@ func resolveIds(ctx context.Context, pk *scpacket.FeCommandPacketType, rtype int
return rtn, nil return rtn, nil
} }
func resolveSessionScreen(ctx context.Context, sessionId string, screenArg string) (string, error) { func resolveSessionScreen(ctx context.Context, sessionId string, screenArg string, curScreenArg string) (*ResolveItem, error) {
screens, err := sstore.GetSessionScreens(ctx, sessionId) screens, err := sstore.GetSessionScreens(ctx, sessionId)
if err != nil { if err != nil {
return "", fmt.Errorf("could not retreive screens for session=%s", sessionId) return nil, fmt.Errorf("could not retreive screens for session=%s", sessionId)
} }
screenNum, err := strconv.Atoi(screenArg) ritems := screensToResolveItems(screens)
if err == nil { return genericResolve(screenArg, curScreenArg, ritems, "screen")
if screenNum < 1 || screenNum > len(screens) {
return "", fmt.Errorf("could not resolve screen #%d (out of range), valid screens 1-%d", screenNum, len(screens))
}
return screens[screenNum-1].ScreenId, nil
}
for _, screen := range screens {
if screen.ScreenId == screenArg || screen.Name == screenArg {
return screen.ScreenId, nil
}
}
return "", fmt.Errorf("could not resolve screen '%s' (name/id not found)", screenArg)
} }
func getSessionIds(sarr []*sstore.SessionType) []string { func getSessionIds(sarr []*sstore.SessionType) []string {
@ -254,7 +253,11 @@ func resolveScreenId(ctx context.Context, pk *scpacket.FeCommandPacketType, sess
if sessionId == "" { if sessionId == "" {
return "", fmt.Errorf("cannot resolve screen without session") return "", fmt.Errorf("cannot resolve screen without session")
} }
return resolveSessionScreen(ctx, sessionId, screenArg) ritem, err := resolveSessionScreen(ctx, sessionId, screenArg, "")
if err != nil {
return "", err
}
return ritem.Id, nil
} }
// returns (remoteuserref, remoteref, name, error) // returns (remoteuserref, remoteref, name, error)