megfile 2.2.10.post1__py3-none-any.whl → 3.0.0.post1__py3-none-any.whl

megfile/cli.py

@@ -14,7 +14,7 @@ from megfile.config import DEFAULT_BLOCK_SIZE
 from megfile.hdfs_path import DEFAULT_HDFS_TIMEOUT
 from megfile.interfaces import FileEntry
 from megfile.lib.glob import get_non_glob_dir, has_magic
-from megfile.smart import _smart_sync_single_file, smart_copy, smart_exists, smart_getmd5, smart_getmtime, smart_getsize, smart_glob_stat, smart_isdir, smart_isfile, smart_makedirs, smart_move, smart_open, smart_path_join, smart_remove, smart_rename, smart_scan_stat, smart_scandir, smart_stat, smart_sync, smart_sync_with_progress, smart_touch, smart_unlink
+from megfile.smart import _smart_sync_single_file, smart_copy, smart_exists, smart_getmd5, smart_getmtime, smart_getsize, smart_glob_stat, smart_isdir, smart_isfile, smart_makedirs, smart_move, smart_open, smart_path_join, smart_readlink, smart_realpath, smart_remove, smart_rename, smart_scan_stat, smart_scandir, smart_stat, smart_sync, smart_sync_with_progress, smart_touch, smart_unlink
 from megfile.smart_path import SmartPath
 from megfile.utils import get_human_size
 from megfile.version import VERSION
@@ -58,25 +58,23 @@ def get_echo_path(file_stat, base_path: str = "", full_path: bool = False):
 
 
 def simple_echo(file_stat, base_path: str = "", full_path: bool = False):
-    click.echo(get_echo_path(file_stat, base_path, full_path))
+    return get_echo_path(file_stat, base_path, full_path)
 
 
 def long_echo(file_stat, base_path: str = "", full_path: bool = False):
-    click.echo(
-        '%12d %s %s' % (
-            file_stat.stat.size,
-            time.strftime(
-                "%Y-%m-%d %H:%M:%S", time.localtime(file_stat.stat.mtime)),
-            get_echo_path(file_stat, base_path, full_path)))
+    return '%12d %s %s' % (
+        file_stat.stat.size,
+        time.strftime(
+            "%Y-%m-%d %H:%M:%S", time.localtime(file_stat.stat.mtime)),
+        get_echo_path(file_stat, base_path, full_path))
 
 
 def human_echo(file_stat, base_path: str = "", full_path: bool = False):
-    click.echo(
-        '%10s %s %s' % (
-            get_human_size(file_stat.stat.size),
-            time.strftime(
-                "%Y-%m-%d %H:%M:%S", time.localtime(file_stat.stat.mtime)),
-            get_echo_path(file_stat, base_path, full_path)))
+    return '%10s %s %s' % (
+        get_human_size(file_stat.stat.size),
+        time.strftime(
+            "%Y-%m-%d %H:%M:%S", time.localtime(file_stat.stat.mtime)),
+        get_echo_path(file_stat, base_path, full_path))
 
 
 def smart_list_stat(path):
@@ -108,7 +106,14 @@ def _ls(path: str, long: bool, recursive: bool, human_readable: bool):
     total_size = 0
     for file_stat in scan_func(path):
         total_size += file_stat.stat.size
-        echo_func(file_stat, base_path, full_path=full_path)
+        output = echo_func(file_stat, base_path, full_path=full_path)
+        if file_stat.is_symlink():
+            try:
+                link = smart_readlink(file_stat.path)
+            except FileNotFoundError as e:
+                link = repr(e)
+            output += ' -> %s' % link
+        click.echo(output)
     if long:
         click.echo(f'total: {get_human_size(total_size)}')
 

megfile/fs_path.py

@@ -3,6 +3,7 @@ import io
 import os
 import pathlib
 import shutil
+from shutil import copytree
 from stat import S_ISDIR as stat_isdir
 from stat import S_ISLNK as stat_islnk
 from typing import IO, AnyStr, BinaryIO, Callable, Iterator, List, Optional, Tuple, Union
@@ -10,7 +11,6 @@ from typing import IO, AnyStr, BinaryIO, Callable, Iterator, List, Optional, Tup
 from megfile.errors import _create_missing_ok_generator
 from megfile.interfaces import Access, ContextIterator, FileEntry, PathLike, StatResult
 from megfile.lib.compare import is_same_file
-from megfile.lib.compat import copytree
 from megfile.lib.glob import iglob
 from megfile.lib.url import get_url_scheme
 from megfile.utils import cachedproperty, calculate_md5

megfile/lib/compat.py

