pyxllib 0.3.89__tar.gz → 0.3.91__tar.gz

{pyxllib-0.3.89/pyxllib.egg-info → pyxllib-0.3.91}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.89
+Version: 0.3.91
 Summary: 厦门理工模式识别团队通用python代码工具库
 Home-page: https://github.com/XLPRUtils/pyxllib
 Author: code4101

{pyxllib-0.3.89 → pyxllib-0.3.91}/pyxllib/cv/xlpillib.py

@@ -249,6 +249,9 @@ class PilImg(PIL.Image.Image):
         else:
             color = tuple(color)
 
+        # 如果图片通道数跟预设的color不同，要断言
+        assert self.n_channels() == len(color), f'图片通道数{self.n_channels}跟预设的color{color}不同'
+
         im = self
         bg = Image.new(im.mode, im.size, color)
         diff = ImageChops.difference(im, bg)

{pyxllib-0.3.89 → pyxllib-0.3.91}/pyxllib/file/packlib/__init__.py

@@ -278,9 +278,9 @@ def smart_compress_zip(root, paths, check_func=None):
     num = len(paths)
     outfile = None
     if num > 1:
-        outfile = root.parent / XlPath(root.name + '.zip')
+        outfile = root / XlPath(root.name + '.zip')
     elif num == 1:
-        outfile = root.parent / (XlPath(paths[0]).name + '.zip')
+        outfile = root / (XlPath(paths[0]).name + '.zip')
     else:
         return
     zipf = XlZipFile(outfile, 'w', zipfile.ZIP_DEFLATED)

{pyxllib-0.3.89 → pyxllib-0.3.91}/pyxllib/file/specialist/filelib.py

@@ -2594,7 +2594,10 @@ class BatchFileRenamer:
                 return f2
 
     def rename_files(self, print_mode=False, exists_keys=None):
-        """ 对文件进行批量重命名 """
+        """ 对文件进行批量重命名
+
+        这里分两轮运行，是有非常深的用意的，避免前面重命名的时候，没有见到后面可能会出现的重名文件
+        """
         # 1 先遍历一遍文件，确认哪些文件是确定要重命名的
         exists_keys = exists_keys or set()
         repeat_name_files = []  # 确认要进行重命名的文件