benya/whipper-gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #660 from CommandMC/feat/multiple-catalognums

Browse Source 
Support releases with multiple catalog numbers
This commit is contained in:
Merlijn Wajer
2026-02-07 12:41:23 +01:00
committed by GitHub
parent 57a59f2840 65e9439d45
commit bf8fe39d6b
5 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
whipper/common/program.py
View File

@@ -151,8 +151,8 @@ class Program:
@staticmethod
def addDisambiguation(template_part, metadata):
"""Add disambiguation to template path part string."""
if metadata.catalogNumber:
template_part += ' (%s)' % metadata.catalogNumber
if metadata.catalogNumbers:
template_part += ' (%s)' % ', '.join(metadata.catalogNumbers)
elif metadata.barcode:
template_part += ' (%s)' % metadata.barcode
return template_part
@@ -221,7 +221,7 @@ class Program:
v['d'] = metadata.releaseTitle
v['D'] = metadata.title
v['B'] = metadata.barcode
v['C'] = metadata.catalogNumber
v['C'] = ', '.join(metadata.catalogNumbers)
v['c'] = metadata.releaseDisambCmt
v['M'] = metadata.discTotal
v['N'] = metadata.discNumber
@@ -332,20 +332,20 @@ class Program:
print('\nMatching releases:')
for metadata in metadatas:
print('\nArtist : %s' % metadata.artist)
print('Title : %s' % metadata.releaseTitle)
print('Duration: %s' % common.formatTime(
print('\nArtist : %s' % metadata.artist)
print('Title : %s' % metadata.releaseTitle)
print('Duration : %s' % common.formatTime(
metadata.duration / 1000.0))
print('URL : %s' % metadata.url)
print('Release : %s' % metadata.mbid)
print('Type : %s' % metadata.releaseType)
print('URL : %s' % metadata.url)
print('Release : %s' % metadata.mbid)
print('Type : %s' % metadata.releaseType)
if metadata.barcode:
print("Barcode : %s" % metadata.barcode)
print("Barcode : %s" % metadata.barcode)
if metadata.countries:
print("Country : %s" % ', '.join(metadata.countries))
print("Country : %s" % ', '.join(metadata.countries))
# TODO: Add test for non ASCII catalog numbers: see issue #215
if metadata.catalogNumber:
print("Cat no : %s" % metadata.catalogNumber)
if metadata.catalogNumbers:
print("Cat no(s): %s" % ', '.join(metadata.catalogNumbers))
delta = abs(metadata.duration - ittoc.duration())
if delta not in deltas: