Merge branch 'main' of https://github.com/datawhalechina/whale-anno into main

be/.gitignore

@@ -6,3 +6,4 @@ __pycache__
 
 
 /app/projects/*
+!/app/projects/test/

be/app/api/v1/files.py

@@ -66,7 +66,8 @@ def query_file():
 def get_json():
     ret_info = ReturnInfo()
     try:
-        project_name = request.args.get("projectName").strip()
+        
+        project_name = request.args.get("projectName")
         download_json = []
         anno_data = read_json_file(PROJECT_PATH.format(project_name)+'/anno.json')
         for item in anno_data:
@@ -98,9 +99,9 @@ def get_json():
     # 本线默认目录时app下，所以不需要再加/app了，所以不能用PROJECT_PATH
     # 2.创建response对象返回数据
     #使用response可以将result.json再删除掉
-    response = make_response(send_from_directory('', filename=DOWNLOAD_FILE_LOCATION.format(project_name),
+    response = make_response(send_from_directory(directory='', path=DOWNLOAD_FILE_LOCATION.format(project_name),
                                                  as_attachment=True))
-    response.headers["Content-disposition"] = 'attachment; filename={}_result.json'.format(project_name)
+    response.headers["Content-disposition"] = 'attachment; filename=result.json'
     # print(PROJECT_PATH.format(project_name)+'/result.json')
     # os.remove(PROJECT_PATH.format(project_name)+'/result.json')
 

be/app/api/v1/project.py

@@ -34,10 +34,12 @@ def get_zipped_data():
 
         # Put files in the folder directly under the project directory
         for item in os.listdir(target_path):
+
             # If item is a folder,copy files in item to project folder,then remove this folder
             folder_path = target_path + '/' + item
             if os.path.isdir(folder_path):
                 for file in os.listdir(folder_path):
+                    if file.split('.')[-1] == 'txt':
                         shutil.copy(folder_path + '/' + file, folder_path + '/../')
                         # Here  to deal with chinese encode in module zipfile and rarfile
                         if file_type == 'zip':