Adjusted image/map filenames

* Partition filenames should include '_pX_' instead of just '_X_'
* Trailing whitespace should be removed
This commit is contained in:
2Shirt 2018-09-03 21:39:32 -06:00
parent 7cfdddcfbd
commit dbf4559e14
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C

View file

@ -207,13 +207,17 @@ class DevObj(BaseObj):
self.prefix = '{m_size}_{model}'.format(
m_size=self.model_size,
model=self.model)
self.prefix = self.prefix.strip()
if self.parent:
# Add child device details
self.prefix += '_{c_num}_{c_size}{sep}{c_label}'.format(
c_num=self.path.replace(self.parent, ''),
c_num = self.path.replace(self.parent, '')
self.prefix += '_{c_prefix}{c_num}_{c_size}{sep}{c_label}'.format(
c_prefix='p' if len(c_num) == 1 else '',
c_num=c_num,
c_size=self.details.get('size', 'UNKNOWN'),
sep='_' if self.label else '',
c_label=self.label)
self.prefix = self.prefix.strip()
class DirObj(BaseObj):