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

Refactor Program.getPath disambiguation logic to .addDisambiguation

Browse Source
This commit is contained in:
Frederik “Freso” S. Olesen
2017-04-29 15:45:14 +02:00
parent b0d047ded1
commit 5ba3e924fb
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
whipper/common/program.py
View File

@@ -170,6 +170,14 @@ class Program:
def saveRipResult(self):
self._presult.persist()
def addDisambiguation(self, template_part, metadata):
"Add disambiguation to template path part string."
if metadata.catalogNumber:
template_part += ' (%s)' % metadata.catalogNumber
elif metadata.barcode:
template_part += ' (%s)' % metadata.barcode
return template_part
def getPath(self, outdir, template, mbdiscid, i, disambiguate=False):
"""
Based on the template, get a complete path for the given track,
@@ -246,17 +254,11 @@ class Program:
# Find the section of the template with the release name
for i, part in enumerate(templateParts):
if "%d" in part:
if self.metadata.catalogNumber:
templateParts[i] += ' (%s)' % self.metadata.catalogNumber
elif self.metadata.barcode:
templateParts[i] += ' (%s)' % self.metadata.barcode
templateParts[i] = self.addDisambiguation(part, self.metadata)
break
else:
# No parts of the template contain the release
if self.metadata.catalogNumber:
templateParts[-1] += ' (%s)' % self.metadata.catalogNumber
elif self.metadata.barcode:
templateParts[-1] += ' (%s)' % self.metadata.barcode
templateParts[-1] = self.addDisambiguation(templateParts[-1], self.metadata)
template = os.path.join(*templateParts)
logger.debug('Disambiguated template to %r' % template)