Merge branch 'file-stats-fix' into 'master'

Exclude directories from disk list



See merge request !15

storagedriver.py

@@ -92,7 +92,8 @@ def get_storage_stat(path):
 def get_file_statistics(datastore):
 def get_file_statistics(datastore):
     disks = [Disk.get(datastore, name).get_desc()
     disks = [Disk.get(datastore, name).get_desc()
              for name in listdir(datastore)
              for name in listdir(datastore)
-             if not name.endswith((".dump", "trash"))]
+             if not name.endswith(".dump") and
+             not path.isdir(path.join(datastore, name))]
     dumps = [{'name': name,
     dumps = [{'name': name,
               'size': path.getsize(path.join(datastore, name))}
               'size': path.getsize(path.join(datastore, name))}
              for name in listdir(datastore) if name.endswith(".dump")]
              for name in listdir(datastore) if name.endswith(".dump")]