python-backpack 2.0.3__tar.gz → 2.0.4__tar.gz

{python_backpack-2.0.3 → python_backpack-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: python-backpack
-Version: 2.0.3
+Version: 2.0.4
 Summary: Lightweight utilities for JSON, filesystem operations, strings, caching, and scripting.
 Project-URL: Homepage, https://github.com/MaxRocamora/python-backpack
 Project-URL: Repository, https://github.com/MaxRocamora/python-backpack.git

{python_backpack-2.0.3 → python_backpack-2.0.4}/backpack/file_utils.py

@@ -4,6 +4,7 @@
 # https://github.com/MaxRocamora/python-backpack
 # ----------------------------------------------------------------------------------------
 
+import re
 from collections.abc import Sequence
 
 from backpack.logger import get_logger
@@ -94,11 +95,12 @@ def file_is_writeable(filepath: str) -> bool:
     return False
 
 
-def get_version_from_filename(filename: str) -> str:
+def get_version_from_filename(filename: str, separator: str | None = None) -> str:
     """Extracts version from filename.
 
     Args:
         filename: (str) file name to extract version from
+        separator: delimiter that must precede the version; when omitted, use supported delimiters
     Returns:
         str : version extracted from filename
 
@@ -107,29 +109,32 @@ def get_version_from_filename(filename: str) -> str:
         get_version_from_filename('myfile-9.txt') -> '9'
         get_version_from_filename('myfile.130.txt') -> '130'
         get_version_from_filename('myfile_v1002.txt') -> '1002'
+        get_version_from_filename('XD_shot_0000.0003.ma') -> '0003'
+        get_version_from_filename('ANM_shot_0010.0003.ma') -> '0003'
 
     """
 
     filename_no_ext = filename.rsplit('.', 1)[0]
 
-    # guess is the separator is an underscore, dash, dot or v, and the version is the last part before the extension
-    separators = ['_', '-', '.', 'v']
-    if not any(sep in filename_no_ext for sep in separators):
-        log.info(f'No separator found in filename: {filename_no_ext}. Using fallback extraction.')
-    else:
-        for sep in separators:
-            if sep in filename_no_ext:
-                parts = filename_no_ext.split(sep)
-                version_part = parts[-1].split('.')[0]  # Get the last part before the extension
-                if version_part.replace('.', '').isdigit():  # Check if it's a valid version number
-                    log.info(
-                        f'Extracted version: {version_part} from filename: {filename} using separator: {sep}'
-                    )
-                    return version_part
-
-    # Fallback: extract from the entire filename
-    version = filename_no_ext.lstrip('v')
-    version = version.replace('_', '.').replace('-', '.')
-    version = version if version.replace('.', '').isdigit() else '0'
-    log.info(f'Extracted version: {version} from filename: {filename}')
-    return version
+    if separator is not None:
+        if not separator:
+            raise ValueError('separator must not be empty')
+
+        version = filename_no_ext.rsplit(separator, 1)[-1]
+        if version.isdigit():
+            log.info(
+                f'Extracted version: {version} from filename: {filename} using separator: {separator}'
+            )
+            return version
+
+        log.info(f'No numeric version found in filename: {filename} using separator: {separator}')
+        return '0'
+
+    match = re.search(r'(?:^|[_.-])v?(\d+)$', filename_no_ext)
+    if match:
+        version = match.group(1)
+        log.info(f'Extracted version: {version} from filename: {filename}')
+        return version
+
+    log.info(f'No numeric version found in filename: {filename}')
+    return '0'

{python_backpack-2.0.3 → python_backpack-2.0.4}/backpack/version.py

@@ -11,10 +11,11 @@
 # 1.1.4 07/2025 - Moved from pipenv to poetry for dependency management.toml
 # 2.0.1 05/2026 - Remove tox workflow and setup.py, standardize uv + coverage tooling
 # 2.0.2 05/2026 - Add PyPI long description metadata and release polish
-# 2.0.3 06/2026 - Add type hints to backpack.cache, backpack.folder_utils, backpack.json_user_settings, backpack.json_utils, and backpack.logger, refactor backpack.cache to use functools.lru_cache, and add tests for backpack.cache and backpack.folder_utils.
+# 2.0.3 06/2026 - Add type hints, refactor backpack.cache to use functools.lru_cache, added tests.
+# 2.0.4 08/2026 - Fixed get_version_from_filename().
 # ----------------------------------------------------------------------------------------
 
-__version__ = '2.0.3'
+__version__ = '2.0.4'
 
 VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH = map(int, __version__.split('.'))
 

{python_backpack-2.0.3 → python_backpack-2.0.4}/tests/test_file_utils.py

@@ -79,8 +79,31 @@ def test_file_is_writeable(tmp_path):
         ('myfile.txt', '0'),
         ('mod_asset.1004.ma', '1004'),
         ('script_nuke_s100_v1005.ma', '1005'),
+        ('XD_shot_0000.0003.ma', '0003'),
+        ('ANM_shot_0010.0003.ma', '0003'),
     ],
 )
 def test_get_version_from_filename(filename: str, expected_version: str):
     """Version extraction should handle supported separators and invalid values."""
     assert get_version_from_filename(filename) == expected_version
+
+
+@pytest.mark.parametrize(
+    ('filename', 'separator', 'expected_version'),
+    [
+        ('XD_shot_0000.0003.ma', '.', '0003'),
+        ('XD_shot_0000.0003.ma', '_', '0'),
+        ('myfile_v1002.txt', 'v', '1002'),
+    ],
+)
+def test_get_version_from_filename_with_separator(
+    filename: str, separator: str, expected_version: str
+):
+    """An explicit separator constrains version extraction to its final token."""
+    assert get_version_from_filename(filename, separator) == expected_version
+
+
+def test_get_version_from_filename_rejects_empty_separator():
+    """An empty separator is not a meaningful version delimiter."""
+    with pytest.raises(ValueError, match='separator must not be empty'):
+        get_version_from_filename('myfile_23.txt', '')

{python_backpack-2.0.3 → python_backpack-2.0.4}/tests/test_json_user_settings.py

@@ -65,3 +65,11 @@ def test_user_settings_creates_missing_directory(settings_home):
 
     assert target_dir.exists() is True
     assert Path(js.filepath).parent == target_dir
+
+
+def test_os_user_folder_returns_home_directory(monkeypatch):
+    """The unpatched property should resolve the current user's home directory."""
+    monkeypatch.undo()
+    settings = object.__new__(JsonUserSettings)
+
+    assert settings.os_user_folder == str(Path.home())