← Back to branch summary

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

« back to all changes in this revision

Viewing changes to services/serveservice

  • Committer: William Grant
  • Date: 2010-02-25 03:18:21 UTC
  • Revision ID: grantw@unimelb.edu.au-20100225031821-mi9a2tm5679fht4d
Shuffle things around so that req.user and req.store only construct when actually retrieved, and ensure they're not retrieved for media files. Saves 50ms of DB connection time per request.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/serveservice
112
112
    else:
113
113
        if not download and \
114
114
           determine_file_type(filename) in ivle.conf.app.server.interpreters:
115
 
            throw_error('is-executable', {'path': filename})
 
115
            throw_error('is-executable', {'path': filename.decode('utf-8')})
116
116
 
117
117
        if not download and (
118
118
            (ivle.conf.app.server.blacklist_served_filetypes and \
139
139
    zipmod.make_zip(zipbasepath, paths, zipfile)
140
140
 
141
141
    print cjson.encode({'type': zip_mimetype,
142
 
                        'name': zipfilename})
 
142
                        'name': zipfilename.decode('utf-8')})
143
143
 
144
144
    stream = zipfile
145
145
    stream.seek(0)
146
146
else:
147
147
 
148
148
    print cjson.encode({'type': determine_file_type(filename),
149
 
                        'name': os.path.basename(filename)})
 
149
                        'name': os.path.basename(filename).decode('utf-8')})
150
150
    stream = open(filename)
151
151
    
152
152
next = stream.read(1024)