lesscode-flask 0.1.8__tar.gz → 0.1.10__tar.gz

{lesscode-flask-0.1.8 → lesscode-flask-0.1.10}/PKG-INFO

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

{lesscode-flask-0.1.8 → lesscode-flask-0.1.10}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.8'
+__version__ = '0.1.10'
 
 import functools
 import logging

{lesscode-flask-0.1.8 → lesscode-flask-0.1.10}/lesscode_flask/utils/oss/__init__.py

@@ -6,17 +6,62 @@ from lesscode_flask.utils.oss.ks3_oss import Ks3Oss
 
 
 class CommonOss:
-    def __init__(self, storage_type, **kwargs):
+    def __init__(self, storage_type, data_type="stream", **kwargs):
         """
         初始化OSS
         Args:
             storage_type (str): 存储类型，目前支持ks3和file
-            storage_config (dict): 存储配置，目前支持ks3和file
+            data_type (str): 数据类型，目前支持stream和file_path
+            storage_config (dict): 存储配置，目前支持ks3和file,file_name
         """
         self.storage_type = storage_type
+        self.data_type = data_type
         self.storage_config = kwargs.get("storage_config", {}) if kwargs.get("storage_config", {}) else app_config.get(
             "STORAGE_CONFIG", {})
 
+    def _save(self, key, io_stream: BytesIO = None, file_path: str = None):
+        file_url_obj = dict()
+        if self.storage_type == "ks3":
+            if self.data_type == "stream":
+                storage_config = self.storage_config or dict()
+                ks3 = Ks3Oss(**storage_config)
+                url = ks3.save(key=key, string_data=io_stream.getvalue(), content_type="string", policy="public-read")
+                file_url_obj = {"key": key, "url": url}
+            elif self.data_type == "file_path":
+                storage_config = self.storage_config or dict()
+                ks3 = Ks3Oss(**storage_config)
+                url = ks3.save(key=key, filename=file_path, content_type="filename", policy="public-read")
+                file_url_obj = {"key": key, "url": url}
+        elif self.storage_type == "file":
+            storage_path = ""
+            storage_dir = self.storage_config.get("storage_dir", "")
+            if not storage_dir:
+                storage_dir = app_config.get("STORAGE_DIR")
+            if not storage_dir:
+                raise Exception("storage_dir is empty")
+            if self.data_type == "stream":
+                if "\\" in key:
+                    key_list = key.split("\\")
+                elif "/" in key:
+                    key_list = key.split("/")
+                else:
+                    key_list = [key]
+                storage_path = storage_dir
+                if key_list:
+                    for k in key_list:
+                        storage_path = os.path.join(storage_path, k)
+                dir_path = os.path.dirname(storage_path)
+                if not os.path.exists(dir_path):
+                    os.makedirs(dir_path)
+            elif self.data_type == "file_path":
+                with open(file_path, 'rb') as infile:
+                    io_stram = BytesIO(infile.read())
+            if storage_path:
+                with open(storage_path, 'wb') as outfile:
+                    outfile.write(io_stram.getvalue())
+                file_url_obj = {"key": key, "url": storage_path}
+        return file_url_obj
+
     def upload(self, **kwargs):
         """上传文件
         Args:
@@ -28,60 +73,36 @@ class CommonOss:
         files = kwargs.get("files", [])
         if not files:
             raise Exception("files is empty")
-        if self.storage_type == "ks3":
-            storage_config = self.storage_config or dict()
-            ks3 = Ks3Oss(**storage_config)
+        if self.data_type == "stream":
             for f in files:
                 if not isinstance(f, dict):
-                    file_name = f.filename
+                    key = f.filename
                     stream = f.stream.read()
                     file_stream = BytesIO(stream)
-                    content = file_stream.getvalue().decode('utf-8')
-                    url = ks3.save(key=file_name, content=content, content_type="string", policy="public-read")
-                    file_url_list.append({"key": file_name, "url": url})
                 else:
                     key = f.get("key", "")
                     _steam = f.get("stream")
                     stream = _steam.stream.read()
                     file_stream = BytesIO(stream)
-                    content = file_stream.getvalue().decode('utf-8')
-                    url = ks3.save(key=key, content=content, content_type="string", policy="public-read")
-                    file_url_list.append({"key": key, "url": url})
-        elif self.storage_type == "file":
-            storage_dir = self.storage_config.get("storage_dir", "")
-            if not storage_dir:
-                storage_dir = app_config.get("STORAGE_DIR")
-            if not storage_dir:
-                raise Exception("storage_dir is empty")
+                file_url_obj = self._save(key=key, io_stream=file_stream)
+                file_url_list.append(file_url_obj)
 
+        elif self.data_type == "file_path":
             for f in files:
                 if not isinstance(f, dict):
-                    file_name = f.filename
-                    stream = f.stream.read()
-                    file_stream = BytesIO(stream)
-                    file_path = os.path.join(storage_dir, file_name)
-                    with open(file_path, 'wb') as outfile:
-                        outfile.write(file_stream.getvalue())
-                    file_url_list.append({"key": file_name, "url": file_path})
+                    if "\\" in f:
+                        file_name = f.split("\\")[-1]
+                    elif "/" in f:
+                        file_name = f.split("/")[-1]
+                    else:
+                        file_name = f
+                    key = file_name
+                    _file_path = f
                 else:
                     key = f.get("key", "")
-                    _steam = f.get("stream")
-                    stream = _steam.stream.read()
-                    file_stream = BytesIO(stream)
-                    if "\\" in key:
-                        key_list = key.split("\\")
-                    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)
-                    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
+                    _file_path = f.get("file_path")
+                file_url_obj = self._save(key=key, file_path=_file_path)
+                file_url_list.append(file_url_obj)
 
     def download(self, key):
         """下载文件，返回文件流

{lesscode-flask-0.1.8 → lesscode-flask-0.1.10}/lesscode_flask.egg-info/PKG-INFO

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