Bug fix in uploadfile#8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeroenmeulenaar wants to merge 6 commits into
base:master
Choose a base branch
from
Open

Bug fix in uploadfile #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7a359ef
Bug fix: 'getattr' needs a defualt value, otherwise an AttributeError is
frankmeulenaar Apr 17, 2016
55b26b0
Simplified test case: no need to call api.get_files() before calling
frankmeulenaar Apr 17, 2016
2213dbb
testing python3 support
JuanjoSalvador Dec 10, 2017
791d916
added simple testing script
JuanjoSalvador Dec 10, 2017
fbda4bd
Merge remote-tracking branch 'upstream/master'
jeroenmeulenaar Dec 24, 2017
78f4242
Fixed import
jeroenmeulenaar Dec 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions mega/crypto.py
 100644 → 100755
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@

from Crypto.Cipher import AES

from .utils import a32_to_str, str_to_a32, a32_to_base64
from utils import a32_to_str, str_to_a32, a32_to_base64


def aes_cbc_encrypt(data, key):
Expand All@@ -27,19 +27,19 @@ def aes_cbc_decrypt_a32(data, key):
def stringhash(s, aeskey):
s32 = str_to_a32(s)
h32 = [0, 0, 0, 0]
for i in xrange(len(s32)):
for i in range(len(s32)):
h32[i % 4] ^= s32[i]
for _ in xrange(0x4000):
for _ in range(0x4000):
h32 = aes_cbc_encrypt_a32(h32, aeskey)
return a32_to_base64((h32[0], h32[2]))


def prepare_key(a):
pkey = [0x93C467E3, 0x7DB0C7A4, 0xD1BE3F81, 0x0152CB56]
for _ in xrange(0x10000):
for j in xrange(0, len(a), 4):
for _ in range(0x10000):
for j in range(0, len(a), 4):
key = [0, 0, 0, 0]
for i in xrange(4):
for i in range(4):
if i + j < len(a):
key[i] = a[i + j]
pkey = aes_cbc_encrypt_a32(pkey, key)
Expand All@@ -49,13 +49,13 @@ def prepare_key(a):
def encrypt_key(a, key):
return sum(
(aes_cbc_encrypt_a32(a[i:i+4], key)
for i in xrange(0, len(a), 4)), ())
for i in range(0, len(a), 4)), ())


def decrypt_key(a, key):
return sum(
(aes_cbc_decrypt_a32(a[i:i+4], key)
for i in xrange(0, len(a), 4)), ())
for i in range(0, len(a), 4)), ())


def enc_attr(attr, key):
Expand Down
20 changes: 10 additions & 10 deletions mega/mega.py
 100644 → 100755
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@
from Crypto.PublicKey import RSA
from Crypto.Util import Counter

from .crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
from crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
enc_attr, dec_attr, aes_cbc_encrypt_a32
from .utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
from utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
mpi2int, base64urlencode, base64urldecode, get_chunks
from .exceptions import MegaRequestException, MegaIncorrectPasswordExcetion
from exceptions import MegaRequestException, MegaIncorrectPasswordExcetion


class Mega(object):
Expand DownExpand Up@@ -88,15 +88,15 @@ def _login_common(self, res, password):
privk = a32_to_str(rsa_priv_key)
self.rsa_priv_key = [0, 0, 0, 0]

for i in xrange(4):
for i in range(4):
l = ((ord(privk[0]) * 256 + ord(privk[1]) + 7) / 8) + 2
self.rsa_priv_key[i] = mpi2int(privk[:l])
privk = privk[l:]

enc_sid = mpi2int(base64urldecode(res['csid']))
decrypter = RSA.construct(
(self.rsa_priv_key[0] * self.rsa_priv_key[1],
0L,
0,
self.rsa_priv_key[2],
self.rsa_priv_key[0],
self.rsa_priv_key[1]))
Expand DownExpand Up@@ -173,7 +173,7 @@ def download_file(self, file_id, file_key, public=False):
outfile.write(chunk)

chunk_mac = [iv[0], iv[1], iv[0], iv[1]]
for i in xrange(0, len(chunk), 16):
for i in range(0, len(chunk), 16):
block = chunk[i:i+16]
if len(block) % 16:
block += '\0' * (16 - (len(block) % 16))
Expand DownExpand Up@@ -205,15 +205,15 @@ def get_public_url(self, file_id, file_key):

def uploadfile(self, filename, dst=None):
if not dst:
root_id = getattr(self, 'root_id')
if not root_id:
root_id = getattr(self, 'root_id', None)
if root_id == None:
self.get_files()
dst = self.root_id
infile = open(filename, 'rb')
size = os.path.getsize(filename)
ul_url = self.api_req({'a': 'u', 's': size})['p']

