Adding more defaults in wiki site info.

- add mandatory host, and base-url is by default computed from host
- add api-base-url for api base url, only applicable to mediawiki now
- compute display name from site id by default

1 files changed, 30 insertions, 34 deletions

diff --git a/wiki-utils.el b/wiki-utils.el
index 8408a4c..fd5a0bc 100644
--- a/wiki-utils.el
+++ b/wiki-utils.el
@@ -59,56 +59,52 @@ Assuming the current buffer to be a `url-retrieve' response buffer."
   (re-search-forward "\r?\n\r?\n"))
 
 ;; TODO: generalise fandom
-;; TODO: default engine to mediawiki
+;; mandatory fields: id and host
 (defvar wiki-sites
   '((local)
-    (archwiki :base-url "https://wiki.archlinux.org/title/"
+    (archwiki :host "https://wiki.archlinux.org"
+              :base-url "https://wiki.archlinux.org/title"
               :display-name "ArchWiki")
-    (debian-wiki :base-url "https://wiki.debian.org/"
-                 :engine moinmoin
-                 :display-name "Debian Wiki")
-    (emacswiki :base-url "https://www.emacswiki.org/emacs/"
+    (debian-wiki :host "https://wiki.debian.org"
+                 :engine moinmoin)
+    (emacswiki :host "https://www.emacswiki.org"
+               :base-url "https://www.emacswiki.org/emacs"
                :engine oddmuse
                :display-name "EmacsWiki")
-    (esp :base-url "https://wiki.endsoftwarepatents.org/wiki/"
+    (esp :host "https://wiki.endsoftwarepatents.org"
          :display-name "ESP Wiki")
-    (fandom-recipes :base-url "https://recipes.fandom.com/wiki/"
-                    :display-name "Fandom Recipes Wiki")
-    (fsd :base-url "https://directory.fsf.org/wiki/"
+    (fandom-recipes :host "https://recipes.fandom.com")
+    (fsd :host "https://directory.fsf.org"
          :display-name "Free Software Directory")
-    (haskell-wiki :base-url "https://wiki.haskell.org/"
-                  :display-name "Haskell Wiki")
-    (libreplanet :base-url "https://libreplanet.org/wiki/"
-                 :display-name "Libreplanet Wiki")
-    (oddmuse :base-url "https://oddmuse.org/wiki/"
+    (haskell-wiki :host "https://wiki.haskell.org")
+    (libreplanet :host "https://libreplanet.org")
+    (oddmuse :host "https://oddmuse.org"
              :engine oddmuse
              :display-name "Oddmuse")
-    (parabolawiki :base-url "https://wiki.parabola.nu/"
+    (parabolawiki :host "https://wiki.parabola.nu"
                   :display-name "ParabolaWiki")
-    (python-wiki :base-url "https://wiki.python.org/moin/"
-                 :engine moinmoin
-                 :display-name "Python Wiki")
-    (termux-wiki :base-url "https://wiki.termux.com/wiki/"
-                 :display-name "Termux Wiki")
-    (ubuntu-wiki :base-url "https://wiki.ubuntu.com/"
-                 :engine moinmoin
-                 :display-name "Ubuntu Wiki")
-    (ubuntu-community-help-wiki
-     :base-url "https://help.ubuntu.com/community/"
-     :engine moinmoin
-     :display-name "Ubuntu Community Help Wiki")
-    (wikihow :base-url "https://www.wikihow.com/"
+    (python-wiki :host "https://wiki.python.org"
+                 :base-url "https://wiki.python.org/moin"
+                 :engine moinmoin)
+    (termux-wiki :host "https://wiki.termux.com")
+    (ubuntu-wiki :host "https://wiki.ubuntu.com"
+                 :engine moinmoin)
+    (ubuntu-community-help-wiki :host "https://help.ubuntu.com/community"
+                                :engine moinmoin)
+    (wikihow :host "https://www.wikihow.com"
+             :api-base-url "https://www.wikihow.com"
              :display-name "wikiHow"
              :fetcher wiki-engine-mediawiki-api-fetch)
-    (wikiindex :base-url "https://wikiindex.org/"
+    (wikiindex :host "https://wikiindex.org"
+               :base-url "https://wikiindex.org"
                :display-name "WikiIndex")
-    (wikipedia-en :base-url "https://en.wikipedia.org/wiki/"
+    (wikipedia-en :host "https://en.wikipedia.org"
                   :display-name "Wikipedia EN")
-    (wikipedia-zh :base-url "https://zh.wikipedia.org/wiki/"
+    (wikipedia-zh :host "https://zh.wikipedia.org"
                   :display-name "Wikipedia ZH")
-    (wikivoyage-en :base-url "https://en.wikivoyage.org/wiki/"
+    (wikivoyage-en :host "https://en.wikivoyage.org"
                    :display-name "Wikivoyage EN")
-    (wiktionary-en :base-url "https://en.wiktionary.org/wiki/"
+    (wiktionary-en :host "https://en.wiktionary.org"
                    :display-name "Wiktionary EN")
     )
   "Alist of wiki sites.