Fix account/container size reporting, zero-length object uploading.

pithos/api/functions.py

@@ -423,8 +423,14 @@ def object_write(request, v_account, v_container, v_object):
     if 'Content-Type' not in meta:
         raise LengthRequired('Missing Content-Type header')
     
-    sock = raw_input_socket(request)
     md5 = hashlib.md5()
+    if content_length == 0:
+        try:
+            backend.update_object(request.user, v_container, v_object, '')
+        except NameError:
+            raise ItemNotFound('Container does not exist')
+    else:
+        sock = raw_input_socket(request)
         offset = 0
         for data in socket_read_iterator(sock, content_length):
             # TODO: Raise 408 (Request Timeout) if this takes too long.
@@ -433,7 +439,7 @@ def object_write(request, v_account, v_container, v_object):
             try:
                 backend.update_object(request.user, v_container, v_object, data, offset)
             except NameError:
-            raise ItemNotFound('Object does not exist')
+                raise ItemNotFound('Container does not exist')
             offset += len(data)
     
     meta['hash'] = md5.hexdigest().lower()

pithos/backends/simple.py

@@ -38,7 +38,9 @@ class SimpleBackend(BaseBackend):
             return {'name': account, 'count': 0, 'bytes': 0}
         contents = os.listdir(fullname)
         count = len(contents)
-        size = sum((os.path.getsize(os.path.join(fullname, x)) for x in os.listdir(fullname)))
+        size = 0
+        for y in (os.path.join(fullname, z) for z in contents):
+            size += sum((os.path.getsize(os.path.join(y, x)) for x in os.listdir(y)))
         meta = self._get_metadata(account)
         meta.update({'name': account, 'count': count, 'bytes': size})
         return meta
@@ -81,7 +83,7 @@ class SimpleBackend(BaseBackend):
         fullname = self._get_containerinfo(account, name)
         contents = os.listdir(fullname)
         count = len(contents)
-        size = os.stat(fullname).st_size
+        size = sum((os.path.getsize(os.path.join(fullname, x)) for x in contents))
         meta = self._get_metadata(os.path.join(account, name))
         meta.update({'name': name, 'count': count, 'bytes': size})
         return meta