webapi: pass client through constructor arguments, remove IClient, should make it...

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / web / unlinked.py

diff --git a/src/allmydata/web/unlinked.py b/src/allmydata/web/unlinked.py
index 3b8d95380377eb0e616eab9425663b3a1fafcabc..d3ef96f67148db175ab77d89c325c238e7d14593 100644 (file)
--- a/src/allmydata/web/unlinked.py
+++ b/src/allmydata/web/unlinked.py
@@ -3,42 +3,35 @@ import urllib
 from twisted.web import http
 from twisted.internet import defer
 from nevow import rend, url, tags as T
-from nevow.inevow import IRequest
 from allmydata.immutable.upload import FileHandle
-from allmydata.web.common import IClient, getxmlfile, get_arg, boolean_of_arg
+from allmydata.web.common import getxmlfile, get_arg, boolean_of_arg
 from allmydata.web import status
 
-def PUTUnlinkedCHK(ctx):
-    req = IRequest(ctx)
+def PUTUnlinkedCHK(req, client):
     # "PUT /uri", to create an unlinked file.
-    client = IClient(ctx)
     uploadable = FileHandle(req.content, client.convergence)
     d = client.upload(uploadable)
     d.addCallback(lambda results: results.uri)
     # that fires with the URI of the new file
     return d
 
-def PUTUnlinkedSSK(ctx):
-    req = IRequest(ctx)
+def PUTUnlinkedSSK(req, client):
     # SDMF: files are small, and we can only upload data
     req.content.seek(0)
     data = req.content.read()
-    d = IClient(ctx).create_mutable_file(data)
+    d = client.create_mutable_file(data)
     d.addCallback(lambda n: n.get_uri())
     return d
 
-def PUTUnlinkedCreateDirectory(ctx):
-    req = IRequest(ctx)
+def PUTUnlinkedCreateDirectory(req, client):
     # "PUT /uri?t=mkdir", to create an unlinked directory.
-    d = IClient(ctx).create_empty_dirnode()
+    d = client.create_empty_dirnode()
     d.addCallback(lambda dirnode: dirnode.get_uri())
     # XXX add redirect_to_result
     return d
 
 
-def POSTUnlinkedCHK(ctx):
-    req = IRequest(ctx)
-    client = IClient(ctx)
+def POSTUnlinkedCHK(req, client):
     fileobj = req.fields["file"].file
     uploadable = FileHandle(fileobj, client.convergence)
     d = client.upload(uploadable)
@@ -54,7 +47,7 @@ def POSTUnlinkedCHK(ctx):
         d.addCallback(_done, when_done)
     else:
         # return the Upload Results page, which includes the URI
-        d.addCallback(UploadResultsPage, ctx)
+        d.addCallback(UploadResultsPage)
     return d
 
 
@@ -62,7 +55,7 @@ class UploadResultsPage(status.UploadResultsRendererMixin, rend.Page):
     """'POST /uri', to create an unlinked file."""
     docFactory = getxmlfile("upload-results.xhtml")
 
-    def __init__(self, upload_results, ctx):
+    def __init__(self, upload_results):
         rend.Page.__init__(self)
         self.results = upload_results
 
@@ -85,21 +78,19 @@ class UploadResultsPage(status.UploadResultsRendererMixin, rend.Page):
                       ["/uri/" + res.uri])
         return d
 
-def POSTUnlinkedSSK(ctx):
-    req = IRequest(ctx)
+def POSTUnlinkedSSK(req, client):
     # "POST /uri", to create an unlinked file.
     # SDMF: files are small, and we can only upload data
     contents = req.fields["file"]
     contents.file.seek(0)
     data = contents.file.read()
-    d = IClient(ctx).create_mutable_file(data)
+    d = client.create_mutable_file(data)
     d.addCallback(lambda n: n.get_uri())
     return d
 
-def POSTUnlinkedCreateDirectory(ctx):
-    req = IRequest(ctx)
+def POSTUnlinkedCreateDirectory(req, client):
     # "POST /uri?t=mkdir", to create an unlinked directory.
-    d = IClient(ctx).create_empty_dirnode()
+    d = client.create_empty_dirnode()
     redirect = get_arg(req, "redirect_to_result", "false")
     if boolean_of_arg(redirect):
         def _then_redir(res):