qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Eric Blake <eblake@redhat.com>
To: John Snow <jsnow@redhat.com>
Cc: Eduardo Habkost <eduardo@habkost.net>,
	Kevin Wolf <kwolf@redhat.com>, Thomas Huth <thuth@redhat.com>,
	Beraldo Leal <bleal@redhat.com>,
	qemu-block@nongnu.org, qemu-devel@nongnu.org,
	Hanna Reitz <hreitz@redhat.com>, Cleber Rosa <crosa@redhat.com>
Subject: Re: [PATCH 1/4] python/utils: add enboxify() text decoration utility
Date: Tue, 15 Feb 2022 16:55:02 -0600	[thread overview]
Message-ID: <20220215225502.uuqqjkbbhqwuajn2@redhat.com> (raw)
In-Reply-To: <20220215220853.4179173-2-jsnow@redhat.com>

On Tue, Feb 15, 2022 at 05:08:50PM -0500, John Snow wrote:
> >>> print(enboxify(msg, width=72, name="commit message"))
> ┏━ commit message ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
> ┃ enboxify() takes a chunk of text and wraps it in a text art box that ┃
> ┃  adheres to a specified width. An optional title label may be given, ┃
> ┃  and any of the individual glyphs used to draw the box may be        ┃

Why do these two lines have a leading space,

> ┃ replaced or specified as well.                                       ┃

but this one doesn't?  It must be an off-by-one corner case when your
choice of space to wrap on is exactly at the wrap column.

> ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  python/qemu/utils/__init__.py | 58 +++++++++++++++++++++++++++++++++++
>  1 file changed, 58 insertions(+)
> 
> diff --git a/python/qemu/utils/__init__.py b/python/qemu/utils/__init__.py
> index 7f1a5138c4b..f785316f230 100644
> --- a/python/qemu/utils/__init__.py
> +++ b/python/qemu/utils/__init__.py
> @@ -15,7 +15,10 @@
>  # the COPYING file in the top-level directory.
>  #
>  
> +import os
>  import re
> +import shutil
> +import textwrap
>  from typing import Optional
>  
>  # pylint: disable=import-error
> @@ -23,6 +26,7 @@
>  
>  
>  __all__ = (
> +    'enboxify',
>      'get_info_usernet_hostfwd_port',
>      'kvm_available',
>      'list_accel',
> @@ -43,3 +47,57 @@ def get_info_usernet_hostfwd_port(info_usernet_output: str) -> Optional[int]:
>          if match is not None:
>              return int(match[1])
>      return None
> +
> +
> +# pylint: disable=too-many-arguments
> +def enboxify(
> +        content: str = '',
> +        width: Optional[int] = None,
> +        name: Optional[str] = None,
> +        padding: int = 1,
> +        upper_left: str = '┏',
> +        upper_right: str = '┓',
> +        lower_left: str = '┗',
> +        lower_right: str = '┛',
> +        horizontal: str = '━',
> +        vertical: str = '┃',
> +) -> str:
> +    """
> +    Wrap some text into a text art box of a given width.
> +
> +    :param content: The text to wrap into a box.
> +    :param width: The number of columns (including the box itself).
> +    :param name: A label to apply to the upper-left of the box.
> +    :param padding: How many columns of padding to apply inside.
> +    """

Where's theh :param docs for the 6 custom glyphs?

> +    if width is None:
> +        width = shutil.get_terminal_size()[0]
> +    prefix = vertical + (' ' * padding)
> +    suffix = (' ' * padding) + vertical
> +    lwidth = width - len(suffix)
> +
> +    def _bar(name: Optional[str], top: bool = True) -> str:
> +        ret = upper_left if top else lower_left
> +        right = upper_right if top else lower_right
> +        if name is not None:
> +            ret += f"{horizontal} {name} "
> +
> +        assert width is not None
> +        filler_len = width - len(ret) - len(right)
> +        ret += f"{horizontal * filler_len}{right}"
> +        return ret
> +
> +    def _wrap(line: str) -> str:
> +        return os.linesep.join([
> +            wrapped_line.ljust(lwidth) + suffix
> +            for wrapped_line in textwrap.wrap(
> +                    line, width=lwidth, initial_indent=prefix,
> +                    subsequent_indent=prefix, replace_whitespace=False,
> +                    drop_whitespace=False, break_on_hyphens=False)

Always nice when someone else has written the cool library function to
do all the hard work for you ;)  But this is probably where you have the off-by-one I called out above.

> +        ])
> +
> +    return os.linesep.join((
> +        _bar(name, top=True),
> +        os.linesep.join(_wrap(line) for line in content.splitlines()),
> +        _bar(None, top=False),
> +    ))
> -- 
> 2.34.1
> 
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org



  reply	other threads:[~2022-02-15 22:57 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-15 22:08 [PATCH 0/4] iotests: add detailed tracebacks to qemu_img() failures John Snow
2022-02-15 22:08 ` [PATCH 1/4] python/utils: add enboxify() text decoration utility John Snow
2022-02-15 22:55   ` Eric Blake [this message]
2022-02-15 23:53     ` John Snow
2022-02-15 23:57       ` Philippe Mathieu-Daudé via
2022-02-16 16:16         ` John Snow
2022-02-16 16:54           ` Hanna Reitz
2022-02-15 22:08 ` [PATCH 2/4] iotests: add VerboseProcessError John Snow
2022-02-15 22:58   ` Eric Blake
2022-02-15 23:54     ` John Snow
2022-02-15 22:08 ` [PATCH 3/4] iotests: Remove explicit checks for qemu_img() == 0 John Snow
2022-02-15 23:04   ` Eric Blake
2022-02-15 23:57     ` John Snow
2022-02-15 22:08 ` [PATCH 4/4] iotests: make qemu_img raise on non-zero rc by default John Snow
2022-02-15 23:09   ` Eric Blake
2022-02-16  0:02     ` John Snow

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220215225502.uuqqjkbbhqwuajn2@redhat.com \
    --to=eblake@redhat.com \
    --cc=bleal@redhat.com \
    --cc=crosa@redhat.com \
    --cc=eduardo@habkost.net \
    --cc=hreitz@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).