From cea721a33ac0fd43b1a2ffe0c8a63f613dfd9485 Mon Sep 17 00:00:00 2001 From: Dhinak G <17605561+dhinakg@users.noreply.github.com> Date: Fri, 29 Aug 2025 20:16:38 -0400 Subject: [PATCH] GUI: Update messages for installer download --- .../wx_gui/gui_macos_installer_download.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/opencore_legacy_patcher/wx_gui/gui_macos_installer_download.py b/opencore_legacy_patcher/wx_gui/gui_macos_installer_download.py index 8f7101758..dcf3eefa2 100644 --- a/opencore_legacy_patcher/wx_gui/gui_macos_installer_download.py +++ b/opencore_legacy_patcher/wx_gui/gui_macos_installer_download.py @@ -136,14 +136,12 @@ class macOSInstallerDownloadFrame(wx.Frame): # Grab installer catalog def _fetch_installers(): - logging.info(f"Fetching installer catalog: {sucatalog.SeedType.DeveloperSeed.name}") - - sucatalog_contents = sucatalog.CatalogURL(seed=sucatalog.SeedType.DeveloperSeed).url_contents - if sucatalog_contents is None: - logging.error("Failed to download Installer Catalog from Apple") - return + logging.info(f"Fetching AppleDB products") self.catalog_products = sucatalog.AppleDBProducts(self.constants) + if self.catalog_products.data is None: + logging.error("Failed to fetch installers from AppleDB") + return self.available_installers = self.catalog_products.products self.available_installers_latest = self.catalog_products.latest_products @@ -192,7 +190,7 @@ class macOSInstallerDownloadFrame(wx.Frame): if installers: locale.setlocale(locale.LC_TIME, '') - logging.info(f"Available installers on SUCatalog ({'All entries' if show_full else 'Latest only'}):") + logging.info(f"Available installers from AppleDB ({'All entries' if show_full else 'Latest only'}):") for item in installers: logging.info(f"- {item['Title']} ({item['Version']} - {item['Build']}):\n - Size: {utilities.human_fmt(item['InstallAssistant']['Size'])}\n - Link: {item['InstallAssistant']['URL']}\n") index = self.list.InsertItem(self.list.GetItemCount(), f"{item['Title']}") @@ -202,8 +200,8 @@ class macOSInstallerDownloadFrame(wx.Frame): self.list.SetItem(index, 3, utilities.human_fmt(item['InstallAssistant']['Size'])) self.list.SetItem(index, 4, item['PostDate'].strftime("%x")) else: - logging.error("No installers found on SUCatalog") - wx.MessageDialog(self.frame_modal, "Failed to download Installer Catalog from Apple", "Error", wx.OK | wx.ICON_ERROR).ShowModal() + logging.error("No installers found from AppleDB") + wx.MessageDialog(self.frame_modal, "Failed to fetch installers from AppleDB", "Error", wx.OK | wx.ICON_ERROR).ShowModal() if show_full is False: self.list.Select(-1)