;; Author: Tim Vaughan <tgvaughan@gmail.com>
;; Created: 11 April 2019
-;; Version: 1.0.0
+;; Version: 1.1.1
;; Keywords: comm gopher
;; Homepage: https://github.com/tgvaughan/elpher
;; Package-Requires: ((emacs "25"))
;; - (m)enu key support, similar to Emacs' info browser,
;; - clickable web and gopher links in plain text.
-;; The caching mechanism works by maintaining a hierarchy of visited
-;; pages rather than a linear history, meaning that it is quick and
-;; easy to navigate this history.
+;; Visited pages are stored as a hierarchy rather than a linear history,
+;; meaning that navigation between these pages is quick and easy.
;; To launch Elpher, simply use 'M-x elpher'. This will open a start
;; page containing information on key bindings and suggested starting
;;; Global constants
;;
-(defconst elpher-version "1.1.0"
+(defconst elpher-version "1.1.1"
"Current version of elpher.")
(defconst elpher-margin-width 6
(defun elpher-address-selector (address)
"Retrieve selector from ADDRESS."
- (car address))
+ (elt address 0))
(defun elpher-address-host (address)
"Retrieve host from ADDRESS."
- (cadr address))
+ (elt address 1))
(defun elpher-address-port (address)
"Retrieve port from ADDRESS."
- (caddr address))
+ (elt address 2))
;; Node
-(defvar elpher-seen-nodes (make-hash-table :test 'equal)
- "Table mapping addresses to existing (seen) node objects.")
-
(defun elpher-make-node (parent address getter &optional content pos)
"Create a node in the gopher page hierarchy.
page.
The optional arguments CONTENT and POS can be used to fill the cached
-content and cursor position fields of the node.
-
-If the hash table `elpher-seen-nodes' contains a key equal to ADDRESS,
-the node contained as its value will be returned instead."
- (let ((existing-node (gethash address elpher-seen-nodes)))
- (if existing-node
- existing-node
- (let ((new-node (list parent address getter content pos)))
- (puthash address new-node elpher-seen-nodes)
- new-node))))
+content and cursor position fields of the node."
+ (list parent address getter content pos))
(defun elpher-node-parent (node)
"Retrieve the parent node of NODE."
(if type-map-entry
(let ((getter (car type-map-entry))
(margin-code (cadr type-map-entry))
- (face (caddr type-map-entry)))
+ (face (elt type-map-entry 2)))
(elpher-insert-margin margin-code)
(insert-text-button display-string
'face face
(protocol (downcase (match-string 1))))
(if (string= protocol "gopher")
(let* ((host (match-string 2))
- (port 70)
+ (port (if (match-string 3)
+ (string-to-number (substring (match-string 3) 1))
+ 70))
(type-and-selector (match-string 4))
(type (if (> (length type-and-selector) 1)
(elt type-and-selector 1)
(push-button))
(defun elpher-go ()
- "Go to a particular gopher site."
+ "Go to a particular gopher site read from the minibuffer.
+The site may be specified via a URL or explicitly in terms of
+host, selector and port."
(interactive)
- (switch-to-buffer "*elpher*")
- (let* (
- (hostname (read-string "Gopher host: "))
- (selector (read-string "Selector (default none): " nil nil ""))
- (port (read-string "Port (default 70): " nil nil 70))
- (address (list selector hostname port)))
- (elpher-visit-node
- (elpher-make-node elpher-current-node
- address
- #'elpher-get-index-node))))
+ (let ((node
+ (let ((host-or-url (read-string "Gopher host or URL: ")))
+ (if (string-match elpher-url-regex host-or-url)
+ (if (not (string= (downcase (match-string 1 host-or-url)) "gopher"))
+ (error "Only gopher URLs acceptable")
+ (let* ((host (match-string 2 host-or-url))
+ (port (if (match-string 3 host-or-url)
+ (string-to-number (substring (match-string 3 host-or-url) 1))
+ 70))
+ (type-and-selector (match-string 4 host-or-url))
+ (type (if (> (length type-and-selector) 1)
+ (elt type-and-selector 1)
+ ?1))
+ (selector (if (> (length type-and-selector) 1)
+ (substring type-and-selector 2)
+ ""))
+ (address (elpher-make-address selector host port))
+ (getter (car (alist-get type elpher-type-map))))
+ (elpher-make-node elpher-current-node
+ address
+ getter)))
+ (let* ((selector (read-string "Selector (default none): " nil nil ""))
+ (port (read-string "Port (default 70): " nil nil 70))
+ (address (list selector host-or-url port)))
+ (elpher-make-node elpher-current-node
+ address
+ #'elpher-get-index-node))))))
+ (switch-to-buffer "*elpher*")
+ (elpher-visit-node node)))
(defun elpher-redraw ()
"Redraw current page."
(let* ((link-map (elpher-build-link-map)))
(if link-map
(let ((key (let ((completion-ignore-case t))
- (completing-read "Directory entry/link (tab to autocomplete): "
+ (completing-read "Directory item/link: "
link-map nil t))))
(if (and key (> (length key) 0))
(let ((b (cdr (assoc key link-map))))