py2ls 0.2.4.27__tar.gz → 0.2.4.29__tar.gz

{py2ls-0.2.4.27 → py2ls-0.2.4.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2ls
-Version: 0.2.4.27
+Version: 0.2.4.29
 Summary: py(thon)2(too)ls
 Author: Jianfeng
 Author-email: Jianfeng.Liu0413@gmail.com
@@ -25,11 +25,11 @@ Requires-Dist: MarkupSafe (>=2.1.5)
 Requires-Dist: PyMatting (>=1.1.12)
 Requires-Dist: PyOpenGL (>=3.1.6)
 Requires-Dist: PyPDF2 (>=3.0.1)
-Requires-Dist: PyQt5 (>=5.15.11)
-Requires-Dist: PyQt5-Qt5 (>=5.15.14)
+Requires-Dist: PyQt5 (>=5.15.0)
+Requires-Dist: PyQt5-Qt5 (>=5.15.0)
 Requires-Dist: PyQt5_sip (>=12.15.0)
-Requires-Dist: PyQtWebEngine (>=5.15.7)
-Requires-Dist: PyQtWebEngine-Qt5 (>=5.15.14)
+Requires-Dist: PyQtWebEngine (>=5.15.0)
+Requires-Dist: PyQtWebEngine-Qt5 (>=5.15.0)
 Requires-Dist: PySocks (>=1.7.1)
 Requires-Dist: PyYAML (>=6.0.1)
 Requires-Dist: Pygments (>=2.18.0)
@@ -38,7 +38,6 @@ Requires-Dist: SciencePlots (>=2.1.1)
 Requires-Dist: XlsxWriter (>=3.2.0)
 Requires-Dist: asciitree (>=0.3.3)
 Requires-Dist: asttokens (>=2.4.1)
-Requires-Dist: attrs (>=23.2.0)
 Requires-Dist: autogluon (>=1.2)
 Requires-Dist: beautifulsoup4 (>=4.12.3)
 Requires-Dist: bleach (>=6.1.0)

{py2ls-0.2.4.27 → py2ls-0.2.4.29}/py2ls/ips.py

@@ -3657,35 +3657,21 @@ def get_os(full=False, verbose=False):
             pnrint(e)
     return res
 
-
+import re
+import stat
+import platform
 def listdir(
     rootdir,
     kind=None,
     sort_by="name",
     ascending=True,
-    contains=None,
+    contains=None,# filter filenames using re
+    booster=False,# walk in subfolders
+    hidden=False,  # Include hidden files/folders
     orient="list",
-    output="df",  # 'list','dict','records','index','series'
+    output="df",  # "df", 'list','dict','records','index','series'
     verbose=True,
-):
-    if kind is None:
-        ls = os.listdir(rootdir)
-        ls = [f for f in ls if not f.startswith(".") and not f.startswith("~")]
-        if verbose:
-            if len(ls)>20:
-                print(ls[:20])
-            else:
-                print(ls)
-        df_all = pd.DataFrame(
-            {
-                "name": ls,
-                "path": [os.path.join(rootdir, i) for i in ls],
-                "kind":[os.path.splitext(i)[1] for i in ls]
-            }
-        )
-        if verbose:
-            display(df_all.head())
-        return df_all
+): 
     if isinstance(kind, list):
         f_ = []
         for kind_ in kind:
@@ -3695,56 +3681,106 @@ def listdir(
                 sort_by=sort_by,
                 ascending=ascending,
                 contains=contains,
+                booster=booster,# walk in subfolders
+                hidden=hidden,
                 orient=orient,
                 output=output,
+                verbose=verbose,
             )
             f_.append(f_tmp)
         if f_:
             return pd.concat(f_, ignore_index=True)
-
-    if not kind.startswith("."):
-        kind = "." + kind
-
-    if os.path.isdir(rootdir):
-        ls = os.listdir(rootdir)
-        ls = [f for f in ls if not f.startswith(".") and not f.startswith("~")]
-        fd = [".fd", ".fld", ".fol", ".fd", ".folder"]
-        i = 0
-        f = {
-            "name": [],
-            "length": [],
-            "path": [],
-            "created_time": [],
-            "modified_time": [],
-            "last_open_time": [],
-            "size": [],
-            "fname": [],
-            "fpath": [],
-            "basename":[],
-        }
-        for item in ls:
-            item_path = os.path.join(rootdir, item)
-            if item.startswith("."):
+    if kind is not None:
+        if not kind.startswith("."):
+            kind = "." + kind
+    fd = [".fd", ".fld", ".fol", ".fd", ".folder"]
+    i = 0
+    f = {
+        "name": [],
+        'kind':[],
+        "length": [],
+        "basename":[],
+        "path": [],
+        "created_time": [],
+        "modified_time": [],
+        "last_open_time": [],
+        "size": [],
+        "permission":[],
+        "owner":[],
+        "rootdir":[],
+        "fname": [],
+        "fpath": [],
+    }
+    for dirpath, dirnames, ls in os.walk(rootdir):
+        if not hidden:
+            dirnames[:] = [d for d in dirnames if not d.startswith(".")]
+            ls = [i for i in ls if not i.startswith(".")]
+        for dirname in dirnames: 
+            if contains and not re.search(contains, dirname):
                 continue
