megfile 2.0.4.post3__py3-none-any.whl → 2.0.5__py3-none-any.whl

megfile/cli.py

@@ -15,7 +15,8 @@ from megfile.smart_path import SmartPath
 from megfile.utils import get_human_size
 from megfile.version import VERSION
 
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig(level=logging.ERROR)
+logging.getLogger('megfile').setLevel(level=logging.INFO)
 
 
 @click.group()
@@ -122,7 +123,7 @@ def cp(
         no_target_directory: bool,
         progress_bar: bool,
 ):
-    if smart_isdir(dst_path) and not no_target_directory:
+    if not no_target_directory and smart_isdir(dst_path):
         dst_path = smart_path_join(dst_path, os.path.basename(src_path))
     if recursive:
         with ThreadPoolExecutor(max_workers=(os.cpu_count() or 1) *

megfile/s3_path.py

@@ -130,6 +130,11 @@ def get_scoped_config(profile_name: Optional[str] = None) -> Dict:
         profile_name=profile_name)._session.get_scoped_config()
 
 
+@lru_cache()
+def warning_endpoint_url(key: str, endpoint_url: str):
+    _logger.info("using %s: %s" % (key, endpoint_url))
+
+
 def get_endpoint_url(profile_name: Optional[str] = None) -> str:
     '''Get the endpoint url of S3
 
@@ -139,14 +144,13 @@ def get_endpoint_url(profile_name: Optional[str] = None) -> str:
     ) if profile_name else 'OSS_ENDPOINT'
     environ_endpoint_url = os.environ.get(environ_key)
     if environ_endpoint_url:
-        _logger.info("using %s: %s" % (environ_key, environ_endpoint_url))
+        warning_endpoint_url(environ_key, environ_endpoint_url)
         return environ_endpoint_url
     try:
         config_endpoint_url = get_scoped_config(profile_name=profile_name).get(
             's3', {}).get('endpoint_url')
         if config_endpoint_url:
-            _logger.info(
-                "using ~/.aws/config: endpoint_url=%s" % config_endpoint_url)
+            warning_endpoint_url('~/.aws/config', config_endpoint_url)
             return config_endpoint_url
     except botocore.exceptions.ProfileNotFound:  # pragma: no cover
         pass
@@ -1223,7 +1227,10 @@ class S3Path(URIPath):
                 resp = self._client.head_object(Bucket=bucket, Key=key)
             return dict(
                 (key.lower(), value) for key, value in resp['Metadata'].items())
-        except Exception:
+        except Exception as error:
+            if isinstance(error,
+                          (S3UnknownError, S3ConfigError, S3PermissionError)):
+                raise error
             return {}
 
     def access(
@@ -1403,7 +1410,8 @@ class S3Path(URIPath):
                 Bucket=bucket, Prefix=prefix, Delimiter='/', MaxKeys=1)
         except Exception as error:
             error = translate_s3_error(error, self.path_with_protocol)
-            if isinstance(error, (S3UnknownError, S3ConfigError)):
+            if isinstance(error,
+                          (S3UnknownError, S3ConfigError, S3PermissionError)):
                 raise error
             return False
 
@@ -1436,7 +1444,8 @@ class S3Path(URIPath):
             self._client.head_object(Bucket=bucket, Key=key)
         except Exception as error:
             error = translate_s3_error(error, s3_url)
-            if isinstance(error, (S3UnknownError, S3ConfigError)):
+            if isinstance(error,
+                          (S3UnknownError, S3ConfigError, S3PermissionError)):
                 raise error
             return False
         return True
@@ -1500,7 +1509,8 @@ class S3Path(URIPath):
             self._client.head_bucket(Bucket=bucket)
         except Exception as error:
             error = translate_s3_error(error, self.path_with_protocol)
-            if isinstance(error, (S3UnknownError, S3ConfigError)):
+            if isinstance(error,
+                          (S3UnknownError, S3ConfigError, S3PermissionError)):
                 raise error
             if isinstance(error, S3FileNotFoundError):
                 return False

megfile/sftp_path.py

@@ -2,6 +2,7 @@ import atexit
 import hashlib
 import io
 import os
+import shlex
 import subprocess
 from functools import lru_cache
 from logging import getLogger as get_logger
@@ -497,9 +498,12 @@ class SftpPath(URIPath):
         :returns: True if the path is a directory, else False
 
         '''
