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

Fix 

-fix stuck on uploading after selection from some torrents

Signed-off-by: anas <e.anastayyar@gmail.com>
This commit is contained in:
anas 2021-08-25 01:27:13 +03:00
parent c50a932e4c
commit 9932495333
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bot/helper/mirror_utils/download_utils/qbit_downloader.py
View File

@ -52,6 +52,7 @@ class qbittorrent:
tor_info = self.client.torrents_info(torrent_hashes=self.ext_hash)
if len(tor_info) > 0:
sendMessage("This torrent is already in list.", listener.bot, listener.update)
self.client.auth_log_out()
return
if is_file:
op = self.client.torrents_add(torrent_files=[link], save_path=dire)
@ -64,6 +65,7 @@ class qbittorrent:
while True:
if time.time() - self.meta_time >= 300:
sendMessage("The torrent was not added. report when u see this error", listener.bot, listener.update)
self.client.auth_log_out()
return False
tor_info = self.client.torrents_info(torrent_hashes=self.ext_hash)
if len(tor_info) > 0:
@ -118,10 +120,12 @@ class qbittorrent:
except qba.UnsupportedMediaType415Error as e:
LOGGER.error(str(e))
sendMessage("This is an unsupported/invalid link. {str(e)}", listener.bot, listener.update)
self.client.auth_log_out()
except Exception as e:
LOGGER.error(str(e))
sendMessage(str(e), listener.bot, listener.update)
self.client.torrents_delete(torrent_hashes=self.ext_hash, delete_files=True)
self.client.auth_log_out()
def update(self):
@ -136,6 +140,7 @@ class qbittorrent:
if time.time() - self.meta_time >= 999999999: # timeout while downloading metadata
self.listener.onDownloadError("Dead Torrent!")
self.client.torrents_delete(torrent_hashes=self.ext_hash, delete_files=True)
self.client.auth_log_out()
self.updater.cancel()
return
elif tor_info.state == "downloading":
@ -153,17 +158,20 @@ class qbittorrent:
if result:
self.listener.onDownloadError(f"{mssg}.\nYour File/Folder size is {get_readable_file_size(size)}")
self.client.torrents_delete(torrent_hashes=self.ext_hash, delete_files=True)
self.client.auth_log_out()
self.updater.cancel()
return
elif tor_info.state == "stalledDL":
if time.time() - self.stalled_time >= 999999999: # timeout after downloading metadata
self.listener.onDownloadError("Dead Torrent!")
self.client.torrents_delete(torrent_hashes=self.ext_hash, delete_files=True)
self.client.auth_log_out()
self.updater.cancel()
return
elif tor_info.state == "error":
self.listener.onDownloadError("Error. IDK why, report in support group")
self.client.torrents_delete(torrent_hashes=self.ext_hash, delete_files=True)
self.client.auth_log_out()
self.updater.cancel()
return
elif tor_info.state == "uploading" or tor_info.state.lower().endswith("up"):
@ -176,10 +184,12 @@ class qbittorrent:
for folder in subdir:
if fnmatch(folder, ".unwanted"):
shutil.rmtree(os.path.join(dirpath, folder))
for dirpath, subdir, files in os.walk(f"{self.dire}", topdown=False):
if not os.listdir(dirpath):
os.rmdir(dirpath)
self.listener.onDownloadComplete()
self.client.torrents_delete(torrent_hashes=self.ext_hash, delete_files=True)
self.client.auth_log_out()
self.updater.cancel()
except:
self.updater.cancel()

1
bot/modules/mirror.py
View File

@ -56,6 +56,7 @@ class MirrorListener(listeners.MirrorListeners):
try:
aria2.purge()
get_client().torrents_delete(torrent_hashes="all", delete_files=True)
get_client().auth_log_out()
Interval[0].cancel()
del Interval[0]
delete_all_messages()