rambo hace 7 meses
padre
commit
e529adb7c7
Se han modificado 2 ficheros con 16 adiciones y 6 borrados
  1. 12 2
      python/service/grenerate_main_image_test.py
  2. 4 4
      python/settings.py

+ 12 - 2
python/service/grenerate_main_image_test.py

@@ -437,17 +437,27 @@ class GeneratePic(object):
                 image_bg = image_bg.resize(
                     (imageSize, imageSize), resample=settings.RESIZE_IMAGE_MODE
                 )
+            dot_index = out_path.rfind(".")
+            if dot_index != -1:
+                # 拆分文件路径和后缀
+                file_without_suffix = out_path[:dot_index]
+                suffix = out_path[dot_index + 1 :]
+            else:
+                file_without_suffix = out_path
+                suffix = ""
 
+            # 单独拼接字符串示例
+            new_file_path = f"{file_without_suffix}_{imageSize}.{suffix}"
             if settings.OUT_PIC_MODE == ".jpg":
                 image_bg.save(
-                    f"{out_path}_{imageSize}",
+                    new_file_path,
                     quality=100,
                     dpi=(300, 300),
                     format="JPEG",
                 )
             else:
                 # quality=quality
-                image_bg.save(f"{out_path}_{imageSize}", quality=100)
+                image_bg.save(new_file_path, quality=100)
 
         if output_queue is not None:
             output_queue.put(True)

+ 4 - 4
python/settings.py

@@ -180,10 +180,10 @@ is_test_plugins = true_divide
 
 OUT_PIC_MODE = "."+getSysConfigs("basic_configs", "image_out_format", "png")  # ".png"
 
-OUT_PIC_SIZE = json.loads(
-    800
-    if getSysConfigs("basic_configs", "main_image_size", "[1600]") == ""
-    else getSysConfigs("basic_configs", "main_image_size", "[1600]")
+OUT_PIC_SIZE = (
+    [1600]
+    if getSysConfigs("basic_configs", "main_image_size", [1600]) == ""
+    else getSysConfigs("basic_configs", "main_image_size", [1600])
 )  # 主图大小