ul_key = [random.randint(0, 0xFFFFFFFF) for _ in xrange(6)]
ul_key = [random.randint(0, 0xFFFFFFFF) for _ in range(6)]
counter = Counter.new(
128, initial_value=((ul_key[4] << 32) + ul_key[5]) << 64)
encryptor = AES.new(
Expand All@@ -226,7 +226,7 @@ def uploadfile(self, filename, dst=None):
chunk = infile.read(chunk_size)

chunk_mac = [ul_key[4], ul_key[5], ul_key[4], ul_key[5]]
for i in xrange(0, len(chunk), 16):
for i in range(0, len(chunk), 16):
block = chunk[i:i+16]
if len(block) % 16:
block += '\0' * (16 - len(block) % 16)
Expand Down
6 changes: 3 additions & 3 deletions setup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@ def get_package_data(package):
if sys.argv[-1] == 'publish':
os.system("python setup.py sdist upload")
args = {'version': version}
print"You probably want to also tag the version now:"
print" git tag -a %(version)s -m 'version %(version)s'" % args
print" git push --tags"
print("You probably want to also tag the version now:")
print(" git tag -a %(version)s -m 'version %(version)s'" % args)
print(" git push --tags")
sys.exit()


Expand Down
8 changes: 8 additions & 0 deletions simple-test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from mega import Mega

email = "juanjosalvador@netc.eu"
password = "Er0senn1n"

m = Mega.from_credentials(email, password)

m.download_from_url('https://mega.co.nz/#!wYo3AYZC!Zwi1f3ANtYwKNOc07fwuN1enOoRj4CreFouuGqi4D6Y')
2 changes: 0 additions & 2 deletions tests.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ def _check_file_exists(self, file_name, files):
return uploaded

def _test_upload_file(self, api):
api.get_files()

# Create temp file
uFile, uFilePath = tempfile.mkstemp()
os.write(uFile, "Does it work?")
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Bug fix in uploadfile#8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jeroenmeulenaar
wants to merge
6
commits into

base:master
Choose a base branch

from

 Open


Bug fix in uploadfile
#8
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7a359ef

Bug fix: 'getattr' needs a defualt value, otherwise an AttributeError is


frankmeulenaar Apr 17, 2016
55b26b0

Simplified test case: no need to call api.get_files() before calling


frankmeulenaar Apr 17, 2016
2213dbb

testing python3 support


JuanjoSalvador Dec 10, 2017
791d916

added simple testing script


JuanjoSalvador Dec 10, 2017
fbda4bd

Merge remote-tracking branch 'upstream/master'


jeroenmeulenaar Dec 24, 2017
78f4242

Fixed import


jeroenmeulenaar Dec 26, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 8 additions & 8 deletions
mega/crypto.py

100644 → 100755


View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@

from Crypto.Cipher import AES

from .utils import a32_to_str, str_to_a32, a32_to_base64
from utils import a32_to_str, str_to_a32, a32_to_base64


def aes_cbc_encrypt(data, key):
Expand All@@ -27,19 +27,19 @@ def aes_cbc_decrypt_a32(data, key):
def stringhash(s, aeskey):
 s32 = str_to_a32(s)
 h32 = [0, 0, 0, 0]
 for i in xrange(len(s32)):
 for i in range(len(s32)):
 h32[i % 4] ^= s32[i]
 for _ in xrange(0x4000):
 for _ in range(0x4000):
 h32 = aes_cbc_encrypt_a32(h32, aeskey)
 return a32_to_base64((h32[0], h32[2]))


def prepare_key(a):
 pkey = [0x93C467E3, 0x7DB0C7A4, 0xD1BE3F81, 0x0152CB56]
 for _ in xrange(0x10000):
 for j in xrange(0, len(a), 4):
 for _ in range(0x10000):
 for j in range(0, len(a), 4):
 key = [0, 0, 0, 0]
 for i in xrange(4):
 for i in range(4):
 if i + j < len(a):
 key[i] = a[i + j]
 pkey = aes_cbc_encrypt_a32(pkey, key)
Expand All@@ -49,13 +49,13 @@ def prepare_key(a):
def encrypt_key(a, key):
 return sum(
 (aes_cbc_encrypt_a32(a[i:i+4], key)
 for i in xrange(0, len(a), 4)), ())
 for i in range(0, len(a), 4)), ())


def decrypt_key(a, key):
 return sum(
 (aes_cbc_decrypt_a32(a[i:i+4], key)
 for i in xrange(0, len(a), 4)), ())
 for i in range(0, len(a), 4)), ())


def enc_attr(attr, key):
Expand Down

20 changes: 10 additions & 10 deletions
mega/mega.py

100644 → 100755


View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@
from Crypto.PublicKey import RSA
from Crypto.Util import Counter

from .crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
from crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
 enc_attr, dec_attr, aes_cbc_encrypt_a32
from .utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
from utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
 mpi2int, base64urlencode, base64urldecode, get_chunks
from .exceptions import MegaRequestException, MegaIncorrectPasswordExcetion
from exceptions import MegaRequestException, MegaIncorrectPasswordExcetion


class Mega(object):
Expand DownExpand Up@@ -88,15 +88,15 @@ def _login_common(self, res, password):
 privk = a32_to_str(rsa_priv_key)
 self.rsa_priv_key = [0, 0, 0, 0]

 for i in xrange(4):
 for i in range(4):
 l = ((ord(privk[0]) * 256 + ord(privk[1]) + 7) / 8) + 2
 self.rsa_priv_key[i] = mpi2int(privk[:l])
 privk = privk[l:]

 enc_sid = mpi2int(base64urldecode(res['csid']))
 decrypter = RSA.construct(
 (self.rsa_priv_key[0] * self.rsa_priv_key[1],
0L,
0,
 self.rsa_priv_key[2],
 self.rsa_priv_key[0],
 self.rsa_priv_key[1]))
Expand DownExpand Up@@ -173,7 +173,7 @@ def download_file(self, file_id, file_key, public=False):
 outfile.write(chunk)

 chunk_mac = [iv[0], iv[1], iv[0], iv[1]]
 for i in xrange(0, len(chunk), 16):
 for i in range(0, len(chunk), 16):
 block = chunk[i:i+16]
 if len(block) % 16:
 block += '\0' * (16 - (len(block) % 16))
Expand DownExpand Up@@ -205,15 +205,15 @@ def get_public_url(self, file_id, file_key):

 def uploadfile(self, filename, dst=None):
 if not dst:
 root_id = getattr(self, 'root_id')
 if not root_id:
 root_id = getattr(self, 'root_id', None)
 if root_id == None:
 self.get_files()
 dst = self.root_id
 infile = open(filename, 'rb')
 size = os.path.getsize(filename)
 ul_url = self.api_req({'a': 'u', 's': size})['p']

 ul_key = [random.randint(0, 0xFFFFFFFF) for _ in xrange(6)]
 ul_key = [random.randint(0, 0xFFFFFFFF) for _ in range(6)]
 counter = Counter.new(
 128, initial_value=((ul_key[4] << 32) + ul_key[5]) << 64)
 encryptor = AES.new(
Expand All@@ -226,7 +226,7 @@ def uploadfile(self, filename, dst=None):
 chunk = infile.read(chunk_size)

 chunk_mac = [ul_key[4], ul_key[5], ul_key[4], ul_key[5]]
 for i in xrange(0, len(chunk), 16):
 for i in range(0, len(chunk), 16):
 block = chunk[i:i+16]
 if len(block) % 16:
 block += '\0' * (16 - len(block) % 16)
Expand Down

6 changes: 3 additions & 3 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@ def get_package_data(package):
if sys.argv[-1] == 'publish':
 os.system("python setup.py sdist upload")
 args = {'version': version}
 print"You probably want to also tag the version now:"
 print" git tag -a %(version)s -m 'version %(version)s'" % args
 print" git push --tags"
 print("You probably want to also tag the version now:")
 print(" git tag -a %(version)s -m 'version %(version)s'" % args)
 print(" git push --tags")
 sys.exit()


Expand Down

8 changes: 8 additions & 0 deletions
simple-test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from mega import Mega

email = "juanjosalvador@netc.eu"
password = "Er0senn1n"

m = Mega.from_credentials(email, password)

m.download_from_url('https://mega.co.nz/#!wYo3AYZC!Zwi1f3ANtYwKNOc07fwuN1enOoRj4CreFouuGqi4D6Y')

2 changes: 0 additions & 2 deletions
tests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ def _check_file_exists(self, file_name, files):
 return uploaded

 def _test_upload_file(self, api):
 api.get_files()

 # Create temp file
 uFile, uFilePath = tempfile.mkstemp()
 os.write(uFile, "Does it work?")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bug fix in uploadfile#8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jeroenmeulenaar
wants to merge
6
commits into

base:master
Choose a base branch

from

 Open


Bug fix in uploadfile
#8
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7a359ef

Bug fix: 'getattr' needs a defualt value, otherwise an AttributeError is


frankmeulenaar Apr 17, 2016
55b26b0

Simplified test case: no need to call api.get_files() before calling


frankmeulenaar Apr 17, 2016
2213dbb

testing python3 support


JuanjoSalvador Dec 10, 2017
791d916

added simple testing script


JuanjoSalvador Dec 10, 2017
fbda4bd

Merge remote-tracking branch 'upstream/master'


jeroenmeulenaar Dec 24, 2017
78f4242

Fixed import


jeroenmeulenaar Dec 26, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 8 additions & 8 deletions
mega/crypto.py

100644 → 100755


View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@

from Crypto.Cipher import AES

from .utils import a32_to_str, str_to_a32, a32_to_base64
from utils import a32_to_str, str_to_a32, a32_to_base64


def aes_cbc_encrypt(data, key):
Expand All@@ -27,19 +27,19 @@ def aes_cbc_decrypt_a32(data, key):
def stringhash(s, aeskey):
 s32 = str_to_a32(s)
 h32 = [0, 0, 0, 0]
 for i in xrange(len(s32)):
 for i in range(len(s32)):
 h32[i % 4] ^= s32[i]
 for _ in xrange(0x4000):
 for _ in range(0x4000):
 h32 = aes_cbc_encrypt_a32(h32, aeskey)
 return a32_to_base64((h32[0], h32[2]))


def prepare_key(a):
 pkey = [0x93C467E3, 0x7DB0C7A4, 0xD1BE3F81, 0x0152CB56]
 for _ in xrange(0x10000):
 for j in xrange(0, len(a), 4):
 for _ in range(0x10000):
 for j in range(0, len(a), 4):
 key = [0, 0, 0, 0]
 for i in xrange(4):
 for i in range(4):
 if i + j < len(a):
 key[i] = a[i + j]
 pkey = aes_cbc_encrypt_a32(pkey, key)
Expand All@@ -49,13 +49,13 @@ def prepare_key(a):
def encrypt_key(a, key):
 return sum(
 (aes_cbc_encrypt_a32(a[i:i+4], key)
 for i in xrange(0, len(a), 4)), ())
 for i in range(0, len(a), 4)), ())


