GE-Proton: Refactor to use fetch_project_release_data (#524)

* util: Implement fetching `checksum` in `fetch_project_release_data`

* GE-Proton: Refactor to use `fetch_project_release_data`

* util: Note that `fetch_project_release_data` can return a `checksum` now

* GE-Proton: remove unused import

---------

Co-authored-by: DavidoTek <54072917+DavidoTek@users.noreply.github.com>

Author: sonic2kk

pupgui2/resources/ctmods/ctmod_00protonge.py

@@ -10,7 +10,8 @@
 from PySide6.QtCore import QObject, QCoreApplication, Signal, Property
 
 from pupgui2.datastructures import Launcher
-from pupgui2.util import fetch_project_releases, get_launcher_from_installdir, extract_tar
+from pupgui2.util import fetch_project_release_data, fetch_project_releases
+from pupgui2.util import get_launcher_from_installdir, extract_tar
 from pupgui2.util import build_headers_with_authorization
 from pupgui2.networkutil import download_file
 
@@ -100,19 +101,8 @@ def __fetch_github_data(self, tag):
         Content(s):
             'version', 'date', 'download', 'size', 'checksum'
         """
-        url = self.CT_URL + (f'/tags/{tag}' if tag else '/latest')
-        data = self.rs.get(url).json()
-        if 'tag_name' not in data:
-            return None
-
-        values = {'version': data['tag_name'], 'date': data['published_at'].split('T')[0]}
-        for asset in data['assets']:
-            if asset['name'].endswith('sha512sum'):
-                values['checksum'] = asset['browser_download_url']
-            elif asset['name'].endswith(self.release_format):
-                values['download'] = asset['browser_download_url']
-                values['size'] = asset['size']
-        return values
+
+        return fetch_project_release_data(self.CT_URL, self.release_format, self.rs, tag=tag, checksum_suffix='.sha512sum')
 
     def __get_data(self, version: str, install_dir: str) -> tuple[dict | None, str | None]:
 

pupgui2/util.py

@@ -681,14 +681,13 @@ def get_download_url_from_asset(release_url: str, asset: dict, release_format: s
     return ''
 
 
-# TODO in future if this is re-used for other ctmods other than DXVK and dxvk-async, try to parse more data i.e. checksum
-def fetch_project_release_data(release_url: str, release_format: str, rs: requests.Session, tag: str = '', asset_condition: Callable | None = None) -> dict:
+def fetch_project_release_data(release_url: str, release_format: str, rs: requests.Session, tag: str = '', checksum_suffix: str = '', asset_condition: Callable | None = None) -> dict:
 
     """
     Fetch information about a given release based on its tag, with an optional condition lambda.
     Return Type: dict
     Content(s):
-        'version', 'date', 'download', 'size' (if available)
+        'version', 'date', 'download', 'size' (if available), 'checksum' (if available)
     """
 
     date_key: str = ''
@@ -712,7 +711,13 @@ def fetch_project_release_data(release_url: str, release_format: str, rs: reques
             values['download'] = asset_url
             values['size'] = asset.get('size', None)
 
-            break
+        if bool(checksum_suffix) and not 'checksum' in values:
+            checksum_url = get_download_url_from_asset(release_url, asset, release_format=checksum_suffix)
+
+            if not bool(checksum_url):
+                continue
+            
+            values['checksum'] = checksum_url
 
     return values