diff --git a/resources/sys_patch/sys_patch_auto.py b/resources/sys_patch/sys_patch_auto.py index d6276de29..683ff6035 100644 --- a/resources/sys_patch/sys_patch_auto.py +++ b/resources/sys_patch/sys_patch_auto.py @@ -62,7 +62,12 @@ class AutomaticSysPatch: url = "https://api.github.com/repos/dortania/OpenCore-Legacy-Patcher/releases/latest" response = requests.get(url).json() - changelog = response["body"].split("## Asset Information")[0] + try: + changelog = response["body"].split("## Asset Information")[0] + except: #if user constantly checks for updates, github will rate limit them + changelog = """## Unable to fetch changelog + +Please check the Github page for more information about this release.""" html_markdown = markdown2.markdown(changelog) html_css = """ @@ -84,20 +89,20 @@ class AutomaticSysPatch: @media (prefers-color-scheme: dark) { body { color: #fff; - background-color: rgb(47,47,47); + background-color: rgb(47,47,47); } - + } """ - frame = wx.Dialog(None, -1, title="", size=(600, 500)) - frame.SetMinSize((600, 500)) + frame = wx.Dialog(None, -1, title="", size=(650, 500)) + frame.SetMinSize((650, 500)) frame.SetWindowStyle(wx.STAY_ON_TOP) panel = wx.Panel(frame) sizer = wx.BoxSizer(wx.VERTICAL) sizer.AddSpacer(10) self.title_text = wx.StaticText(panel, label="A new version of OpenCore Legacy Patcher is available!") - self.description = wx.StaticText(panel, label=f"OpenCore Legacy Patcher {version} is now available - You have {self.constants.patcher_version}. Would you like to update?") + self.description = wx.StaticText(panel, label=f"OpenCore Legacy Patcher {version} is now available - You have {self.constants.patcher_version}{' (Nightly)' if not self.constants.commit_info[0].startswith('refs/tags') else ''}. Would you like to update?") self.title_text.SetFont(wx.Font(19, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, ".AppleSystemUIFont")) self.description.SetFont(wx.Font(13, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, ".AppleSystemUIFont")) self.web_view = wx.html2.WebView.New(panel, style=wx.BORDER_SUNKEN) @@ -126,14 +131,14 @@ class AutomaticSysPatch: frame.Centre() result = frame.ShowModal() - + if result == ID_GITHUB: webbrowser.open(dict["Github Link"]) elif result == ID_UPDATE: gui_entry.EntryPoint(self.constants).start(entry=gui_entry.SupportedEntryPoints.UPDATE_APP) - + return if utilities.check_seal() is True: diff --git a/resources/wx_gui/gui_entry.py b/resources/wx_gui/gui_entry.py index f7d2764cf..c15791d71 100644 --- a/resources/wx_gui/gui_entry.py +++ b/resources/wx_gui/gui_entry.py @@ -58,7 +58,7 @@ class EntryPoint: self.frame: wx.Frame = entry( None, - title=f"{self.constants.patcher_name} ({self.constants.patcher_version})", + title=f"{self.constants.patcher_name} {self.constants.patcher_version}{' (Nightly)' if not self.constants.commit_info[0].startswith('refs/tags') else ''}", global_constants=self.constants, screen_location=None, **({"patches": patches} if "--gui_patch" in sys.argv or "--gui_unpatch" in sys.argv else {}) diff --git a/resources/wx_gui/gui_main_menu.py b/resources/wx_gui/gui_main_menu.py index d235bf69c..50f56edeb 100644 --- a/resources/wx_gui/gui_main_menu.py +++ b/resources/wx_gui/gui_main_menu.py @@ -70,7 +70,7 @@ class MainFrame(wx.Frame): """ # Title label: OpenCore Legacy Patcher v{X.Y.Z} - title_label = wx.StaticText(self, label=f"OpenCore Legacy Patcher {'' if self.constants.special_build else 'v'}{self.constants.patcher_version}", pos=(-1, 10)) + title_label = wx.StaticText(self, label=f"OpenCore Legacy Patcher {'' if self.constants.special_build else ''}{self.constants.patcher_version}{' (Nightly)' if not self.constants.commit_info[0].startswith('refs/tags') else ''}", pos=(-1, 10)) title_label.SetFont(gui_support.font_factory(19, wx.FONTWEIGHT_BOLD)) title_label.Centre(wx.HORIZONTAL) @@ -345,7 +345,12 @@ class MainFrame(wx.Frame): url = "https://api.github.com/repos/dortania/OpenCore-Legacy-Patcher/releases/latest" response = requests.get(url).json() - changelog = response["body"].split("## Asset Information")[0] + try: + changelog = response["body"].split("## Asset Information")[0] + except: #if user constantly checks for updates, github will rate limit them + changelog = """## Unable to fetch changelog + +Please check the Github page for more information about this release.""" html_markdown = markdown2.markdown(changelog) html_css = """ @@ -372,14 +377,14 @@ class MainFrame(wx.Frame): } """ - frame = wx.Dialog(None, -1, title="", size=(600, 500)) - frame.SetMinSize((600, 500)) + frame = wx.Dialog(None, -1, title="", size=(650, 500)) + frame.SetMinSize((650, 500)) frame.SetWindowStyle(wx.STAY_ON_TOP) panel = wx.Panel(frame) sizer = wx.BoxSizer(wx.VERTICAL) sizer.AddSpacer(10) self.title_text = wx.StaticText(panel, label="A new version of OpenCore Legacy Patcher is available!") - self.description = wx.StaticText(panel, label=f"OpenCore Legacy Patcher {oclp_version} is now available - You have {self.constants.patcher_version}. Would you like to update?") + self.description = wx.StaticText(panel, label=f"OpenCore Legacy Patcher {oclp_version} is now available - You have {self.constants.patcher_version}{' (Nightly)' if not self.constants.commit_info[0].startswith('refs/tags') else ''}. Would you like to update?") self.title_text.SetFont(wx.Font(19, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD, False, ".AppleSystemUIFont")) self.description.SetFont(wx.Font(13, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False, ".AppleSystemUIFont")) self.web_view = wx.html2.WebView.New(panel, style=wx.BORDER_SUNKEN)