-            filename, file_extension = os.path.splitext(item)
-            is_folder = kind.lower() in fd and os.path.isdir(item_path)
-            is_file = kind.lower() in file_extension.lower() and (
-                os.path.isfile(item_path)
-            )
-            if kind in [".doc", ".img", ".zip"]:  # 选择大的类别
-                if kind != ".folder" and not isa(item_path, kind):
-                    continue
-            elif kind in [".all"]:
-                return flist(fpath, contains=contains)
-            else:  # 精确到文件的后缀
-                if not is_folder and not is_file:
-                    continue
+            dirname_path = os.path.join(dirpath, dirname)
+            fpath = os.path.join(os.path.dirname(dirname_path), dirname) 
+            try:
+                stats_file = os.stat(fpath)
+            except Exception as e:
+                print(e)
+                continue
+            filename, file_extension = os.path.splitext(dirname)
+            file_extension = file_extension if file_extension!='' else None
             f["name"].append(filename)
+            f['kind'].append(file_extension)
             f["length"].append(len(filename))
-            f["path"].append(os.path.join(os.path.dirname(item_path), item))
+            f["size"].append(round(os.path.getsize(fpath) / 1024 / 1024, 3))
+            f['basename'].append(os.path.basename(dirname_path))
+            f["path"].append(os.path.join(os.path.dirname(dirname_path), dirname))
+            f["created_time"].append(
+                pd.to_datetime(os.path.getctime(dirname_path), unit="s")
+            )
+            f["modified_time"].append(
+                pd.to_datetime(os.path.getmtime(dirname_path), unit="s")
+            )
+            f["last_open_time"].append(
+                pd.to_datetime(os.path.getatime(dirname_path), unit="s")
+            )
+            f["permission"].append(stat.filemode(stats_file.st_mode)),
+            f["owner"].append(os.getlogin() if platform.system() != "Windows" else "N/A"),
+            f["rootdir"].append(dirpath)
+            f["fname"].append(filename)  # will be removed
+            f["fpath"].append(fpath)  # will be removed
+            i += 1
+        for item in ls: 
+            if contains and not re.search(contains, item):
+                continue
+            item_path = os.path.join(dirpath, item)
             fpath = os.path.join(os.path.dirname(item_path), item)
-            basename=os.path.basename(item_path)
+            try:
+                stats_file = os.stat(fpath)
+            except Exception as e:
+                print(e)
+                continue
+            filename, file_extension = os.path.splitext(item)
+            if kind is not None:
+                if not kind.startswith("."):
+                    kind = "." + kind
+                is_folder = kind.lower() in fd and os.path.isdir(item_path)
+                is_file = kind.lower() in file_extension.lower() and (
+                    os.path.isfile(item_path)
+                )
+                if kind in [".doc", ".img", ".zip"]:  # 选择大的类别
+                    if kind != ".folder" and not isa(item_path, kind):
+                        continue
+                elif kind in [".all"]:
+                    return flist(fpath, contains=contains)
+                else:  # 精确到文件的后缀
+                    if not is_folder and not is_file:
+                        continue
+            file_extension = file_extension if file_extension!='' else None
+            f["name"].append(filename)
+            f['kind'].append(file_extension)
+            f["length"].append(len(filename))
             f["size"].append(round(os.path.getsize(fpath) / 1024 / 1024, 3))
+            f['basename'].append(os.path.basename(item_path))
+            f["path"].append(os.path.join(os.path.dirname(item_path), item))
             f["created_time"].append(
                 pd.to_datetime(os.path.getctime(item_path), unit="s")
             )
