feat: git host in config

This commit is contained in:
张泊明518370910136 2022-05-27 12:45:45 +08:00
parent 3e66456535
commit 3b6f83440a
No known key found for this signature in database
GPG Key ID: FBEF5DE8B9F4C629
2 changed files with 5 additions and 2 deletions

View File

@ -21,6 +21,7 @@ class Settings(BaseSettings):
gitea_org_name: str = "" gitea_org_name: str = ""
# git # git
git_host: str = "ssh://git@focs.ji.sjtu.edu.cn:2222"
repos_dir: str = "./repos" repos_dir: str = "./repos"
# mattermost # mattermost

View File

@ -7,7 +7,7 @@ from joint_teapot.utils.logger import logger
current_path = sys.path[0] current_path = sys.path[0]
sys.path.remove(current_path) sys.path.remove(current_path)
from git import Repo # type: ignore from git import Repo
from git.exc import GitCommandError from git.exc import GitCommandError
sys.path.insert(0, current_path) sys.path.insert(0, current_path)
@ -18,9 +18,11 @@ from joint_teapot.config import settings
class Git: class Git:
def __init__( def __init__(
self, self,
git_host: str = settings.git_host,
org_name: str = settings.gitea_org_name, org_name: str = settings.gitea_org_name,
repos_dir: str = settings.repos_dir, repos_dir: str = settings.repos_dir,
): ):
self.git_host = git_host
self.org_name = org_name self.org_name = org_name
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.")
@ -36,7 +38,7 @@ class Git:
while retry_interval and auto_retry: while retry_interval and auto_retry:
try: try:
repo = Repo.clone_from( repo = Repo.clone_from(
f"ssh://git@focs.ji.sjtu.edu.cn:2222/{self.org_name}/{repo_name}.git", f"{self.git_host}/{self.org_name}/{repo_name}.git",
repo_dir, repo_dir,
branch=branch, branch=branch,
) )