Added to readme wishlist.

[elpher.git] / elopher.el

diff --git a/elopher.el b/elopher.el
index 3742497..8237b63 100644 (file)
--- a/elopher.el
+++ b/elopher.el
@@ -16,7 +16,8 @@
   "Width of left-hand margin used when rendering indicies.")
 
 (defconst elopher-start-index
-  (mapconcat 'identity
+  (mapconcat
+   'identity
    (list "i\tfake\tfake\t1"
          "i--------------------------------------------\tfake\tfake\t1"
          "i          Elopher Gopher Client             \tfake\tfake\t1"
@@ -30,7 +31,8 @@
          "i - u: return to parent directory entry\tfake\tfake\t1"
          "i - g: go to a particular page\tfake\tfake\t1"
          "i - r: reload current page\tfake\tfake\t1"
-         "i - t: display the current page as text (i.e. \"source\")\tfake\tfake\t1"
+         "i - d: download directory entry under cursor\tfake\tfake\t1"
+         "i - w: display the raw server response for the current page\tfake\tfake\t1"
          "i\tfake\tfake\t1"
          "iPlaces to start exploring Gopherspace:\tfake\tfake\t1"
          "i\tfake\tfake\t1"
@@ -141,11 +143,11 @@ Otherwise, use the system browser via the BROWSE-URL function."
 
 (defvar elopher-current-node)
 
-(defun elopher-visit-node (node &optional raw)
+(defun elopher-visit-node (node &optional getter)
   (elopher-save-pos)
   (setq elopher-current-node node)
-  (if raw
-      (elopher-get-node-raw)
+  (if getter
+      (funcall getter)
     (funcall (elopher-node-getter node))))
 
 (defun elopher-visit-parent-node ()
@@ -364,7 +366,7 @@ The result is stored as a string in the variable elopher-selector-string."
           (elopher-with-clean-buffer
             (insert content))
           (elopher-restore-pos)
-          (message "Displaying cached search results. Reload to perform a new search."))
+          (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
@@ -380,6 +382,8 @@ The result is stored as a string in the variable elopher-selector-string."
                                 (elopher-set-node-content elopher-current-node
                                                           (buffer-string))))))))
 
+;; Raw server response retrieval
+
 (defun elopher-get-node-raw ()
   (let* ((content (elopher-node-content elopher-current-node))
          (address (elopher-node-address elopher-current-node)))
@@ -398,6 +402,32 @@ The result is stored as a string in the variable elopher-selector-string."
   (message "Displaying raw server response.  Reload to return to standard view."))
  
 
+;; File export retrieval
+
+(defvar elopher-download-filename)
+
+(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)))
+                                  (message (format "Download complate, saved to file %s."
+                                                   elopher-download-filename)))))
+      (elopher-visit-parent-node))))
+        
+
 ;;; Navigation procedures
 ;;
 
@@ -444,7 +474,8 @@ The result is stored as a string in the variable elopher-selector-string."
 (defun elopher-view-raw ()
   "View current page as plain text."
   (interactive)
-  (elopher-visit-node elopher-current-node t))
+  (elopher-visit-node elopher-current-node
+                      #'elopher-get-node-raw))
 
 (defun elopher-back ()
   "Go to previous site."
@@ -453,6 +484,15 @@ The result is stored as a string in the variable elopher-selector-string."
       (elopher-visit-parent-node)
     (message "No previous site.")))
 
+(defun elopher-download ()
+  "Download the link at point."
+  (interactive)
+  (let ((button (button-at (point))))
+    (if button
+        (elopher-visit-node (button-get button 'elopher-node)
+                            #'elopher-get-node-download)
+      (message "No link selected."))))
+
 
 ;;; Mode and keymap
 ;;
@@ -465,6 +505,7 @@ The result is stored as a string in the variable elopher-selector-string."
     (define-key map (kbd "g") 'elopher-go)
     (define-key map (kbd "r") 'elopher-reload)
     (define-key map (kbd "w") 'elopher-view-raw)
+    (define-key map (kbd "d") 'elopher-download)
     (when (fboundp 'evil-define-key)
       (evil-define-key 'normal map
         (kbd "C-]") 'elopher-follow-closest-link
@@ -472,7 +513,8 @@ The result is stored as a string in the variable elopher-selector-string."
         (kbd "u") 'elopher-back
         (kbd "g") 'elopher-go
         (kbd "r") 'elopher-reload
-        (kbd "w") 'elopher-view-raw))
+        (kbd "w") 'elopher-view-raw
+        (kbd "d") 'elopher-download))
     map)
   "Keymap for gopher client.")
 
@@ -482,12 +524,14 @@ The result is stored as a string in the variable elopher-selector-string."
 
 ;;; Main start procedure
 ;;
+
 (defun elopher ()
   "Start elopher with default landing page."
   (interactive)
   (setq elopher-current-node nil)
   (let ((start-node (elopher-make-node nil nil #'elopher-get-index-node)))
-    (elopher-visit-node start-node)))
+    (elopher-visit-node start-node))
+  "Started Elopher.") ; Otherwise (elopher) evaluates to start page string.
 
 ;;; elopher.el ends here