[PATCH 1/5] url-cache.el (url-cache-expired): Handle any type of cached object

[Julien Danjou <julien@danjou.info>]

Signed-off-by: Julien Danjou <julien@danjou.info>
---
 lisp/url/ChangeLog    |    1 +
 lisp/url/url-cache.el |   27 ++++++++++++---------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 7726f6c..a5e5c26 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,6 +1,7 @@
 2010-09-14  Julien Danjou  <julien@danjou.info>
 
 	* url-cache (url-store-in-cache): Make `buff' argument really optional.
+	(url-cache-expired): Handle any type of cached object.
 
 2010-09-14  Glenn Morris  <rgm@gnu.org>
 
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index 3a6f00d..015a1ff 100644
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -180,21 +180,18 @@ Very fast if you have an `md5' primitive function, suitably fast otherwise."
   (insert-file-contents-literally fnam))
 
 ;;;###autoload
-(defun url-cache-expired (url mod)
-  "Return t if a cached file has expired."
-  (let* ((urlobj (if (vectorp url) url (url-generic-parse-url url)))
-	 (type (url-type urlobj)))
-    (cond
-     (url-standalone-mode
-      (not (file-exists-p (url-cache-create-filename url))))
-     ((string= type "http")
-      t)
-     ((member type '("file" "ftp"))
-      (if (or (equal mod '(0 0)) (not mod))
-	  t
-	(or (> (nth 0 mod) (nth 0 (current-time)))
-	    (> (nth 1 mod) (nth 1 (current-time))))))
-     (t nil))))
+(defun url-cache-expired (url expire-time)
+  "Return t if a cached URL is more than EXPIRE-TIME old."
+    (cond (url-standalone-mode
+           (not (file-exists-p (url-cache-create-filename url))))
+          (t (let ((cache-time (url-is-cached url)))
+               (if cache-time
+                   (time-less-p
+                    (time-add
+                     (url-is-cached url)
+                     (seconds-to-time expire-time))
+                    (current-time))
+                 t)))))
 
 (provide 'url-cache)
 
-- 
1.7.1