def decrypt_key(a, key):
 return sum(
 (aes_cbc_decrypt_a32(a[i:i+4], key)
 for i in xrange(0, len(a), 4)), ())
 for i in range(0, len(a), 4)), ())


def enc_attr(attr, key):
Expand Down

20 changes: 10 additions & 10 deletions
mega/mega.py

100644 → 100755


View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@
from Crypto.PublicKey import RSA
from Crypto.Util import Counter

from .crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
from crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
 enc_attr, dec_attr, aes_cbc_encrypt_a32
from .utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
from utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
 mpi2int, base64urlencode, base64urldecode, get_chunks
from .exceptions import MegaRequestException, MegaIncorrectPasswordExcetion
from exceptions import MegaRequestException, MegaIncorrectPasswordExcetion


class Mega(object):
Expand DownExpand Up@@ -88,15 +88,15 @@ def _login_common(self, res, password):
 privk = a32_to_str(rsa_priv_key)
 self.rsa_priv_key = [0, 0, 0, 0]

 for i in xrange(4):
 for i in range(4):
 l = ((ord(privk[0]) * 256 + ord(privk[1]) + 7) / 8) + 2
 self.rsa_priv_key[i] = mpi2int(privk[:l])
 privk = privk[l:]

 enc_sid = mpi2int(base64urldecode(res['csid']))
 decrypter = RSA.construct(
 (self.rsa_priv_key[0] * self.rsa_priv_key[1],
0L,
0,
 self.rsa_priv_key[2],
 self.rsa_priv_key[0],
 self.rsa_priv_key[1]))
Expand DownExpand Up@@ -173,7 +173,7 @@ def download_file(self, file_id, file_key, public=False):
 outfile.write(chunk)

 chunk_mac = [iv[0], iv[1], iv[0], iv[1]]
 for i in xrange(0, len(chunk), 16):
 for i in range(0, len(chunk), 16):
 block = chunk[i:i+16]
 if len(block) % 16:
 block += '\0' * (16 - (len(block) % 16))
Expand DownExpand Up@@ -205,15 +205,15 @@ def get_public_url(self, file_id, file_key):

 def uploadfile(self, filename, dst=None):
 if not dst:
 root_id = getattr(self, 'root_id')
 if not root_id:
 root_id = getattr(self, 'root_id', None)
 if root_id == None:
 self.get_files()
 dst = self.root_id
 infile = open(filename, 'rb')
 size = os.path.getsize(filename)
 ul_url = self.api_req({'a': 'u', 's': size})['p']

 ul_key = [random.randint(0, 0xFFFFFFFF) for _ in xrange(6)]
 ul_key = [random.randint(0, 0xFFFFFFFF) for _ in range(6)]
 counter = Counter.new(
 128, initial_value=((ul_key[4] << 32) + ul_key[5]) << 64)
 encryptor = AES.new(
Expand All@@ -226,7 +226,7 @@ def uploadfile(self, filename, dst=None):
 chunk = infile.read(chunk_size)

 chunk_mac = [ul_key[4], ul_key[5], ul_key[4], ul_key[5]]
 for i in xrange(0, len(chunk), 16):
 for i in range(0, len(chunk), 16):
 block = chunk[i:i+16]
 if len(block) % 16:
 block += '\0' * (16 - len(block) % 16)
Expand Down

6 changes: 3 additions & 3 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@ def get_package_data(package):
if sys.argv[-1] == 'publish':
 os.system("python setup.py sdist upload")
 args = {'version': version}
 print"You probably want to also tag the version now:"
 print" git tag -a %(version)s -m 'version %(version)s'" % args
 print" git push --tags"
 print("You probably want to also tag the version now:")
 print(" git tag -a %(version)s -m 'version %(version)s'" % args)
 print(" git push --tags")
 sys.exit()


Expand Down

8 changes: 8 additions & 0 deletions
simple-test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from mega import Mega

email = "juanjosalvador@netc.eu"
password = "Er0senn1n"

m = Mega.from_credentials(email, password)

m.download_from_url('https://mega.co.nz/#!wYo3AYZC!Zwi1f3ANtYwKNOc07fwuN1enOoRj4CreFouuGqi4D6Y')

2 changes: 0 additions & 2 deletions
tests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ def _check_file_exists(self, file_name, files):
 return uploaded

 def _test_upload_file(self, api):
 api.get_files()

 # Create temp file
 uFile, uFilePath = tempfile.mkstemp()
 os.write(uFile, "Does it work?")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bug fix in uploadfile#8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jeroenmeulenaar
wants to merge
6
commits into

base:master
Choose a base branch

from

 Open


Bug fix in uploadfile
#8
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7a359ef

Bug fix: 'getattr' needs a defualt value, otherwise an AttributeError is


frankmeulenaar Apr 17, 2016
55b26b0

Simplified test case: no need to call api.get_files() before calling


frankmeulenaar Apr 17, 2016
2213dbb

testing python3 support


JuanjoSalvador Dec 10, 2017
791d916

added simple testing script


JuanjoSalvador Dec 10, 2017
fbda4bd

Merge remote-tracking branch 'upstream/master'


jeroenmeulenaar Dec 24, 2017
78f4242

Fixed import


jeroenmeulenaar Dec 26, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 8 additions & 8 deletions
mega/crypto.py

100644 → 100755


View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@

from Crypto.Cipher import AES

from .utils import a32_to_str, str_to_a32, a32_to_base64
from utils import a32_to_str, str_to_a32, a32_to_base64


def aes_cbc_encrypt(data, key):
Expand All@@ -27,19 +27,19 @@ def aes_cbc_decrypt_a32(data, key):
def stringhash(s, aeskey):
 s32 = str_to_a32(s)
 h32 = [0, 0, 0, 0]
 for i in xrange(len(s32)):
 for i in range(len(s32)):
 h32[i % 4] ^= s32[i]
 for _ in xrange(0x4000):
 for _ in range(0x4000):
 h32 = aes_cbc_encrypt_a32(h32, aeskey)
 return a32_to_base64((h32[0], h32[2]))


def prepare_key(a):
 pkey = [0x93C467E3, 0x7DB0C7A4, 0xD1BE3F81, 0x0152CB56]
 for _ in xrange(0x10000):
 for j in xrange(0, len(a), 4):
 for _ in range(0x10000):
 for j in range(0, len(a), 4):
 key = [0, 0, 0, 0]
 for i in xrange(4):
 for i in range(4):
 if i + j < len(a):
 key[i] = a[i + j]
 pkey = aes_cbc_encrypt_a32(pkey, key)
Expand All@@ -49,13 +49,13 @@ def prepare_key(a):
def encrypt_key(a, key):
 return sum(
 (aes_cbc_encrypt_a32(a[i:i+4], key)
 for i in xrange(0, len(a), 4)), ())
 for i in range(0, len(a), 4)), ())


