Skip to content

Commit

Permalink
Merge branch 'devel' into pure-py
Browse files Browse the repository at this point in the history
# Conflicts:
#	ktoolbox.spec
#	poetry.lock
#	pyproject.toml
  • Loading branch information
Ljzd-PRO committed Oct 25, 2024
2 parents 037814a + f9723d0 commit 4147b92
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 2 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ Goto [Shortcuts for iOS](https://ktoolbox.readthedocs.io/latest/shortcut/) page

Goto [Configuration-Guide](https://ktoolbox.readthedocs.io/latest/configuration/guide/) page for more details.

![KToolBox Configuration Editor](https://cdn.jsdelivr.net/gh/Ljzd-PRO/KToolBox@latest/static/preview-2.png)
![KToolBox Configuration Editor](https://cdn.jsdelivr.net/gh/Ljzd-PRO/KToolBox@latest/static/preview-3.png)

## Other Branches

- Pure Python branch: [🔗pure-py](https://github.com/Ljzd-PRO/KToolBox/tree/pure-py)
Expand Down
3 changes: 3 additions & 0 deletions README_zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ ktoolbox sync-creator https://kemono.su/fanbox/user/9016 --start-time=2024-1-1 -

前往 [配置-向导](https://ktoolbox.readthedocs.io/latest/zh/configuration/guide/) 页面查看更多详情。

![KToolBox 配置编辑器](https://cdn.jsdelivr.net/gh/Ljzd-PRO/KToolBox@latest/static/preview-2.png)
![KToolBox 配置编辑器](https://cdn.jsdelivr.net/gh/Ljzd-PRO/KToolBox@latest/static/preview-3.png)

## 其他分支

- 纯 Python 分支:[🔗pure-py](https://github.com/Ljzd-PRO/KToolBox/tree/pure-py)
Expand Down
5 changes: 4 additions & 1 deletion docs/en/configuration/guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
!!! tip "Generate Example `.env` File"
Run `ktoolbox example-env` to generate a complete sample configuration file.

- KToolBox load **`.env` or `prod.env` file** in the work folder or **environment variables** to store configuration
![KToolBox Configuration Editor](https://cdn.jsdelivr.net/gh/Ljzd-PRO/KToolBox@latest/static/preview-2.png)
![KToolBox Configuration Editor](https://cdn.jsdelivr.net/gh/Ljzd-PRO/KToolBox@latest/static/preview-3.png)

- KToolBox load **`.env` or `prod.env` file** in the **working directory** or **environment variables** to store configuration
- Check [Reference](reference.md) for all configuration options
- Use `__` to specify the sub option, like `KTOOLBOX_API__SCHEME` means `api.scheme`
- All configuration options are optional
Expand Down
5 changes: 4 additions & 1 deletion docs/zh/configuration/guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
!!! tip "生成示例 `.env` 文件"
运行 `ktoolbox example-env` 来生成完整的配置文件样例。

- KToolBox 读取工作目录下的 **`.env``prod.env` 文件****环境变量** 来设定配置
![KToolBox 配置编辑器](https://cdn.jsdelivr.net/gh/Ljzd-PRO/KToolBox@latest/static/preview-2.png)
![KToolBox 配置编辑器](https://cdn.jsdelivr.net/gh/Ljzd-PRO/KToolBox@latest/static/preview-3.png)

- KToolBox 读取 **工作目录** 下的 **`.env``prod.env` 文件****环境变量** 来设定配置
- 前往 [参考](./reference.md) 查看所有配置选项
-`__` 来指定子选项, 例如 `KTOOLBOX_API__SCHEME` 相当于 `api.scheme`
- 所有配置选项都是可选的
Expand Down
Binary file added static/preview-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/preview-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 4147b92

Please sign in to comment.