wechat-media-writer 2.2.1 → 2.2.2

package/README.md

@@ -25,8 +25,14 @@ git clone https://github.com/your-username/wechat-media-writer.git ~/.claude/ski
 
 ```bash
 npx wechat-media-writer cover "人类简史" "尤瓦尔·赫拉利"
-npx wechat-media-writer cover "肖申克的救赎" "弗兰克·德拉邦特"
-npx wechat-media-writer publish --title "标题" --content-file content.html --cover-dir /tmp/output
+npx wechat-media-writer download books 5
+npx wechat-media-writer publish \
+  --title "《人类简史》全书深度拆解" \
+  --content-file content.html \
+  --cover-dir /tmp/wx \
+  --book-title "人类简史" \
+  --book-author "尤瓦尔·赫拉利" \
+  --theme books
 ```
 
 ### 方式三：全局安装
@@ -47,31 +53,59 @@ wechat-media-writer cover "人类简史"
 }
 ```
 
+access_token 自动缓存在 `~/.wechat/token_cache.json`（2小时有效期）。
+
 ## 命令
 
-### 获取封面
+### `cover` — 获取封面
 
 ```bash
-npx wechat-media-writer cover <书名/电影名> [作者/导演]
+npx wechat-media-writer cover <书名/电影名> [作者] [ISBN]
 ```
 
-自动从 Google Books、Open Library、豆瓣获取封面。
+按优先级自动从 Google Books → Open Library → 豆瓣 获取封面；
+三个数据源均失败时回退到 Pexels 占位图（保证流程不中断）。
 
-### 下载主题插图
+### `download` — 下载主题插图
 
 ```bash
-npx wechat-media-writer download [主题] [数量]
+npx wechat-media-writer download [主题] [数量] [输出目录]
 ```
 
-主题：`nature`、`technology`、`abstract`、`books`、`movies`、`business`
+主题：`abstract`、`books`、`nature`、`technology`、`business`，默认 `abstract`，数量默认 `5`，目录默认 `/tmp/images`。
 
-### 发布文章
+### `publish` — 发布文章到微信草稿箱
 
 ```bash
-npx wechat-media-writer publish --title "标题" --content-file content.html --cover-dir /tmp/output
+npx wechat-media-writer publish --title "标题" --content-file content.html --cover-dir <目录>
 ```
 
-### 查看帮助
+`publish` 是**完整一键发布**：
+
+1. 检查封面图，缺失则自动获取
+2. 检查主题插图，缺失则自动下载
+3. 加载微信配置、获取 token
+4. 上传封面（永久素材）+ 内容图（uploadimg）
+5. 创建草稿
+
+#### 完整参数
+
+| 参数 | 必填 | 说明 |
+| --- | --- | --- |
+| `--title` | 是 | 文章标题 |
+| `--content-file` | 是 | HTML 内容文件路径 |
+| `--cover-dir` | 是 | 封面和图片目录（自动创建） |
+| `--author` | 否 | 文章作者，默认 `读书笔记` |
+| `--digest` | 否 | 文章摘要 |
+| `--theme` | 否 | 图片主题，默认 `abstract` |
+| `--image-count` | 否 | 主题插图数量，默认 `5` |
+| `--book-title` | 否 | 书籍标题（封面缺失时自动获取） |
+| `--book-author` | 否 | 书籍作者 |
+| `--book-isbn` | 否 | 书籍 ISBN |
+
+成功后输出草稿 ID，前往 https://mp.weixin.qq.com 预览发布。
+
+### `help` — 查看帮助
 
 ```bash
 npx wechat-media-writer help
@@ -87,11 +121,11 @@ wechat-media-writer/
 ├── bin/
 │   └── cli.js                  # CLI 入口
 ├── scripts/
