From c8443332dea3dcd868c5d7d4ec1ae0ea232d210d Mon Sep 17 00:00:00 2001 From: Jamie Quigley Date: Mon, 7 Sep 2020 17:31:42 +0100 Subject: [PATCH 1/3] Added flac-specific samplerate-bitdepth reporting for duplicate imports --- beets/ui/commands.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/beets/ui/commands.py b/beets/ui/commands.py index 56f9ad1f5..d9fe9dcf0 100755 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -465,9 +465,13 @@ def summarize_items(items, singleton): if items: average_bitrate = sum([item.bitrate for item in items]) / len(items) + if items[0].format == "FLAC": + sample_bits = u'{}kHz/{} bit'.format(items[0].samplerate, items[0].bitdepth) total_duration = sum([item.length for item in items]) total_filesize = sum([item.filesize for item in items]) summary_parts.append(u'{0}kbps'.format(int(average_bitrate / 1000))) + if items[0].format == "FLAC": + summary_parts.append(sample_bits) summary_parts.append(ui.human_seconds_short(total_duration)) summary_parts.append(ui.human_bytes(total_filesize)) From 1ab162743ac27be40277a9c33f88313b8751f294 Mon Sep 17 00:00:00 2001 From: Jamie Quigley Date: Mon, 7 Sep 2020 17:42:56 +0100 Subject: [PATCH 2/3] Convert to kHz and meet line limit --- 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 d9fe9dcf0..eb85485b6 100755 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -466,7 +466,8 @@ def summarize_items(items, singleton): if items: average_bitrate = sum([item.bitrate for item in items]) / len(items) if items[0].format == "FLAC": - sample_bits = u'{}kHz/{} bit'.format(items[0].samplerate, items[0].bitdepth) + sample_bits = u'{}kHz/{} bit'.format( + round(int(items[0].samplerate) / 1000, 1), items[0].bitdepth) total_duration = sum([item.length for item in items]) total_filesize = sum([item.filesize for item in items]) summary_parts.append(u'{0}kbps'.format(int(average_bitrate / 1000))) From e83959ab757103ab3f36d6bb8d0215d1084166ca Mon Sep 17 00:00:00 2001 From: Jamie Quigley Date: Mon, 7 Sep 2020 22:11:15 +0100 Subject: [PATCH 3/3] Add changelog item and merge if statements --- beets/ui/commands.py | 5 ++--- docs/changelog.rst | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/beets/ui/commands.py b/beets/ui/commands.py index eb85485b6..f34e5578f 100755 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -465,13 +465,12 @@ def summarize_items(items, singleton): if items: average_bitrate = sum([item.bitrate for item in items]) / len(items) - if items[0].format == "FLAC": - sample_bits = u'{}kHz/{} bit'.format( - round(int(items[0].samplerate) / 1000, 1), items[0].bitdepth) total_duration = sum([item.length for item in items]) total_filesize = sum([item.filesize for item in items]) summary_parts.append(u'{0}kbps'.format(int(average_bitrate / 1000))) if items[0].format == "FLAC": + sample_bits = u'{}kHz/{} bit'.format( + round(int(items[0].samplerate) / 1000, 1), items[0].bitdepth) summary_parts.append(sample_bits) summary_parts.append(ui.human_seconds_short(total_duration)) summary_parts.append(ui.human_bytes(total_filesize)) diff --git a/docs/changelog.rst b/docs/changelog.rst index bc03d772e..a9d2ac540 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -147,6 +147,7 @@ New features: be deleted after importing. Thanks to :user:`logan-arens`. :bug:`2947` +* Added flac-specific reporting of samplerate and bitrate when importing duplicates. Fixes: