Skip to content

Commit

Permalink
release 5.0.8
Browse files Browse the repository at this point in the history
  • Loading branch information
hiltay committed Feb 10, 2023
1 parent 33d44ae commit 1b50481
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
部署教程:[文档](https://fcircle-doc.yyyzyyyz.cn/) | [备用地址](https://fcircle-doc.is-a.dev/)

```
5.0.7 支持:
5.0.8 支持:
- 更好的前端样式
- 极简模式
- 新增前端管理面板,告别繁琐的配置,管理朋友圈更加方便
Expand All @@ -26,9 +26,8 @@
- 提供一个简单的快速部署脚本
最近改动:
- 新增管理面板可下载运行日志
- 前端默认加载文章数量可配置
- docker镜像对多种架构的支持
- 新增主页爬取文章数量可配置
- 在开启配置项友链情况下,LINK可以置空
```

[![Stargazers over time](https://starchart.cc/Rock-Candy-Tea/hexo-circle-of-friends.svg)](https://starchart.cc/Rock-Candy-Tea/hexo-circle-of-friends)
Expand Down
1 change: 1 addition & 0 deletions api_dependencies/items.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class FcSettings(BaseModel):
GITEE_FRIENDS_LINKS: GitFriendsLinks = get_user_settings()["GITEE_FRIENDS_LINKS"]
GITHUB_FRIENDS_LINKS: GitFriendsLinks = get_user_settings()["GITHUB_FRIENDS_LINKS"]
BLOCK_SITE: List[str] = get_user_settings()["BLOCK_SITE"]
MAX_POSTS_NUM: int = get_user_settings()["MAX_POSTS_NUM"]
HTTP_PROXY: bool = get_user_settings()["HTTP_PROXY"]
OUTDATE_CLEAN: int = get_user_settings()["OUTDATE_CLEAN"]
DATABASE: str = get_user_settings()["DATABASE"]
Expand Down
17 changes: 9 additions & 8 deletions hexo_circle_of_friends/fc_settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@
# - volantis:volantis主题
# - Yun:Yun主题
# - stellar:stellar主题
# 支持配置多个友链页面并指定不同主题策略,每个用{}分隔,它们会被同时爬取,数据保存在一起。***至少配置一个***
LINK:
- {link: "https://www.yyyzyyyz.cn/link/", theme: "butterfly"} # 友链页地址1,修改为你的友链页地址
# - {link: "https://noionion.top/link/", theme: "butterfly"} # 友链页地址2
# - {link: "https://immmmm.com/about/", theme: "common1"} # 友链页地址3

# 支持配置多个友链页面并指定不同主题策略,每个用{}分隔,它们会被同时爬取,数据保存在一起。
LINK: [
{ link: "https://www.yyyzyyyz.cn/link/", theme: "butterfly" }, # 友链页地址1,修改为你的友链页地址
# { link: "https://noionion.top/link/", theme: "butterfly" }, # 友链页地址2
# { link: "https://immmmm.com/about/", theme: "common1" }, # 友链页地址3
# ...
]

# 配置项友链
# enable:# 是否启用配置项友链 true/false(针对还未适配主题或者有定制需求的用户)
# json_api:通过json格式配置友链,详见:https://fcircle-doc.js.cool/#/developmentdoc?id=配置项json友链
# json_api:通过json格式配置友链,详见:https://fcircle-doc.yyyzyyyz.cn/#/developmentdoc?id=配置项json友链
# list字段填写格式:["name", "link", "avatar","suffix"],其中:
# name:必填,友链的名字
# link:必填,友链主页地址
Expand Down Expand Up @@ -72,7 +73,7 @@ BLOCK_SITE: [
# ^http://, # http开头的全部屏蔽
]

# 每个link主页最多获取几篇文章,此值越大,则抓取的文章上限越多,相应地运行速度也会降低,反之亦然
# 每个友链最多获取几篇文章,此值越大,则抓取的文章上限越多,相应地运行速度也会降低,反之亦然
# 请设置一个正整数
MAX_POSTS_NUM: 5

Expand Down
2 changes: 1 addition & 1 deletion hexo_circle_of_friends/scrapy_conf.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
############################## 除非您了解本项目,否则请勿修改本文件 ################################
VERSION = "5.0.7"
VERSION = "5.0.8"

# debug
# debug模式
Expand Down
3 changes: 2 additions & 1 deletion hexo_circle_of_friends/spiders/hexo_circle_of_friends.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ def start_requests(self):
logger.info(f"起始url: {url}")
yield Request(url, callback=self.friend_poor_parse, meta={"theme": friendpage_theme[i]})
elif not self.friend_poor.empty():
yield Request(li[1], callback=self.friend_poor_parse)
# 开启配置项友链且未配置link url
yield Request(self.settings.get("SETTINGS_FRIENDS_LINKS").get("list")[0][1], callback=self.friend_poor_parse)


def init_start_urls(self):
Expand Down

0 comments on commit 1b50481

Please sign in to comment.