|
|
@@ -9,6 +9,7 @@ import settings
|
|
|
from functools import wraps
|
|
|
from .multi_threaded_image_saving import ImageSaver
|
|
|
from .get_mask_by_green import GetMask
|
|
|
+from middleware import UnicornException
|
|
|
|
|
|
def time_it(func):
|
|
|
@wraps(func) # 使用wraps来保留原始函数的元数据信息
|
|
|
@@ -550,7 +551,10 @@ class GeneratePic(object):
|
|
|
else:
|
|
|
logo_im = Image.new("RGBA", (1600, 1600), (0, 0, 0, 0))
|
|
|
|
|
|
- image_bg.paste(logo_im, (0, 0), logo_im)
|
|
|
+ try:
|
|
|
+ image_bg.paste(logo_im, (0, 0), logo_im)
|
|
|
+ except:
|
|
|
+ raise UnicornException("Logo图片错误，请更换其他logo并重试")
|
|
|
|
|
|
# image_bg = image_bg.resize((out_pic_size, out_pic_size), Image.BICUBIC)
|
|
|
if settings.OUT_PIC_FACTOR > 1.0:
|
|
|
@@ -559,13 +563,13 @@ class GeneratePic(object):
|
|
|
for imageSize in out_pic_size:
|
|
|
dot_index = out_path.rfind(".")
|
|
|
if dot_index != -1:
|
|
|
- # 拆分文件路径和后缀
|
|
|
- file_without_suffix = out_path[:dot_index]
|
|
|
- suffix = out_path[dot_index + 1 :]
|
|
|
+ # 拆分文件路径和后缀
|
|
|
+ file_without_suffix = out_path[:dot_index]
|
|
|
+ suffix = out_path[dot_index + 1 :]
|
|
|
else:
|
|
|
- file_without_suffix = out_path
|
|
|
- suffix = ""
|
|
|
- # 单独拼接字符串示例
|
|
|
+ file_without_suffix = out_path
|
|
|
+ suffix = ""
|
|
|
+ # 单独拼接字符串示例
|
|
|
new_file_path = f"{file_without_suffix}_{imageSize}.{suffix}"
|
|
|
if imageSize < 1600:
|
|
|
image_bg = image_bg.resize(
|
rambo