@@ -13,74 +13,3 @@ def fspath(path) -> str:
     if isinstance(result, bytes):
         return result.decode()
     return result
-
-
-import sys
-
-if sys.version_info.major == 3 and sys.version_info.minor >= 8:
-    from shutil import copytree
-else:  # pragma: no cover
-    from shutil import Error, copy2, copystat
-
-    def copytree(
-            src,
-            dst,
-            symlinks=False,
-            ignore=None,
-            copy_function=copy2,
-            ignore_dangling_symlinks=False,
-            dirs_exist_ok=False):
-        names = os.listdir(src)
-        if ignore is not None:
-            ignored_names = ignore(src, names)
-        else:
-            ignored_names = set()
-
-        os.makedirs(dst, exist_ok=dirs_exist_ok)
-        errors = []
-        for name in names:
-            if name in ignored_names:
-                continue
-            srcname = os.path.join(src, name)
-            dstname = os.path.join(dst, name)
-            try:
-                if os.path.islink(srcname):
-                    linkto = os.readlink(srcname)
-                    if symlinks:
-                        # We can't just leave it to `copy_function` because legacy
-                        # code with a custom `copy_function` may rely on copytree
-                        # doing the right thing.
-                        os.symlink(linkto, dstname)
-                        copystat(srcname, dstname, follow_symlinks=not symlinks)
-                    else:
-                        # ignore dangling symlink if the flag is on
-                        if not os.path.exists(
-                                linkto) and ignore_dangling_symlinks:
-                            continue
-                        # otherwise let the copy occurs. copy2 will raise an error
-                        if os.path.isdir(srcname):
-                            copytree(
-                                srcname, dstname, symlinks, ignore,
-                                copy_function)
-                        else:
-                            copy_function(srcname, dstname)
-                elif os.path.isdir(srcname):
-                    copytree(srcname, dstname, symlinks, ignore, copy_function)
-                else:
-                    # Will raise a SpecialFileError for unsupported file types
-                    copy_function(srcname, dstname)
-            # catch the Error from the recursive copytree so that we can
-            # continue with other files
-            except Error as err:
-                errors.extend(err.args[0])
-            except OSError as why:
-                errors.append((srcname, dstname, str(why)))
-        try:
-            copystat(src, dst)
-        except OSError as why:
-            # Copying file access times may fail on Windows
-            if getattr(why, 'winerror', None) is None:
-                errors.append((src, dst, str(why)))
-        if errors:
-            raise Error(errors)
-        return dst

megfile/version.py

@@ -1 +1 @@
-VERSION = "2.2.10.post1"
+VERSION = "3.0.0.post1"

