X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-delay.el;h=05bbaf534658cd436f88b85452c4c57273199b99;hb=51894eadf581f5473825a112f1fbd4c78acfdfcf;hp=58b39529ea878e5b33ef8a92a775c95d0eb5caca;hpb=eac3378189223bac2542f246ece2b2d146c9817f;p=gnus diff --git a/lisp/gnus-delay.el b/lisp/gnus-delay.el index 58b39529e..05bbaf534 100644 --- a/lisp/gnus-delay.el +++ b/lisp/gnus-delay.el @@ -1,93 +1,179 @@ -;;; gnus-delay.el --- Delayed posting of articles -*- coding: latin-1; -*- +;;; gnus-delay.el --- Delayed posting of articles -;; Copyright (C) 2001 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Kai Großjohann ;; Keywords: mail, news, extensions -;; This file is free software; you can redistribute it and/or modify +;; This file is part of GNU Emacs. + +;; GNU Emacs 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. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. -;; This file is distributed in the hope that it will be useful, +;; 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 -;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: ;; Provide delayed posting of articles. +;;; Todo: + +;; * `gnus-delay-send-queue' barfs when group does not exist. +;; * Integrate gnus-delay.el into the rest of Gnus automatically. How +;; should this be done? Basically, we need to do what +;; `gnus-delay-initialize' does. But in which files? + ;;; Code: (require 'nndraft) (require 'gnus-draft) +(autoload 'parse-time-string "parse-time" nil nil) + +(defgroup gnus-delay nil + "Arrange for sending postings later." + :version "22.1" + :group 'gnus) + +(defcustom gnus-delay-group "delayed" + "Group name for storing delayed articles." + :type 'string + :group 'gnus-delay) + +(defcustom gnus-delay-header "X-Gnus-Delayed" + "Header name for storing info about delayed articles." + :type 'string + :group 'gnus-delay) + +(defcustom gnus-delay-default-delay "3d" + "*Default length of delay." + :type 'string + :group 'gnus-delay) + +(defcustom gnus-delay-default-hour 8 + "*If deadline is given as date, then assume this time of day." + :version "22.1" + :type 'integer + :group 'gnus-delay) -(defvar gnus-delay-group "delayed" - "Group name for storing delayed articles.") +;;;###autoload +(defun gnus-delay-article (delay) + "Delay this article by some time. +DELAY is a string, giving the length of the time. Possible values are: -(defvar gnus-delay-header "X-Gnus-Delayed" - "Header name for storing info about delayed articles.") +* for in minutes (`m'), hours (`h'), days (`d'), + weeks (`w'), months (`M'), or years (`Y'); -(defvar gnus-delay-default-delay "3d" - "*Default length of delay.") +* YYYY-MM-DD for a specific date. The time of day is given by the + variable `gnus-delay-default-hour', minute and second are zero. -(defun gnus-delay-article (delay) - "Delay this article by some time. -DELAY is a string, giving the length of the time. Possible values are -like 3d (meaning 3 days) or 2w (meaning two weeks)." +* hh:mm for a specific time. Use 24h format. If it is later than this + time, then the deadline is tomorrow, else today." (interactive - (list (read-string (format "Length of delay (default `%s'): " - gnus-delay-default-delay) - nil nil gnus-delay-default-delay nil))) - (let (num unit days deadline) - (unless (string-match "\\([0-9]+\\)\\s-*\\([dw]\\)" delay) - (error "Malformed delay `%s'" delay)) - (setq num (match-string 1 delay)) - (setq unit (match-string 2 delay)) - (if (string= unit "w") - (setq delay (* 7 (string-to-number num))) - (setq delay (string-to-number num))) - (setq deadline (message-make-date - (seconds-to-time (+ (time-to-seconds (current-time)) - (* delay 24 60 60))))) + (list (read-string + "Target date (YYYY-MM-DD) or length of delay (units in [mhdwMY]): " + gnus-delay-default-delay))) + (let (num unit days year month day hour minute deadline) + (cond ((string-match + "\\([0-9][0-9][0-9]?[0-9]?\\)-\\([0-9]+\\)-\\([0-9]+\\)" + delay) + (setq year (string-to-number (match-string 1 delay)) + month (string-to-number (match-string 2 delay)) + day (string-to-number (match-string 3 delay))) + (setq deadline + (message-make-date + (encode-time 0 0 ; second and minute + gnus-delay-default-hour + day month year)))) + ((string-match "\\([0-9]+\\):\\([0-9]+\\)" delay) + (setq hour (string-to-number (match-string 1 delay)) + minute (string-to-number (match-string 2 delay))) + ;; Use current time, except... + (setq deadline (apply 'vector (decode-time (current-time)))) + ;; ... for minute and hour. + (aset deadline 1 minute) + (aset deadline 2 hour) + ;; Convert to seconds. + (setq deadline (gnus-float-time (apply 'encode-time + (append deadline nil)))) + ;; If this time has passed already, add a day. + (when (< deadline (gnus-float-time)) + (setq deadline (+ 3600 deadline))) ;3600 secs/day + ;; Convert seconds to date header. + (setq deadline (message-make-date + (seconds-to-time deadline)))) + ((string-match "\\([0-9]+\\)\\s-*\\([mhdwMY]\\)" delay) + (setq num (match-string 1 delay)) + (setq unit (match-string 2 delay)) + ;; Start from seconds, then multiply into needed units. + (setq num (string-to-number num)) + (cond ((string= unit "Y") + (setq delay (* num 60 60 24 365))) + ((string= unit "M") + (setq delay (* num 60 60 24 30))) + ((string= unit "w") + (setq delay (* num 60 60 24 7))) + ((string= unit "d") + (setq delay (* num 60 60 24))) + ((string= unit "h") + (setq delay (* num 60 60))) + (t + (setq delay (* num 60)))) + (setq deadline (message-make-date + (seconds-to-time (+ (gnus-float-time) delay))))) + (t (error "Malformed delay `%s'" delay))) (message-add-header (format "%s: %s" gnus-delay-header deadline))) (set-buffer-modified-p t) - (nndraft-request-create-group gnus-delay-group) + ;; If group does not exist, create it. + (let ((group (format "nndraft:%s" gnus-delay-group))) + (gnus-agent-queue-setup gnus-delay-group)) (message-disassociate-draft) (nndraft-request-associate-buffer gnus-delay-group) (save-buffer 0) (kill-buffer (current-buffer)) (message-do-actions message-postpone-actions)) -(defun gnus-delay-send-drafts () +;;;###autoload +(defun gnus-delay-send-queue () "Send all the delayed messages that are due now." (interactive) (save-excursion (let* ((group (format "nndraft:%s" gnus-delay-group)) - (articles (nndraft-articles)) - article deadline) - (gnus-activate-group group) - (while (setq article (pop articles)) - (gnus-request-head article group) - (set-buffer nntp-server-buffer) - (unless (re-search-forward - (concat "^" (regexp-quote gnus-delay-header) ":\\s-+")) - (error "Couldn't find delay for article %d" article)) - (setq deadline (nnheader-header-value)) - (setq deadline (apply 'encode-time (parse-time-string deadline))) - (setq deadline (time-since deadline)) - (when (and (>= (nth 0 deadline) 0) - (>= (nth 1 deadline) 0)) - (message "Sending article %d" article) - (gnus-draft-send article group) - (message "Sending article %d...done" article)))))) + (message-send-hook (copy-sequence message-send-hook)) + articles + article deadline) + (when (gnus-group-entry group) + (gnus-activate-group group) + (add-hook 'message-send-hook + '(lambda () + (message-remove-header gnus-delay-header))) + (setq articles (nndraft-articles)) + (while (setq article (pop articles)) + (gnus-request-head article group) + (set-buffer nntp-server-buffer) + (goto-char (point-min)) + (if (re-search-forward + (concat "^" (regexp-quote gnus-delay-header) ":\\s-+") + nil t) + (progn + (setq deadline (nnheader-header-value)) + (setq deadline (apply 'encode-time + (parse-time-string deadline))) + (setq deadline (time-since deadline)) + (when (and (>= (nth 0 deadline) 0) + (>= (nth 1 deadline) 0)) + (message "Sending delayed article %d" article) + (gnus-draft-send article group) + (message "Sending delayed article %d...done" article))) + (message "Delay header missing for article %d" article))))))) ;;;###autoload (defun gnus-delay-initialize (&optional no-keymap no-check) @@ -95,13 +181,15 @@ like 3d (meaning 3 days) or 2w (meaning two weeks)." This sets up a key binding in `message-mode' to delay a message. This tells Gnus to look for delayed messages after getting new news. -Key binding is skipped if optional arg NO-KEYMAP is non-nil. +The optional arg NO-KEYMAP is ignored. Checking delayed messages is skipped if optional arg NO-CHECK is non-nil." - (unless no-keymap - (require 'message) - (define-key message-mode-map (kbd "C-c C-j") 'gnus-delay-article)) (unless no-check - (add-hook 'gnus-get-new-news-hook 'gnus-delay-send-drafts))) + (add-hook 'gnus-get-new-news-hook 'gnus-delay-send-queue))) (provide 'gnus-delay) + +;; Local Variables: +;; coding: iso-8859-1 +;; End: + ;;; gnus-delay.el ends here