From 06b8b08d4b8dabb11b6188f34c3c9d5a24133817 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Thu, 18 May 2023 10:34:46 -0600 Subject: [PATCH] GUI: Simplify cleaning --- resources/wx_gui/gui_install_oc.py | 6 ++---- resources/wx_gui/gui_macos_installer_flash.py | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/resources/wx_gui/gui_install_oc.py b/resources/wx_gui/gui_install_oc.py index 00fbf092b..bc28e2e28 100644 --- a/resources/wx_gui/gui_install_oc.py +++ b/resources/wx_gui/gui_install_oc.py @@ -78,10 +78,8 @@ class InstallOCFrame(wx.Frame): # Disk images are mixed in with regular disks (ex. payloads.dmg) ignore = ["disk image", "read-only", "virtual"] for disk in self.available_disks.copy(): - for string in ignore: - if string in self.available_disks[disk]['name'].lower(): - del self.available_disks[disk] - break + if any(string in self.available_disks[disk]['name'].lower() for string in ignore): + del self.available_disks[disk] def _display_disks(self) -> None: diff --git a/resources/wx_gui/gui_macos_installer_flash.py b/resources/wx_gui/gui_macos_installer_flash.py index 544afcd04..8205daea5 100644 --- a/resources/wx_gui/gui_macos_installer_flash.py +++ b/resources/wx_gui/gui_macos_installer_flash.py @@ -158,10 +158,8 @@ class macOSInstallerFlashFrame(wx.Frame): # Disk images are mixed in with regular disks (ex. payloads.dmg) ignore = ["disk image", "read-only", "virtual"] for disk in self.available_disks.copy(): - for string in ignore: - if string in self.available_disks[disk]['name'].lower(): - del self.available_disks[disk] - break + if any(string in self.available_disks[disk]['name'].lower() for string in ignore): + del self.available_disks[disk] thread = threading.Thread(target=_fetch_disks)