Fixed bug in non-gopher URL construction.

[elpher.git] / elpher.el

diff --git a/elpher.el b/elpher.el
index 56ab5e8..d1d795c 100644 (file)
--- a/elpher.el
+++ b/elpher.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tim Vaughan <tgvaughan@gmail.com>
 ;; Created: 11 April 2019
-;; Version: 1.2.0
+;; Version: 1.2.4
 ;; Keywords: comm gopher
 ;; Homepage: https://github.com/tgvaughan/elpher
 ;; Package-Requires: ((emacs "25"))
@@ -57,7 +57,7 @@
 ;;; Global constants
 ;;
 
-(defconst elpher-version "1.2.0"
+(defconst elpher-version "1.2.4"
   "Current version of elpher.")
 
 (defconst elpher-margin-width 6
@@ -103,18 +103,18 @@
   "Source for elpher start page.")
 
 (defconst elpher-type-map
-  '((?0 elpher-get-text-node "T" elpher-text)
+  '((?0 elpher-get-text-node "txt" elpher-text)
     (?1 elpher-get-index-node "/" elpher-index)
-    (?4 elpher-get-node-download "B" elpher-binary)
-    (?5 elpher-get-node-download "B" elpher-binary)
+    (?4 elpher-get-node-download "bin" elpher-binary)
+    (?5 elpher-get-node-download "bin" elpher-binary)
     (?7 elpher-get-search-node "?" elpher-search)
-    (?8 elpher-get-telnet-node "?" elpher-telnet)
-    (?9 elpher-get-node-download "B" elpher-binary)
-    (?g elpher-get-image-node "im" elpher-image)
-    (?p elpher-get-image-node "im" elpher-image)
-    (?I elpher-get-image-node "im" elpher-image)
-    (?d elpher-get-node-download "d" elpher-binary)
-    (?h elpher-get-url-node "W" elpher-url)
+    (?8 elpher-get-telnet-node "tel" elpher-telnet)
+    (?9 elpher-get-node-download "bin" elpher-binary)
+    (?g elpher-get-image-node "img" elpher-image)
+    (?p elpher-get-image-node "img" elpher-image)
+    (?I elpher-get-image-node "img" elpher-image)
+    (?d elpher-get-node-download "doc" elpher-binary)
+    (?h elpher-get-url-node "web" elpher-url)
     (bookmarks elpher-get-bookmarks-node "#" elpher-index)
     (start elpher-get-start-node "#" elpher-index))
   "Association list from types to getters, margin codes and index faces.")
@@ -279,12 +279,18 @@ initially."
 
 (defvar elpher-current-node nil)
 
-(defun elpher-visit-node (node &optional getter)
-  "Visit NODE using its own getter or GETTER, if non-nil."
+(defun elpher-visit-node (node &optional getter preserve-parent)
+  "Visit NODE using its own getter or GETTER, if non-nil.
+Additionally, set the parent of NODE to `elpher-current-node',
+unless PRESERVE-PARENT is non-nil."
   (elpher-save-pos)
   (elpher-process-cleanup)
-  (unless (eq node (elpher-node-parent elpher-current-node))
-      (elpher-set-node-parent node elpher-current-node))
+  (unless preserve-parent
+    (if (and (elpher-node-parent elpher-current-node)
+             (equal (elpher-node-address elpher-current-node)
+                    (elpher-node-address node)))
+        (elpher-set-node-parent node (elpher-node-parent elpher-current-node))
+      (elpher-set-node-parent node elpher-current-node)))
   (setq elpher-current-node node)
   (if getter
       (funcall getter)
@@ -296,7 +302,7 @@ initially."
   "Visit the parent of the current node."
   (let ((parent-node (elpher-node-parent elpher-current-node)))
     (when parent-node
-      (elpher-visit-node parent-node))))
+      (elpher-visit-node parent-node nil t))))
       
 (defun elpher-reload-current-node ()
   "Reload the current node, discarding any existing cached content."
@@ -1007,14 +1013,20 @@ host, selector and port."
 
 (defun elpher-get-address-url (address)
   "Get URL representation of ADDRESS."
-  (concat "gopher://"
-          (elpher-address-host address)
-          (let ((port (elpher-address-port address)))
-            (if (equal port 70)
-                ""
-              (format ":%d" port)))
-          "/" (string (elpher-address-type address))
-          (elpher-address-selector address)))
+  (let ((type (elpher-address-type address))
+        (selector (elpher-address-selector address))
+        (host (elpher-address-host address))
+        (port (elpher-address-port address)))
+    (if (and (equal type ?h)
+             (string-prefix-p "URL:" selector))
+        (elt (split-string selector "URL:") 1)
+      (concat "gopher://"
+              host
+              (if (equal port 70)
+                  ""
+                (format ":%d" port))
+              "/" (string type)
+              selector))))
 
 (defun elpher-copy-node-url (node)
   "Copy URL representation of address of NODE to `kill-ring'."