From 9a667ec6668f9c696e06167d93d649b692c022e6 Mon Sep 17 00:00:00 2001 From: Guijin Gao Date: Mon, 5 Feb 2024 04:30:44 +0800 Subject: [PATCH] Change to extract maintainers first from sig-info.yaml Most sigs only have maintainers listed in sig-info.yaml while there're still several sigs only have OWNERS. So change to extract maintainers first from sig-info.yaml and use OWNERS as backup. Signed-off-by: Guijin Gao --- advisors/user_activity.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/advisors/user_activity.py b/advisors/user_activity.py index 09ecd292..7fd0c6bb 100755 --- a/advisors/user_activity.py +++ b/advisors/user_activity.py @@ -84,8 +84,13 @@ class Advisor: """ Get list of current SIG maintainers """ - owners = yaml.load(self.get_file("openeuler/community", "sig/{sig}/OWNERS".format(sig=sig)), - Loader=yaml.Loader) + try: + owners = yaml.load(self.get_file("openeuler/community", "sig/{sig}/sig-info.yaml".format(sig=sig)), + Loader=yaml.Loader) + except urllib.error.HTTPError as err: + owners = yaml.load(self.get_file("openeuler/community", "sig/{sig}/OWNERS".format(sig=sig)), + Loader=yaml.Loader) + self.tc_members = owners["maintainers"] return owners["maintainers"] @@ -125,8 +130,13 @@ def main(): print("Current {sig} maintainers: ".format(sig=args.sig)) for member in maintainers: - eve_list = advisor.get_pub_events(member, args.number, args.member) - print("{name}, Total: {number}".format(name=member, number=len(eve_list))) + try: + member_info = json.loads(str(member).replace("\'", "\"").replace("None","\"None\"")) + member_id = member_info['gitee_id'] + except json.decoder.JSONDecodeError as err: + member_id = member + eve_list = advisor.get_pub_events(member_id, args.number, args.member) + print("{name}, Total: {number}".format(name=member_id, number=len(eve_list))) if eve_list: #print("From: {date2}, To: {date1}".format( # date1=eve_list[0]['date'], date2=eve_list[-1]['date'])) -- Gitee