KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for GitHub releases API not returning all assets when querying the assets URL due to pagination

Browse Source 
Use the assets list from the release result when available as it is
not paginated. Otherwise request 64 items per page which is more than
enough for our 30 odd assets
This commit is contained in:
Kovid Goyal 2023-03-01 20:54:20 +05:30
parent eb6d777790
commit 6d73306198
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
publish.py
View File

@ -262,6 +262,7 @@ class GitHub: # {{{
'Authorization': self.auth, 'Authorization': self.auth,
'Accept': 'application/vnd.github+json', 'Accept': 'application/vnd.github+json',
'User-Agent': 'kitty', 'User-Agent': 'kitty',
'X-GitHub-Api-Version': '2022-11-28',
} }
if params: if params:
url += '?' + urlencode(params) url += '?' + urlencode(params)
@ -335,11 +336,11 @@ class GitHub: # {{{
# self.clean_older_releases(releases) # self.clean_older_releases(releases)
release = self.create_release() release = self.create_release()
upload_url = release['upload_url'].partition('{')[0] upload_url = release['upload_url'].partition('{')[0]
asset_url = f'{self.url_base}/assets/{{}}' existing_assets = self.existing_assets(release)
existing_assets = self.existing_assets(release['id'])
def delete_asset(asset_id: str) -> None: def delete_asset(asset_id: str) -> None:
self.delete_asset(asset_url.format(asset_id), fname) asset_url = release['assets_url'] + f'/{asset_id}'
self.delete_asset(asset_url, fname)
def upload_with_retries(path: str, desc: str, num_tries: int = 8, sleep_time: float = 60.0) -> None: def upload_with_retries(path: str, desc: str, num_tries: int = 8, sleep_time: float = 60.0) -> None:
fname = os.path.basename(path) fname = os.path.basename(path)
@ -399,9 +400,12 @@ class GitHub: # {{{
self.print_failed_response_details(r, msg) self.print_failed_response_details(r, msg)
raise SystemExit(1) raise SystemExit(1)
def existing_assets(self, release_id: str) -> Dict[str, str]: def existing_assets(self, release: Dict[str, Any]) -> Dict[str, str]:
url = f'{self.url_base}/{release_id}/assets' if 'assets' in release:
d = self.make_request_with_retries(url, failure_msg='Failed to get assets for release', return_data=True) d = release['assets']
else:
d = self.make_request_with_retries(
release['assets_url'], params={'per_page': '64'}, failure_msg='Failed to get assets for release', return_data=True)
return {asset['name']: asset['id'] for asset in d} return {asset['name']: asset['id'] for asset in d}
def create_release(self) -> Dict[str, Any]: def create_release(self) -> Dict[str, Any]: