python-backpack 2.0.3__py3-none-any.whl → 2.0.4__py3-none-any.whl

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'

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.dist-info → python_backpack-2.0.4.dist-info}/METADATA

@@ -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.dist-info → python_backpack-2.0.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
 backpack/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 backpack/cache.py,sha256=pAQGxIyQOMZ60Np7aOkS7QebWcJf8f4vyKts7GY5q20,3071
 backpack/custom_errors.py,sha256=tkn0AnV-Ihnge9X197nPeRpCFD6Feu9lLntejNTNpik,1358
-backpack/file_utils.py,sha256=kP0WC4QQVmMiea2QpzeVEn2bBO85pMC4RokM3PbEIIU,4543
+backpack/file_utils.py,sha256=S_4EhipFHRuq_D5KH9GMFonQpHYltSR6Zm4a4jnx1GA,4451
 backpack/folder_utils.py,sha256=F6kaaH5K-OSRZZSNdRQjzIaxVokirm2GsGVM48_C7no,3265
 backpack/json_metadata.py,sha256=ekhzxe8u0D7xz4tcKHCzgKNc14LtF0wo2FRTJp4eoCc,4638
 backpack/json_user_settings.py,sha256=bC9BNbFroIwBlV2sPcibaFcPvUzkGRxvGxG3i1OR78o,2644
@@ -10,8 +10,8 @@ backpack/logger.py,sha256=yoo4_4Ok9MAdd3GSTeeSGaIKJ4c-KwdhI6q7lg_39oo,518
 backpack/patterns.py,sha256=qBwgbpfzMrap4KHtLLsg1CJmsmstGGXfzYLpkuUdbMI,889
 backpack/strings.py,sha256=J6GAXRXeNgdA7gvNO5hYOYpIs2jHmYoG99z9O6Sczbo,3611
 backpack/test_utils.py,sha256=am9XWt8NTDQx5gl5tFq47tTDZ7cJjSnpB7f2s603X4s,1370
-backpack/version.py,sha256=PNBE3ogWLVZEP90MKMa6Wqb0YN6wQ03f1JERBqTBy9g,1410
-python_backpack-2.0.3.dist-info/METADATA,sha256=B_tjW5uTw0Y7SsrL9ct7EnHsMAgUqd1wJoyFb-k3uKo,6665
-python_backpack-2.0.3.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-python_backpack-2.0.3.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-python_backpack-2.0.3.dist-info/RECORD,,
+backpack/version.py,sha256=5W8rugrg7yvzss1RdSpTh7EZ6kuqwBn7dBHUYktOpMw,1305
+python_backpack-2.0.4.dist-info/METADATA,sha256=koB5TMh4ISFQxJ0lvRIMXEZrl6qMxMq04Zy9oBfs4PA,6665
+python_backpack-2.0.4.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+python_backpack-2.0.4.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+python_backpack-2.0.4.dist-info/RECORD,,

{python_backpack-2.0.3.dist-info → python_backpack-2.0.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.31.0
+Generator: hatchling 1.32.0
 Root-Is-Purelib: true
 Tag: py3-none-any