def decrypt_key(a, key):
 return sum(
 (aes_cbc_decrypt_a32(a[i:i+4], key)
 for i in xrange(0, len(a), 4)), ())
 for i in range(0, len(a), 4)), ())


def enc_attr(attr, key):
Expand Down

20 changes: 10 additions & 10 deletions
mega/mega.py

100644 → 100755


View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@
from Crypto.PublicKey import RSA
from Crypto.Util import Counter

from .crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
from crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
 enc_attr, dec_attr, aes_cbc_encrypt_a32
from .utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
from utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
 mpi2int, base64urlencode, base64urldecode, get_chunks
from .exceptions import MegaRequestException, MegaIncorrectPasswordExcetion
from exceptions import MegaRequestException, MegaIncorrectPasswordExcetion


class Mega(object):
Expand DownExpand Up@@ -88,15 +88,15 @@ def _login_common(self, res, password):
 privk = a32_to_str(rsa_priv_key)
 self.rsa_priv_key = [0, 0, 0, 0]

 for i in xrange(4):
 for i in range(4):
 l = ((ord(privk[0]) * 256 + ord(privk[1]) + 7) / 8) + 2
 self.rsa_priv_key[i] = mpi2int(privk[:l])
 privk = privk[l:]

 enc_sid = mpi2int(base64urldecode(res['csid']))
 decrypter = RSA.construct(
 (self.rsa_priv_key[0] * self.rsa_priv_key[1],
0L,
0,
 self.rsa_priv_key[2],
 self.rsa_priv_key[0],
 self.rsa_priv_key[1]))
Expand DownExpand Up@@ -173,7 +173,7 @@ def download_file(self, file_id, file_key, public=False):
 outfile.write(chunk)

 chunk_mac = [iv[0], iv[1], iv[0], iv[1]]
 for i in xrange(0, len(chunk), 16):
 for i in range(0, len(chunk), 16):
 block = chunk[i:i+16]
 if len(block) % 16:
 block += '\0' * (16 - (len(block) % 16))
Expand DownExpand Up@@ -205,15 +205,15 @@ def get_public_url(self, file_id, file_key):

 def uploadfile(self, filename, dst=None):
 if not dst:
 root_id = getattr(self, 'root_id')
 if not root_id:
 root_id = getattr(self, 'root_id', None)
 if root_id == None:
 self.get_files()
 dst = self.root_id
 infile = open(filename, 'rb')
 size = os.path.getsize(filename)
 ul_url = self.api_req({'a': 'u', 's': size})['p']

 ul_key = [random.randint(0, 0xFFFFFFFF) for _ in xrange(6)]
 ul_key = [random.randint(0, 0xFFFFFFFF) for _ in range(6)]
 counter = Counter.new(
 128, initial_value=((ul_key[4] << 32) + ul_key[5]) << 64)
 encryptor = AES.new(
Expand All@@ -226,7 +226,7 @@ def uploadfile(self, filename, dst=None):
 chunk = infile.read(chunk_size)

 chunk_mac = [ul_key[4], ul_key[5], ul_key[4], ul_key[5]]
 for i in xrange(0, len(chunk), 16):
 for i in range(0, len(chunk), 16):
 block = chunk[i:i+16]
 if len(block) % 16:
 block += '\0' * (16 - len(block) % 16)
Expand Down

6 changes: 3 additions & 3 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@ def get_package_data(package):
if sys.argv[-1] == 'publish':
 os.system("python setup.py sdist upload")
 args = {'version': version}
 print"You probably want to also tag the version now:"
 print" git tag -a %(version)s -m 'version %(version)s'" % args
 print" git push --tags"
 print("You probably want to also tag the version now:")
 print(" git tag -a %(version)s -m 'version %(version)s'" % args)
 print(" git push --tags")
 sys.exit()


Expand Down

8 changes: 8 additions & 0 deletions
simple-test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from mega import Mega

email = "juanjosalvador@netc.eu"
password = "Er0senn1n"

m = Mega.from_credentials(email, password)

m.download_from_url('https://mega.co.nz/#!wYo3AYZC!Zwi1f3ANtYwKNOc07fwuN1enOoRj4CreFouuGqi4D6Y')

2 changes: 0 additions & 2 deletions
tests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ def _check_file_exists(self, file_name, files):
 return uploaded

 def _test_upload_file(self, api):
 api.get_files()

 # Create temp file
 uFile, uFilePath = tempfile.mkstemp()
 os.write(uFile, "Does it work?")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Bug fix in uploadfile#8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jeroenmeulenaar
wants to merge
6
commits into

base:master
Choose a base branch

from

 Open


Bug fix in uploadfile
#8
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7a359ef

Bug fix: 'getattr' needs a defualt value, otherwise an AttributeError is


frankmeulenaar Apr 17, 2016
55b26b0

Simplified test case: no need to call api.get_files() before calling


frankmeulenaar Apr 17, 2016
2213dbb

testing python3 support


JuanjoSalvador Dec 10, 2017
791d916

added simple testing script


JuanjoSalvador Dec 10, 2017
fbda4bd

Merge remote-tracking branch 'upstream/master'


jeroenmeulenaar Dec 24, 2017
78f4242

Fixed import


jeroenmeulenaar Dec 26, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 8 additions & 8 deletions
mega/crypto.py

100644 → 100755


View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@

from Crypto.Cipher import AES

from .utils import a32_to_str, str_to_a32, a32_to_base64
from utils import a32_to_str, str_to_a32, a32_to_base64


def aes_cbc_encrypt(data, key):
Expand All@@ -27,19 +27,19 @@ def aes_cbc_decrypt_a32(data, key):
def stringhash(s, aeskey):
 s32 = str_to_a32(s)
 h32 = [0, 0, 0, 0]
 for i in xrange(len(s32)):
 for i in range(len(s32)):
 h32[i % 4] ^= s32[i]
 for _ in xrange(0x4000):
 for _ in range(0x4000):
 h32 = aes_cbc_encrypt_a32(h32, aeskey)
 return a32_to_base64((h32[0], h32[2]))


def prepare_key(a):
 pkey = [0x93C467E3, 0x7DB0C7A4, 0xD1BE3F81, 0x0152CB56]
 for _ in xrange(0x10000):
 for j in xrange(0, len(a), 4):
 for _ in range(0x10000):
 for j in range(0, len(a), 4):
 key = [0, 0, 0, 0]
 for i in xrange(4):
 for i in range(4):
 if i + j < len(a):
 key[i] = a[i + j]
 pkey = aes_cbc_encrypt_a32(pkey, key)
Expand All@@ -49,13 +49,13 @@ def prepare_key(a):
def encrypt_key(a, key):
 return sum(
 (aes_cbc_encrypt_a32(a[i:i+4], key)
 for i in xrange(0, len(a), 4)), ())
 for i in range(0, len(a), 4)), ())


