voussoir/megapy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

A few whitespace adjustments.

Browse source
This commit is contained in:
voussoir 2021-12-07 12:38:28 -08:00
parent bd61afd24d
commit c4d5064bfa
No known key found for this signature in database
GPG key ID: 5F7554F8C26DACCB
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/mega/mega.py
View file

@ -763,11 +763,12 @@ class Mega:
parent_dir_name, parent_dir_name,
files=files, files=files,
) )
if (filename and parent_node_id and file[1]['a'] if (
filename and parent_node_id and file[1]['a']
and file[1]['a']['n'] == filename and file[1]['a']['n'] == filename
and parent_node_id == file[1]['p']): and parent_node_id == file[1]['p']
if (exclude_deleted and self._trash_folder_node_id ):
== file[1]['p']): if (exclude_deleted and self._trash_folder_node_id == file[1]['p']):
continue continue
return file return file
elif (filename and file[1]['a'] elif (filename and file[1]['a']
@ -795,8 +796,7 @@ class Mega:
for foldername in paths: for foldername in paths:
if foldername != '': if foldername != '':
for file in files.items(): for file in files.items():
if (file[1]['a'] and file[1]['t'] if (file[1]['a'] and file[1]['t'] and file[1]['a']['n'] == foldername):
and file[1]['a']['n'] == foldername):
if parent_desc == file[1]['p']: if parent_desc == file[1]['p']:
parent_desc = file[0] parent_desc = file[0]
found = True found = True
@ -1490,8 +1490,7 @@ class Mega:
timeout=self.timeout timeout=self.timeout
) )
completion_file_handle = output_file.text completion_file_handle = output_file.text
logger.debug('%s of %s uploaded', upload_progress, logger.debug('%s of %s uploaded', upload_progress, file_size)
file_size)
else: else:
output_file = self.requests_session.post( output_file = self.requests_session.post(
ul_url + "/0", ul_url + "/0",
@ -1515,9 +1514,14 @@ class Mega:
crypto.encrypt_attr(attribs, ul_key[:4]) crypto.encrypt_attr(attribs, ul_key[:4])
) )
key = [ key = [
ul_key[0] ^ ul_key[4], ul_key[1] ^ ul_key[5], ul_key[0] ^ ul_key[4],
ul_key[2] ^ meta_mac[0], ul_key[3] ^ meta_mac[1], ul_key[4], ul_key[1] ^ ul_key[5],
ul_key[5], meta_mac[0], meta_mac[1] ul_key[2] ^ meta_mac[0],
ul_key[3] ^ meta_mac[1],
ul_key[4],
ul_key[5],
meta_mac[0],
meta_mac[1]
] ]
encrypted_key = crypto.a32_to_base64(crypto.encrypt_key(key, self.master_key)) encrypted_key = crypto.a32_to_base64(crypto.encrypt_key(key, self.master_key))
logger.debug('Sending request to update attributes') logger.debug('Sending request to update attributes')