allanger/mkdocs-with-confluence
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Activity

more prints to verbose mode, add more exception handling

Browse Source
This commit is contained in:
Pawel Sikora 2021-05-05 06:56:58 +02:00
parent 2e8f641260
commit 8bd06ba37a
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mkdocs_with_confluence/plugin.py
View File

@ -107,27 +107,49 @@ class MkdocsWithConfluence(BasePlugin):
print("-", end="", flush=True) print("-", end="", flush=True)
print(f"] ({MkdocsWithConfluence._id} / {self.flen})", end="\r", flush=True) print(f"] ({MkdocsWithConfluence._id} / {self.flen})", end="\r", flush=True)
if self.config["debug"]: if self.config["verbose"]:
print(f"\nHandling Page '{page.title}' (And Parent Nav Pages if necessary):\n") print(f"\nHandling Page '{page.title}' (And Parent Nav Pages if necessary):\n")
if not all(self.config_scheme): if not all(self.config_scheme):
print("ERR: YOU HAVE EMPTY VALUES IN YOUR CONFIG. ABORTING") print("ERR: YOU HAVE EMPTY VALUES IN YOUR CONFIG. ABORTING")
return markdown return markdown
try:
try:
if self.config["verbose"]:
print("Get section first parent title...: ")
try:
parent = self.__get_section_title(page.ancestors[0].__repr__()) parent = self.__get_section_title(page.ancestors[0].__repr__())
except IndexError as e:
print(
f'ERR({e}): No second parent! Assuming self.config["parent_page_name"]'
f"{self.config['parent_page_name']}..."
)
parent = None
if self.config["verbose"]:
print(f"{parent}")
if not parent:
parent = self.config["parent_page_name"]
if self.config["parent_page_name"] is not None: if self.config["parent_page_name"] is not None:
main_parent = self.config["parent_page_name"] main_parent = self.config["parent_page_name"]
else: else:
main_parent = self.config["space"] main_parent = self.config["space"]
if self.config["verbose"]:
print("Get section second parent title...: ")
try:
parent1 = self.__get_section_title(page.ancestors[1].__repr__()) parent1 = self.__get_section_title(page.ancestors[1].__repr__())
except IndexError as e:
print(f"ERR({e}) No second parent! Assuming second parent is main parent: {main_parent}...")
parent1 = None
if self.config["verbose"]:
print(f"{parent}")
if not parent1: if not parent1:
parent1 = main_parent parent1 = main_parent
if self.config["debug"]: if self.config["verbose"]:
print(f"ONLY ONE PARENT FOUND. ASSUMING AS A FIRST NODE after main parent config {main_parent}") print(f"ONLY ONE PARENT FOUND. ASSUMING AS A FIRST NODE after main parent config {main_parent}")
if self.config["debug"]: if self.config["verbose"]:
print(f"PARENT0: {parent}, PARENT1: {parent1}, MAIN PARENT: {main_parent}") print(f"PARENT0: {parent}, PARENT1: {parent1}, MAIN PARENT: {main_parent}")
tf = tempfile.NamedTemporaryFile(delete=False) tf = tempfile.NamedTemporaryFile(delete=False)
@ -139,9 +161,9 @@ class MkdocsWithConfluence(BasePlugin):
if self.config["debug"]: if self.config["debug"]:
print(f"FOUND IMAGE: {match.group(1)}") print(f"FOUND IMAGE: {match.group(1)}")
files.append(match.group(1)) files.append(match.group(1))
except AttributeError: except AttributeError as e:
if self.config["debug"]: if self.config["debug"]:
print("WARN: No images found in markdown. Proceed..") print(f"WARN(({e}): No images found in markdown. Proceed..")
new_markdown = re.sub( new_markdown = re.sub(
r'<img src="file:///tmp/', '<p><ac:image ac:height="350"><ri:attachment ri:filename="', markdown r'<img src="file:///tmp/', '<p><ac:image ac:height="350"><ri:attachment ri:filename="', markdown
@ -239,7 +261,8 @@ class MkdocsWithConfluence(BasePlugin):
for f in files: for f in files:
self.add_attachment(page.title, f) self.add_attachment(page.title, f)
except IndexError: except IndexError as e:
print(f"ERR({e}): Exception error!")
return markdown return markdown
return markdown return markdown

2
setup.py
View File

@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup( setup(
name="mkdocs-with-confluence", name="mkdocs-with-confluence",
version="0.2.1", version="0.2.2",
description="MkDocs plugin for uploading markdown documentation to Confluence via Confluence REST API", description="MkDocs plugin for uploading markdown documentation to Confluence via Confluence REST API",
keywords="mkdocs markdown confluence documentation rest python", keywords="mkdocs markdown confluence documentation rest python",
url="https://github.com/pawelsikora/mkdocs-with-confluence/", url="https://github.com/pawelsikora/mkdocs-with-confluence/",