RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplified lambda and made it filter out non relevant disks for the selection process.

This commit is contained in:
Anton Hvornum 2021-09-04 17:03:52 +02:00
parent 1814a19d6a
commit 429006fe4b
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archinstall/lib/disk.py
View File

@ -75,6 +75,11 @@ def sort_block_devices_based_on_performance(block_devices):
return result return result
def filter_disks_below_size_in_gb(devices, gigabytes):
for disk in devices:
if disk.size >= gigabytes:
yield disk
def select_largest_device(devices, gigabytes, filter_out=None): def select_largest_device(devices, gigabytes, filter_out=None):
if not filter_out: if not filter_out:
filter_out = [] filter_out = []
@ -84,10 +89,12 @@ def select_largest_device(devices, gigabytes, filter_out=None):
if filter_device in copy_devices: if filter_device in copy_devices:
copy_devices.pop(copy_devices.index(filter_device)) copy_devices.pop(copy_devices.index(filter_device))
copy_devices = list(filter_disks_below_size_in_gb(copy_devices, gigabytes))
if not len(copy_devices): if not len(copy_devices):
return None return None
return max(copy_devices, key=(lambda device : device.size if device.size > gigabytes else 0)) return max(copy_devices, key=(lambda device : device.size))
def select_disk_larger_than_or_close_to(devices, gigabytes, filter_out=None): def select_disk_larger_than_or_close_to(devices, gigabytes, filter_out=None):
if not filter_out: if not filter_out: