2002-01-22 Lars Magne Ingebrigtsen <larsi@gnus.org>

[gnus] / lisp / mm-url.el

diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index 609b0ba..5baa44d 100644 (file)
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -29,22 +29,23 @@
 
 ;;; Code:
 
-(require 'mm-util)
-(require 'executable)
-
 (eval-when-compile (require 'cl))
 
+(require 'mm-util)
+;;(require 'url)
+(require 'w3)
+
 (eval-and-compile
-  (autoload 'url-insert-file-contents "url-handlers"))
+  (autoload 'executable-find "executable")
+  ;;(autoload 'url-insert-file-contents "url-handlers")
+  (autoload 'url-insert-file-contents "url")
+  )
 
 (defgroup mm-url nil
   "A wrapper of url package and external url command for Gnus."
   :group 'gnus)
 
-(defcustom mm-url-use-external (not
-                               (condition-case nil
-                                   (require 'url-handlers)
-                                 (error nil)))
+(defcustom mm-url-use-external nil
   "*If not-nil, use external grab program `mm-url-program'."
   :type 'boolean
   :group 'mm-url)
@@ -248,8 +249,14 @@ This is taken from RFC 2396.")
 
 (defun mm-url-insert-file-contents (url)
   (if mm-url-use-external
-      (mm-url-insert-file-contents-external url)
-    (url-insert-file-contents url)))
+      (if (string-match "^file:/+" url)
+         (insert-file-contents (substring url (1- (match-end 0))))
+       (mm-url-insert-file-contents-external url))
+    ;;(require 'url-handlers)
+    (let ((name buffer-file-name))
+      (prog1
+         (url-insert-file-contents url)
+       (setq buffer-file-name name)))))
 
 (defun mm-url-insert-file-contents-external (url)
   (let (program args)
@@ -264,19 +271,17 @@ This is taken from RFC 2396.")
 (defun mm-url-insert (url &optional follow-refresh)
   "Insert the contents from an URL in the current buffer.
 If FOLLOW-REFRESH is non-nil, redirect refresh url in META."
-  (let ((name buffer-file-name))
-    (if follow-refresh
-       (save-restriction
-         (narrow-to-region (point) (point))
-         (mm-url-insert-file-contents url)
-         (goto-char (point-min))
-         (when (re-search-forward
-                "<meta[ \t\r\n]*http-equiv=\"Refresh\"[^>]*URL=\\([^\"]+\\)\"" nil t)
-           (let ((url (match-string 1)))
-             (delete-region (point-min) (point-max))
-             (mm-url-insert url t))))
-      (mm-url-insert-file-contents url))
-    (setq buffer-file-name name)))
+  (if follow-refresh
+      (save-restriction
+       (narrow-to-region (point) (point))
+       (mm-url-insert-file-contents url)
+       (goto-char (point-min))
+       (when (re-search-forward
+              "<meta[ \t\r\n]*http-equiv=\"Refresh\"[^>]*URL=\\([^\"]+\\)\"" nil t)
+         (let ((url (match-string 1)))
+           (delete-region (point-min) (point-max))
+           (mm-url-insert url t))))
+    (mm-url-insert-file-contents url)))
 
 (defun mm-url-decode-entities ()
   "Decode all HTML entities."
@@ -294,6 +299,11 @@ If FOLLOW-REFRESH is non-nil, redirect refresh url in META."
        (setq elem (char-to-string elem)))
       (replace-match elem t t))))
 
+(defun mm-url-decode-entities-nbsp ()
+  "Decode all HTML entities and &nbsp; to a space."
+  (let ((mm-url-html-entities (cons '(nbsp . 32) mm-url-html-entities)))
+    (mm-url-decode-entities)))
+
 (defun mm-url-decode-entities-string (string)
   (with-temp-buffer
     (insert string)
@@ -325,6 +335,46 @@ spaces.  Die Die Die."
      chunk)
    ""))
 
+(defun mm-url-encode-www-form-urlencoded (pairs)
+  "Return PAIRS encoded for forms."
+  (mapconcat
+   (lambda (data)
+     (concat (mm-url-form-encode-xwfu (car data)) "="
+            (mm-url-form-encode-xwfu (cdr data))))
+   pairs "&"))
+
+(defun mm-url-fetch-form (url pairs)
+  "Fetch a form from URL with PAIRS as the data using the POST method."
+  ;;(require 'url-handlers)
+  (let ((url-request-data (mm-url-encode-www-form-urlencoded pairs))
+       (url-request-method "POST")
+       (url-request-extra-headers
+        '(("Content-type" . "application/x-www-form-urlencoded"))))
+    (url-insert-file-contents url)
+    (setq buffer-file-name nil))
+  t)
+
+(defun mm-url-fetch-simple (url content)
+  ;;(require 'url-handlers)
+  (let ((url-request-data content)
+       (url-request-method "POST")
+       (url-request-extra-headers
+        '(("Content-type" . "application/x-www-form-urlencoded"))))
+    (url-insert-file-contents url)
+    (setq buffer-file-name nil))
+  t)
+
+(defun mm-url-remove-markup ()
+  "Remove all HTML markup, leaving just plain text."
+  (goto-char (point-min))
+  (while (search-forward "<!--" nil t)
+    (delete-region (match-beginning 0)
+                  (or (search-forward "-->" nil t)
+                      (point-max))))
+  (goto-char (point-min))
+  (while (re-search-forward "<[^>]+>" nil t)
+    (replace-match "" t t)))
+
 (provide 'mm-url)
 
 ;;; mm-url.el ends here