dadada/abgabesystem
dadada/abgabesystem
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix: Naming issues

Browse source
This commit is contained in:
Tim Schubert 2018-04-19 18:10:09 +02:00
parent acaa21d585
commit 6e1eb5a5a1
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
abgabesystem.py
View file

@ -92,10 +92,11 @@ class Course(yaml.YAMLObject):
self.base.commits.create(data) self.base.commits.create(data)
def sync_plagiates(self, gl): def sync_plagiates(self, gl):
self.group = self.sync_group(gl)
found = self.group.projects.list(search=self.plagiates) found = self.group.projects.list(search=self.plagiates)
if len(found) == 0: if len(found) == 0:
self.base = gl.projects.create({ self.base = gl.projects.create({
'name': self.base, 'name': self.plagiates,
'namespace_id': self.group.id, 'namespace_id': self.group.id,
'visibility': 'private' 'visibility': 'private'
}) })
@ -110,7 +111,10 @@ class Course(yaml.YAMLObject):
for project in projects: for project in projects:
if project.name != self.plagiates: if project.name != self.plagiates:
projects_list += '../%s\n' % project.name projects_list += '''
[submodule "%s"]
path = "%s"
url = ../%s''' % (project.path, project.path)
data = { data = {
'branch': 'master', 'branch': 'master',
@ -183,8 +187,7 @@ def sync_project(gl, course, student):
#for project in student.user.projects.list(): #for project in student.user.projects.list():
# gl.projects.delete(project.id) # gl.projects.delete(project.id)
print(student.user.name) projects = course.group.projects.list(search=student.user.username)
projects = course.group.projects.list(search=student.user.name)
if len(projects) > 0: if len(projects) > 0:
print('found') print('found')
return projects[0] return projects[0]
@ -192,14 +195,14 @@ def sync_project(gl, course, student):
base = course.group.projects.list(search=course.base)[0] base = course.group.projects.list(search=course.base)[0]
base = gl.projects.get(base.id) base = gl.projects.get(base.id)
log.info('Creating project %s' % student.user) log.info('Creating project %s' % student.user.username)
fork = base.forks.create({ fork = base.forks.create({
'namespace': student.user.username, 'namespace': student.user.username,
'name': student.name 'name': student.user.username
}) })
project = gl.projects.get(fork.id) project = gl.projects.get(fork.id)
project.path = student.user.username project.path = student.user.username
project.name = student.name project.name = student.user.username
project.visibility = 'private' project.visibility = 'private'
project.save() project.save()
course.group.transfer_project(to_project_id=fork.id) course.group.transfer_project(to_project_id=fork.id)
@ -232,20 +235,22 @@ def sync(gl, conf, args):
""" """
for course in conf['courses']: for course in conf['courses']:
print(course.name)
course.group = course.sync_group(gl) course.group = course.sync_group(gl)
course.sync_base(gl) course.sync_base(gl)
with open(course.students, encoding='latin1') as csvfile: with open(course.students, encoding='latin1') as csvfile:
for student in Student.from_csv(csvfile): for student in Student.from_csv(csvfile):
print(student.user)
print(course, student)
try: try:
student.user = student.sync_user(gl, conf['ldap']) student.user = student.sync_user(gl, conf['ldap'])
print("%s %s" % (student.user.username, student.user.name))
sync_project(gl, course, student) sync_project(gl, course, student)
except gitlab.exceptions.GitlabCreateError as e: except gitlab.exceptions.GitlabCreateError as e:
log.warn(e) log.warn(e)
course.sync_plagiates(gl) #course.sync_plagiates(gl)
def parseconf(conf): def parseconf(conf):