aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emms-lastfm.el20
-rw-r--r--emms-url.el72
2 files changed, 72 insertions, 20 deletions
diff --git a/emms-lastfm.el b/emms-lastfm.el
index 3758a8b..48c2699 100644
--- a/emms-lastfm.el
+++ b/emms-lastfm.el
@@ -488,25 +488,5 @@ x=17"
(when (re-search-forward (concat "^" key "=") nil t)
(buffer-substring-no-properties (point) (line-end-position))))
-(defun url-escape (url)
- "Escapes SPACEs with %20."
- (replace-regexp-in-string " " "%20" url))
-
-(defun http-content-coding ()
- (and (boundp 'url-http-content-type)
- (string-match ";\\s-*charset=\\([^;[:space:]]+\\)" url-http-content-type)
- (intern-soft (downcase (match-string 1 url-http-content-type))) ))
-
-(defun http-decode-buffer ()
- "Recode the buffer with `url-retrieve's contents. Else the
-buffer would contain multibyte chars like \\123\\456."
- (let* ((default (or (car default-process-coding-system) 'utf-8) )
- (coding (or (http-content-coding) default)) )
- ;; (pop-to-buffer (current-buffer))
- ;; (message "content-type: %s" url-http-content-type)
- ;; (message "coding: %S [default: %S]" coding default)
- (set-buffer-multibyte t)
- (decode-coding-region (point-min) (point-max) coding)))
-
(provide 'emms-lastfm)
;;; emms-lastfm.el ends here
diff --git a/emms-url.el b/emms-url.el
new file mode 100644
index 0000000..2af1027
--- /dev/null
+++ b/emms-url.el
@@ -0,0 +1,72 @@
+;;; emms-url.el --- Make URL and EMMS work together well
+
+;; Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+
+;; This file is part of EMMS.
+
+;; EMMS is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+;;
+;; EMMS is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with EMMS; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; These routines sanify input to URL and parse data returned by URL.
+
+;;; Code:
+
+(require 'url)
+
+(defvar emms-url-specials
+ '((?\" . """)
+ (?\< . "&lt;")
+ (?\> . "&gt;")
+ (?\& . "&amp;")
+ (?\ . "%20")
+ (?\n . "%0D%0A"))
+ "*An alist of characters which must be represented specially in URLs.
+The transformation is the key of the pair.")
+
+(defun emms-escape-url (url)
+ "Escape specials in URL.
+
+The specials to escape are specified by the `emms-url-specials'
+variable."
+ (apply (function concat)
+ (mapcar
+ (lambda (ch)
+ (let ((repl (assoc ch emms-url-specials)))
+ (if (null repl)
+ (char-to-string ch)
+ (cdr repl))))
+ (append url nil))))
+
+(defun emms-http-content-coding ()
+ (and (boundp 'url-http-content-type)
+ (string-match ";\\s-*charset=\\([^;[:space:]]+\\)"
+ url-http-content-type)
+ (intern-soft (downcase (match-string 1 url-http-content-type)))))
+
+(defun emms-http-decode-buffer ()
+ "Recode the buffer with `url-retrieve's contents. Else the
+buffer would contain multibyte chars like \\123\\456."
+ (let* ((default (or (car default-process-coding-system) 'utf-8))
+ (coding (or (emms-http-content-coding) default)))
+ ;; (pop-to-buffer (current-buffer))
+ ;; (message "content-type: %s" url-http-content-type)
+ ;; (message "coding: %S [default: %S]" coding default)
+ (set-buffer-multibyte t)
+ (decode-coding-region (point-min) (point-max) coding)))
+
+(provide 'emms-url)
+;;; emms-url.el ends here