diff --git a/LICENSE b/LICENSE index 5206e34..969207d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018-2020 P3TERX +Copyright (c) 2018-2021 P3TERX Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/aria2.conf b/aria2.conf index 4f4b7f3..f50280c 100644 --- a/aria2.conf +++ b/aria2.conf @@ -1,13 +1,13 @@ # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：aria2.conf # Description: Awesome Aria2 configuration file -# Version: 2020.12.28 +# Version: 2021.09.15 +# +# Copyright (c) 2018-2021 P3TERX +# +# This is free software, licensed under the MIT License. +# See /LICENSE for more information. # ## 文件保存设置 ## @@ -280,14 +280,14 @@ bt-detach-seed-only=true ## 客户端伪装 ## # 自定义 User Agent -user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.57 +user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.63 Safari/537.36 Edg/93.0.961.47 # BT 客户端伪装 # PT 下载需要保持 user-agent 和 peer-agent 两个参数一致 # 部分 PT 站对 Aria2 有特殊封禁机制，客户端伪装不一定有效，且有封禁账号的风险。 -#user-agent=Transmission 2.94 -peer-agent=Transmission 2.94 -peer-id-prefix=-TR2940- +#user-agent=Deluge 1.3.15 +peer-agent=Deluge 1.3.15 +peer-id-prefix=-DE13F0- ## 执行额外命令 ## @@ -384,6 +384,9 @@ quiet=false # 下载进度摘要输出间隔时间（秒），0 为禁止输出。默认：60 summary-interval=0 +# 关闭控制台进度条输出，避免日志里面打印大量空行 +show-console-readout=false + ## 增强扩展设置(非官方) ## diff --git a/clean.sh b/clean.sh index 0602de5..80750c2 100755 --- a/clean.sh +++ b/clean.sh @@ -1,15 +1,30 @@ #!/usr/bin/env bash # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：clean.sh # Description: Remove redundant files after Aria2 download is complete # Version: 3.0 # +# Copyright (c) 2018-2021 P3TERX +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# CHECK_CORE_FILE() { CORE_FILE="$(dirname $0)/core" diff --git a/core b/core index 500eba4..7ac0f3e 100644 --- a/core +++ b/core @@ -1,13 +1,28 @@ # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：core # Description: Aria2 additional function script core file -# Version: 3.0 +# Version: 3.3 +# +# Copyright (c) 2018-2021 P3TERX +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # TASK_GID=$1 @@ -215,7 +230,7 @@ DELETE_EMPTY_DIR() { } DELETE_EXCLUDE_FILE() { - if [[ ${FILE_NUM} -gt 1 ]] && [[ -n ${MIN_SIZE} || -n ${INCLUDE_FILE} || -n ${EXCLUDE_FILE} ]] || -n ${EXCLUDE_FILE_REGEX} ]] || -n ${INCLUDE_FILE_REGEX} ]]; then + if [[ ${FILE_NUM} -gt 1 ]] && [[ -n ${MIN_SIZE} || -n ${INCLUDE_FILE} || -n ${EXCLUDE_FILE} || -n ${EXCLUDE_FILE_REGEX} || -n ${INCLUDE_FILE_REGEX} ]]; then echo -e "${INFO} Deleting excluded files ..." [[ -n ${MIN_SIZE} ]] && find "${TASK_PATH}" -type f -size -${MIN_SIZE} -print0 | xargs -0 rm -vf [[ -n ${EXCLUDE_FILE} ]] && find "${TASK_PATH}" -type f -regextype posix-extended -iregex ".*\.(${EXCLUDE_FILE})" -print0 | xargs -0 rm -vf diff --git a/delete.sh b/delete.sh index 0aa5619..a1e4790 100755 --- a/delete.sh +++ b/delete.sh @@ -1,15 +1,30 @@ #!/usr/bin/env bash # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：delete.sh # Description: Delete files after Aria2 download error or task removed # Version: 3.0 # +# Copyright (c) 2018-2021 P3TERX +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# CHECK_CORE_FILE() { CORE_FILE="$(dirname $0)/core" diff --git a/dht.dat b/dht.dat index a834b77..a55fe38 100644 Binary files a/dht.dat and b/dht.dat differ diff --git a/dht6.dat b/dht6.dat index 36d34db..b0bbd18 100644 Binary files a/dht6.dat and b/dht6.dat differ diff --git a/move.sh b/move.sh index ee1e961..2702442 100755 --- a/move.sh +++ b/move.sh @@ -1,15 +1,30 @@ #!/usr/bin/env bash # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：move.sh # Description: Move files after Aria2 download is complete # Version: 3.0 # +# Copyright (c) 2018-2021 P3TERX +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# CHECK_CORE_FILE() { CORE_FILE="$(dirname $0)/core" diff --git a/rclone.env b/rclone.env index e154a4a..6de7005 100644 --- a/rclone.env +++ b/rclone.env @@ -1,14 +1,12 @@ # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：rclone.env -# Description: Rclone environment variables file +# Description: RCLONE environment variables file # Version: 2020.11.26 # +# For more information on RCLONE environment variables： +# https://rclone.org/docs/#environment-variables +# # RCLONE 配置文件路径 #RCLONE_CONFIG=$HOME/.config/rclone/rclone.conf @@ -16,6 +14,9 @@ # RCLONE 配置文件密码 #RCLONE_CONFIG_PASS= +# RCLONE 速率限制(单位K,M,G) +#RCLONE_BWLIMIT=10M + # RCLONE 并行上传文件数，使用 Aria2 联动上传时仅适用于单个任务。 #RCLONE_TRANSFERS=4 @@ -41,6 +42,3 @@ RCLONE_RETRIES_SLEEP=10s # RCLONE 代理设置 #HTTP_PROXY=localhost:1080 #HTTPS_PROXY=$HTTP_PROXY - -# More details -# https://rclone.org/docs/#environment-variables diff --git a/script.conf b/script.conf index 86299a8..c528cca 100644 --- a/script.conf +++ b/script.conf @@ -1,13 +1,8 @@ # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：script.conf # Description: Aria2 additional function script configuration file -# Version: 2020.08.08 +# Version: 2021.07.04 # ## 文件上传设置(upload.sh) ## diff --git a/tracker.sh b/tracker.sh index 1555698..ba85321 100755 --- a/tracker.sh +++ b/tracker.sh @@ -1,21 +1,33 @@ #!/usr/bin/env bash # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：tracker.sh # Description: Get BT trackers and add to Aria2 -# Version: 3.0 +# Version: 3.1 +# +# Copyright (c) 2018-2021 P3TERX +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # # BT tracker is provided by the following project. # https://github.com/XIU2/TrackersListCollection # -# Fallback URLs provided by jsDelivr -# https://www.jsdelivr.com -# RED_FONT_PREFIX="\033[31m" GREEN_FONT_PREFIX="\033[32m" @@ -38,7 +50,7 @@ GET_TRACKERS() { echo && echo -e "$(DATE_TIME) ${INFO} Get BT trackers..." TRACKER=$( ${DOWNLOADER} https://trackerslist.com/all_aria2.txt || - ${DOWNLOADER} https://cdn.jsdelivr.net/gh/XIU2/TrackersListCollection@master/all_aria2.txt || + ${DOWNLOADER} https://cdn.statically.io/gh/XIU2/TrackersListCollection/master/all_aria2.txt || ${DOWNLOADER} https://trackers.p3terx.com/all_aria2.txt ) else diff --git a/upload.sh b/upload.sh index cb55f11..b3a214c 100755 --- a/upload.sh +++ b/upload.sh @@ -1,15 +1,30 @@ #!/usr/bin/env bash # -# Copyright (c) 2018-2020 P3TERX -# -# This is free software, licensed under the MIT License. -# See /LICENSE for more information. -# # https://github.com/P3TERX/aria2.conf # File name：upload.sh # Description: Use Rclone to upload files after Aria2 download is complete # Version: 3.1 # +# Copyright (c) 2018-2021 P3TERX +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# CHECK_CORE_FILE() { CORE_FILE="$(dirname $0)/core"