archae 2026.2.0b1__py3-none-any.whl → 2026.2.1__py3-none-any.whl

archae/cli.py

@@ -9,7 +9,7 @@ from pathlib import Path
 
 import rich_click as click
 
-from archae.config import apply_options, convert_settings, get_options
+from archae.config import apply_options, get_options
 from archae.extractor import ArchiveExtractor
 from archae.util.tool_manager import ToolManager
 
@@ -72,7 +72,6 @@ def extract(
     # Apply any options from the command line, then convert any convertible settings
     if options:
         apply_options(options)
-    convert_settings()
 
     # Locate external tools
     ToolManager.locate_tools()

archae/config.py

@@ -97,11 +97,37 @@ def apply_options(option_list: list[tuple[str, str]]) -> None:
             pass
 
 
-def convert_settings() -> None:
-    """Convert settings using their defined converters."""
+def convert_settings(settings_dict: dict) -> dict:
+    """Convert settings using their defined converters.
+
+    Args:
+        settings_dict (dict): The settings dictionary to convert.
+
+    Returns:
+        dict: The converted settings dictionary.
+    """
     options = get_options()
     for key in options:
         option_def = options[key]
-        if "converter" in option_def:
+        if "converter" in option_def and key in settings_dict:
             converter = get_converter(option_def["converter"])
-            settings[key] = converter(settings[key])
+            settings_dict[key] = converter(settings_dict[key])
+    return settings_dict
+
+
+def get_settings() -> dict:
+    """Get the current settings after converting them.
+
+    Returns:
+        dict: The current settings as a dictionary.
+    """
+    return convert_settings(dict(settings))
+
+
+def get_default_settings() -> dict:
+    """Get the default settings after converting them.
+
+    Returns:
+        dict: The default settings as a dictionary.
+    """
+    return convert_settings(dict(default_settings))

archae/extractor.py

@@ -9,7 +9,7 @@ from typing import TYPE_CHECKING
 
 import magic
 
-from archae.config import apply_options, default_settings, settings
+from archae.config import apply_options, get_default_settings, get_settings
 from archae.util.file_tracker import FileTracker
 from archae.util.tool_manager import ToolManager
 
@@ -55,6 +55,8 @@ class ArchiveExtractor:
             shutil.rmtree(self.extract_dir)
         self.extract_dir.mkdir(exist_ok=True)
         self.file_tracker = FileTracker()
+        if ToolManager.get_tools() == {}:
+            ToolManager.locate_tools()
 
     def handle_file(self, file_path: Path) -> None:
         """Handle a file given its path.
@@ -88,7 +90,8 @@ class ArchiveExtractor:
         is_file_archive = self._is_archive(base_hash)
         self.file_tracker.add_metadata_to_hash(base_hash, "is_archive", is_file_archive)
         if is_file_archive:
-            if settings["MAX_DEPTH"] == 0 or depth < settings["MAX_DEPTH"]:
+            settings_dict = get_settings()
+            if settings_dict["MAX_DEPTH"] == 0 or depth < settings_dict["MAX_DEPTH"]:
                 archiver = self._get_archiver_for_file(base_hash)
                 if archiver:
                     extracted_size = archiver.get_archive_uncompressed_size(file_path)
@@ -99,39 +102,39 @@ class ArchiveExtractor:
                     self.file_tracker.add_metadata_to_hash(
                         base_hash, "overall_compression_ratio", compression_ratio
                     )
-                    if extracted_size > settings["MAX_ARCHIVE_SIZE_BYTES"]:
+                    if extracted_size > settings_dict["MAX_ARCHIVE_SIZE_BYTES"]:
                         logger.warning(
                             "MAX_ARCHIVE_SIZE_BYTES: Skipped archive %s because expected size %s is greater than MAX_ARCHIVE_SIZE_BYTES %s",
                             file_path,
                             extracted_size,
-                            settings["MAX_ARCHIVE_SIZE_BYTES"],
+                            settings_dict["MAX_ARCHIVE_SIZE_BYTES"],
                         )
                     elif (
                         self.file_tracker.get_tracked_file_size() + extracted_size
-                        > settings["MAX_TOTAL_SIZE_BYTES"]
+                        > settings_dict["MAX_TOTAL_SIZE_BYTES"]
                     ):
                         logger.warning(
                             "MAX_TOTAL_SIZE_BYTES: Skipped archive %s because expected size %s + current tracked files %s is greater than MAX_TOTAL_SIZE_BYTES %s",
                             file_path,
                             extracted_size,
                             self.file_tracker.get_tracked_file_size(),
-                            settings["MAX_TOTAL_SIZE_BYTES"],
+                            settings_dict["MAX_TOTAL_SIZE_BYTES"],
                         )
-                    elif compression_ratio < settings["MIN_ARCHIVE_RATIO"]:
+                    elif compression_ratio < settings_dict["MIN_ARCHIVE_RATIO"]:
                         logger.warning(
                             "MIN_ARCHIVE_RATIO: Skipped archive %s because compression ratio %.5f is less than MIN_ARCHIVE_RATIO %s",
                             file_path,
                             compression_ratio,
-                            settings["MIN_ARCHIVE_RATIO"],
+                            settings_dict["MIN_ARCHIVE_RATIO"],
                         )
                     elif (
                         shutil.disk_usage(self.extract_dir).free - extracted_size
-                        < settings["MIN_DISK_FREE_SPACE"]
+                        < settings_dict["MIN_DISK_FREE_SPACE"]
                     ):
                         logger.warning(
                             "MIN_DISK_FREE_SPACE:Skipped archive %s because extracting it would leave less than MIN_DISK_FREE_SPACE %s bytes free at extraction location %s",
                             file_path,
-                            settings["MIN_DISK_FREE_SPACE"],
+                            settings_dict["MIN_DISK_FREE_SPACE"],
                             self.extract_dir,
                         )
                     else:
@@ -235,7 +238,7 @@ class ArchiveExtractor:
         Returns:
             dict: Dictionary of default settings.
         """
-        return dict(default_settings)
+        return get_default_settings()
 
     def apply_settings(self, option_list: list[tuple[str, str]]) -> None:
         """Apply a list of settings options.

{archae-2026.2.0b1.dist-info → archae-2026.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: archae
-Version: 2026.2.0b1
+Version: 2026.2.1
 Summary: Archae explodes archives.
 Keywords: 
 Author: Shawn McNaughton
@@ -57,7 +57,7 @@ Description-Content-Type: text/markdown
 
 ![Archae Logo of a spider exploring a sarcophagus](./_static/archae_logo.png)
 
-[![PyPI](https://img.shields.io/pypi/v/archae)](https://img.shields.io/pypi/v/archae)
+[![PyPI](https://img.shields.io/pypi/v/archae)](https://pypi.org/project/archae/)
 [![Supported Python Versions](https://img.shields.io/pypi/pyversions/archae)](https://pypi.org/project/archae/)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/shawngmc/archae/main.svg)](https://results.pre-commit.ci/latest/github/shawngmc/archae/main)
 [![Test](https://github.com/shawngmc/archae/actions/workflows/test.yml/badge.svg)](https://github.com/shawngmc/archae/actions/workflows/test.yml)

{archae-2026.2.0b1.dist-info → archae-2026.2.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 archae/__init__.py,sha256=O_HNvpNVsJ5LZPNPLvuHhHdOq0b6M0LnWqycB505mkQ,111
 archae/__main__.py,sha256=l3eO5dEs1cR_hDziOpnW1PYzoRL2siYm81wgvftyigg,172
-archae/cli.py,sha256=ZYq7joe10y73dCwQY7666m-SY2dej_GVEmoYRyFpg7A,5739
-archae/config.py,sha256=zGOwkPDfNLR-06ziZMXeLBamd-98AbNU0aTuoH7ibKQ,2952
+archae/cli.py,sha256=NqNUsncmXNYrfyE97jqCzKQ0tvOJz4Bm0_hbSnKzOm0,5698
+archae/config.py,sha256=yO3VDRjL0t7rk_yuJ9mym1bqXxuYPvXrBp9cPk85JuU,3598
 archae/default_settings.toml,sha256=svBdN9QJm8UBBz6AEWpBp-gslSBcE5n00xZdl32KDEc,230
-archae/extractor.py,sha256=CfYtsxuoXQ2rOLQIByJvLI9Y61U338dZoeb7ZBWAc_g,9948
+archae/extractor.py,sha256=PFPwOxb_KWEHZR6uJ_a8ai0iZtaXheEDSukYQAUvRmo,10130
 archae/options.yaml,sha256=nJo7gOCuiS_fKd9C3iRwI3Eb_f4OT6mbdVkipqdISpk,937
 archae/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 archae/util/__init__.py,sha256=HlENK1XfnwnYMrlkvVJTjs-6W7RLLUJOoyFcOb7njUE,34
@@ -17,7 +17,7 @@ archae/util/enum/__init__.py,sha256=IvjtVopATKLAHDjOpblaExy2yXwIzweX0HoUrQWcpkM,
 archae/util/enum/byte_scale.py,sha256=5TZG1msPmJU9whZtKAywZtKOre6p2xMJ2y0gE4TG3OE,1593
 archae/util/file_tracker.py,sha256=HQb1l7j_Jy0qO6tqkB8jXM6P2o5fLB6Ih0J5U4JUyT8,3106
 archae/util/tool_manager.py,sha256=HU2xkmb_18XF5SFwFV5gUUcPddZVBYRdGB2PSWgWaqA,3974
-archae-2026.2.0b1.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
-archae-2026.2.0b1.dist-info/entry_points.txt,sha256=gGL_R78QELaTeyFGb-OuSnRuu4EUdT68EKmyrFno59o,48
-archae-2026.2.0b1.dist-info/METADATA,sha256=NiFftqzt93bRJoLbDw7jpWo5-Xt8JclNlSk8SezrroE,7976
-archae-2026.2.0b1.dist-info/RECORD,,
+archae-2026.2.1.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+archae-2026.2.1.dist-info/entry_points.txt,sha256=gGL_R78QELaTeyFGb-OuSnRuu4EUdT68EKmyrFno59o,48
+archae-2026.2.1.dist-info/METADATA,sha256=Jrv9YutS0F0yMCyKA2_WHsVhsle7nmOgtmEswaIAP50,7970
+archae-2026.2.1.dist-info/RECORD,,