Mercurial > odfcast > odfcast

comparison odfcast/convert.py @ 92:2200ae1e7bdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename html_error_code to http_error_code The new name is obviously what the parameter actually specifies. Not least because there is no such thing as an HTML error code.
author Bernhard Herzog <bh@intevation.de>
date Fri, 28 Apr 2017 19:03:36 +0200
parents 607694092e2e
children 48dabf4bf680
comparison
equal deleted inserted replaced
91:607694092e2e 92:2200ae1e7bdb
35 class ErrorResponse(Response): 35 class ErrorResponse(Response):
36 36
37 BAD_REQUEST_ERROR_CODE = 400 37 BAD_REQUEST_ERROR_CODE = 400
38 38
39 def __init__(self, title, error_code, details, 39 def __init__(self, title, error_code, details,
40 html_error_code=BAD_REQUEST_ERROR_CODE): 40 http_error_code=BAD_REQUEST_ERROR_CODE):
41 data, mime_type = self.get_response_data(title, error_code, details) 41 data, mime_type = self.get_response_data(title, error_code, details)
42 super(ErrorResponse, self).__init__(response=data, mimetype=mime_type, 42 super(ErrorResponse, self).__init__(response=data, mimetype=mime_type,
43 status=html_error_code) 43 status=http_error_code)
44 44
45 def json(self, title, error_code, details): 45 def json(self, title, error_code, details):
46 return json.dumps({ 46 return json.dumps({
47 "error": title, 47 "error": title,
48 "error_code": error_code, 48 "error_code": error_code,
80 TEMPLATE_ERROR_CODE = 100 80 TEMPLATE_ERROR_CODE = 100
81 81
82 def __init__(self, details, error_code=TEMPLATE_ERROR_CODE): 82 def __init__(self, details, error_code=TEMPLATE_ERROR_CODE):
83 super(TemplateErrorResponse, self).__init__( 83 super(TemplateErrorResponse, self).__init__(
84 title="TemplateError", error_code=error_code, details=details, 84 title="TemplateError", error_code=error_code, details=details,
85 html_error_code=500) 85 http_error_code=500)
86 86
87 87
88 class ConversionErrorResponse(ErrorResponse): 88 class ConversionErrorResponse(ErrorResponse):
89 89
90 CONVERSION_ERROR_CODE = 200 90 CONVERSION_ERROR_CODE = 200
91 91
92 def __init__(self, details, error_code=CONVERSION_ERROR_CODE): 92 def __init__(self, details, error_code=CONVERSION_ERROR_CODE):
93 super(ConversionErrorResponse, self).__init__( 93 super(ConversionErrorResponse, self).__init__(
94 title="ConversionError", error_code=error_code, details=details, 94 title="ConversionError", error_code=error_code, details=details,
95 html_error_code=500) 95 http_error_code=500)
96 96
97 97
98 class MergeErrorResponse(ErrorResponse): 98 class MergeErrorResponse(ErrorResponse):
99 99
100 MERGE_ERROR_CODE = 300 100 MERGE_ERROR_CODE = 300
101 101
102 def __init__(self, details, error_code=MERGE_ERROR_CODE): 102 def __init__(self, details, error_code=MERGE_ERROR_CODE):
103 super(MergeErrorResponse, self).__init__( 103 super(MergeErrorResponse, self).__init__(
104 title="MergeError", error_code=error_code, details=details, 104 title="MergeError", error_code=error_code, details=details,
105 html_error_code=500) 105 http_error_code=500)
106 106
107 107
108 class ConvertView(MethodView): 108 class ConvertView(MethodView):
109 109
110 def __init__(self, pyuno_driver_name="", hostname="localhost", port=2001): 110 def __init__(self, pyuno_driver_name="", hostname="localhost", port=2001):
123 ffile = request.files['file'] 123 ffile = request.files['file']
124 if not ffile.filename: 124 if not ffile.filename:
125 return ErrorResponse( 125 return ErrorResponse(
126 "Upload file missing", error_code=101, 126 "Upload file missing", error_code=101,
127 details="Please upload a file for conversion", 127 details="Please upload a file for conversion",
128 html_error_code=400) 128 http_error_code=400)
129 129
130 fformat = request.form['format'] 130 fformat = request.form['format']
131 if not self.is_format_supported(fformat): 131 if not self.is_format_supported(fformat):
132 return ErrorResponse( 132 return ErrorResponse(
133 "Invalid format", error_code=102, 133 "Invalid format", error_code=102,
134 details="Format %s not allowed" % fformat, 134 details="Format %s not allowed" % fformat,
135 html_error_code=400) 135 http_error_code=400)
136 136
137 datadict = self.get_datadict() 137 datadict = self.get_datadict()
138 138
139 if datadict: 139 if datadict:
140 log.debug(" with datadict") 140 log.debug(" with datadict")
250 ffile = request.files['file'] 250 ffile = request.files['file']
251 if not ffile.filename: 251 if not ffile.filename:
252 return ErrorResponse( 252 return ErrorResponse(
253 "Upload file missing", error_code=101, 253 "Upload file missing", error_code=101,
254 details="Please upload a file for conversion", 254 details="Please upload a file for conversion",
255 html_error_code=400) 255 http_error_code=400)
256 256
257 with tempfile.TemporaryFile() as outfile: 257 with tempfile.TemporaryFile() as outfile:
258 merger = PdfFileMerger(strict=False) 258 merger = PdfFileMerger(strict=False)
259 try: 259 try:
260 merger.append(ffile, import_bookmarks=False) 260 merger.append(ffile, import_bookmarks=False)
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)