misc mutable-type fixes:

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

diff --git a/src/allmydata/web/common.py b/src/allmydata/web/common.py
index 0a14bf307ab926c2893e30932b51c307092eec53..13385c5f66bcb5743a45f7aa37dabc0c096872a1 100644 (file)
--- a/src/allmydata/web/common.py
+++ b/src/allmydata/web/common.py
@@ -34,17 +34,34 @@ def parse_replace_arg(replace):
         return boolean_of_arg(replace)
 
 
-def parse_mutable_type_arg(arg):
+def get_format(req, default="CHK"):
+    arg = get_arg(req, "format", None)
     if not arg:
-        return None # interpreted by the caller as "let the nodemaker decide"
+        if boolean_of_arg(get_arg(req, "mutable", "false")):
+            return "SDMF"
+        return default
+    if arg.upper() == "CHK":
+        return "CHK"
+    elif arg.upper() == "SDMF":
+        return "SDMF"
+    elif arg.upper() == "MDMF":
+        return "MDMF"
+    else:
+        raise WebError("Unknown format: %s, I know CHK, SDMF, MDMF" % arg,
+                       http.BAD_REQUEST)
 
-    arg = arg.lower()
-    if arg == "mdmf":
-        return MDMF_VERSION
-    elif arg == "sdmf":
+def get_mutable_type(file_format): # accepts result of get_format()
+    if file_format == "SDMF":
         return SDMF_VERSION
-
-    return "invalid"
+    elif file_format == "MDMF":
+        return MDMF_VERSION
+    else:
+        # this is also used to identify which formats are mutable. Use
+        #  if get_mutable_type(file_format) is not None:
+        #      do_mutable()
+        #  else:
+        #      do_immutable()
+        return None
 
 
 def parse_offset_arg(offset):