download-flow-enmu 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

cli/download_cmd.py

@@ -1,6 +1,7 @@
 import typer
-import json
 import logging
+import sys
+import json
 from pathlib import Path
 from pydantic import TypeAdapter
 from factory import downloader_factory, email_factory, provider_factory
@@ -12,22 +13,21 @@ from cli.root import app
 def run(provider: str):
     # 配置日志
     logging.basicConfig(
-        level=logging.INFO,
-        format='%(levelname)s: %(message)s'
+        level=logging.ERROR, stream=sys.stderr, format="%(levelname)s: %(message)s"
     )
-    
     config_path = Path.home() / ".flow" / "config.json"
-    
+
     logging.info(f"开始下载 {provider} 账单...")
     logging.info(f"配置文件路径: {config_path}")
 
     try:
         # 使用 ConfigLoader 加载配置（支持环境变量替换）
-        from config.loader import load_config 
+        from config.loader import load_config
+
         config_json = load_config(config_path)
-        
+
         logging.info(f"配置加载成功")
-        
+
         adapter = TypeAdapter(PayConfig)
         config_obj = adapter.validate_python(config_json[provider])
         downloader = downloader_factory.creat_downloader(config_obj.download)
@@ -41,9 +41,22 @@ def run(provider: str):
         provider_obj.bill = config_obj.profile
 
         logging.info(f"开始执行下载...")
-        provider_obj.process_bills()
+        is_success = provider_obj.process_bills()
+
         logging.info(f"✅ 下载完成！")
 
+        if is_success:
+
+            return {
+                "status": "success",
+                "provider": provider,
+            }
+        else:
+            return {
+                "status": "fail",
+                "provider": provider,
+            }
+
     except FileNotFoundError as e:
         logging.error(f"配置文件未找到: {config_path}")
         raise
@@ -61,4 +74,11 @@ def download(
         str, typer.Option("--provider", "-p", help="config file")
     ] = "alipay",
 ):
-    run(provider)
+
+    try:
+        result = run(provider)
+        typer.echo(json.dumps(result, ensure_ascii=False))
+    except Exception as e:
+        error_result = {"status": "error", "provider": provider, "message": str(e)}
+        typer.echo(json.dumps(error_result, ensure_ascii=False))
+        raise typer.Exit(code=1)

cli/main.py

@@ -1,4 +1,4 @@
-from .root import app
+from cli.root import app
 
 from cli.download_cmd import download
 

