Skip to content

Commit

Permalink
chore: added setup and fixture for initializing the magic path
Browse files Browse the repository at this point in the history
  • Loading branch information
jstucke committed Oct 30, 2024
1 parent f192996 commit ad80d89
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
5 changes: 3 additions & 2 deletions fact_extractor/docker_extraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
'''
import argparse
from pathlib import Path
import sys
from pathlib import Path

from helperFunctions.config import get_config_dir
from helperFunctions.file_system import change_owner_of_output_files
from helperFunctions.program_setup import check_ulimits, load_config, setup_logging
from helperFunctions.program_setup import check_ulimits, init_magic, load_config, setup_logging
from unpacker.unpack import unpack


Expand All @@ -44,6 +44,7 @@ def main(args):
config = load_config(f'{get_config_dir()}/main.cfg')
setup_logging(debug=False)
check_ulimits()
init_magic()

input_dir = Path(config.get('unpack', 'data_folder'), 'input')
input_file = list(input_dir.iterdir())[0]
Expand Down
3 changes: 2 additions & 1 deletion fact_extractor/fact_extract.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@
import sys
from pathlib import Path

from helperFunctions.program_setup import setup_argparser, setup_logging, load_config
from helperFunctions.program_setup import init_magic, load_config, setup_argparser, setup_logging
from unpacker.unpack import unpack


def main():
arguments = setup_argparser('FACT extractor', 'Standalone extraction utility', sys.argv)
config = load_config(arguments.config_file)
setup_logging(arguments.debug, log_file=arguments.log_file, log_level=arguments.log_level)
init_magic()

# Make sure report folder exists some meta.json can be written
report_folder = Path(config.get('unpack', 'data_folder'), 'reports')
Expand Down
7 changes: 7 additions & 0 deletions fact_extractor/helperFunctions/program_setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import argparse
import configparser
import logging
import os
import resource
from pathlib import Path

from common_helper_files import create_dir_for_file

Expand Down Expand Up @@ -54,3 +56,8 @@ def load_config(config_file):
config = configparser.ConfigParser()
config.read(config_file)
return config


def init_magic():
firmware_magic_path = Path(__file__).parent.parent / 'bin' / 'firmware'
os.environ['MAGIC'] = f'{firmware_magic_path}:/usr/lib/file/magic.mgc'
3 changes: 2 additions & 1 deletion fact_extractor/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@

from helperFunctions.config import load_config
from helperFunctions.file_system import change_owner_of_output_files
from helperFunctions.program_setup import setup_logging
from helperFunctions.program_setup import init_magic, setup_logging
from unpacker.unpack import unpack

app = Flask(__name__)
api = Api(app)
config = load_config('main.cfg')
setup_logging(False, log_level=int(os.getenv('LOG_LEVEL', logging.WARNING))) # pylint: disable=invalid-envvar-default
init_magic()


@api.resource('/start/<folder>', methods=['GET'])
Expand Down

0 comments on commit ad80d89

Please sign in to comment.