Set json mimetype for specific flask.Response (#70)

scrapydweb/views/api.py

@@ -27,7 +27,7 @@ def dispatch_request(self, **kwargs):
  self.update_data()
  self.get_result()
  self.handle_result()
- return self.json_dumps(self.js, sort_keys=False)
+ return self.json_dumps(self.js, sort_keys=False, as_response=True)
 
  def update_url(self):
  if self.opt in ['listversions', 'listjobs']:

scrapydweb/views/myview.py

@@ -4,7 +4,7 @@
 import re
 
 from flask import current_app as app
-from flask import flash, g, request, url_for
+from flask import Response, flash, g, request, url_for
 from flask.views import View
 from logparser import __version__ as LOGPARSER_VERSION
 from six import text_type
@@ -225,8 +225,17 @@ def handle_slash(string):
  return handle_slash(string)
 
  @staticmethod
- def json_dumps(obj, sort_keys=True, indent=4, ensure_ascii=False):
- return json_dumps(obj, sort_keys=sort_keys, indent=indent, ensure_ascii=ensure_ascii)
+ def json_dumps(obj, sort_keys=True, indent=4, ensure_ascii=False, as_response=False):
+ # flask.jsonify
+ # https://flask.palletsprojects.com/en/1.1.x/config/#JSONIFY_MIMETYPE
+ # https://stackoverflow.com/questions/11773348/python-flask-how-to-set-content-type
+ # https://stackoverflow.com/questions/9254891/what-does-content-type-application-json-charset-utf-8-really-mean
+ js = json_dumps(obj, sort_keys=sort_keys, indent=indent, ensure_ascii=ensure_ascii)
+ if as_response:
+ # Content-Type: application/json
+ return Response(js, mimetype='application/json')
+ else:
+ return js
 
  @staticmethod
  def remove_microsecond(dt):
@@ -378,4 +387,4 @@ def __init__(self):
  super(MetadataView, self).__init__()
 
  def dispatch_request(self, **kwargs):
- return self.json_dumps(handle_metadata())
+ return self.json_dumps(handle_metadata(), as_response=True)

scrapydweb/views/operations/deploy.py

@@ -464,4 +464,4 @@ def dispatch_request(self, **kwargs):
  'egg': content
  }
  status_code, js = self.make_request(self.url, data=data, auth=self.AUTH)
- return self.json_dumps(js)
+ return self.json_dumps(js, as_response=True)

scrapydweb/views/operations/schedule.py

@@ -231,7 +231,7 @@ def dispatch_request(self, **kwargs):
  cmd = re.sub(r'(curl -u\s+.*?:.*?)\s+(http:https://)', r'\1 \\\r\n\2', cmd)
  cmd = re.sub(r'\s+-d\s+', ' \\\r\n-d ', cmd)
  cmd = re.sub(r'\s+--data-urlencode\s+', ' \\\r\n--data-urlencode ', cmd)
- return self.json_dumps({'filename': self.filename, 'cmd': cmd})
+ return self.json_dumps({'filename': self.filename, 'cmd': cmd}, as_response=True)
 
  def prepare_data(self):
  for k, d in [('project', 'projectname'), ('_version', self.DEFAULT_LATEST_VERSION),
@@ -611,7 +611,7 @@ def dispatch_request(self, **kwargs):
  self.data = pickle.loads(f.read())
 
  status_code, js = self.make_request(self.url, data=self.data, auth=self.AUTH)
- return self.json_dumps(js)
+ return self.json_dumps(js, as_response=True)
 
 
 class ScheduleTaskView(MyView):
@@ -639,4 +639,4 @@ def dispatch_request(self, **kwargs):
  self.data.update(json.loads(task.settings_arguments))
  status_code, js = self.make_request(self.url, data=self.data, auth=self.AUTH)
 
- return self.json_dumps(js)
+ return self.json_dumps(js, as_response=True)

scrapydweb/views/overview/jobs.py

@@ -119,7 +119,7 @@ def dispatch_request(self, **kwargs):
  raise
  finally:
  get_flashed_messages()
- return self.json_dumps(self.jobs_dict)
+ return self.json_dumps(self.jobs_dict, as_response=True)
  if self.style != 'database':
  self.jobs = self.jobs_backup
  self.handle_jobs_without_db()
@@ -454,4 +454,4 @@ def dispatch_request(self, **kwargs):
  self.js['status'] = self.ERROR
  self.js['message'] = "job #%s not found in the database" % self.id
 
- return self.json_dumps(self.js)
+ return self.json_dumps(self.js, as_response=True)

scrapydweb/views/overview/tasks.py

@@ -275,7 +275,7 @@ def dispatch_request(self, **kwargs):
  self.js.setdefault('status', self.OK)
  finally:
  self.logger.debug(self.js)
- return self.json_dumps(self.js)
+ return self.json_dumps(self.js, as_response=True)
 
  def generate_response(self):
  if self.action in ['disable', 'enable']: # ENABLE|DISABLE the scheduler