lesscode-flask 0.1.7__tar.gz → 0.1.9__tar.gz

{lesscode-flask-0.1.7 → lesscode-flask-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.1.7
+Version: 0.1.9
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode-flask-0.1.7 → lesscode-flask-0.1.9}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.7'
+__version__ = '0.1.9'
 
 import functools
 import logging

{lesscode-flask-0.1.7 → lesscode-flask-0.1.9}/lesscode_flask/utils/oss/__init__.py

@@ -7,11 +7,23 @@ from lesscode_flask.utils.oss.ks3_oss import Ks3Oss
 
 class CommonOss:
     def __init__(self, storage_type, **kwargs):
+        """
+        初始化OSS
+        Args:
+            storage_type (str): 存储类型，目前支持ks3和file
+            storage_config (dict): 存储配置，目前支持ks3和file
+        """
         self.storage_type = storage_type
         self.storage_config = kwargs.get("storage_config", {}) if kwargs.get("storage_config", {}) else app_config.get(
             "STORAGE_CONFIG", {})
 
     def upload(self, **kwargs):
+        """上传文件
+        Args:
+            files (list): 文件列表 可以是文件流列表，也可以是字典列表，字典格式为{"key":"文件key，可以是带路径的文件","stream":"文件流"}
+        Returns:
+            file_url_list: 文件url列表[{"key":"文件key，可以是带路径的文件","url":"本地文件存储的文件的全路径，对象存储，存放的是文件的下载地址"}]
+        """
         file_url_list = []
         files = kwargs.get("files", [])
         if not files:
@@ -56,21 +68,31 @@ class CommonOss:
                     _steam = f.get("stream")
                     stream = _steam.stream.read()
                     file_stream = BytesIO(stream)
-                    key_list = []
                     if "\\" in key:
                         key_list = key.split("\\")
-                    if "/" in key:
+                    elif "/" in key:
                         key_list = key.split("/")
+                    else:
+                        key_list = [key]
                     file_path = storage_dir
                     if key_list:
                         for k in key_list:
                             file_path = os.path.join(file_path, k)
+                    dir_path = os.path.dirname(file_path)
+                    if not os.path.exists(dir_path):
+                        os.makedirs(dir_path)
                     with open(file_path, 'wb') as outfile:
                         outfile.write(file_stream.getvalue())
                     file_url_list.append({"key": key, "url": file_path})
         return file_url_list
 
     def download(self, key):
+        """下载文件，返回文件流
+        Args:
+            key (str): 上面接口返回的文件key
+        Returns:
+            file_stream: 文件流
+        """
         if self.storage_type == "ks3":
             storage_config = self.storage_config or dict()
             ks3 = Ks3Oss(**storage_config)
@@ -79,11 +101,12 @@ class CommonOss:
             storage_dir = self.storage_config.get("storage_dir", "")
             if not storage_dir:
                 storage_dir = app_config.get("STORAGE_DIR")
-            key_list = []
             if "\\" in key:
                 key_list = key.split("\\")
-            if "/" in key:
+            elif "/" in key:
                 key_list = key.split("/")
+            else:
+                key_list = [key]
             file_path = storage_dir
             if key_list:
                 for k in key_list:

{lesscode-flask-0.1.7 → lesscode-flask-0.1.9}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.1.7
+Version: 0.1.9
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy