2004-04-04 01:21:46 +00:00
|
|
|
;;; url-cache.el --- Uniform Resource Locator retrieval tool
|
2004-10-19 21:36:56 +00:00
|
|
|
|
2015-01-01 14:26:41 -08:00
|
|
|
;; Copyright (C) 1996-1999, 2004-2015 Free Software Foundation, Inc.
|
2004-10-19 21:36:56 +00:00
|
|
|
|
2004-04-04 01:21:46 +00:00
|
|
|
;; Keywords: comm, data, processes, hypermedia
|
|
|
|
|
2004-10-19 21:36:56 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 04:29:13 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2004-10-19 21:36:56 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 04:29:13 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2004-10-19 21:36:56 +00:00
|
|
|
|
|
|
|
;; GNU Emacs 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
|
2008-05-06 04:29:13 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2004-10-19 21:36:56 +00:00
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
2004-04-04 01:21:46 +00:00
|
|
|
(require 'url-parse)
|
2004-04-12 04:02:25 +00:00
|
|
|
(require 'url-util)
|
2006-01-02 05:24:01 +00:00
|
|
|
(require 'url) ;E.g. for url-configuration-directory.
|
2004-04-04 01:21:46 +00:00
|
|
|
|
|
|
|
(defcustom url-cache-directory
|
|
|
|
(expand-file-name "cache" url-configuration-directory)
|
2010-09-10 18:58:42 -07:00
|
|
|
"The directory where cache files should be stored."
|
2004-04-04 01:21:46 +00:00
|
|
|
:type 'directory
|
|
|
|
:group 'url-file)
|
|
|
|
|
2010-09-22 22:56:17 -07:00
|
|
|
(defcustom url-cache-expire-time 3600
|
2010-09-22 23:08:57 -07:00
|
|
|
"Default maximum time in seconds before cache files expire.
|
|
|
|
Used by the function `url-cache-expired'."
|
2010-09-22 22:56:17 -07:00
|
|
|
:version "24.1"
|
|
|
|
:type 'integer
|
|
|
|
:group 'url-cache)
|
|
|
|
|
2004-04-04 01:21:46 +00:00
|
|
|
;; Cache manager
|
|
|
|
(defun url-cache-file-writable-p (file)
|
|
|
|
"Follows the documentation of `file-writable-p', unlike `file-writable-p'."
|
|
|
|
(and (file-writable-p file)
|
|
|
|
(if (file-exists-p file)
|
|
|
|
(not (file-directory-p file))
|
|
|
|
(file-directory-p (file-name-directory file)))))
|
2005-08-06 15:55:38 +00:00
|
|
|
|
2004-04-04 01:21:46 +00:00
|
|
|
(defun url-cache-prepare (file)
|
|
|
|
"Makes it possible to cache data in FILE.
|
|
|
|
Creates any necessary parent directories, deleting any non-directory files
|
|
|
|
that would stop this. Returns nil if parent directories can not be
|
|
|
|
created. If FILE already exists as a non-directory, it changes
|
|
|
|
permissions of FILE or deletes FILE to make it possible to write a new
|
Typo and docstring fixes.
* url.el (url-do-setup):
* url-dired.el (url-dired-minor-mode):
* url-file.el (url-file-find-possibly-compressed-file):
* url-gw.el (url-gateway-broken-resolution):
* url-handlers.el (url-handler-regexp):
* url-imap.el (url-imap-default-port):
* url-methods.el (url-scheme-get-property): Fix typos in docstrings.
* url-auth.el (url-basic-auth-storage, url-digest-auth):
Fix typos in docstrings.
(url-digest-auth-storage, url-register-auth-scheme): Reflow docstrings.
* url-cache.el (url-cache-prepare): Doc fix.
(url-cache-create-filename-human-readable, url-cache-extract):
Fix typos in docstrings.
* url-dav.el (url-intersection, url-dav-iso8601-regexp)
(url-dav-delete-something): Fix typos in docstrings.
(url-dav-http-success-p, url-dav-file-name-all-completions)
(url-dav-directory-files, url-dav-file-name-completion): Doc fixes.
* url-http.el (url-http-idle-sentinel): Doc fix.
* url-irc.el (url-irc-default-port): Fix typo in docstring.
(url-irc-function): Doc fix.
* url-util.el (url-get-url-filename-chars, url-unhex-string):
Fix typos in docstrings.
(url-file-extension): Doc fix.
* url-vars.el (url-current-object, url-current-mime-headers)
(url-privacy-level, url-mail-command, url-mime-language-string):
Fix typos in docstrings.
(url-honor-refresh-requests): Reflow docstring.
(url-using-proxy): Doc fix.
2008-07-02 11:14:38 +00:00
|
|
|
version of FILE. Returns nil if this can not be done, or if FILE already
|
|
|
|
exists as a directory. Otherwise, returns t, indicating that
|
2004-04-04 01:21:46 +00:00
|
|
|
FILE can be created or overwritten."
|
|
|
|
(cond
|
|
|
|
((url-cache-file-writable-p file)
|
|
|
|
t)
|
|
|
|
((file-directory-p file)
|
|
|
|
nil)
|
|
|
|
(t
|
|
|
|
(condition-case ()
|
|
|
|
(or (make-directory (file-name-directory file) t) t)
|
|
|
|
(error nil)))))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun url-store-in-cache (&optional buff)
|
|
|
|
"Store buffer BUFF in the cache."
|
2010-09-10 18:55:55 -07:00
|
|
|
(with-current-buffer (get-buffer (or buff (current-buffer)))
|
|
|
|
(let ((fname (url-cache-create-filename (url-view-url t))))
|
|
|
|
(if (url-cache-prepare fname)
|
|
|
|
(let ((coding-system-for-write 'binary))
|
|
|
|
(write-region (point-min) (point-max) fname nil 5))))))
|
2005-08-06 15:55:38 +00:00
|
|
|
|
2010-09-19 11:48:11 -07:00
|
|
|
(defun url-fetch-from-cache (url)
|
|
|
|
"Fetch URL from cache and return a buffer with the content."
|
|
|
|
(with-current-buffer (generate-new-buffer " *temp*")
|
|
|
|
(url-cache-extract (url-cache-create-filename url))
|
|
|
|
(current-buffer)))
|
|
|
|
|
2004-04-04 01:21:46 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defun url-is-cached (url)
|
2010-09-18 13:43:13 -07:00
|
|
|
"Return non-nil if the URL is cached.
|
|
|
|
The actual return value is the last modification time of the cache file."
|
2004-04-04 01:21:46 +00:00
|
|
|
(let* ((fname (url-cache-create-filename url))
|
|
|
|
(attribs (file-attributes fname)))
|
|
|
|
(and fname ; got a filename
|
|
|
|
(file-exists-p fname) ; file exists
|
|
|
|
(not (eq (nth 0 attribs) t)) ; Its not a directory
|
|
|
|
(nth 5 attribs)))) ; Can get last mod-time
|
|
|
|
|
|
|
|
(defun url-cache-create-filename-human-readable (url)
|
Typo and docstring fixes.
* url.el (url-do-setup):
* url-dired.el (url-dired-minor-mode):
* url-file.el (url-file-find-possibly-compressed-file):
* url-gw.el (url-gateway-broken-resolution):
* url-handlers.el (url-handler-regexp):
* url-imap.el (url-imap-default-port):
* url-methods.el (url-scheme-get-property): Fix typos in docstrings.
* url-auth.el (url-basic-auth-storage, url-digest-auth):
Fix typos in docstrings.
(url-digest-auth-storage, url-register-auth-scheme): Reflow docstrings.
* url-cache.el (url-cache-prepare): Doc fix.
(url-cache-create-filename-human-readable, url-cache-extract):
Fix typos in docstrings.
* url-dav.el (url-intersection, url-dav-iso8601-regexp)
(url-dav-delete-something): Fix typos in docstrings.
(url-dav-http-success-p, url-dav-file-name-all-completions)
(url-dav-directory-files, url-dav-file-name-completion): Doc fixes.
* url-http.el (url-http-idle-sentinel): Doc fix.
* url-irc.el (url-irc-default-port): Fix typo in docstring.
(url-irc-function): Doc fix.
* url-util.el (url-get-url-filename-chars, url-unhex-string):
Fix typos in docstrings.
(url-file-extension): Doc fix.
* url-vars.el (url-current-object, url-current-mime-headers)
(url-privacy-level, url-mail-command, url-mime-language-string):
Fix typos in docstrings.
(url-honor-refresh-requests): Reflow docstring.
(url-using-proxy): Doc fix.
2008-07-02 11:14:38 +00:00
|
|
|
"Return a filename in the local cache for URL."
|
2004-04-04 01:21:46 +00:00
|
|
|
(if url
|
2010-09-25 13:59:05 -07:00
|
|
|
(let* ((urlobj (url-generic-parse-url url))
|
2004-04-04 01:21:46 +00:00
|
|
|
(protocol (url-type urlobj))
|
|
|
|
(hostname (url-host urlobj))
|
|
|
|
(host-components
|
|
|
|
(cons
|
|
|
|
(user-real-login-name)
|
|
|
|
(cons (or protocol "file")
|
|
|
|
(reverse (split-string (or hostname "localhost")
|
2010-10-03 14:37:41 -07:00
|
|
|
"\\.")))))
|
2004-04-04 01:21:46 +00:00
|
|
|
(fname (url-filename urlobj)))
|
|
|
|
(if (and fname (/= (length fname) 0) (= (aref fname 0) ?/))
|
|
|
|
(setq fname (substring fname 1 nil)))
|
|
|
|
(if fname
|
|
|
|
(let ((slash nil))
|
|
|
|
(setq fname
|
|
|
|
(mapconcat
|
|
|
|
(function
|
|
|
|
(lambda (x)
|
|
|
|
(cond
|
|
|
|
((and (= ?/ x) slash)
|
|
|
|
(setq slash nil)
|
|
|
|
"%2F")
|
|
|
|
((= ?/ x)
|
|
|
|
(setq slash t)
|
|
|
|
"/")
|
|
|
|
(t
|
|
|
|
(setq slash nil)
|
|
|
|
(char-to-string x))))) fname ""))))
|
|
|
|
|
|
|
|
(setq fname (and fname
|
|
|
|
(mapconcat
|
|
|
|
(function (lambda (x)
|
|
|
|
(if (= x ?~) "" (char-to-string x))))
|
|
|
|
fname ""))
|
|
|
|
fname (cond
|
|
|
|
((null fname) nil)
|
|
|
|
((or (string= "" fname) (string= "/" fname))
|
|
|
|
url-directory-index-file)
|
|
|
|
((= (string-to-char fname) ?/)
|
|
|
|
(if (string= (substring fname -1 nil) "/")
|
|
|
|
(concat fname url-directory-index-file)
|
|
|
|
(substring fname 1 nil)))
|
|
|
|
(t
|
|
|
|
(if (string= (substring fname -1 nil) "/")
|
|
|
|
(concat fname url-directory-index-file)
|
|
|
|
fname))))
|
|
|
|
(and fname
|
|
|
|
(expand-file-name fname
|
|
|
|
(expand-file-name
|
|
|
|
(mapconcat 'identity host-components "/")
|
|
|
|
url-cache-directory))))))
|
|
|
|
|
|
|
|
(defun url-cache-create-filename-using-md5 (url)
|
|
|
|
"Create a cached filename using MD5.
|
2004-04-12 04:02:25 +00:00
|
|
|
Very fast if you have an `md5' primitive function, suitably fast otherwise."
|
2004-04-04 01:21:46 +00:00
|
|
|
(if url
|
2010-09-25 13:59:05 -07:00
|
|
|
(let* ((checksum (md5 url))
|
2004-04-04 01:21:46 +00:00
|
|
|
(urlobj (url-generic-parse-url url))
|
|
|
|
(protocol (url-type urlobj))
|
|
|
|
(hostname (url-host urlobj))
|
|
|
|
(host-components
|
|
|
|
(cons
|
|
|
|
(user-real-login-name)
|
|
|
|
(cons (or protocol "file")
|
|
|
|
(nreverse
|
|
|
|
(delq nil
|
|
|
|
(split-string (or hostname "localhost")
|
2010-10-03 14:37:41 -07:00
|
|
|
"\\."))))))
|
2004-04-04 01:21:46 +00:00
|
|
|
(fname (url-filename urlobj)))
|
|
|
|
(and fname
|
|
|
|
(expand-file-name checksum
|
|
|
|
(expand-file-name
|
|
|
|
(mapconcat 'identity host-components "/")
|
|
|
|
url-cache-directory))))))
|
|
|
|
|
|
|
|
(defcustom url-cache-creation-function 'url-cache-create-filename-using-md5
|
2010-09-10 18:58:42 -07:00
|
|
|
"What function to use to create a cached filename."
|
2004-04-04 01:21:46 +00:00
|
|
|
:type '(choice (const :tag "MD5 of filename (low collision rate)"
|
|
|
|
:value url-cache-create-filename-using-md5)
|
|
|
|
(const :tag "Human readable filenames (higher collision rate)"
|
|
|
|
:value url-cache-create-filename-human-readable)
|
|
|
|
(function :tag "Other"))
|
|
|
|
:group 'url-cache)
|
|
|
|
|
|
|
|
(defun url-cache-create-filename (url)
|
2010-09-25 13:59:05 -07:00
|
|
|
(funcall url-cache-creation-function
|
|
|
|
;; We need to parse+recreate in order to remove the default port
|
|
|
|
;; if it has been specified: e.g. http://www.example.com:80 will
|
|
|
|
;; be transcoded as http://www.example.com
|
|
|
|
(url-recreate-url
|
|
|
|
(if (vectorp url) url
|
|
|
|
(url-generic-parse-url url)))))
|
2004-04-04 01:21:46 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun url-cache-extract (fnam)
|
Typo and docstring fixes.
* url.el (url-do-setup):
* url-dired.el (url-dired-minor-mode):
* url-file.el (url-file-find-possibly-compressed-file):
* url-gw.el (url-gateway-broken-resolution):
* url-handlers.el (url-handler-regexp):
* url-imap.el (url-imap-default-port):
* url-methods.el (url-scheme-get-property): Fix typos in docstrings.
* url-auth.el (url-basic-auth-storage, url-digest-auth):
Fix typos in docstrings.
(url-digest-auth-storage, url-register-auth-scheme): Reflow docstrings.
* url-cache.el (url-cache-prepare): Doc fix.
(url-cache-create-filename-human-readable, url-cache-extract):
Fix typos in docstrings.
* url-dav.el (url-intersection, url-dav-iso8601-regexp)
(url-dav-delete-something): Fix typos in docstrings.
(url-dav-http-success-p, url-dav-file-name-all-completions)
(url-dav-directory-files, url-dav-file-name-completion): Doc fixes.
* url-http.el (url-http-idle-sentinel): Doc fix.
* url-irc.el (url-irc-default-port): Fix typo in docstring.
(url-irc-function): Doc fix.
* url-util.el (url-get-url-filename-chars, url-unhex-string):
Fix typos in docstrings.
(url-file-extension): Doc fix.
* url-vars.el (url-current-object, url-current-mime-headers)
(url-privacy-level, url-mail-command, url-mime-language-string):
Fix typos in docstrings.
(url-honor-refresh-requests): Reflow docstring.
(url-using-proxy): Doc fix.
2008-07-02 11:14:38 +00:00
|
|
|
"Extract FNAM from the local disk cache."
|
2004-04-04 01:21:46 +00:00
|
|
|
(erase-buffer)
|
2011-07-06 09:47:15 +02:00
|
|
|
(set-buffer-multibyte nil)
|
2004-04-04 01:21:46 +00:00
|
|
|
(insert-file-contents-literally fnam))
|
|
|
|
|
2010-09-22 22:56:17 -07:00
|
|
|
(defun url-cache-expired (url &optional expire-time)
|
2010-09-22 22:59:20 -07:00
|
|
|
"Return non-nil if a cached URL is older than EXPIRE-TIME seconds.
|
|
|
|
The default value of EXPIRE-TIME is `url-cache-expire-time'.
|
|
|
|
If `url-standalone-mode' is non-nil, cached items never expire."
|
|
|
|
(if url-standalone-mode
|
|
|
|
(not (file-exists-p (url-cache-create-filename url)))
|
|
|
|
(let ((cache-time (url-is-cached url)))
|
2010-09-22 23:04:01 -07:00
|
|
|
(or (not cache-time)
|
|
|
|
(time-less-p
|
|
|
|
(time-add
|
|
|
|
cache-time
|
|
|
|
(seconds-to-time (or expire-time url-cache-expire-time)))
|
|
|
|
(current-time))))))
|
2004-04-04 01:21:46 +00:00
|
|
|
|
2012-02-06 22:06:15 +01:00
|
|
|
(defun url-cache-prune-cache (&optional directory)
|
|
|
|
"Remove all expired files from the cache.
|
|
|
|
`url-cache-expire-time' says how old a file has to be to be
|
|
|
|
considered \"expired\"."
|
Simplify use of current-time and friends.
* doc/misc/org.texi (Dynamic blocks):
* lisp/allout-widgets.el (allout-widgets-hook-error-handler):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/icalendar.el (icalendar--convert-float-to-ical):
* lisp/calendar/timeclock.el (timeclock-in, timeclock-when-to-leave)
(timeclock-last-period, timeclock-day-base):
* lisp/eshell/em-ls.el (eshell-ls-file):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/generic-x.el (named-database-print-serial):
* lisp/net/newst-backend.el (newsticker--get-news-by-url-callback)
(newsticker-get-news, newsticker--sentinel-work)
(newsticker--image-get, newsticker--image-sentinel):
* lisp/net/tramp-sh.el (tramp-get-remote-touch):
* lisp/progmodes/opascal.el (opascal-debug-log):
* lisp/textmodes/remember.el (remember-mail-date)
(remember-store-in-files):
* lisp/vc/vc-annotate.el (vc-annotate-display-autoscale)
(vc-default-annotate-current-time):
* lisp/vc/vc-bzr.el (vc-bzr-shelve-snapshot):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time):
* lisp/vc/vc-rcs.el (vc-rcs-annotate-current-time):
* lisp/url/url-util.el (url-get-normalized-date):
* lisp/erc/erc-backend.el (TOPIC):
* lisp/gnus/gnus-delay.el (gnus-delay-article):
* lisp/gnus/gnus-sum.el (gnus-summary-read-document):
* lisp/gnus/gnus-util.el (gnus-seconds-today, gnus-seconds-month):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/org/org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling):
* lisp/org/org-clock.el (org-resolve-clocks, org-clock-get-sum-start)
(org-clock-special-range):
* lisp/org/org-timer.el (org-timer-seconds):
* lisp/org/org.el (org-read-date-analyze, org-get-cursor-date):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-icalendar.el (org-icalendar--vtodo):
Omit unnecessary call to current-time.
* lisp/calendar/time-date.el (time-to-seconds) [!float-time]:
* lisp/calendar/timeclock.el (timeclock-time-to-date):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Use current time if arg is nil, to be compatible with float-time.
(time-date--day-in-year): New function, with most of the guts of
the old time-to-day-in-year.
(time-to-day-in-year): Use it.
(time-to-days): Use it, to avoid decoding the same time stamp twice.
* lisp/calendar/timeclock.el (timeclock-update-mode-line):
* lisp/cedet/srecode/args.el (srecode-semantic-handle-:time):
* lisp/gnus/gnus-util.el (gnus-seconds-year):
* lisp/org/org.el (org-get-cursor-date):
Don't call current-time twice to get the current time stamp,
as this can lead to inconsistent results.
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/erc/erc.el (erc-emacs-time-to-erc-time):
* lisp/ido.el (ido-time-stamp):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Simplify by using float-time.
* lisp/completion.el (save-completions-to-file):
* lisp/url/url-cache.el (url-cache-prune-cache):
Rename local var to avoid confusion.
* lisp/gnus/gnus-util.el (gnus-float-time):
* lisp/net/rcirc.el (rcirc-float-time):
* lisp/org/org-compat.el (org-float-time):
Simplify to an alias because time-to-seconds now behaves like float-time
with respect to nil arg.
* lisp/subr.el (progress-reporter-do-update):
Don't call float-time unless needed.
* lisp/erc/erc.el (erc-current-time): Simplify by using erc-emacs-time-to-erc-time.
* lisp/org/org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy
conversion from floating point to Emacs time and back.
(org-resolve-clocks): Prefer two-argument floor.
2014-10-28 18:42:51 -07:00
|
|
|
(let ((now (current-time))
|
2012-02-06 22:06:15 +01:00
|
|
|
(total-files 0)
|
|
|
|
(deleted-files 0))
|
2012-02-06 22:37:56 +01:00
|
|
|
(setq directory (or directory url-cache-directory))
|
|
|
|
(when (file-exists-p directory)
|
|
|
|
(dolist (file (directory-files directory t))
|
|
|
|
(unless (member (file-name-nondirectory file) '("." ".."))
|
|
|
|
(setq total-files (1+ total-files))
|
|
|
|
(cond
|
|
|
|
((file-directory-p file)
|
|
|
|
(when (url-cache-prune-cache file)
|
|
|
|
(setq deleted-files (1+ deleted-files))))
|
|
|
|
((time-less-p
|
|
|
|
(time-add
|
|
|
|
(nth 5 (file-attributes file))
|
|
|
|
(seconds-to-time url-cache-expire-time))
|
Simplify use of current-time and friends.
* doc/misc/org.texi (Dynamic blocks):
* lisp/allout-widgets.el (allout-widgets-hook-error-handler):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/icalendar.el (icalendar--convert-float-to-ical):
* lisp/calendar/timeclock.el (timeclock-in, timeclock-when-to-leave)
(timeclock-last-period, timeclock-day-base):
* lisp/eshell/em-ls.el (eshell-ls-file):
* lisp/eshell/esh-util.el (eshell-parse-ange-ls):
* lisp/generic-x.el (named-database-print-serial):
* lisp/net/newst-backend.el (newsticker--get-news-by-url-callback)
(newsticker-get-news, newsticker--sentinel-work)
(newsticker--image-get, newsticker--image-sentinel):
* lisp/net/tramp-sh.el (tramp-get-remote-touch):
* lisp/progmodes/opascal.el (opascal-debug-log):
* lisp/textmodes/remember.el (remember-mail-date)
(remember-store-in-files):
* lisp/vc/vc-annotate.el (vc-annotate-display-autoscale)
(vc-default-annotate-current-time):
* lisp/vc/vc-bzr.el (vc-bzr-shelve-snapshot):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-current-time):
* lisp/vc/vc-rcs.el (vc-rcs-annotate-current-time):
* lisp/url/url-util.el (url-get-normalized-date):
* lisp/erc/erc-backend.el (TOPIC):
* lisp/gnus/gnus-delay.el (gnus-delay-article):
* lisp/gnus/gnus-sum.el (gnus-summary-read-document):
* lisp/gnus/gnus-util.el (gnus-seconds-today, gnus-seconds-month):
* lisp/gnus/message.el (message-make-expires-date):
* lisp/org/org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling):
* lisp/org/org-clock.el (org-resolve-clocks, org-clock-get-sum-start)
(org-clock-special-range):
* lisp/org/org-timer.el (org-timer-seconds):
* lisp/org/org.el (org-read-date-analyze, org-get-cursor-date):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-icalendar.el (org-icalendar--vtodo):
Omit unnecessary call to current-time.
* lisp/calendar/time-date.el (time-to-seconds) [!float-time]:
* lisp/calendar/timeclock.el (timeclock-time-to-date):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Use current time if arg is nil, to be compatible with float-time.
(time-date--day-in-year): New function, with most of the guts of
the old time-to-day-in-year.
(time-to-day-in-year): Use it.
(time-to-days): Use it, to avoid decoding the same time stamp twice.
* lisp/calendar/timeclock.el (timeclock-update-mode-line):
* lisp/cedet/srecode/args.el (srecode-semantic-handle-:time):
* lisp/gnus/gnus-util.el (gnus-seconds-year):
* lisp/org/org.el (org-get-cursor-date):
Don't call current-time twice to get the current time stamp,
as this can lead to inconsistent results.
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/erc/erc.el (erc-emacs-time-to-erc-time):
* lisp/ido.el (ido-time-stamp):
* lisp/vc/vc-annotate.el (vc-annotate-convert-time):
Simplify by using float-time.
* lisp/completion.el (save-completions-to-file):
* lisp/url/url-cache.el (url-cache-prune-cache):
Rename local var to avoid confusion.
* lisp/gnus/gnus-util.el (gnus-float-time):
* lisp/net/rcirc.el (rcirc-float-time):
* lisp/org/org-compat.el (org-float-time):
Simplify to an alias because time-to-seconds now behaves like float-time
with respect to nil arg.
* lisp/subr.el (progress-reporter-do-update):
Don't call float-time unless needed.
* lisp/erc/erc.el (erc-current-time): Simplify by using erc-emacs-time-to-erc-time.
* lisp/org/org-clock.el (org-clock-get-table-data): Omit unnecessary, lossy
conversion from floating point to Emacs time and back.
(org-resolve-clocks): Prefer two-argument floor.
2014-10-28 18:42:51 -07:00
|
|
|
now)
|
2012-02-06 22:37:56 +01:00
|
|
|
(delete-file file)
|
|
|
|
(setq deleted-files (1+ deleted-files))))))
|
|
|
|
(if (< deleted-files total-files)
|
|
|
|
nil
|
|
|
|
(delete-directory directory)
|
|
|
|
t))))
|
2012-02-06 22:06:15 +01:00
|
|
|
|
2004-04-04 01:21:46 +00:00
|
|
|
(provide 'url-cache)
|
2004-04-04 04:44:10 +00:00
|
|
|
|
2004-10-19 21:36:56 +00:00
|
|
|
;;; url-cache.el ends here
|