Merge branch 'malinkang:main' into main

Author: kekishel

.github/workflows/weread.yml

@@ -8,10 +8,18 @@ jobs:
   sync:
     name: Sync
     runs-on: ubuntu-latest
+    env:
+      NOTION_TOKEN: ${{ secrets.NOTION_TOKEN }}
+      NOTION_PAGE: ${{ secrets.NOTION_PAGE }}
+      NOTION_DATABASE_ID: ${{ secrets.NOTION_DATABASE_ID }}
+      WEREAD_COOKIE: ${{ secrets.WEREAD_COOKIE }}
+      CC_URL: ${{ secrets.CC_URL }}
+      CC_ID: ${{ secrets.CC_ID }}
+      CC_PASSWORD: ${{ secrets.CC_PASSWORD }}
+      YEAR: ${{ vars.YEAR }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
@@ -22,11 +30,17 @@ jobs:
           pip install -r requirements.txt
       - name: weread sync
         run: |
-          python weread.py "${{secrets.WEREAD_COOKIE}}" "${{secrets.NOTION_TOKEN}}" "${{secrets.NOTION_DATABASE_ID}}" "${{ github.ref }}" "${{ github.repository }}" --styles 0 1 2 --colors 0 1 2 3 4 5
-      - name: Push Cover
+          python scripts/weread.py
+      - name: Set default year if not provided
+        run: echo "YEAR=$(date +"%Y")" >> $GITHUB_ENV
+        if: env.YEAR == ''
+      - name: weread heatmap
+        run: |
+          github_heatmap weread --year $YEAR  --me "${{secrets.NAME}}" --with-animation --background-color=${{ vars.background_color||'#FFFFFF'}} --track-color=${{ vars.track_color||'#ACE7AE'}} --special-color1=${{ vars.special_color||'#69C16E'}} --special-color2=${{ vars.special_color2||'#549F57'}} --dom-color=${{ vars.dom_color||'#EBEDF0'}} --text-color=${{ vars.text_color||'#000000'}}
+      - name: push
         run: |
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
           git add .
           git commit -m 'add new cover' || echo "nothing to commit"
-          git push || echo "nothing to push"
+          git push || echo "nothing to push"

.gitignore

@@ -0,0 +1,2 @@
+scripts/__pycache__/
+.env

OUT_FOLDER/weread.svg

@@ -11,38 +11,28 @@
 
 ## 使用
 
-使用文档：https://malinkang.com/posts/weread2notion/
+> [!IMPORTANT]  
+> 关注公众号获取教程
 
-## 捐赠
+![扫码_搜索联合传播样式-标准色版](https://github.com/malinkang/weread2notion/assets/3365208/191900c6-958e-4f9b-908d-a40a54889b5e)
 
-如果你觉得本项目帮助了你，请作者喝一杯咖啡，你的支持是作者最大的动力。本项目会持续更新。
 
-![](./asset/WechatIMG27.jpg)
+## 群
+> [!IMPORTANT]  
+> 欢迎加入群讨论。可以讨论使用中遇到的任何问题，也可以讨论Notion使用，后续我也会在群中分享更多Notion自动化工具。微信群失效的话可以添加我的微信malinkang，我拉你入群。
 
-## 问题解答
 
-1. 如果发现数据没有同步，请点击Action查看运行状态。红色表示失败，绿色代表成功，如果有失败的点击去查看详情，检查值是否填写正确
-2. Categories is expected to be select. 这个是模板设置的问题，将模板中的Categories修改为Multi-select类型
-3. 模板中的属性解释
-    * BookName：书名
-    * BookId：书Id
-    * Sort：主要用于增量同步没啥实际意义
-    * Cover：封面
-    * Author：作者
-    * Status：状态
-    * ReadingTime：阅读时长
-    * Date：读完日期
-    * Rating：评分
-    * URL：网页链接
-    * Categories：分类
-    * Progress：阅读进度
+| 微信群 | QQ群 |
+| --- | --- |
+| <div align="center"><img src="https://images.malinkang.com/2024/04/d54cd68602ccbb9e2747ce01f02280a3.jpg" width="50%"></div> | <div align="center"><img src="https://images.malinkang.com/2024/04/b225b17d60670e4a6ff3459bbde80d28.jpg" width="50%"></div> |
 
 
-## 微信群
-> [!WARNING]  
-> 微信群已满，加我备注微信读书，我拉你进群。
-> 也可以加TG群：https://t.me/wereadnotion
+## 捐赠
+
+如果你觉得本项目帮助了你，请作者喝一杯咖啡，你的支持是作者最大的动力。本项目会持续更新。
 
- ![image](./asset/WechatIMG24.jpg)
+| 支付宝支付 | 微信支付 |
+| --- | --- |
+| <div align="center"><img src="https://images.malinkang.com/2024/03/7fd0feb1145f19fab3821ff1d4631f85.jpg" width="50%"></div> | <div align="center"><img src="https://images.malinkang.com/2024/03/d34f577490a32d4440c8a22f57af41da.jpg" width="50%"></div> |
 
 

README.md

@@ -1,2 +1,4 @@
 requests
-notion-client
+notion-client
+github-heatmap
+python-dotenv

cover/CB_9ax3Gh3GK5B46i26g289e0DH_parsecover.jpg

@@ -0,0 +1,122 @@
+def get_heading(level, content):
+    if level == 1:
+        heading = "heading_1"
+    elif level == 2:
+        heading = "heading_2"
+    else:
+        heading = "heading_3"
+    return {
+        "type": heading,
+        heading: {
+            "rich_text": [
+                {
+                    "type": "text",
+                    "text": {
+                        "content": content,
+                    },
+                }
+            ],
+            "color": "default",
+            "is_toggleable": False,
+        },
+    }
+
+
+def get_table_of_contents():
+    """获取目录"""
+    return {"type": "table_of_contents", "table_of_contents": {"color": "default"}}
+
+
+def get_title(content):
+    return {"title": [{"type": "text", "text": {"content": content}}]}
+
+
+def get_rich_text(content):
+    return {"rich_text": [{"type": "text", "text": {"content": content}}]}
+
+
+def get_url(url):
+    return {"url": url}
+
+
+def get_file(url):
+    return {"files": [{"type": "external", "name": "Cover", "external": {"url": url}}]}
+
+
+def get_multi_select(names):
+    return {"multi_select": [{"name": name} for name in names]}
+
+
+def get_date(start):
+    return {
+        "date": {
+            "start": start,
+            "time_zone": "Asia/Shanghai",
+        }
+    }
+
+
+def get_icon(url):
+    return {"type": "external", "external": {"url": url}}
+
+
+def get_select(name):
+    return {"select": {"name": name}}
+
+
+def get_number(number):
+    return {"number": number}
+
+
+def get_quote(content):
+    return {
+        "type": "quote",
+        "quote": {
+            "rich_text": [
+                {
+                    "type": "text",
+                    "text": {"content": content},
+                }
+            ],
+            "color": "default",
+        },
+    }
+
+
+def get_callout(content, style, colorStyle, reviewId):
+    # 根据不同的划线样式设置不同的emoji 直线type=0 背景颜色是1 波浪线是2
+    emoji = "〰️"
+    if style == 0:
+        emoji = "💡"
+    elif style == 1:
+        emoji = "⭐"
+    # 如果reviewId不是空说明是笔记
+    if reviewId != None:
+        emoji = "✍️"
+    color = "default"
+    # 根据划线颜色设置文字的颜色
+    if colorStyle == 1:
+        color = "red"
+    elif colorStyle == 2:
+        color = "purple"
+    elif colorStyle == 3:
+        color = "blue"
+    elif colorStyle == 4:
+        color = "green"
+    elif colorStyle == 5:
+        color = "yellow"
+    return {
+        "type": "callout",
+        "callout": {
+            "rich_text": [
+                {
+                    "type": "text",
+                    "text": {
+                        "content": content,
+                    },
+                }
+            ],
+            "icon": {"emoji": emoji},
+            "color": color,
+        },
+    }