resolved merge
This commit is contained in:
commit
93c38775ff
|
|
@ -1,3 +1,3 @@
|
|||
~~header
|
||||
This is header text
|
||||
header~~
|
||||
header~~
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
This is whatever2.bpr
|
||||
hello world
|
||||
hello world
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ from io import StringIO
|
|||
from bootstraparse.modules import pathresolver as pr
|
||||
from bootstraparse.modules import environment
|
||||
import rich
|
||||
from rich.tree import Tree
|
||||
|
||||
# list of regexps
|
||||
_rgx_import_file = regex.compile(r'::( ?\< ?(?P<file_name>[\w\-._/]+) ?\>[ \s]*)+')
|
||||
|
|
@ -17,11 +18,11 @@ class PreParser:
|
|||
"""
|
||||
Takes a path and environment, executes all pre-parsing methods on the specified file.
|
||||
"""
|
||||
def __init__(self, path, __env, list_of_paths=None, dict_of_imports=None):
|
||||
def __init__(self, file_path, __env, list_of_paths=None, dict_of_imports=None):
|
||||
"""
|
||||
Initializes the PreParser object.
|
||||
Takes the following parameters:
|
||||
:param path: the path of the file to be parsed
|
||||
:param file_path: the path of the file to be parsed
|
||||
:param __env: the environment object
|
||||
:param list_of_paths: the list of files that have been imported in this branch of the import tree
|
||||
:param dict_of_imports: Dictionary of all imports made to avoid duplicate file opening / pre-parsing
|
||||
|
|
@ -32,15 +33,16 @@ class PreParser:
|
|||
dict_of_imports = {}
|
||||
|
||||
self.__env = __env
|
||||
self.path = path
|
||||
self.name = os.path.basename(path)
|
||||
self.base_path = os.path.dirname(path)
|
||||
self.relative_path_resolver = pr.PathResolver(path)
|
||||
self.path = file_path
|
||||
self.name = os.path.basename(file_path)
|
||||
self.base_path = os.path.dirname(file_path)
|
||||
self.relative_path_resolver = pr.PathResolver(file_path)
|
||||
self.list_of_paths = list_of_paths + [self.relative_path_resolver(self.name)]
|
||||
self.global_dict_of_imports = dict_of_imports
|
||||
self.local_dict_of_imports = {} # Dictionary of all local imports made to avoid duplicate file opening ?
|
||||
self.is_global_dict_of_imports_initialized = False
|
||||
self.saved_import_list = None
|
||||
self.tree_view = None
|
||||
|
||||
def readlines(self):
|
||||
"""
|
||||
|
|
@ -106,20 +108,16 @@ class PreParser:
|
|||
"""
|
||||
|
||||
self.make_import_list()
|
||||
|
||||
temp_file = StringIO()
|
||||
source_line_count = 0
|
||||
old_import_line = 0
|
||||
import_list = self.parse_import_list()
|
||||
source_lines = self.readlines()
|
||||
for import_path, import_line in import_list:
|
||||
if import_line != old_import_line:
|
||||
source_line_count += 1
|
||||
source_lines[import_line] = ""
|
||||
temp_file.writelines(source_lines[source_line_count:import_line])
|
||||
source_line_count = import_line
|
||||
import_file = self.global_dict_of_imports[import_path].export_with_imports()
|
||||
temp_file.writelines(import_file.readlines())
|
||||
old_import_line = import_line
|
||||
temp_file.writelines(source_lines[source_line_count:])
|
||||
temp_file.seek(0)
|
||||
return temp_file
|
||||
|
|
@ -181,12 +179,17 @@ class PreParser:
|
|||
"""
|
||||
return not self.__eq__(other)
|
||||
|
||||
def rich_tree(self):
|
||||
def rich_tree(self, prefix="", suffix="", force=True):
|
||||
"""
|
||||
Returns a rich representation of the PreParser object.
|
||||
:return: a rich representation of the PreParser object
|
||||
"""
|
||||
pass
|
||||
if self.tree_view and not force:
|
||||
return self.tree_view
|
||||
self.tree_view = Tree(prefix+self.name+suffix)
|
||||
for p, l in self.parse_import_list():
|
||||
self.tree_view.add(self.global_dict_of_imports[p].rich_tree(suffix=" (Line:{})".format(l), force=True))
|
||||
return self.tree_view
|
||||
|
||||
|
||||
# This part is only used for testing
|
||||
|
|
@ -197,5 +200,9 @@ if __name__ == "__main__": # pragma: no cover
|
|||
michel.parse_import_list()
|
||||
# michel.make_import_list()
|
||||
michel.export_with_imports()
|
||||
with open('../../../example_userfiles/output/show_me_what_you_got.txt', 'w+') as file:
|
||||
file.writelines(michel.export_with_imports().readlines())
|
||||
path = '../../../example_userfiles/output/show_me_what_you_got.txt'
|
||||
os.makedirs(os.path.dirname(path), exist_ok=True)
|
||||
with open(path, 'w+') as file:
|
||||
file.writelines(michel.export_with_imports().readlines())
|
||||
|
||||
rich.print(michel.rich_tree())
|
||||
|
|
|
|||
|
|
@ -32,8 +32,9 @@ Test content line 3
|
|||
::< pages/page2.bpr >
|
||||
Test content line 5
|
||||
::< pages/page1.bpr >
|
||||
Test content line 7"""
|
||||
content_page1 = """Test page1\nTest page1-2\nTest page1-3"""
|
||||
Test content line 7
|
||||
"""
|
||||
content_page1 = """Test page1\nTest page1-2\nTest page1-3\n"""
|
||||
content_page2 = """Test page2\n::< page1.bpr >"""
|
||||
content_page3 = """Test page3\n::< page3.bpr >"""
|
||||
content_index_import_list = [(temp_name("pages/page1.bpr"), 1),
|
||||
|
|
@ -54,9 +55,12 @@ Test page1-2
|
|||
Test page1-3
|
||||
Test content line 5
|
||||
Test page1
|
||||
Test content line 7"""
|
||||
final_content_page1 = """Test page1\nTest page1-2\nTest page1-3"""
|
||||
final_content_page2 = """Test page2\nTest page1"""
|
||||
Test page1-2
|
||||
Test page1-3
|
||||
Test content line 7
|
||||
"""
|
||||
final_content_page1 = """Test page1\nTest page1-2\nTest page1-3\n"""
|
||||
final_content_page2 = """Test page2\nTest page1\nTest page1-2\nTest page1-3\n"""
|
||||
|
||||
website_tree = {
|
||||
"index.bpr": content_index,
|
||||
|
|
@ -180,11 +184,10 @@ def test_make_import_list(filename, content, capsys):
|
|||
assert pp.global_dict_of_imports.keys() == set([f for f, _ in pp.saved_import_list])
|
||||
|
||||
|
||||
@pytest.mark.xfail(reason="Not implemented", raises=Exception)
|
||||
@pytest.mark.parametrize("filename, content", [
|
||||
("index.bpr", content_index),
|
||||
("pages/page1.bpr", content_page1),
|
||||
("pages/page2.bpr", content_page2),
|
||||
("index.bpr", final_content_index),
|
||||
("pages/page1.bpr", final_content_page1),
|
||||
("pages/page2.bpr", final_content_page2),
|
||||
])
|
||||
def test_preparser_content(filename, content):
|
||||
"""
|
||||
|
|
@ -195,7 +198,8 @@ def test_preparser_content(filename, content):
|
|||
pp = preparser.PreParser(testfile, env)
|
||||
pp.make_import_list()
|
||||
|
||||
assert pp.export_with_imports() == content # nothing is implementes yet
|
||||
assert pp.export_with_imports().read() == content # nothing is implementes yet
|
||||
# todo: test import in sub-folders
|
||||
|
||||
|
||||
# @pytest.mark.skip("Not implemented")
|
||||
|
|
@ -222,6 +226,10 @@ def test_rich_tree():
|
|||
Test the rich_tree function
|
||||
"""
|
||||
test_file = temp_name("test_rich_tree.bpr")
|
||||
make_new_file(test_file, "Test line 1\n::< test_rich_tree.bpr >\nTest line 3")
|
||||
test_file_2 = temp_name("test_rich_tree_2.bpr")
|
||||
make_new_file(test_file, "Test line 1\n::< test_rich_tree_2.bpr >\nTest line 3")
|
||||
make_new_file(test_file_2, "Test line 1\nTest line 3")
|
||||
pp = preparser.PreParser(test_file, env)
|
||||
pp.make_import_list()
|
||||
pp.rich_tree()
|
||||
pp.rich_tree(force=False)
|
||||
|
|
|
|||
Loading…
Reference in New Issue