ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-25 05:19:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

web t=json: add 'mutable' key to the information dict

Browse Source
This commit is contained in:
Brian Warner 2008-05-20 15:40:49 -07:00
parent 9c992c0d06
commit 3ac4a734e5
4 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/webapi.txt
View File

@ -298,6 +298,7 @@ GET /uri/$DIRCAP/[SUBDIRS../]FILENAME?t=json
[ "filenode", { "ro_uri": file_uri, [ "filenode", { "ro_uri": file_uri,
"size": bytes, "size": bytes,
"mutable": false,
"metadata": {"ctime": 1202777696.7564139, "metadata": {"ctime": 1202777696.7564139,
"mtime": 1202777696.7564139 "mtime": 1202777696.7564139
} }
@ -315,6 +316,7 @@ GET /uri/$DIRCAP/[SUBDIRS../]FILENAME?t=json
[ "dirnode", { "rw_uri": read_write_uri, [ "dirnode", { "rw_uri": read_write_uri,
"ro_uri": read_only_uri, "ro_uri": read_only_uri,
"mutable": true,
"children": { "children": {
"foo.txt": [ "filenode", { "ro_uri": uri, "foo.txt": [ "filenode", { "ro_uri": uri,
"size": bytes, "size": bytes,

4
src/allmydata/test/test_web.py
View File

@ -183,6 +183,7 @@ class WebMixin(object):
self.failUnless(isinstance(data, list)) self.failUnless(isinstance(data, list))
self.failUnlessEqual(data[0], "filenode") self.failUnlessEqual(data[0], "filenode")
self.failUnless(isinstance(data[1], dict)) self.failUnless(isinstance(data[1], dict))
self.failIf(data[1]["mutable"])
self.failIf("rw_uri" in data[1]) # immutable self.failIf("rw_uri" in data[1]) # immutable
self.failUnlessEqual(data[1]["ro_uri"], self._bar_txt_uri) self.failUnlessEqual(data[1]["ro_uri"], self._bar_txt_uri)
self.failUnlessEqual(data[1]["size"], len(self.BAR_CONTENTS)) self.failUnlessEqual(data[1]["size"], len(self.BAR_CONTENTS))
@ -192,6 +193,7 @@ class WebMixin(object):
self.failUnless(isinstance(data, list)) self.failUnless(isinstance(data, list))
self.failUnlessEqual(data[0], "dirnode", res) self.failUnlessEqual(data[0], "dirnode", res)
self.failUnless(isinstance(data[1], dict)) self.failUnless(isinstance(data[1], dict))
self.failUnless(data[1]["mutable"])
self.failUnless("rw_uri" in data[1]) # mutable self.failUnless("rw_uri" in data[1]) # mutable
self.failUnlessEqual(data[1]["rw_uri"], self._foo_uri) self.failUnlessEqual(data[1]["rw_uri"], self._foo_uri)
self.failUnlessEqual(data[1]["ro_uri"], self._foo_readonly_uri) self.failUnlessEqual(data[1]["ro_uri"], self._foo_readonly_uri)
@ -1150,6 +1152,7 @@ class Web(WebMixin, unittest.TestCase):
self.failUnless("new.txt" in children) self.failUnless("new.txt" in children)
new_json = children["new.txt"] new_json = children["new.txt"]
self.failUnlessEqual(new_json[0], "filenode") self.failUnlessEqual(new_json[0], "filenode")
self.failUnless(new_json[1]["mutable"])
self.failUnlessEqual(new_json[1]["rw_uri"], self._mutable_uri) self.failUnlessEqual(new_json[1]["rw_uri"], self._mutable_uri)
ro_uri = unicode(self._mutable_node.get_readonly().to_string()) ro_uri = unicode(self._mutable_node.get_readonly().to_string())
self.failUnlessEqual(new_json[1]["ro_uri"], ro_uri) self.failUnlessEqual(new_json[1]["ro_uri"], ro_uri)
@ -1161,6 +1164,7 @@ class Web(WebMixin, unittest.TestCase):
def _check_file_json(res): def _check_file_json(res):
parsed = simplejson.loads(res) parsed = simplejson.loads(res)
self.failUnlessEqual(parsed[0], "filenode") self.failUnlessEqual(parsed[0], "filenode")
self.failUnless(parsed[1]["mutable"])
self.failUnlessEqual(parsed[1]["rw_uri"], self._mutable_uri) self.failUnlessEqual(parsed[1]["rw_uri"], self._mutable_uri)
ro_uri = unicode(self._mutable_node.get_readonly().to_string()) ro_uri = unicode(self._mutable_node.get_readonly().to_string())
self.failUnlessEqual(parsed[1]["ro_uri"], ro_uri) self.failUnlessEqual(parsed[1]["ro_uri"], ro_uri)

2
src/allmydata/web/directory.py
View File

@ -645,6 +645,7 @@ def DirectoryJSONMetadata(ctx, dirnode):
kiddata[1]["ro_uri"] = ro_uri kiddata[1]["ro_uri"] = ro_uri
if rw_uri: if rw_uri:
kiddata[1]["rw_uri"] = rw_uri kiddata[1]["rw_uri"] = rw_uri
kiddata[1]['mutable'] = childnode.is_mutable()
kids[name] = kiddata kids[name] = kiddata
if dirnode.is_readonly(): if dirnode.is_readonly():
drw_uri = None drw_uri = None
@ -657,6 +658,7 @@ def DirectoryJSONMetadata(ctx, dirnode):
contents['ro_uri'] = dro_uri contents['ro_uri'] = dro_uri
if drw_uri: if drw_uri:
contents['rw_uri'] = drw_uri contents['rw_uri'] = drw_uri
contents['mutable'] = dirnode.is_mutable()
data = ("dirnode", contents) data = ("dirnode", contents)
return simplejson.dumps(data, indent=1) return simplejson.dumps(data, indent=1)
d.addCallback(_got) d.addCallback(_got)

1
src/allmydata/web/filenode.py
View File

@ -380,6 +380,7 @@ def FileJSONMetadata(ctx, filenode):
data[1]['ro_uri'] = ro_uri data[1]['ro_uri'] = ro_uri
if rw_uri: if rw_uri:
data[1]['rw_uri'] = rw_uri data[1]['rw_uri'] = rw_uri
data[1]['mutable'] = filenode.is_mutable()
return text_plain(simplejson.dumps(data, indent=1), ctx) return text_plain(simplejson.dumps(data, indent=1), ctx)
def FileURI(ctx, filenode): def FileURI(ctx, filenode):