ghostwriter-cli 0.1.0__tar.gz → 0.1.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ghostwriter-cli
-Version: 0.1.0
+Version: 0.1.1
 Summary: Markdown → Ghost → WeChat publishing pipeline
 Project-URL: Homepage, https://github.com/yinguobing/ghostwriter
 Author: yinguobing
@@ -46,7 +46,7 @@ pip install -e ".[dev]"
 ### 方式 1：环境变量（推荐用于 CI/Docker）
 
 ```bash
-export GHOSTWRITER_GHOST_API_URL="https://yinguobing.com"
+export GHOSTWRITER_GHOST_API_URL="https://your-ghost-blog.com"
 export GHOSTWRITER_GHOST_ADMIN_KEY_ID="your_key_id"
 export GHOSTWRITER_GHOST_ADMIN_KEY="your_hex_secret"
 export GHOSTWRITER_WECHAT_APPID="your_wechat_appid"
@@ -57,7 +57,7 @@ export GHOSTWRITER_WECHAT_SECRET="your_wechat_secret"
 
 ```bash
 # 交互式设置
-ghostwriter config set ghost.api_url https://yinguobing.com
+ghostwriter config set ghost.api_url https://your-ghost-blog.com
 ghostwriter config set ghost.admin_key_id your_key_id
 ghostwriter config set ghost.admin_key your_hex_secret
 ghostwriter config set wechat.appid your_wechat_appid

{ghostwriter_cli-0.1.0 → ghostwriter_cli-0.1.1}/README.md

@@ -31,7 +31,7 @@ pip install -e ".[dev]"
 ### 方式 1：环境变量（推荐用于 CI/Docker）
 
 ```bash
-export GHOSTWRITER_GHOST_API_URL="https://yinguobing.com"
+export GHOSTWRITER_GHOST_API_URL="https://your-ghost-blog.com"
 export GHOSTWRITER_GHOST_ADMIN_KEY_ID="your_key_id"
 export GHOSTWRITER_GHOST_ADMIN_KEY="your_hex_secret"
 export GHOSTWRITER_WECHAT_APPID="your_wechat_appid"
@@ -42,7 +42,7 @@ export GHOSTWRITER_WECHAT_SECRET="your_wechat_secret"
 
 ```bash
 # 交互式设置
-ghostwriter config set ghost.api_url https://yinguobing.com
+ghostwriter config set ghost.api_url https://your-ghost-blog.com
 ghostwriter config set ghost.admin_key_id your_key_id
 ghostwriter config set ghost.admin_key your_hex_secret
 ghostwriter config set wechat.appid your_wechat_appid

{ghostwriter_cli-0.1.0 → ghostwriter_cli-0.1.1}/docs/index.html

@@ -541,29 +541,38 @@
         <span class="dot r"></span><span class="dot y"></span><span class="dot g"></span>
         <span style="margin-left:8px">terminal</span>
       </div>
-      <pre>git clone https://github.com/yinguobing/ghostwriter.git
+      <pre><span class="cm"># 从 PyPI 安装（推荐）</span>
+pip install ghostwriter-cli
+
+<span class="cm"># 或从源码安装</span>
+git clone https://github.com/yinguobing/ghostwriter.git
 cd ghostwriter
-pip install requests PyJWT</pre>
+pip install -e <span class="str">".[dev]"</span></pre>
     </div>
 
     <h3>配置</h3>
-    <p>创建 <code>config.json</code>，填入微信公众号和 Ghost 的 API 密钥：</p>
+    <p>支持环境变量（CI/Docker 首选）或配置文件两种方式：</p>
     <div class="code-block">
       <div class="code-header">
         <span class="dot r"></span><span class="dot y"></span><span class="dot g"></span>
-        <span style="margin-left:8px">config.json</span>
+        <span style="margin-left:8px">terminal</span>
       </div>
