Changeset 2004927 in trunk

Timestamp:

2014-10-10T19:16:12Z (11 years ago)

Author:

zooko <zookog@…>

Branches:

master

Children:

346b5c4

Parents:

5bd7600 (diff), 425b904 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pull request #120 from zancas/1634-dont-return-none_5

1634 dont return none 5

Location:

src/allmydata

Files:

• test/test_json_metadata.py (added)
• web/common.py (modified) (1 diff)
• web/directory.py (modified) (3 diffs)
• web/filenode.py (modified) (4 diffs)

src/allmydata/web/common.py ¶

@@ -19 +19 @@
 TIME_FORMAT = "%H:%M:%S %d-%b-%Y"
 
+def get_filenode_metadata(filenode):
+    metadata = {'mutable': filenode.is_mutable()}
+    if metadata['mutable']:
+        mutable_type = filenode.get_version()
+        assert mutable_type in (SDMF_VERSION, MDMF_VERSION)
+        if mutable_type == MDMF_VERSION:
+            file_format = "MDMF"
+        else:
+            file_format = "SDMF"
+    else:
+        file_format = "CHK"
+    metadata['format'] = file_format
+    if filenode.get_size() is not None:
+        metadata['size'] = filenode.get_size()
+    return metadata
 
 class IOpHandleTable(Interface):

src/allmydata/web/directory.py ¶

@@ -27 +27 @@
      should_create_intermediate_directories, \
      getxmlfile, RenderMixin, humanize_failure, convert_children_json, \
-     get_format, get_mutable_type
+     get_format, get_mutable_type, get_filenode_metadata
 from allmydata.web.filenode import ReplaceMeMixin, \
      FileNodeHandler, PlaceHolderNodeHandler
@@ -870 +870 @@
         return get_arg(req, "results", "")
 
-
 def DirectoryJSONMetadata(ctx, dirnode):
     d = dirnode.list()
@@ -880 +879 @@
             ro_uri = childnode.get_readonly_uri()
             if IFileNode.providedBy(childnode):
-                kiddata = ("filenode", {'size': childnode.get_size(),
-                                        'mutable': childnode.is_mutable(),
-                                        })
-                if childnode.is_mutable():
-                    mutable_type = childnode.get_version()
-                    assert mutable_type in (SDMF_VERSION, MDMF_VERSION)
-                    if mutable_type == MDMF_VERSION:
-                        file_format = "MDMF"
-                    else:
-                        file_format = "SDMF"
-                else:
-                    file_format = "CHK"
-                kiddata[1]['format'] = file_format
-
+                kiddata = ("filenode", get_filenode_metadata(childnode))
             elif IDirectoryNode.providedBy(childnode):
                 kiddata = ("dirnode", {'mutable': childnode.is_mutable()})

src/allmydata/web/filenode.py ¶

@@ -7 +7 @@
 from nevow.inevow import IRequest
 
-from allmydata.interfaces import ExistingChildError, SDMF_VERSION, MDMF_VERSION
+from allmydata.interfaces import ExistingChildError
 from allmydata.monitor import Monitor
 from allmydata.immutable.upload import FileHandle
@@ -19 +19 @@
      boolean_of_arg, get_arg, should_create_intermediate_directories, \
      MyExceptionHandler, parse_replace_arg, parse_offset_arg, \
-     get_format, get_mutable_type
+     get_format, get_mutable_type, get_filenode_metadata
 from allmydata.web.check_results import CheckResultsRenderer, \
      CheckAndRepairResultsRenderer, LiteralCheckResultsRenderer
@@ -499 +499 @@
     rw_uri = filenode.get_write_uri()
     ro_uri = filenode.get_readonly_uri()
-    data = ("filenode", {})
-    data[1]['size'] = filenode.get_size()
+    data = ("filenode", get_filenode_metadata(filenode))
     if ro_uri:
         data[1]['ro_uri'] = ro_uri
@@ -508 +507 @@
     if verifycap:
         data[1]['verify_uri'] = verifycap.to_string()
-    data[1]['mutable'] = filenode.is_mutable()
     if edge_metadata is not None:
         data[1]['metadata'] = edge_metadata
-
-    if filenode.is_mutable():
-        mutable_type = filenode.get_version()
-        assert mutable_type in (SDMF_VERSION, MDMF_VERSION)
-        if mutable_type == MDMF_VERSION:
-            file_format = "MDMF"
-        else:
-            file_format = "SDMF"
-    else:
-        file_format = "CHK"
-    data[1]['format'] = file_format
 
     return text_plain(simplejson.dumps(data, indent=1) + "\n", ctx)