def decrypt_key(a, key):
 return sum(
 (aes_cbc_decrypt_a32(a[i:i+4], key)
 for i in xrange(0, len(a), 4)), ())
 for i in range(0, len(a), 4)), ())


def enc_attr(attr, key):
Expand Down

20 changes: 10 additions & 10 deletions
mega/mega.py

100644 → 100755


View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@
from Crypto.PublicKey import RSA
from Crypto.Util import Counter

from .crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
from crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
 enc_attr, dec_attr, aes_cbc_encrypt_a32
from .utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
from utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
 mpi2int, base64urlencode, base64urldecode, get_chunks
from .exceptions import MegaRequestException, MegaIncorrectPasswordExcetion
from exceptions import MegaRequestException, MegaIncorrectPasswordExcetion


class Mega(object):
Expand DownExpand Up@@ -88,15 +88,15 @@ def _login_common(self, res, password):
 privk = a32_to_str(rsa_priv_key)
 self.rsa_priv_key = [0, 0, 0, 0]

 for i in xrange(4):
 for i in range(4):
 l = ((ord(privk[0]) * 256 + ord(privk[1]) + 7) / 8) + 2
 self.rsa_priv_key[i] = mpi2int(privk[:l])
 privk = privk[l:]

 enc_sid = mpi2int(base64urldecode(res['csid']))
 decrypter = RSA.construct(
 (self.rsa_priv_key[0] * self.rsa_priv_key[1],
0L,
0,
 self.rsa_priv_key[2],
 self.rsa_priv_key[0],
 self.rsa_priv_key[1]))
Expand DownExpand Up@@ -173,7 +173,7 @@ def download_file(self, file_id, file_key, public=False):
 outfile.write(chunk)

 chunk_mac = [iv[0], iv[1], iv[0], iv[1]]
 for i in xrange(0, len(chunk), 16):
 for i in range(0, len(chunk), 16):
 block = chunk[i:i+16]
 if len(block) % 16:
 block += '\0' * (16 - (len(block) % 16))
Expand DownExpand Up@@ -205,15 +205,15 @@ def get_public_url(self, file_id, file_key):

 def uploadfile(self, filename, dst=None):
 if not dst:
 root_id = getattr(self, 'root_id')
 if not root_id:
 root_id = getattr(self, 'root_id', None)
 if root_id == None:
 self.get_files()
 dst = self.root_id
 infile = open(filename, 'rb')
 size = os.path.getsize(filename)
 ul_url = self.api_req({'a': 'u', 's': size})['p']

 ul_key = [random.randint(0, 0xFFFFFFFF) for _ in xrange(6)]
 ul_key = [random.randint(0, 0xFFFFFFFF) for _ in range(6)]
 counter = Counter.new(
 128, initial_value=((ul_key[4] << 32) + ul_key[5]) << 64)
 encryptor = AES.new(
Expand All@@ -226,7 +226,7 @@ def uploadfile(self, filename, dst=None):
 chunk = infile.read(chunk_size)

 chunk_mac = [ul_key[4], ul_key[5], ul_key[4], ul_key[5]]
 for i in xrange(0, len(chunk), 16):
 for i in range(0, len(chunk), 16):
 block = chunk[i:i+16]
 if len(block) % 16:
 block += '\0' * (16 - len(block) % 16)
Expand Down

6 changes: 3 additions & 3 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@ def get_package_data(package):
if sys.argv[-1] == 'publish':
 os.system("python setup.py sdist upload")
 args = {'version': version}
 print"You probably want to also tag the version now:"
 print" git tag -a %(version)s -m 'version %(version)s'" % args
 print" git push --tags"
 print("You probably want to also tag the version now:")
 print(" git tag -a %(version)s -m 'version %(version)s'" % args)
 print(" git push --tags")
 sys.exit()


Expand Down

8 changes: 8 additions & 0 deletions
simple-test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from mega import Mega

email = "juanjosalvador@netc.eu"
password = "Er0senn1n"

m = Mega.from_credentials(email, password)

m.download_from_url('https://mega.co.nz/#!wYo3AYZC!Zwi1f3ANtYwKNOc07fwuN1enOoRj4CreFouuGqi4D6Y')

2 changes: 0 additions & 2 deletions
tests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ def _check_file_exists(self, file_name, files):
 return uploaded

 def _test_upload_file(self, api):
 api.get_files()

 # Create temp file
 uFile, uFilePath = tempfile.mkstemp()
 os.write(uFile, "Does it work?")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bug fix in uploadfile#8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jeroenmeulenaar
wants to merge
6
commits into

base:master
Choose a base branch

from

 Open


Bug fix in uploadfile
#8
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7a359ef

Bug fix: 'getattr' needs a defualt value, otherwise an AttributeError is


frankmeulenaar Apr 17, 2016
55b26b0

Simplified test case: no need to call api.get_files() before calling


frankmeulenaar Apr 17, 2016
2213dbb

testing python3 support


JuanjoSalvador Dec 10, 2017
791d916

added simple testing script


JuanjoSalvador Dec 10, 2017
fbda4bd

Merge remote-tracking branch 'upstream/master'


jeroenmeulenaar Dec 24, 2017
78f4242

Fixed import


jeroenmeulenaar Dec 26, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 8 additions & 8 deletions
mega/crypto.py

100644 → 100755


View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@

from Crypto.Cipher import AES

from .utils import a32_to_str, str_to_a32, a32_to_base64
from utils import a32_to_str, str_to_a32, a32_to_base64


def aes_cbc_encrypt(data, key):
Expand All@@ -27,19 +27,19 @@ def aes_cbc_decrypt_a32(data, key):
def stringhash(s, aeskey):
 s32 = str_to_a32(s)
 h32 = [0, 0, 0, 0]
 for i in xrange(len(s32)):
 for i in range(len(s32)):
 h32[i % 4] ^= s32[i]
 for _ in xrange(0x4000):
 for _ in range(0x4000):
 h32 = aes_cbc_encrypt_a32(h32, aeskey)
 return a32_to_base64((h32[0], h32[2]))


def prepare_key(a):
 pkey = [0x93C467E3, 0x7DB0C7A4, 0xD1BE3F81, 0x0152CB56]
 for _ in xrange(0x10000):
 for j in xrange(0, len(a), 4):
 for _ in range(0x10000):
 for j in range(0, len(a), 4):
 key = [0, 0, 0, 0]
 for i in xrange(4):
 for i in range(4):
 if i + j < len(a):
 key[i] = a[i + j]
 pkey = aes_cbc_encrypt_a32(pkey, key)
Expand All@@ -49,13 +49,13 @@ def prepare_key(a):
def encrypt_key(a, key):
 return sum(
 (aes_cbc_encrypt_a32(a[i:i+4], key)
 for i in xrange(0, len(a), 4)), ())
 for i in range(0, len(a), 4)), ())


