Added some missing comments.

[elpher.git] / elopher.el

diff --git a/elopher.el b/elopher.el
index 8985bfe..3e35921 100644 (file)
--- a/elopher.el
+++ b/elopher.el
@@ -77,6 +77,10 @@
   "Face used for image records."
   :type '(face))
 
+(defcustom elopher-binary-face '(foreground-color . "magenta")
+  "Face used for image records."
+  :type '(face))
+
 (defcustom elopher-unknown-face '(foreground-color . "red")
   "Face used for unknown record types."
   :type '(face))
@@ -205,10 +209,10 @@ Otherwise, use the system browser via the BROWSE-URL function."
          (help-string (format "mouse-1, RET: open %s on %s port %s"
                               selector host port)))
     (pcase type
-      (?i (elopher-insert-margin)
+      (?i (elopher-insert-margin)                             ; Information 
           (insert (propertize display-string
                               'face elopher-info-face)))
-      (?0 (elopher-insert-margin "T")
+      (?0 (elopher-insert-margin "T")                         ; Text
           (insert-text-button display-string
                               'face elopher-text-face
                               'elopher-node (elopher-make-node elopher-current-node
@@ -217,7 +221,7 @@ Otherwise, use the system browser via the BROWSE-URL function."
                               'action #'elopher-click-link
                               'follow-link t
                               'help-echo help-string))
-      (?1 (elopher-insert-margin "/")
+      (?1 (elopher-insert-margin "/")                         ; Index
           (insert-text-button display-string
                               'face elopher-index-face
                               'elopher-node (elopher-make-node elopher-current-node
@@ -226,25 +230,34 @@ Otherwise, use the system browser via the BROWSE-URL function."
                               'action #'elopher-click-link
                               'follow-link t
                               'help-echo help-string))
-      ((or ?g ?p ?I) (elopher-insert-margin "im")
-          (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))
-      (?7 (elopher-insert-margin "S")
+      ((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")                         ; Query
           (insert-text-button display-string
                               'face elopher-search-face
                               'elopher-node (elopher-make-node elopher-current-node
-                                                              address
-                                                              #'elopher-get-search-node)
+                                                               address
+                                                               #'elopher-get-search-node)
                               'action #'elopher-click-link
                               'follow-link t
                               'help-echo help-string))
-      (?h (elopher-insert-margin "W")
+      (?h (elopher-insert-margin "W")                         ; Web link
           (let ((url (elt (split-string selector "URL:") 1)))
             (insert-text-button display-string
                                 'face elopher-http-face
@@ -315,8 +328,25 @@ 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)))
-    (replace-regexp-in-string "\r" "" chopped-str)))
+  (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(),]*\\)")
+
+(defun elopher-buttonify-urls (string)
+  (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))))
+    (buffer-string)))
 
 (defun elopher-get-text-node ()
   (let ((content (elopher-node-content elopher-current-node))
@@ -420,24 +450,23 @@ The result is stored as a string in the variable elopher-selector-string."
 (defun elopher-get-node-download ()
   (let* ((address (elopher-node-address elopher-current-node))
          (selector (elopher-address-selector address)))
-    (unwind-protect
-        (let* ((filename-proposal (file-name-nondirectory selector))
-               (filename (read-file-name "Save file as: "
-                                         nil nil nil
-                                         (if (> (length filename-proposal) 0)
-                                             filename-proposal
-                                           "gopher.file"))))
-          (message "Downloading...")
-          (setq elopher-download-filename filename)
-          (elopher-get-selector address
-                                (lambda (proc event)
-                                  (let ((coding-system-for-write 'binary))
-                                    (with-temp-file elopher-download-filename
-                                      (insert elopher-selector-string)))
+    (elopher-visit-parent-node) ; Do first in case of non-local exits.
+    (let* ((filename-proposal (file-name-nondirectory selector))
+           (filename (read-file-name "Save file as: "
+                                     nil nil nil
+                                     (if (> (length filename-proposal) 0)
+                                         filename-proposal
+                                       "gopher.file"))))
+      (message "Downloading...")
+      (setq elopher-download-filename filename)
+      (elopher-get-selector address
+                            (lambda (proc event)
+                              (let ((coding-system-for-write 'binary))
+                                (with-temp-file elopher-download-filename
+                                  (insert elopher-selector-string)
                                   (message (format "Download complate, saved to file %s."
-                                                   elopher-download-filename)))))
-      (elopher-visit-parent-node))))
-        
+                                                   elopher-download-filename)))))))))
+
 
 ;;; Navigation procedures
 ;;