mirror of
https://github.com/HackTricks-wiki/hacktricks-cloud.git
synced 2025-12-12 15:50:19 -08:00
Sync hacktricks-preprocessor.py with master (mdbook 0.5.x fix)
This commit is contained in:
@@ -53,11 +53,17 @@ def ref(matchobj):
|
|||||||
if href.endswith("/"):
|
if href.endswith("/"):
|
||||||
href = href+"README.md" # Fix if ref points to a folder
|
href = href+"README.md" # Fix if ref points to a folder
|
||||||
if "#" in href:
|
if "#" in href:
|
||||||
chapter, _path = findtitle(href.split("#")[0], book, "source_path")
|
result = findtitle(href.split("#")[0], book, "source_path")
|
||||||
|
if result is None or result[0] is None:
|
||||||
|
raise Exception(f"Chapter not found")
|
||||||
|
chapter, _path = result
|
||||||
title = " ".join(href.split("#")[1].split("-")).title()
|
title = " ".join(href.split("#")[1].split("-")).title()
|
||||||
logger.debug(f'Ref has # using title: {title}')
|
logger.debug(f'Ref has # using title: {title}')
|
||||||
else:
|
else:
|
||||||
chapter, _path = findtitle(href, book, "source_path")
|
result = findtitle(href, book, "source_path")
|
||||||
|
if result is None or result[0] is None:
|
||||||
|
raise Exception(f"Chapter not found")
|
||||||
|
chapter, _path = result
|
||||||
logger.debug(f'Recursive title search result: {chapter["name"]}')
|
logger.debug(f'Recursive title search result: {chapter["name"]}')
|
||||||
title = chapter['name']
|
title = chapter['name']
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -65,11 +71,17 @@ def ref(matchobj):
|
|||||||
dir = path.dirname(current_chapter['source_path'])
|
dir = path.dirname(current_chapter['source_path'])
|
||||||
logger.debug(f'Error getting chapter title: {href} trying with relative path {path.normpath(path.join(dir,href))}')
|
logger.debug(f'Error getting chapter title: {href} trying with relative path {path.normpath(path.join(dir,href))}')
|
||||||
if "#" in href:
|
if "#" in href:
|
||||||
chapter, _path = findtitle(path.normpath(path.join(dir,href.split('#')[0])), book, "source_path")
|
result = findtitle(path.normpath(path.join(dir,href.split('#')[0])), book, "source_path")
|
||||||
|
if result is None or result[0] is None:
|
||||||
|
raise Exception(f"Chapter not found")
|
||||||
|
chapter, _path = result
|
||||||
title = " ".join(href.split("#")[1].split("-")).title()
|
title = " ".join(href.split("#")[1].split("-")).title()
|
||||||
logger.debug(f'Ref has # using title: {title}')
|
logger.debug(f'Ref has # using title: {title}')
|
||||||
else:
|
else:
|
||||||
chapter, _path = findtitle(path.normpath(path.join(dir,href.split('#')[0])), book, "source_path")
|
result = findtitle(path.normpath(path.join(dir,href.split('#')[0])), book, "source_path")
|
||||||
|
if result is None or result[0] is None:
|
||||||
|
raise Exception(f"Chapter not found")
|
||||||
|
chapter, _path = result
|
||||||
title = chapter["name"]
|
title = chapter["name"]
|
||||||
logger.debug(f'Recursive title search result: {chapter["name"]}')
|
logger.debug(f'Recursive title search result: {chapter["name"]}')
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -147,8 +159,14 @@ if __name__ == '__main__':
|
|||||||
context, book = json.load(sys.stdin)
|
context, book = json.load(sys.stdin)
|
||||||
|
|
||||||
logger.debug(f"Context: {context}")
|
logger.debug(f"Context: {context}")
|
||||||
|
logger.debug(f"Book keys: {book.keys()}")
|
||||||
|
|
||||||
for chapter in iterate_chapters(book['sections']):
|
# Handle both old (sections) and new (items) mdbook API
|
||||||
|
book_items = book.get('sections') or book.get('items', [])
|
||||||
|
|
||||||
|
for chapter in iterate_chapters(book_items):
|
||||||
|
if chapter is None:
|
||||||
|
continue
|
||||||
logger.debug(f"Chapter: {chapter['path']}")
|
logger.debug(f"Chapter: {chapter['path']}")
|
||||||
current_chapter = chapter
|
current_chapter = chapter
|
||||||
# regex = r'{{[\s]*#ref[\s]*}}(?:\n)?([^\\\n]*)(?:\n)?{{[\s]*#endref[\s]*}}'
|
# regex = r'{{[\s]*#ref[\s]*}}(?:\n)?([^\\\n]*)(?:\n)?{{[\s]*#endref[\s]*}}'
|
||||||
|
|||||||
Reference in New Issue
Block a user