def decrypt_key(a, key):
 return sum(
 (aes_cbc_decrypt_a32(a[i:i+4], key)
 for i in xrange(0, len(a), 4)), ())
 for i in range(0, len(a), 4)), ())


def enc_attr(attr, key):
Expand Down

20 changes: 10 additions & 10 deletions
mega/mega.py

100644 → 100755


View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@
from Crypto.PublicKey import RSA
from Crypto.Util import Counter

from .crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
from crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
 enc_attr, dec_attr, aes_cbc_encrypt_a32
from .utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
from utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
 mpi2int, base64urlencode, base64urldecode, get_chunks
from .exceptions import MegaRequestException, MegaIncorrectPasswordExcetion
from exceptions import MegaRequestException, MegaIncorrectPasswordExcetion


class Mega(object):
Expand DownExpand Up@@ -88,15 +88,15 @@ def _login_common(self, res, password):
 privk = a32_to_str(rsa_priv_key)
 self.rsa_priv_key = [0, 0, 0, 0]

 for i in xrange(4):
 for i in range(4):
 l = ((ord(privk[0]) * 256 + ord(privk[1]) + 7) / 8) + 2
 self.rsa_priv_key[i] = mpi2int(privk[:l])
 privk = privk[l:]

 enc_sid = mpi2int(base64urldecode(res['csid']))
 decrypter = RSA.construct(
 (self.rsa_priv_key[0] * self.rsa_priv_key[1],
0L,
0,
 self.rsa_priv_key[2],
 self.rsa_priv_key[0],
 self.rsa_priv_key[1]))
Expand DownExpand Up@@ -173,7 +173,7 @@ def download_file(self, file_id, file_key, public=False):
 outfile.write(chunk)

 chunk_mac = [iv[0], iv[1], iv[0], iv[1]]
 for i in xrange(0, len(chunk), 16):
 for i in range(0, len(chunk), 16):
 block = chunk[i:i+16]
 if len(block) % 16:
 block += '\0' * (16 - (len(block) % 16))
Expand DownExpand Up@@ -205,15 +205,15 @@ def get_public_url(self, file_id, file_key):

 def uploadfile(self, filename, dst=None):
 if not dst:
 root_id = getattr(self, 'root_id')
 if not root_id:
 root_id = getattr(self, 'root_id', None)
 if root_id == None:
 self.get_files()
 dst = self.root_id
 infile = open(filename, 'rb')
 size = os.path.getsize(filename)
 ul_url = self.api_req({'a': 'u', 's': size})['p']

 ul_key = [random.randint(0, 0xFFFFFFFF) for _ in xrange(6)]
 ul_key = [random.randint(0, 0xFFFFFFFF) for _ in range(6)]
 counter = Counter.new(
 128, initial_value=((ul_key[4] << 32) + ul_key[5]) << 64)
 encryptor = AES.new(
Expand All@@ -226,7 +226,7 @@ def uploadfile(self, filename, dst=None):
 chunk = infile.read(chunk_size)

 chunk_mac = [ul_key[4], ul_key[5], ul_key[4], ul_key[5]]
 for i in xrange(0, len(chunk), 16):
 for i in range(0, len(chunk), 16):
 block = chunk[i:i+16]
 if len(block) % 16:
 block += '\0' * (16 - len(block) % 16)
Expand Down

6 changes: 3 additions & 3 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@ def get_package_data(package):
if sys.argv[-1] == 'publish':
 os.system("python setup.py sdist upload")
 args = {'version': version}
 print"You probably want to also tag the version now:"
 print" git tag -a %(version)s -m 'version %(version)s'" % args
 print" git push --tags"
 print("You probably want to also tag the version now:")
 print(" git tag -a %(version)s -m 'version %(version)s'" % args)
 print(" git push --tags")
 sys.exit()


Expand Down

8 changes: 8 additions & 0 deletions
simple-test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from mega import Mega

email = "juanjosalvador@netc.eu"
password = "Er0senn1n"

m = Mega.from_credentials(email, password)

m.download_from_url('https://mega.co.nz/#!wYo3AYZC!Zwi1f3ANtYwKNOc07fwuN1enOoRj4CreFouuGqi4D6Y')

2 changes: 0 additions & 2 deletions
tests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ def _check_file_exists(self, file_name, files):
 return uploaded

 def _test_upload_file(self, api):
 api.get_files()

 # Create temp file
 uFile, uFilePath = tempfile.mkstemp()
 os.write(uFile, "Does it work?")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bug fix in uploadfile#8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jeroenmeulenaar
wants to merge
6
commits into

base:master
Choose a base branch

from

 Open


Bug fix in uploadfile
#8
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7a359ef

Bug fix: 'getattr' needs a defualt value, otherwise an AttributeError is


frankmeulenaar Apr 17, 2016
55b26b0

Simplified test case: no need to call api.get_files() before calling


frankmeulenaar Apr 17, 2016
2213dbb

testing python3 support


JuanjoSalvador Dec 10, 2017
791d916

added simple testing script


JuanjoSalvador Dec 10, 2017
fbda4bd

Merge remote-tracking branch 'upstream/master'


jeroenmeulenaar Dec 24, 2017
78f4242

Fixed import


jeroenmeulenaar Dec 26, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 8 additions & 8 deletions
mega/crypto.py

100644 → 100755


View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@

from Crypto.Cipher import AES

from .utils import a32_to_str, str_to_a32, a32_to_base64
from utils import a32_to_str, str_to_a32, a32_to_base64


def aes_cbc_encrypt(data, key):
Expand All@@ -27,19 +27,19 @@ def aes_cbc_decrypt_a32(data, key):
def stringhash(s, aeskey):
 s32 = str_to_a32(s)
 h32 = [0, 0, 0, 0]
 for i in xrange(len(s32)):
 for i in range(len(s32)):
 h32[i % 4] ^= s32[i]
 for _ in xrange(0x4000):
 for _ in range(0x4000):
 h32 = aes_cbc_encrypt_a32(h32, aeskey)
 return a32_to_base64((h32[0], h32[2]))


def prepare_key(a):
 pkey = [0x93C467E3, 0x7DB0C7A4, 0xD1BE3F81, 0x0152CB56]
 for _ in xrange(0x10000):
 for j in xrange(0, len(a), 4):
 for _ in range(0x10000):
 for j in range(0, len(a), 4):
 key = [0, 0, 0, 0]
 for i in xrange(4):
 for i in range(4):
 if i + j < len(a):
 key[i] = a[i + j]
 pkey = aes_cbc_encrypt_a32(pkey, key)
Expand All@@ -49,13 +49,13 @@ def prepare_key(a):
def encrypt_key(a, key):
 return sum(
 (aes_cbc_encrypt_a32(a[i:i+4], key)
 for i in xrange(0, len(a), 4)), ())
 for i in range(0, len(a), 4)), ())


