evanferrao
/
dump-mirrorbot
mirror of https://github.com/Box-boi/dump-mirrorbot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
839 Commits 2 Branches 21 Tags 2 MiB
Commit Graph

581 Commits

Author SHA1 Message Date
Hafitz Setya 11e9b2cad6
Fixed /list command 2021-03-01 11:18:11 +07:00
Hafitz Setya a6e3482878
Update list.py 2021-03-01 10:28:03 +07:00
Hafitz Setya 77904d77f0
v2.5 (#9) 
* Added mega.nz support
* Added option to disable mega.nz links
* Some fixes and optimization
 2021-03-01 07:44:54 +07:00
Hafitz Setya 2bf3e7fa88
v2.0 (#7) 
* Added ability of extracting iso, wim and many other filetypes 

* Added Speedtest command
 2021-02-27 16:12:22 +07:00
Hafitz Setya 8745252232
Fixed typo 2021-02-26 18:30:52 +07:00
Hafitz Setya 37b30cd10f
Fix None FileName in mirroring some TG File (#6) 2021-02-24 19:55:10 +07:00
Hafitz Setya 78a3f13f92
Skip unavailable videos when downloading from Playlist 2021-02-22 15:27:53 +07:00
Hafitz Setya 7c5e7c5108
Update gdriveTools.py 2021-02-21 18:33:38 +07:00
Hafitz Setya 195c04112a
Tidying up (#5) 
* Update delete.py

* Update mirror.py

* Update README.md
 2021-02-20 14:03:55 +07:00
Hafitz Setya 6a296bf0de
Update clone.py 2021-02-19 16:45:10 +07:00
Hafitz Setya 2990e85d79
Update __main__.py 2021-02-19 08:21:53 +07:00
Hafitz Setya f9b5af6375
Tidying up 2021-02-19 07:38:17 +07:00
Hafitz Setya 96f5c1fdee
Change /delete command to /del (#4) 
* Update bot_commands.py

* Update README.md
 2021-02-18 19:52:04 +07:00
Hafitz Setya e1c4fdd8fe
Update search.py 2021-02-15 09:22:52 +07:00
Hafitz Setya b8aac403b3
Added AUTHORIZED_CHATS in config & auto generate String Session (#3) 
* Added AUTHORIZED_CHATS in config

* Update config_sample.env

* Update app.json

* Update __init__.py

* Update config_sample.env

* Delete generate_string_session.py

* Update app.json

* Delete authorized_chats.txt

* Oof

* Update README.md

* Forget

* Update README.md

* Update README.md
 2021-02-15 08:03:25 +07:00
Hafitz Setya c7b58b09cd
Fix tag 2021-02-14 20:57:56 +07:00
Hafitz Setya 35e636cc23
Update gdriveTools.py 2021-02-14 20:43:34 +07:00
Hafitz Setya cffd94501a
Fix TG unzipmirror 2021-02-14 11:03:53 +07:00
Hafitz Setya a999fe00c2
Fix restart if user has not mirrored anything 2021-02-14 10:52:24 +07:00
Hafitz Setya fbd77ae313
Session String (#2) 
* Update README.md

* Update README.md

* Update gdriveTools.py
 2021-02-14 09:57:29 +07:00
Hafitz Setya 8f94e54696
Update gdriveTools.py 2021-02-14 04:17:31 +07:00
Hafitz Setya cf506b283a
Change to English 2021-02-13 19:29:02 +07:00
4amparaboy 884b653cc6
Update __main__.py 2021-02-13 19:10:36 +07:00
4amparaboy ec85e8e4c1
Update bot_commands.py 2021-02-13 19:10:12 +07:00
4amparaboy 91b796e20d
Update gdriveTools.py 2021-02-13 19:09:26 +07:00
4amparaboy c6df641282
Create delete.py 2021-02-13 19:07:59 +07:00
4amparaboy 6bb946b6b6
Update clone.py 2021-02-13 19:07:18 +07:00
Hafitz Setya 2b0681001d
Update stickers.py 2021-02-11 19:23:05 +07:00
Hafitz Setya 71e705ffe3
Update anime.py 2021-02-11 19:21:54 +07:00
Hafitz Setya 990d244e81
Update __main__.py 2021-02-11 19:20:46 +07:00
blank x 11bd13a756 add nyaa and sukebei torrent search function 2020-11-28 21:31:05 +05:30
jaskaranSM 9fd1269dd9 add shell and executor 2020-11-13 18:26:33 +05:30
DragSama 250a0155f7 add anime and stickers mod 2020-11-13 18:21:53 +05:30
Chizuru 22e38bb099 few changes 2020-11-13 18:12:58 +05:30
lzzy12 952a661b62 Merge remote-tracking branch 'origin/staging-4.0' into master 
# Conflicts:
#	Dockerfile
#	bot/helper/ext_utils/bot_utils.py
#	bot/helper/mirror_utils/download_utils/aria2_download.py
#	bot/modules/mirror.py
#	requirements.txt
 2020-09-13 22:38:45 +05:30
Dev Singh Rajput 009746aa01 added ability of extracting .7z files (#144) 2020-07-31 20:21:42 +05:30
Shubham dubey 10593d8a66 Fix /list if fileName string contains multiple quotes (#141) 2020-07-31 20:06:01 +05:30
jaskaranSM 0096b6328c Revert "Implement mega.nz support" 
This reverts commit 45f75fb7a6.
 2020-07-31 20:06:01 +05:30
lzzy12 1aed50a5f4 Fixed multiple /unzipmirror commands gets all the mirrors stuck 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-06-28 14:51:55 +05:30
lzzy12 b5a162f15d Use subprocess.run to call extract shell script 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-06-27 23:40:47 +05:30
lzzy12 e77290528e Fixed downloads from torrent files won't show seeders and peers 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>

# Conflicts:
#	bot/helper/mirror_utils/download_utils/aria2_download.py
 2020-06-27 20:28:30 +05:30
jaskaranSM b042030760 Implement Centralized Aria Websocket Listener 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-06-23 18:39:15 +05:30
jaskaranSM e4ecc60407 Optimize Clone implementation 2020-06-23 17:09:49 +05:30
jaskaranSM 53c34db027 Added cpu and ram usage in stats 2020-06-21 14:02:24 +05:30
jaskaranSM 1b79bbda6e Fix error extraction 2020-06-21 13:39:15 +05:30
lzzy12 45f75fb7a6 Fix crash if Mega API key is not provided 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-06-19 15:34:18 +05:30
jaskaranSM c6a430a44d Handle more exceptions 2020-06-18 12:59:52 +05:30
jaskaranSM 3720eacf13 Optimize Clone implementation 2020-06-18 12:57:31 +05:30
lzzy12 c4c7575000 Generate our own gid for mega mirrors 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-06-05 14:01:36 +05:30
lzzy12 c791b39785 Revert "Improved upload progress implementation" 
This reverts commit 0f7b79f7a4.
 2020-06-05 13:20:40 +05:30
lzzy12 3217b67df0 Fixup for meganz login 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-06-05 13:15:00 +05:30
lzzy12 8bd01276be Add ability to login to mega account for premium accounts 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-06-03 11:32:09 +05:30
lzzy12 df655a356c Import mega api key from config.env file 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-05-28 21:03:15 +05:30
jaskaranSM 578eeb4004 Implement Mega.nz mirror support. 
- Co-authored by - lzzy12 (github.com/lzzy12)
 2020-05-28 15:17:19 +05:30
Yash Garg 3f45ba6a73
Fix start message using f strings (#94) 
Fixes #90
 2020-05-28 08:23:02 +05:30
Nageen Chand b6b8a416e9
add ability to unzip files (#93) 
handle unsupported request

use shell utils to extract archives

use shell utils to extract archives

update mirror calls for unzipmirror

fix extract location of files

install deps

handling if archive is not extracted correctly

typo fix

implement Extract Status

handle filenames with spaces

handle special character
 2020-05-28 00:26:22 +05:30
Adnan Ahmad 9f5942deaa
Fixed Start message after changing HelpCommand (#90) 2020-05-23 16:57:02 +05:30
lzzy12 f3a3ed05f4 Fixed cancel by gid after f4290210b1 
- This fixes #77

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-05-21 17:25:11 +05:30
lzzy12 0f7b79f7a4 Improved upload progress implementation 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-05-21 13:08:50 +05:30
jaskaranSM cdefe12348 Implement Centralized Aria Websocket Listener 2020-05-15 13:34:09 +05:30
lzzy12 f4290210b1 Implemented mirror ownership 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-05-14 19:02:33 +05:30
jaskaranSM 3c04dc4a6c handle exception in onUploadError 2020-05-12 14:34:07 +05:30
jaskaranSM 1670b619ae Fix deadlock 2020-05-12 14:27:24 +05:30
jaskaranSM a196ce5b93 Handle TG exceptions 2020-05-12 13:56:57 +05:30
jaskaranSM c4e81d5ab1 start Aria2 Websocket listener before adding download in queue. 2020-05-12 13:50:16 +05:30
lzzy12 d3938784ac Remove broken direct download link extracters 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-05-09 00:10:09 +05:30
lzzy12 1d8c8ce954 restart: Clean downloads before restarting 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-05-09 00:05:35 +05:30
jaskaranSM 315108e7d1 patch regex for more links 2020-05-05 10:51:55 +05:30
jaskaranSM 4d964b6e29 use regex to extract fileId from GDrive links 2020-05-04 12:25:40 +05:30
Youssif Shaaban Alsager b02990d9eb
restart: inform the user that restarting is complete (#67) 
Signed-off-by: yshalsager <ysh-alsager@hotmail.com>
 2020-04-25 21:13:25 +05:30
Arsalan 4410f4e8aa
fixed hardcoded /watch for custom command users (#66) 2020-04-22 11:41:51 +05:30
Youssif Shaaban Alsager 63a67d7a14
Add restart command (#53) 
* Add restart command

This is handy when you need to restart the bot when something goes wrong.

Currently, the bot restarts but doesn't send a message after restarting
is done, feel free to improve this. It'll need something like storing
bot status locally then on bot start, if restart status exists send
a message.

Signed-off-by: yshalsager <ysh-alsager@hotmail.com>

* restart: switch to context based callbacks

* restart: restrict the command to owner only

Co-authored-by: Shivam Jha <jhashivam2020@gmail.com>
 2020-04-21 15:33:05 +05:30
jaskaranSM 78b60d6715
import threading lib 2020-04-19 14:58:35 +05:30
jaskaranSM 8624e0174b Fix IO Block on Large Playlists 2020-04-18 14:32:01 +05:30
jaskaranSM 236b6eb30e use args from CallbackContext 2020-04-16 13:28:44 +05:30
jaskaranSM 8341fe08c8 watch: context based callbacks 2020-04-16 13:00:35 +05:30
jaskaranSM 120ca7538d clone: remove forward slash 2020-04-16 12:39:46 +05:30
jaskaranSM e5bb8e55ef Clone fix and added index link support 2020-04-16 12:38:12 +05:30
jaskaranSM d7bc8f3c9a switch to context based callbacks 2020-04-16 12:26:28 +05:30
lzzy12 c6b4c542b7 fixup after e0f4c4347c 
- Also fixed copying of netrc file in the container

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-04-15 14:47:33 +05:30
lzzy12 e0f4c4347c Separate out youtube-dl command 
- /watch [youtube-dl supported link]

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-04-14 23:20:52 +05:30
lzzy12 e5364f96e1 Revert "Handle rare bug when download is not deleted from download_dict on error" 
This reverts commit 136924ffd4.

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-04-13 13:32:39 +05:30
lzzy12 76e3db1946 [Hotfix] Fix bug where the link have 302 request are treated as torrents 
Download.is_torrent introduced in aria2p v0.9.0
https://github.com/pawamoy/aria2p/issues/53

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-04-08 19:29:59 +05:30
Arsalan ed60afa9d6
fix typo in INDEX_URL (#54) 2020-04-07 20:36:04 +05:30
lzzy12 b2f2ee4335 Fix aria downloads cancellation after b58eb87b11 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-04-06 13:14:40 +05:30
lzzy12 47dd3c2b6f gdriveTools: Handle unhandled exception in clone method 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-04-05 14:12:13 +05:30
lzzy12 0536472e28 Expose message object from Status objects 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-04-05 13:28:35 +05:30
lzzy12 b58eb87b11 Improvements in cancelling mirrors 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-04-05 12:34:08 +05:30
jaskaranSM 708e6df87a youtube-dl: use best format 2020-04-01 12:07:29 +05:30
lzzy12 50ab740219 Correct filename if ffmpeg conversion is invoked by yt-dl 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-31 17:56:57 +05:30
lzzy12 a54fc42e1e Handle some exceptions 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-31 15:42:13 +05:30
lzzy12 e2c5c8beaf Log youtube-dl warnings and errors in bot log 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-31 11:15:09 +05:30
lzzy12 85d4005c16 Use netrc by default for youtube-dl 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-31 10:50:53 +05:30
lzzy12 9fa41f68c1 Some minor Fix-ups 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-30 18:16:54 +05:30
lzzy12 136924ffd4 Handle rare bug when download is not deleted from download_dict on error 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-30 17:46:56 +05:30
jaskaranSM 52e8fbec11 Fixed direct link torrent mirroring 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-30 17:05:55 +05:30
lzzy12 3754e8b3ce Fix tg torrent file mirror broken 
since 7d74cf29d8

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-30 17:02:31 +05:30
lzzy12 0ec499ff4a Handle weird path naming of youtube_dl 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-30 16:36:12 +05:30
lzzy12 141b13b52d Make ydl object local to the methods 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-30 14:55:29 +05:30
lzzy12 3bf9e0ea31 Use default quality provided by youtube-dl for now 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-28 20:14:43 +05:30
jaskaranSM 6262b26fe5 youtube-dl: fixed downloading from sites that provide encrypted content (m3u8) 2020-03-28 18:44:02 +05:30
lzzy12 7c304d449a Fix uploading for YT-DL 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-28 14:38:08 +05:30
lzzy12 9057d3fc4e Fixed yt-dl support 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-28 13:47:19 +05:30
jaskaranSM 3a06458609 Added Youtube-dl support 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-27 20:04:13 +05:30
lzzy12 2254444378 Handle KeyError exception in Telegram download error 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-27 16:00:37 +05:30
lzzy12 0de6915222 Remove redundant exception classes and fix existing ones 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-27 14:35:51 +05:30
Shivam Jha 6d07c3c8c4
Stop trying to generate sourceforge direct links 2020-03-26 16:02:36 +05:30
jaskaranSM be9c64a9aa Use Service Accounts for Cloning if availble. 
- increase default timeout for network socket interface

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-25 18:00:33 +05:30
jaskaranSM 08a71e4bd4 TeamDrive List fix 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-24 18:57:10 +05:30
lzzy12 6ca2f479d5 Fix up errors after porting service accounts from develop 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-24 16:30:03 +05:30
lzzy12 25856bfac0 gdrive: Stop spamming logs at INFO log level 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-24 15:49:04 +05:30
jaskaranSM 8d1bf5aa92 recursively try again instead of handling switch with backoff 
- Handling service account switching with exponential backoff implementation limits the number of service accounts to be used. recursively retrying again after switch doesnt effect backoff.

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-24 15:41:59 +05:30
jaskaranSM 6cd59d5a15 Cleanup drive_list and minor fixes 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-24 15:39:57 +05:30
jaskaranSM 681b8bd47d Added missing property 2020-03-24 15:07:45 +05:30
jaskaranSM 2bbfca0496 Refactor service account implementation 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-24 15:07:23 +05:30
lzzy12 7ad7d9388a Add support for service account 
Adding support service accounts

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>

Added scripts and docs for generating service accounts

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>

gen_sa_accounts: Save credentials with indexed file name

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>

gdriveTools: Avoid using oauth2 library for service accounts

oauth2 library is deprecated

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-24 15:04:24 +05:30
jaskaranSM 997e572b69 Enable TeamDrive support for clone 2020-03-24 14:17:50 +05:30
lzzy12 94b6be4c03 Add licensing and authorship information for direct_link_generator.py 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-23 15:41:53 +05:30
lzzy12 f50981b3a2 Implement cancel downloads of tg mirrors 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-23 15:21:54 +05:30
lzzy12 9369c7dc98 Allow mirroring tg file again once file download is complete 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-23 14:49:57 +05:30
lzzy12 7d74cf29d8 Fixed support for mirror of video and audio telegram files 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-22 16:30:57 +05:30
lzzy12 d6a513e77b Fix typo in direct_link_generator.py 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-22 15:48:14 +05:30
lzzy12 b4b0dcd3f8 Improve logic for parsing id from gdrive url 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-22 15:05:12 +05:30
lzzy12 49fe46bad3 Add gid method in Status class for download classes 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-22 15:05:12 +05:30
jaskaranSM a44d0da9f6 Implement cancellation of downloads by gid 2020-03-22 15:05:11 +05:30
jaskaranSM 6b60ca4491 Squash of clone command 
Implement clone feature
- clones a public/driveAccountAccessible Drive Link to bot G-Drive

use BotCommands for clone command trigger
 2020-03-22 15:05:11 +05:30
lzzy12 94ccdcbeef Add support for mirror of telegram files 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>

Add a script to generate string session for user

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>

Some fix ups

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>

Fix telegram download

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-22 15:04:31 +05:30
lzzy12 898977df97 Use proper url-encoding methods to replace special characters from url 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-20 17:03:33 +05:30
jaskaranSM afc2808acc Rewrite tar function 
- shutil changes pwd while archiving. as some functions of bot require relative paths, it is neccesary to keep pwd as bot root dir.

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>

# Conflicts:
#	bot/helper/ext_utils/fs_utils.py
 2020-03-19 15:43:04 +05:30
lzzy12 36df3aa2b4 Improve logic for determining true/false from config.env 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>

# Conflicts:
#	bot/modules/mirror.py
 2020-03-19 15:40:43 +05:30
lzzy12 ae9d972add Tag the author of replied message of mirror command 
This closes #24

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>

# Conflicts:
#	bot/modules/mirror.py
 2020-03-19 15:36:11 +05:30
lzzy12 7ba7bc92ac Add support for Direct Download generation 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-03-19 14:22:33 +05:30
lzzy12 2fddd06178 Fixed upload of empty files for Team Drive 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-02-05 02:49:54 -08:00
jaskaranSM 8cbe2c29e4 Added peers and seeders count for bittorent downloads 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-02-05 02:45:38 -08:00
Shivam Jha 96e623ef57
UploadStatus: Handle exception ZeroDivisionError 2020-02-05 01:52:43 -08:00
jaskaranSM 05468196e3
Fix Status Message 2020-01-20 09:19:49 +05:30
Shivam Jha 5c1a9c71b7
gdriveTools: Hardcode interval for updating progress 2020-01-17 01:34:52 -08:00
Shivam Jha 38348fc2aa
Revert "Set logging level to debug" 
This reverts 687321ac72
 2020-01-17 01:14:54 -08:00
Shivam Jha 687321ac72
Set logging level to debug 2020-01-16 10:46:50 -08:00
Aki 351d4030a8 fs_utils.py: Use python-magic for guessing mimetype (#31) 
1. mimetypes is not a reliable way to know the mime type of a file.

2. python-magic uses libmagic which identifies file types by checking their headers according to a predefined list of file types.

	https://github.com/ahupp/python-magic
 2020-01-16 09:06:55 -08:00
Shivam Jha 00a8e57467
Fixed error in gdrivetools 2020-01-10 17:36:51 +05:30
jaskaranSM 5598159626
Refactor parse logic 2020-01-04 07:46:23 +05:30
lzzy12 326129fdeb Make Oauth Scope a list as it should be 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-01-04 07:42:55 +05:30
lzzy12 e5f997d1f3 Revert "Fixed potential race conditions in GoogleDriveHelper class" 
This reverts commit 20dae25dc9.

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2020-01-03 10:41:54 +05:30
jaskaranSM 7b2d5d50ab Implement Exponential Backoff 
- for handling Google Drive API errors such as 5xx,4xx
 2020-01-03 10:15:40 +05:30
jaskaranSM 1543da735c Fixed bugs in MirrorListener 2020-01-02 13:41:39 +05:30
jaskaranSM b84ffcc416 prevent cleaning of uploading/archiving downloads 2020-01-02 10:25:45 +05:30
jaskaranSM 22d5797942 Fixed variable assignment 2019-12-29 20:20:16 +05:30
jaskaranSM a64b1b5346 Fixed stucked downloads when stopped via aria bt-stop-timeout 2019-12-29 19:50:01 +05:30
jaskaranSM 30dd2d97f5 Minor Refactor 2019-12-29 19:14:52 +05:30
jaskaranSM 38fa1ec2a6 Fixed Handling of Cancellation of uploads/archivals 2019-12-29 19:13:10 +05:30
jaskaranSM 7c4779cfc6
Added Authorization for Drive List Command. 2019-12-29 18:07:12 +05:30
lzzy12 20dae25dc9 Fixed potential race conditions in GoogleDriveHelper class 
* Also simplified code a bit
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-26 16:39:59 +05:30
lzzy12 820d72f317 Fixed files not being shown which were not uploaded by bot 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-26 14:47:05 +05:30
lzzy12 4fc07cd7a9 Fix typo in speed indicator 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-25 19:17:35 +05:30
lzzy12 4dd1aa4977 Handle empty strings in config variables 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-25 18:20:56 +05:30
lzzy12 4e1f7a8a77 Small optimisations all around 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-25 16:40:43 +05:30
lzzy12 8e886a3030 Add Index URL in /list cmd 
Also simplified code a bit

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-25 15:53:43 +05:30
lzzy12 53b6829235 Fixed Team Drive list functionality 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-25 15:15:36 +05:30
lzzy12 ac24ff0371 Optimise adding index url to messsage 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-25 14:53:58 +05:30
Shubham dubey eb388c7cea Fix Index trailing issue on directories 2019-12-25 14:53:58 +05:30
jaskaranSM e69625c406 Fix git conflict 2019-12-24 21:16:46 +05:30
jaskaranSM 8a516024cb Fixed Folder upload to Team Drives 2019-12-24 21:11:33 +05:30
lzzy12 b31a39f11a Enable TeamDrive support 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-24 20:12:39 +05:30
lzzy12 0ed1ca3531 Enable TeamDrive support 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-24 19:49:48 +05:30
lzzy12 6dfb3e9863 Simplify get_readable_msg code 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-24 17:35:09 +05:30
lzzy12 82ae49a33a Re implement upload progress after rebase 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-24 17:24:35 +05:30
jaskaranSM 19b6f91d5d Dont edit the message if content is same 2019-12-23 18:51:35 +05:30
Shivam Jha c4964ad9d0
Fix hardcoded value of status Update interval 2019-12-23 17:36:35 +05:30
lzzy12 01ed02e57c Fix mimetype error 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-23 16:29:20 +05:30
lzzy12 e2e1453013 Fixup errors after rebase 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-23 16:17:57 +05:30
lzzy12 b4cd971930 Read setup variables from environment variables 
Also Adds support for heroku env variables

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-23 15:46:56 +05:30
jaskaranSM 0d30f19a4e Project Rebase 
- Changelog:
 Improved Performance
 Fixed Stucked Messages
 Seperated Download Progress Status From Listener
 Disabled Upload Progress (Temporarily)
 2019-12-23 13:26:32 +05:30
lzzy12 4f9fa3f63f Fix typo 
Also Adds support for heroku env variables

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-09 17:05:57 +05:30
lzzy12 6c66a2ad8a Read setup variables from environment variables 
Also Adds support for heroku env variables

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-12-09 15:34:12 +05:30
lzzy12 db0dcb0d8b [DO NOT DEPLOY] Incomplete save 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-11-12 17:32:58 +05:30
jaskaranSM 584bd138df Refactored Download start logic 2019-11-12 15:01:08 +05:30
Shivam Jha df82d5944e
Fix progress update in torrent download 2019-11-10 01:24:13 +05:30
lzzy12 da622c04be Don't depend on bot to run for generate_gdrive_token.py 2019-11-07 14:48:35 +05:30
jaskaranSM ac39b7e682
Added Missing Statement 2019-11-01 21:29:23 +05:30
jaskaranSM 3a3eca2411 Refactored disk to stats and added bot uptime 
- Also helps tracking auto reboots on Heroku.
 2019-11-01 21:18:46 +05:30
jaskaranSM 8be32c6e5c Fixed Broken Mimetype Detection 2019-11-01 20:26:36 +05:30
Shivam Jha 7b5375fd21
Fix up after f7960a7dfe 2019-11-01 19:00:35 +05:30
lzzy12 826ab1d6f5 Update README.md 2019-11-01 17:46:10 +05:30
lzzy12 bf956b3fa6 Merge branch 'master' of https://github.com/lzzy12/python-aria-mirror-bot 2019-11-01 16:54:04 +05:30
lzzy12 f7960a7dfe Fix empty file progress 
Fixes #8

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-11-01 16:33:54 +05:30
jaskaranSM b9084fe506
list: Dont try to get size for folders 2019-10-31 22:23:40 +05:30
Shivam Jha c754d228e4
gdriveTools: Fix error in search 2019-10-31 00:04:43 +05:30
Shivam Jha 830ee1ad3e
gdriveTools: Fix search 
Recent force push seems to cause loss of commits. 
* Lesson learnt: NEVER FORCE PUSH IN MASTER BRANCH
 2019-10-31 00:02:55 +05:30
jaskaranSM a0d8947d6b
list: fix bug 2019-10-30 21:04:32 +05:30
Shivam Jha 8e65b6280d
Only Allow owner to cancell all downloads 2019-10-30 17:28:59 +05:30
jaskaranSM 03952750e2 Fix tagging users without username (#7) 2019-10-28 11:59:40 +05:30
Arsalan c403eab909 fixed the wrong comment (#6) 2019-10-28 10:52:22 +05:30
lzzy12 fd1c49d93f Fix indentation error 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-27 19:02:36 +05:30
jaskaranSM deb4b43fdd Validate Url and Magnet with Regex 2019-10-27 17:29:02 +05:30
jaskaranSM 3bac006fb3 Output file size in list search results 
- Also Listing Recent Uploads Fixed. ( * )
 2019-10-22 19:47:50 +05:30
jaskaranSM fdb49ac62a Fixed Cancelled Downloads stuck in Download Queue. 
- Also some minor Modifications.
 2019-10-22 18:20:47 +05:30
jaskaranSM 6ed78411fc
message_utils: Handle TimeOuts. 2019-10-20 18:53:18 +05:30
jaskaranSM b7e65d9c9c Changed sleep() call for Fixing Delay. 
- Also Tweaked Torrent Metadata Status Logic a bit.
 2019-10-19 16:44:26 +05:30
Shivam Jha fa664e6663
Check if log.txt exists before trying to open 
This fixes #3
 2019-10-17 21:45:03 +05:30
lzzy12 35f99c849f Handle an crash when user deletes the bot message manually 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-15 21:41:04 +05:30
lzzy12 9f26ed107c Allow owner to unauthorize a user or a chat 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-14 21:53:31 +05:30
lzzy12 d38bc90e82 Don't do anything on KillThreadException until we figure a better way 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-14 20:51:34 +05:30
lzzy12 6ce2507c36 Implement /log command for easier debugging 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-14 20:50:35 +05:30
lzzy12 a0cdda9e6e Improve gdrive progress tracking 
* Still bugged

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-14 19:49:33 +05:30
lzzy12 7228461ab9 Cast time formats to int 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-13 21:14:47 +05:30
lzzy12 c9ede8bf16 Fix torrent download from telegram 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-12 23:40:04 +05:30
Shubham dubey cc90560657
This triggers my OCD 2019-10-12 17:39:04 +05:30
lzzy12 17a08973e1 Handle some more crashes related download cleanup 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-12 22:54:30 +05:30
lzzy12 7b485d13b0 Fix crashes related to cancel mirror 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-12 22:45:30 +05:30
lzzy12 c1e4bf246c Simply sleep the upload progress thread instead of using event locks 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-12 22:14:22 +05:30
lzzy12 4fa2e71e98 Show upload ETA in appropriate time units 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-12 22:12:07 +05:30
lzzy12 70eaada75f Stop blocking the thread while uploading the file causing slow speeds 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-12 21:22:21 +05:30
lzzy12 bb74416eca Stop trying to add invalid urls 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-12 21:02:12 +05:30
lzzy12 16886f5ac8 Make changing of bot commands easier 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-12 20:56:49 +05:30
lzzy12 5d6c0c8ff7 Implementing auto delete message 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-12 20:22:21 +05:30
lzzy12 a432ad8a5d Fix some messages sent by bot 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-12 19:50:50 +05:30
lzzy12 b5c3989451 exit_cleanup: Use aria2.remove_all method instead of loop 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-11 23:28:46 +05:30
lzzy12 fda8785c64 get_readable_message: Acquire lock before accessing the download_dict 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-11 23:25:13 +05:30
lzzy12 6fe360ebaa Delete the element from download_dict if the download failed 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-11 19:56:54 +05:30
lzzy12 2e378a9f0b Add initial project documentation 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-11 19:19:32 +05:30
lzzy12 fad3913e26 Implement cancelall 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-11 00:30:58 +05:30
lzzy12 9d83cd31c7 Random fixes all around the source 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-11 00:30:58 +05:30
lzzy12 c683c7732f Fix authorization on bot restart 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-10 21:44:52 +05:30
lzzy12 ce16f77b6d Clean download directory on startup 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-07 23:17:09 +05:30
lzzy12 65303e3143 Change status while archiving download 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-07 23:05:05 +05:30
lzzy12 1761d16f70 Fix disk_usage size unit conversion logic 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-07 22:13:38 +05:30
lzzy12 80388249c5 Implement tar-mirror invoked by /tarmirror 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-07 22:13:38 +05:30
lzzy12 d36ba18a9f Categorise modules according to their jobs 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-07 22:13:38 +05:30
lzzy12 e49445c603 Use loop count instead of progress_bytes for upload progress 
* We still have to find the best way to limit the update
: Help needed

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-07 22:13:38 +05:30
lzzy12 3a8f284186 Only allow authorized users to use the bot 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-06 23:18:16 +05:30
lzzy12 3bfe24786e Use threading.Lock to prevent concurrent access to shared resources 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-06 20:56:36 +05:30
lzzy12 b58cb47584 Trying to fix bug 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-05 22:48:37 +05:30
lzzy12 99efa2dacb Fix error 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-05 21:25:13 +05:30
lzzy12 8d95cfa3b7 Fix upload ETA 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-05 21:18:58 +05:30
lzzy12 1e3b5578d5 Implement speed and ETA for upload 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-10-05 19:54:11 +05:30
lzzy12 706047f102 cancel_mirror: Handle some more user made errors 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-29 22:02:02 +05:30
lzzy12 7eda6b5f79 Add support for mirroring torrent files sent on telegram 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-29 21:22:50 +05:30
lzzy12 2447f7fc5c Add /disk command 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-29 20:29:21 +05:30
lzzy12 b69e009661 Add help and ping commands 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-29 19:37:02 +05:30
lzzy12 f83ab444d2 Fix some random stuffs 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-29 19:01:15 +05:30
lzzy12 6cc7f63410 Fix more crashes when mirror url is invalid 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-29 18:29:04 +05:30
jaskaranSM 1fd10648ff Add Progress Bar for Downloads 2019-09-29 18:29:04 +05:30
lzzy12 c638d7703e Fix onDownloadError callback when url is invalid 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-29 05:43:34 +05:30
lzzy12 c360bebb7b Start using python f-strings 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-28 23:29:01 +05:30
lzzy12 def54aca87 Mention error in the message while informing the user about cancellation 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-28 22:29:39 +05:30
lzzy12 6d4cfcaf43 Implement cancel_mirror 
* Only cancels downloads. Files already being uploaded can't be cancelled yet
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-28 22:09:07 +05:30
lzzy12 4e3f412e7a Use message_id as a key for download_dict instead of update_id 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-28 20:44:21 +05:30
lzzy12 7703a14058 Add support for mirroring .torrent provided it's URL 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-28 19:47:29 +05:30
lzzy12 0fac78be49 Fix some stuffs 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-28 19:43:48 +05:30
lzzy12 ae16a8338d gdriveTools: Set log level of googleapiclient.discovery to ERROR 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-28 19:19:31 +05:30
lzzy12 7ebd051ed3 Fix download cleanup 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-28 18:24:27 +05:30
lzzy12 c0a446749a Fix onDownloadComplete not being called 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-28 02:42:44 +05:30
lzzy12 bce77735ce Fix dead locks due to while loop in multiple threads trying to access a shared state 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-28 02:21:01 +05:30
lzzy12 8ddb98595c Fix bugged implementation of 464a633115 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-27 22:44:48 +05:30
lzzy12 464a633115 Only maintain single status message in a chat 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-27 20:35:41 +05:30
lzzy12 3fc9d40292 Implement mirror_status: invoked by /status 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-27 20:18:46 +05:30
lzzy12 c2f1fbadff Introduce message_utils module managing telegram messages 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-27 20:18:46 +05:30
lzzy12 86d624214d gdriveTools: Refactor confusing variable names 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-27 20:15:24 +05:30
lzzy12 d2a65adf18 Fix Yet another bug due to indentation 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-27 20:15:14 +05:30
jaskaranSM 94fc5d0022 Added G-Drive List Feature 2019-09-27 20:15:02 +05:30
jaskaranSM 53fb5bda2e Fixed Recursive Directory Upload 2019-09-27 20:14:52 +05:30
lzzy12 a67ddfb5be download_tools: Fix torrent yet again 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-26 23:05:19 +05:30
lzzy12 7281c18687 gdrive_tools: Refactor file_ops() to get_mime_type() 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-26 23:01:34 +05:30
lzzy12 43c95a659b Fix bug of uploaded file not saving with proper name 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-26 23:01:34 +05:30
lzzy12 84482969f1 Introduce DownloadStatus class for storing stats of downloads 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-26 22:34:37 +05:30
lzzy12 f0efb4357d Clean up downloads user requests bot shut-down 
* Basically for Ctrl + C
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-26 18:30:43 +05:30
lzzy12 ab6c01146e Make separate module for fs related jobs 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-26 18:30:43 +05:30
lzzy12 54c563ffc4 Make sure there are not other useless downloads in background on startup 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-26 18:30:43 +05:30
lzzy12 50020b0e6b Fix logic for is_url 
This is not perfect

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-26 18:30:43 +05:30
lzzy12 6c082f7e77 download_helper: Fix support for download from magnet links 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-26 18:30:43 +05:30
lzzy12 76c6d68d85 download_helper: Avoid instantiating Aria APIs on each new mirror request 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-26 18:30:43 +05:30
lzzy12 d403c95c5a gdrivetool: Use console based Flow for authentication 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-26 18:30:43 +05:30
lzzy12 b2bd0c2685 Remove unnecessary dependency on CLIENT_SECRET and CLIENT_ID 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-26 18:30:43 +05:30
lzzy12 1c56b18724 Separated telegram related code from download upload related code 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-26 18:30:43 +05:30
lzzy12 d6b6933ee8 Remove redundant str constructors 2019-09-22 23:08:42 +05:30
lzzy12 ffd1f7f378 ariaTools: Add a function to get file name of download 2019-09-22 22:26:00 +05:30
jaskaranSM 6bb1224aa7 Specify Download Dir with RPC 2019-09-18 11:48:19 -04:00
lzzy12 12b66b960c Remove dirty hack 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-18 19:34:39 +05:30
lzzy12 d56aaa4729 Add an option to specify download directory 2019-09-18 18:38:45 +05:30
lzzy12 21dacbc8fb Major project structure rebase 
Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
 2019-09-17 19:17:34 +05:30