-      <pre>{
-  <span class="str">"wechat"</span>: {
-    <span class="str">"appid"</span>: <span class="str">"your_wechat_appid"</span>,
-    <span class="str">"secret"</span>: <span class="str">"your_wechat_secret"</span>
-  },
-  <span class="str">"ghost"</span>: {
-    <span class="str">"api_url"</span>: <span class="str">"https://yinguobing.com"</span>,
-    <span class="str">"admin_key_id"</span>: <span class="str">"your_key_id"</span>,
-    <span class="str">"admin_key"</span>: <span class="str">"your_hex_secret"</span>
-  }
-}</pre>
+      <pre><span class="cm"># 方式 1：环境变量（CI/Docker 首选）</span>
+<span class="kw">export</span> GHOSTWRITER_GHOST_API_URL=<span class="str">"https://your-ghost-blog.com"</span>
+<span class="kw">export</span> GHOSTWRITER_GHOST_ADMIN_KEY_ID=<span class="str">"your_key_id"</span>
+<span class="kw">export</span> GHOSTWRITER_GHOST_ADMIN_KEY=<span class="str">"your_hex_secret"</span>
+<span class="kw">export</span> GHOSTWRITER_WECHAT_APPID=<span class="str">"your_wechat_appid"</span>
+<span class="kw">export</span> GHOSTWRITER_WECHAT_SECRET=<span class="str">"your_wechat_secret"</span>
+
+<span class="cm"># 方式 2：CLI 交互式配置</span>
+ghostwriter config set ghost.api_url https://your-ghost-blog.com
+ghostwriter config set ghost.admin_key_id your_key_id
+ghostwriter config set ghost.admin_key your_hex_secret
+ghostwriter config set wechat.appid your_wechat_appid
+ghostwriter config set wechat.secret your_wechat_secret
+
+<span class="cm"># 查看当前配置（密钥已脱敏）</span>
+ghostwriter config</pre>
     </div>
 
     <h3>使用</h3>
@@ -573,19 +582,19 @@ pip install requests PyJWT</pre>
         <span style="margin-left:8px">terminal</span>
       </div>
       <pre><span class="cm"># 列出 Ghost 文章</span>
-python3 ghostwriter.py list
+ghostwriter list
 
 <span class="cm"># 发布 Markdown 到 Ghost</span>
-python3 ghostwriter.py publish article.md
+ghostwriter publish article.md
 
 <span class="cm"># 同步到微信草稿</span>
-python3 ghostwriter.py &lt;article-id&gt;
-
-<span class="cm"># 一键发布 + 同步</span>
-python3 ghostwriter.py publish article.md --wechat
+ghostwriter sync &lt;article-id&gt;
 
 <span class="cm"># 预览 HTML（不创建草稿）</span>
-python3 ghostwriter.py --preview &lt;article-id&gt;</pre>
+ghostwriter sync --preview &lt;article-id&gt;
+
+<span class="cm"># 一键发布 + 同步</span>
+ghostwriter publish article.md --wechat</pre>
     </div>
   </section>
 

