Many changes. Local browse initial
This commit is contained in:
parent
fc60b7d2f3
commit
94ad808dcb
@ -26,7 +26,7 @@
|
||||
|
||||
;;; Code:
|
||||
|
||||
(require 'idec-mode)
|
||||
(require 'idec)
|
||||
(require 'web)
|
||||
|
||||
(defun replace-in-string (what with str)
|
||||
|
22
idec-db.el
22
idec-db.el
@ -145,21 +145,21 @@ unread by default, but you can MARK-READ it."
|
||||
(defun make-hash-from-msg-list (msg-list)
|
||||
"Return hash table maded from MSG-LIST."
|
||||
(let (msg-hash)
|
||||
(setq msg-hash (make-hash-table :test 'equal))
|
||||
(if (and
|
||||
(listp msg-list)
|
||||
(> (length msg-list) 0))
|
||||
(let ()
|
||||
(setq msg-hash (make-hash-table :test 'equal))
|
||||
(puthash "id" (nth 0 l) msg-hash)
|
||||
(puthash "tags" (nth 1 l) msg-hash)
|
||||
(puthash "author" (nth 2 l) msg-hash)
|
||||
(puthash "recipient" (nth 3 l) msg-hash)
|
||||
(puthash "repto" (nth 4 l) msg-hash)
|
||||
(puthash "echo" (nth 5 l) msg-hash)
|
||||
(puthash "subj" (nth 6 l) msg-hash)
|
||||
(puthash "body" (nth 7 l) msg-hash)
|
||||
(puthash "time" (nth 8 l) msg-hash)
|
||||
(puthash "unread" (nth 9 l) msg-hash)))
|
||||
(puthash "id" (nth 0 msg-list) msg-hash)
|
||||
(puthash "tags" (nth 1 msg-list) msg-hash)
|
||||
(puthash "author" (nth 2 msg-list) msg-hash)
|
||||
(puthash "recipient" (nth 3 msg-list) msg-hash)
|
||||
(puthash "repto" (nth 4 msg-list) msg-hash)
|
||||
(puthash "echo" (nth 5 msg-list) msg-hash)
|
||||
(puthash "subj" (nth 6 msg-list) msg-hash)
|
||||
(puthash "body" (nth 7 msg-list) msg-hash)
|
||||
(puthash "time" (nth 8 msg-list) msg-hash)
|
||||
(puthash "unread" (nth 9 msg-list) msg-hash)))
|
||||
msg-hash))
|
||||
|
||||
(defun get-echo-messages (echo)
|
||||
|
245
idec-mode.el
245
idec-mode.el
@ -26,6 +26,110 @@
|
||||
|
||||
;;; Code:
|
||||
|
||||
(require 'idec)
|
||||
(require 'idec-online)
|
||||
|
||||
(defgroup idec nil
|
||||
"IDEC configuration."
|
||||
:group 'network)
|
||||
|
||||
;; Not used
|
||||
(defcustom idec-nodes-list
|
||||
"http://idec.spline-online.tk/,https://ii-net.tk/ii/ii-point.php?q=/"
|
||||
"List(comma separated) of IDEC nodes."
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-primary-node nil
|
||||
"Primary node to send messages."
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
;; Never used at this time.
|
||||
(defcustom idec-use-list-txt t
|
||||
"Use /list.txt extension."
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-smart-fetch t
|
||||
"Enable smat fetching;
|
||||
Download only new messages; Not implemented."
|
||||
:type 'boolean
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-download-limit "50"
|
||||
"Limit of download messages;
|
||||
Not used if `idec-smart-fetching' is not nil."
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-download-offset "-50"
|
||||
"Offset of download messages;
|
||||
Not used if `idec-smart-fetching' is not nil."
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-echo-subscriptions nil
|
||||
"List of subribes echoes."
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-mail-dir "~/.emacs.d/idec-mail"
|
||||
"Directory to store mail."
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-online-download-limit "0"
|
||||
"Download limit on online browsing;
|
||||
Default to `idec-download-lmit'"
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-online-download-offset "0"
|
||||
"Download limit on online browsing;
|
||||
Default to `idec-download-offset'"
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
(defgroup idec-accounts nil
|
||||
"IDEC accounts settings."
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-account-nick ""
|
||||
"Account nickname."
|
||||
:type 'string
|
||||
:group 'idec-accounts)
|
||||
|
||||
(defcustom idec-account-node ""
|
||||
"Node to send messages."
|
||||
:type 'string
|
||||
:group 'idec-accounts)
|
||||
|
||||
(defcustom idec-account-auth ""
|
||||
"Account authstring."
|
||||
:type 'string
|
||||
:group 'idec-accounts)
|
||||
|
||||
;; END OF CUSTOMIZATION
|
||||
;; ;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
;; VARIABLES
|
||||
;; ;;;;;;;;;
|
||||
|
||||
(defvar smart-download-limit nil
|
||||
"Used with `idec-smart-fetch'.")
|
||||
|
||||
(defvar smart-download-offset nil
|
||||
"Used with `idec-smart-fetch'.")
|
||||
|
||||
(defvar new-messages-list nil
|
||||
"New messages for display.")
|
||||
|
||||
(setq idec-online-download-limit idec-download-limit)
|
||||
(setq idec-online-download-offset idec-download-offset)
|
||||
|
||||
;; END OF VARIABLES
|
||||
;; ;;;;;;;;;;;;;;;;
|
||||
|
||||
;; MODE
|
||||
;; ;;;;
|
||||
|
||||
@ -102,6 +206,145 @@
|
||||
(setq imenu-generic-expression "*IDEC")
|
||||
(run-hooks 'idec-mode-hook))
|
||||
|
||||
(provide 'idec-mode)
|
||||
(defun idec-mark-all-as-read (&optional echo)
|
||||
"Mark all messages in ECHO as read."
|
||||
(interactive)
|
||||
(if (not echo)
|
||||
(mark-all-messages-as-read (read-string "Enter echo name: "))
|
||||
(mark-all-messages-as-read echo)))
|
||||
|
||||
(defun idec-local-browse (&optional checkpoint)
|
||||
"Browse local mail from `idec-mail-dir';
|
||||
optionaly return cursor to CHECKPOINT."
|
||||
(interactive)
|
||||
(get-buffer-create "*IDEC: INBOX*")
|
||||
(with-output-to-temp-buffer (get-buffer-create "*IDEC: INBOX*")
|
||||
(switch-to-buffer "*IDEC: INBOX*")
|
||||
(save-excursion
|
||||
(dolist (echo (get-local-echoes))
|
||||
(if echo
|
||||
(let (unread start end)
|
||||
;; Echo name with unread messages
|
||||
;; ii.test.14 (5)*
|
||||
(insert-button echo
|
||||
'action (lambda (x) (browse-local-echo (button-get x 'echo)))
|
||||
'echo echo
|
||||
'(face nil))
|
||||
|
||||
(beginning-of-line)
|
||||
(setq start (point))
|
||||
(end-of-line)
|
||||
(setq end (point))
|
||||
(add-text-properties start end '(comment t face '(:foreground "light green")))
|
||||
|
||||
(princ (concat (dots echo)
|
||||
"("
|
||||
(number-to-string (get-echo-messages-count echo))
|
||||
")"))
|
||||
|
||||
(setq unread (get-echo-unread-messages echo))
|
||||
(when (> unread 0)
|
||||
(princ "*"))
|
||||
(princ " ")
|
||||
|
||||
;; [New message] button
|
||||
(princ "\t[")
|
||||
(insert-button "New message"
|
||||
'action (lambda (x) (idec-new-message (button-get x 'echo)))
|
||||
'echo echo)
|
||||
(princ "]\t[")
|
||||
;; [Mark read] button
|
||||
(insert-button "Mark read"
|
||||
'action (lambda (x) (mark-all-as-read (button-get x 'echo) (button-get x 'point)))
|
||||
'echo echo
|
||||
'point (point))
|
||||
(princ "]\n"))
|
||||
(message (concat "IDEC: FUUUUUU <" echo ">")))
|
||||
))
|
||||
(add-text-properties (point-min) (point-max) 'read-only))
|
||||
(if checkpoint
|
||||
(goto-char checkpoint))
|
||||
(idec-mode))
|
||||
|
||||
(defun browse-local-echo (&optional echo)
|
||||
"Get messages from local ECHO."
|
||||
(interactive)
|
||||
(if (not echo)
|
||||
(setq echo (read-string "Enter echo name: ")))
|
||||
(with-output-to-temp-buffer (get-buffer-create (concat "*IDEC: INBOX->(" echo ")") )
|
||||
(switch-to-buffer (concat "*IDEC: INBOX->(" echo ")"))
|
||||
(let (counter)
|
||||
(setq counter 0)
|
||||
(dolist (msg (get-echo-messages echo))
|
||||
(insert-button (concat (gethash "subj" msg) "\n")
|
||||
'action (lambda (x) (message (button-get x 'subj)))
|
||||
'subj (gethash "subj" msg)
|
||||
'help-echo (concat "Read message *" (gethash "subj" msg) "*") )
|
||||
))
|
||||
(idec-mode)))
|
||||
|
||||
|
||||
;; NAVIGATION FUNCTIONS
|
||||
;; ;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(defun idec-next-message ()
|
||||
"Show next message."
|
||||
(interactive)
|
||||
(kill-this-buffer)
|
||||
(forward-button 1)
|
||||
(push-button))
|
||||
|
||||
(defun idec-previous-message ()
|
||||
"Show next message."
|
||||
(interactive)
|
||||
(kill-this-buffer)
|
||||
(backward-button 1)
|
||||
(push-button))
|
||||
|
||||
;; END OF NAVIGATION FUNCTIONS
|
||||
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
|
||||
(defun idec-load-new-messages ()
|
||||
"Load new messages from IDEC `idec-primary-node'."
|
||||
(interactive)
|
||||
(defvar current-echo nil)
|
||||
(setq new-messages-list (make-hash-table :test 'equal))
|
||||
(let (msgid-for-download)
|
||||
(setq msgid-for-download (make-hash-table :test 'equal))
|
||||
(dolist (line (split-string (download-subscriptions) "\n"))
|
||||
(if (string-match "\\." line)
|
||||
(and (setq current-echo line)
|
||||
(store-echo-counter line))
|
||||
(when (and ;; (check-message-in-echo line current-echo)
|
||||
(> (length line) 1)
|
||||
(check-message-in-db line current-echo))
|
||||
(when (not (string= "" line))
|
||||
(puthash line current-echo msgid-for-download)))))
|
||||
(download-message msgid-for-download))
|
||||
;; (print (hash-table-count new-messages-list))
|
||||
;; (message (gethash "id" (nth 0 new-messages-list)))
|
||||
(display-new-messages)
|
||||
)
|
||||
|
||||
(defun idec-new-message (&optional echo)
|
||||
"Make new message to ECHO."
|
||||
(interactive)
|
||||
(if (not echo) (edit-new-message (read-string "Echo: "))
|
||||
(edit-new-message echo)))
|
||||
|
||||
;; Online
|
||||
(defun idec-online-browse ()
|
||||
"Load echoes list.txt from node `idec-primary-node'."
|
||||
(interactive)
|
||||
(idec-fetch-echo-list (concat idec-primary-node "list.txt")))
|
||||
|
||||
(defun idec-online-browse-hidden ()
|
||||
"Browse hidden echo."
|
||||
(interactive)
|
||||
(load-echo-messages (read-string "Enter echo name: ") t))
|
||||
|
||||
|
||||
;;; idec-mode.el ends here
|
||||
|
||||
(provide 'idec-mode)
|
||||
|
@ -26,7 +26,7 @@
|
||||
|
||||
;;; Code:
|
||||
|
||||
(require 'idec-mode)
|
||||
;; (require 'idec-mode)
|
||||
(require 'idec-answers)
|
||||
|
||||
(defun display-echo-messages (messages)
|
||||
@ -129,16 +129,6 @@
|
||||
"Fetch echoes list from remote NODEURL."
|
||||
(proccess-echo-list (get-url-content nodeurl)))
|
||||
|
||||
(defun idec-online-browse ()
|
||||
"Load echoes list.txt from node `idec-primary-node'."
|
||||
(interactive)
|
||||
(idec-fetch-echo-list (concat idec-primary-node "list.txt")))
|
||||
|
||||
(defun idec-online-browse-hidden ()
|
||||
"Browse hidden echo."
|
||||
(interactive)
|
||||
(load-echo-messages (read-string "Enter echo name: ") t))
|
||||
|
||||
(provide 'idec-online)
|
||||
|
||||
;;; idec-online.el ends here
|
||||
|
221
idec.el
221
idec.el
@ -26,133 +26,11 @@
|
||||
|
||||
;;; Code:
|
||||
|
||||
(require 'idec-mode)
|
||||
;; (require 'idec-answers)
|
||||
(require 'idec-parser)
|
||||
(require 'idec-online)
|
||||
;; (require 'idec-online)
|
||||
(require 'idec-db)
|
||||
|
||||
(defgroup idec nil
|
||||
"IDEC configuration."
|
||||
:group 'network)
|
||||
|
||||
;; Not used
|
||||
(defcustom idec-nodes-list
|
||||
"http://idec.spline-online.tk/,https://ii-net.tk/ii/ii-point.php?q=/"
|
||||
"List(comma separated) of IDEC nodes."
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-primary-node nil
|
||||
"Primary node to send messages."
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
;; Never used at this time.
|
||||
(defcustom idec-use-list-txt t
|
||||
"Use /list.txt extension."
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-smart-fetch t
|
||||
"Enable smat fetching;
|
||||
Download only new messages; Not implemented."
|
||||
:type 'boolean
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-download-limit "50"
|
||||
"Limit of download messages;
|
||||
Not used if `idec-smart-fetching' is not nil."
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-download-offset "-50"
|
||||
"Offset of download messages;
|
||||
Not used if `idec-smart-fetching' is not nil."
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-echo-subscriptions nil
|
||||
"List of subribes echoes."
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-mail-dir "~/.emacs.d/idec-mail"
|
||||
"Directory to store mail."
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-online-download-limit "0"
|
||||
"Download limit on online browsing;
|
||||
Default to `idec-download-lmit'"
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-online-download-offset "0"
|
||||
"Download limit on online browsing;
|
||||
Default to `idec-download-offset'"
|
||||
:type 'string
|
||||
:group 'idec)
|
||||
|
||||
(defgroup idec-accounts nil
|
||||
"IDEC accounts settings."
|
||||
:group 'idec)
|
||||
|
||||
(defcustom idec-account-nick ""
|
||||
"Account nickname."
|
||||
:type 'string
|
||||
:group 'idec-accounts)
|
||||
|
||||
(defcustom idec-account-node ""
|
||||
"Node to send messages."
|
||||
:type 'string
|
||||
:group 'idec-accounts)
|
||||
|
||||
(defcustom idec-account-auth ""
|
||||
"Account authstring."
|
||||
:type 'string
|
||||
:group 'idec-accounts)
|
||||
|
||||
;; END OF CUSTOMIZATION
|
||||
;; ;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
;; VARIABLES
|
||||
;; ;;;;;;;;;
|
||||
|
||||
(defvar smart-download-limit nil
|
||||
"Used with `idec-smart-fetch'.")
|
||||
|
||||
(defvar smart-download-offset nil
|
||||
"Used with `idec-smart-fetch'.")
|
||||
|
||||
(defvar new-messages-list nil
|
||||
"New messages for display.")
|
||||
|
||||
(setq idec-online-download-limit idec-download-limit)
|
||||
(setq idec-online-download-offset idec-download-offset)
|
||||
|
||||
;; END OF VARIABLES
|
||||
;; ;;;;;;;;;;;;;;;;
|
||||
|
||||
;; NAVIGATION FUNCTIONS
|
||||
;; ;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(defun idec-next-message ()
|
||||
"Show next message."
|
||||
(interactive)
|
||||
(kill-this-buffer)
|
||||
(forward-button 1)
|
||||
(push-button))
|
||||
|
||||
(defun idec-previous-message ()
|
||||
"Show next message."
|
||||
(interactive)
|
||||
(kill-this-buffer)
|
||||
(backward-button 1)
|
||||
(push-button))
|
||||
|
||||
;; END OF NAVIGATION FUNCTIONS
|
||||
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
;; FUNCTIONS
|
||||
;; ;;;;;;;;;
|
||||
|
||||
@ -183,100 +61,9 @@ put cursor to CHECKPOINT."
|
||||
(mark-all-messages-as-read echo)
|
||||
(idec-local-browse checkpoint))
|
||||
|
||||
(defun idec-mark-all-as-read (&optional echo)
|
||||
"Mark all messages in ECHO as read."
|
||||
(interactive)
|
||||
(if (not echo)
|
||||
(mark-all-messages-as-read (read-string "Enter echo name: "))
|
||||
(mark-all-messages-as-read echo)))
|
||||
|
||||
(defun idec-local-browse (&optional checkpoint)
|
||||
"Browse local mail from `idec-mail-dir';
|
||||
optionaly return cursor to CHECKPOINT."
|
||||
(interactive)
|
||||
(get-buffer-create "*IDEC: INBOX*")
|
||||
(with-output-to-temp-buffer (get-buffer-create "*IDEC: INBOX*")
|
||||
(switch-to-buffer "*IDEC: INBOX*")
|
||||
(save-excursion
|
||||
(dolist (echo (get-local-echoes))
|
||||
(if echo
|
||||
(let (unread start end)
|
||||
;; Echo name with unread messages
|
||||
;; ii.test.14 (5)*
|
||||
(insert-button echo
|
||||
'action (lambda (x) (browse-local-echo (button-get x 'echo)))
|
||||
'echo echo
|
||||
'(face nil))
|
||||
|
||||
(beginning-of-line)
|
||||
(setq start (point))
|
||||
(end-of-line)
|
||||
(setq end (point))
|
||||
(add-text-properties start end '(comment t face '(:foreground "light green")))
|
||||
|
||||
(princ (concat (dots echo)
|
||||
"("
|
||||
(number-to-string (get-echo-messages-count echo))
|
||||
")"))
|
||||
|
||||
(setq unread (get-echo-unread-messages echo))
|
||||
(when (> unread 0)
|
||||
(princ "*"))
|
||||
(princ " ")
|
||||
|
||||
;; [New message] button
|
||||
(princ "\t[")
|
||||
(insert-button "New message"
|
||||
'action (lambda (x) (idec-new-message (button-get x 'echo)))
|
||||
'echo echo)
|
||||
(princ "]\t[")
|
||||
;; [Mark read] button
|
||||
(insert-button "Mark read"
|
||||
'action (lambda (x) (mark-all-as-read (button-get x 'echo) (button-get x 'point)))
|
||||
'echo echo
|
||||
'point (point))
|
||||
(princ "]\n"))
|
||||
(message (concat "IDEC: FUUUUUU <" echo ">")))
|
||||
))
|
||||
(add-text-properties (point-min) (point-max) 'read-only))
|
||||
(if checkpoint
|
||||
(goto-char checkpoint))
|
||||
(idec-mode))
|
||||
|
||||
(defun browse-local-echo (&optional echo)
|
||||
"Get messages from local ECHO."
|
||||
(interactive)
|
||||
(if (not echo)
|
||||
(setq echo (read-string "Enter echo name: ")))
|
||||
(with-output-to-temp-buffer (get-buffer-create (concat "*IDEC: INBOX->(" echo ")") )
|
||||
(princ (number-to-string (length (get-echo-messages echo))))
|
||||
(idec-mode)))
|
||||
|
||||
;; END OF LOCAL MAIL FUNCTIONS
|
||||
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(defun idec-load-new-messages ()
|
||||
"Load new messages from IDEC `idec-primary-node'."
|
||||
(interactive)
|
||||
(defvar current-echo nil)
|
||||
(setq new-messages-list (make-hash-table :test 'equal))
|
||||
(let (msgid-for-download)
|
||||
(setq msgid-for-download (make-hash-table :test 'equal))
|
||||
(dolist (line (split-string (download-subscriptions) "\n"))
|
||||
(if (string-match "\\." line)
|
||||
(and (setq current-echo line)
|
||||
(store-echo-counter line))
|
||||
(when (and ;; (check-message-in-echo line current-echo)
|
||||
(> (length line) 1)
|
||||
(check-message-in-db line current-echo))
|
||||
(when (not (string= "" line))
|
||||
(puthash line current-echo msgid-for-download)))))
|
||||
(download-message msgid-for-download))
|
||||
;; (print (hash-table-count new-messages-list))
|
||||
;; (message (gethash "id" (nth 0 new-messages-list)))
|
||||
(display-new-messages)
|
||||
)
|
||||
|
||||
(defun display-message (msg)
|
||||
"Display message MSG in new buffer in idec-mode."
|
||||
(mark-message-read (gethash "id" msg) (get-message-field (gethash "msg" msg) "echo"))
|
||||
@ -442,12 +229,6 @@ If ONLINE is t uses `idec-online-download-limit' and `idec-online-download-offse
|
||||
;; END OF ECHOES FUNCTIONS
|
||||
;; ;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(defun idec-new-message (&optional echo)
|
||||
"Make new message to ECHO."
|
||||
(interactive)
|
||||
(if (not echo) (edit-new-message (read-string "Echo: "))
|
||||
(edit-new-message echo)))
|
||||
|
||||
;; END OF FUNCTIONS
|
||||
;; ;;;;;;;;;;;;;;;;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user