ditkrg/todo-to-issue-action
4
0
Fork 0
mirror of https://github.com/ditkrg/todo-to-issue-action.git synced 2026-01-22 22:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add diff fallback URL

Browse Source
This commit is contained in:
alstr 2024-12-12 16:01:19 +00:00
parent b64689f916
commit 84220a48d7
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
GitHubClient.py
View File

@ -27,12 +27,12 @@ class GitHubClient(Client):
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': f'token {self.token}', 'Authorization': f'token {self.token}',
'X-GitHub-Api-Version': '2022-11-28', 'X-GitHub-Api-Version': '2022-11-28',
'User-Agent': 'TODOToIssue/5.1.5' 'User-Agent': 'TODOToIssue/5.1.9'
} }
self.graphql_headers = { self.graphql_headers = {
'Authorization': f'Bearer {os.getenv("INPUT_PROJECTS_SECRET", "")}', 'Authorization': f'Bearer {os.getenv("INPUT_PROJECTS_SECRET", "")}',
'Accept': 'application/vnd.github.v4+json', 'Accept': 'application/vnd.github.v4+json',
'User-Agent': 'TODOToIssue/5.1.5' 'User-Agent': 'TODOToIssue/5.1.9'
} }
auto_p = os.getenv('INPUT_AUTO_P', 'true') == 'true' auto_p = os.getenv('INPUT_AUTO_P', 'true') == 'true'
self.line_break = '\n\n' if auto_p else '\n' self.line_break = '\n\n' if auto_p else '\n'
@ -88,7 +88,7 @@ class GitHubClient(Client):
'Accept': 'application/vnd.github.v3.diff', 'Accept': 'application/vnd.github.v3.diff',
'Authorization': f'token {self.token}', 'Authorization': f'token {self.token}',
'X-GitHub-Api-Version': '2022-11-28', 'X-GitHub-Api-Version': '2022-11-28',
'User-Agent': 'TODOToIssue/5.1.5' 'User-Agent': 'TODOToIssue/5.1.9'
} }
diff_request = requests.get(url=diff_url, headers=diff_headers) diff_request = requests.get(url=diff_url, headers=diff_headers)
if diff_request.status_code == 200: if diff_request.status_code == 200:
@ -100,6 +100,16 @@ class GitHubClient(Client):
if 'application/json' in diff_request.headers['content-type']: if 'application/json' in diff_request.headers['content-type']:
error_response.append(f"Server response: {json.loads(diff_request.text)['message']}") error_response.append(f"Server response: {json.loads(diff_request.text)['message']}")
error_response.append('Operation will abort') error_response.append('Operation will abort')
if '/compare/' in diff_url:
# The before SHA may no longer be valid due to a force push, fall back to /commits/ endpoint.
diff_url = f'{self.repos_url}{self.repo}/commits/{self.sha}'
print(f'Falling back to {diff_url}')
diff_request = requests.get(url=diff_url, headers=diff_headers)
if diff_request.status_code == 200:
return diff_request.text
error_response.append('Fallback URL also failed')
raise Exception('\n'.join(error_response)) raise Exception('\n'.join(error_response))
# noinspection PyMethodMayBeStatic # noinspection PyMethodMayBeStatic

2
TodoParser.py
View File

@ -9,7 +9,7 @@ from urllib.parse import urlparse
import itertools import itertools
headers = { headers = {
'User-Agent': 'TODOToIssue/5.1.5' 'User-Agent': 'TODOToIssue/5.1.9'
} }
class TodoParser(object): class TodoParser(object):