Skip to content

Remove magic_file config option #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 29, 2022
Merged

Remove magic_file config option #404

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions unblob/processing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ class ExtractionConfig:
keep_extracted_chunks: bool = False
extract_suffix: str = "_extract"
handlers: Handlers = BUILTIN_HANDLERS
magic_file: Optional[Path] = None

def get_extract_dir_for(self, path: Path) -> Path:
"""Extraction dir under root with the name of path."""
Expand Down Expand Up @@ -212,12 +211,8 @@ def __init__(self, config: ExtractionConfig):
# By enabling keep_going (which eventually enables MAGIC_CONTINUE) all matching patterns
# will be included in the magic string at the cost of being a bit slower, but increasing
# accuracy by no shadowing rules.
self._get_magic = magic.Magic(
keep_going=True, magic_file=config.magic_file
).from_file
self._get_mime_type = magic.Magic(
mime=True, magic_file=config.magic_file
).from_file
self._get_magic = magic.Magic(keep_going=True).from_file
self._get_mime_type = magic.Magic(mime=True).from_file

def process_task(self, task: Task) -> TaskResult:
result = TaskResult(task)
Expand Down