Merge pull request #1285 from mwhudson/extended-part-display

indent logical partitions and gaps in extended partitions
This commit is contained in:
Michael Hudson-Doyle 2022-04-29 13:59:39 +12:00 committed by GitHub
commit e0f9ae5b22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions

View File

@ -176,16 +176,23 @@ def _label_just_name(device, *, short=False):
@label.register(Partition) @label.register(Partition)
def _label_partition(partition, *, short=False): def _label_partition(partition, *, short=False):
if short: if partition.flag == "logical":
return _("partition {number}").format(number=partition._number) p = " "
else: else:
return _("partition {number} of {device}").format( p = ""
if short:
return p + _("partition {number}").format(number=partition._number)
else:
return p + _("partition {number} of {device}").format(
number=partition._number, device=label(partition.device)) number=partition._number, device=label(partition.device))
@label.register(gaps.Gap) @label.register(gaps.Gap)
def _label_gap(gap, *, short=False): def _label_gap(gap, *, short=False):
return _("free space") r = _("free space")
if gap.in_extended:
r = " " + r
return r
def _usage_labels_generic(device, *, exclude_final_unused=False): def _usage_labels_generic(device, *, exclude_final_unused=False):