@@ -3754,26 +3790,22 @@ def listdir(
             f["last_open_time"].append(
                 pd.to_datetime(os.path.getatime(item_path), unit="s")
             )
+            f["permission"].append(stat.filemode(stats_file.st_mode)),
+            f["owner"].append(os.getlogin() if platform.system() != "Windows" else "N/A"),
             f["fname"].append(filename)  # will be removed
             f["fpath"].append(fpath)  # will be removed
-            f['basename'].append(basename)
+            f["rootdir"].append(dirpath)
             i += 1
 
         f["num"] = i
-        f["rootdir"] = rootdir
         f["os"] = get_os()  # os.uname().machine
-    else:
-        raise FileNotFoundError(
-            'The directory "{}" does NOT exist. Please check the directory "rootdir".'.format(
-                rootdir
-            )
-        )
-
+        if not booster: # go deeper subfolders
+            break
+    #* convert to pd.DataFrame
     f = pd.DataFrame(f)
-
-    if contains is not None:
-        f = f[f["name"].str.contains(contains, case=False)]
-
+    f=f[["basename","name","kind","length","size","num","path","created_time",
+        "modified_time","last_open_time","rootdir",
+        "fname","fpath","permission","owner","os",]]
     if "nam" in sort_by.lower():
         f = sort_kind(f, by="name", ascending=ascending)
     elif "crea" in sort_by.lower():
@@ -3786,10 +3818,10 @@ def listdir(
     if "df" in output:
         if verbose:
             display(f.head())
+            print(f"shape: {f.shape}")
         return f
     else:
         from box import Box
-
         if "l" in orient.lower():  # list # default
             res_output = Box(f.to_dict(orient="list"))
             return res_output
@@ -3802,12 +3834,6 @@ def listdir(
         if "se" in orient.lower():  # records
             return Box(f.to_dict(orient="series"))
 
-
-# Example usage:
-# result = listdir('your_root_directory')
-# print(result)
-# df=listdir("/", contains='sss',sort_by='name',ascending=False)
-# print(df.fname.to_list(),"\n",df.fpath.to_list())
 def listfunc(lib_name, opt="call"):
     if opt == "call":
         funcs = [func for func in dir(lib_name) if callable(getattr(lib_name, func))]
@@ -3822,6 +3848,10 @@ def func_list(lib_name, opt="call"):
 def copy(src, dst, overwrite=False):
     """Copy a file from src to dst."""
     try:
+        dir_par_dst = os.path.dirname(dst)
+        if not os.path.isdir(dir_par_dst):
+            mkdir(dir_par_dst)
+        print(dir_par_dst)
         src = Path(src)
         dst = Path(dst)
         if not src.is_dir():
@@ -3848,11 +3878,14 @@ def copy(src, dst, overwrite=False):
     except Exception as e:
         logging.error(f"Failed {e}")
         
-def move(src, dst, overwrite=False):
-    return cut(src=src, dst=dst, overwrite=overwrite)
-
 def cut(src, dst, overwrite=False):
+    return move(src=src, dst=dst, overwrite=overwrite)
+
+def move(src, dst, overwrite=False):
     try:
+        dir_par_dst = os.path.dirname(dst)
+        if not os.path.isdir(dir_par_dst):
+            mkdir(dir_par_dst)
         src = Path(src)
         dst = Path(dst)
         if dst.is_dir():

{py2ls-0.2.4.27 → py2ls-0.2.4.29}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "py2ls"
-version = "0.2.4.27"
+version = "0.2.4.29"
 description = "py(thon)2(too)ls"
 authors = ["Jianfeng <Jianfeng.Liu0413@gmail.com>"]
 readme = "README.md"
@@ -14,7 +14,7 @@ autogluon = ">=1.2"
 gluoncv =  ">=0.10.5"
 asciitree = ">=0.3.3"
 asttokens = ">=2.4.1"
-attrs = ">=23.2.0"
+#attrs = ">=23.2.0"
 beautifulsoup4 = ">=4.12.3"
 bleach = ">=6.1.0"
 build = ">=0.10.0"
@@ -161,11 +161,11 @@ PyOpenGL = ">=3.1.6"
 pyparsing = ">=3.1.2"
 PyPDF2 = ">=3.0.1"
 pyproject_hooks = ">=1.1.0"
-PyQt5 = ">=5.15.11"
-PyQt5-Qt5 = ">=5.15.14"
+PyQt5 = ">=5.15.0"
+PyQt5-Qt5 = ">=5.15.0"
 PyQt5_sip = ">=12.15.0"
-PyQtWebEngine = ">=5.15.7"
-PyQtWebEngine-Qt5 = ">=5.15.14"
+PyQtWebEngine = ">=5.15.0"
+PyQtWebEngine-Qt5 = ">=5.15.0"
 pyrsistent = ">=0.20.0"
 PySocks = ">=1.7.1"
 pytest = ">=8.3.1"