From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Julien Danjou Newsgroups: gmane.emacs.devel Subject: [PATCH 5/5] url-cache: add url-cache-expire-time Date: Wed, 15 Sep 2010 10:51:28 +0200 Message-ID: <1284540688-7912-6-git-send-email-julien@danjou.info> References: <1284540688-7912-1-git-send-email-julien@danjou.info> NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1284540882 25535 80.91.229.12 (15 Sep 2010 08:54:42 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 15 Sep 2010 08:54:42 +0000 (UTC) Cc: Julien Danjou To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Sep 15 10:54:38 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OvnlF-00084p-7r for ged-emacs-devel@m.gmane.org; Wed, 15 Sep 2010 10:54:37 +0200 Original-Received: from localhost ([127.0.0.1]:60034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OvnlE-0003Gh-Lg for ged-emacs-devel@m.gmane.org; Wed, 15 Sep 2010 04:54:36 -0400 Original-Received: from [140.186.70.92] (port=58709 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OvniQ-0001ha-07 for emacs-devel@gnu.org; Wed, 15 Sep 2010 04:51:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OvniN-00020J-Of for emacs-devel@gnu.org; Wed, 15 Sep 2010 04:51:41 -0400 Original-Received: from coquelicot-s.easter-eggs.com ([213.215.37.94]:43184) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OvniN-0001zT-Fc for emacs-devel@gnu.org; Wed, 15 Sep 2010 04:51:39 -0400 Original-Received: from cigue.easter-eggs.fr (cigue.easter-eggs.fr [10.0.0.33]) by rose.easter-eggs.fr (Postfix) with ESMTPS id 7F1B21428A; Wed, 15 Sep 2010 10:51:35 +0200 (CEST) Original-Received: from jdanjou by cigue.easter-eggs.fr with local (Exim 4.72) (envelope-from ) id 1OvniK-00024d-Lh; Wed, 15 Sep 2010 10:51:36 +0200 X-Mailer: git-send-email 1.7.1 In-Reply-To: <1284540688-7912-1-git-send-email-julien@danjou.info> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:130185 Archived-At: Signed-off-by: Julien Danjou --- lisp/url/ChangeLog | 3 ++- lisp/url/url-cache.el | 7 ++++--- lisp/url/url-vars.el | 5 +++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 34169a8..08d9d58 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,7 +1,8 @@ 2010-09-14 Julien Danjou * url-cache (url-store-in-cache): Make `buff' argument really optional. - (url-cache-expired): Handle any type of cached object. + (url-cache-expired): Handle any type of cached object and add a + global `url-cache-expire-time' variable. (url-fetch-from-cache): Add new function. (url-is-cached): Enhance docstring. * url-vars.el: Remove useless variable `url-cache-expired'. diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el index 3c11a85..36fbded 100644 --- a/lisp/url/url-cache.el +++ b/lisp/url/url-cache.el @@ -187,8 +187,9 @@ Very fast if you have an `md5' primitive function, suitably fast otherwise." (insert-file-contents-literally fnam)) ;;;###autoload -(defun url-cache-expired (url expire-time) - "Return t if a cached URL is more than EXPIRE-TIME old." +(defun url-cache-expired (url &optional expire-time) + "Return t if a cached URL is more than EXPIRE-TIME old. +If EXPIRE-TIME is not set, `url-cache-expire-time' is used instead." (cond (url-standalone-mode (not (file-exists-p (url-cache-create-filename url)))) (t (let ((cache-time (url-is-cached url))) @@ -196,7 +197,7 @@ Very fast if you have an `md5' primitive function, suitably fast otherwise." (time-less-p (time-add (url-is-cached url) - (seconds-to-time expire-time)) + (seconds-to-time (or expire-time url-cache-expire-time)) (current-time)) t))))) diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el index 06d3c2d..2922843 100644 --- a/lisp/url/url-vars.el +++ b/lisp/url/url-vars.el @@ -83,6 +83,11 @@ If non-nil and not t, the user will be asked for each refresh request." :type 'boolean :group 'url-cache) +(defcustom url-cache-expire-time 3600 + "Maximum time in seconds to keep the documents cached." + :type 'integer + :group 'url-cache) + (defconst url-bug-address "bug-gnu-emacs@gnu.org" "Where to send bug reports.") -- 1.7.1