Change get_disk_images function in store API to get list of files with given extensions

circle/dashboard/forms.py

@@ -935,7 +935,9 @@ class VmImportDiskForm(OperationForm):
         self.user = kwargs.pop('user')
         self.user = kwargs.pop('user')
         super(VmImportDiskForm, self).__init__(*args, **kwargs)
         super(VmImportDiskForm, self).__init__(*args, **kwargs)
 
 
-        disk_paths = Store(self.user).get_disk_images()
+        disk_paths = Store(self.user).get_files_with_exts(
+            [f[0] for f in Disk.EXPORT_FORMATS]
+        )
         disk_filenames = [os.path.basename(item) for item in disk_paths]
         disk_filenames = [os.path.basename(item) for item in disk_paths]
         self.choices = zip(disk_paths, disk_filenames)
         self.choices = zip(disk_paths, disk_filenames)
 
 

circle/dashboard/store_api.py

@@ -110,14 +110,16 @@ class Store(object):
         else:
         else:
             return result
             return result
 
 
-    def get_disk_images(self, path='/'):
-        images = []
+    def get_files_with_exts(self, exts, path='/'):
+        """
+        Get list of files from store with the given file extensions.
+        """
+        matching_files = []
         file_list = self.list(path, process=False)
         file_list = self.list(path, process=False)
-        export_formats = [item[0] for item in Disk.EXPORT_FORMATS]
         for item in file_list:
         for item in file_list:
-            if os.path.splitext(item['NAME'])[1].strip('.') in export_formats:
-                images.append(os.path.join(path, item['NAME']))
-        return images
+            if os.path.splitext(item['NAME'])[1].strip('.') in exts:
+                matching_files.append(os.path.join(path, item['NAME']))
+        return matching_files
 
 
     def request_download(self, path):
     def request_download(self, path):
         r = self._request_cmd("DOWNLOAD", PATH=path, timeout=10)
         r = self._request_cmd("DOWNLOAD", PATH=path, timeout=10)