← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/makeuser.py

Now respects --zip, and creates Zip files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/makeuser.py
27
27
import logging
28
28
import subprocess
29
29
 
30
 
from storm.expr import Select, Max
31
 
 
32
30
import ivle.config
33
 
from ivle.database import (User, ProjectGroup, Assessed, ProjectSubmission,
34
 
        Project, ProjectSet, Offering, Enrolment)
 
31
from ivle.database import ProjectGroup, User
35
32
 
36
33
def chown_to_webserver(filename):
37
34
    """chown a directory and its contents to the web server.
74
71
%(login)s = rw
75
72
""" % {'login': u.login})
76
73
 
77
 
    # Now we need to grant offering tutors and lecturers access to the latest
78
 
    # submissions in their offerings. There are much prettier ways to do this,
79
 
    # but a lot of browser requests call this function, so it needs to be
80
 
    # fast. We can grab all of the paths needing authorisation directives with
81
 
    # a single query, and we cache the list of viewers for each offering.
82
 
    offering_viewers_cache = {}
83
 
    for (login, psid, pspath, offeringid) in store.find(
84
 
        (User.login, ProjectSubmission.id, ProjectSubmission.path,
85
 
         Offering.id),
86
 
            Assessed.id == ProjectSubmission.assessed_id,
87
 
            User.id == Assessed.user_id,
88
 
            Project.id == Assessed.project_id,
89
 
            ProjectSet.id == Project.project_set_id,
90
 
            Offering.id == ProjectSet.id,
91
 
            ProjectSubmission.date_submitted == Select(
92
 
                    Max(ProjectSubmission.date_submitted),
93
 
                    ProjectSubmission.assessed_id == Assessed.id,
94
 
                    tables=ProjectSubmission
95
 
            )
96
 
        ):
97
 
 
98
 
        # Do we already have the list of logins authorised for this offering
99
 
        # cached? If not, get it.
100
 
        if offeringid not in offering_viewers_cache:
101
 
            offering_viewers_cache[offeringid] = list(store.find(
102
 
                    User.login,
103
 
                    User.id == Enrolment.user_id,
104
 
                    Enrolment.offering_id == offeringid,
105
 
                    Enrolment.role.is_in((u'tutor', u'lecturer'))
106
 
                )
107
 
            )
108
 
 
109
 
        f.write("""
110
 
# Submission %(id)d
111
 
[%(login)s:%(path)s]
112
 
""" % {'login': login, 'id': psid, 'path': pspath})
113
 
 
114
 
        for viewer_login in offering_viewers_cache[offeringid]:
115
 
            # We don't want to override the owner's write privilege,
116
 
            # so we don't add them to the read-only ACL.
117
 
            if login != viewer_login:
118
 
                f.write("%s = r\n" % viewer_login)
119
 
 
120
74
    f.close()
121
75
    os.rename(temp_name, conf_name)
122
76
    chown_to_webserver(conf_name)