diff --git a/pixiv/config.json.example b/pixiv/config.json.example index bdfab4a..ce93d72 100644 --- a/pixiv/config.json.example +++ b/pixiv/config.json.example @@ -1,9 +1,15 @@ { "basePath": "本地缓存路径,包括接口数据,图片等", - "telegramToken": "telegram 机器人申请的API Token", - "chatId": "推送目标聊天的唯一标识符或目标频道的用户名", - "mode": "Pixiv排行榜类型,有效值:daily/weekly/monthly/rookie/daily_r18/weekly_r18/male_r18/female_r18/r18g,分别是日榜/周榜/月榜/新人榜/日榜r18/周榜r18/受男性欢迎r18/受女性欢迎r18/r18g", - "content": "Pixiv排行榜类型,有效值:illust/ugoira/manga/,分别是插画/动图/漫画", + "telegram":{ + "telegramToken": "telegram 机器人申请的API Token", + "chatId": "推送目标聊天的唯一标识符或目标频道的用户名" + }, + "pixiv":{ + "mode": "Pixiv排行榜类型,有效值:daily/weekly/monthly/rookie/daily_r18/weekly_r18/male_r18/female_r18/r18g,分别是日榜/周榜/月榜/新人榜/日榜r18/周榜r18/受男性欢迎r18/受女性欢迎r18/r18g", + "content": "Pixiv排行榜类型,有效值:illust/ugoira/manga/,分别是插画/动图/漫画", + "cookie_param":"Pixiv 用户cookie", + "user_agent":"请求头User-Agent" + }, "aliyun_oss":{ "Host":"Endpoint(地域节点)", "accelerateHost":"传输加速Endpoint(地域节点)", diff --git a/pixiv/pixiv.sh b/pixiv/pixiv.sh index ec396ba..f13e5b4 100644 --- a/pixiv/pixiv.sh +++ b/pixiv/pixiv.sh @@ -160,11 +160,13 @@ GetBucketV2 | xmlstarlet select -t -m '/ListBucketResult//Contents' -v 'Key' -n fi done -telegramToken=$(cat $config_file | jq -r .telegramToken) +telegramToken=$(cat $config_file | jq -r .telegram.telegramToken) baseApi="https://api.telegram.org/bot$telegramToken" -chat_id=$(cat $config_file | jq .chatId) -mode=$(cat $config_file | jq -r .mode) -content=$(cat $config_file | jq -r .content) +chat_id=$(cat $config_file | jq .telegram.chatId) +mode=$(cat $config_file | jq -r .pixiv.mode) +content=$(cat $config_file | jq -r .pixiv.content) +cookie_param=$(cat $config_file | jq -r .pixiv.cookie_param) +user_agent=$(cat $config_file | jq -r .pixiv.user_agent) rank_url="https://www.pixiv.net/ranking.php?mode=$mode&content=$content&p=1&format=json" today=$(date "+%Y-%m-%d") _today=$(date "+%Y%m%d") @@ -216,7 +218,7 @@ for index in $(seq 1 $length); do png_html_file=$pid.html if [ ! -f $png_html_file ]; then echo "get data from $artworkLink" - curl -v $artworkLink >$png_html_file + curl -v -H "cookie: $cookie_param" -H "user-agent:$user_agent" $artworkLink >$png_html_file fi json_file=$pid.json if [ ! -f $json_file ]; then