From 399fdc97932210f7710a1ce6b3e5c73bf49723f8 Mon Sep 17 00:00:00 2001 From: jams2 Date: Tue, 19 Jun 2018 09:11:55 +0100 Subject: [PATCH 1/6] add space-padding to missing tracks dialog --- beets/ui/commands.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/beets/ui/commands.py b/beets/ui/commands.py index 71dd8fef03..ce1a46c3b5 100755 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -379,14 +379,14 @@ def format_index(track_info): len(match.extra_tracks) / len(match.info.tracks) )) for track_info in match.extra_tracks: - line = u' ! %s (#%s)' % (track_info.title, format_index(track_info)) + line = u' ! {0: <48} (#{1: >2})'.format(track_info.title, format_index(track_info)) if track_info.length: line += u' (%s)' % ui.human_seconds_short(track_info.length) print_(ui.colorize('text_warning', line)) if match.extra_items: print_(u'Unmatched tracks ({0}):'.format(len(match.extra_items))) for item in match.extra_items: - line = u' ! %s (#%s)' % (item.title, format_index(item)) + line = u' ! {0: <48} (#{1: >2})'.format(item.title, format_index(item)) if item.length: line += u' (%s)' % ui.human_seconds_short(item.length) print_(ui.colorize('text_warning', line)) From 15b53f26ed7c4a3542aa5bb39fe5eac4dfc7ad31 Mon Sep 17 00:00:00 2001 From: jams2 Date: Tue, 19 Jun 2018 09:22:00 +0100 Subject: [PATCH 2/6] update changelog.rst --- docs/changelog.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 140f674f42..bb21f21be3 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -14,6 +14,8 @@ New features: and Winamp. Thanks to :user:`mz2212`. :bug:`2944` +* Added whitespace padding to missing tracks dialog to improve readability. + :user:`jams2` Fixes: From e0853683268c3b3e0082eae57c404c141bc1b368 Mon Sep 17 00:00:00 2001 From: jams2 Date: Tue, 19 Jun 2018 09:45:50 +0100 Subject: [PATCH 3/6] fix style --- beets/ui/commands.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/beets/ui/commands.py b/beets/ui/commands.py index ce1a46c3b5..c05a70dc94 100755 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -379,7 +379,8 @@ def format_index(track_info): len(match.extra_tracks) / len(match.info.tracks) )) for track_info in match.extra_tracks: - line = u' ! {0: <48} (#{1: >2})'.format(track_info.title, format_index(track_info)) + line = u' ! {0: <48} (#{1: >2})'.format(track_info.title, + format_index(track_info)) if track_info.length: line += u' (%s)' % ui.human_seconds_short(track_info.length) print_(ui.colorize('text_warning', line)) From df2172baaa9e5689f0471f9ac50a927e5e8f06f4 Mon Sep 17 00:00:00 2001 From: jams2 Date: Wed, 20 Jun 2018 12:55:51 +0100 Subject: [PATCH 4/6] add variable width justification to missing tracks dialog --- beets/ui/commands.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/beets/ui/commands.py b/beets/ui/commands.py index c05a70dc94..14a942496f 100755 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -378,16 +378,20 @@ def format_index(track_info): len(match.info.tracks), len(match.extra_tracks) / len(match.info.tracks) )) + trackname_width = max([len(x.title) for x in match.extra_tracks]) for track_info in match.extra_tracks: - line = u' ! {0: <48} (#{1: >2})'.format(track_info.title, - format_index(track_info)) + line = u' ! {0: <{width}} (#{1: >2})'.format(track_info.title, + format_index(track_info), + width=trackname_width) if track_info.length: line += u' (%s)' % ui.human_seconds_short(track_info.length) print_(ui.colorize('text_warning', line)) if match.extra_items: print_(u'Unmatched tracks ({0}):'.format(len(match.extra_items))) for item in match.extra_items: - line = u' ! {0: <48} (#{1: >2})'.format(item.title, format_index(item)) + line = u' ! {0: <{width}} (#{1: >2})'.format(item.title, + format_index(item), + width=trackname_width) if item.length: line += u' (%s)' % ui.human_seconds_short(item.length) print_(ui.colorize('text_warning', line)) From b6947ddc2e5f3da91832854ab758008c68462edc Mon Sep 17 00:00:00 2001 From: jams2 Date: Wed, 20 Jun 2018 18:07:03 +0100 Subject: [PATCH 5/6] change ui.commands.show_change to align missing tracks by length of longest track name to print --- beets/ui/commands.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/beets/ui/commands.py b/beets/ui/commands.py index 14a942496f..6ead78bec5 100755 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -378,20 +378,21 @@ def format_index(track_info): len(match.info.tracks), len(match.extra_tracks) / len(match.info.tracks) )) - trackname_width = max([len(x.title) for x in match.extra_tracks]) + pad_width = max([len(x.title) for x in match.extra_tracks]) for track_info in match.extra_tracks: line = u' ! {0: <{width}} (#{1: >2})'.format(track_info.title, - format_index(track_info), - width=trackname_width) + format_index(track_info), + width=pad_width) if track_info.length: line += u' (%s)' % ui.human_seconds_short(track_info.length) print_(ui.colorize('text_warning', line)) if match.extra_items: print_(u'Unmatched tracks ({0}):'.format(len(match.extra_items))) + pad_width = max([len(x.title) for x in match.extra_items]) for item in match.extra_items: line = u' ! {0: <{width}} (#{1: >2})'.format(item.title, - format_index(item), - width=trackname_width) + format_index(item), + width=pad_width) if item.length: line += u' (%s)' % ui.human_seconds_short(item.length) print_(ui.colorize('text_warning', line)) From 68590e10ab4135ee32b4cd1270ebed18bb20ea36 Mon Sep 17 00:00:00 2001 From: jams2 Date: Wed, 20 Jun 2018 18:21:04 +0100 Subject: [PATCH 6/6] remove unnecessary list comp, add descriptive variable names --- beets/ui/commands.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/beets/ui/commands.py b/beets/ui/commands.py index 6ead78bec5..6adc277863 100755 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -378,7 +378,8 @@ def format_index(track_info): len(match.info.tracks), len(match.extra_tracks) / len(match.info.tracks) )) - pad_width = max([len(x.title) for x in match.extra_tracks]) + pad_width = max(len(track_info.title) for track_info in + match.extra_tracks) for track_info in match.extra_tracks: line = u' ! {0: <{width}} (#{1: >2})'.format(track_info.title, format_index(track_info), @@ -388,7 +389,7 @@ def format_index(track_info): print_(ui.colorize('text_warning', line)) if match.extra_items: print_(u'Unmatched tracks ({0}):'.format(len(match.extra_items))) - pad_width = max([len(x.title) for x in match.extra_items]) + pad_width = max(len(item.title) for item in match.extra_items) for item in match.extra_items: line = u' ! {0: <{width}} (#{1: >2})'.format(item.title, format_index(item),