liukaiwen 1 gadu atpakaļ
vecāks
revīzija
94d94e61e4
2 mainītis faili ar 10 papildinājumiem un 8 dzēšanām
  1. 7 5
      magic_pdf/io/DiskReaderWriter.py
  2. 3 3
      magic_pdf/io/S3ReaderWriter.py

+ 7 - 5
magic_pdf/io/DiskReaderWriter.py

@@ -1,5 +1,6 @@
 import os
 from magic_pdf.io.AbsReaderWriter import AbsReaderWriter
+from loguru import logger
 class DiskReaderWriter(AbsReaderWriter):
     def __init__(self, parent_path, encoding='utf-8'):
         self.path = parent_path
@@ -7,8 +8,8 @@ class DiskReaderWriter(AbsReaderWriter):
 
     def read(self, mode="text"):
         if not os.path.exists(self.path):
-            print(f"文件 {self.path} 不存在")
-            return None
+            logger.error(f"文件 {self.path} 不存在")
+            raise Exception(f"文件 {self.path} 不存在")
         if mode == "text":
             with open(self.path, 'r', encoding = self.encoding) as f:
                 return f.read()
@@ -22,11 +23,12 @@ class DiskReaderWriter(AbsReaderWriter):
         if mode == "text":
             with open(self.path, 'w', encoding=self.encoding) as f:
                 f.write(data)
-            print(f"内容已成功写入 {self.path}")
+                logger.info(f"内容已成功写入 {self.path}")
+
         elif mode == "binary":
             with open(self.path, 'wb') as f:
                 f.write(data)
-            print(f"内容已成功写入 {self.path}")
+                logger.info(f"内容已成功写入 {self.path}")
         else:
             raise ValueError("Invalid mode. Use 'text' or 'binary'.")
 
@@ -42,6 +44,6 @@ if __name__ == "__main__":
     # 从文件读取内容
     content = drw.read()
     if content:
-        print(f"从 {file_path} 读取的内容: {content}")
+        logger.info(f"从 {file_path} 读取的内容: {content}")
 
 

+ 3 - 3
magic_pdf/io/S3ReaderWriter.py

@@ -46,6 +46,7 @@ class S3ReaderWriter(AbsReaderWriter):
             raise ValueError("Invalid mode. Use 'text' or 'binary'.")
         bucket_name, bucket_key = parse_bucket_key(s3_path)
         self.client.put_object(Body=body, Bucket=bucket_name, Key=bucket_key)
+        logger.info(f"内容已写入 {s3_path} ")
 
 
 if __name__ == "__main__":
@@ -64,12 +65,11 @@ if __name__ == "__main__":
 
     # Read text data from S3
     text_data_read = s3_reader_writer.read(s3_path = "s3://bucket_name/ebook/test/test.json", mode='text')
-    print(f"Read text data from S3: {text_data_read}")
-
+    logger.info(f"Read text data from S3: {text_data_read}")
     # Write binary data to S3
     binary_data = b"This is some binary data"
     s3_reader_writer.write(data=text_data, s3_path = "s3://bucket_name/ebook/test/test2.json", mode='binary')
 
     # Read binary data from S3
     binary_data_read = s3_reader_writer.read(s3_path = "s3://bucket_name/ebook/test/test2.json", mode='binary')
-    print(f"Read binary data from S3: {binary_data_read}")
+    logger.info(f"Read binary data from S3: {binary_data_read}")