book prepper mostly working, toc fixed

Author: hjwp

_site/index.html

@@ -43,12 +43,12 @@ <h2>Simple patterns for building complex applications</h2>
   <h1>The Book</h1>
   <ul>
     <li>
-      Read for free from the sources using Github previews:
-      <a href="https://github.com/cosmicpython/book#table-of-contents">github.com/cosmicpython/book</a>
+      Read for free
+      <a href="book/preface.html">on this site</a> (license: CC-By-NC-ND).
     </li>
 
     <li>
-      Read in online on O'Reilly Learning (aka Safari) 
+      Read in online on O'Reilly Learning (aka Safari)
       <a href="https://learning.oreilly.com/library/view/architecture-patterns-with/9781492052197/">learning.oreilly.com</a>
     </li>
 

_site/rss.xml

@@ -7,7 +7,7 @@
             Simple patterns for building complex apps
         </description>
         <link>https://cosmicpython.com</link>
-        <lastBuildDate>Mon, 16 Mar 2020 10:44:20 -0000</lastBuildDate>
+        <lastBuildDate>Mon, 16 Mar 2020 13:15:11 -0000</lastBuildDate>
         <pubDate>Sat, 4 Jan 2020 19:15:54 -0500</pubDate>
         <atom:link href="https://cosmicpython.com/rss.xml" rel="self" type="application/rss+xml" />
 

pages/index.html

@@ -20,12 +20,12 @@ <h2>Simple patterns for building complex applications</h2>
   <h1>The Book</h1>
   <ul>
     <li>
-      Read for free from the sources using Github previews:
-      <a href="https://github.com/cosmicpython/book#table-of-contents">github.com/cosmicpython/book</a>
+      Read for free
+      <a href="book/preface.html">on this site</a> (license: CC-By-NC-ND).
     </li>
 
     <li>
-      Read in online on O'Reilly Learning (aka Safari) 
+      Read in online on O'Reilly Learning (aka Safari)
       <a href="https://learning.oreilly.com/library/view/architecture-patterns-with/9781492052197/">learning.oreilly.com</a>
     </li>
 

prep-book-html.py

@@ -41,6 +41,7 @@ def get_anchor_targets(parsed_html):
 class ChapterInfo:
     href_id: str
     chapter_title: str
+    old_title: str
     subheaders: list
     xrefs: list
 
@@ -63,12 +64,12 @@ def get_chapter_info():
             href_id = parsed_html.cssselect('body')[0].get('id')
         subheaders = [h.get('id') for h in parsed_html.cssselect('h3')]
 
-        chapter_title = header.text_content()
-        chapter_title = chapter_title.replace('Appendix A: ', '')
+        old_title = header.text_content()
+        chapter_title = old_title.replace('Appendix A: ', '')
 
         if chapter.startswith('chapter_'):
             chapter_no = chapter_numbers.pop(0)
-            chapter_title = f'Chapter {chapter_no}: {chapter_title}'
+            chapter_title = f'{chapter_no}: {chapter_title}'
 
         if chapter.startswith('appendix_'):
             appendix_no = appendix_numbers.pop(0)
@@ -82,7 +83,9 @@ def get_chapter_info():
             chapter_title = f'Epilogue: {chapter_title}'
 
         xrefs = get_anchor_targets(parsed_html)
-        chapter_info[chapter] = ChapterInfo(href_id, chapter_title, subheaders, xrefs)
+        chapter_info[chapter] = ChapterInfo(
+            href_id, chapter_title, old_title, subheaders, xrefs
+        )
 
     return chapter_info
 
@@ -117,7 +120,6 @@ def copy_chapters_across_with_fixes(chapter_info, fixed_toc):
     # comments_html = open('disqus_comments.html').read()
     # buy_book_div = html.fromstring(open('buy_the_book_banner.html').read())
     # analytics_div = html.fromstring(open('analytics.html').read())
-    # load_toc_script = open('load_toc.js').read()
 
     for chapter in CHAPTERS:
         old_contents = Path(f'book/{chapter}').read_text()
@@ -126,8 +128,6 @@ def copy_chapters_across_with_fixes(chapter_info, fixed_toc):
         parsed = html.fromstring(new_contents)
         body = parsed.cssselect('body')[0]
         if header := parsed.cssselect('#header'):
-            # head = parsed.cssselect('head')[0]
-            # head.append(html.fragment_fromstring('<script>' + load_toc_script + '</script>'))
             body.set('class', 'article toc2 toc-left')
             header[0].append(fixed_toc)
         # body.insert(0, buy_book_div)
@@ -150,19 +150,26 @@ def extract_toc_from_book():
 
 def fix_toc(toc, chapter_info):
     href_mappings = {}
+    title_mappings = {}
     for chapter in CHAPTERS:
-        chap = chapter_info[chapter]
-        if chap.href_id:
-            href_mappings['#' + chap.href_id] = f'/book/{chapter}'
-        for subheader in chap.subheaders:
+        chapinfo = chapter_info[chapter]
+        if chapinfo.href_id:
+            href_mappings['#' + chapinfo.href_id] = f'/book/{chapter}'
+        for subheader in chapinfo.subheaders:
             href_mappings['#' + subheader] = f'/book/{chapter}#{subheader}'
-
-    def fix_link(href):
-        if href in href_mappings:
-            return href_mappings[href]
-        return href
-
-    toc.rewrite_links(fix_link)
+        title_mappings[chapinfo.old_title] = chapinfo.chapter_title
+
+    for (el, attr, link, pos) in toc.iterlinks():
+        print(el.text, attr, link, pos)
+        el.set('href', href_mappings[link])
+        if 'Appendix' in el.text:
+            old_title = el.text.partition(':')[2].strip()
+            new_title = title_mappings.get(old_title, el.text)
+            print('old', old_title)
+            el.text = new_title
+        print(el.text)
+
+    # toc.rewrite_links(lambda href: href_mappings.get(href, href))
     toc.set('class', 'toc2')
     return toc
 
@@ -172,7 +179,6 @@ def main():
     chapter_info = get_chapter_info()
     fixed_toc = fix_toc(toc, chapter_info)
     copy_chapters_across_with_fixes(chapter_info, fixed_toc)
-    rsync_images()
 
 
 if __name__ == '__main__':