Skip to content

Commit

Permalink
Merge branch 'refs/heads/dev'
Browse files Browse the repository at this point in the history
# Conflicts:
#	result.log
#	result.txt
  • Loading branch information
Guovin committed Apr 8, 2024
2 parents 8d5681b + 3bf0b45 commit 4a39c35
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'update schedule'

on:
schedule:
- cron: '0 */12 * * *'
- cron: '0 0 * * *'
workflow_dispatch:
branches:
- master
Expand Down Expand Up @@ -55,12 +55,12 @@ jobs:
import config
print(config.final_file)')
if [[ -f "$final_file" ]]; then
git add "$final_file"
git add -f "$final_file"
fi
if [[ -f user_result.log ]]; then
git add user_result.log
git add -f user_result.log
elif [[ -f result.log ]]; then
git add result.log
git add -f result.log
fi
if ! git diff --staged --quiet; then
git commit -m "Github Action Auto Updated"
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
*.log
user_*.txt
user_*.py
config.py
demo.txt
result.txt
source.json
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# 更新日志(Changelog)

## v1.0.4

### 2024/4/8

- 更新 Github 使用条款,请务必仔细阅读并遵守(Updated GitHub Terms of Service, please read and comply carefully)
- 更新使用说明,关于可能导致工作流资源滥用的情况说明(Updated usage instructions, explanation about situations that may lead to workflow resource abuse)
- 增加.gitignore 文件,忽略用户配置、接口更新结果、日志文件等上传,非代码逻辑修改请不要发起 Pull requests,避免影响他人使用(Added .gitignore file to ignore uploads of user configurations, interface update results, log files, etc. Please do not initiate pull requests for non-code logic modifications to avoid affecting others' use)
- 调整更新频率,每日 8:00 执行一次(Adjusted update frequency, executes once daily at 8:00)

## v1.0.3

### 2024/4/7
Expand Down
8 changes: 8 additions & 0 deletions README-EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ In any case, the developer and any contributor do not assume any responsibility

Using the code or data of this project means that you have understood and accepted these terms.

## GitHub Terms of Service

When forking or using this project, you must comply with the [GitHub Terms of Service](https://docs.github.com/en/github/site-policy/github-terms-of-service). This includes, but is not limited to, the prohibition of uploading content that infringes copyright, is illegal, malicious, or violates our terms. Any violation of these provisions may result in the termination of your account. When using this project, please ensure that your behavior complies with these provisions.

If you do not agree to comply with these terms, you should stop using the code and data of this project immediately.

The use of the code or data of this project means that you have understood and accepted these terms.

## License

[MIT](./LICENSE) License © 2024-PRESENT [Govin](https://github.com/guovin)
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@

使用本项目的代码或数据即表示您已经了解并接受这些条款。

## GitHub 使用条款

在 Fork 或使用本项目时,您必须遵守[GitHub 使用条款](https://docs.github.com/cn/github/site-policy/github-terms-of-service)。这包括但不限于禁止上传违规内容,包括侵犯版权、非法、恶意或违反条款中的内容。任何违反这些规定的行为都可能导致您的账户被封禁。在使用本项目时,请确保您的行为符合这些规定。

如果您不同意遵守这些条款,您应立即停止使用本项目的代码和数据。

使用本项目的代码或数据即表示您已经了解并接受这些条款。

## 许可证

[MIT](./LICENSE) License © 2024-PRESENT [Govin](https://github.com/guovin)
7 changes: 5 additions & 2 deletions docs/tutorial-EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,15 @@ https://mirror.ghproxy.com/raw.githubusercontent.com/your github username/reposi

If you can access this link and it returns the updated interface content, then your live source interface link has been successfully created! Simply copy and paste this link into software like TVBox in the configuration field to use~

- Note: Except for the first execution of the workflow, which requires you to manually trigger it, subsequent executions (default every 12 hours) will be automatically triggered. If you have modified the template or configuration files and want to execute the update immediately, you can manually trigger (2) Run workflow.
- Note: Except for the first execution of the workflow, which requires you to manually trigger it, subsequent executions (default: daily at 8:00) will be automatically triggered. If you have modified the template or configuration files and want to execute the update immediately, you can manually trigger (2) Run workflow.

## Step 5: Modify Workflow Update Frequency

![.github/workflows/main.yml](./images/schedule-cron.png '.github/workflows/main.yml')
If you want to modify the update frequency (default 12 hours), you can modify the on:schedule:- cron field. It is not recommended to update the frequency too high, as there is no difference in interfaces in a short period.
If you want to modify the update frequency (default: daily at 8:00), you can modify the on:schedule:- cron field.

- #### It is strongly discouraged to make modifications, as there is no difference in the content of the interface in a short period of time. Both too frequent updates and high-consumption running workflows may be judged as resource abuse, leading to the risk of the repository and account being banned.
- #### Please pay attention to the runtime of your workflow. If you find that the execution time is too long, you need to appropriately reduce the number of channels in the template, modify the number of pages and interfaces in the configuration, in order to meet the compliant operation requirements.

## Step 6: Update the Source Code

Expand Down
7 changes: 5 additions & 2 deletions docs/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,15 @@ https://mirror.ghproxy.com/raw.githubusercontent.com/您的github用户名/仓

如果访问该链接能正常返回更新后的接口内容,说明您的直播源接口链接已经大功告成了!将该链接复制粘贴到 TVBox 等软件配置栏中即可使用~

- 注意:除了首次执行工作流需要您手动触发,后续执行(默认每隔 12 小时)将自动触发。如果您修改了模板或配置文件想立刻执行更新,可手动触发(2)中的 Run workflow 即可。
- 注意:除了首次执行工作流需要您手动触发,后续执行(默认每日 8:00)将自动触发。如果您修改了模板或配置文件想立刻执行更新,可手动触发(2)中的 Run workflow 即可。

## 步骤五:修改工作流更新频率

![.github/workflows/main.yml](./images/schedule-cron.png '.github/workflows/main.yml')
如果您想修改更新频率(默认 12 小时),可修改 on:schedule:- cron 字段。不建议更新频率过高,因为短时间内的接口并无差异。
如果您想修改更新频率(默认每日 8:00),可修改 on:schedule:- cron 字段。

- #### 强烈不建议修改,因为短时间内的接口内容并无差异,过高的更新频率与高耗时运行的工作流都有可能被判定为资源滥用,导致仓库与账户被封禁的风险。
- #### 请留意您的工作流运行时长,若发现执行时间过长,需要适当删减模板中频道数量、修改配置中的分页数量和接口数量,以达到合规的运行要求。

## 步骤六:更新源代码

Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.0.3"
"version": "1.0.4"
}

0 comments on commit 4a39c35

Please sign in to comment.