-        stat = self.stat(follow_symlinks=followlinks)
-        if S_ISDIR(stat.st_mode):
-            return True
+        try:
+            stat = self.stat(follow_symlinks=followlinks)
+            if S_ISDIR(stat.st_mode):
+                return True
+        except FileNotFoundError:
+            pass
         return False
 
     def is_file(self, followlinks: bool = False) -> bool:
@@ -514,9 +518,12 @@ class SftpPath(URIPath):
         :returns: True if the path is a file, else False
 
         '''
-        stat = self.stat(follow_symlinks=followlinks)
-        if S_ISREG(stat.st_mode):
-            return True
+        try:
+            stat = self.stat(follow_symlinks=followlinks)
+            if S_ISREG(stat.st_mode):
+                return True
+        except FileNotFoundError:
+            pass
         return False
 
     def listdir(self) -> List[str]:
@@ -872,16 +879,13 @@ class SftpPath(URIPath):
 
     def open(self, mode: str = 'r', buffering=-1, **kwargs) -> IO[AnyStr]:  # pytype: disable=signature-mismatch
         if 'w' in mode or 'x' in mode or 'a' in mode:
-            try:
-                if self.is_dir():
-                    raise IsADirectoryError(
-                        'Is a directory: %r' % self.path_with_protocol)
-            except FileNotFoundError:
-                pass
+            if self.is_dir():
+                raise IsADirectoryError(
+                    'Is a directory: %r' % self.path_with_protocol)
             self.parent.mkdir(parents=True, exist_ok=True)
-        elif not self.is_file():
-            raise IsADirectoryError(
-                'Is a directory: %r' % self.path_with_protocol)
+        elif not self.exists():
+            raise FileNotFoundError(
+                'No such file: %r' % self.path_with_protocol)
         fileobj = self._client.open(self._real_path, mode, bufsize=buffering)
         if 'r' in mode and 'b' not in mode:
             return io.TextIOWrapper(fileobj)  # type: ignore
@@ -930,7 +934,7 @@ class SftpPath(URIPath):
         chan.settimeout(timeout)
         if environment:
             chan.update_environment(environment)
-        chan.exec_command(" ".join(command))
+        chan.exec_command(' '.join(shlex.quote(arg) for arg in command))
         stdout = chan.makefile("r", bufsize)
         stderr = chan.makefile_stderr("r", bufsize)
         return subprocess.CompletedProcess(

megfile/version.py

@@ -1 +1 @@
-VERSION = "2.0.4.post3"
+VERSION = "2.0.5"

{megfile-2.0.4.post3.dist-info → megfile-2.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: megfile
-Version: 2.0.4.post3
+Version: 2.0.5
 Summary: Megvii file operation library
 Home-page: https://github.com/megvii-research/megfile
 Author: megvii

{megfile-2.0.4.post3.dist-info → megfile-2.0.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
 megfile/__init__.py,sha256=wlijLJS6F8Vdm1xjpsjd9fKBeDGpgIMrVsXYSeOQ4Xw,5434
-megfile/cli.py,sha256=ky2o8F1NdEAkEfRmY-ZJo03IhVUG1RYCoBgMYehS_vQ,9974
+megfile/cli.py,sha256=t299Wo9lA0EbZlS5k3tCxW19liCqY7-i7zbu8oHOwHo,10033
 megfile/errors.py,sha256=FE9mGMxnNFpsQdtNJWiL-BuZbPGbbx8es9eAo8osyio,11584
 megfile/fs.py,sha256=sjkm_LsvNCw8hj9Ee-1HSNzvg7bRHTPem8KTDDBQlCw,11621
 megfile/fs_path.py,sha256=xdMkmH0mVAWnP2yfhxudvfuI-7tEgCzk9CzbN08-8O4,37351
@@ -8,14 +8,14 @@ megfile/http_path.py,sha256=up1gB0Yk1a3ZbmHoJV-XWzOTiKh66hmm5p_Kzy3GMHo,4483
 megfile/interfaces.py,sha256=h3tWE8hVt5S-HopaMAX6lunPJ97vzhv6jH_2HubcDNc,6219
 megfile/pathlike.py,sha256=EKVSfr13IFYTyUIfkTxzli93UJXkxtTH3IXdv946DhE,28741
 megfile/s3.py,sha256=hlXqQvZuXuDJbLjsrK23LD25cblThO9f-r78eWFsYZ8,12456
-megfile/s3_path.py,sha256=zNSrEZaiED1uJaN6fwapXBrFnD2jQk-t0cMmxB9cABQ,84409
+megfile/s3_path.py,sha256=WrKby1hDJPa8JGRWVggOWrakjvPtHlk6VmHMqlHkOiw,84774
 megfile/sftp.py,sha256=qzfgI-MGzNsr7adUQaiVKS7zRHGuK-Hs6o45wNIAcww,11943
-megfile/sftp_path.py,sha256=XxG_u-DhIREm99CF5Esh9HHSuVkK_YTHjaaOR1pGDfA,40243
+megfile/sftp_path.py,sha256=1DH_we_ygn7oYc4S_uh-mXZjbXleWaZDnNINxzuNIU4,40345
 megfile/smart.py,sha256=InlLZHUCjSuUo9MYgEmz0Q_2UuFKiD5ckwH5oag2SBo,30484
 megfile/smart_path.py,sha256=OPFfRgv-wtdSgakt7eN01d3Sne4qGNe4_nL_9a4AyzA,6613
 megfile/stdio.py,sha256=qmi1c7VTll6Y6ya9MCd-dSKffocX2GafA-YUncZRU1Y,559
 megfile/stdio_path.py,sha256=77P-SEFy5EONViTe-J7gK8ID9VkfACLvB-7WXrWry6s,2672
-megfile/version.py,sha256=RehFieZTT6idWnbOgobMRSGluaaE4RJEm9-go097iIg,25
+megfile/version.py,sha256=V8tafegt5EJPpw_OdTJ2xlmX0IbL6epFkgwbhD7aB-M,19
 megfile/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 megfile/lib/combine_reader.py,sha256=TkjvYvM5ZBVCh3tA7cOmTe8dYZc_eI7XbpPhnzqaNvU,4580
 megfile/lib/compat.py,sha256=ro07M9GU9hmqnSBu-IV13qKQQ9ktiMNDxaGGw9I9W3k,228
@@ -34,10 +34,10 @@ megfile/lib/shadow_handler.py,sha256=IbFyTw107t-yWH0cGrDjAJX-CS3xeEr77_PTGsnSgk4
 megfile/lib/stdio_handler.py,sha256=QDWtcZxz-hzi-rqQUiSlR3NrihX1fjK_Rj9T2mdTFEg,2044
 megfile/utils/__init__.py,sha256=gWplPIHzpSqV9AiQiRvUrBCkD737caNYyudsgwQBbKk,9025
 megfile/utils/mutex.py,sha256=BE16gbmZxr0RgU0ULaAFVDTZGwiOA-Jven-fDeG3ltQ,2461
-megfile-2.0.4.post3.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-megfile-2.0.4.post3.dist-info/LICENSE.pyre,sha256=9lf5nT-5ZH25JijpYAequ0bl8E8z5JmZB1qrjiUMp84,1080
-megfile-2.0.4.post3.dist-info/METADATA,sha256=wtFZYk0IBsgUhmBy6S8LVAtT6W6e9VjxwFEHNDSnPhk,10197
-megfile-2.0.4.post3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-megfile-2.0.4.post3.dist-info/entry_points.txt,sha256=O8y31sCLdgUkNujumqaC4GDjJDOq55SJQ_uc7s1FeYw,50
-megfile-2.0.4.post3.dist-info/top_level.txt,sha256=i3rMgdU1ZAJekAceojhA-bkm3749PzshtRmLTbeLUPQ,8
-megfile-2.0.4.post3.dist-info/RECORD,,
+megfile-2.0.5.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+megfile-2.0.5.dist-info/LICENSE.pyre,sha256=9lf5nT-5ZH25JijpYAequ0bl8E8z5JmZB1qrjiUMp84,1080
+megfile-2.0.5.dist-info/METADATA,sha256=eXUyzBLc4ihdouSq74YpP8co_MyR55xQL8WLAzmSZn8,10191
+megfile-2.0.5.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+megfile-2.0.5.dist-info/entry_points.txt,sha256=O8y31sCLdgUkNujumqaC4GDjJDOq55SJQ_uc7s1FeYw,50
+megfile-2.0.5.dist-info/top_level.txt,sha256=i3rMgdU1ZAJekAceojhA-bkm3749PzshtRmLTbeLUPQ,8
+megfile-2.0.5.dist-info/RECORD,,