Merge remote-tracking branch 'origin/develop' into develop

CoderWanFeng · Sep 8, 2022 · cb95569 · cb95569
2 parents cc9a114 + 1049a88
commit cb95569
Show file tree

Hide file tree

Showing 10 changed files with 119 additions and 2 deletions.
diff --git a/office/api/testApi/ruiming.py b/office/api/testApi/ruiming.py
@@ -11,4 +11,9 @@ def screen_unmarked_image(dir_path):
 
 @except_dec()
 def change_label_in_xml(dir_path, old_label, new_label):
-    ruiming.change_label_in_xml(dir_path, old_label, new_label)
+    ruiming.change_label_in_xml(dir_path, old_label, new_label)
+
+
+@except_dec()
+def screen_without_label_json_file(dir_path):
+    ruiming.screen_without_label_json_file(dir_path)
diff --git a/office/core/TestTypes/RuimingType.py b/office/core/TestTypes/RuimingType.py
@@ -1,6 +1,7 @@
 import pathlib
 import shutil
 import xml.etree.ElementTree
+import json
 
 
 class MainRuiming():
@@ -69,3 +70,22 @@ def change_label_in_xml(self, dir_path, old_label, new_label):
                     xml_file.write(str(file), encoding="utf-8")
         else:
             print("请输入正确的路径！")
+
+    def screen_without_label_json_file(self, dir_path):
+        dir_path = pathlib.Path(dir_path).resolve()
+        if dir_path.is_dir():
+            print("正在筛选无标签内容的json文件")
+            without_label_json_storage_path = dir_path.joinpath("无标签json文件")
+            self.__make_dir(dir_path, "无标签json文件")
+            dir_path_file_list = list(dir_path.iterdir())
+            for file_name in dir_path_file_list:
+                if file_name.is_file() and file_name.suffix == ".json":
+                    json_file = open(file_name, "r")
+                    json_file_text = json.load(json_file)
+                    json_file.close()
+                    if json_file_text["shapes"] == []:
+                        shutil.move(dir_path.joinpath(file_name.name),
+                                    without_label_json_storage_path.joinpath(file_name.name))
+            print("筛选完成")
+        else:
+            print("路径输入有误，请检查！")
diff --git a/tests/test_files/json/1.json b/tests/test_files/json/1.json
diff --git a/tests/test_files/json/10.json b/tests/test_files/json/10.json
diff --git a/tests/test_files/json/11.json b/tests/test_files/json/11.json
diff --git a/tests/test_files/json/12.json b/tests/test_files/json/12.json
diff --git a/tests/test_files/json/148.json b/tests/test_files/json/148.json
diff --git a/tests/test_files/json/15.json b/tests/test_files/json/15.json
diff --git a/tests/test_files/json/152.json b/tests/test_files/json/152.json
diff --git a/tests/test_ruiming.py b/tests/test_ruiming.py
@@ -1,6 +1,6 @@
 import unittest
 
-from office.api.testApi.ruiming import screen_unmarked_image, change_label_in_xml
+from office.api.testApi.ruiming import screen_unmarked_image, change_label_in_xml, screen_without_label_json_file
 
 
 class TestExcel(unittest.TestCase):
@@ -9,3 +9,7 @@ def test_screen_unmarked_image(self):
 
     def test_change_label_in_xml(self):
         change_label_in_xml(dir_path=r".\xml", old_label="测试", new_label="测试1")
+
+    def test_screen_without_label_json_file(self):
+        screen_without_label_json_file(dir_path="./test_files/json")
+        # 预期结果：除1.json外均被移动到”无标签json文件“文件夹中