{ghostwriter_cli-0.1.0 → ghostwriter_cli-0.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ghostwriter-cli"
-version = "0.1.0"
+version = "0.1.1"
 description = "Markdown → Ghost → WeChat publishing pipeline"
 readme = "README.md"
 license = {text = "MIT"}

{ghostwriter_cli-0.1.0 → ghostwriter_cli-0.1.1}/src/ghostwriter/pipeline.py

@@ -93,6 +93,20 @@ def restore_code_blocks(html):
 
 # ── Element transformers ─────────────────────────────────────
 
+def convert_figure_div(html):
+    """Convert <figure> to <div> and <figcaption> to <p>.
+
+    Ghost uses <figure> to wrap images (image cards, bookmark cards),
+    but WeChat's whitelist doesn't include <figure> or <figcaption>.
+    Without this conversion, all images inside <figure> get stripped.
+    """
+    html = re.sub(r'<figure(\s[^>]*)>', r'<div\1>', html)
+    html = re.sub(r'</figure>', '</div>', html)
+    html = re.sub(r'<figcaption>', '<p>', html)
+    html = re.sub(r'</figcaption>', '</p>', html)
+    return html
+
+
 def convert_hr(html):
     """Convert <hr> to a styled divider <div>."""
     return re.sub(
@@ -320,18 +334,19 @@ def process_html(html_content, image_map):
     Pipeline stages (order is critical):
      1. Replace image URLs with WeChat CDN URLs
      2. Remove Ghost-specific HTML comments (<!--kg-card-*-->)
-     3. Convert <hr> to styled <div> (before whitelist filter)
-     4. Convert <table> to inline-block layout (before whitelist filter)
-     5. Protect code blocks with placeholders
-     6. Three-level whitelist filter (tags → attrs → styles)
-     7. Restore code blocks with WeChat-safe styling
-     8. Apply default styles (headings, code, blockquote)
-     9. Flatten nested blockquotes
-    10. Add paragraph spacing
-    11. Add image spacing
-    12. Convert links to text [url] format
-    13. Convert ordered lists to numbered <p>
-    14. Convert unordered lists to bulleted <p>
+     3. Convert <figure>/<figcaption> to <div>/<p> (before whitelist)
+     4. Convert <hr> to styled <div> (before whitelist filter)
+     5. Convert <table> to inline-block layout (before whitelist filter)
+     6. Protect code blocks with placeholders
+     7. Three-level whitelist filter (tags → attrs → styles)
+     8. Restore code blocks with WeChat-safe styling
+     9. Apply default styles (headings, code, blockquote)
+    10. Flatten nested blockquotes
+    11. Add paragraph spacing
+    12. Add image spacing
+    13. Convert links to text [url] format
+    14. Convert ordered lists to numbered <p>
+    15. Convert unordered lists to bulleted <p>
 
     Returns HTML suitable for WeChat draft creation.
     """
@@ -341,46 +356,49 @@ def process_html(html_content, image_map):
     # 2. Remove Ghost comments
     html = clean_ghost_comments(html)
 
-    # 3. Convert <hr> (before whitelist — <hr> not in safe tags)
+    # 3. Convert <figure>/<figcaption> (before whitelist — not in safe tags)
+    html = convert_figure_div(html)
+
+    # 4. Convert <hr> (before whitelist — <hr> not in safe tags)
     html = convert_hr(html)
 
-    # 4. Convert <table> (before whitelist — <table> not in safe tags)
+    # 5. Convert <table> (before whitelist — <table> not in safe tags)
     html = convert_table_to_div(html)
 
-    # 5. Protect code blocks
+    # 6. Protect code blocks
     html = convert_code_blocks(html)
 
-    # 6. Three-level whitelist filter
+    # 7. Three-level whitelist filter
     html = clean_html_for_wechat(html)
 
-    # 7. Restore code blocks
+    # 8. Restore code blocks
     html = restore_code_blocks(html)
 
-    # 8. Default styles
+    # 9. Default styles
     html = apply_wechat_styles(html)
 
-    # 9. Flatten nested blockquotes
+    # 10. Flatten nested blockquotes
     html = flatten_nested_blockquotes(html)
 
-    # 10. Paragraph spacing
+    # 11. Paragraph spacing
     html = re.sub(
         r'<p\b(?!\s+[^>]*style=)([^>]*)>',
         r'<p style="margin-bottom: 16px;">', html,
     )
 
-    # 11. Image spacing
+    # 12. Image spacing
     html = re.sub(
         r'<img([^>]*)>',
         r'<img style="margin-bottom: 16px;"\1>', html,
     )
 
-    # 12. Links → text [url]
+    # 13. Links → text [url]
     html = convert_links(html)
 
-    # 13. Ordered lists → numbered <p>
+    # 14. Ordered lists → numbered <p>
     html = convert_ordered_list(html)
 
-    # 14. Unordered lists → bullet <p>
+    # 15. Unordered lists → bullet <p>
     html = convert_unordered_list(html)
 
     return html