xlin 0.1.14__tar.gz → 0.1.15__tar.gz

{xlin-0.1.14 → xlin-0.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: xlin
-Version: 0.1.14
+Version: 0.1.15
 Summary: toolbox for LinXueyuan
 License: MIT
 Author: XiChen
@@ -18,7 +18,6 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: loguru
 Requires-Dist: pandas
 Requires-Dist: pyexcel

{xlin-0.1.14 → xlin-0.1.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "xlin"
-version = "0.1.14"
+version = "0.1.15"
 description = "toolbox for LinXueyuan"
 authors = ["XiChen <23211526+LinXueyuanStdio@users.noreply.github.com>"]
 license = "MIT"

{xlin-0.1.14 → xlin-0.1.15}/xlin/util.py

@@ -103,32 +103,12 @@ def rm(dir_path: Union[str, Path, List[str], List[Path]], filter: Callable[[Path
     filenames = os.listdir(dir_path)
     for filename in sorted(filenames):
         filepath = dir_path / filename
-        if debug:
-            print("checking", filepath)
-        if filepath.is_dir():
-            paths = ls(filepath, filter, expand_all_subdir)
-            if len(paths) > 0:
-                rm(paths, filter, expand_all_subdir)
-            child = filepath
-            while child.exists() and len(os.listdir(child)) > 0:
-                child = child / os.listdir(child)[0]
-            while child != filepath:
-                if child.exists() and len(os.listdir(child)) == 0:
-                    child.rmdir()
-                    if debug:
-                        print(f"删除空文件夹 {child}")
-                else:
-                    break
-            if filepath.exists() and len(os.listdir(filepath)) == 0:
-                filepath.rmdir()
-                if debug:
-                    print(f"删除空文件夹 {filepath}")
-        elif filter(filepath):
-            rm(filepath, filter, expand_all_subdir)
-    if dir_path.exists() and len(os.listdir(dir_path)) == 0:
-        dir_path.rmdir()
-        if debug:
-            print(f"删除空文件夹 {dir_path}")
+        rm(filepath, filter, expand_all_subdir, debug)
+    if dir_path.exists() and dir_path.is_dir() and len(os.listdir(dir_path)) == 0:
+        if filter(dir_path):
+            dir_path.rmdir()
+            if debug:
+                print(f"删除空文件夹 {dir_path}")
 
 
 def cp(