From a2cd520ce8aa4a7100df4c0d03e658393edf9f95 Mon Sep 17 00:00:00 2001 From: kaede10 Date: Tue, 12 Dec 2023 17:32:28 +0800 Subject: [PATCH 1/2] update function parse_result --- pr_review/src/review_code/review.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pr_review/src/review_code/review.py b/pr_review/src/review_code/review.py index 0db4855..b237201 100644 --- a/pr_review/src/review_code/review.py +++ b/pr_review/src/review_code/review.py @@ -168,7 +168,7 @@ class CodeReview: for filename, fileContent, _, patches in filesAndChangesReview: lgtm_num = self.do_review(filename, self.input, patches, file_comment_line[filename]) if lgtm_num == len(patches): - self.giteeApi.submit_review(body = "There is no issue found", commitId = self.commits[0], filename=filename, line=file_comment_line[filename].get(patches[-1][1])) + self.giteeApi.submit_review(body = "There is no issue found", commitId = self.commits[-1], filename=filename, line=file_comment_line[filename].get(patches[-1][1])) def splitPatch(self, patch): if not patch: @@ -308,16 +308,17 @@ class CodeReview: def parse_result(self, diff_new_line_dic, filename, answer): lgtm = True - ans = answer.split('---') - for patch in ans: - lines = patch.split(':') - line = lines[0].split('-')[-1] - comment_line = diff_new_line_dic[int(line)] - - # There is issue found on a line range - if ('LGTM' not in lines[1]): - lgtm = False - self.giteeApi.submit_review(body = lines[1], commitId = self.commits[0], filename=filename, line=comment_line) + result = re.split('(\d+-\d+:)', answer) + result = [x.strip() for x in result if x.strip()] + for i in range(len(result) - 1): + if re.match('\d+-\d+:', result[i]): + line = int(result[i].split('-')[-1][:-1]) + comment_line = diff_new_line_dic[int(line)] + + # There is issue found on a line range + if ('LGTM' not in result[i + 1]): + lgtm = False + self.giteeApi.submit_review(body = result[i + 1], commitId = self.commits[0], filename=filename, line=comment_line) return lgtm def delta(self, line_numbers, step): @@ -353,6 +354,7 @@ class CodeReview: step = [0] diff_new_line_dic = {} patches = self.splitPatch(file_patches) + print(patches) try: for patch in patches: patch_lines = self.patchStartEndLine(patch) -- Gitee From d84f8509a25085b5c3536d908975bf35de826aa1 Mon Sep 17 00:00:00 2001 From: kaede10 Date: Tue, 12 Dec 2023 17:35:15 +0800 Subject: [PATCH 2/2] update --- pr_review/src/review_code/review.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pr_review/src/review_code/review.py b/pr_review/src/review_code/review.py index b237201..d04237d 100644 --- a/pr_review/src/review_code/review.py +++ b/pr_review/src/review_code/review.py @@ -354,7 +354,6 @@ class CodeReview: step = [0] diff_new_line_dic = {} patches = self.splitPatch(file_patches) - print(patches) try: for patch in patches: patch_lines = self.patchStartEndLine(patch) -- Gitee