open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-07-07 11:56:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复同时执行多个ql repo命令脚本比对错误，独立ql extra命令

Browse Source
This commit is contained in:
whyour 2021-05-12 22:50:07 +08:00
parent 394eccab5e
commit 4abefccc5b
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
back/services/cron.ts
View File

@ -57,7 +57,7 @@ export default class CronService {
const tab = new Crontab({ ...doc, ...other }); const tab = new Crontab({ ...doc, ...other });
tab.saved = false; tab.saved = false;
const newDoc = await this.updateDb(tab); const newDoc = await this.updateDb(tab);
await this.set_crontab(); await this.set_crontab(this.isSixCron(newDoc));
return newDoc; return newDoc;
} }
@ -99,6 +99,9 @@ export default class CronService {
{ {
command: reg, command: reg,
}, },
{
schedule: reg,
},
], ],
}; };
} }
@ -214,7 +217,7 @@ export default class CronService {
{ $set: { status: CrontabStatus.disabled } }, { $set: { status: CrontabStatus.disabled } },
{ multi: true }, { multi: true },
); );
await this.set_crontab(); await this.set_crontab(true);
} }
public async enabled(ids: string[]) { public async enabled(ids: string[]) {
@ -223,6 +226,7 @@ export default class CronService {
{ $set: { status: CrontabStatus.idle } }, { $set: { status: CrontabStatus.idle } },
{ multi: true }, { multi: true },
); );
await this.set_crontab(true);
} }
public async log(_id: string) { public async log(_id: string) {

25
shell/update.sh
View File

@ -223,7 +223,8 @@ run_extra_shell() {
## 脚本用法 ## 脚本用法
usage() { usage() {
echo -e "本脚本用法：" echo -e "本脚本用法："
echo -e "1. $cmd_update update # 更新青龙，并且运行extra.sh" echo -e "1. $cmd_update update # 更新并重启青龙"
echo -e "1. $cmd_update extra # 运行自定义脚本"
echo -e "3. $cmd_update raw <fileurl> # 更新单个脚本文件" echo -e "3. $cmd_update raw <fileurl> # 更新单个脚本文件"
echo -e "4. $cmd_update repo <repourl> <path> <blacklist> <dependence> # 更新单个仓库的脚本" echo -e "4. $cmd_update repo <repourl> <path> <blacklist> <dependence> # 更新单个仓库的脚本"
echo -e "5. $cmd_update rmlog <days> # 删除旧日志" echo -e "5. $cmd_update rmlog <days> # 删除旧日志"
@ -266,18 +267,20 @@ update_qinglong() {
## 对比脚本 ## 对比脚本
diff_scripts() { diff_scripts() {
gen_list_repo $1 $2 $3 $4 $5 gen_list_repo $1 $2 $3 $4 $5
diff_cron $list_own_scripts $list_own_user $list_own_add $list_own_drop local list_add="$dir_list_tmp/${2}_add.list"
local list_drop="$dir_list_tmp/${2}_drop.list"
diff_cron "$dir_list_tmp/${2}_scripts.list" "$dir_list_tmp/${2}_user.list" $list_add $list_drop
if [ -s $list_own_drop ]; then if [ -s $list_drop ]; then
output_list_add_drop $list_own_drop "失效" output_list_add_drop $list_drop "失效"
if [[ ${AutoDelCron} == true ]]; then if [[ ${AutoDelCron} == true ]]; then
del_cron $list_own_drop $2 del_cron $list_drop $2
fi fi
fi fi
if [ -s $list_own_add ]; then if [ -s $list_add ]; then
output_list_add_drop $list_own_add "新" output_list_add_drop $list_add "新"
if [[ ${AutoAddCron} == true ]]; then if [[ ${AutoAddCron} == true ]]; then
add_cron $list_own_add $2 add_cron $list_add $2
fi fi
fi fi
} }
@ -306,9 +309,9 @@ gen_list_repo() {
for file in ${files}; do for file in ${files}; do
filename=$(basename $file) filename=$(basename $file)
cp -f $file $dir_scripts/${author}_${filename} cp -f $file $dir_scripts/${author}_${filename}
echo ${author}_${filename} >>$list_own_scripts echo ${author}_${filename} >>"$dir_list_tmp/${author}_scripts.list"
done done
grep -E "$cmd_task $author" $list_crontab_user | perl -pe "s|.*ID=(.*) $cmd_task ($author_.*)\.*|\2|" | awk -F " " '{print $1}' | sort -u >$list_own_user grep -E "$cmd_task $author" $list_crontab_user | perl -pe "s|.*ID=(.*) $cmd_task ($author_.*)\.*|\2|" | awk -F " " '{print $1}' | sort -u >"$dir_list_tmp/${author}_user.list"
cd $dir_current cd $dir_current
} }
@ -323,6 +326,8 @@ main() {
case $p1 in case $p1 in
update) update)
update_qinglong | tee $log_path update_qinglong | tee $log_path
;;
extra)
run_extra_shell | tee -a $log_path run_extra_shell | tee -a $log_path
;; ;;
repo) repo)