X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=elopher.el;h=4617d08387e5d18e5444a1363bf79cc7bdefe0de;hb=0c3e78c30bf2e23a54c0eb0324213434b2611255;hp=f058179c4bf81a4db5b7fd5ce183d4b1b077244f;hpb=41d6c3b6d5234db34f5184755cd903116a5c7abe;p=elpher.git diff --git a/elopher.el b/elopher.el index f058179..4617d08 100644 --- a/elopher.el +++ b/elopher.el @@ -197,6 +197,17 @@ Otherwise, use the system browser via the BROWSE-URL function." (insert " ")) (insert (make-string elopher-margin-width ?\s)))) +(defvar elopher-type-map + `((?0 elopher-get-text-node "T" ,elopher-text-face) + (?1 elopher-get-index-node "/" ,elopher-index-face) + (?g elopher-get-image-node "im" ,elopher-image-face) + (?p elopher-get-image-node "im" ,elopher-image-face) + (?I elopher-get-image-node "im" ,elopher-image-face) + (?4 elopher-get-node-download "B" ,elopher-binary-face) + (?5 elopher-get-node-download "B" ,elopher-binary-face) + (?9 elopher-get-node-download "B" ,elopher-binary-face) + (?7 elopher-get-search-node "?" ,elopher-search-face))) + (defun elopher-insert-index-record (line) "Insert the index record corresponding to LINE into the current buffer." (let* ((type (elt line 0)) @@ -206,69 +217,37 @@ Otherwise, use the system browser via the BROWSE-URL function." (host (elt fields 2)) (port (elt fields 3)) (address (elopher-make-address selector host port)) - (help-string (format "mouse-1, RET: open %s on %s port %s" - selector host port))) - (pcase type - (?i (elopher-insert-margin) ; Information - (insert (propertize display-string - 'face elopher-info-face))) - (?0 (elopher-insert-margin "T") ; Text - (insert-text-button display-string - 'face elopher-text-face - 'elopher-node (elopher-make-node elopher-current-node - address - #'elopher-get-text-node) - 'action #'elopher-click-link - 'follow-link t - 'help-echo help-string)) - (?1 (elopher-insert-margin "/") ; Index - (insert-text-button display-string - 'face elopher-index-face - 'elopher-node (elopher-make-node elopher-current-node - address - #'elopher-get-index-node) - 'action #'elopher-click-link - 'follow-link t - 'help-echo help-string)) - ((or ?g ?p ?I) (elopher-insert-margin "im") ; Image - (insert-text-button display-string - 'face elopher-image-face - 'elopher-node (elopher-make-node elopher-current-node - address - #'elopher-get-image-node) - 'action #'elopher-click-link - 'follow-link t - 'help-echo help-string)) - ((or ?4 ?9) (elopher-insert-margin "B") ; Binary - (insert-text-button display-string - 'face elopher-binary-face - 'elopher-node (elopher-make-node elopher-current-node - address - #'elopher-get-node-download) - 'action #'elopher-click-link - 'follow-link t - 'help-echo help-string)) - (?7 (elopher-insert-margin "S") + (type-map-entry (alist-get type elopher-type-map))) + (if type-map-entry + (let ((getter (car type-map-entry)) + (margin-code (cadr type-map-entry)) + (face (caddr type-map-entry))) + (elopher-insert-margin margin-code) (insert-text-button display-string - 'face elopher-search-face + 'face face 'elopher-node (elopher-make-node elopher-current-node address - #'elopher-get-search-node) + getter) 'action #'elopher-click-link 'follow-link t - 'help-echo help-string)) - (?h (elopher-insert-margin "W") - (let ((url (elt (split-string selector "URL:") 1))) - (insert-text-button display-string - 'face elopher-http-face - 'elopher-url url - 'action #'elopher-click-url - 'follow-link t - 'help-echo (format "mouse-1, RET: open url %s" url)))) - (?.) ; Occurs at end of index, can safely ignore. - (tp (elopher-insert-margin (concat (char-to-string tp) "?")) - (insert (propertize display-string - 'face elopher-unknown-face)))) + 'help-echo (format "mouse-1, RET: open %s on %s port %s" + selector host port))) + (pcase type + (?i (elopher-insert-margin) ; Information + (insert (propertize display-string + 'face elopher-info-face))) + (?h (elopher-insert-margin "W") ; Web link + (let ((url (elt (split-string selector "URL:") 1))) + (insert-text-button display-string + 'face elopher-http-face + 'elopher-url url + 'action #'elopher-click-url + 'follow-link t + 'help-echo (format "mouse-1, RET: open url %s" url)))) + (?.) ; Occurs at end of index, can safely ignore. + (tp (elopher-insert-margin (concat (char-to-string tp) "?")) + (insert (propertize display-string + 'face elopher-unknown-face))))) (insert "\n"))) @@ -327,27 +306,50 @@ The result is stored as a string in the variable elopher-selector-string." ;; Text retrieval -(defun elopher-process-text (string) - (let* ((chopped-str (replace-regexp-in-string "\r\n\.\r\n$" "\r\n" string)) - (cleaned-str (replace-regexp-in-string "\r" "" chopped-str))) - (elopher-buttonify-urls cleaned-str))) - -(defvar elopher-url-regex "\\https?://\\([a-z.\-]+\\)\\([^ \r\n\t(),]*\\)") +(defvar elopher-url-regex "\\(https?\\|gopher\\)://\\([a-zA-Z0-9.\-]+\\)\\(?3::[0-9]+\\)?\\(?4:/[^ \r\n\t(),]*\\)") (defun elopher-buttonify-urls (string) + "Turn substrings which look like urls in STRING into clickable buttons." (with-temp-buffer (insert string) (goto-char (point-min)) (while (re-search-forward elopher-url-regex nil t) - (let ((url (match-string 0))) - (make-text-button (match-beginning 0) - (match-end 0) - 'elopher-url url - 'action #'elopher-click-url - 'follow-link t - 'help-echo (format "mouse-1, RET: open url %s" url)))) + (let ((url (match-string 0)) + (protocol (downcase (match-string 1)))) + (if (string= protocol "gopher") + (let* ((host (match-string 2)) + (port 70) + (type-and-selector (match-string 4)) + (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 (elopher-make-address selector host port)) + (getter (car (alist-get type elopher-type-map)))) + (make-text-button (match-beginning 0) + (match-end 0) + 'elopher-node (elopher-make-node elopher-current-node + address + getter) + 'action #'elopher-click-link + 'follow-link t + 'help-echo (format "mouse-1, RET: open %s on %s port %s" + selector host port))) + (make-text-button (match-beginning 0) + (match-end 0) + 'elopher-url url + 'action #'elopher-click-url + 'follow-link t + 'help-echo (format "mouse-1, RET: open url %s" url))))) (buffer-string))) +(defun elopher-process-text (string) + (let* ((chopped-str (replace-regexp-in-string "\r\n\.\r\n$" "\r\n" string)) + (cleaned-str (replace-regexp-in-string "\r" "" chopped-str))) + (elopher-buttonify-urls cleaned-str))) + (defun elopher-get-text-node () (let ((content (elopher-node-content elopher-current-node)) (address (elopher-node-address elopher-current-node))) @@ -403,24 +405,26 @@ The result is stored as a string in the variable elopher-selector-string." (if content (progn (elopher-with-clean-buffer - (insert content)) + (insert content)) (elopher-restore-pos) (message "Displaying cached search results. Reload to perform a new search.")) - (let* ((query-string (read-string "Query: ")) - (query-selector (concat (elopher-address-selector address) "\t" query-string)) - (search-address (elopher-make-address query-selector - (elopher-address-host address) - (elopher-address-port address)))) - (elopher-with-clean-buffer - (insert "LOADING RESULTS...")) - (elopher-get-selector search-address - (lambda (proc event) - (unless (string-prefix-p "deleted" event) - (elopher-with-clean-buffer - (elopher-insert-index elopher-selector-string)) - (goto-char (point-min)) - (elopher-set-node-content elopher-current-node - (buffer-string))))))))) + (unwind-protect + (let* ((query-string (read-string "Query: ")) + (query-selector (concat (elopher-address-selector address) "\t" query-string)) + (search-address (elopher-make-address query-selector + (elopher-address-host address) + (elopher-address-port address)))) + (elopher-with-clean-buffer + (insert "LOADING RESULTS...")) + (elopher-get-selector search-address + (lambda (proc event) + (unless (string-prefix-p "deleted" event) + (elopher-with-clean-buffer + (elopher-insert-index elopher-selector-string)) + (goto-char (point-min)) + (elopher-set-node-content elopher-current-node + (buffer-string)))))) + (elopher-visit-parent-node))))) ;; Raw server response retrieval @@ -442,7 +446,6 @@ The result is stored as a string in the variable elopher-selector-string." (goto-char (point-min))))) (message "Displaying raw server response. Reload to return to standard view.")) - ;; File export retrieval (defvar elopher-download-filename) @@ -529,11 +532,13 @@ The result is stored as a string in the variable elopher-selector-string." (interactive) (let ((button (button-at (point)))) (if button - (elopher-visit-node (button-get button 'elopher-node) - #'elopher-get-node-download) + (let ((node (button-get button 'elopher-node))) + (if node + (elopher-visit-node (button-get button 'elopher-node) + #'elopher-get-node-download) + (message "Can only download gopher links, not general URLs."))) (message "No link selected.")))) - ;;; Mode and keymap ;;