diff --git a/README.md b/README.md
index bd4fcf4b9eb..4e64914b91f 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@
## Additional Features
- Qbittorrent
- Size limiting for Torrent/Direct, Tar/Unzip, Mega and clone
-- Stop duplicate for all except qbittorrent tasks
+- Stop duplicate for all except qbittorrent tasks and youtube-dl
- Tar/Unzip Google Drive link support
- Select files from Torrent before downloading using qbittorrent
- Sudo with or without Database
@@ -26,9 +26,10 @@
- Counting Google Drive link
- View Link button
- Shell and Executor
-- Speedtes
+- Speedtest
- Status Pages for unlimited tasks
- Clone status
+- Many bugs has been fixed
- Direct links Supported:
```
letsupload.io, hxfile.co, anonfiles.com, bayfiles.com, antfiles,
@@ -38,7 +39,6 @@ streamtape.com, streamsb.net, feurl.com, pixeldrain.com, racaty.net,
1fichier.com, 1drv.ms (Only works for file not folder or business account),
uptobox.com (Uptobox account must be premium), solidfiles.com
```
-- Many bugs has been fixed
## From Original and Other Repos
- Mirroring direct download links, Torrent, and Telegram files to Google Drive
@@ -100,12 +100,12 @@ pip3 install -r requirements-cli.txt
Click Here For More Details
**1. Using ElephantSQL**
-- Go to https://elephantsql.com/ and create account (skip this if you already have ElephantSQL account)
-- Hit **Create New Instance**
+- Go to https://elephantsql.com and create account (skip this if you already have **ElephantSQL** account)
+- Hit `Create New Instance`
- Follow the further instructions in the screen
-- Hit **Select Region**
-- Hit **Review**
-- Hit **Create instance**
+- Hit `Select Region`
+- Hit `Review`
+- Hit `Create instance`
- Select your database name
- Copy your database url, and fill to `DATABASE_URL` in config
@@ -134,7 +134,7 @@ Fill up rest of the fields. Meaning of each fields are discussed below:
- `GDRIVE_FOLDER_ID`: This is the folder ID of the Google Drive Folder to which you want to upload all the mirrors.
- `DOWNLOAD_DIR`: The path to the local folder where the downloads should be downloaded to
- `DOWNLOAD_STATUS_UPDATE_INTERVAL`: A short interval of time in seconds after which the Mirror progress message is updated. (I recommend to keep it `5` seconds at least)
-- `AUTO_DELETE_MESSAGE_DURATION`: Interval of time (in seconds), after which the bot deletes it's message (and command message) which is expected to be viewed instantly. (**Note**: Set to `-1` to never automatically delete messages)
+- `AUTO_DELETE_MESSAGE_DURATION`: Interval of time (in seconds), after which the bot deletes it's message (and command message) which is expected to be viewed instantly. (**NOTE**: Set to `-1` to never automatically delete messages)
### Optional Field
- `ACCOUNTS_ZIP_URL`: Only if you want to load your Service Account externally from an Index Link. Archive the accounts folder to a zip file. Fill this with the direct link of that file.
- `TOKEN_PICKLE_URL`: Only if you want to load your **token.pickle** externally from an Index Link. Fill this with the direct link of that file.
@@ -154,7 +154,7 @@ Fill up rest of the fields. Meaning of each fields are discussed below:
- `MEGA_LIMIT`: To limit downloading Mega (leave space between number and unit, Available units is (gb or GB, tb or TB), Examples: `100 gb, 100 GB, 10 tb, 10 TB`
- `TORRENT_DIRECT_LIMIT`: To limit the Torrent/Direct mirror size, Leave space between number and unit. Available units is (gb or GB, tb or TB), Examples: `100 gb, 100 GB, 10 tb, 10 TB`
- `TAR_UNZIP_LIMIT`: To limit mirroring as Tar or unzipmirror. Available units is (gb or GB, tb or TB), Examples: `100 gb, 100 GB, 10 tb, 10 TB`
-- `VIEW_LINK`: View Link button to open file Index Link in browser instead of direct download link, you can figure out if it's compatible with your Index code or not, open any video from you Index and check if the END of link from browser link bar is `?a=view`, if yes make it `True` it will work (Compatible with [Bhadoo Index](https://gitlab.com/ParveenBhadooOfficial/Google-Drive-Index) Code)
+- `VIEW_LINK`: View Link button to open file Index Link in browser instead of direct download link, you can figure out if it's compatible with your Index code or not, open any video from you Index and check if the END of link from browser link bar is `?a=view`, if yes make it `True` it will work (Compatible with https://gitlab.com/ParveenBhadooOfficial/Google-Drive-Index Code)
- `UPTOBOX_TOKEN`: Uptobox token to mirror uptobox links. Get it from [Uptobox Premium Account](https://uptobox.com/my_account).
- `HEROKU_EMAIL`: Heroku Account email Id in which the above app will be deployed (**NOTE**: Only needed if you deploying on Heroku with Github Workflow).
- `HEROKU_API_KEY`: (Only if you deploying on Heroku) Your Heroku API key, get it from https://dashboard.heroku.com/account.
@@ -163,7 +163,7 @@ Fill up rest of the fields. Meaning of each fields are discussed below:
- `STATUS_LIMIT`: Status limit with buttons (**NOTE**: Recommend limit status to `4` tasks max).
- `IS_VPS`: (Only for VPS) Don't set this to `True` even if you are using VPS, unless facing error with web server. Also go to start.sh and replace `$PORT` by `80` or any port you want to use.
- `SERVER_PORT`: (Only if IS_VPS is `True`) Base URL Port
-- `BASE_URL_OF_BOT`: (Required for Heroku to avoid sleep) Valid BASE URL of where the bot is deploy. Ip/domain of your bot like `http://myip` or if you have chosen other port then `80` then `http://myip:port`, for Heroku fill `https://yourappname.herokuapp.com` (**NOTE**: No slash at the end), still got idling? You can use http://cron-job.org to ping you Heroku app.
+- `BASE_URL_OF_BOT`: (Required for Heroku to avoid sleep) Valid BASE URL of where the bot is deploy. Ip/domain of your bot like `http://myip` or if you have chosen other port then `80` then `http://myip:port`, for Heroku fill `https://yourappname.herokuapp.com` (**NOTE**: No slash at the end), still got idling? You can use http://cron-job.org to ping your Heroku app.
- `SHORTENER_API`: Fill your Shortener api key if you are using Shortener.
- `SHORTENER`: if you want to use Shortener in Gdrive and index link, fill Shortener url here. Examples:
```
@@ -254,13 +254,13 @@ sudo docker image prune -a
## Deploying on Heroku
- Deploying on Heroku with Github Workflow
- 
+
- Deploying on Heroku with heroku-cli and Goorm IDE
# Using Service Accounts for uploading to avoid user rate limit
-For Service Account to work, you must set `USE_SERVICE_ACCOUNTS`="True" in config file or environment variables,
+For Service Account to work, you must set `USE_SERVICE_ACCOUNTS` = "True" in config file or environment variables,
Many thanks to [AutoRClone](https://github.com/xyou365/AutoRclone) for the scripts.
**NOTE**: Using Service Accounts is only recommended while uploading to a Team Drive.
diff --git a/bot/helper/ext_utils/fs_utils.py b/bot/helper/ext_utils/fs_utils.py
index f4043ada9e5..2ac2b0a9686 100644
--- a/bot/helper/ext_utils/fs_utils.py
+++ b/bot/helper/ext_utils/fs_utils.py
@@ -10,7 +10,7 @@
def clean_download(path: str):
if os.path.exists(path):
- LOGGER.info(f"Cleaning download: {path}")
+ LOGGER.info(f"Cleaning Download: {path}")
shutil.rmtree(path)
diff --git a/heroku-guide.md b/heroku-guide.md
deleted file mode 100644
index f8b66836719..00000000000
--- a/heroku-guide.md
+++ /dev/null
@@ -1,51 +0,0 @@
-## Deploying slam-mirrorbot on Heroku with Github Workflows.
-
-## Pre-requisites
-
-- [Token Pickle](https://github.com/SlamDevs/slam-mirrorbot#getting-google-oauth-api-credential-file)
-- [Heroku](heroku.com) accounts. **NOTE**: Recommended to use 1 App in 1 Heroku account and Don't use bin/fake credits card, because your Heroku account will get banned.
-
-## Deployment
-
-1. Give a star and Fork this repo then upload **token.pickle** to your forks, or you can upload your **token.pickle** to your Index and put your **token.pickle** link to `TOKEN_PICKLE_URL` (**NOTE**: If you don't upload **token.pickle** uploading will not work).
-
-2. Go to Repository `Settings` -> `Secrets`
-
- 
-
-3. Add the below Required Variables one by one by clicking `New Repository Secret` everytime.
-
- * `HEROKU_EMAIL` Heroku Account Email Id in which the above app will be deployed
- * `HEROKU_API_KEY` Your Heroku API key, get it from https://dashboard.heroku.com/account
- * `HEROKU_APP_NAME` Your Heroku app name, Name Must be unique
- * `CONFIG_FILE_URL` Fill [This](https://raw.githubusercontent.com/Slam-Team/slam-mirrorbot/master/config_sample.env) in any text editor. Remove the `_____REMOVE_THIS_LINE_____=True` line and fill the variables. For details about config you can see [Here](https://github.com/SlamDevs/slam-mirrorbot#setting-up-config-file). Go to https://gist.github.com and paste your config data. Rename the file to `config.env` then create secret gist. Click on Raw, copy the link. This will be your `CONFIG_FILE_URL`. Refer to below images for clarity.
-
- 
-
- 
-
- 
-
- * **NOTE**: Remove commit id from raw link to be able to change variables without updating the `CONFIG_FILE_URL` in secrets. should be in this form: https://gist.githubusercontent.com/username/gist-id/raw/config.env
- * Before: https://gist.githubusercontent.com/anasty17/8cce4a4b4e7f4ea47e948b2d058e52ac/raw/19ba5ab5eb43016422193319f28bc3c7dfb60f25/config.env
- * After: https://gist.githubusercontent.com/anasty17/8cce4a4b4e7f4ea47e948b2d058e52ac/raw/config.env
- * You only need to restart your bot after editing `config.env` gist secret.
-
-4. After adding all the above Required Variables go to Github Actions tab in your repo
-
-5. Select `Manually Deploy to Heroku` workflow as shown below:
-
- 
-
-6. Then click on Run workflow
-
- 
-
-7. **Done!** your bot will be deployed now.
-
-## NOTE
-- Don't change/edit variables from Heroku if you want to change/edit do it in `config.env` from your gist.
-
-## Credits
-- [`arghyac35`](https://github.com/arghyac35) for Tutorial
-- [`AkhileshNS`](https://github.com/AkhileshNS) for Github Workflow method to deploy Heroku app
diff --git a/requirements.txt b/requirements.txt
index b07c49f7b0d..07fe5b30207 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
aiohttp
anytree
aria2p
-attrdict
appdirs
+attrdict
beautifulsoup4
cloudscrape
feedparser