python-fsutil 0.16.0__py3-none-any.whl → 0.17.0__py3-none-any.whl

fsutil/converters.py

@@ -11,7 +11,7 @@ def convert_size_bytes_to_string(size: int) -> str:
     units = SIZE_UNITS
     factor = 0
     factor_limit = len(units) - 1
-    while (size_num >= 1024) and (factor <= factor_limit):
+    while (size_num >= 1024) and (factor < factor_limit):
         size_num /= 1024
         factor += 1
     size_units = units[factor]

fsutil/info.py

@@ -2,7 +2,9 @@ from __future__ import annotations
 
 import hashlib
 import os
+import pathlib
 from datetime import datetime
+from typing import IO
 
 from fsutil.args import get_path as _get_path
 from fsutil.checks import assert_dir, assert_file
@@ -129,17 +131,29 @@ def get_file_creation_date_formatted(
     return date.strftime(format)
 
 
-def get_file_hash(path: PathIn, *, func: str = "md5") -> str:
+def get_file_hash(path: PathIn | IO[bytes], *, func: str = "md5") -> str:
     """
-    Get the hash of the file at the given path using
-    the specified algorithm function (md5 by default).
+    Get the hash of the file at the given path (or of the given
+    binary file-like object) using the specified algorithm
+    function (md5 by default).
     """
-    path = _get_path(path)
-    assert_file(path)
     hash = hashlib.new(func)
-    with open(path, "rb") as file:
-        for chunk in iter(lambda: file.read(4096), b""):
+    if isinstance(path, (str, pathlib.Path)):
+        path = _get_path(path)
+        assert_file(path)
+        with open(path, "rb") as file:
+            for chunk in iter(lambda: file.read(4096), b""):
+                hash.update(chunk)
+    else:
+        fileobj = path
+        position = None
+        if fileobj.seekable():
+            position = fileobj.tell()
+            fileobj.seek(0)
+        for chunk in iter(lambda: fileobj.read(4096), b""):
             hash.update(chunk)
+        if position is not None:
+            fileobj.seek(position)
     hash_hex = hash.hexdigest()
     return hash_hex
 

fsutil/metadata.py

@@ -4,4 +4,4 @@ __description__ = "high-level file-system operations for lazy devs."
 __email__ = "fabio.caccamo@gmail.com"
 __license__ = "MIT"
 __title__ = "python-fsutil"
-__version__ = "0.16.0"
+__version__ = "0.17.0"

fsutil/operations.py

@@ -213,7 +213,9 @@ def download_file(
             filename_pattern = r'filename="(.*)"'
             filename_match = re.search(filename_pattern, content_disposition)
             if filename_match:
-                filename = filename_match.group(1)
+                # sanitize Content-Disposition filename to prevent path traversal
+                filename = filename_match.group(1).replace("\\", "/")
+                filename = os.path.basename(filename)
             # or detect filename from url
             if not filename:
                 filename = get_filename(url)
@@ -518,7 +520,9 @@ def _search_paths(path: PathIn, pattern: str) -> list[str]:
     pathname = os.path.join(path, pattern)
     paths = glob.glob(pathname, recursive=True)
     # normalize paths to use OS-specific separators
-    paths = [os.path.normpath(path_result) for path_result in paths]
+    paths = [
+        os.path.relpath(os.path.normpath(path_result), path) for path_result in paths
+    ]
     return paths
 
 

{python_fsutil-0.16.0.dist-info → python_fsutil-0.17.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fsutil
-Version: 0.16.0
+Version: 0.17.0
 Summary: high-level file-system operations for lazy devs.
 Author-email: Fabio Caccamo <fabio.caccamo@gmail.com>
 Maintainer-email: Fabio Caccamo <fabio.caccamo@gmail.com>
@@ -69,6 +69,7 @@ Dynamic: license-file
 [![](https://img.shields.io/codacy/grade/fc40788ae7d74d1fb34a38934113c4e5?logo=codacy)](https://www.codacy.com/app/fabiocaccamo/python-fsutil)
 [![](https://img.shields.io/badge/code%20style-black-000000.svg?logo=python&logoColor=black)](https://github.com/psf/black)
 [![](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/fabiocaccamo/python-fsutil/badge)](https://securityscorecards.dev/viewer/?uri=github.com/fabiocaccamo/python-fsutil)
 
 # python-fsutil
 high-level file-system operations for lazy devs.

{python_fsutil-0.16.0.dist-info → python_fsutil-0.17.0.dist-info}/RECORD

@@ -2,18 +2,18 @@ fsutil/__init__.py,sha256=FsRKd11udg0Y-ZS_r1WDpmd77B1VJ31ykbEBn_Kt_kQ,4223
 fsutil/archives.py,sha256=bvFXaaXy5QBBwwBf2313XbCZ3XlSlCoHoVAFWD9WQ74,5027
 fsutil/args.py,sha256=sNf6LlEM8m1XchfklaqidABct5A-V6DCIxLBiaIUCBU,246
 fsutil/checks.py,sha256=LZHz3GsihLlat8Lz-CqQngXDEZfAidmxf8veu_de96I,2807
-fsutil/converters.py,sha256=7YoaIg-_XuYzXo0IhjEAZUWasaIbPA67aAL5z_T3IRg,1013
+fsutil/converters.py,sha256=7VjabLMSwznM9mOhUnSJUVY-qH5EOExCIvofZ8_SLPk,1012
 fsutil/deps.py,sha256=-7eswE7fgHCmILC6GSLbipbuXp_aB3UfmkNRRGaHfgA,336
-fsutil/info.py,sha256=yVoWPtAc_WOj0WVpRIGkq0TTj8xB6W4l-mVUKaB7Bu8,5333
+fsutil/info.py,sha256=nQRquIbuSCbM9cO-zQALMHGtYhAXihm8MyPtp3qQfR4,5807
 fsutil/io.py,sha256=1AYC83lhwgNUFiT0BB-I0sDvncXAPopOtlYxzL0lEE4,6327
-fsutil/metadata.py,sha256=gZcEc5XoiEDgf0nxjvOrL1ZP1-9_4rLYdezlOdDGAnk,266
-fsutil/operations.py,sha256=J9LuM5GfkAM13lyPs-S6Ez79vWn6SgQSX5feEYX4MHE,15355
+fsutil/metadata.py,sha256=_tHK4wb02c2ISdGHCGtR-P5ka6pbuw-V9DiBlAqH-cw,266
+fsutil/operations.py,sha256=eyT8qhRok9KQ_hVkMm4symkzMMSiG7_XWt5p_8zCzM8,15547
 fsutil/paths.py,sha256=oxeJQgDJlU7a3xu9tThAhQw4LjxHQDjfmYkAcH6B784,5816
 fsutil/perms.py,sha256=Yw0R3w-Bx94bek2sY8FlJ0KI6LGFPpxEpQ3n2ULOmos,669
 fsutil/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fsutil/types.py,sha256=scqjRct7dMNTmk_UgL1PMxRQktlnEMlSgvOy0MfqREg,111
-python_fsutil-0.16.0.dist-info/licenses/LICENSE.txt,sha256=IcPfOD_lonKcLMnPRhiWdQUPW_LYW-5TTDljwi3UXQg,1078
-python_fsutil-0.16.0.dist-info/METADATA,sha256=3ST0WCkGwoSBbj22dyvbKzXmhP9b-ysGaICvsyI2zR4,24763
-python_fsutil-0.16.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python_fsutil-0.16.0.dist-info/top_level.txt,sha256=KGTSjNLPWmxnZt8BFMZQrpnhkO7DsKrYWoXK-Sf3wBQ,7
-python_fsutil-0.16.0.dist-info/RECORD,,
+python_fsutil-0.17.0.dist-info/licenses/LICENSE.txt,sha256=IcPfOD_lonKcLMnPRhiWdQUPW_LYW-5TTDljwi3UXQg,1078
+python_fsutil-0.17.0.dist-info/METADATA,sha256=c0P6g3VQ8S-GGe8GvB-hrxI4-a5-VVn0xMmCtxCB8nE,24957
+python_fsutil-0.17.0.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+python_fsutil-0.17.0.dist-info/top_level.txt,sha256=KGTSjNLPWmxnZt8BFMZQrpnhkO7DsKrYWoXK-Sf3wBQ,7
+python_fsutil-0.17.0.dist-info/RECORD,,

{python_fsutil-0.16.0.dist-info → python_fsutil-0.17.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (83.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any