修复签章解析导致的异常

README.md

@@ -29,7 +29,7 @@ https://github.com/renoyuan/easyofd/wiki/FAQ
 
 2 gui 工具 ，之前提供过一个开箱即用的gui工具 v0.1.0.1版本后就没有更新过了，有时间会更新下。
 
-3 功能上 对于pfd2ofd 和 ofd 生成 可能会  
+3 功能上 对于pfd2ofd 和 ofd 生成 可能会有一些优化
 
 4 需求收集，若有其他相关easyofd 的需求和建议可以git 上给我提，有意思的需求我会考虑尝试。
 

easyofd/__init__.py

@@ -1,3 +1,3 @@
 from .ofd import OFD
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 __all__ = ["OFD"]

easyofd/draw/draw_ofd.py

@@ -113,7 +113,7 @@ def build_content_res(self, pil_img_list=None, pdf_info_list=None, id_obj: CurId
         if pil_img_list:
             for idx, pil_img in enumerate(pil_img_list):
                 # print(pil_img)
-                print(idx, pil_img[1], pil_img[2])
+                # print(idx, pil_img[1], pil_img[2])
                 PhysicalBox = f"0 0 {pil_img[1]} {pil_img[2]}"
                 ImageObject = [{
                                     "@ID": 0,
@@ -126,7 +126,7 @@ def build_content_res(self, pil_img_list=None, pdf_info_list=None, id_obj: CurId
                 conten = ContentTemplate(PhysicalBox=PhysicalBox, ImageObject=ImageObject,
 
                                          CGTransform=[],PathObject=[],TextObject=[], id_obj=id_obj)
-                print(conten)
+                # print(conten)
                 content_res_list.append(conten)
         elif pdf_info_list:  # 写入读取后的pdf 结果 # todo 图片id 需要关联得提前定义或者有其他方式反向对齐
 

easyofd/parser_ofd/ofd_parser.py

@@ -93,14 +93,18 @@ def img2data(self,imglist):
     # 获得xml 对象
     def get_xml_obj(self, label):
         assert label
+        # print(self.file_tree.keys())
         for abs_p in self.file_tree:
             # 统一符号，避免win linux 路径冲突
 
-            abs_p_compare = abs_p.replace("\\","-").replace("/","-")  
-            label_compare = label.replace("\\","-").replace("/","-") 
+            abs_p_compare = abs_p.replace("\\\\","-").replace("//","-").replace("\\","-").replace("/","-")
+            label_compare = label.replace("\\\\","-").replace("//","-").replace("\\","-").replace("/","-")
             if label_compare in abs_p_compare:
                 # logger.info(f"{label} {abs_p}")
                 return self.file_tree[abs_p]
+        logger.info("ofd file path is not")
+        return ""
+
 
     def jb22png(self, img_d:dict):
         """
@@ -238,16 +242,16 @@ def parser(self, ):
                     prefix = BaseLoc.split("/")[0]
                     signatures_info = SignatureFileParser(signature_xml_obj)(prefix=prefix)
                     # print(signatures_info)
-
+                    print("signatures_info",signatures_info)
                     PageRef = signatures_info.get("PageRef")
                     Boundary = signatures_info.get("Boundary")
                     SignedValue = signatures_info.get("SignedValue")
                     sing_page_no = page_id_map.get(PageRef)
                     # print("self.file_tree",self.file_tree.keys)
                     # print(page_id_map,PageRef)
                     # print(SignedValue, self.get_xml_obj(SignedValue))
-                    with open("b64.txt","w") as f:
-                        f.write(self.get_xml_obj(SignedValue))
+                    # with open("b64.txt","w") as f:
+                    #     f.write(self.get_xml_obj(SignedValue))
                     if signatures_page_id.get(sing_page_no):
                         signatures_page_id[sing_page_no].append(
                             {

test/demo.py

@@ -82,8 +82,8 @@ def test_pdf2(file_path):
 
 
 if __name__ == "__main__":
-    file_path = r"1111.ofd"
-    file_path = r"E:\download\MyPython\ceshi.pdf"
+    file_path = r"1.ofd"
+    # file_path = r"E:\download\MyPython\ceshi.pdf"
     if sys.argv[1] =="ofd2":
         test_ofd2(file_path)
     elif sys.argv[1] =="pdf2":