diff --git a/publish_docs.cmd b/publish_docs.cmd index 6ab5ca4dbb..ad0da7cb96 100644 --- a/publish_docs.cmd +++ b/publish_docs.cmd @@ -4,4 +4,4 @@ set ENABLE_SEARCH=true python -m mkdocs build python tools/documentation/docs_modifier.py site set ENABLE_SEARCH= -gsutil -m rsync -j html,txt,xml,png,js,css,json,svg,gif -r site gs://docs-dqo-ai/docs/ +@REM gsutil -m rsync -j html,txt,xml,png,js,css,json,svg,gif -r site gs://docs-dqo-ai/docs/ diff --git a/tools/documentation/docs_modifier.py b/tools/documentation/docs_modifier.py index 7b0fd89c98..cd4df3ca42 100644 --- a/tools/documentation/docs_modifier.py +++ b/tools/documentation/docs_modifier.py @@ -1,7 +1,7 @@ from scripts.files_provider import get_all_files from scripts.docs_file_modifier import modify_file import sys - +import time def main(): @@ -21,6 +21,9 @@ def main(): print("Total modified files : " + str(number)) +start = time.time() main() +end = time.time() +print("time : " + end - start) # python docs_modifier.py C:\dev\dqoado\site \ No newline at end of file diff --git a/tools/documentation/scripts/content_modifiers/link_modifier.py b/tools/documentation/scripts/content_modifiers/link_modifier.py index 4b47b293b9..81c37647d2 100644 --- a/tools/documentation/scripts/content_modifiers/link_modifier.py +++ b/tools/documentation/scripts/content_modifiers/link_modifier.py @@ -6,7 +6,7 @@ tag_regex_string: str = "<(((a)|(link))[^<>]*href)|(((script)|(img))[^<>]*src)=[^<>]*>" link_tag_pattern: re.Pattern = re.compile(tag_regex_string) -attribute_regex_string: str = """((?:(?:href)|(?:src))=\"([^<>]*)\")""" +attribute_regex_string: str = """((?:(?:href)|(?:src))=\"(?:([.]{2}[^<>]*)|([^<>]*/))\")""" link_pattern: re.Pattern = re.compile(attribute_regex_string) def modify_link(line: str, file_path: str) -> str: @@ -26,6 +26,8 @@ def _apply_modification(line: str, file_path: str) -> str: file_path_fixed = file_path.replace("\\", "/") result = link_pattern.search(line) + if result is None: + return line groups = result.groups() for link in groups: diff --git a/tools/documentation/scripts/docs_file_modifier.py b/tools/documentation/scripts/docs_file_modifier.py index 7a6e5f8cb8..27771ba01e 100644 --- a/tools/documentation/scripts/docs_file_modifier.py +++ b/tools/documentation/scripts/docs_file_modifier.py @@ -1,6 +1,8 @@ from scripts.file_handler import provide_file_content, save_lines_to_file from scripts.content_modifiers.script_tag_modifier import modify_script_tag -from scripts.content_modifiers.link_modifier import modify_link +import scripts.content_modifiers.link_modifier as link_modifier +import scripts.content_modifiers.search_script_link_modifier as search_script_link_modifier + def modify_file(file_path: str): @@ -9,8 +11,9 @@ def modify_file(file_path: str): for line in lines: script_tag_modified_line = modify_script_tag(line) - link_modified_line = modify_link(script_tag_modified_line, file_path) + link_modified_line = link_modifier.modify_link(script_tag_modified_line, file_path) + search_links_modified_line = search_script_link_modifier.modify_link(link_modified_line) - modified_lines.append(link_modified_line) + modified_lines.append(search_links_modified_line) save_lines_to_file(file_path, modified_lines) diff --git a/tools/documentation/tests/link_modifier_test.py b/tools/documentation/tests/link_modifier_test.py index 5566a60b8c..2d48dec9ca 100644 --- a/tools/documentation/tests/link_modifier_test.py +++ b/tools/documentation/tests/link_modifier_test.py @@ -56,7 +56,7 @@ def test_modify_link__when_path_is_relative_and_end_wth_slash__then_expand_path_ def test_modify_link__when_two_in_one_line__then_modifies_both(self): file_path: str = """site/checks/index.html""" source: str = """