[Yum-devel] [PATCH] Make "yum list kmod\*" look better (ie. repoid is always overflowing)

[seth vidal]

On Fri, 2010-06-18 at 14:54 -0400, James Antill wrote:
> ---
>  output.py |   20 ++++++++++++++++++--
>  1 files changed, 18 insertions(+), 2 deletions(-)
> 
> diff --git a/output.py b/output.py
> index d4c0d96..4eddecd 100755
> --- a/output.py
> +++ b/output.py
> @@ -379,10 +379,22 @@ class YumOutput:
>          for d in range(0, cols):
>              data[d] = sorted(pdata[d].items())
>  
> +        #  We start allocating 1 char to everything but the last column, and a
> +        # space between each (again, except for the last column). Because
> +        # at worst we are better with:
> +        # |one two three|
> +        # | four        |
> +        # ...than:
> +        # |one two three|
> +        # |            f|
> +        # |our          |
> +        # ...the later being what we get if we pre-allocate the last column, and
> +        # thus. the space, due to "three" overflowing it's column by 2 chars.
>          if columns is None:
> -            columns = [1] * cols
> +            columns = [1] * (cols - 1)
> +            columns.append(0)
>  
> -        total_width -= (sum(columns) + (cols - 1) + utf8_width(indent))
> +        total_width -= ((2 * (cols - 1)) - 1 + utf8_width(indent))
>          while total_width > 0:
>              # Find which field all the spaces left will help best
>              helps = 0
> @@ -406,6 +418,10 @@ class YumOutput:
>              # that column and start again with any remaining space.
>              if helps:
>                  diff = data[val].pop(0)[0] - columns[val]
> +                if not columns[val] and (val == (cols - 1)):
> +                    #  If we are going from 0 => N on the last column, take 1
> +                    # for the space before the column.
> +                    total_width  -= 1
>                  columns[val] += diff
>                  total_width  -= diff
>                  continue


ACK - but for the record - the ts list output code is making me want to
cry. It's complexity seems to be increasing more and more.

-sv