diff options
Diffstat (limited to 'worker')
| -rw-r--r-- | worker/GitWorker.py | 16 | ||||
| -rw-r--r-- | worker/__init__.py | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/worker/GitWorker.py b/worker/GitWorker.py index 1213e98..af5ed12 100644 --- a/worker/GitWorker.py +++ b/worker/GitWorker.py @@ -7,7 +7,7 @@ import os import re -class GiteaWorker(): +class GitWorker(): def __init__(self, args, hgroups, @@ -92,7 +92,7 @@ class GiteaWorker(): scores[stuName]['indvFailSubmit'] = 1 scores[stuName]['indvComment'].append( f"individual branch h{hwNum}/{fn} file missing") - if not list(filter(GiteaWorker.isREADME, + if not list(filter(GitWorker.isREADME, os.listdir(hwDir))): self.logger.warning( f"{repoName} {stuID} {stuName} h{hwNum}/README file missing" @@ -105,7 +105,7 @@ class GiteaWorker(): filter( lambda x: x not in [ ".git", *[f"h{n}" for n in range(20)] - ] and not GiteaWorker.isREADME(x), + ] and not GitWorker.isREADME(x), os.listdir(repoDir))) if dirList: self.logger.warning( @@ -120,7 +120,7 @@ class GiteaWorker(): dirList = list( filter( lambda x: not x.startswith("ex") and - not GiteaWorker.isREADME(x), dirList)) + not GitWorker.isREADME(x), dirList)) if dirList: self.logger.warning( f"{repoName} {stuID} {stuName} h{hwNum}/ untidy {dirList.__repr__()}" @@ -180,7 +180,7 @@ class GiteaWorker(): scores[stuName]['groupFailSubmit'] = 1 scores[stuName]['groupComment'].append( f"master branch h{hwNum}/{fn} missing") - if not list(filter(GiteaWorker.isREADME, os.listdir(hwDir))): + if not list(filter(GitWorker.isREADME, os.listdir(hwDir))): self.logger.warning(f"{repoName} h{hwNum}/README file missing") for _, stuName in self.hgroups[repoName]: scores[stuName]['groupFailSubmit'] = 1 @@ -192,7 +192,7 @@ class GiteaWorker(): dirList = list( filter( lambda x: x not in [".git", *[f"h{n}" for n in range(20)]] and - not GiteaWorker.isREADME(x), dirList)) + not GitWorker.isREADME(x), dirList)) if dirList: self.logger.warning(f"{repoName} untidy {dirList.__repr__()}") for _, stuName in self.hgroups[repoName]: @@ -203,7 +203,7 @@ class GiteaWorker(): dirList = os.listdir(hwDir) dirList = list( filter( - lambda x: not x.startswith("ex") and not GiteaWorker. + lambda x: not x.startswith("ex") and not GitWorker. isREADME(x), dirList)) if dirList: self.logger.warning( @@ -232,7 +232,7 @@ class GiteaWorker(): repo.git.pull("origin", "master", "-f") repo.git.reset('--hard') repo.git.clean("-d", "-f", "-x") - if not list(filter(GiteaWorker.isREADME, os.listdir(repoDir))): + if not list(filter(GitWorker.isREADME, os.listdir(repoDir))): self.logger.warning(f"{repoName} README missing") if milestoneNum: tagNames = [tag.name for tag in repo.tags] diff --git a/worker/__init__.py b/worker/__init__.py index 78bd11f..153ec1b 100644 --- a/worker/__init__.py +++ b/worker/__init__.py @@ -1,3 +1,3 @@ from .CanvasWorker import CanvasWorker -from .GiteaWorker import GiteaWorker +from .GitWorker import GitWorker from .JOJWorker import JOJWorker
\ No newline at end of file |