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

Added upload progress

Browse source
This commit is contained in:
richard 2013-04-28 16:33:50 +01:00
parent d8df8bd76e
commit 675ff6bbc5
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mega/mega.py
View file

@ -472,8 +472,8 @@ class Mega(object):
#request upload url, call 'u' method #request upload url, call 'u' method
input_file = open(filename, 'rb') input_file = open(filename, 'rb')
size = os.path.getsize(filename) file_size = os.path.getsize(filename)
ul_url = self.api_request({'a': 'u', 's': size})['p'] ul_url = self.api_request({'a': 'u', 's': file_size})['p']
#generate random aes key (128) for file #generate random aes key (128) for file
ul_key = [random.randint(0, 0xFFFFFFFF) for _ in range(6)] ul_key = [random.randint(0, 0xFFFFFFFF) for _ in range(6)]
@ -481,8 +481,10 @@ class Mega(object):
aes = AES.new(a32_to_str(ul_key[:4]), AES.MODE_CTR, counter=count) aes = AES.new(a32_to_str(ul_key[:4]), AES.MODE_CTR, counter=count)
file_mac = [0, 0, 0, 0] file_mac = [0, 0, 0, 0]
for chunk_start, chunk_size in sorted(get_chunks(size).items()): upload_progress = 0
for chunk_start, chunk_size in sorted(get_chunks(file_size).items()):
chunk = input_file.read(chunk_size) chunk = input_file.read(chunk_size)
upload_progress += len(chunk)
#determine chunks mac #determine chunks mac
chunk_mac = [ul_key[4], ul_key[5], ul_key[4], ul_key[5]] chunk_mac = [ul_key[4], ul_key[5], ul_key[4], ul_key[5]]
@ -508,6 +510,10 @@ class Mega(object):
data=chunk, timeout=self.timeout) data=chunk, timeout=self.timeout)
completion_file_handle = output_file.text completion_file_handle = output_file.text
if self.options.get('verbose') is True:
# upload progress
print('{0} of {1} uploaded'.format(upload_progress, file_size))
#determine meta mac #determine meta mac
meta_mac = (file_mac[0] ^ file_mac[1], file_mac[2] ^ file_mac[3]) meta_mac = (file_mac[0] ^ file_mac[1], file_mac[2] ^ file_mac[3])