X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=blobdiff_plain;f=elpher.el;h=ea95aee605c5311b01ae99d9bd02631a7037a1ac;hp=deb7fe88d2db6b3b9c639bf9a7f78f113f3e40ca;hb=986d88c39d06c58fb23a7dfad037fec8235164b0;hpb=0e8eb2e0c919a07aa5db733d02e7669ccfb4276d

diff --git a/elpher.el b/elpher.el
index deb7fe8..ea95aee 100644
--- a/elpher.el
+++ b/elpher.el
@@ -7,7 +7,7 @@
 ;; Version: 1.4.6
 ;; Keywords: comm gopher
 ;; Homepage: https://github.com/tgvaughan/elpher
-;; Package-Requires: ((emacs "25"))
+;; Package-Requires: ((emacs "26"))
 
 ;; This file is not part of GNU Emacs.
 
@@ -50,9 +50,15 @@
 ;;; Code:
 
 (provide 'elpher)
+
+;;; Dependencies
+;;
+
 (require 'seq)
 (require 'pp)
 (require 'shr)
+(require 'url-util)
+
 
 ;;; Global constants
 ;;
@@ -209,21 +215,22 @@ before attempting to connect to the server."
         (selector (elpher-address-selector address))
         (bare-host (elpher-address-host address))
         (port (elpher-address-port address)))
-    (let ((host (if (string-match-p ":" bare-host)
-                    (concat "[" bare-host "]")
-                  bare-host)))
-      (if (and (equal type ?h)
-               (string-prefix-p "URL:" selector))
-          (elt (split-string selector "URL:") 1)
-        (concat "gopher"
-                (if (elpher-address-use-tls-p address) "s" "")
-                "://"
-                host
-                (if (equal port 70)
-                    ""
-                  (format ":%d" port))
-                "/" (string type)
-                selector)))))
+    (url-encode-url
+     (let ((host (if (string-match-p ":" bare-host)
+                     (concat "[" bare-host "]")
+                   bare-host)))
+       (if (and (equal type ?h)
+                (string-prefix-p "URL:" selector))
+           (elt (split-string selector "URL:") 1)
+         (concat "gopher"
+                 (if (elpher-address-use-tls-p address) "s" "")
+                 "://"
+                 host
+                 (if (equal port 70)
+                     ""
+                   (format ":%d" port))
+                 "/" (string type)
+                 selector))))))
 
 ;; Node
 
@@ -297,8 +304,12 @@ unless PRESERVE-PARENT is non-nil."
   (if getter
       (funcall getter)
     (let* ((address (elpher-node-address node))
-           (type (elpher-address-type address)))
-      (funcall (car (alist-get type elpher-type-map))))))
+           (type (elpher-address-type address))
+           (type-record (alist-get type elpher-type-map)))
+      (if (listp type-record)
+          (funcall (car type-record))
+        (elpher-visit-parent-node)
+        (error "Unsupported gopher selector type '%c'" type)))))
 
 (defun elpher-visit-parent-node ()
   "Visit the parent of the current node."
@@ -554,9 +565,11 @@ calls, as is necessary if the match is performed by `string-match'."
                (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)
-                           ""))
+               (selector (decode-coding-string
+                          (url-unhex-string
+                           (if (> (length type-and-selector) 1)
+                               (substring type-and-selector 2)
+                             "")) 'utf-8))
                (use-tls (string= protocol "gophers"))
                (address (elpher-make-address type selector host port use-tls)))
           (elpher-make-node url address))