mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-30 01:38:55 +00:00
cleanup
This commit is contained in:
parent
b51f144f87
commit
79c3f919ba
@ -77,8 +77,6 @@ class BlockingFileError(Exception):
|
|||||||
|
|
||||||
|
|
||||||
def make_handler_for(node, client, parentnode=None, name=None):
|
def make_handler_for(node, client, parentnode=None, name=None):
|
||||||
print("make_handler_for")
|
|
||||||
print(node)
|
|
||||||
if parentnode:
|
if parentnode:
|
||||||
assert IDirectoryNode.providedBy(parentnode)
|
assert IDirectoryNode.providedBy(parentnode)
|
||||||
if IFileNode.providedBy(node):
|
if IFileNode.providedBy(node):
|
||||||
@ -109,11 +107,7 @@ class DirectoryNodeHandler(ReplaceMeMixin, Resource, object):
|
|||||||
return self.render_GET(req)
|
return self.render_GET(req)
|
||||||
elif req.method == 'POST':
|
elif req.method == 'POST':
|
||||||
return self.render_POST(req)
|
return self.render_POST(req)
|
||||||
print("RENDER: {}",format(req))
|
x = super(DirectoryNodeHandler, self).render(req)
|
||||||
print(dir(req))
|
|
||||||
for k in dir(req):
|
|
||||||
print(" {}: {}".format(k, getattr(req, k)))
|
|
||||||
x = super(DirectoryNodeHandler, self).__init__()
|
|
||||||
print(type(x))
|
print(type(x))
|
||||||
print(x)
|
print(x)
|
||||||
return x
|
return x
|
||||||
@ -124,8 +118,6 @@ class DirectoryNodeHandler(ReplaceMeMixin, Resource, object):
|
|||||||
"""
|
"""
|
||||||
# XXX can we do this with putChild() instead? (i.e. does it
|
# XXX can we do this with putChild() instead? (i.e. does it
|
||||||
# HAVE to be dynamic?)
|
# HAVE to be dynamic?)
|
||||||
print("getChild {} {}".format(name, type(name)))
|
|
||||||
print(dir(req))
|
|
||||||
if name is None:
|
if name is None:
|
||||||
name = get_arg(req, "uri")
|
name = get_arg(req, "uri")
|
||||||
d = self.node.get(name.decode('utf8'))
|
d = self.node.get(name.decode('utf8'))
|
||||||
@ -219,8 +211,6 @@ class DirectoryNodeHandler(ReplaceMeMixin, Resource, object):
|
|||||||
def render_GET(self, req):
|
def render_GET(self, req):
|
||||||
# This is where all of the directory-related ?t=* code goes.
|
# This is where all of the directory-related ?t=* code goes.
|
||||||
t = get_arg(req, "t", "").strip()
|
t = get_arg(req, "t", "").strip()
|
||||||
print("RENDER_GET", req)
|
|
||||||
print(t)
|
|
||||||
|
|
||||||
# t=info contains variable ophandles, t=rename-form contains the name
|
# t=info contains variable ophandles, t=rename-form contains the name
|
||||||
# of the child being renamed. Neither is allowed an ETag.
|
# of the child being renamed. Neither is allowed an ETag.
|
||||||
@ -237,10 +227,7 @@ class DirectoryNodeHandler(ReplaceMeMixin, Resource, object):
|
|||||||
self.node,
|
self.node,
|
||||||
self.client.mutable_file_default,
|
self.client.mutable_file_default,
|
||||||
)
|
)
|
||||||
x = renderElement(req, dah)
|
return renderElement(req, dah)
|
||||||
print("X")
|
|
||||||
print(x)
|
|
||||||
return x
|
|
||||||
|
|
||||||
if t == "json":
|
if t == "json":
|
||||||
return DirectoryJSONMetadata(req, self.node)
|
return DirectoryJSONMetadata(req, self.node)
|
||||||
@ -275,7 +262,6 @@ class DirectoryNodeHandler(ReplaceMeMixin, Resource, object):
|
|||||||
raise WebError("PUT to a directory")
|
raise WebError("PUT to a directory")
|
||||||
|
|
||||||
def render_POST(self, req):
|
def render_POST(self, req):
|
||||||
print("RENDER_POST")
|
|
||||||
t = get_arg(req, "t", "").strip()
|
t = get_arg(req, "t", "").strip()
|
||||||
|
|
||||||
if t == "mkdir":
|
if t == "mkdir":
|
||||||
@ -315,13 +301,7 @@ class DirectoryNodeHandler(ReplaceMeMixin, Resource, object):
|
|||||||
|
|
||||||
when_done = get_arg(req, "when_done", None)
|
when_done = get_arg(req, "when_done", None)
|
||||||
if when_done:
|
if when_done:
|
||||||
print("got a when_done: {}".format(when_done))
|
|
||||||
print(dir(req))
|
|
||||||
print(d)
|
|
||||||
def done(res):
|
def done(res):
|
||||||
print("RES: {}".format(type(res)))
|
|
||||||
print(res)
|
|
||||||
print(dir(req))
|
|
||||||
req.redirect(when_done)
|
req.redirect(when_done)
|
||||||
return res
|
return res
|
||||||
d.addCallback(done)
|
d.addCallback(done)
|
||||||
@ -685,7 +665,6 @@ class DirectoryAsHTML(Element):
|
|||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def _get_children(self, req):
|
def _get_children(self, req):
|
||||||
print("beforeRender")
|
|
||||||
# attempt to get the dirnode's children, stashing them (or the
|
# attempt to get the dirnode's children, stashing them (or the
|
||||||
# failure that results) for later use
|
# failure that results) for later use
|
||||||
try:
|
try:
|
||||||
@ -715,7 +694,6 @@ class DirectoryAsHTML(Element):
|
|||||||
|
|
||||||
@renderer
|
@renderer
|
||||||
def title(self, req, tag):
|
def title(self, req, tag):
|
||||||
print("render_title", req, tag)
|
|
||||||
si_s = abbreviated_dirnode(self.node)
|
si_s = abbreviated_dirnode(self.node)
|
||||||
header = ["Tahoe-LAFS - Directory SI=%s" % si_s]
|
header = ["Tahoe-LAFS - Directory SI=%s" % si_s]
|
||||||
if self.node.is_unknown():
|
if self.node.is_unknown():
|
||||||
@ -726,8 +704,6 @@ class DirectoryAsHTML(Element):
|
|||||||
header.append(" (read-only)")
|
header.append(" (read-only)")
|
||||||
else:
|
else:
|
||||||
header.append(" (modifiable)")
|
header.append(" (modifiable)")
|
||||||
print(tag)
|
|
||||||
print(dir(tag))
|
|
||||||
return tag(header)
|
return tag(header)
|
||||||
|
|
||||||
@renderer
|
@renderer
|
||||||
|
Loading…
Reference in New Issue
Block a user