Commit Graph

7369 Commits

Author SHA1 Message Date
Aldo Cortesi
f14ec2d8f0 console: add a data view overlay for command output
Fixes #2654
2017-12-17 10:11:02 +13:00
Aldo Cortesi
eab27db7d6 minor: commandeditor.py -> commandexecutor.py 2017-12-17 10:11:02 +13:00
Aldo Cortesi
2649e57691 minor: fix key bindings, adjust flow command presentation
Fixes #2681
2017-12-17 10:11:02 +13:00
Aldo Cortesi
cd913d598d command cuts: add completion
- Remove shortcuts for request, response, etc. - we don't need them if we have completion
- Restrict cuts specification to a set of prefixes
- Extend cuts to add a few more items
2017-12-17 10:11:02 +13:00
Aldo Cortesi
50a94db2cc commands: Reassess the cuts API
Make the cuts API more transparent. Cut specifications are no longer a
centrally resolved core type, and flows are now passed explicitly.
2017-12-17 10:11:02 +13:00
Thomas Kriechbaumer
099aa9cebf
Merge pull request #2682 from mitmproxy/requires-io-master
[requires.io] dependency update on master branch
2017-12-16 08:50:42 +01:00
requires.io
4e24915c8e [requires.io] dependency update 2017-12-15 23:20:14 +01:00
Aldo Cortesi
367d3a02e1
Merge pull request #2679 from cortesi/commander2
commands - further progress
2017-12-16 09:22:07 +13:00
Aldo Cortesi
198c7b19a3 commander: test++ 2017-12-15 17:51:02 +13:00
Aldo Cortesi
1d2cdcff07 commander: sort options for completion 2017-12-15 16:26:33 +13:00
Aldo Cortesi
a8ae006f2e command: path completion 2017-12-15 16:02:34 +13:00
Aldo Cortesi
ea891b43f8 console: fix variable clash exposed by recent key binding work 2017-12-15 16:02:34 +13:00
Aldo Cortesi
582e6a9fa6 command: recursive command parsing
This lets us complete commands passed to commands correctly.
2017-12-15 16:02:34 +13:00
Aldo Cortesi
a436af537a
Merge pull request #2678 from mhils/console-startup-events
Fix console logging during startup
2017-12-15 16:02:19 +13:00
Aldo Cortesi
adad33595e
Merge pull request #2677 from cortesi/commander
Commander
2017-12-15 15:57:27 +13:00
Aldo Cortesi
2cfe45428a command: add command.Arg type
This type represents an argument to a command passed to another command. This
improves help text, and will be used in the partial parser to expand subcommand
types.
2017-12-15 13:37:44 +13:00
Maximilian Hils
3ff380054c improve eventstore truncation 2017-12-15 01:36:41 +01:00
Maximilian Hils
96ee3d853b limit eventstore size 2017-12-14 23:45:12 +01:00
Aldo Cortesi
1c097813c1 commands: emit types from partial parser, implement choice completion 2017-12-15 11:38:37 +13:00
Maximilian Hils
a5fd4bdb82 console: display errors that happened during startup 2017-12-14 23:27:37 +01:00
Maximilian Hils
18f34fe88e streamline console logging, fix #2667 2017-12-14 23:27:37 +01:00
Aldo Cortesi
8c0ba71fd8 commander: tab completion for command names 2017-12-15 10:07:47 +13:00
Aldo Cortesi
4d358c49fb WIP: autocompletion 2017-12-15 10:07:47 +13:00
Aldo Cortesi
0cd4a77268 commands: add a parser for partial commands
We only return Cmd and str types for the moment.
2017-12-15 10:07:47 +13:00
Aldo Cortesi
e64d5c6bb9 commands: add a Cmd argument type
This represents a command passed as an argument. Also split arguments from
command values themselves, making the command help for meta-commands much
clearer.
2017-12-15 10:07:47 +13:00
Aldo Cortesi
04e19f9171 Introduce a custom widget for command editing
The builtin urwid.Edit widget is not sufficiently flexible for what we want to
do.
2017-12-15 10:07:47 +13:00
Aldo Cortesi
21324086c3
Merge pull request #2674 from mhils/issue-2620
Fix #2620
2017-12-15 10:05:40 +13:00
Aldo Cortesi
dfcf62ff2b
Merge pull request #2545 from mitmproxy/wsproto
Replace our WebSocket stack with wsproto
2017-12-15 09:49:24 +13:00
Aldo Cortesi
d9848a8bc1
Merge pull request #2675 from mhils/issue-2673
Fix #2673
2017-12-15 09:48:41 +13:00
Maximilian Hils
9f3806e27a fix #2673 2017-12-14 18:05:36 +01:00
Maximilian Hils
842c9f72f7
Merge pull request #2671 from mhils/command-argtypes
Introduce @command.argument
2017-12-14 17:34:25 +01:00
Maximilian Hils
b9973bfbcf simplify path type
the previous implementation crashed the typechecker, as typing.NewType
does not return a proper type that can be used for isinstance() checks.
2017-12-14 15:44:49 +01:00
Maximilian Hils
0af6e2e97f adjust tests 2017-12-14 15:44:47 +01:00
Maximilian Hils
079507e4b6 fix #2620
We previously had the problem that overriding keypress() skipped
the proper calculation of the top widget's size, leading to broken
scrolling behavior in the flowlist. We now always use urwid.Frame's
keypress method, but we make sure that urwid.Pile and urwid.Columns
delegate to the currently focused component.
2017-12-14 14:59:07 +01:00
Maximilian Hils
b725e40b12 fix keybinding help strings 2017-12-14 14:41:43 +01:00
Maximilian Hils
20372b5b0b introduce @command.argument
This makes it possible to specify more specific type annotations at runtime,
so that both mypy and our command system are happy. The .argument(name, type=)
syntax is similar to click's, so it should be fairly extensible if we need it.
2017-12-14 14:15:36 +01:00
Aldo Cortesi
62561ed428
Merge pull request #2669 from cortesi/path
commands: add a Path argument type
2017-12-14 07:42:12 +13:00
Maximilian Hils
5e0e08a4d6
Merge pull request #2670 from Kriechi/fix-2664
fix #2664
2017-12-13 13:50:43 +01:00
Thomas Kriechbaumer
488ec6f3f1 fix #2664 2017-12-13 09:45:40 +01:00
Aldo Cortesi
79cf6d2a5d
Merge pull request #2668 from cortesi/commandopts
Command improvements
2017-12-13 14:42:56 +13:00
Aldo Cortesi
e63bb8cde5 commands: add a Path argument type
This is just an alias for str, and in this patch is used mostly to give an
appropriate type in help strings. More to come.

