Изменён вид списка устройств для авторазметки

pym/install/variables/autopartition.py

@@ -26,6 +26,7 @@ from calculate.lib.utils.files import (readLinesFile)
 from calculate.install.fs_manager import FileSystemManager
 from calculate.lib.utils.tools import Sizes, traverse
 from itertools import *
+import os
 
 from calculate.lib.cl_lang import setLocalTranslate, _
 from calculate.lib.variables.system import RootType
@@ -148,11 +149,14 @@ class VariableClAutopartitionDeviceData(ReadonlyTableVariable):
             for dev, _type, size, name in self.ZipVars(
                     'os_device_dev', 'os_device_type',
                     'os_device_size', 'os_device_name'):
+                hsize = humanreadableSize(size)
                 if not _type.startswith('raid'):
                     _type = "device"
+                    if not name:
+                        name = _("Unknown")
                 else:
                     raidname = _type.upper()
-                    name = "%s (%s)" % (raidname, humanreadableSize(size))
+                    name = raidname
                     _type = "raid"
 
                 yield [dev, _type, size, name]
@@ -205,8 +209,13 @@ class VariableClAutopartitionDevice(AutopartitionHelper, Variable):
         return []
 
     def choice(self):
-        return [(dev, name or _("Unknown")) for dev, name in self.ZipVars(
-            'cl_autopartition_device_dev', 'cl_autopartition_device_name')]
+        getname = lambda dev, name, size: "%s (%s, %s)" % (
+            dev, name, humanreadableSize(size)
+        )
+        return [(dev, getname(dev, name, size))
+                for dev, name, size in self.ZipVars(
+                'cl_autopartition_device_dev', 'cl_autopartition_device_name',
+                'cl_autopartition_device_size')]
 
     def checkNeeded(self, valuelist, usedDevices, agregationType):
         needDevices = list(set(usedDevices) - set(valuelist))

pym/install/variables/disk.py

@@ -1981,7 +1981,7 @@ class VariableOsInstallUefi(LocationHelper, Variable):
     def choice(self):
         deviceParentMap = self.ZipVars('os_device_dev',
                                        'os_device_efi', 'os_device_name')
-        return [(efidisk, "%s (%s)" % (name or _("Unknown"), dev))
+        return [(efidisk, "%s (%s)" % (dev, name or _("Unknown")))
                 for dev, efidisk, name in deviceParentMap
                 if efidisk]
 
@@ -2083,7 +2083,7 @@ class VariableOsInstallMbr(LocationHelper, Variable):
 
     def choice(self):
         deviceParentMap = self.ZipVars('os_device_mbr', 'os_device_name')
-        return [(mbrdisk, "%s (%s)" % (name or _("Unknown"), mbrdisk))
+        return [(mbrdisk, "%s (%s)" % (mbrdisk, name or _("Unknown")))
                 for mbrdisk, name in deviceParentMap
                 if mbrdisk]