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

Simply sleep the upload progress thread instead of using event locks 

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
This commit is contained in:
lzzy12 2019-10-12 22:14:22 +05:30
parent 4fa2e71e98
commit c1e4bf246c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bot/helper/mirror_utils/gdriveTools.py
View File

@ -5,7 +5,7 @@ from googleapiclient.http import MediaFileUpload
import pickle import pickle
import os import os
import time import time
from bot import LOGGER, parent_id, DOWNLOAD_DIR from bot import LOGGER, parent_id, DOWNLOAD_DIR, DOWNLOAD_STATUS_UPDATE_INTERVAL
from bot.helper.ext_utils.fs_utils import get_mime_type from bot.helper.ext_utils.fs_utils import get_mime_type
from bot.helper.ext_utils.bot_utils import * from bot.helper.ext_utils.bot_utils import *
from bot.helper.ext_utils.exceptions import KillThreadException from bot.helper.ext_utils.exceptions import KillThreadException
@ -28,13 +28,11 @@ class GoogleDriveHelper:
self.uploadedBytes = 0 self.uploadedBytes = 0
self.start_time = 0 self.start_time = 0
self._should_update = True self._should_update = True
self.event = threading.Event()
self._do_progress_update = True self._do_progress_update = True
self.status = None self.status = None
def _on_upload_progress(self): def _on_upload_progress(self):
while self._do_progress_update: while self._do_progress_update:
self.event.wait()
if self.status is not None: if self.status is not None:
time_lapsed = time.time() - self.start_time time_lapsed = time.time() - self.start_time
# Update the message only if status is not null and loop_count is multiple of 50 # Update the message only if status is not null and loop_count is multiple of 50
@ -54,7 +52,7 @@ class GoogleDriveHelper:
self.__listener.onUploadProgress(_list, index) self.__listener.onUploadProgress(_list, index)
except KillThreadException: except KillThreadException:
self._should_update = False self._should_update = False
self.event.clear() time.sleep(DOWNLOAD_STATUS_UPDATE_INTERVAL)
def upload_file(self, file_path, file_name, mime_type, parent_id): def upload_file(self, file_path, file_name, mime_type, parent_id):
# File body description # File body description
@ -83,7 +81,6 @@ class GoogleDriveHelper:
threading.Thread(target=self._on_upload_progress).start() threading.Thread(target=self._on_upload_progress).start()
while response is None: while response is None:
self.status, response = drive_file.next_chunk() self.status, response = drive_file.next_chunk()
self.event.set()
self._do_progress_update = False self._do_progress_update = False
# Insert new permissions # Insert new permissions
self.__service.permissions().create(fileId=response['id'], body=permissions).execute() self.__service.permissions().create(fileId=response['id'], body=permissions).execute()