refactor a bit to handle links between pages better

notion_docs_sync/__init__.py

@@ -2,6 +2,7 @@
 import os
 from random import choice
 from argparse import ArgumentParser
+from urllib.parse import urlparse
 
 from notion.client import NotionClient
 from notion.block import Block, PageBlock, CollectionViewBlock
@@ -194,35 +195,50 @@ def sync_markdown_blocks_to_block(markdown_blocks, block):
             c.remove()
 
 
-def sync_file_to_block(filename, block):
+def sync_file_to_block(filename, block, links : dict={}):
     logger.info(f"Syncing {filename} to block {block.id}")
 
     with open(filename) as markdown_fd:
         contents = markdown_fd.read()
 
     post = frontmatter.loads(contents)
 
-    markdown_blocks = convert(str(post))
+    def resolve_link(target):
+        try:
+            parsed = urlparse(target)
 
-    sync_markdown_blocks_to_block(markdown_blocks, block)
+            if parsed.scheme:
+                return target
+        except:
+            pass
 
+        target_path = os.path.realpath(os.path.join(os.path.dirname(filename), target))
 
-def sync_directory_to_block(directory, root_block):
-    if not root_block.get(['format', 'block_locked'], default=False):
-        root_block.set(['format', 'block_locked'], True)
+        block = links.get(target_path)
+
+        if not block:
+            return target
+
+        return block.get_browseable_url()
+
+    markdown_blocks = convert(str(post), link_resolver=resolve_link)
 
+    sync_markdown_blocks_to_block(markdown_blocks, block)
+
+
+def create_page_structure(directory, root_block):
     touched_pages = set()
 
-    index_path = os.path.join(directory, "index.md")
-    readme_path = os.path.join(directory, "README.md")
+    files_to_pages = dict()
+
+    index_path = os.path.realpath(os.path.join(directory, "index.md"))
+    readme_path = os.path.realpath(os.path.join(directory, "README.md"))
 
     # Do the index/readme first to ensure the correct sort order.
     if os.path.isfile(index_path):
-        touched_pages.add(root_block.id)
-        sync_file_to_block(index_path, root_block)
+        files_to_pages[index_path] = root_block
     elif os.path.isfile(readme_path):
-        touched_pages.add(root_block.id)
-        sync_file_to_block(readme_path, root_block)
+        files_to_pages[readme_path] = root_block
 
     for path in os.listdir(directory):
         if path.startswith('.'):
@@ -238,29 +254,48 @@ def sync_directory_to_block(directory, root_block):
         if not block:
             continue
 
-        if not block.get(['format', 'block_locked'], default=False):
-            block.set(['format', 'block_locked'], True)
+        full_path = os.path.realpath(os.path.join(directory, path))
 
         touched_pages.add(block.id)
 
-        full_path = os.path.join(directory, path)
+        if os.path.isdir(full_path):
+            files_to_pages.update(create_page_structure(full_path, block))
+        else:
+            files_to_pages[full_path] = block
+
+    return files_to_pages
+
+
+def sync_directory_to_block(directory, root_block):
+    # Do Two Passes: First, create blocks for all files that need them
+    # Keep track of absolute file path -> block
+    logger.info("Creating page structure..")
+    files_to_pages = create_page_structure(os.path.realpath(directory), root_block)
+
+    touched_pages = set(block.id for block in files_to_pages.values())
+
+    # Then, for iterate through every single page block created and:
+    for full_path, block in files_to_pages.items():
+        #   Lock it
+        if not block.get(['format', 'block_locked'], default=False):
+            block.set(['format', 'block_locked'], True)
 
         if block.icon is None:
             block.icon = random_emoji()
 
-        if os.path.isdir(full_path):
-            sync_directory_to_block(full_path, block)
-        else:
-            sync_file_to_block(full_path, block)
+        #   Sync it.
+        sync_file_to_block(full_path, block, links=files_to_pages)
+
+        #   Sort it.
+        move_pages_to_end(block)
 
-    # Any children that are pages under root_block but aren't in touched_pages should be pruned
-    # And the pages linked within them should be moved to the tail.
-    move_pages_to_end(root_block)
-    for child in root_block.children:
-        move_pages_to_end(child)
-        if child.type == 'page' and child.id not in touched_pages:
-            child.remove()
+        #   Clean it.
+        for child in block.children:
+            # Any children that are pages under block but aren't in touched_pages should be pruned
+            if child.type == 'page' and child.id not in touched_pages:
+                child.remove()
 
+    #   Technologic.
 
 def main():
     import sys

notion_docs_sync/markdown.py

@@ -4,7 +4,7 @@
 from notion.block import CodeBlock, DividerBlock, HeaderBlock, SubheaderBlock, \
     SubsubheaderBlock, QuoteBlock, TextBlock, NumberedListBlock, \
     BulletedListBlock, ImageBlock, CollectionViewBlock
-import mistletoe
+from mistletoe.block_token import Document
 from mistletoe.base_renderer import BaseRenderer
 
 
@@ -176,6 +176,10 @@ def as_inline_style_block(tokens, style, *style_args):
 
 
 class NotionRenderer(BaseRenderer):
+    def __init__(self, link_resolver=(lambda path: path), *extras):
+        super().__init__(*extras)
+        self.__link_resolver = link_resolver
+
     def __render_multiple(self, tokens):
         return flatten([self.render(t) for t in tokens])
 
@@ -284,7 +288,11 @@ def render_strikethrough(self, token):
         return as_inline_style_block(self.__render_multiple(token.children), NOTION_STYLE_STRIKETHROUGH)
 
     def render_link(self, token):
-        return as_inline_style_block(self.__render_multiple(token.children), NOTION_STYLE_ANCHOR, token.target)
+        return as_inline_style_block(
+            self.__render_multiple(token.children),
+            NOTION_STYLE_ANCHOR,
+            self.__link_resolver(token.target)
+        )
 
     def render_escape_sequence(self, token):
         return self.__render_multiple(token.children)
@@ -306,5 +314,6 @@ def render_image(self, token):
         }
 
 
-def convert(markdown):
-    return mistletoe.markdown(markdown, renderer=NotionRenderer)
+def convert(markdown, link_resolver=(lambda path: path)):
+    with NotionRenderer(link_resolver=link_resolver) as renderer:
+        return renderer.render(Document(markdown))