From: Plom Heller Date: Sat, 30 May 2026 00:38:15 +0000 (+0200) Subject: Print newlines between multi-line collections listings. X-Git-Url: https://plomlompom.com/repos/booking/task?a=commitdiff_plain;h=ea756cddd723ba27b0a060829ccec053e5bc07dd;p=bricksplom Print newlines between multi-line collections listings. --- diff --git a/bricksplom.py b/bricksplom.py index aa71449..b5c9f35 100755 --- a/bricksplom.py +++ b/bricksplom.py @@ -330,7 +330,7 @@ class Collection(Textfiled, WithDb, Lookupable): def raw( self ) -> str: - return (f'{self.id_} {self._is_in_str}{self.description}\n' + return (f'{self.id_} {self._is_in_str}{self.description}{CHAR_NEWLINE}' + self._format_paginated(lambda count, p_id, comment: f' {count:2} {p_id:>7} {comment}')) @@ -357,7 +357,7 @@ class Collection(Textfiled, WithDb, Lookupable): lines += [' -'] for count, piece_id, comment in column: lines += [format_line(count, piece_id, comment)] - return '\n'.join(lines) + return CHAR_NEWLINE.join(lines) + CHAR_NEWLINE def piece_listings_flat(self) -> tuple[PieceListing, ...]: 'Flattened variant of .piece_listings, no division into pages/cols.' @@ -402,7 +402,7 @@ class Collection(Textfiled, WithDb, Lookupable): f'{color} {self._db.designs[design_id].description}' f'{tail_comment}') - return f'{self}\n\n{self._format_paginated(format_line)}' + return f'{self}{CHAR_NEWLINE}{self._format_paginated(format_line)}' class Box(WithDb, Lookupable): @@ -447,7 +447,7 @@ class Box(WithDb, Lookupable): for count, piece_id, comment in listings: color = self._db.colors[self._db.pieces[piece_id].color_id] lines += [f'{count:>2}× {piece_id:>7} / {color} # {comment}'] - return '\n'.join(lines) + return CHAR_NEWLINE.join(lines) def raw( self @@ -583,7 +583,7 @@ def main( parser.add_argument('inquiry', nargs='?', default=CHAR_INQUIRY) parser.add_argument('--raw', action='store_true') args = parser.parse_args() - print(db.lookup(args.table, args.inquiry, args.raw)) + print(db.lookup(args.table, args.inquiry, args.raw).rstrip()) main()