mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-02-22 10:20:59 +00:00
webish: add an extra newline to JSON output
This commit is contained in:
parent
616b950869
commit
51612cd1be
@ -82,7 +82,7 @@ class LiteralCheckerResults(rend.Page, ResultsBase):
|
|||||||
data = {"storage-index": "",
|
data = {"storage-index": "",
|
||||||
"results": {"healthy": True},
|
"results": {"healthy": True},
|
||||||
}
|
}
|
||||||
return simplejson.dumps(data, indent=1)
|
return simplejson.dumps(data, indent=1) + "\n"
|
||||||
|
|
||||||
class CheckerResults(rend.Page, ResultsBase):
|
class CheckerResults(rend.Page, ResultsBase):
|
||||||
docFactory = getxmlfile("checker-results.xhtml")
|
docFactory = getxmlfile("checker-results.xhtml")
|
||||||
@ -98,7 +98,7 @@ class CheckerResults(rend.Page, ResultsBase):
|
|||||||
def json(self, ctx):
|
def json(self, ctx):
|
||||||
inevow.IRequest(ctx).setHeader("content-type", "text/plain")
|
inevow.IRequest(ctx).setHeader("content-type", "text/plain")
|
||||||
data = self._json_check_results(self.r)
|
data = self._json_check_results(self.r)
|
||||||
return simplejson.dumps(data, indent=1)
|
return simplejson.dumps(data, indent=1) + "\n"
|
||||||
|
|
||||||
def render_storage_index(self, ctx, data):
|
def render_storage_index(self, ctx, data):
|
||||||
return self.r.get_storage_index_string()
|
return self.r.get_storage_index_string()
|
||||||
@ -133,7 +133,7 @@ class CheckAndRepairResults(rend.Page, ResultsBase):
|
|||||||
def json(self, ctx):
|
def json(self, ctx):
|
||||||
inevow.IRequest(ctx).setHeader("content-type", "text/plain")
|
inevow.IRequest(ctx).setHeader("content-type", "text/plain")
|
||||||
data = self._json_check_and_repair_results(self.r)
|
data = self._json_check_and_repair_results(self.r)
|
||||||
return simplejson.dumps(data, indent=1)
|
return simplejson.dumps(data, indent=1) + "\n"
|
||||||
|
|
||||||
def render_storage_index(self, ctx, data):
|
def render_storage_index(self, ctx, data):
|
||||||
return self.r.get_storage_index_string()
|
return self.r.get_storage_index_string()
|
||||||
@ -200,7 +200,7 @@ class DeepCheckResults(rend.Page, ResultsBase):
|
|||||||
in self.r.get_all_results().items()
|
in self.r.get_all_results().items()
|
||||||
if not r.is_healthy() ]
|
if not r.is_healthy() ]
|
||||||
data["stats"] = self.r.get_stats()
|
data["stats"] = self.r.get_stats()
|
||||||
return simplejson.dumps(data, indent=1)
|
return simplejson.dumps(data, indent=1) + "\n"
|
||||||
|
|
||||||
def render_root_storage_index(self, ctx, data):
|
def render_root_storage_index(self, ctx, data):
|
||||||
return self.r.get_root_storage_index_string()
|
return self.r.get_root_storage_index_string()
|
||||||
@ -348,7 +348,7 @@ class DeepCheckAndRepairResults(rend.Page, ResultsBase):
|
|||||||
in self.r.get_all_results().items()
|
in self.r.get_all_results().items()
|
||||||
if not r.get_pre_repair_results().is_healthy() ]
|
if not r.get_pre_repair_results().is_healthy() ]
|
||||||
data["stats"] = self.r.get_stats()
|
data["stats"] = self.r.get_stats()
|
||||||
return simplejson.dumps(data, indent=1)
|
return simplejson.dumps(data, indent=1) + "\n"
|
||||||
|
|
||||||
def render_root_storage_index(self, ctx, data):
|
def render_root_storage_index(self, ctx, data):
|
||||||
return self.r.get_root_storage_index_string()
|
return self.r.get_root_storage_index_string()
|
||||||
|
@ -692,7 +692,7 @@ def DirectoryJSONMetadata(ctx, dirnode):
|
|||||||
contents['rw_uri'] = drw_uri
|
contents['rw_uri'] = drw_uri
|
||||||
contents['mutable'] = dirnode.is_mutable()
|
contents['mutable'] = dirnode.is_mutable()
|
||||||
data = ("dirnode", contents)
|
data = ("dirnode", contents)
|
||||||
return simplejson.dumps(data, indent=1)
|
return simplejson.dumps(data, indent=1) + "\n"
|
||||||
d.addCallback(_got)
|
d.addCallback(_got)
|
||||||
d.addCallback(text_plain, ctx)
|
d.addCallback(text_plain, ctx)
|
||||||
return d
|
return d
|
||||||
|
@ -398,7 +398,7 @@ def FileJSONMetadata(ctx, filenode):
|
|||||||
if rw_uri:
|
if rw_uri:
|
||||||
data[1]['rw_uri'] = rw_uri
|
data[1]['rw_uri'] = rw_uri
|
||||||
data[1]['mutable'] = filenode.is_mutable()
|
data[1]['mutable'] = filenode.is_mutable()
|
||||||
return text_plain(simplejson.dumps(data, indent=1), ctx)
|
return text_plain(simplejson.dumps(data, indent=1) + "\n", ctx)
|
||||||
|
|
||||||
def FileURI(ctx, filenode):
|
def FileURI(ctx, filenode):
|
||||||
return text_plain(filenode.get_uri(), ctx)
|
return text_plain(filenode.get_uri(), ctx)
|
||||||
|
@ -36,7 +36,7 @@ class IntroducerRoot(rend.Page):
|
|||||||
announcement_summary[service_name] += 1
|
announcement_summary[service_name] += 1
|
||||||
res["announcement_summary"] = announcement_summary
|
res["announcement_summary"] = announcement_summary
|
||||||
|
|
||||||
return simplejson.dumps(res, indent=1)
|
return simplejson.dumps(res, indent=1) + "\n"
|
||||||
|
|
||||||
def data_version(self, ctx, data):
|
def data_version(self, ctx, data):
|
||||||
return get_package_versions_string()
|
return get_package_versions_string()
|
||||||
|
@ -805,7 +805,7 @@ class Status(rend.Page):
|
|||||||
"progress": s.get_progress(),
|
"progress": s.get_progress(),
|
||||||
})
|
})
|
||||||
|
|
||||||
return simplejson.dumps(data, indent=1)
|
return simplejson.dumps(data, indent=1) + "\n"
|
||||||
|
|
||||||
def _get_all_statuses(self, client):
|
def _get_all_statuses(self, client):
|
||||||
return itertools.chain(client.list_all_upload_statuses(),
|
return itertools.chain(client.list_all_upload_statuses(),
|
||||||
@ -931,10 +931,10 @@ class HelperStatus(rend.Page):
|
|||||||
try:
|
try:
|
||||||
h = IClient(ctx).getServiceNamed("helper")
|
h = IClient(ctx).getServiceNamed("helper")
|
||||||
except KeyError:
|
except KeyError:
|
||||||
return simplejson.dumps({})
|
return simplejson.dumps({}) + "\n"
|
||||||
|
|
||||||
stats = h.get_stats()
|
stats = h.get_stats()
|
||||||
return simplejson.dumps(stats, indent=1)
|
return simplejson.dumps(stats, indent=1) + "\n"
|
||||||
|
|
||||||
def render_active_uploads(self, ctx, data):
|
def render_active_uploads(self, ctx, data):
|
||||||
return data["chk_upload_helper.active_uploads"]
|
return data["chk_upload_helper.active_uploads"]
|
||||||
@ -974,7 +974,7 @@ class Statistics(rend.Page):
|
|||||||
t = get_arg(inevow.IRequest(ctx), "t")
|
t = get_arg(inevow.IRequest(ctx), "t")
|
||||||
if t == "json":
|
if t == "json":
|
||||||
inevow.IRequest(ctx).setHeader("content-type", "text/plain")
|
inevow.IRequest(ctx).setHeader("content-type", "text/plain")
|
||||||
return simplejson.dumps(stats, indent=1)
|
return simplejson.dumps(stats, indent=1) + "\n"
|
||||||
# is there a better way to provide 'data' to all rendering methods?
|
# is there a better way to provide 'data' to all rendering methods?
|
||||||
self.original = stats
|
self.original = stats
|
||||||
return rend.Page.renderHTTP(self, ctx)
|
return rend.Page.renderHTTP(self, ctx)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user