{megfile-2.2.10.post1.dist-info → megfile-3.0.0.post1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: megfile
-Version: 2.2.10.post1
+Version: 3.0.0.post1
 Summary: Megvii file operation library
 Home-page: https://github.com/megvii-research/megfile
 Author: megvii
@@ -13,13 +13,12 @@ Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.6
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: LICENSE.pyre

{megfile-2.2.10.post1.dist-info → megfile-3.0.0.post1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 megfile/__init__.py,sha256=MT8SIXsmEUvtSpd1GHv6e3fFfR1gRnlEdkNNqv3gngo,6534
-megfile/cli.py,sha256=Lgc0RL1DGR6bcm2yPPkYZ6UJ-KRquRg5vtB7uqUZies,21062
+megfile/cli.py,sha256=yaECF7bn-_QjeK6MLnZgvgJjIHcUIQrrKVl_JaxOEDo,21283
 megfile/config.py,sha256=Mz91CpRJJtepidOPXs98wYskmbbHRByG1VCeKJ81kVg,658
 megfile/errors.py,sha256=Sbx3UEKnzuyUmB1tFU9cZv61Yr4dRa79J6D0UMmkvj4,13323
 megfile/fs.py,sha256=OfY0z4GSl8fT3mDGdeqP2hWFsd1QJl-h8RkSbg6-M8I,11547
-megfile/fs_path.py,sha256=k2hT-NwF71DSB2tvITkQBb_V9oXHYcdro_LSFeSrnOk,38249
+megfile/fs_path.py,sha256=sHn-sBcvq7SvYN71onkA_ssLs71NzM1MM3d3Sug8uzo,38237
 megfile/hdfs.py,sha256=aAkHobOO0nDcLoqj0tx_1tvgoLOCooTWuukq0pO-nQA,9156
 megfile/hdfs_path.py,sha256=rVmdHydhe0x6Vn7hblewghiWZIdZswe4hfxLOHm8vCM,26677
 megfile/http.py,sha256=a3oAuARSSaIU8VMx86Mui0N5Vh-EI0AoHnwxRU5DSMU,2032
@@ -18,12 +18,12 @@ megfile/smart.py,sha256=YoRvxEaZ_C-A5gQlFEs4sGBJ6D26s0qYEBJEcny_jBg,33416
 megfile/smart_path.py,sha256=Y0UFh4J2ccydRY2W-wX2ubaf9zzJx1M2nf-VLBGe4mk,6749
 megfile/stdio.py,sha256=yRhlfUA2DHi3bq-9cXsSlbLCnHvS_zvglO2IYYyPsGc,707
 megfile/stdio_path.py,sha256=eQulTXUwHvUKA-5PKCGfVNiEPkJhG9YtVhtU58OcmoM,2873
-megfile/version.py,sha256=t6FtFxitIKAvDdjuV0gIQNCEumM93Ab0ZsL2ATtR-58,26
+megfile/version.py,sha256=kMj-Zcr5CPQqqnyAXYysUF5loOzPHPIw9kUQCBiOepA,25
 megfile/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 megfile/lib/base_prefetch_reader.py,sha256=9HT0tcgXa95BdbyclpDEDw8WwKi6091GRQerS90-pjE,13191
 megfile/lib/combine_reader.py,sha256=XFSqEY5A5X5Uf7eQ6AXAzrvNteESSXvKNVPktGjo3KY,4546
 megfile/lib/compare.py,sha256=yG2fZve_gMg32rQVCdwixBdqgYRsjn-24TqhALQaOrA,2233
-megfile/lib/compat.py,sha256=rYjfzQ3svuY7pB37W1JGyWH1kxd9aT4RtIe90npPtXI,3033
+megfile/lib/compat.py,sha256=0wt3_atcYhSLCxUj_WuDlQa3E1atjZfwJQ12thiFh5Q,234
 megfile/lib/fnmatch.py,sha256=HgdlnEWBsdFUOZqnW_v1kj1jeH_9lMcCqW85pyMu4vM,4054
 megfile/lib/glob.py,sha256=7i9dIput9rI9JIPyTZX-JDmFS7IP_THlX1k-35foAfw,9732
 megfile/lib/hdfs_prefetch_reader.py,sha256=peLUau0xas33IWOoNTOJECud_r3oJYEHBXblUALO1lY,2040
@@ -43,10 +43,10 @@ megfile/lib/stdio_handler.py,sha256=QDWtcZxz-hzi-rqQUiSlR3NrihX1fjK_Rj9T2mdTFEg,
 megfile/lib/url.py,sha256=VbQLjo0s4AaV0iSk66BcjI68aUTcN9zBZ5x6-cM4Qvs,103
 megfile/utils/__init__.py,sha256=qdX8FF_dYFKwp1BIWx3JeSGd91s7AKUDSEpDv9tORcM,9162
 megfile/utils/mutex.py,sha256=-2KH3bNovKRd9zvsXq9n3bWM7rQdoG9hO7tUPxVG_Po,2538
-megfile-2.2.10.post1.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-megfile-2.2.10.post1.dist-info/LICENSE.pyre,sha256=9lf5nT-5ZH25JijpYAequ0bl8E8z5JmZB1qrjiUMp84,1080
-megfile-2.2.10.post1.dist-info/METADATA,sha256=Q6-sfDnK_TfS1fRjLFoFxrVyABDGqf9du3M6fUBxp1Y,8972
-megfile-2.2.10.post1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-megfile-2.2.10.post1.dist-info/entry_points.txt,sha256=M6ZWSSv5_5_QtIpZafy3vq7WuOJ_5dSGQQnEZbByt2Q,49
-megfile-2.2.10.post1.dist-info/top_level.txt,sha256=i3rMgdU1ZAJekAceojhA-bkm3749PzshtRmLTbeLUPQ,8
-megfile-2.2.10.post1.dist-info/RECORD,,
+megfile-3.0.0.post1.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+megfile-3.0.0.post1.dist-info/LICENSE.pyre,sha256=9lf5nT-5ZH25JijpYAequ0bl8E8z5JmZB1qrjiUMp84,1080
+megfile-3.0.0.post1.dist-info/METADATA,sha256=8JE1q74gWq4onYy2ws28_CiXNsNHdRgS0_bf4TQvky8,8922
+megfile-3.0.0.post1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+megfile-3.0.0.post1.dist-info/entry_points.txt,sha256=M6ZWSSv5_5_QtIpZafy3vq7WuOJ_5dSGQQnEZbByt2Q,49
+megfile-3.0.0.post1.dist-info/top_level.txt,sha256=i3rMgdU1ZAJekAceojhA-bkm3749PzshtRmLTbeLUPQ,8
+megfile-3.0.0.post1.dist-info/RECORD,,