diff --git a/Dockerfile b/Dockerfile index 6a381f4..930aae4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,8 @@ FROM ubuntu:20.04 WORKDIR /usr/src/app RUN chmod 777 /usr/src/app RUN apt-get -qq update && \ - DEBIAN_FRONTEND="noninteractive" apt-get -qq install -y tzdata aria2 git python3 python3-pip \ + apt-get upgrade -y && apt-get autoremove -y && \ + DEBIAN_FRONTEND="noninteractive" apt-get -qq install -y tzdata aria2 wget git python3 python3-pip \ locales python3-lxml \ curl pv jq ffmpeg \ p7zip-full p7zip-rar \ @@ -17,6 +18,8 @@ COPY requirements.txt . COPY extract /usr/local/bin COPY pextract /usr/local/bin RUN chmod +x /usr/local/bin/extract && chmod +x /usr/local/bin/pextract +RUN wget -q https://github.com/P3TERX/aria2.conf/raw/master/dht.dat -O /usr/src/app/dht.dat && \ +wget -q https://github.com/P3TERX/aria2.conf/raw/master/dht6.dat -O /usr/src/app/dht6.dat RUN pip3 install --no-cache-dir -r requirements.txt RUN locale-gen en_US.UTF-8 ENV LANG en_US.UTF-8 diff --git a/aria.sh b/aria.sh index 27cc601..9b2a15e 100755 --- a/aria.sh +++ b/aria.sh @@ -12,4 +12,10 @@ aria2c --enable-rpc --rpc-listen-all=false --rpc-listen-port 6800 --check-certif --disk-cache=64M --file-allocation=prealloc --continue=true \ --max-file-not-found=5 --max-tries=20 --auto-file-renaming=true \ --bt-enable-lpd=true --seed-time=0.01 --seed-ratio=1.0 \ - --content-disposition-default-utf8=true --http-accept-gzip=true --reuse-uri=true + --file-allocation=prealloc --max-file-not-found=5 --max-tries=5 --retry-wait=5 \ + --auto-file-renaming=true --reuse-uri=true --http-accept-gzip=true --listen-port=49152-65535 \ + --content-disposition-default-utf8=true --http-accept-gzip=true --reuse-uri=true --bt-tracker-connect-timeout=600 \ + --dht-listen-port=51513 --enable-dht=true --enable-dht6=true \ + --dht-file-path=/usr/src/app/dht.dat --dht-file-path6=/usr/src/app/dht6.dat \ + --dht-entry-point=dht.transmissionbt.com:6881 \ + --dht-entry-point6=dht.transmissionbt.com:6881 diff --git a/bot/helper/mirror_utils/upload_utils/gdriveTools.py b/bot/helper/mirror_utils/upload_utils/gdriveTools.py index 19e06af..7df263f 100644 --- a/bot/helper/mirror_utils/upload_utils/gdriveTools.py +++ b/bot/helper/mirror_utils/upload_utils/gdriveTools.py @@ -524,7 +524,10 @@ class GoogleDriveHelper: msg += f' | Index Link' else: msg += f' | Index Link' - + elif file.get('mimeType') == 'application/vnd.google-apps.shortcut': + msg += f"⁍{file.get('name')}" \ + f" (shortcut)" + # Excluded index link as indexes cant download or open these shortcuts else: furl = f"https://drive.google.com/uc?id={file.get('id')}&export=download" msg += f"⁍{file.get('name')}
({get_readable_file_size(int(file.get('size')))})📄

"