← 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: 2009-04-28 04:50:39 UTC
  • Revision ID: grantw@unimelb.edu.au-20090428045039-ibb7gwtjrhe9osq3
Populate req.config in a cleaner manner.

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/serveservice
25
25
import StringIO
26
26
from optparse import OptionParser
27
27
 
28
 
try:
29
 
    import json
30
 
except ImportError:
31
 
    import simplejson as json
 
28
import cjson
32
29
 
33
30
from ivle import zip as zipmod
34
31
import ivle.conf.app.server
35
 
import ivle.mimetypes
36
32
 
37
33
def determine_file_type(filename):
38
34
    filetype = mimetypes.guess_type(filename)[0]
39
35
    if filetype is None:
40
 
        filetype = ivle.mimetypes.DEFAULT_MIMETYPE
 
36
         filetype = ivle.conf.mimetypes.default_mimetype
41
37
    return filetype
42
38
 
43
39
def throw_error(message, extra={}):
44
40
    error = {'error': message}
45
41
    error.update(extra)
46
 
    print json.dumps(error)
 
42
    print cjson.encode(error)
47
43
    sys.exit(0)
48
44
 
49
45
parser = OptionParser()
115
111
    else:
116
112
        if not download and \
117
113
           determine_file_type(filename) in ivle.conf.app.server.interpreters:
118
 
            throw_error('is-executable', {'path': filename.decode('utf-8')})
 
114
            throw_error('is-executable', {'path': filename})
119
115
 
120
116
        if not download and (
121
117
            (ivle.conf.app.server.blacklist_served_filetypes and \
141
137
    zipfile = StringIO.StringIO()
142
138
    zipmod.make_zip(zipbasepath, paths, zipfile)
143
139
 
144
 
    print json.dumps({'type': zip_mimetype,
145
 
                      'name': zipfilename.decode('utf-8'),
146
 
                      'size': len(zipfile.getvalue()),
147
 
                      })
 
140
    print cjson.encode({'type': zip_mimetype,
 
141
                        'name': zipfilename})
148
142
 
149
143
    stream = zipfile
150
144
    stream.seek(0)
151
145
else:
152
146
 
153
 
    print json.dumps({'type': determine_file_type(filename),
154
 
                      'name': os.path.basename(filename).decode('utf-8'),
155
 
                      'size': os.path.getsize(filename),
156
 
                      })
 
147
    print cjson.encode({'type': determine_file_type(filename),
 
148
                        'name': os.path.basename(filename)})
157
149
    stream = open(filename)
158
 
 
 
150
    
159
151
next = stream.read(1024)
160
152
while next:
161
153
    sys.stdout.write(next)