← 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-06-24 10:47:38 UTC
  • mfrom: (1288 trunk)
  • mto: (1281.1.8 aufsless)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: grantw@unimelb.edu.au-20090624104738-ezgfy17mjzwz09i3
Merge from trunk.

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
37
34
def determine_file_type(filename):
38
35
    filetype = mimetypes.guess_type(filename)[0]
39
36
    if filetype is None:
40
 
        filetype = ivle.mimetypes.DEFAULT_MIMETYPE
 
37
         filetype = ivle.mimetypes.DEFAULT_MIMETYPE
41
38
    return filetype
42
39
 
43
40
def throw_error(message, extra={}):
44
41
    error = {'error': message}
45
42
    error.update(extra)
46
 
    print json.dumps(error)
 
43
    print cjson.encode(error)
47
44
    sys.exit(0)
48
45
 
49
46
parser = OptionParser()
115
112
    else:
116
113
        if not download and \
117
114
           determine_file_type(filename) in ivle.conf.app.server.interpreters:
118
 
            throw_error('is-executable', {'path': filename.decode('utf-8')})
 
115
            throw_error('is-executable', {'path': filename})
119
116
 
120
117
        if not download and (
121
118
            (ivle.conf.app.server.blacklist_served_filetypes and \
141
138
    zipfile = StringIO.StringIO()
142
139
    zipmod.make_zip(zipbasepath, paths, zipfile)
143
140
 
144
 
    print json.dumps({'type': zip_mimetype,
145
 
                      'name': zipfilename.decode('utf-8'),
146
 
                      'size': len(zipfile.getvalue()),
147
 
                      })
 
141
    print cjson.encode({'type': zip_mimetype,
 
142
                        'name': zipfilename})
148
143
 
149
144
    stream = zipfile
150
145
    stream.seek(0)
151
146
else:
152
147
 
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
 
                      })
 
148
    print cjson.encode({'type': determine_file_type(filename),
 
149
                        'name': os.path.basename(filename)})
157
150
    stream = open(filename)
158
 
 
 
151
    
159
152
next = stream.read(1024)
160
153
while next:
161
154
    sys.stdout.write(next)