-Use token.pickle instead of SA for count, clone and download if file not found and token.pickle exists and always for multi drive search
-Skip folder id if using recursive search Signed-off-by: anas <e.anastayyar@gmail.com>
This commit is contained in:
anas
parent
794d6ba227
commit
3c08a3ea6b
|
|
@ -203,6 +203,7 @@ class QbitTorrent:
|
|||
self.client.auth_log_out()
|
||||
self.updater.cancel()
|
||||
except:
|
||||
self.client.auth_log_out()
|
||||
self.updater.cancel()
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -74,6 +74,7 @@ class GoogleDriveHelper:
|
|||
self.total_folders = 0
|
||||
self.transferred_size = 0
|
||||
self.sa_count = 0
|
||||
self.alt_auth = False
|
||||
|
||||
|
||||
def speed(self):
|
||||
|
|
@ -257,8 +258,6 @@ class GoogleDriveHelper:
|
|||
def upload(self, file_name: str):
|
||||
self.is_downloading = False
|
||||
self.is_uploading = True
|
||||
if USE_SERVICE_ACCOUNTS:
|
||||
self.service_account_count = len(os.listdir("accounts"))
|
||||
self.__listener.onUploadStarted()
|
||||
file_dir = f"{DOWNLOAD_DIR}{self.__listener.message.message_id}"
|
||||
file_path = f"{file_dir}/{file_name}"
|
||||
|
|
@ -339,7 +338,7 @@ class GoogleDriveHelper:
|
|||
reason = json.loads(err.content).get('error').get('errors')[0].get('reason')
|
||||
if reason in ['userRateLimitExceeded', 'dailyLimitExceeded']:
|
||||
if USE_SERVICE_ACCOUNTS:
|
||||
if self.sa_count == self.service_account_count:
|
||||
if self.sa_count == len(os.listdir("accounts")):
|
||||
self.is_cancelled = True
|
||||
raise err
|
||||
else:
|
||||
|
|
@ -388,8 +387,6 @@ class GoogleDriveHelper:
|
|||
self.start_time = time.time()
|
||||
self.total_files = 0
|
||||
self.total_folders = 0
|
||||
if USE_SERVICE_ACCOUNTS:
|
||||
self.service_account_count = len(os.listdir("accounts"))
|
||||
try:
|
||||
file_id = self.getIdFromUrl(link)
|
||||
except (KeyError,IndexError):
|
||||
|
|
@ -474,6 +471,10 @@ class GoogleDriveHelper:
|
|||
if "User rate limit exceeded" in str(err):
|
||||
msg = "User rate limit exceeded."
|
||||
elif "File not found" in str(err):
|
||||
token_service = self.alt_authorize()
|
||||
if token_service is not None:
|
||||
self.__service = token_service
|
||||
return self.clone(link)
|
||||
msg = "File not found."
|
||||
else:
|
||||
msg = f"Error.\n{err}"
|
||||
|
|
@ -571,6 +572,30 @@ class GoogleDriveHelper:
|
|||
scopes=self.__OAUTH_SCOPE)
|
||||
return build('drive', 'v3', credentials=credentials, cache_discovery=False)
|
||||
|
||||
def alt_authorize(self):
|
||||
credentials = None
|
||||
if USE_SERVICE_ACCOUNTS and not self.alt_auth:
|
||||
self.alt_auth = True
|
||||
if os.path.exists(self.__G_DRIVE_TOKEN_FILE):
|
||||
LOGGER.info("Authorize with token.pickle")
|
||||
with open(self.__G_DRIVE_TOKEN_FILE, 'rb') as f:
|
||||
credentials = pickle.load(f)
|
||||
if credentials is None or not credentials.valid:
|
||||
if credentials and credentials.expired and credentials.refresh_token:
|
||||
credentials.refresh(Request())
|
||||
else:
|
||||
flow = InstalledAppFlow.from_client_secrets_file(
|
||||
'credentials.json', self.__OAUTH_SCOPE)
|
||||
LOGGER.info(flow)
|
||||
credentials = flow.run_console(port=0)
|
||||
|
||||
# Save the credentials for the next run
|
||||
with open(self.__G_DRIVE_TOKEN_FILE, 'wb') as token:
|
||||
pickle.dump(credentials, token)
|
||||
return build('drive', 'v3', credentials=credentials, cache_discovery=False)
|
||||
else:
|
||||
return None
|
||||
|
||||
|
||||
def edit_telegraph(self):
|
||||
nxt_page = 1
|
||||
|
|
@ -621,68 +646,72 @@ class GoogleDriveHelper:
|
|||
return rtnlist
|
||||
|
||||
def drive_query(self, parent_id, fileName):
|
||||
if RECURSIVE_SEARCH:
|
||||
if self.stopDup:
|
||||
query = f"name = '{fileName}' and "
|
||||
else:
|
||||
fileName = fileName.split(' ')
|
||||
query = "".join(
|
||||
f"name contains '{name}' and "
|
||||
for name in fileName
|
||||
if name != ''
|
||||
)
|
||||
|
||||
query += "trashed = false"
|
||||
if parent_id == "root":
|
||||
return (
|
||||
self.__service.files()
|
||||
.list(q=query + " and 'me' in owners",
|
||||
pageSize=100,
|
||||
spaces='drive',
|
||||
fields='files(id, name, mimeType, size, parents)',
|
||||
orderBy='folder, name asc'
|
||||
try:
|
||||
if RECURSIVE_SEARCH:
|
||||
if self.stopDup:
|
||||
query = f"name = '{fileName}' and "
|
||||
else:
|
||||
fileName = fileName.split(' ')
|
||||
query = "".join(
|
||||
f"name contains '{name}' and "
|
||||
for name in fileName
|
||||
if name != ''
|
||||
)
|
||||
|
||||
query += "trashed = false"
|
||||
if parent_id == "root":
|
||||
return (
|
||||
self.__service.files()
|
||||
.list(q=query + " and 'me' in owners",
|
||||
pageSize=100,
|
||||
spaces='drive',
|
||||
fields='files(id, name, mimeType, size, parents)',
|
||||
orderBy='folder, name asc'
|
||||
)
|
||||
.execute()
|
||||
)
|
||||
else:
|
||||
return (
|
||||
self.__service.files()
|
||||
.list(supportsTeamDrives=True,
|
||||
includeTeamDriveItems=True,
|
||||
teamDriveId=parent_id,
|
||||
q=query,
|
||||
corpora='drive',
|
||||
spaces='drive',
|
||||
pageSize=100,
|
||||
fields='files(id, name, mimeType, size, teamDriveId, parents)',
|
||||
orderBy='folder, name asc'
|
||||
)
|
||||
.execute()
|
||||
)
|
||||
.execute()
|
||||
)
|
||||
else:
|
||||
if self.stopDup:
|
||||
query = f"'{parent_id}' in parents and name = '{fileName}' and "
|
||||
else:
|
||||
query = f"'{parent_id}' in parents and "
|
||||
fileName = fileName.split(' ')
|
||||
for name in fileName:
|
||||
if name != '':
|
||||
query += f"name contains '{name}' and "
|
||||
query += "trashed = false"
|
||||
return (
|
||||
self.__service.files()
|
||||
.list(supportsTeamDrives=True,
|
||||
.list(
|
||||
supportsTeamDrives=True,
|
||||
includeTeamDriveItems=True,
|
||||
teamDriveId=parent_id,
|
||||
q=query,
|
||||
corpora='drive',
|
||||
spaces='drive',
|
||||
pageSize=100,
|
||||
fields='files(id, name, mimeType, size, teamDriveId, parents)',
|
||||
orderBy='folder, name asc'
|
||||
pageSize=200,
|
||||
fields='files(id, name, mimeType, size)',
|
||||
orderBy='folder, name asc',
|
||||
)
|
||||
.execute()
|
||||
)
|
||||
else:
|
||||
if self.stopDup:
|
||||
query = f"'{parent_id}' in parents and name = '{fileName}' and "
|
||||
else:
|
||||
query = f"'{parent_id}' in parents and "
|
||||
fileName = fileName.split(' ')
|
||||
for name in fileName:
|
||||
if name != '':
|
||||
query += f"name contains '{name}' and "
|
||||
query += "trashed = false"
|
||||
return (
|
||||
self.__service.files()
|
||||
.list(
|
||||
supportsTeamDrives=True,
|
||||
includeTeamDriveItems=True,
|
||||
q=query,
|
||||
spaces='drive',
|
||||
pageSize=200,
|
||||
fields='files(id, name, mimeType, size)',
|
||||
orderBy='folder, name asc',
|
||||
)
|
||||
.execute()
|
||||
)
|
||||
|
||||
except Exception as err:
|
||||
err = str(err).replace('>', '').replace('<', '')
|
||||
LOGGER.error(err)
|
||||
return {'files': []}
|
||||
|
||||
def drive_list(self, fileName, stopDup=False, noMulti=False):
|
||||
self.stopDup = stopDup
|
||||
|
|
@ -692,7 +721,13 @@ class GoogleDriveHelper:
|
|||
content_count = 0
|
||||
all_contents_count = 0
|
||||
Title = False
|
||||
if len(DRIVES_IDS) > 1:
|
||||
token_service = self.alt_authorize()
|
||||
if token_service is not None:
|
||||
self.__service = token_service
|
||||
for index, parent_id in enumerate(DRIVES_IDS):
|
||||
if RECURSIVE_SEARCH and len(parent_id) > 23:
|
||||
continue
|
||||
response = self.drive_query(parent_id, fileName)
|
||||
if not response["files"] and noMulti:
|
||||
break
|
||||
|
|
@ -828,8 +863,14 @@ class GoogleDriveHelper:
|
|||
except Exception as err:
|
||||
err = str(err).replace('>', '').replace('<', '')
|
||||
LOGGER.error(err)
|
||||
msg = "File not found." if "File not found" in str(err) else f"Error.\n{err}"
|
||||
return msg
|
||||
if "File not found" in str(err):
|
||||
token_service = self.alt_authorize()
|
||||
if token_service is not None:
|
||||
self.__service = token_service
|
||||
return self.count(link)
|
||||
msg = "File not found."
|
||||
else:
|
||||
msg = f"Error.\n{err}"
|
||||
return msg
|
||||
|
||||
|
||||
|
|
@ -879,7 +920,14 @@ class GoogleDriveHelper:
|
|||
except Exception as err:
|
||||
err = str(err).replace('>', '').replace('<', '')
|
||||
LOGGER.error(err)
|
||||
msg = "File not found." if "File not found" in str(err) else f"Error.\n{err}"
|
||||
if "File not found" in str(err):
|
||||
token_service = self.alt_authorize()
|
||||
if token_service is not None:
|
||||
self.__service = token_service
|
||||
return self.clonehelper(link)
|
||||
msg = "File not found."
|
||||
else:
|
||||
msg = f"Error.\n{err}"
|
||||
return msg, "", "", ""
|
||||
return "", clonesize, name, files
|
||||
|
||||
|
|
@ -887,8 +935,6 @@ class GoogleDriveHelper:
|
|||
def download(self, link):
|
||||
self.is_downloading = True
|
||||
file_id = self.getIdFromUrl(link)
|
||||
if USE_SERVICE_ACCOUNTS:
|
||||
self.service_account_count = len(os.listdir("accounts"))
|
||||
self.updater = setInterval(self.update_interval, self._on_download_progress)
|
||||
try:
|
||||
meta = self.getFileMetadata(file_id)
|
||||
|
|
@ -903,6 +949,12 @@ class GoogleDriveHelper:
|
|||
LOGGER.error(err)
|
||||
if "downloadQuotaExceeded" in str(err):
|
||||
err = "Download Quota Exceeded."
|
||||
elif "File not found" in str(err):
|
||||
token_service = self.alt_authorize()
|
||||
if token_service is not None:
|
||||
self.__service = token_service
|
||||
return self.download(link)
|
||||
err = "File not found"
|
||||
self.__listener.onDownloadError(err)
|
||||
return
|
||||
finally:
|
||||
|
|
@ -969,7 +1021,7 @@ class GoogleDriveHelper:
|
|||
]:
|
||||
raise err
|
||||
if USE_SERVICE_ACCOUNTS:
|
||||
if self.sa_count == self.service_account_count:
|
||||
if self.sa_count == len(os.listdir("accounts")):
|
||||
self.is_cancelled = True
|
||||
raise err
|
||||
else:
|
||||
|
|
|
|||
Loading…
Reference in New Issue