diff --git a/Dockerfile b/Dockerfile index 4851d9e..45303e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,10 +35,6 @@ ENV XDG_CACHE_HOME=/app/.cache ENV RCLONE_CONFIG_BASE64="" ENV ENABLE_APP_CHECKER=true ENV CADDY_LOG_LEVEL=INFO -ENV RCLONE_AUTO_UPLOAD_PROVIDER= -ENV RCLONE_AUTO_UPLOAD_REMOTE_PATH=/downloads -ENV RCLONE_AUTO_UPLOAD_FILE_MIN_SIZE=1K -ENV RCLONE_AUTO_UPLOAD_FILE_MAX_SIZE=100G ADD install.sh aria2c.sh caddy.sh Procfile init.sh start.sh rclone.sh new-version-checker.sh APP_VERSION /app/ ADD conf /app/conf diff --git a/README.md b/README.md index 4b60090..66e02d4 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,6 @@ File Browser * Basic Auth * Support ARM CPUs as well, all supported CPU platforms can be found [here](https://cloud.docker.com/repository/docker/wahyd4/aria2-ui/tags) * Cloud Storage platforms synchronization - * Auto uploading files to 3rd party Cloud storage providers via Rclone after files been downloaded. ## Recommended versions @@ -132,10 +131,6 @@ Then simply run `docker-compose up -d`, that's it! | `RCLONE_CONFIG_BASE64` | Inject and config Rclone through `base64` string, which is the only way to use Rclone on Heroku. Please use `cat /app/conf/rclone.conf \| base64` or any base64 online tools such as [this](https://www.base64encode.org/) to encode your `rclone.conf` as bse64 string. Note, you need to set `ENABLE_RCLONE` to true as well. | | `ENABLE_APP_CHECKER` | By default it's set to `true` to check if any new docker image version release on daily basis, which can help you get notification when new features released as well as some security vulnerabilities get fixed. You can set it to `false` to disable this feature. Note: you still need to manually pull the new image version and re run the docker container to complete upgrading. | | CADDY_LOG_LEVEL | For specifying the log level of Caddy, set it to `ERROR` to reduce logs. Default: `INFO` | -| RCLONE_AUTO_UPLOAD_PROVIDER | The Rclone remote storage provider name, which can be found under `Rclone -> Configs`, default `""`, which means auto upload is disabled. When the value is not empty, then the files will be attempted to be uploaded.| -| RCLONE_AUTO_UPLOAD_REMOTE_PATH | The file folder in remote cloud storage provider, default `/downloads`| -| RCLONE_AUTO_UPLOAD_FILE_MIN_SIZE | Set the minimum file size of auto uploader, files smaller than it won't be uploaded, default `1K` | -| RCLONE_AUTO_UPLOAD_FILE_MAX_SIZE | Set the limit of the Max file can be uploaded to 3rd party storage provider, default `100G`. | ### Supported Volumes diff --git a/conf/aria2.conf b/conf/aria2.conf index fa9bbbd..daa032b 100644 --- a/conf/aria2.conf +++ b/conf/aria2.conf @@ -69,8 +69,7 @@ save-session-interval=10 bt-tracker=http://1337.abcvg.info:80/announce,http://nyaa.tracker.wf:7777/announce,http://opentracker.xyz:80/announce,http://rt.tace.ru:80/announce,http://share.camoe.cn:8080/announce,http://t.nyaatracker.com:80/announce,http://torrentsmd.com:8080/announce,http://tr.cili001.com:8070/announce,http://tracker-cdn.moeking.me:2095/announce,http://tracker.anirena.com:80/announce,http://tracker.anirena.com:80/b16a15d9a238d1f59178d3614b857290/announce,http://tracker.anonwebz.xyz:8080/announce,http://tracker.bt4g.com:2095/announce,http://tracker.files.fm:6969/announce,http://tracker.gbitt.info:80/announce,http://tracker.ipv6tracker.ru:80/announce,http://tracker.noobsubs.net:80/announce,http://tracker.shittyurl.org:80/announce,http://tracker.tfile.co:80/announce,http://tracker.tfile.me:80/announce,http://tracker.trackerfix.com:80/announce,http://vps02.net.orel.ru:80/announce,https://1337.abcvg.info:443/announce,https://tr.torland.ga:443/announce,https://tracker.coalition.space:443/announce,https://tracker.gbitt.info:443/announce,https://tracker.lilithraws.cf:443/announce,https://tracker.nanoha.org:443/announce,https://tracker.nitrix.me:443/announce,https://tracker.parrotsec.org:443/announce,https://tracker.shittyurl.org:443/announce,https://tracker.tamersunion.org:443/announce,https://w.wwwww.wtf:443/announce,udp://6rt.tace.ru:80/announce,udp://9.rarbg.com:2830/announce,udp://9.rarbg.me:2710/announce,udp://9.rarbg.to:2710/announce,udp://app.icon256.com:8000/announce,udp://bubu.mapfactor.com:6969/announce,udp://discord.heihachi.pw:6969/announce,udp://exodus.desync.com:6969/announce,udp://explodie.org:6969/announce,udp://fe.dealclub.de:6969/announce,udp://inferno.demonoid.is:3391/announce,udp://ipv6.tracker.zerobytes.xyz:16661/announce,udp://mail.realliferpg.de:6969/announce,udp://movies.zsw.ca:6969/announce,udp://mts.tvbit.co:6969/announce,udp://open.demonii.com:1337/announce,udp://open.stealth.si:80/announce,udp://opentor.org:2710/announce,udp://opentracker.i2p.rocks:6969/announce,udp://p4p.arenabg.ch:1337/announce,udp://p4p.arenabg.com:1337/announce,udp://pow7.com:80/announce,udp://retracker.hotplug.ru:2710/announce,udp://retracker.lanta-net.ru:2710/announce,udp://retracker.netbynet.ru:2710/announce,udp://retracker01-msk-virt.corbina.net:80/announce,udp://t1.leech.ie:1337/announce,udp://t2.leech.ie:1337/announce,udp://thetracker.org:80/announce,udp://torrentclub.online:54123/announce,udp://tracker-de.ololosh.space:6969/announce,udp://tracker.0x.tf:6969/announce,udp://tracker.altrosky.nl:6969/announce,udp://tracker.army:6969/announce,udp://tracker.beeimg.com:6969/announce,udp://tracker.birkenwald.de:6969/announce,udp://tracker.blacksparrowmedia.net:6969/announce,udp://tracker.breizh.pm:6969/announce,udp://tracker.ccp.ovh:6969/announce,udp://tracker.cyberia.is:6969/announce,udp://tracker.dler.com:6969/announce,udp://tracker.internetwarriors.net:1337/announce,udp://tracker.moeking.me:6969/announce,udp://tracker.nrx.me:6969/announce,udp://tracker.ololosh.space:6969/announce,udp://tracker.openbittorrent.com:6969/announce,udp://tracker.opentrackr.org:1337/announce,udp://tracker.shkinev.me:6969/announce,udp://tracker.theoks.net:6969/announce,udp://tracker.tiny-vps.com:6969/announce,udp://tracker.torrent.eu.org:451/announce,udp://tracker.uw0.xyz:6969/announce,udp://tracker.zerobytes.xyz:1337/announce,udp://tracker0.ufibox.com:6969/announce,udp://tracker1.bt.moack.co.kr:80/announce,udp://tracker1.itzmx.com:8080/announce,udp://tracker2.dler.com:80/announce,udp://tracker2.dler.org:80/announce,udp://tracker2.itzmx.com:6961/announce,udp://tracker3.itzmx.com:6961/announce,udp://tracker4.itzmx.com:2710/announce,udp://u.wwwww.wtf:1/announce,udp://valakas.rollo.dnsabr.com:2710/announce,udp://vibe.community:6969/announce,udp://wassermann.online:6969/announce,udp://www.torrent.eu.org:451/announce # The script to be run when download completes -#on-download-complete=/app/conf/aria2-sample-hook.sh -on-download-complete=/app/conf/auto-upload.sh +on-download-complete=/app/conf/aria2-sample-hook.sh # The script to be run when download fails on-download-error=/app/conf/aria2-sample-hook.sh diff --git a/conf/auto-upload.sh b/conf/auto-upload.sh deleted file mode 100755 index cae835b..0000000 --- a/conf/auto-upload.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -eu -RCLONE_AUTO_UPLOAD_PROVIDER=google-drive -if [[ $RCLONE_AUTO_UPLOAD_PROVIDER == "" ]]; then - echo "[INFO] $(date -u +'%Y-%m-%dT%H:%M:%SZ') Auto upload isn't enabled" - exit 0 -fi - -if [ $2 -eq 0 ]; then - echo "[WARN] $(date -u +'%Y-%m-%dT%H:%M:%SZ') No files detected" - exit 0 -fi - -echo "[INFO] $(date -u +'%Y-%m-%dT%H:%M:%SZ') Start to upload files with: Files Count: [$2], Files Path: [$3]" - -path=$3 # File full path -downloadpath='/data' # Aria2 downloading folder -provider_name=$RCLONE_AUTO_UPLOAD_PROVIDER # RClone remote provider -folder=$RCLONE_AUTO_UPLOAD_REMOTE_PATH # Foler path in Rclone remote provider -MinSize=$RCLONE_AUTO_UPLOAD_FILE_MIN_SIZE # Set mininum file size to be uploaded, files smaller than this will be deleted without uploading -MaxSize=$RCLONE_AUTO_UPLOAD_FILE_MAX_SIZE # Set the Max file size to be uploaded - -while true; do #提取下载文件根路径，如把/data/a/b/c/d.jpg变成/data/a - file_path=$path - path=${path%/*} - if [ "$path" == "" ]; then #不在下载文件夹 - exit 0 - elif [ "$path" == "$downloadpath" ] && [ $2 -eq 1 ]; then # To handle single file - rclone move "$file_path" ${provider_name}:${folder}/ - echo "[INFO] $(date -u +'%Y-%m-%dT%H:%M:%SZ') Successfully uploaded file $file_path" - exit 0 - elif [ "$path" == "$downloadpath" ]; then # To handle folder - while [[ "$(ls -A "$file_path/")" != "" ]]; do - rclone move "$file_path"/ ${provider_name}:${folder}/"${file_path##*/}"/ --delete-empty-src-dirs --min-size $MinSize --max-size $MaxSize - - echo "[INFO] $(date -u +'%Y-%m-%dT%H:%M:%SZ') Successfully uploaded file $file_path" - - rclone delete -v "$file_path" --max-size $MinSize # Delete files smaller than min file. - done - rm -rf "$file_path/" - exit 0 - fi -done