mirror of
https://github.com/httpie/cli.git
synced 2024-11-22 15:53:13 +01:00
4f1c9441c5
* Fix encoding error with non-prettified encoded responses
Removed `--format-option response.as` an promote `--response-as`: using
the format option would be misleading as it is now also used by non-prettified
responses.
* Encoding refactoring
* split --response-as into --response-mime and --response-charset
* add support for Content-Type charset for requests printed to terminal
* add support charset detection for requests printed to terminal without a Content-Type charset
* etc.
* `test_unicode.py` → `test_encoding.py`
* Drop sequence length check
* Clean-up tests
* [skip ci] Tweaks
* Use the compatible release clause for `charset_normalizer` requirement
Cf. https://www.python.org/dev/peps/pep-0440/#version-specifiers
* Clean-up
* Partially revert d52a4833e4
* Changelog
* Tweak tests
* [skip ci] Better test name
* Cleanup tests and add request body charset detection
* More test suite cleanups
* Cleanup
* Fix code style in test
* Improve detect_encoding() docstring
* Uniformize pytest.mark.parametrize() calls
* [skip ci] Comment out TODOs (will be tackled in a specific PR)
Co-authored-by: Jakub Roztocil <jakub@roztocil.co>
114 lines
2.7 KiB
Python
114 lines
2.7 KiB
Python
"""Parsing and processing of CLI input (args, auth credentials, files, stdin).
|
|
|
|
"""
|
|
import enum
|
|
import re
|
|
|
|
|
|
URL_SCHEME_RE = re.compile(r'^[a-z][a-z0-9.+-]*://', re.IGNORECASE)
|
|
|
|
HTTP_POST = 'POST'
|
|
HTTP_GET = 'GET'
|
|
|
|
# Various separators used in args
|
|
SEPARATOR_HEADER = ':'
|
|
SEPARATOR_HEADER_EMPTY = ';'
|
|
SEPARATOR_CREDENTIALS = ':'
|
|
SEPARATOR_PROXY = ':'
|
|
SEPARATOR_DATA_STRING = '='
|
|
SEPARATOR_DATA_RAW_JSON = ':='
|
|
SEPARATOR_FILE_UPLOAD = '@'
|
|
SEPARATOR_FILE_UPLOAD_TYPE = ';type=' # in already parsed file upload path only
|
|
SEPARATOR_DATA_EMBED_FILE_CONTENTS = '=@'
|
|
SEPARATOR_DATA_EMBED_RAW_JSON_FILE = ':=@'
|
|
SEPARATOR_QUERY_PARAM = '=='
|
|
|
|
# Separators that become request data
|
|
SEPARATOR_GROUP_DATA_ITEMS = frozenset({
|
|
SEPARATOR_DATA_STRING,
|
|
SEPARATOR_DATA_RAW_JSON,
|
|
SEPARATOR_FILE_UPLOAD,
|
|
SEPARATOR_DATA_EMBED_FILE_CONTENTS,
|
|
SEPARATOR_DATA_EMBED_RAW_JSON_FILE
|
|
})
|
|
|
|
SEPARATORS_GROUP_MULTIPART = frozenset({
|
|
SEPARATOR_DATA_STRING,
|
|
SEPARATOR_DATA_EMBED_FILE_CONTENTS,
|
|
SEPARATOR_FILE_UPLOAD,
|
|
})
|
|
|
|
# Separators for items whose value is a filename to be embedded
|
|
SEPARATOR_GROUP_DATA_EMBED_ITEMS = frozenset({
|
|
SEPARATOR_DATA_EMBED_FILE_CONTENTS,
|
|
SEPARATOR_DATA_EMBED_RAW_JSON_FILE,
|
|
})
|
|
|
|
# Separators for raw JSON items
|
|
SEPARATOR_GROUP_RAW_JSON_ITEMS = frozenset([
|
|
SEPARATOR_DATA_RAW_JSON,
|
|
SEPARATOR_DATA_EMBED_RAW_JSON_FILE,
|
|
])
|
|
|
|
# Separators allowed in ITEM arguments
|
|
SEPARATOR_GROUP_ALL_ITEMS = frozenset({
|
|
SEPARATOR_HEADER,
|
|
SEPARATOR_HEADER_EMPTY,
|
|
SEPARATOR_QUERY_PARAM,
|
|
SEPARATOR_DATA_STRING,
|
|
SEPARATOR_DATA_RAW_JSON,
|
|
SEPARATOR_FILE_UPLOAD,
|
|
SEPARATOR_DATA_EMBED_FILE_CONTENTS,
|
|
SEPARATOR_DATA_EMBED_RAW_JSON_FILE,
|
|
})
|
|
|
|
# Output options
|
|
OUT_REQ_HEAD = 'H'
|
|
OUT_REQ_BODY = 'B'
|
|
OUT_RESP_HEAD = 'h'
|
|
OUT_RESP_BODY = 'b'
|
|
|
|
OUTPUT_OPTIONS = frozenset({
|
|
OUT_REQ_HEAD,
|
|
OUT_REQ_BODY,
|
|
OUT_RESP_HEAD,
|
|
OUT_RESP_BODY
|
|
})
|
|
|
|
# Pretty
|
|
PRETTY_MAP = {
|
|
'all': ['format', 'colors'],
|
|
'colors': ['colors'],
|
|
'format': ['format'],
|
|
'none': []
|
|
}
|
|
PRETTY_STDOUT_TTY_ONLY = object()
|
|
|
|
|
|
DEFAULT_FORMAT_OPTIONS = [
|
|
'headers.sort:true',
|
|
'json.format:true',
|
|
'json.indent:4',
|
|
'json.sort_keys:true',
|
|
'xml.format:true',
|
|
'xml.indent:2',
|
|
]
|
|
SORTED_FORMAT_OPTIONS = [
|
|
'headers.sort:true',
|
|
'json.sort_keys:true',
|
|
]
|
|
SORTED_FORMAT_OPTIONS_STRING = ','.join(SORTED_FORMAT_OPTIONS)
|
|
UNSORTED_FORMAT_OPTIONS_STRING = ','.join(
|
|
option.replace('true', 'false') for option in SORTED_FORMAT_OPTIONS)
|
|
|
|
# Defaults
|
|
OUTPUT_OPTIONS_DEFAULT = OUT_RESP_HEAD + OUT_RESP_BODY
|
|
OUTPUT_OPTIONS_DEFAULT_STDOUT_REDIRECTED = OUT_RESP_BODY
|
|
OUTPUT_OPTIONS_DEFAULT_OFFLINE = OUT_REQ_HEAD + OUT_REQ_BODY
|
|
|
|
|
|
class RequestType(enum.Enum):
|
|
FORM = enum.auto()
|
|
MULTIPART = enum.auto()
|
|
JSON = enum.auto()
|