Merge pull request #1 from idle-org/hotfix

Hotfix
This commit is contained in:
Vicky 2022-06-09 11:39:49 +02:00 committed by GitHub
commit 8641fa8d9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 44 additions and 39 deletions

View File

@ -73,7 +73,7 @@ class ConfigLoader:
self.loaded_conf[name] = yaml.safe_load(f)
else:
self.loaded_conf[name].update(yaml.safe_load(f))
error_mngr.log_message(f"Warning: {name} is already in {self.loaded_conf}", level='WARNING')
error_mngr.log_message(f"Warning: {name} is already in {self.loaded_conf}", level='INFO')
except BaseException as e:
error_mngr.log_message(f'Error parsing in file {basename} at {filepath}.', level='CRITICAL')
error_mngr.log_exception(str(e), level='CRITICAL')

View File

@ -83,33 +83,6 @@ def log_exception(exception, level="ERROR"):
return
def dict_check(dic, *args):
"""
Helper function to test existence within a dictionary.
:param dic: The dictionary of dictionaries to check
:param args: Any number of keys to check the dictionaries for
:return: A table of Booleans for every key checked.
"""
output = [False for _ in args]
for i in range(len(args)):
if args[i] in dic:
output[i] = True
dic = dic[args[i]]
else:
break
return output
def str_dict_check(dic, *args):
"""
Helper function to test existence within a dictionary and return a string of the values.
'arg[0]' : True or False
"""
out = dict_check(dic, *args)
return "\n".join([f"{args[i]}: {out[i]}" for i in range(len(out))])
class BootstraparseError(Exception):
pass

View File

@ -11,6 +11,7 @@ import rich
from io import StringIO
from bootstraparse.modules import config, pathresolver, error_mngr, context_mngr
from collections import namedtuple
from bootstraparse.modules import tools
from bootstraparse.modules import syntax # noqa F401
@ -101,7 +102,7 @@ class ExportManager:
start, end = self.templates["bootstrap"][export_request.type][export_request.subtype]
except KeyError:
log_entries = ["bootstrap", export_request.type, export_request.subtype]
log_ = error_mngr.dict_check(self.templates, *log_entries)
log_ = tools.dict_check(self.templates, *log_entries)
print()
error_mngr.log_exception(
KeyError(

View File

@ -42,6 +42,7 @@ def create_environment(origin, destination):
def create_crawler(origin, destination, _env):
"""
Returns crawler as an object for navigation in the user files.
rtype: sitecrawler.SiteCrawler
"""
return sitecrawler.SiteCrawler(origin, destination, _env)

View File

@ -12,6 +12,35 @@ import os
import re
###############################################################################
# Dictionary checks
########################################
def dict_check(dic, *args):
"""
Helper function to test existence within a dictionary.
:param dic: The dictionary of dictionaries to check
:param args: Any number of keys to check the dictionaries for
:return: A table of Booleans for every key checked.
"""
output = [False for _ in args]
for i in range(len(args)):
if args[i] in dic:
output[i] = True
dic = dic[args[i]]
else:
break
return output
def str_dict_check(dic, *args):
"""
Helper function to test existence within a dictionary and return a string of the values.
'arg[0]' : True or False
"""
out = dict_check(dic, *args)
return "\n".join([f"{args[i]}: {out[i]}" for i in range(len(out))])
###############################################################################
# Paths
########################################

View File

@ -4,6 +4,7 @@ from collections import namedtuple
from importlib import reload
from unittest import TestCase
import pytest
import bootstraparse.modules.tools as tools
import bootstraparse.modules.error_mngr as error_mngr
from bootstraparse.modules.error_mngr import ParsingError, MismatchedContainerError
@ -83,23 +84,23 @@ def test_dict_check():
"""
Test the dict_check function
"""
assert(error_mngr.dict_check({"test": "test"}, "test") == [True])
assert(error_mngr.dict_check({"test": "test"}, "test2") == [False])
assert(error_mngr.dict_check({"test": {"test3": "test5"}}, "test", "test3") == [True, True])
assert(error_mngr.dict_check({"test": {"test3": "test5"}}, "test4", "test4") == [False, False])
assert(error_mngr.dict_check({"test": {"test3": "test5"}}, "test", "test34") == [True, False])
assert(tools.dict_check({"test": "test"}, "test") == [True])
assert(tools.dict_check({"test": "test"}, "test2") == [False])
assert(tools.dict_check({"test": {"test3": "test5"}}, "test", "test3") == [True, True])
assert(tools.dict_check({"test": {"test3": "test5"}}, "test4", "test4") == [False, False])
assert(tools.dict_check({"test": {"test3": "test5"}}, "test", "test34") == [True, False])
# @pytest.mark.xfail(strict=True, reason="This test is not implemented yet")
def test_dict_check_2():
assert(error_mngr.dict_check({"test": "test"}, "test", "test2") == [True, False])
assert(error_mngr.dict_check({"test": "test"}, "test", "test2", "test3") == [True, False, False])
assert(tools.dict_check({"test": "test"}, "test", "test2") == [True, False])
assert(tools.dict_check({"test": "test"}, "test", "test2", "test3") == [True, False, False])
def test_dict_str():
assert error_mngr.str_dict_check({"test": "test"}, "test") == "test: True"
assert error_mngr.str_dict_check({"test": "test"}, "test2") == "test2: False"
assert error_mngr.str_dict_check({"test": {"test3": "test5"}}, "test", "test3") == "test: True\ntest3: True"
assert tools.str_dict_check({"test": "test"}, "test") == "test: True"
assert tools.str_dict_check({"test": "test"}, "test2") == "test2: False"
assert tools.str_dict_check({"test": {"test3": "test5"}}, "test", "test3") == "test: True\ntest3: True"
def test_weird_exception_cases():