load_folder_files: support passing in folder list

This commit is contained in:
debugtalk
2017-09-22 19:04:29 +08:00
parent 8d2d52b192
commit eaf080212c
2 changed files with 24 additions and 2 deletions

View File

@@ -65,6 +65,16 @@ def load_folder_files(folder_path, recursive=True):
folder_path: specified folder path to load
recursive: if True, will load files recursively
"""
if isinstance(folder_path, (list, set)):
files = []
for path in set(folder_path):
files.extend(load_folder_files(path, recursive))
return files
if not os.path.exists(folder_path):
return []
file_list = []
for dirpath, dirnames, filenames in os.walk(folder_path):

View File

@@ -45,9 +45,21 @@ class TestUtils(ApiServerUnittest):
self.assertIn(file2, files)
self.assertNotIn(file1, files)
files = utils.load_folder_files(folder)
files_1 = utils.load_folder_files(folder)
api_file = os.path.join(os.getcwd(), 'tests', 'api', 'demo.yml')
self.assertEqual(files[0], api_file)
self.assertEqual(files_1[0], api_file)
folder_list = [folder, folder]
files_2 = utils.load_folder_files(folder)
api_file = os.path.join(os.getcwd(), 'tests', 'api', 'demo.yml')
self.assertEqual(files_2[0], api_file)
self.assertEqual(len(files_1), len(files_2))
files = utils.load_folder_files("not_existed_foulder", recursive=False)
self.assertEqual([], files)
files = utils.load_folder_files(file2, recursive=False)
self.assertEqual([], files)
def test_query_json(self):
json_content = {