(require 'nnheader)
(require 'nnmail)
-(eval-when-compile (require 'cl))
+(require 'nnoo)
+(require 'gnus-util)
+(require 'cl)
-(defvar nneething-map-file-directory "~/.nneething/"
+(nnoo-declare nneething)
+
+(defvoo nneething-map-file-directory "~/.nneething/"
"*Where nneething stores the map files.")
-(defvar nneething-map-file ".nneething"
+(defvoo nneething-map-file ".nneething"
"*Name of the map files.")
-(defvar nneething-exclude-files nil
+(defvoo nneething-exclude-files nil
"*Regexp saying what files to exclude from the group.
If this variable is nil, no files will be excluded.")
(defconst nneething-version "nneething 1.0"
"nneething version.")
-(defvar nneething-current-directory nil
+(defvoo nneething-current-directory nil
"Current news group directory.")
-(defvar nneething-status-string "")
-(defvar nneething-group-alist nil)
-
-(defvar nneething-message-id-number 0)
-(defvar nneething-work-buffer " *nneething work*")
-
-(defvar nneething-directory nil)
-(defvar nneething-group nil)
-(defvar nneething-map nil)
-(defvar nneething-read-only nil)
-(defvar nneething-active nil)
+(defvoo nneething-status-string "")
+(defvoo nneething-group-alist nil)
-\f
+(defvoo nneething-message-id-number 0)
+(defvoo nneething-work-buffer " *nneething work*")
-(defvar nneething-current-server nil)
-(defvar nneething-server-alist)
-(defvar nneething-server-variables
- `((nneething-directory ,nneething-directory)
- (nneething-current-directory nil)
- (nneething-status-string "")
- (nneething-active nil)
- (nneething-read-only nil)
- (nneething-map nil)
- (nneething-group nil)
- (nneething-work-buffer ,nneething-work-buffer)
- (nneething-message-id-number ,nneething-message-id-number)
- (nneething-exclude-files nil)
- (nneething-map-file ,nneething-map-file)
- (nneething-map-file-directory ,nneething-map-file-directory)
- (nneething-group-alist nil)))
+(defvoo nneething-directory nil)
+(defvoo nneething-group nil)
+(defvoo nneething-map nil)
+(defvoo nneething-read-only nil)
+(defvoo nneething-active nil)
\f
;;; Interface functions.
-(defun nneething-retrieve-headers (articles &optional group server fetch-old)
+(nnoo-define-basics nneething)
+
+(deffoo nneething-retrieve-headers (articles &optional group server fetch-old)
(nneething-possibly-change-directory group)
(save-excursion
(when (and (file-exists-p file)
(or (file-directory-p file)
- (not (zerop (nth 7 (file-attributes file))))))
+ (not (zerop (nnheader-file-size file)))))
(insert (format "221 %d Article retrieved.\n" article))
(nneething-insert-head file)
(insert ".\n"))
(nnheader-fold-continuation-lines)
'headers))))
-(defun nneething-open-server (server &optional defs)
- (nnheader-report 'nneething "")
- (nnheader-init-server-buffer))
-
-(defun nneething-close-server (&optional server)
- (setq nneething-current-directory nil)
- t)
-
-(defun nneething-server-opened (&optional server)
- nneething-current-directory)
-
-(defun nneething-status-message (&optional server)
- nneething-status-string)
-
-(defun nneething-request-article (id &optional group server buffer)
+(deffoo nneething-request-article (id &optional group server buffer)
(nneething-possibly-change-directory group)
(let ((file (unless (stringp id) (nneething-file-name id)))
(nntp-server-buffer (or buffer nntp-server-buffer)))
(or (nnheader-article-p) ; Either it's a real article...
(progn
(goto-char (point-min))
- (nneething-make-head file) ; ... or we fake some headers.
+ (nneething-make-head file (current-buffer)) ; ... or we fake some headers.
(insert "\n")))
t))))
-(defun nneething-request-group (group &optional dir dont-check)
+(deffoo nneething-request-group (group &optional dir dont-check)
(nneething-possibly-change-directory group dir)
(unless dont-check
(nneething-create-mapping)
group)))
t)
-(defun nneething-request-list (&optional server dir)
+(deffoo nneething-request-list (&optional server dir)
(nnheader-report 'nneething "LIST is not implemented."))
-(defun nneething-request-newgroups (date &optional server)
+(deffoo nneething-request-newgroups (date &optional server)
(nnheader-report 'nneething "NEWSGROUPS is not implemented."))
-(defun nneething-request-type (group &optional article)
+(deffoo nneething-request-type (group &optional article)
'unknown)
-(defun nneething-close-group (group &optional server)
+(deffoo nneething-close-group (group &optional server)
(setq nneething-current-directory nil)
t)
(defun nneething-map-file ()
;; We make sure that the .nneething directory exists.
- (unless (file-exists-p nneething-map-file-directory)
- (make-directory nneething-map-file-directory 'parents))
+ (gnus-make-directory nneething-map-file-directory)
;; We store it in a special directory under the user's home dir.
(concat (file-name-as-directory nneething-map-file-directory)
nneething-group nneething-map-file))
(setq files (cdr files)))
(when (and touched
(not nneething-read-only))
- (save-excursion
- (nnheader-set-temp-buffer " *nneething map*")
- (insert "(setq nneething-map '" (prin1-to-string nneething-map) ")\n"
- "(setq nneething-active '" (prin1-to-string nneething-active)
- ")\n")
- (write-region (point-min) (point-max) map-file nil 'nomesg)
- (kill-buffer (current-buffer))))))
+ (nnheader-temp-write map-file
+ (insert "(setq nneething-map '")
+ (gnus-prin1 nneething-map)
+ (insert ")\n(setq nneething-active '")
+ (gnus-prin1 nneething-active)
+ (insert ")\n")))))
(defun nneething-insert-head (file)
"Insert the head of FILE."
(when (nneething-get-head file)
- (insert-buffer-substring nneething-work-buffer)))
+ (insert-buffer-substring nneething-work-buffer)
+ (goto-char (point-max))))
-(defun nneething-make-head (file)
+(defun nneething-make-head (file &optional buffer)
"Create a head by looking at the file attributes of FILE."
(let ((atts (file-attributes file)))
(insert
"Message-ID: <nneething-"
(int-to-string (incf nneething-message-id-number))
"@" (system-name) ">\n"
- "Date: " (current-time-string (nth 5 atts)) "\n"
- (nneething-from-line (nth 2 atts))
- "Chars: " (int-to-string (nth 7 atts)) "\n")))
+ (if (equal '(0 0) (nth 5 atts)) ""
+ (concat "Date: " (current-time-string (nth 5 atts)) "\n"))
+ (or (if buffer
+ (save-excursion
+ (set-buffer buffer)
+ (if (re-search-forward "<[a-zA-Z0-9_]@[-a-zA-Z0-9_]>" 1000 t)
+ (concat "From: " (match-string 0) "\n"))))
+ (nneething-from-line (nth 2 atts) file))
+ (if (> (string-to-int (int-to-string (nth 7 atts))) 0)
+ (concat "Chars: " (int-to-string (nth 7 atts)) "\n")
+ "")
+ (if buffer
+ (save-excursion
+ (set-buffer buffer)
+ (concat "Lines: " (int-to-string
+ (count-lines (point-min) (point-max))) "\n"))
+ "")
+ )))
-(defun nneething-from-line (uid)
+(defun nneething-from-line (uid &optional file)
"Return a From header based of UID."
- (let ((login (condition-case nil
- (user-login-name uid)
+ (let* ((login (condition-case nil
+ (user-login-name uid)
+ (error
+ (cond ((= uid (user-uid)) (user-login-name))
+ ((zerop uid) "root")
+ (t (int-to-string uid))))))
+ (name (condition-case nil
+ (user-full-name uid)
(error
- (cond ((= uid (user-uid)) (user-login-name))
- ((zerop uid) "root")
- (t (int-to-string uid))))))
- (name (condition-case nil
- (user-full-name uid)
- (error
- (cond ((= uid (user-uid)) (user-full-name))
- ((zerop uid) "Ms. Root"))))))
- (concat "From: " login "@" (system-name)
+ (cond ((= uid (user-uid)) (user-full-name))
+ ((zerop uid) "Ms. Root")))))
+ (host (if (string-match "\\`/[^/@]*@\\([^:/]+\\):" file)
+ (prog1
+ (substring file
+ (match-beginning 1)
+ (match-end 1))
+ (if (string-match "/\\(users\\|home\\)/\\([^/]+\\)/" file)
+ (setq login (substring file
+ (match-beginning 2)
+ (match-end 2))
+ name nil)))
+ (system-name))))
+ (concat "From: " login "@" host
(if name (concat " (" name ")") "") "\n")))
(defun nneething-get-head (file)
(1- (point)))
(point-max)))
(point-max))
- (erase-buffer)
- (nneething-make-head file))
+ (goto-char (point-min))
+ (nneething-make-head file (current-buffer))
+ (delete-region (point) (point-max)))
t))))
(defun nneething-file-name (article)
projects / gnus / blobdiff