Changeset a8a768ef in trunk for src/allmydata

Timestamp:

2009-12-27T22:54:43Z (15 years ago)

Author:

Brian Warner <warner@…>

Branches:

master

Children:

00d0ca3

Parents:

931ab76

Message:

Fix 'tahoe ls' on files (#771). Patch adapted from Kevan Carstensen.

web/filenode.py: also serve edge metadata when using t=json on a

DIRCAP/childname object.

tahoe_ls.py: list file objects as if we were listing one-entry directories.

Show edge metadata if we have it, which will be true when doing
'tahoe ls DIRCAP/filename' and false when doing 'tahoe ls
FILECAP'

Location:

src/allmydata

Files:

• scripts/tahoe_ls.py (modified) (1 diff)
• test/test_cli.py (modified) (1 diff)
• test/test_web.py (modified) (2 diffs)
• web/filenode.py (modified) (3 diffs)

src/allmydata/scripts/tahoe_ls.py ¶

@@ -53 +53 @@
     elif nodetype == "filenode":
         childname = path.split("/")[-1]
-        children = {childname: d}
+        children = {childname: (nodetype, d)}
     childnames = sorted(children.keys())
     now = time.time()

src/allmydata/test/test_cli.py ¶

@@ -786 +786 @@
         d.addCallback(lambda ign: self.do_cli("ls", "0share"))
         d.addCallback(_check3)
+        def _check4((rc, out, err)):
+            self.failUnlessEqual(rc, 0)
+            self.failUnlessIn("good", out)
+        d.addCallback(lambda ign: self.do_cli("ls", "good"))
+        d.addCallback(_check4)
         return d
 

src/allmydata/test/test_web.py ¶

@@ -861 +861 @@
         return d
 
+    def failUnlessHasBarDotTxtMetadata(self, res):
+        data = simplejson.loads(res)
+        self.failUnless(isinstance(data, list))
+        self.failUnless(data[1].has_key("metadata"))
+        self.failUnless(data[1]["metadata"].has_key("ctime"))
+        self.failUnless(data[1]["metadata"].has_key("mtime"))
+        self.failUnlessEqual(data[1]["metadata"]["ctime"],
+                             self._bar_txt_metadata["ctime"])
+
     def test_GET_FILEURL_json(self):
         # twisted.web.http.parse_qs ignores any query args without an '=', so
@@ -867 +876 @@
         # completely.
         d = self.GET(self.public_url + "/foo/bar.txt?t=json")
-        d.addCallback(self.failUnlessIsBarJSON)
+        def _check1(data):
+            self.failUnlessIsBarJSON(data)
+            self.failUnlessHasBarDotTxtMetadata(data)
+            return
+        d.addCallback(_check1)
         return d
 

src/allmydata/web/filenode.py ¶

@@ -187 +187 @@
             return d
         if t == "json":
-            return FileJSONMetadata(ctx, self.node)
+            if self.parentnode and self.name:
+                d = self.parentnode.get_metadata_for(self.name)
+            else:
+                d = defer.succeed(None)
+            d.addCallback(lambda md: FileJSONMetadata(ctx, self.node, md))
+            return d
         if t == "info":
             return MoreInfo(self.node)
@@ -422 +427 @@
 
 
-def FileJSONMetadata(ctx, filenode):
+def FileJSONMetadata(ctx, filenode, edge_metadata=None):
     if filenode.is_readonly():
         rw_uri = None
@@ -439 +444 @@
         data[1]['verify_uri'] = verifycap.to_string()
     data[1]['mutable'] = filenode.is_mutable()
+    if edge_metadata:
+        data[1]["metadata"] = edge_metadata
     return text_plain(simplejson.dumps(data, indent=1) + "\n", ctx)