download-flow-enmu 0.1.0__tar.gz → 0.1.1__tar.gz

{download_flow_enmu-0.1.0 → download_flow_enmu-0.1.1}/PKG-INFO

@@ -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 → download_flow_enmu-0.1.1}/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)

{download_flow_enmu-0.1.0 → download_flow_enmu-0.1.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 → download_flow_enmu-0.1.1}/download_flow_enmu.egg-info/PKG-INFO

@@ -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 → download_flow_enmu-0.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "download-flow-enmu"
-version = "0.1.0"
+version = "0.1.1"
 description = "A task flow management tool for syncing todo files with taskwarrior"
 readme = "README.md"
 requires-python = ">=3.10"

download_flow_enmu-0.1.1/strategy/downloader/attchment.py

@@ -0,0 +1,45 @@
+import datetime
+import logging
+
+from imap_tools import MailBox, AND
+
+from strategy.downloader.provider import Downloader
+from typing import override
+from data.bill_profile import BillProfile
+
+
+class AttchmentDownloader(Downloader):
+    @override
+    def download(self, mail: MailBox, bill: BillProfile):
+
+        criteria = AND(
+            from_=bill.sender_email,
+            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 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

{download_flow_enmu-0.1.0 → download_flow_enmu-0.1.1}/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)

download_flow_enmu-0.1.0/strategy/downloader/attchment.py

@@ -1,41 +0,0 @@
-import datetime
-import logging
-
-from imap_tools import MailBox, AND
-
-from strategy.downloader.provider import Downloader
-from typing import override
-from data.bill_profile import BillProfile
-
-
-class AttchmentDownloader(Downloader):
-    @override
-    def download(self, mail: MailBox, bill: BillProfile):
-
-        criteria = AND(
-            from_=bill.sender_email,
-            date=datetime.date.today(),
-        )
-
-        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})")