From 2465f03337c5b71ed761c0d7cb73c9dbe4d9d7cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Sat, 29 Apr 2017 14:45:51 +0200 Subject: [PATCH] Add disambiguation to the end of template strings w/o "%d" --- whipper/common/program.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/whipper/common/program.py b/whipper/common/program.py index 9791ae8..93118be 100644 --- a/whipper/common/program.py +++ b/whipper/common/program.py @@ -251,6 +251,12 @@ class Program: elif self.metadata.barcode: templateParts[i] += ' (%s)' % self.metadata.barcode 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 template = os.path.join(*templateParts) logger.debug('Disambiguated template to %r' % template)