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

Fix issue formatting

Browse Source
This commit is contained in:
alstr 2024-09-24 14:11:59 +01:00
parent 049f0b228d
commit 86193fe430
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
main.py
View File

@ -259,10 +259,6 @@ class GitHubClient(object):
def create_issue(self, issue): def create_issue(self, issue):
"""Create a dict containing the issue details and send it to GitHub.""" """Create a dict containing the issue details and send it to GitHub."""
title = issue.title
if len(title) > 80:
# Title is too long.
title = title[:80] + '...'
formatted_issue_body = self.line_break.join(issue.body) formatted_issue_body = self.line_break.join(issue.body)
line_num_anchor = f'#L{issue.start_line}' line_num_anchor = f'#L{issue.start_line}'
if issue.num_lines > 1: if issue.num_lines > 1:
@ -282,13 +278,13 @@ class GitHubClient(object):
else: else:
issue_contents = url_to_line + '\n\n' + snippet issue_contents = url_to_line + '\n\n' + snippet
new_issue_body = {'title': title, 'body': issue_contents, 'labels': issue.labels}
endpoint = self.issues_url endpoint = self.issues_url
if issue.issue_url: if issue.issue_url:
# Issue already exists, update existing rather than create new. # Issue already exists, update existing rather than create new.
endpoint += f'/{issue.issue_number}' endpoint += f'/{issue.issue_number}'
title = issue.title
if issue.ref: if issue.ref:
if issue.ref.startswith('@'): if issue.ref.startswith('@'):
# Ref = assignee. # Ref = assignee.
@ -304,7 +300,10 @@ class GitHubClient(object):
return self._comment_issue(issue_number, f'{issue.title}\n\n{issue_contents}'), None return self._comment_issue(issue_number, f'{issue.title}\n\n{issue_contents}'), None
else: else:
# Just prepend the ref to the title. # Just prepend the ref to the title.
issue.title = f'[{issue.ref}] {issue.title}' title = f'[{issue.ref}] {issue.title}'
title = title + '...' if len(title) > 80 else title
new_issue_body = {'title': title, 'body': issue_contents, 'labels': issue.labels}
# We need to check if any assignees/milestone specified exist, otherwise issue creation will fail. # We need to check if any assignees/milestone specified exist, otherwise issue creation will fail.
valid_assignees = [] valid_assignees = []
@ -710,7 +709,7 @@ class TodoParser(object):
start_line=code_block['start_line'], start_line=code_block['start_line'],
num_lines=1, num_lines=1,
markdown_language=code_block['markdown_language'], markdown_language=code_block['markdown_language'],
status=None, status=line_status,
identifier=identifier, identifier=identifier,
ref=ref, ref=ref,
issue_url=None, issue_url=None,
@ -745,7 +744,7 @@ class TodoParser(object):
issue_number_search = self.ISSUE_NUMBER_PATTERN.search(line_url) issue_number_search = self.ISSUE_NUMBER_PATTERN.search(line_url)
if issue_number_search: if issue_number_search:
curr_issue.issue_number = issue_number_search.group(1) curr_issue.issue_number = issue_number_search.group(1)
elif len(cleaned_line): elif len(cleaned_line) and line_status != LineStatus.DELETED:
if self.should_escape: if self.should_escape:
curr_issue.body.append(self._escape_markdown(cleaned_line)) curr_issue.body.append(self._escape_markdown(cleaned_line))
else: else:
@ -765,9 +764,10 @@ class TodoParser(object):
# If all the lines are unchanged, don't do anything. # If all the lines are unchanged, don't do anything.
if all(s == LineStatus.UNCHANGED for s in line_statuses): if all(s == LineStatus.UNCHANGED for s in line_statuses):
return None return None
# LineStatus.ADDED also covers modifications. # If the title line hasn't changed, but the info below has, we need to mark it as an update (addition).
curr_issue.status = LineStatus.DELETED if all(s == LineStatus.DELETED for s in line_statuses) \ if (curr_issue.status == LineStatus.UNCHANGED
else LineStatus.ADDED and (LineStatus.ADDED in line_statuses or LineStatus.DELETED in line_statuses)):
curr_issue.status = LineStatus.ADDED
found_issues.append(curr_issue) found_issues.append(curr_issue)
@ -987,9 +987,9 @@ if __name__ == "__main__":
if line_number < len(file_lines): if line_number < len(file_lines):
# Duplicate the line to retain the comment syntax. # Duplicate the line to retain the comment syntax.
new_line = file_lines[line_number] new_line = file_lines[line_number]
url_to_insert = f'{client.line_base_url}{client.repo}/issues/{new_issue_number}' remove = fr'{raw_issue.identifier}.*{raw_issue.title}'
new_line = (new_line.replace(raw_issue.identifier, 'Issue URL') insert = f'Issue URL: {client.line_base_url}{client.repo}/issues/{new_issue_number}'
.replace(raw_issue.title, url_to_insert)) new_line = re.sub(remove, insert, new_line)
# Check if the URL line already exists, if so abort. # Check if the URL line already exists, if so abort.
if line_number == len(file_lines) - 1 or file_lines[line_number + 1] != new_line: if line_number == len(file_lines) - 1 or file_lines[line_number + 1] != new_line:
file_lines.insert(line_number + 1, new_line) file_lines.insert(line_number + 1, new_line)