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

Merge pull request #22 from gissehel/evols

Browse source 
All good, temp file name is a good idea. And yes the print in the download function shouldn't have been there :)
This commit is contained in:
Richard O'Dwyer 2013-04-19 11:35:12 -07:00
commit 6ea2bfa5c7
1 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
mega/mega.py
View file

@ -7,6 +7,8 @@ import os
import random import random
import binascii import binascii
import requests import requests
import time
import shutil
from .errors import ValidationError, RequestError from .errors import ValidationError, RequestError
from .crypto import * from .crypto import *
@ -135,6 +137,8 @@ class Mega(object):
# folder # folder
else: else:
k = key k = key
file['key'] = key
file['k'] = k
attributes = base64_url_decode(file['a']) attributes = base64_url_decode(file['a'])
attributes = decrypt_attr(attributes, k) attributes = decrypt_attr(attributes, k)
file['a'] = attributes file['a'] = attributes
@ -222,9 +226,9 @@ class Mega(object):
file = file[1] file = file[1]
if 'h' in file and 'k' in file: if 'h' in file and 'k' in file:
public_handle = self.api_request({'a': 'l', 'n': file['h']}) public_handle = self.api_request({'a': 'l', 'n': file['h']})
file_key = file['k'][file['k'].index(':') + 1:] if public_handle == -11 :
decrypted_key = a32_to_base64(decrypt_key(base64_to_a32(file_key), raise RequestError("Can't get a public link from that file (is this a shared file?)")
self.master_key)) decrypted_key = a32_to_base64(file['key'])
return '{0}://{1}/#!{2}!{3}'.format(self.schema, return '{0}://{1}/#!{2}!{3}'.format(self.schema,
self.domain, self.domain,
public_handle, public_handle,
@ -360,8 +364,7 @@ class Mega(object):
""" """
Download a file by it's file object Download a file by it's file object
""" """
url = self.get_link(file) self.download_file(None, None, file=file[1], dest_path=dest_path, is_public=False)
self.download_url(url, dest_path)
def download_url(self, url, dest_path=None): def download_url(self, url, dest_path=None):
""" """
@ -372,7 +375,8 @@ class Mega(object):
file_key = path[1] file_key = path[1]
self.download_file(file_id, file_key, dest_path, is_public=True) self.download_file(file_id, file_key, dest_path, is_public=True)
def download_file(self, file_handle, file_key, dest_path=None, is_public=False): def download_file(self, file_handle, file_key, dest_path=None, is_public=False, file=None):
if file is None :
if is_public: if is_public:
file_key = base64_to_a32(file_key) file_key = base64_to_a32(file_key)
file_data = self.api_request({'a': 'g', 'g': 1, 'p': file_handle}) file_data = self.api_request({'a': 'g', 'g': 1, 'p': file_handle})
@ -383,23 +387,34 @@ class Mega(object):
file_key[2] ^ file_key[6], file_key[3] ^ file_key[7]) file_key[2] ^ file_key[6], file_key[3] ^ file_key[7])
iv = file_key[4:6] + (0, 0) iv = file_key[4:6] + (0, 0)
meta_mac = file_key[6:8] meta_mac = file_key[6:8]
else :
file_data = self.api_request({'a': 'g', 'g': 1, 'n': file['h']})
k = file['k']
iv = file['iv']
meta_mac = file['meta_mac']
# Seems to happens sometime... When this occurs, files are
# inaccessible also in the official also in the official webapp.
# Strangely, files can come back later.
if 'g' not in file_data :
raise RequestError('File not accessible anymore')
file_url = file_data['g'] file_url = file_data['g']
file_size = file_data['s'] file_size = file_data['s']
attribs = base64_url_decode(file_data['at']) attribs = base64_url_decode(file_data['at'])
attribs = decrypt_attr(attribs, k) attribs = decrypt_attr(attribs, k)
file_name = attribs['n'] file_name = attribs['n']
file_name_tmp = '.megapy-%s-%s' % (int(time.time()*1000), filename)
print("downloading {0} (size: {1}), url = {2}".format(attribs['n'].encode("utf8"), # print("downloading {0} (size: {1}), url = {2}".format(attribs['n'].encode("utf8"),
file_size, # file_size,
file_url)) # file_url))
input_file = requests.get(file_url, stream=True).raw input_file = requests.get(file_url, stream=True).raw
if dest_path: if dest_path:
output_file = open(dest_path + '/' + file_name, 'wb') output_file = open(dest_path + '/' + file_name, 'wb')
else: else:
output_file = open(file_name, 'wb') output_file = open(file_name_tmp, 'wb')
counter = Counter.new( counter = Counter.new(
128, initial_value=((iv[0] << 32) + iv[1]) << 64) 128, initial_value=((iv[0] << 32) + iv[1]) << 64)
@ -436,6 +451,8 @@ class Mega(object):
if (file_mac[0] ^ file_mac[1], file_mac[2] ^ file_mac[3]) != meta_mac: if (file_mac[0] ^ file_mac[1], file_mac[2] ^ file_mac[3]) != meta_mac:
raise ValueError('Mismatched mac') raise ValueError('Mismatched mac')
shutil.move(file_name_tmp, file_name)
########################################################################## ##########################################################################
# UPLOAD # UPLOAD
def upload(self, filename, dest=None): def upload(self, filename, dest=None):