{download_flow_enmu-0.1.0.dist-info → download_flow_enmu-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: download-flow-enmu
-Version: 0.1.0
+Version: 0.1.1
 Summary: A task flow management tool for syncing todo files with taskwarrior
 Author-email: Your Name <your.email@example.com>
 Classifier: Development Status :: 3 - Alpha

{download_flow_enmu-0.1.0.dist-info → download_flow_enmu-0.1.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cli/__init__.py,sha256=I9Hh5zrDiIh_ocW0Ra3I-pV0VAJrl1dwLEmCbX-NDn4,14
-cli/download_cmd.py,sha256=kuobLGli_nbrLeeoU1U4GFe46fYDtyj3K4Nlr-KjMhY,1951
-cli/main.py,sha256=zC--P4_g2EtDaiHO0hyBx_4Y458C9YMtl7pDY6Xd84M,125
+cli/download_cmd.py,sha256=HSZnpK5wrrl3laj2K3o3LcYL-Z8T3DiZCR746N0Yl-g,2510
+cli/main.py,sha256=BOnRpFwm5tzlUg0m9UWqqHB7NI_RRE8tkwCUiMBeL5k,128
 cli/root.py,sha256=TlMsPrPVwiIl64ZuwixmftVpmqRwoPmgFLDwKxrzgPY,513
 config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 config/loader.py,sha256=sHueTVLT-spMWn-8Eq2RancJIkVKpgD3XHJIqW3h8SI,1793
@@ -11,15 +11,15 @@ factory/provider_factory.py,sha256=oe7oDyCIBeFTjQTGJY0gxkcgrGdhhvOfxS_mZSnooWc,2
 package/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 package/downfile.py,sha256=7qnDJeh1sGnRZDYOPZ5f5QsHuck2iAdfXOIWD6NG3RE,6501
 strategy/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-strategy/downloader/attchment.py,sha256=v6CQwnyKLLoaTk_4q3K99SUuCoSHo4JSHPr4i05a1JM,1545
+strategy/downloader/attchment.py,sha256=wegb6hM1QvoOskFi5uVGCsspvzgFy_Zj0H6X6jf8Ir8,1519
 strategy/downloader/provider.py,sha256=YasGNxaYvvUgHQxPck8GkD5FW7pCyR9DS9JrbyUTYT4,225
 strategy/email/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 strategy/email/email_provider.py,sha256=aoGFk_D2nifwGQZFi8LH6Xu-2_CHqCWMJSYaIPjKIu0,151
 strategy/email/gmail.py,sha256=-DJiv6f8VbY0ZCdz7rbikfv1PWgkQ5qr3hwkgH06xAI,458
-strategy/provider/ali_provider.py,sha256=WvEeeDsWUVxBMsSQNHSQe36ANyFk1ulevi_J1NGvgpA,797
+strategy/provider/ali_provider.py,sha256=43rb5QqIjZ3TQAKOJUJar43RRD60wPZO5-HCJeW8Euw,804
 strategy/provider/provider.py,sha256=DHBGAr2dfw0W0XULwLd8DwzZY_VH4qEV5tarx8hUU_o,122
-download_flow_enmu-0.1.0.dist-info/METADATA,sha256=VGpCyPLOgmHZcqZsbchSUUlGzj3oXlBYz_iehdnyUnE,1969
-download_flow_enmu-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-download_flow_enmu-0.1.0.dist-info/entry_points.txt,sha256=8SQ6Y1ma7AZSTzdbb0fRbAzeCKnxtNYchJjhi4ciosw,40
-download_flow_enmu-0.1.0.dist-info/top_level.txt,sha256=lAF0lGukoa1q1EfG1UxNkro603Rnr3H0HaXMu9hDAno,41
-download_flow_enmu-0.1.0.dist-info/RECORD,,
+download_flow_enmu-0.1.1.dist-info/METADATA,sha256=hD21rwWDJQBJlZ6PWSZX8c1Wq_lHDxnfoVVlWDHanhw,1969
+download_flow_enmu-0.1.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+download_flow_enmu-0.1.1.dist-info/entry_points.txt,sha256=8SQ6Y1ma7AZSTzdbb0fRbAzeCKnxtNYchJjhi4ciosw,40
+download_flow_enmu-0.1.1.dist-info/top_level.txt,sha256=lAF0lGukoa1q1EfG1UxNkro603Rnr3H0HaXMu9hDAno,41
+download_flow_enmu-0.1.1.dist-info/RECORD,,

{download_flow_enmu-0.1.0.dist-info → download_flow_enmu-0.1.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

strategy/downloader/attchment.py

@@ -17,25 +17,29 @@ class AttchmentDownloader(Downloader):
             date=datetime.date.today(),
         )
 
+        downloaded_count = 0
+
         for msg in mail.fetch(criteria=criteria):
             logging.info(f"找到邮件: {msg.subject}")  # 添加这一行
 
             if bill.search_subject not in msg.subject:
                 continue
             for att in msg.attachments:
-                if att.filename.lower().endswith(bill.file_suffix):
-                    bill.save_subdir.mkdir(parents=True, exist_ok=True)
-                    filepath = (
-                        bill.save_subdir / f"{datetime.date.today()}.{bill.file_suffix}"
-                    )  # 改这里：加扩展名
-
-                    try:
-                        if bill.file_suffix in ["zip", "7z", "rar"]:
-                            filepath.write_bytes(att.payload)
-                        else:
-                            content_str = att.payload.decode(bill.encoding)
-                            filepath.write_text(content_str, encoding="utf-8")
-                    except UnicodeDecodeError:
-                        logging.error("  ✗ 转码失败")
-                else:
-                    logging.info(f"✗ 附件类型不匹配 (期望后缀: {bill.file_suffix})")
+                if not att.filename.lower().endswith(bill.file_suffix):
+                    continue
+                bill.save_subdir.mkdir(parents=True, exist_ok=True)
+                filepath = (
+                    bill.save_subdir / f"{datetime.date.today()}.{bill.file_suffix}"
+                )
+
+                try:
+                    if bill.file_suffix in ["zip", "7z", "rar"]:
+                        filepath.write_bytes(att.payload)
+                    else:
+                        content_str = att.payload.decode(bill.encoding)
+                        filepath.write_text(content_str, encoding="utf-8")
+                    downloaded_count += 1
+                except UnicodeDecodeError:
+                    logging.error("  ✗ 转码失败")
+                    continue
+        return downloaded_count > 0

strategy/provider/ali_provider.py

@@ -28,4 +28,4 @@ class AliProvider(Provider):
         mailbox = self.email.connect()
 
         with mailbox.login(self.email.username, self.email.password, "INBOX") as mb:
-            self.downloader.download(mb, bill=self.bill)
+            return self.downloader.download(mb, bill=self.bill)