-│   ├── book_cover.py          # 封面获取（书/影）
-│   ├── image_downloader.py    # 图片下载
-│   ├── wechat_api.py          # 微信API封装
-│   ├── publish.py             # 完整发布脚本
-│   └── install.js             # npm postinstall
+│   ├── book_cover.py          # 书籍封面获取
+│   ├── image_downloader.py    # 主题插图下载
+│   ├── wechat_api.py          # 微信 API 封装（token/上传/草稿）
+│   ├── publish.py             # 一键发布主脚本（含封面/插图自动补齐）
+│   └── install.js             # npm postinstall（检查 Python/Pillow）
 └── references/
     └── publish_template.py    # 发布脚本模板
 ```
@@ -105,4 +139,4 @@ npm publish
 
 ## License
 
-MIT
+MIT

package/bin/cli.js

@@ -43,16 +43,33 @@ function showHelp() {
   npx wechat-media-writer <command> [options]
 
 命令:
-  cover <书名/电影名> [作者/导演]    获取封面
-  download <主题> [数量]              下载主题插图
-  publish                             发布文章到微信
-  help                                显示帮助信息
+  cover <书名/电影名> [作者] [ISBN]    获取书籍封面
+  download <主题> [数量]                下载主题插图
+  publish                               发布文章到微信（封面/插图缺失会自动补齐）
+  help                                  显示帮助信息
+
+publish 选项:
+  --title <标题>             文章标题（必填）
+  --content-file <路径>      HTML 内容文件（必填）
+  --cover-dir <目录>         封面和图片目录（必填）
+  --author <作者>            文章作者，默认"读书笔记"
+  --digest <摘要>            文章摘要
+  --theme <主题>             图片主题：abstract/books/nature/technology/business，默认 abstract
+  --image-count <数量>       主题插图数量，默认 5
+  --book-title <书名>        书籍标题（封面缺失时自动获取）
+  --book-author <作者>       书籍作者
+  --book-isbn <ISBN>         书籍ISBN
 
 示例:
   npx wechat-media-writer cover "人类简史" "尤瓦尔·赫拉利"
-  npx wechat-media-writer cover "肖申克的救赎" "弗兰克·德拉邦特"
   npx wechat-media-writer download books 5
-  npx wechat-media-writer publish --title "标题" --content-file content.html
+  npx wechat-media-writer publish \\
+    --title "《人类简史》全书深度拆解" \\
+    --content-file content.html \\
+    --cover-dir /tmp/wx \\
+    --book-title "人类简史" \\
+    --book-author "尤瓦尔·赫拉利" \\
+    --theme books
 
 配置:
   创建 ~/.wechat/config.json:
@@ -86,18 +103,25 @@ function main() {
       break;
 
     case 'download':
-      const theme = args[1] || 'abstract';
-      const count = args[2] || '5';
-      execSync(`${python} -c "from scripts.image_downloader import download_theme_images; download_theme_images('${theme}', '/tmp/images', ${count})"`, { 
-        stdio: 'inherit',
-        cwd: SKILL_DIR
-      });
+      {
+        const theme = args[1] || 'abstract';
+        const count = args[2] || '5';
+        const outDir = args[3] || '/tmp/images';
+        execSync(
+          `${python} ${path.join(SCRIPTS_DIR, 'image_downloader.py')} "${theme}" "${outDir}" ${count}`,
+          { stdio: 'inherit' }
+        );
+      }
       break;
 
     case 'publish':
-      // 传递所有参数给Python脚本
-      const publishArgs = args.slice(1).join(' ');
-      execSync(`${python} ${path.join(SCRIPTS_DIR, 'publish.py')} ${publishArgs}`, { stdio: 'inherit' });
+      {
+        const publishArgs = args.slice(1).join(' ');
+        execSync(
+          `${python} ${path.join(SCRIPTS_DIR, 'publish.py')} ${publishArgs}`,
+          { stdio: 'inherit' }
+        );
+      }
       break;
 
     default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechat-media-writer",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "微信公众号书评、影评文章自动生成与发布 - Skill",
   "main": "index.js",
   "bin": {
@@ -14,7 +14,11 @@
     "README.md"
   ],
   "scripts": {
-    "postinstall": "node scripts/install.js"
+    "postinstall": "node scripts/install.js",
+    "release:patch": "npm version patch && git push origin main --tags && npm publish",
+    "release:minor": "npm version minor && git push origin main --tags && npm publish",
+    "release:major": "npm version major && git push origin main --tags && npm publish",
+    "prepare": "husky"
   },
   "keywords": [
     "wechat",
@@ -36,5 +40,10 @@
   },
   "engines": {
     "node": ">=14.0.0"
+  },
+  "devDependencies": {
+    "@commitlint/cli": "^21.1.0",
+    "@commitlint/config-conventional": "^21.1.0",
+    "husky": "^9.1.7"
   }
 }

package/scripts/book_cover.py

@@ -72,7 +72,8 @@ def fetch_book_cover_douban(book_title, author=""):
     ctx.verify_mode = ssl.CERT_NONE
 
     query = f"{book_title} {author}".strip()
-    url = f"https://search.douban.com/book/subject_search?search_text={urllib.parse.quote(query)}"
+    encoded_query = urllib.parse.quote(query)
+    url = f"https://search.douban.com/book/subject_search?search_text={encoded_query}"
     req = urllib.request.Request(
         url,
         headers={
@@ -81,9 +82,8 @@ def fetch_book_cover_douban(book_title, author=""):
     )
 
     try:
-        html = (
-            urllib.request.urlopen(req, context=ctx, timeout=15).read().decode("utf-8")
-        )
+        raw = urllib.request.urlopen(req, context=ctx, timeout=15).read()
+        html = raw.decode("utf-8", errors="replace")
         match = re.search(
             r'<img[^>]+src="(https://img[0-9]+\.doubanio\.com/view/subject/[^"]+)"',
             html,
@@ -97,7 +97,7 @@ def fetch_book_cover_douban(book_title, author=""):
 
 
 def fetch_book_cover(book_title, author="", isbn=""):
-    """按优先级尝试获取书籍封面"""
+    """按优先级尝试获取书籍封面，最后回退到占位图"""
     cover_url = None
 
     print(f"尝试从 Google Books 获取《{book_title}》封面...")
@@ -112,10 +112,10 @@ def fetch_book_cover(book_title, author="", isbn=""):
         cover_url = fetch_book_cover_douban(book_title, author)
 
     if not cover_url:
-        print("⚠️ 无法自动获取书籍封面，请手动提供封面图")
-        return None
+        print("⚠️ 三个数据源均未返回封面，使用占位图占位")
+        cover_url = "https://images.pexels.com/photos/159711/books-bookstore-book-reading-159711.jpeg?auto=compress&cs=tinysrgb&w=600"
 
-    print(f"✓ 成功获取封面: {cover_url}")
+    print(f"✓ 封面URL: {cover_url}")
     return cover_url
 
 

package/scripts/image_downloader.py

@@ -36,20 +36,26 @@ def download_pexels_image(pid, output_path):
 def download_theme_images(theme, output_dir, count=5):
     """根据主题下载多张图片"""
     themes = {
-        "nature": [15286, 15287, 15288, 15289, 15290],
-        "technology": [1181244, 1181245, 1181246, 1181247, 1181248],
-        "abstract": [2693208, 2693209, 2693210, 2693211, 2693212],
-        "books": [159711, 159712, 159713, 159714, 159715],
-        "business": [3184292, 3184293, 3184294, 3184295, 3184296],
+        "nature": [2387873, 2387874, 2387875, 2387876, 2387877, 2387878, 2387879],
+        "technology": [3568520, 3568521, 3568522, 3568523, 3568524, 3568525],
+        "abstract": [2693208, 2693209, 2693210, 2693211, 2693212, 2693213],
+        "books": [159711, 1029141, 256450, 590493, 762687, 3568520],
+        "business": [3184292, 3184293, 3184294, 3184295, 3184296, 3184297],
     }
 
     pids = themes.get(theme, themes["abstract"])[:count]
     urls = []
+    fallback_pid = 159711
+    fallback_used = False
 
     for i, pid in enumerate(pids):
         output_path = os.path.join(output_dir, f"img_{i + 1}.jpg")
         if download_pexels_image(pid, output_path):
             urls.append(output_path)
+        elif not fallback_used:
+            if download_pexels_image(fallback_pid, output_path):
+                urls.append(output_path)
+                fallback_used = True
 
     return urls
 
@@ -58,9 +64,19 @@ if __name__ == "__main__":
     import sys
 
     if len(sys.argv) < 2:
-        print("用法: python image_downloader.py <图片URL> [输出路径]")
+        print("用法:")
+        print("  python image_downloader.py <图片URL> [输出路径]")
+        print("  python image_downloader.py <主题> <输出目录> [数量]")
         sys.exit(1)
 
-    url = sys.argv[1]
-    output = sys.argv[2] if len(sys.argv) > 2 else "/tmp/downloaded_image.jpg"
-    download_image(url, output)
+    arg1 = sys.argv[1]
+    if arg1.startswith("http://") or arg1.startswith("https://"):
+        url = arg1
+        output = sys.argv[2] if len(sys.argv) > 2 else "/tmp/downloaded_image.jpg"
+        download_image(url, output)
+    else:
+        theme = arg1
+        output_dir = sys.argv[2] if len(sys.argv) > 2 else "/tmp/images"
+        count = int(sys.argv[3]) if len(sys.argv) > 3 else 5
+        urls = download_theme_images(theme, output_dir, count)
+        print(f"\n✓ 共下载 {len(urls)} 张图片到 {output_dir}")

package/scripts/publish.py

@@ -23,18 +23,80 @@ from wechat_api import (
 )
 
 
-def publish_article(title, author, digest, content_html, cover_dir, theme="abstract"):
-    """完整发布流程"""
+def ensure_book_cover(cover_dir, book_title="", book_author="", book_isbn=""):
+    """确保封面图存在，缺失则自动获取"""
+    cover_900_path = os.path.join(cover_dir, "cover_900x500.jpg")
+    book_cover_path = os.path.join(cover_dir, "book_cover.jpg")
+
+    if os.path.exists(cover_900_path) and os.path.exists(book_cover_path):
+        print("✓ 封面图已存在，跳过获取")
+        return
+
+    if not book_title:
+        print(
+            f"⚠️ 缺少封面图且未提供 --book-title，无法自动获取。\n"
+            f"  期望路径: {cover_900_path}",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+
+    print(f"封面图缺失，自动获取《{book_title}》封面...")
+    os.makedirs(cover_dir, exist_ok=True)
+    cover_url = fetch_book_cover(book_title, book_author, book_isbn)
+    if not cover_url:
+        print("错误: 无法获取书籍封面URL", file=sys.stderr)
+        sys.exit(1)
+    download_and_process_cover(cover_url, cover_dir)
+
+
+def ensure_theme_images(cover_dir, theme="abstract", count=5):
+    """确保主题插图存在，缺失则自动下载"""
+    existing = [
+        f
+        for f in os.listdir(cover_dir)
+        if f.startswith("img_") and f.endswith((".jpg", ".jpeg", ".png"))
+    ]
+    if len(existing) >= count:
+        print(f"✓ 主题插图已存在 {len(existing)} 张，跳过下载")
+        return
+
+    print(f"主题插图不足，自动下载 {count} 张（主题: {theme}）...")
+    download_theme_images(theme, cover_dir, count)
+
+
+def publish_article(
+    title,
+    author,
+    digest,
+    content_html,
+    cover_dir,
+    theme="abstract",
+    image_count=5,
+    book_title="",
+    book_author="",
+    book_isbn="",
+):
+    """完整发布流程：获取封面 -> 下载插图 -> 上传图片 -> 创建草稿"""
     print("=" * 50)
     print("微信公众号 - 书评发布")
     print("=" * 50)
 
-    # 1. 加载配置和获取token
+    os.makedirs(cover_dir, exist_ok=True)
+
+    # 1. 确保封面图存在
+    print("\n[1/4] 准备封面图...")
+    ensure_book_cover(cover_dir, book_title, book_author, book_isbn)
+
+    # 2. 确保主题插图存在
+    print("\n[2/4] 准备主题插图...")
+    ensure_theme_images(cover_dir, theme, image_count)
+
+    # 3. 加载配置和获取token
     config = load_config()
     token = get_access_token(config)
     print("\n✓ Token 已获取\n")
 
-    # 2. 上传封面图
+    # 4. 上传封面图
     cover_900_path = os.path.join(cover_dir, "cover_900x500.jpg")
     if not os.path.exists(cover_900_path):
         print(f"错误: 封面图不存在 {cover_900_path}", file=sys.stderr)
@@ -43,7 +105,7 @@ def publish_article(title, author, digest, content_html, cover_dir, theme="abstr
     print("上传封面图...")
     cover_mid = upload_cover(token, cover_900_path)
 
-    # 3. 上传内容图片
+    # 5. 上传内容图片
     print("\n上传内容图片...")
     image_urls = {}
     for fname in sorted(os.listdir(cover_dir)):
@@ -54,14 +116,14 @@ def publish_article(title, author, digest, content_html, cover_dir, theme="abstr
                 name = os.path.splitext(fname)[0]
                 image_urls[name] = url
 
-    # 4. 上传书籍封面图（用于文章内显示）
+    # 6. 上传书籍封面图（用于文章内显示）
     book_cover_path = os.path.join(cover_dir, "book_cover.jpg")
     if os.path.exists(book_cover_path):
         book_cover_url = upload_content_image(token, book_cover_path)
         if book_cover_url:
             image_urls["book_cover"] = book_cover_url
 
-    # 5. 保存上传结果
+    # 7. 保存上传结果
     result_path = os.path.join(cover_dir, "upload_result.json")
     with open(result_path, "w") as f:
         json.dump(
@@ -75,7 +137,7 @@ def publish_article(title, author, digest, content_html, cover_dir, theme="abstr
         )
     print(f"\n✓ 上传结果已保存: {result_path}")
 
-    # 6. 创建草稿
+    # 8. 创建草稿
     print("\n创建草稿...")
     draft_id = create_draft(token, title, author, digest, content_html, cover_mid)
 
@@ -99,6 +161,10 @@ def main():
     parser.add_argument("--content-file", required=True, help="HTML内容文件路径")
     parser.add_argument("--cover-dir", required=True, help="封面和图片目录")
     parser.add_argument("--theme", default="abstract", help="图片主题")
+    parser.add_argument("--image-count", type=int, default=5, help="主题插图数量")
+    parser.add_argument("--book-title", default="", help="书籍标题（缺封面时自动获取）")
+    parser.add_argument("--book-author", default="", help="书籍作者")
+    parser.add_argument("--book-isbn", default="", help="书籍ISBN")
     args = parser.parse_args()
 
     with open(args.content_file, "r", encoding="utf-8") as f:
@@ -111,6 +177,10 @@ def main():
         content_html,
         args.cover_dir,
         args.theme,
+        args.image_count,
+        args.book_title,
+        args.book_author,
+        args.book_isbn,
     )