Added the lamest easiest and most straightforwart solution to our problem. Also finished tests.

This commit is contained in:
Maximilien Rigaut 2022-02-11 00:47:42 +01:00
parent d05192f68e
commit 12008831aa
4 changed files with 16 additions and 20 deletions

View File

@ -1,3 +1,3 @@
~~header
This is header text
header~~
header~~

View File

@ -1,2 +1,2 @@
This is whatever2.bpr
hello world
hello world

View File

@ -108,23 +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.write("\n")
if source_line_count != 0:
source_line_count += 1
temp_file.writelines(source_lines[source_line_count:])
temp_file.seek(0)
return temp_file

View File

@ -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,7 @@ 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