store: refactor file_dict creation to new function

miscellaneous/store-server/CloudStore.py

@@ -305,18 +305,21 @@ def list_directory(home, path):
             return json.dumps((os.path.basename(path), 'F', os.path.getsize(path), os.path.getmtime(path)))
             return json.dumps((os.path.basename(path), 'F', os.path.getsize(path), os.path.getmtime(path)))
         # List directory and return list
         # List directory and return list
         else:
         else:
-            tuplelist = []
             filelist = os.listdir(path)
             filelist = os.listdir(path)
-        # Add type support
-            for item in filelist:
-                static_route = path+"/"+item
-                if os.path.isdir(static_route):
-                    is_dir = 'D'
-                else:
-                    is_dir = 'F'
-                element = { 'NAME' : item, 'TYPE' : is_dir, 'SIZE' : os.path.getsize(static_route)/1024, 'MTIME' : os.path.getmtime(static_route) }
-                tuplelist.append(element)
-            return json.dumps(tuplelist)
+            dictlist = [file_dict(os.path.join(path, f), home) for f in filelist]
+            return json.dumps(dictlist)
+
+def file_dict(path, home):
+    basename = os.path.basename(path.rstrip('/'))
+    if os.path.isdir(path):
+        is_dir = 'D'
+    else:
+        is_dir = 'F'
+    return {'NAME': basename,
+            'TYPE': is_dir,
+            'SIZE': os.path.getsize(path)/1024,
+            'MTIME': os.path.getmtime(path),
+            'DIR': os.path.relpath(os.path.dirname(path), home)}
 
 
 def getQuotaStatus(neptun):
 def getQuotaStatus(neptun):
     output=subprocess.check_output([ROOT_BIN_FOLDER+'/'+USER_MANAGER, 'status', neptun], stderr=subprocess.STDOUT)
     output=subprocess.check_output([ROOT_BIN_FOLDER+'/'+USER_MANAGER, 'status', neptun], stderr=subprocess.STDOUT)