Merge pull request #503 from leancloud/file-minor-refactor

refactor: simplify code according to api updates

Author: weakish

leancloud/file_.py

@@ -9,7 +9,6 @@
 import re
 import io
 import hashlib
-import uuid
 import logging
 import threading
 
@@ -34,6 +33,7 @@ class File(object):
 
     def __init__(self, name="", data=None, mime_type=None):
         self._name = name
+        self.key = None
         self.id = None
         self._url = None
         self._acl = None
@@ -314,21 +314,19 @@ def _update_data(self, server_data):
             self._metadata = server_data.get("metaData")
 
     def _get_file_token(self):
-        key = uuid.uuid4().hex
-        if self.extension:
-            key = "{0}.{1}".format(key, self.extension)
         data = {
             "name": self._name,
-            "key": key,
             "ACL": self._acl,
             "mime_type": self.mime_type,
             "metaData": self._metadata,
         }
+        if self.key is not None:
+            data["key"] = self.key
         response = client.post("/fileTokens", data)
         content = response.json()
         self.id = content["objectId"]
         self._url = content["url"]
-        content["key"] = key
+        self.key = content["key"]
         return content
 
     def fetch(self):

tests/test_file.py

@@ -8,6 +8,12 @@
 import io
 
 import six
+
+if six.PY2:
+    from urlparse import urlparse
+if six.PY3:
+    from urllib.parse import urlparse
+
 import requests
 from nose.tools import with_setup  # type: ignore
 from nose.tools import assert_raises  # type: ignore
@@ -24,6 +30,10 @@ def setup_func():
     leancloud.init(os.environ["APP_ID"], master_key=os.environ["MASTER_KEY"])
 
 
+def setup_without_master_key():
+    leancloud.init(os.environ["APP_ID"], os.environ["APP_KEY"])
+
+
 def test_basic():  # type: () -> None
     def fn(s):
         f = File("Blah", s, mime_type="text/plain")
@@ -97,6 +107,34 @@ def test_save():  # type: () -> None
     assert not f.url.endswith(".")
 
 
+@with_setup(setup_func)
+def test_save_with_specified_key():  # type: () -> None
+    f = File("Blah.txt", open("tests/sample_text.txt", "rb"))
+    user_specified_key = "abc"
+    f.key = user_specified_key
+    f.save()
+
+    assert f.id
+    assert f.name == "Blah.txt"
+    assert f.mime_type == "text/plain"
+    path = urlparse(f.url).path
+    if path.startswith("/avos-cloud-"):  # old school aws s3 file url
+        assert path.split("/")[2] == user_specified_key
+    else:
+        assert path == "/" + user_specified_key
+
+
+@with_setup(setup_without_master_key)
+def test_save_with_specified_key_but_without_master_key():  # type: () -> None
+    f = File("Blah.txt", open("tests/sample_text.txt", "rb"))
+    f.key = "abc"
+    try:
+        f.save()
+    except LeanCloudError as e:
+        if e.code == 1 and e.error.startswith("Unsupported file key"):
+            pass
+
+
 @with_setup(setup_func)
 def test_query():  # type: () -> None
     files = leancloud.Query("File").find()