brmlab/hackerbase
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Load sender address from configuration.

Browse source
This commit is contained in:
Dominik Pantůček 2023-04-12 20:10:00 +02:00
parent 8e188a0a8c
commit 073c1efbc6
4 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Makefile
View file

@ -322,10 +322,10 @@ UTIL-MAIL-SOURCES=util-mail.scm util-io.import.scm \
util-mail.o: util-mail.import.scm util-mail.o: util-mail.import.scm
util-mail.import.scm: $(UTIL-MAIL-SOURCES) util-mail.import.scm: $(UTIL-MAIL-SOURCES)
REMINDERS-SOURCES=reminders.scm brmember.import.scm \ REMINDERS-SOURCES=reminders.scm brmember.import.scm \
util-mail.import.scm util-dict-list.import.scm \ util-mail.import.scm util-dict-list.import.scm \
members-payments.import.scm util-format.import.scm \ members-payments.import.scm util-format.import.scm \
brmember-format.import.scm brmember-format.import.scm configuration.import.scm
reminders.o: reminders.import.scm reminders.o: reminders.import.scm
reminders.import.scm: $(REMINDERS-SOURCES) reminders.import.scm: $(REMINDERS-SOURCES)

8
src/configuration.scm
View file

@ -38,6 +38,7 @@
*apikeys-file* *apikeys-file*
*jendasap-checked* *jendasap-checked*
*bank-dir* *bank-dir*
*email-from*
load-configuration! load-configuration!
) )
@ -79,6 +80,9 @@
;; Where are the bank CSV files ;; Where are the bank CSV files
(define *bank-dir* (make-parameter #f)) (define *bank-dir* (make-parameter #f))
;; From address for emails
(define *email-from* (make-parameter "Brmlab - Rada <rada@brmlab.cz>"))
;; Loads the configuration file and possibly changes the default ;; Loads the configuration file and possibly changes the default
;; parameters. ;; parameters.
(define (load-configuration!) (define (load-configuration!)
@ -95,7 +99,9 @@
((members-directory) (*members-directory* v)) ((members-directory) (*members-directory* v))
((apikeys-file) (*apikeys-file* v)) ((apikeys-file) (*apikeys-file* v))
((jendasap-checked) (*jendasap-checked* v)) ((jendasap-checked) (*jendasap-checked* v))
((bank-dir) (*bank-dir* v))))) ((bank-dir) (*bank-dir* v))
((email-from) (*email-from* v))
)))
(loop (cdr lines))))))) (loop (cdr lines)))))))
) )

5
src/hackerbase.scm
View file

@ -62,6 +62,7 @@
(define =apikeys-file= (make-parameter #f)) (define =apikeys-file= (make-parameter #f))
(define =jendasap-checked= (make-parameter #f)) (define =jendasap-checked= (make-parameter #f))
(define =bank-dir= (make-parameter #f)) (define =bank-dir= (make-parameter #f))
(define =email-from= (make-parameter #f))
;; Arguments parsing ;; Arguments parsing
(command-line (command-line
@ -108,7 +109,7 @@
(-quiet- #t) (-quiet- #t)
(*progress-quiet* #t)) (*progress-quiet* #t))
(-from (email) "Sender email address" (-from (email) "Sender email address"
(*reminder-from* email)) (=email-from= email))
"" ""
"Query options:" "Query options:"
(-mi (id) "Specify member by id" (-member-id- (string->number id))) (-mi (id) "Specify member by id" (-member-id- (string->number id)))
@ -179,6 +180,8 @@
(*jendasap-checked* (=jendasap-checked=))) (*jendasap-checked* (=jendasap-checked=)))
(when (=bank-dir=) (when (=bank-dir=)
(*bank-dir* (=bank-dir=))) (*bank-dir* (=bank-dir=)))
(when (=email-from=)
(*email-from* (=email-from=)))
;; Run tests ;; Run tests
(when (-run-tests?-) (when (-run-tests?-)

9
src/reminders.scm
View file

@ -28,7 +28,6 @@
(module (module
reminders reminders
( (
*reminder-from*
make+print-reminder-email make+print-reminder-email
make+send-reminder-email make+send-reminder-email
) )
@ -41,10 +40,8 @@
util-dict-list util-dict-list
members-payments members-payments
util-format util-format
brmember-format) brmember-format
configuration)
;; From address
(define *reminder-from* (make-parameter "Brmlab - Rada <rada@brmlab.cz>"))
;; Creates reminder email body ;; Creates reminder email body
(define (reminder-email-body mr) (define (reminder-email-body mr)
@ -101,7 +98,7 @@
(let ((em (make-reminder-email mr))) (let ((em (make-reminder-email mr)))
(print "Sending " (ldict-ref em 'subject) " originally to " (ldict-ref em 'to)) (print "Sending " (ldict-ref em 'subject) " originally to " (ldict-ref em 'to))
(send-mail (ldict-ref em 'body) (send-mail (ldict-ref em 'body)
#:from (*reminder-from*) #:from (*email-from*)
#:to "joe@joe.cz" #:to "joe@joe.cz"
#:subject (ldict-ref em 'subject)))) #:subject (ldict-ref em 'subject))))