Fixes #2198
2017-12-13 14:41:46 +13:00
Aldo Cortesi
4cee1a4f96 commands: formalise a Choice type
This resolves as a string during MyPy checks, but at runtime has an additional
attribute that is a command that returns valid options.

This is very ugly and clumsy, basically because MyPy is super restrictive about
what it accepts as a type. Almost any attempt to construct these types in a
more sophisticated way fails in one way or another. I'm open to suggestions.
2017-12-13 11:08:14 +13:00
Maximilian Hils
1a45cf17b3
Merge pull request #2643 from Ga-ryo/master
Fix #2594
2017-12-12 22:40:47 +01:00
Thomas Kriechbaumer
f5fafbfcb5 vendoring of wsproto
https://github.com/python-hyper/wsproto.git
commit 5ea2da61266796666f5de6461aaae22e6b00deba
2017-12-12 22:09:46 +01:00
Thomas Kriechbaumer
70e1409261 docs++: add websocket PING/PONG 2017-12-12 22:09:46 +01:00
Thomas Kriechbaumer
3cb459d56d docs++: add individual protocol pages 2017-12-12 22:09:46 +01:00
Ujjwal Verma
5214f544e7 Use wsproto for websockets 2017-12-12 22:09:46 +01:00
Thomas Kriechbaumer
130021b76d prepare WebSocket stack to move to wsproto 2017-12-12 22:09:46 +01:00
Maximilian Hils
8e9194c2b4 fix #2529 2017-12-12 16:46:35 +01:00
Maximilian Hils
4d924dcfe2 fix #2651 2017-12-12 15:56:16 +01:00