def decrypt_key(a, key):
 return sum(
 (aes_cbc_decrypt_a32(a[i:i+4], key)
 for i in xrange(0, len(a), 4)), ())
 for i in range(0, len(a), 4)), ())


def enc_attr(attr, key):
Expand Down

20 changes: 10 additions & 10 deletions
mega/mega.py

100644 → 100755


View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@
from Crypto.PublicKey import RSA
from Crypto.Util import Counter

from .crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
from crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
 enc_attr, dec_attr, aes_cbc_encrypt_a32
from .utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
from utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
 mpi2int, base64urlencode, base64urldecode, get_chunks
from .exceptions import MegaRequestException, MegaIncorrectPasswordExcetion
from exceptions import MegaRequestException, MegaIncorrectPasswordExcetion


class Mega(object):
Expand DownExpand Up@@ -88,15 +88,15 @@ def _login_common(self, res, password):
 privk = a32_to_str(rsa_priv_key)
 self.rsa_priv_key = [0, 0, 0, 0]

 for i in xrange(4):
 for i in range(4):
 l = ((ord(privk[0]) * 256 + ord(privk[1]) + 7) / 8) + 2
 self.rsa_priv_key[i] = mpi2int(privk[:l])
 privk = privk[l:]

 enc_sid = mpi2int(base64urldecode(res['csid']))
 decrypter = RSA.construct(
 (self.rsa_priv_key[0] * self.rsa_priv_key[1],
0L,
0,
 self.rsa_priv_key[2],
 self.rsa_priv_key[0],
 self.rsa_priv_key[1]))
Expand DownExpand Up@@ -173,7 +173,7 @@ def download_file(self, file_id, file_key, public=False):
 outfile.write(chunk)

 chunk_mac = [iv[0], iv[1], iv[0], iv[1]]
 for i in xrange(0, len(chunk), 16):
 for i in range(0, len(chunk), 16):
 block = chunk[i:i+16]
 if len(block) % 16:
 block += '\0' * (16 - (len(block) % 16))
Expand DownExpand Up@@ -205,15 +205,15 @@ def get_public_url(self, file_id, file_key):

 def uploadfile(self, filename, dst=None):
 if not dst:
 root_id = getattr(self, 'root_id')
 if not root_id:
 root_id = getattr(self, 'root_id', None)
 if root_id == None:
 self.get_files()
 dst = self.root_id
 infile = open(filename, 'rb')
 size = os.path.getsize(filename)
 ul_url = self.api_req({'a': 'u', 's': size})['p']

 ul_key = [random.randint(0, 0xFFFFFFFF) for _ in xrange(6)]
 ul_key = [random.randint(0, 0xFFFFFFFF) for _ in range(6)]
 counter = Counter.new(
 128, initial_value=((ul_key[4] << 32) + ul_key[5]) << 64)
 encryptor = AES.new(
Expand All@@ -226,7 +226,7 @@ def uploadfile(self, filename, dst=None):
 chunk = infile.read(chunk_size)

 chunk_mac = [ul_key[4], ul_key[5], ul_key[4], ul_key[5]]
 for i in xrange(0, len(chunk), 16):
 for i in range(0, len(chunk), 16):
 block = chunk[i:i+16]
 if len(block) % 16:
 block += '\0' * (16 - len(block) % 16)
Expand Down

6 changes: 3 additions & 3 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@ def get_package_data(package):
if sys.argv[-1] == 'publish':
 os.system("python setup.py sdist upload")
 args = {'version': version}
 print"You probably want to also tag the version now:"
 print" git tag -a %(version)s -m 'version %(version)s'" % args
 print" git push --tags"
 print("You probably want to also tag the version now:")
 print(" git tag -a %(version)s -m 'version %(version)s'" % args)
 print(" git push --tags")
 sys.exit()


Expand Down

8 changes: 8 additions & 0 deletions
simple-test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from mega import Mega

email = "juanjosalvador@netc.eu"
password = "Er0senn1n"

m = Mega.from_credentials(email, password)

m.download_from_url('https://mega.co.nz/#!wYo3AYZC!Zwi1f3ANtYwKNOc07fwuN1enOoRj4CreFouuGqi4D6Y')

2 changes: 0 additions & 2 deletions
tests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ def _check_file_exists(self, file_name, files):
 return uploaded

 def _test_upload_file(self, api):
 api.get_files()

 # Create temp file
 uFile, uFilePath = tempfile.mkstemp()
 os.write(uFile, "Does it work?")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Bug fix in uploadfile#8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jeroenmeulenaar
wants to merge
6
commits into

base:master
Choose a base branch

from

 Open


Bug fix in uploadfile
#8
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
7a359ef

Bug fix: 'getattr' needs a defualt value, otherwise an AttributeError is


frankmeulenaar Apr 17, 2016
55b26b0

Simplified test case: no need to call api.get_files() before calling


frankmeulenaar Apr 17, 2016
2213dbb

testing python3 support


JuanjoSalvador Dec 10, 2017
791d916

added simple testing script


JuanjoSalvador Dec 10, 2017
fbda4bd

Merge remote-tracking branch 'upstream/master'


jeroenmeulenaar Dec 24, 2017
78f4242

Fixed import


jeroenmeulenaar Dec 26, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 8 additions & 8 deletions
mega/crypto.py

100644 → 100755


View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@

from Crypto.Cipher import AES

from .utils import a32_to_str, str_to_a32, a32_to_base64
from utils import a32_to_str, str_to_a32, a32_to_base64


def aes_cbc_encrypt(data, key):
Expand All@@ -27,19 +27,19 @@ def aes_cbc_decrypt_a32(data, key):
def stringhash(s, aeskey):
 s32 = str_to_a32(s)
 h32 = [0, 0, 0, 0]
 for i in xrange(len(s32)):
 for i in range(len(s32)):
 h32[i % 4] ^= s32[i]
 for _ in xrange(0x4000):
 for _ in range(0x4000):
 h32 = aes_cbc_encrypt_a32(h32, aeskey)
 return a32_to_base64((h32[0], h32[2]))


def prepare_key(a):
 pkey = [0x93C467E3, 0x7DB0C7A4, 0xD1BE3F81, 0x0152CB56]
 for _ in xrange(0x10000):
 for j in xrange(0, len(a), 4):
 for _ in range(0x10000):
 for j in range(0, len(a), 4):
 key = [0, 0, 0, 0]
 for i in xrange(4):
 for i in range(4):
 if i + j < len(a):
 key[i] = a[i + j]
 pkey = aes_cbc_encrypt_a32(pkey, key)
Expand All@@ -49,13 +49,13 @@ def prepare_key(a):
def encrypt_key(a, key):
 return sum(
 (aes_cbc_encrypt_a32(a[i:i+4], key)
 for i in xrange(0, len(a), 4)), ())
 for i in range(0, len(a), 4)), ())


