浏览代码

fix: resolve runtime error when self.folder is None (#8401)

Co-authored-by: 陈长君 <chenchangjun@shuwen.com>
tags/0.8.3
swingchen01 1年前
父节点
当前提交
f55e06d8bf
没有帐户链接到提交者的电子邮件
共有 1 个文件被更改,包括 14 次插入34 次删除
  1. 14
    34
      api/extensions/storage/aliyun_storage.py

+ 14
- 34
api/extensions/storage/aliyun_storage.py 查看文件

) )


def save(self, filename, data): def save(self, filename, data):
if not self.folder or self.folder.endswith("/"):
filename = self.folder + filename
else:
filename = self.folder + "/" + filename
self.client.put_object(filename, data)
self.client.put_object(self.__wrapper_folder_filename(filename), data)


def load_once(self, filename: str) -> bytes: def load_once(self, filename: str) -> bytes:
if not self.folder or self.folder.endswith("/"):
filename = self.folder + filename
else:
filename = self.folder + "/" + filename

with closing(self.client.get_object(filename)) as obj:
with closing(self.client.get_object(self.__wrapper_folder_filename(filename))) as obj:
data = obj.read() data = obj.read()
return data return data


def load_stream(self, filename: str) -> Generator: def load_stream(self, filename: str) -> Generator:
def generate(filename: str = filename) -> Generator: def generate(filename: str = filename) -> Generator:
if not self.folder or self.folder.endswith("/"):
filename = self.folder + filename
else:
filename = self.folder + "/" + filename

with closing(self.client.get_object(filename)) as obj:
with closing(self.client.get_object(self.__wrapper_folder_filename(filename))) as obj:
while chunk := obj.read(4096): while chunk := obj.read(4096):
yield chunk yield chunk


return generate() return generate()


def download(self, filename, target_filepath): def download(self, filename, target_filepath):
if not self.folder or self.folder.endswith("/"):
filename = self.folder + filename
else:
filename = self.folder + "/" + filename

self.client.get_object_to_file(filename, target_filepath)
self.client.get_object_to_file(self.__wrapper_folder_filename(filename), target_filepath)


def exists(self, filename): def exists(self, filename):
if not self.folder or self.folder.endswith("/"):
filename = self.folder + filename
else:
filename = self.folder + "/" + filename

return self.client.object_exists(filename)
return self.client.object_exists(self.__wrapper_folder_filename(filename))


def delete(self, filename): def delete(self, filename):
if not self.folder or self.folder.endswith("/"):
filename = self.folder + filename
else:
filename = self.folder + "/" + filename
self.client.delete_object(filename)
self.client.delete_object(self.__wrapper_folder_filename(filename))

def __wrapper_folder_filename(self, filename) -> str:
if self.folder:
if self.folder.endswith("/"):
filename = self.folder + filename
else:
filename = self.folder + "/" + filename
return filename

正在加载...
取消
保存