create_node_from_uri: take both writecap+readcap, move logic out of dirnode.py

diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index 5dd00d9f220cab1e9d0a5315cbcef08d924e8e60..08d559e555fba1e139520f4b9ce700473c8a87e1 100644 (file)
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -404,8 +404,10 @@ class Client(node.Node, pollmixin.PollMixin):
     # dirnodes. The first takes a URI and produces a filenode or (new-style)
     # dirnode. The other three create brand-new filenodes/dirnodes.
 
-    def create_node_from_uri(self, u):
+    def create_node_from_uri(self, u, readcap=None):
         # this returns synchronously.
+        if not u:
+            u = readcap
         u = IURI(u)
         u_s = u.to_string()
         if u_s not in self._node_cache:

diff --git a/src/allmydata/dirnode.py b/src/allmydata/dirnode.py
index f0f8421d3e560fb0cea4526673cb0710380354b5..b8113b3aab106c43063932b508193d9f8c239787 100644 (file)
--- a/src/allmydata/dirnode.py
+++ b/src/allmydata/dirnode.py
@@ -15,8 +15,7 @@ from allmydata.check_results import DeepCheckResults, \
 from allmydata.monitor import Monitor
 from allmydata.util import hashutil, mathutil, base32, log
 from allmydata.util.assertutil import _assert, precondition
-from allmydata.util.hashutil import netstring
-from allmydata.util.netstring import split_netstring
+from allmydata.util.netstring import netstring, split_netstring
 from allmydata.uri import NewDirectoryURI, LiteralFileURI, from_string
 from pycryptopp.cipher.aes import AES
 
@@ -189,9 +188,7 @@ class NewDirectoryNode:
         return plaintext
 
     def _create_node(self, rwcap, rocap):
-        if rwcap:
-            return self._client.create_node_from_uri(rwcap)
-        return self._client.create_node_from_uri(rocap)
+        return self._client.create_node_from_uri(rwcap, rocap)
 
     def _unpack_contents(self, data):
         # the directory is serialized as a list of netstrings, one per child.
@@ -212,6 +209,10 @@ class NewDirectoryNode:
             rwcap = None
             if writeable:
                 rwcap = self._decrypt_rwcapdata(rwcapdata)
+            if not rwcap:
+                rwcap = None # rwcap is None or a non-empty string
+            if not rocap:
+                rocap = None # rocap is None or a non-empty string
             child = self._create_node(rwcap, rocap)
             metadata = simplejson.loads(metadata_s)
             assert isinstance(metadata, dict)
@@ -230,8 +231,12 @@ class NewDirectoryNode:
                     or IDirectoryNode.providedBy(child)), (name,child)
             assert isinstance(metadata, dict)
             rwcap = child.get_uri() # might be RO if the child is not writeable
+            if rwcap is None:
+                rwcap = ""
             assert isinstance(rwcap, str), rwcap
             rocap = child.get_readonly_uri()
+            if rocap is None:
+                rocap = ""
             assert isinstance(rocap, str), rocap
             entry = "".join([netstring(name.encode("utf-8")),
                              netstring(rocap),

diff --git a/src/allmydata/interfaces.py b/src/allmydata/interfaces.py
index 2aa265648eac6d302e1049e6b35bb6aa42fa60dc..86e8312434c1bb3db31005ab4a35f31e7570faf6 100644 (file)
--- a/src/allmydata/interfaces.py
+++ b/src/allmydata/interfaces.py
@@ -2007,11 +2007,16 @@ class IClient(Interface):
         @return: a Deferred that fires with the new IDirectoryNode instance.
         """
 
-    def create_node_from_uri(uri):
+    def create_node_from_uri(uri, rouri):
         """Create a new IFilesystemNode instance from the uri, synchronously.
-        @param uri: a string or IURI-providing instance. This could be for a
-                    LiteralFileNode, a CHK file node, a mutable file node, or
-                    a directory node
+        @param uri: a string or IURI-providing instance, or None. This could
+                    be for a LiteralFileNode, a CHK file node, a mutable file
+                    node, or a directory node
+        @param rouri: a string or IURI-providing instance, or None. If the
+                      main uri is None, I will use the rouri instead. If I
+                      recognize the format of the main uri, I will ignore the
+                      rouri (because it can be derived from the writecap).
+
         @return: an instance that provides IFilesystemNode (or more usefully
                  one of its subclasses). File-specifying URIs will result in
                  IFileNode or IMutableFileNode -providing instances, like

diff --git a/src/allmydata/test/test_dirnode.py b/src/allmydata/test/test_dirnode.py
index 45567198ce07bf6d5aec3539dfe54151bee248ae..0321726a867c37388d755f9e025cc470db32a41f 100644 (file)
--- a/src/allmydata/test/test_dirnode.py
+++ b/src/allmydata/test/test_dirnode.py
@@ -76,7 +76,9 @@ class FakeClient:
         d.addCallback(_got_data)
         return d
 
-    def create_node_from_uri(self, u):
+    def create_node_from_uri(self, u, readcap=None):
+        if not u:
+            u = readcap
         u = IURI(u)
         if (INewDirectoryURI.providedBy(u)
             or IReadonlyNewDirectoryURI.providedBy(u)):

diff --git a/src/allmydata/test/test_mutable.py b/src/allmydata/test/test_mutable.py
index 91765fe0f8517376c3c6f3149e778eff39e75354..a5fc9b89732593122a504295a55a4b4a2654de8d 100644 (file)
--- a/src/allmydata/test/test_mutable.py
+++ b/src/allmydata/test/test_mutable.py
@@ -208,7 +208,9 @@ class FakeClient:
     def get_history(self):
         return None
 
-    def create_node_from_uri(self, u):
+    def create_node_from_uri(self, u, readcap=None):
+        if not u:
+            u = readcap
         u = IURI(u)
         assert IMutableFileURI.providedBy(u), u
         res = self.mutable_file_node_class(self).init_from_uri(u)

diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py
index c3bd38758c32d5a42cf5b66d6f1e05894ef4ab89..c6638ce709c705f4d5a17bc5b17e546534a0b301 100644 (file)
--- a/src/allmydata/test/test_web.py
+++ b/src/allmydata/test/test_web.py
@@ -63,7 +63,9 @@ class FakeClient(service.MultiService):
     def get_storage_broker(self):
         return self.storage_broker
 
-    def create_node_from_uri(self, auri):
+    def create_node_from_uri(self, auri, readcap=None):
+        if not auri:
+            auri = readcap
         precondition(isinstance(auri, str), auri)
         u = uri.from_string(auri)
         if (INewDirectoryURI.providedBy(u)