From be361bb6c06197f5cc0eeec9e8ab89128b7b25c5 Mon Sep 17 00:00:00 2001
From: phoenixray2000 <phoenixray2000@gmail.com>
Date: Mon, 18 May 2026 02:10:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A1=E5=88=92=20CSV=20=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E7=95=99=E7=A9=BA=20export?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 export_all_chats.py                      |  6 +---
 tests/test_export_all_chats_selection.py | 44 +++++++++++++++++++++---
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/export_all_chats.py b/export_all_chats.py
index d99460b..22e05fc 100644
--- a/export_all_chats.py
+++ b/export_all_chats.py
@@ -935,7 +935,7 @@ def _build_plan_csv_rows(chat_rows, start_ts=None, end_ts=None, size_mode="estim
         username = row["username"]
         stats = stats_by_username[username]
         rows.append({
-            "export": "0",
+            "export": "",
             "index": row["index"],
             "username": username,
             "chat_name": row["display_name"],
@@ -968,10 +968,6 @@ def _write_plan_csv(path, rows, plan_mode=PLAN_MODE_BLACKLIST):
         for row in rows:
             full = {field: "" for field in PLAN_CSV_FIELDS}
             full.update(row)
-            if full["export"] == "":
-                full["export"] = (
-                    "0" if plan_mode == PLAN_MODE_WHITELIST else "1"
-                )
             writer.writerow(full)
 
 
diff --git a/tests/test_export_all_chats_selection.py b/tests/test_export_all_chats_selection.py
index 1a0acbb..8aa4339 100644
--- a/tests/test_export_all_chats_selection.py
+++ b/tests/test_export_all_chats_selection.py
@@ -87,7 +87,7 @@ class ExportAllChatsCliCsvOnlyTests(unittest.TestCase):
 
 
 class ExportPlanCsvTests(unittest.TestCase):
-    def test_writes_utf8_sig_csv_without_contact_remark_or_nickname(self):
+    def test_writes_utf8_sig_csv_with_blank_export_by_default(self):
         row = {
             "index": 1,
             "username": "wxid_alice",
@@ -111,12 +111,12 @@ class ExportPlanCsvTests(unittest.TestCase):
             with open(path, newline="", encoding="utf-8-sig") as f:
                 rows = list(csv.DictReader(f))
             self.assertEqual(export_all_chats.PLAN_CSV_FIELDS, list(rows[0].keys()))
-            self.assertEqual(rows[0]["export"], "1")
+            self.assertEqual(rows[0]["export"], "")
             self.assertEqual(rows[0]["chat_name"], '张三, "A"')
             self.assertNotIn("contact_remark", rows[0])
             self.assertNotIn("contact_nick_name", rows[0])
 
-    def test_whitelist_plan_csv_defaults_to_export_zero(self):
+    def test_whitelist_plan_csv_also_defaults_to_blank_export(self):
         row = {
             "index": 1,
             "username": "wxid_alice",
@@ -140,7 +140,7 @@ class ExportPlanCsvTests(unittest.TestCase):
             with open(path, newline="", encoding="utf-8-sig") as f:
                 rows = list(csv.DictReader(f))
 
-        self.assertEqual(rows[0]["export"], "0")
+        self.assertEqual(rows[0]["export"], "")
 
     def test_loads_all_rows_except_explicit_export_zero(self):
         with tempfile.TemporaryDirectory() as tmp:
@@ -285,12 +285,48 @@ class ExportPlanStatsTests(unittest.TestCase):
                           side_effect=AssertionError("per-chat lookup too slow")):
             rows = export_all_chats._build_plan_csv_rows(chat_rows)
 
+        self.assertEqual(rows[0]["export"], "")
         self.assertEqual(rows[0]["username"], "wxid_alice")
         self.assertNotIn("contact_remark", rows[0])
         self.assertNotIn("contact_nick_name", rows[0])
         self.assertEqual(rows[0]["message_count"], 2)
         self.assertEqual(rows[0]["total_estimated_bytes"], 16)
 
+    def test_build_and_write_plan_keeps_export_blank_in_default_blacklist_mode(self):
+        chat_rows = [
+            {
+                "index": 1,
+                "username": "wxid_alice",
+                "display_name": "Alice",
+                "kind": "single",
+                "remark": "",
+                "nick_name": "",
+            }
+        ]
+        stats = {
+            "wxid_alice": {
+                "message_count": 1,
+                "message_body_bytes": 4,
+                "first_time": "2026-01-01 00:00:00",
+                "last_time": "2026-01-01 00:00:00",
+                "attachment_estimated_bytes": 0,
+                "attachment_scanned_bytes": "",
+                "total_estimated_bytes": 4,
+                "size_status": "ok",
+            }
+        }
+        with tempfile.TemporaryDirectory() as tmp:
+            path = os.path.join(tmp, "plan.csv")
+            with patch.object(export_all_chats, "_collect_all_plan_stats",
+                              return_value=stats):
+                rows = export_all_chats._build_plan_csv_rows(chat_rows)
+                export_all_chats._write_plan_csv(path, rows)
+
+            with open(path, newline="", encoding="utf-8-sig") as f:
+                csv_rows = list(csv.DictReader(f))
+
+        self.assertEqual(csv_rows[0]["export"], "")
+
 
 class ExportAllChatsCliPlanCsvTests(unittest.TestCase):
     def _base_patches(self):