Добавлена сортировка образов в меню live

Mike Khiretskiy 9 years ago
parent c6bec0519b
commit b124e8c0f2

@ -131,12 +131,23 @@ class VariableClBuilderImageData(ReadonlyTableVariable):
return newname
raise VariableError(_("Failed to generate kernel name"))
parser = re.compile(r"^.*/(.*?)-(\d+)(-\d+)?-(x86_64|i686)\.iso$")
def sortkey(self, x):
m = self.parser.search(x)
if m:
return (m.group(1), m.group(2),
int(m.group(3)) if m.group(3) else 0, m.group(4))
else:
return (x,)
def generator(self, isopath):
n = 1
numbered = re.compile(r"^.*-(\d+)-(?:x86_64|i686)\.iso$")
for iso_image in [x for x in sorted(listDirectory(isopath,
fullPath=True))
if x.endswith('.iso')]:
for iso_image in sorted(
[x for x in listDirectory(isopath, fullPath=True)
if x.endswith('.iso')],
key=self.sortkey):
try:
with IsoDistributive(iso_image) as image:
dn = image.getDirectory()

Loading…
Cancel
Save