fix: log level
This commit is contained in:
parent
16925bcf05
commit
f705f59d0e
|
@ -57,7 +57,7 @@ class Teapot:
|
||||||
logger.info(
|
logger.info(
|
||||||
f"Settings loaded. Canvas Course ID: {settings.canvas_course_id}, Gitea Organization name: {settings.gitea_org_name}"
|
f"Settings loaded. Canvas Course ID: {settings.canvas_course_id}, Gitea Organization name: {settings.gitea_org_name}"
|
||||||
)
|
)
|
||||||
logger.info("Teapot initialized.")
|
logger.debug("Teapot initialized.")
|
||||||
|
|
||||||
def add_all_canvas_students_to_teams(self, team_names: List[str]) -> None:
|
def add_all_canvas_students_to_teams(self, team_names: List[str]) -> None:
|
||||||
return self.gitea.add_canvas_students_to_teams(self.canvas.students, team_names)
|
return self.gitea.add_canvas_students_to_teams(self.canvas.students, team_names)
|
||||||
|
|
|
@ -5,5 +5,5 @@ from loguru import logger as logger
|
||||||
from joint_teapot.config import settings
|
from joint_teapot.config import settings
|
||||||
|
|
||||||
logger.remove()
|
logger.remove()
|
||||||
logger.add(stderr)
|
logger.add(stderr, level="INFO")
|
||||||
logger.add(settings.log_file_path)
|
logger.add(settings.log_file_path, level="INFO")
|
||||||
|
|
|
@ -23,12 +23,12 @@ class Canvas:
|
||||||
raise Exception(
|
raise Exception(
|
||||||
f"Unable to gather students' {attr}, please contact the Canvas site admin"
|
f"Unable to gather students' {attr}, please contact the Canvas site admin"
|
||||||
)
|
)
|
||||||
logger.info(f"Canvas students loaded.")
|
logger.debug(f"Canvas students loaded.")
|
||||||
self.assignments = self.course.get_assignments()
|
self.assignments = self.course.get_assignments()
|
||||||
logger.info(f"Canvas assignments loaded.")
|
logger.debug(f"Canvas assignments loaded.")
|
||||||
self.groups = self.course.get_groups()
|
self.groups = self.course.get_groups()
|
||||||
logger.info(f"Canvas groups loaded.")
|
logger.debug(f"Canvas groups loaded.")
|
||||||
logger.info("Canvas initialized.")
|
logger.debug("Canvas initialized.")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|
|
@ -22,7 +22,7 @@ class Git:
|
||||||
if not os.path.isdir(repos_dir):
|
if not os.path.isdir(repos_dir):
|
||||||
raise Exception(f"{repos_dir} does not exist! Create it first.")
|
raise Exception(f"{repos_dir} does not exist! Create it first.")
|
||||||
self.repos_dir = repos_dir
|
self.repos_dir = repos_dir
|
||||||
logger.info("Git initialized.")
|
logger.debug("Git initialized.")
|
||||||
|
|
||||||
def clone_repo(self, repo_name: str, branch: str = "master") -> Repo:
|
def clone_repo(self, repo_name: str, branch: str = "master") -> Repo:
|
||||||
repo_dir = os.path.join(self.repos_dir, repo_name)
|
repo_dir = os.path.join(self.repos_dir, repo_name)
|
||||||
|
|
|
@ -58,7 +58,7 @@ class Gitea:
|
||||||
self.repository_api = focs_gitea.RepositoryApi(self.api_client)
|
self.repository_api = focs_gitea.RepositoryApi(self.api_client)
|
||||||
self.settings_api = focs_gitea.SettingsApi(self.api_client)
|
self.settings_api = focs_gitea.SettingsApi(self.api_client)
|
||||||
self.user_api = focs_gitea.UserApi(self.api_client)
|
self.user_api = focs_gitea.UserApi(self.api_client)
|
||||||
logger.info("Gitea initialized.")
|
logger.debug("Gitea initialized.")
|
||||||
|
|
||||||
@lru_cache()
|
@lru_cache()
|
||||||
def _get_team_id_by_name(self, name: str) -> int:
|
def _get_team_id_by_name(self, name: str) -> int:
|
||||||
|
@ -79,12 +79,22 @@ class Gitea:
|
||||||
) -> None:
|
) -> None:
|
||||||
for team_name in team_names:
|
for team_name in team_names:
|
||||||
team_id = self._get_team_id_by_name(team_name)
|
team_id = self._get_team_id_by_name(team_name)
|
||||||
|
team_members = self.organization_api.org_list_team_members(team_id)
|
||||||
for student in students:
|
for student in students:
|
||||||
try:
|
try:
|
||||||
username = self._get_username_by_canvas_student(student)
|
username = self._get_username_by_canvas_student(student)
|
||||||
|
team_member = first(team_members, lambda x: x.login == username)
|
||||||
|
if team_member is None:
|
||||||
self.organization_api.org_add_team_member(team_id, username)
|
self.organization_api.org_add_team_member(team_id, username)
|
||||||
|
else:
|
||||||
|
team_members.remove(team_member)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(e)
|
logger.error(e)
|
||||||
|
for team_member in team_members:
|
||||||
|
logger.warning(
|
||||||
|
f"{team_member.full_name} found in team {team_name} "
|
||||||
|
+ "but not found in Canvas students"
|
||||||
|
)
|
||||||
|
|
||||||
def create_personal_repos_for_canvas_students(
|
def create_personal_repos_for_canvas_students(
|
||||||
self,
|
self,
|
||||||
|
@ -114,7 +124,7 @@ class Gitea:
|
||||||
)
|
)
|
||||||
except ApiException as e:
|
except ApiException as e:
|
||||||
if e.status == 409:
|
if e.status == 409:
|
||||||
logger.warning(f"Peronsal repo for {student} already exists.")
|
logger.warning(f"Personal repo for {student} already exists.")
|
||||||
else:
|
else:
|
||||||
raise (e)
|
raise (e)
|
||||||
username = self._get_username_by_canvas_student(student)
|
username = self._get_username_by_canvas_student(student)
|
||||||
|
@ -265,3 +275,5 @@ class Gitea:
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
gitea = Gitea()
|
gitea = Gitea()
|
||||||
|
res = gitea.get_all_repo_names()
|
||||||
|
print("\n".join(res))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user