mirror of
https://github.com/httpie/cli.git
synced 2024-11-23 00:03:18 +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>
209 lines
6.5 KiB
Python
209 lines
6.5 KiB
Python
from abc import ABCMeta, abstractmethod
|
|
from itertools import chain
|
|
from typing import Callable, Iterable, Union
|
|
|
|
from .processing import Conversion, Formatting
|
|
from ..context import Environment
|
|
from ..encoding import smart_decode, smart_encode, UTF8
|
|
from ..models import HTTPMessage
|
|
|
|
|
|
BINARY_SUPPRESSED_NOTICE = (
|
|
b'\n'
|
|
b'+-----------------------------------------+\n'
|
|
b'| NOTE: binary data not shown in terminal |\n'
|
|
b'+-----------------------------------------+'
|
|
)
|
|
|
|
|
|
class DataSuppressedError(Exception):
|
|
message = None
|
|
|
|
|
|
class BinarySuppressedError(DataSuppressedError):
|
|
"""An error indicating that the body is binary and won't be written,
|
|
e.g., for terminal output)."""
|
|
message = BINARY_SUPPRESSED_NOTICE
|
|
|
|
|
|
class BaseStream(metaclass=ABCMeta):
|
|
"""Base HTTP message output stream class."""
|
|
|
|
def __init__(
|
|
self,
|
|
msg: HTTPMessage,
|
|
with_headers=True,
|
|
with_body=True,
|
|
on_body_chunk_downloaded: Callable[[bytes], None] = None
|
|
):
|
|
"""
|
|
:param msg: a :class:`models.HTTPMessage` subclass
|
|
:param with_headers: if `True`, headers will be included
|
|
:param with_body: if `True`, body will be included
|
|
|
|
"""
|
|
assert with_headers or with_body
|
|
self.msg = msg
|
|
self.with_headers = with_headers
|
|
self.with_body = with_body
|
|
self.on_body_chunk_downloaded = on_body_chunk_downloaded
|
|
|
|
def get_headers(self) -> bytes:
|
|
"""Return the headers' bytes."""
|
|
return self.msg.headers.encode()
|
|
|
|
@abstractmethod
|
|
def iter_body(self) -> Iterable[bytes]:
|
|
"""Return an iterator over the message body."""
|
|
|
|
def __iter__(self) -> Iterable[bytes]:
|
|
"""Return an iterator over `self.msg`."""
|
|
if self.with_headers:
|
|
yield self.get_headers()
|
|
yield b'\r\n\r\n'
|
|
|
|
if self.with_body:
|
|
try:
|
|
for chunk in self.iter_body():
|
|
yield chunk
|
|
if self.on_body_chunk_downloaded:
|
|
self.on_body_chunk_downloaded(chunk)
|
|
except DataSuppressedError as e:
|
|
if self.with_headers:
|
|
yield b'\n'
|
|
yield e.message
|
|
|
|
|
|
class RawStream(BaseStream):
|
|
"""The message is streamed in chunks with no processing."""
|
|
|
|
CHUNK_SIZE = 1024 * 100
|
|
CHUNK_SIZE_BY_LINE = 1
|
|
|
|
def __init__(self, chunk_size=CHUNK_SIZE, **kwargs):
|
|
super().__init__(**kwargs)
|
|
self.chunk_size = chunk_size
|
|
|
|
def iter_body(self) -> Iterable[bytes]:
|
|
return self.msg.iter_body(self.chunk_size)
|
|
|
|
|
|
class EncodedStream(BaseStream):
|
|
"""Encoded HTTP message stream.
|
|
|
|
The message bytes are converted to an encoding suitable for
|
|
`self.env.stdout`. Unicode errors are replaced and binary data
|
|
is suppressed. The body is always streamed by line.
|
|
|
|
"""
|
|
CHUNK_SIZE = 1
|
|
|
|
def __init__(
|
|
self,
|
|
env=Environment(),
|
|
mime_overwrite: str = None,
|
|
encoding_overwrite: str = None,
|
|
**kwargs
|
|
):
|
|
super().__init__(**kwargs)
|
|
self.mime = mime_overwrite or self.msg.content_type
|
|
self.encoding = encoding_overwrite or self.msg.encoding
|
|
if env.stdout_isatty:
|
|
# Use the encoding supported by the terminal.
|
|
output_encoding = env.stdout_encoding
|
|
else:
|
|
# Preserve the message encoding.
|
|
output_encoding = self.msg.encoding
|
|
# Default to UTF-8 when unsure.
|
|
self.output_encoding = output_encoding or UTF8
|
|
|
|
def iter_body(self) -> Iterable[bytes]:
|
|
for line, lf in self.msg.iter_lines(self.CHUNK_SIZE):
|
|
if b'\0' in line:
|
|
raise BinarySuppressedError()
|
|
line = smart_decode(line, self.encoding)
|
|
yield smart_encode(line, self.output_encoding) + lf
|
|
|
|
|
|
class PrettyStream(EncodedStream):
|
|
"""In addition to :class:`EncodedStream` behaviour, this stream applies
|
|
content processing.
|
|
|
|
Useful for long-lived HTTP responses that stream by lines
|
|
such as the Twitter streaming API.
|
|
|
|
"""
|
|
|
|
CHUNK_SIZE = 1
|
|
|
|
def __init__(
|
|
self, conversion: Conversion,
|
|
formatting: Formatting,
|
|
**kwargs,
|
|
):
|
|
super().__init__(**kwargs)
|
|
self.formatting = formatting
|
|
self.conversion = conversion
|
|
|
|
def get_headers(self) -> bytes:
|
|
return self.formatting.format_headers(
|
|
self.msg.headers).encode(self.output_encoding)
|
|
|
|
def iter_body(self) -> Iterable[bytes]:
|
|
first_chunk = True
|
|
iter_lines = self.msg.iter_lines(self.CHUNK_SIZE)
|
|
for line, lf in iter_lines:
|
|
if b'\0' in line:
|
|
if first_chunk:
|
|
converter = self.conversion.get_converter(self.mime)
|
|
if converter:
|
|
body = bytearray()
|
|
# noinspection PyAssignmentToLoopOrWithParameter
|
|
for line, lf in chain([(line, lf)], iter_lines):
|
|
body.extend(line)
|
|
body.extend(lf)
|
|
self.mime, body = converter.convert(body)
|
|
assert isinstance(body, str)
|
|
yield self.process_body(body)
|
|
return
|
|
raise BinarySuppressedError()
|
|
yield self.process_body(line) + lf
|
|
first_chunk = False
|
|
|
|
def process_body(self, chunk: Union[str, bytes]) -> bytes:
|
|
if not isinstance(chunk, str):
|
|
# Text when a converter has been used,
|
|
# otherwise it will always be bytes.
|
|
chunk = smart_decode(chunk, self.encoding)
|
|
chunk = self.formatting.format_body(content=chunk, mime=self.mime)
|
|
return smart_encode(chunk, self.output_encoding)
|
|
|
|
|
|
class BufferedPrettyStream(PrettyStream):
|
|
"""The same as :class:`PrettyStream` except that the body is fully
|
|
fetched before it's processed.
|
|
|
|
Suitable regular HTTP responses.
|
|
|
|
"""
|
|
|
|
CHUNK_SIZE = 1024 * 10
|
|
|
|
def iter_body(self) -> Iterable[bytes]:
|
|
# Read the whole body before prettifying it,
|
|
# but bail out immediately if the body is binary.
|
|
converter = None
|
|
body = bytearray()
|
|
|
|
for chunk in self.msg.iter_body(self.CHUNK_SIZE):
|
|
if not converter and b'\0' in chunk:
|
|
converter = self.conversion.get_converter(self.mime)
|
|
if not converter:
|
|
raise BinarySuppressedError()
|
|
body.extend(chunk)
|
|
|
|
if converter:
|
|
self.mime, body = converter.convert(body)
|
|
|
|
yield self.process_body(body)
|