def decrypt_key(a, key):
 return sum(
 (aes_cbc_decrypt_a32(a[i:i+4], key)
 for i in xrange(0, len(a), 4)), ())
 for i in range(0, len(a), 4)), ())


def enc_attr(attr, key):
Expand Down

20 changes: 10 additions & 10 deletions
mega/mega.py

100644 → 100755


View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@
from Crypto.PublicKey import RSA
from Crypto.Util import Counter

from .crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
from crypto import prepare_key, stringhash, encrypt_key, decrypt_key,\
 enc_attr, dec_attr, aes_cbc_encrypt_a32
from .utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
from utils import a32_to_str, str_to_a32, a32_to_base64, base64_to_a32,\
 mpi2int, base64urlencode, base64urldecode, get_chunks
from .exceptions import MegaRequestException, MegaIncorrectPasswordExcetion
from exceptions import MegaRequestException, MegaIncorrectPasswordExcetion


class Mega(object):
Expand DownExpand Up@@ -88,15 +88,15 @@ def _login_common(self, res, password):
 privk = a32_to_str(rsa_priv_key)
 self.rsa_priv_key = [0, 0, 0, 0]

 for i in xrange(4):
 for i in range(4):
 l = ((ord(privk[0]) * 256 + ord(privk[1]) + 7) / 8) + 2
 self.rsa_priv_key[i] = mpi2int(privk[:l])
 privk = privk[l:]

 enc_sid = mpi2int(base64urldecode(res['csid']))
 decrypter = RSA.construct(
 (self.rsa_priv_key[0] * self.rsa_priv_key[1],
0L,
0,
 self.rsa_priv_key[2],
 self.rsa_priv_key[0],
 self.rsa_priv_key[1]))
Expand DownExpand Up@@ -173,7 +173,7 @@ def download_file(self, file_id, file_key, public=False):
 outfile.write(chunk)

 chunk_mac = [iv[0], iv[1], iv[0], iv[1]]
 for i in xrange(0, len(chunk), 16):
 for i in range(0, len(chunk), 16):
 block = chunk[i:i+16]
 if len(block) % 16:
 block += '\0' * (16 - (len(block) % 16))
Expand DownExpand Up@@ -205,15 +205,15 @@ def get_public_url(self, file_id, file_key):

 def uploadfile(self, filename, dst=None):
 if not dst:
 root_id = getattr(self, 'root_id')
 if not root_id:
 root_id = getattr(self, 'root_id', None)
 if root_id == None:
 self.get_files()
 dst = self.root_id
 infile = open(filename, 'rb')
 size = os.path.getsize(filename)
 ul_url = self.api_req({'a': 'u', 's': size})['p']

 ul_key = [random.randint(0, 0xFFFFFFFF) for _ in xrange(6)]
 ul_key = [random.randint(0, 0xFFFFFFFF) for _ in range(6)]
 counter = Counter.new(
 128, initial_value=((ul_key[4] << 32) + ul_key[5]) << 64)
 encryptor = AES.new(
Expand All@@ -226,7 +226,7 @@ def uploadfile(self, filename, dst=None):
 chunk = infile.read(chunk_size)

 chunk_mac = [ul_key[4], ul_key[5], ul_key[4], ul_key[5]]
 for i in xrange(0, len(chunk), 16):
 for i in range(0, len(chunk), 16):
 block = chunk[i:i+16]
 if len(block) % 16:
 block += '\0' * (16 - len(block) % 16)
Expand Down

6 changes: 3 additions & 3 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@ def get_package_data(package):
if sys.argv[-1] == 'publish':
 os.system("python setup.py sdist upload")
 args = {'version': version}
 print"You probably want to also tag the version now:"
 print" git tag -a %(version)s -m 'version %(version)s'" % args
 print" git push --tags"
 print("You probably want to also tag the version now:")
 print(" git tag -a %(version)s -m 'version %(version)s'" % args)
 print(" git push --tags")
 sys.exit()


Expand Down

8 changes: 8 additions & 0 deletions
simple-test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
from mega import Mega

email = "juanjosalvador@netc.eu"
password = "Er0senn1n"

m = Mega.from_credentials(email, password)

m.download_from_url('https://mega.co.nz/#!wYo3AYZC!Zwi1f3ANtYwKNOc07fwuN1enOoRj4CreFouuGqi4D6Y')

2 changes: 0 additions & 2 deletions
tests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,8 +22,6 @@ def _check_file_exists(self, file_name, files):
 return uploaded

 def _test_upload_file(self, api):
 api.get_files()

 # Create temp file
 uFile, uFilePath = tempfile.mkstemp()
 os.write(uFile, "Does it work?")
Expand Down