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

修改ql repo逻辑

Browse Source
This commit is contained in:
whyour 2021-11-09 23:07:43 +08:00
parent 0ca640acbd
commit ab5ab951d7
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
shell/task.sh
View File

@ -78,12 +78,15 @@ run_nohup() {
run_normal() { run_normal() {
local first_param=$1 local first_param=$1
cd $dir_scripts cd $dir_scripts
local relative_path="${first_param%/*}"
[[ ! -z ${relative_path} ]] && cd ${relative_path}
define_program "$first_param" define_program "$first_param"
if [[ $first_param == *.js ]]; then if [[ $first_param == *.js ]]; then
if [[ $# -eq 1 ]]; then if [[ $# -eq 1 ]]; then
random_delay random_delay
fi fi
fi fi
log_time=$(date "+%Y-%m-%d-%H-%M-%S") log_time=$(date "+%Y-%m-%d-%H-%M-%S")
log_dir_tmp="${first_param##*/}" log_dir_tmp="${first_param##*/}"
log_dir="$dir_log/${log_dir_tmp%%.*}" log_dir="$dir_log/${log_dir_tmp%%.*}"
@ -136,6 +139,8 @@ run_concurrent() {
local cookieStr=$(echo ${array_run[*]} | sed 's/\ /\&/g') local cookieStr=$(echo ${array_run[*]} | sed 's/\ /\&/g')
cd $dir_scripts cd $dir_scripts
local relative_path="${first_param%/*}"
[[ ! -z ${relative_path} ]] && cd ${relative_path}
define_program "$first_param" define_program "$first_param"
log_time=$(date "+%Y-%m-%d-%H-%M-%S") log_time=$(date "+%Y-%m-%d-%H-%M-%S")
log_dir_tmp="${first_param##*/}" log_dir_tmp="${first_param##*/}"
@ -191,6 +196,8 @@ run_designated() {
fi fi
cd $dir_scripts cd $dir_scripts
local relative_path="${first_param%/*}"
[[ ! -z ${relative_path} ]] && cd ${relative_path}
define_program "$file_param" define_program "$file_param"
log_time=$(date "+%Y-%m-%d-%H-%M-%S") log_time=$(date "+%Y-%m-%d-%H-%M-%S")
log_dir_tmp="${file_param##*/}" log_dir_tmp="${file_param##*/}"

28
shell/update.sh
View File

@ -147,6 +147,8 @@ update_repo() {
local repo_path="${dir_repo}/${uniq_path}" local repo_path="${dir_repo}/${uniq_path}"
make_dir "${dir_scripts}/${uniq_path}"
local formatUrl="$url" local formatUrl="$url"
if [[ $github_proxy_url ]]; then if [[ $github_proxy_url ]]; then
if [[ $url =~ "github.com" ]] || [[ $url =~ "githubusercontent.com" ]]; then if [[ $url =~ "github.com" ]] || [[ $url =~ "githubusercontent.com" ]]; then
@ -339,21 +341,20 @@ diff_scripts() {
gen_list_repo "$repo_path" "$author" "$path" "$blackword" "$dependence" gen_list_repo "$repo_path" "$author" "$path" "$blackword" "$dependence"
local repo="${repo_path##*/}" local list_add="$dir_list_tmp/${uniq_path}_add.list"
local list_add="$dir_list_tmp/${repo}_add.list" local list_drop="$dir_list_tmp/${uniq_path}_drop.list"
local list_drop="$dir_list_tmp/${repo}_drop.list" diff_cron "$dir_list_tmp/${uniq_path}_scripts.list" "$dir_list_tmp/${uniq_path}_user.list" $list_add $list_drop
diff_cron "$dir_list_tmp/${repo}_scripts.list" "$dir_list_tmp/${repo}_user.list" $list_add $list_drop
if [[ -s $list_drop ]]; then if [[ -s $list_drop ]]; then
output_list_add_drop $list_drop "失效" output_list_add_drop $list_drop "失效"
if [[ ${AutoDelCron} == true ]]; then if [[ ${AutoDelCron} == true ]]; then
del_cron $list_drop $repo del_cron $list_drop $uniq_path
fi fi
fi fi
if [[ -s $list_add ]]; then if [[ -s $list_add ]]; then
output_list_add_drop $list_add "新" output_list_add_drop $list_add "新"
if [[ ${AutoAddCron} == true ]]; then if [[ ${AutoAddCron} == true ]]; then
add_cron $list_add $repo add_cron $list_add $uniq_path
fi fi
fi fi
cd $dir_current cd $dir_current
@ -368,8 +369,7 @@ gen_list_repo() {
local blackword="$4" local blackword="$4"
local dependence="$5" local dependence="$5"
local repo="${repo_path##*/}" rm -f $dir_list_tmp/${uniq_path}*.list &>/dev/null
rm -f $dir_list_tmp/${repo}*.list &>/dev/null
cd ${repo_path} cd ${repo_path}
@ -395,19 +395,19 @@ gen_list_repo() {
for _file in ${results}; do for _file in ${results}; do
file_path=$(dirname $_file) file_path=$(dirname $_file)
make_dir "${dir_scripts}/${file_path}" make_dir "${dir_scripts}/${file_path}"
cp -f $_file "${dir_scripts}/${file_path}" cp -f $_file "${dir_scripts}/${uniq_path}/${file_path}"
done done
fi fi
for file in ${files}; do for file in ${files}; do
filename=$(basename $file) filename=$(basename $file)
cp -f $file $dir_scripts/${repo}_${filename} cp -f $file "$dir_scripts/${uniq_path}/${filename}"
echo ${repo}_${filename} >>"$dir_list_tmp/${repo}_scripts.list" echo "${uniq_path}/${filename}" >>"$dir_list_tmp/${uniq_path}_scripts.list"
cron_id=$(cat $list_crontab_user | grep -E "$cmd_task ${author}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task ${author}_${filename}\.*|\1|" | head -1 | awk -F " " '{print $1}') cron_id=$(cat $list_crontab_user | grep -E "$cmd_task ${uniq_path}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task ${uniq_path}_${filename}\.*|\1|" | head -1 | awk -F " " '{print $1}')
if [[ $cron_id ]]; then if [[ $cron_id ]]; then
result=$(update_cron_command_api "$cmd_task ${repo}_${filename}:$cron_id") result=$(update_cron_command_api "$cmd_task ${uniq_path}/${filename}:$cron_id")
fi fi
done done
grep -E "$cmd_task $repo" $list_crontab_user | perl -pe "s|.*ID=(.*) $cmd_task ($repo_.*)\.*|\2|" | awk -F " " '{print $1}' | sort -u >"$dir_list_tmp/${repo}_user.list" grep -E "$cmd_task $uniq_path" $list_crontab_user | perl -pe "s|.*ID=(.*) $cmd_task ($uniq_path.*)\.*|\2|" | awk -F " " '{print $1}' | sort -u >"$dir_list_tmp/${repo}_user.list"
cd $dir_current cd $dir_current
} }