sumbit

2022-12-06 20:34:58 +08:00
parent 7cf795b660
commit a97acb7595
2 changed files with 33 additions and 24 deletions
@@ -53,8 +53,14 @@ class imageUtils:
        split_path = os.path.join(baseDir,save_name_delesu+"split")
        if image_su == "downloads":
            return None
-        cls.splitimage(file_path,blocks,1,split_path)
-        cls.image_compose(split_path,blocks,1,save_file_path,blockHeight,width)
+        is_split = cls.splitimage(file_path,blocks,1,split_path)
+        if not is_split == None:
+            cls.image_compose(split_path,blocks,1,save_file_path,blockHeight,width)
+        else:
+            if os.path.exists(split_path):
+                 shutil.rmtree(split_path)
+            if os.path.exists(file_path):
+                shutil.move(file_path, save_file_path)
        #完成后清空
        return file_path 
    
@@ -62,27 +68,30 @@ class imageUtils:
    def splitimage(cls,src,rownum,colnum,dstpath):
            img=Image.open(src)
            w,h=img.size                
-            s=os.path.split(src)
-            if dstpath=='':
-                dstpath = s[0]
-            if not os.path.exists(dstpath):
-                os.makedirs(dstpath)
-            fn=s[1].split('.')
-            basename=fn[0]
-            ext=fn[-1]
-            num=0
-            rowheight=h//rownum
-            colwidth=w//colnum
-            for r in range(rownum):
-                for c in range(colnum):
-                    box=(c*colwidth,r*rowheight,(c+1)*colwidth,(r+1)*rowheight)
-                    count_image = "{:0>3d}".format(num)
-                    file_path = os.path.join(dstpath,str(count_image)+'.'+ext)
-                    print("file_path=",file_path)
-                    img.crop(box).save(file_path)
-                    num=num+1
-            img.close
-            return src
+            if rownum<= h and colnum<=w:
+                s=os.path.split(src)
+                if dstpath=='':
+                    dstpath = s[0]
+                if not os.path.exists(dstpath):
+                    os.makedirs(dstpath)
+                fn=s[1].split('.')
+                basename=fn[0]
+                ext=fn[-1]
+                num=0
+                rowheight=h//rownum
+                colwidth=w//colnum
+                for r in range(rownum):
+                    for c in range(colnum):
+                        box=(c*colwidth,r*rowheight,(c+1)*colwidth,(r+1)*rowheight)
+                        count_image = "{:0>3d}".format(num)
+                        file_path = os.path.join(dstpath,str(count_image)+'.'+ext)
+                        print("file_path=",file_path)
+                        img.crop(box).save(file_path)
+                        num=num+1
+                return "成功"
+            else:
+                print('不数！')
+                return None
    
    @classmethod
    def image_compose(cls,src,row,column,save_path,image_height,image_width):