From 0cc4f3ed7fd08c56d52a09538e12327bfd38b3a3 Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Fri, 19 Aug 2022 10:59:53 +0100
Subject: [PATCH] WIP

---
 dab_mechanic/wikipedia.py | 22 +++++++++++++++-------
 templates/article.html    | 21 +++++++++++++++++++--
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/dab_mechanic/wikipedia.py b/dab_mechanic/wikipedia.py
index 9bcb0fa..8ee58d1 100644
--- a/dab_mechanic/wikipedia.py
+++ b/dab_mechanic/wikipedia.py
@@ -68,7 +68,7 @@ def needs_disambig(link: dict[str, Any]) -> bool:
     )
 
 
-def get_article_links(enwiki: str) -> list[str]:
+def get_article_links(enwiki: str) -> dict[str, str]:
     """Get links that appear in this article."""
 
     params: dict[str, str | int] = link_params(enwiki)
@@ -92,11 +92,13 @@ def get_article_links(enwiki: str) -> list[str]:
         params["gplcontinue"] = data["continue"]["gplcontinue"]
         sleep(0.1)
 
+    ret_links = {}
     for link in set(links):
-        if link in redirects:
-            links.update(redirects[link])
+        ret_links[link] = link
+        for r in redirects.get(link, []):
+            ret_links[r] = link
 
-    return list(links)
+    return ret_links
 
     # return {link["title"] for link in r.json()["query"]["pages"][0]["links"]}
 
@@ -175,13 +177,18 @@ class Article:
         """Disambiguation links that need fixing."""
         for a in self.root.findall(".//a[@href]"):
             title = a.get("title")
-            if title is None or title not in self.links:
+            if title is not None and title in self.links:
+                yield a, title, self.links[title]
+
+            href = a.get("href")
+            if not href.startswith("/wiki/"):
                 continue
-            yield a, title
+            a.set("href", "https://en.wikipedia.org" + href)
+            a.set("target", "_blank")
 
     def process_links(self) -> None:
         """Process links in parsed wikitext."""
-        for dab_num, (a, title) in enumerate(self.iter_links()):
+        for dab_num, (a, link_to, title) in enumerate(self.iter_links()):
             a.set("class", "disambig")
             a.set("id", f"dab-{dab_num}")
 
@@ -191,6 +198,7 @@ class Article:
             dab: DabItem = {
                 "num": dab_num,
                 "title": title,
+                "link_to": link_to,
                 "html": get_dab_html(dab_num, self.dab_html[title]),
             }
             self.dab_list.append(dab)
diff --git a/templates/article.html b/templates/article.html
index d894d60..3f8ec6a 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -63,6 +63,7 @@ a.new { color: red; }
     {% for dab in article.dab_list %}
     <div class="card p-1 m-2">
       <h3 class="card-title" id="dab-card-title-{{ dab.num }}" onclick="return jump_to({{ dab.num }})">{{ dab.title }}</h3>
+      {% if dab.title != dab.link_to %}<div>redirect from {{ dab.link_to }}</div>{% endif %}
     <div>
       <a href="#" onclick="return jump_to({{ dab.num }})">highlight link</a>
       <span class="d-none" id="cancel-{{ dab.num }}">
@@ -87,7 +88,25 @@ a.new { color: red; }
   var dab_lookup = {{ article.dab_lookup | tojson }};
   var dab_order = {{ article.dab_order | tojson }};
 
+  var dab_links = document.getElementsByClassName("disambig");
+  for(var i=0; i<dab_links.length; i++) {
+      dab_links[i].addEventListener("click", (event) => {
+          event.preventDefault();
+          var dab_num = event.target.id.substring(4);
+          open_dab(dab_num);
+      });
+  }
+
   function jump_to(dab_num) {
+    open_dab(dab_num);
+
+    var link = document.getElementById("dab-" + dab_num);
+    link.scrollIntoView();
+    link.classList.add("disambig-highlight")
+    return false;
+  }
+
+  function open_dab(dab_num) {
     var highlight_title = "text-bg-primary";
 
     var dab_articles = document.getElementsByClassName("dab-article");
@@ -112,9 +131,7 @@ a.new { color: red; }
     card_title.classList.add(highlight_title);
 
     var link = document.getElementById("dab-" + dab_num);
-    link.scrollIntoView();
     link.classList.add("disambig-highlight")
-    return false;
   }
 
   function clear_dab_highlight(dab_num) {