diff options
| author | Frederick Yin <fred.yin@sjtu.edu.cn> | 2021-10-10 13:32:20 +0800 |
|---|---|---|
| committer | Frederick Yin <fred.yin@sjtu.edu.cn> | 2021-10-10 13:32:20 +0800 |
| commit | 1d221035f57dd3af164999aec129a8aacf43bf65 (patch) | |
| tree | 93633facc1465d594d3e51c76374e23a4d4d3e7c | |
| parent | dfe4b717a9bd39d8cd1f9d603e648921e1393903 (diff) | |
GitWorker reads GITEA_ORG from config.py
| -rw-r--r-- | leningrade.py | 2 | ||||
| -rw-r--r-- | worker/GitWorker.py | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/leningrade.py b/leningrade.py index af72cd6..2bd4547 100644 --- a/leningrade.py +++ b/leningrade.py @@ -15,7 +15,7 @@ class Arguments: args = Arguments() -gitWorker = GitWorker(args, HGROUP, None, LANGUAGE, MANDATORY_FILES, OPTIONAL_FILES, GITEA_ORG) +gitWorker = GitWorker(args, HGROUP, None, LANGUAGE, MANDATORY_FILES, OPTIONAL_FILES) giteaWorker = GiteaWorker(args, GITEA_API_BASE, GITEA_ORG, GITEA_TOKEN, HGROUP) jojWorker = JOJWorker(args, JOJ_COURSE_ID, JOJ_SESSION_ID, HGROUP) diff --git a/worker/GitWorker.py b/worker/GitWorker.py index 4ecd968..2814bc6 100644 --- a/worker/GitWorker.py +++ b/worker/GitWorker.py @@ -4,7 +4,7 @@ import multiprocessing import traceback import git import os - +from config import GITEA_ORG class GitWorker(): def __init__(self, @@ -14,7 +14,6 @@ class GitWorker(): language, mandatoryFiles, optionalFiles, - giteaOrg, logger=Logger(), processCount=4): self.args = args @@ -25,7 +24,6 @@ class GitWorker(): self.processCount = processCount self.mandatoryFiles = mandatoryFiles self.optionalFiles = optionalFiles - self.giteaOrg = giteaOrg self.moss = None @classmethod @@ -42,7 +40,7 @@ class GitWorker(): hwDir = os.path.join(repoDir, f"h{hwNum}") if not os.path.exists(repoDir): repo = git.Repo.clone_from( - f"ssh://git@focs.ji.sjtu.edu.cn:2222/{self.giteaOrg}/{repoName}.git", + f"ssh://git@focs.ji.sjtu.edu.cn:2222/{GITEA_ORG}/{repoName}.git", repoDir, branch="master") else: |