refactor based on feedback.
This commit is contained in:
parent
1649973800
commit
8dddbf4a61
@ -120,22 +120,18 @@ class table__n_a_m_e(DefaultTable.DefaultTable):
|
|||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def getBestDebugName(self, nameID):
|
def getBestDebugName(self, nameIDs):
|
||||||
for group in ((21, 16, 1), (22, 17, 2), (25, 4, 6)):
|
for nameID in nameIDs:
|
||||||
if nameID not in group:
|
name = self.getDebugName(nameID)
|
||||||
continue
|
if name is not None:
|
||||||
|
return name
|
||||||
for fallback_id in group:
|
|
||||||
name = self.getDebugName(fallback_id)
|
|
||||||
if name:
|
|
||||||
return name
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def getBestFamilyName(self):
|
def getBestFamilyName(self):
|
||||||
return self.getBestDebugName(21)
|
return self.getBestDebugName((21, 16, 1))
|
||||||
|
|
||||||
def getBestSubFamilyName(self):
|
def getBestSubFamilyName(self):
|
||||||
return self.getBestDebugName(22)
|
return self.getBestDebugName((22, 17, 2))
|
||||||
|
|
||||||
def getBestFullName(self):
|
def getBestFullName(self):
|
||||||
for nameIDs in ((21, 22), (16, 17), (1, 2), (4, ), (6, )):
|
for nameIDs in ((21, 22), (16, 17), (1, 2), (4, ), (6, )):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user