Dark-Alex-17/kapow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed wrong parsing behavior with path EP. Added comment support.

Browse Source
This commit is contained in:
Roberto Abdelkader Martínez Pérez
2019-04-22 14:22:59 +02:00
parent 2de9a3766e
commit 5619ad7905
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kapow.py
+6 -2
View File
@@ -31,6 +31,8 @@ log = logging.getLogger('kapow')
# Parser # # Parser #
######################################################################## ########################################################################
COMMENT = (Literal('#') + SkipTo(LineEnd()))(name="comment")
# Method # Method
METHOD = (Literal('GET') METHOD = (Literal('GET')
| Literal('POST') | Literal('POST')
@@ -59,9 +61,9 @@ ENDPOINT = (Optional(METHOD_SPEC + Suppress(White()),
# Endpoint bodies # Endpoint bodies
CODE_EP = (ENDPOINT + BODY)(name="code_ep") CODE_EP = (ENDPOINT + BODY)(name="code_ep")
PATH_EP = (ENDPOINT + '=' + SkipTo(LineEnd())(name="path"))(name="path_ep") PATH_EP = (ENDPOINT + '=' + SkipTo(LineEnd())(name="path") + Suppress(LineStart()))(name="path_ep")
KAPOW_PROGRAM = OneOrMore(CODE_EP | PATH_EP) KAPOW_PROGRAM = CODE_EP | PATH_EP | COMMENT
######################################################################## ########################################################################
@@ -486,6 +488,8 @@ def main(ctx, program, verbose, expression):
source = expression if program is None else program.read() source = expression if program is None else program.read()
for ep, _, _ in KAPOW_PROGRAM.scanString(source): for ep, _, _ in KAPOW_PROGRAM.scanString(source):
if 'comment' in ep:
continue
methods = ep.method.asList()[0].split('|') methods = ep.method.asList()[0].split('|')
pattern = ''.join(ep.urlpattern) pattern = ''.join(ep.urlpattern)
if ep.body: if ep.body: