Archives
/
wuzz
mirror of https://github.com/asciimoo/wuzz
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39 from cyberj/master

Browse Source 
Disable multiline on url and method views
pull/52/head
Adam Tauber 7 years ago committed by GitHub
parent ef78501721 a850b5c221
commit 155336a547
2 changed files with 78 additions and 22 deletions
Show Stats Download Patch File Download Diff File

2
README.md
Unescape Escape View File

@ -19,7 +19,7 @@ $ "$GOPATH/bin/wuzz" --help
### Commands
Keybinding | Description
----------------------------------------|------------------------------------------------------------
----------------------------------------|---------------------------------------
<kbd>Ctrl+R</kbd> | Send request
<kbd>Ret</kbd> | Send request (only from URL view)
<kbd>Ctrl+S</kbd> | Save response

98
wuzz.go
Unescape Escape View File

@ -64,6 +64,8 @@ var VIEWS []string = []string{
"response-body",
}
var defaultEditor ViewEditor
const MIN_WIDTH = 60
const MIN_HEIGHT = 20
@ -93,8 +95,12 @@ type ViewEditor struct {
}
type SearchEditor struct {
app *App
g *gocui.Gui
wuzzEditor *ViewEditor
}
// The singlelineEditor removes multilines capabilities
type singlelineEditor struct {
wuzzEditor gocui.Editor
}
func init() {
@ -102,6 +108,8 @@ func init() {
CLIENT.Transport = TRANSPORT
}
// Editor funcs
func (e *ViewEditor) Edit(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) {
// handle back-tab (\033[Z) sequence
if e.backTabEscape {
@ -122,13 +130,44 @@ func (e *ViewEditor) Edit(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modif
}
func (e *SearchEditor) Edit(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) {
gocui.DefaultEditor.Edit(v, key, ch, mod)
e.g.Execute(func(g *gocui.Gui) error {
e.app.PrintBody(g)
e.wuzzEditor.Edit(v, key, ch, mod)
e.wuzzEditor.g.Execute(func(g *gocui.Gui) error {
e.wuzzEditor.app.PrintBody(g)
return nil
})
}
// The singlelineEditor removes multilines capabilities
func (e singlelineEditor) Edit(v *gocui.View, key gocui.Key, ch rune, mod gocui.Modifier) {
switch {
case (ch != 0 || key == gocui.KeySpace) && mod == 0:
e.wuzzEditor.Edit(v, key, ch, mod)
// At the end of the line the default gcui editor adds a whitespace
// Force him to remove
ox, _ := v.Cursor()
if ox > 1 && ox >= len(v.Buffer())-2 {
v.EditDelete(false)
}
return
case key == gocui.KeyEnter:
return
case key == gocui.KeyArrowRight:
ox, _ := v.Cursor()
if ox >= len(v.Buffer())-1 {
return
}
case key == gocui.KeyHome || key == gocui.KeyArrowUp:
v.SetCursor(0, 0)
return
case key == gocui.KeyEnd || key == gocui.KeyArrowDown:
v.SetCursor(len(v.Buffer())-1, 0)
return
}
e.wuzzEditor.Edit(v, key, ch, mod)
}
//
func (a *App) Layout(g *gocui.Gui) error {
maxX, maxY := g.Size()
if maxX < MIN_WIDTH || maxY < MIN_HEIGHT {
@ -157,6 +196,8 @@ func (a *App) Layout(g *gocui.Gui) error {
setViewDefaults(v)
v.Title = "URL (F2) - press ctrl+r to send request"
v.Editable = true
v.Overwrite = false
v.Editor = &singlelineEditor{&defaultEditor}
setViewTextAndCursor(v, "https://")
}
if v, err := g.SetView("get", 0, 3, splitX, splitY+1); err != nil {
@ -166,6 +207,7 @@ func (a *App) Layout(g *gocui.Gui) error {
setViewDefaults(v)
v.Editable = true
v.Title = "URL params (F3)"
v.Editor = &defaultEditor
}
if v, err := g.SetView("method", 0, splitY+1, splitX, splitY+3); err != nil {
if err != gocui.ErrUnknownView {
@ -174,6 +216,8 @@ func (a *App) Layout(g *gocui.Gui) error {
setViewDefaults(v)
v.Editable = true
v.Title = "Method (F4)"
v.Editor = &singlelineEditor{&defaultEditor}
setViewTextAndCursor(v, "GET")
}
if v, err := g.SetView("data", 0, 3+splitY, splitX, 2*splitY+3); err != nil {
@ -183,6 +227,7 @@ func (a *App) Layout(g *gocui.Gui) error {
setViewDefaults(v)
v.Editable = true
v.Title = "Request data (POST/PUT) (F5)"
v.Editor = &defaultEditor
}
if v, err := g.SetView("headers", 0, 3+(splitY*2), splitX, maxY-2); err != nil {
if err != gocui.ErrUnknownView {
@ -192,6 +237,7 @@ func (a *App) Layout(g *gocui.Gui) error {
v.Wrap = false
v.Editable = true
v.Title = "Request headers (F6)"
v.Editor = &defaultEditor
}
if v, err := g.SetView("response-headers", splitX, 3, maxX-1, splitY+3); err != nil {
if err != gocui.ErrUnknownView {
@ -229,7 +275,7 @@ func (a *App) Layout(g *gocui.Gui) error {
}
v.Frame = false
v.Editable = true
v.Editor = &SearchEditor{a, g}
v.Editor = &singlelineEditor{&SearchEditor{&defaultEditor}}
v.Wrap = true
}
return nil
@ -519,20 +565,22 @@ func (a *App) SetKeys(g *gocui.Gui) {
})
}
// history keybindings
g.SetKeybinding("history", gocui.KeyArrowDown, gocui.ModNone, func(g *gocui.Gui, v *gocui.View) error {
cursDown := func(g *gocui.Gui, v *gocui.View) error {
cx, cy := v.Cursor()
v.SetCursor(cx, cy+1)
return nil
})
g.SetKeybinding("history", gocui.KeyArrowUp, gocui.ModNone, func(g *gocui.Gui, v *gocui.View) error {
}
cursUp := func(g *gocui.Gui, v *gocui.View) error {
cx, cy := v.Cursor()
if cy > 0 {
cy -= 1
}
v.SetCursor(cx, cy)
return nil
})
}
// history keybindings
g.SetKeybinding("history", gocui.KeyArrowDown, gocui.ModNone, cursDown)
g.SetKeybinding("history", gocui.KeyArrowUp, gocui.ModNone, cursUp)
g.SetKeybinding("history", gocui.KeyEnter, gocui.ModNone, func(g *gocui.Gui, v *gocui.View) error {
_, cy := v.Cursor()
// TODO error
@ -543,20 +591,28 @@ func (a *App) SetKeys(g *gocui.Gui) {
return nil
})
// history keybindings
g.SetKeybinding("method-list", gocui.KeyArrowDown, gocui.ModNone, func(g *gocui.Gui, v *gocui.View) error {
cx, cy := v.Cursor()
v.SetCursor(cx, cy+1)
// method keybindings
g.SetKeybinding("method", gocui.KeyArrowDown, gocui.ModNone, func(g *gocui.Gui, v *gocui.View) error {
value := strings.TrimSpace(v.Buffer())
for i, val := range METHODS {
if val == value && i != len(METHODS)-1 {
setViewTextAndCursor(v, METHODS[i+1])
}
}
return nil
})
g.SetKeybinding("method-list", gocui.KeyArrowUp, gocui.ModNone, func(g *gocui.Gui, v *gocui.View) error {
cx, cy := v.Cursor()
if cy > 0 {
cy -= 1
g.SetKeybinding("method", gocui.KeyArrowUp, gocui.ModNone, func(g *gocui.Gui, v *gocui.View) error {
value := strings.TrimSpace(v.Buffer())
for i, val := range METHODS {
if val == value && i != 0 {
setViewTextAndCursor(v, METHODS[i-1])
}
}
v.SetCursor(cx, cy)
return nil
})
g.SetKeybinding("method-list", gocui.KeyArrowDown, gocui.ModNone, cursDown)
g.SetKeybinding("method-list", gocui.KeyArrowUp, gocui.ModNone, cursUp)
g.SetKeybinding("method-list", gocui.KeyEnter, gocui.ModNone, func(g *gocui.Gui, v *gocui.View) error {
_, cy := v.Cursor()
v, _ = g.View("method")
@ -936,7 +992,7 @@ func main() {
app := &App{history: make([]*Request, 0, 31)}
// overwrite default editor
gocui.DefaultEditor = &ViewEditor{app, g, false, gocui.DefaultEditor}
defaultEditor = ViewEditor{app, g, false, gocui.DefaultEditor}
initApp(app, g)

Write Preview
Loading…
Cancel
Save