Changed config.rkt to simple-ini.
This commit is contained in:
+16
-16
@@ -4,7 +4,7 @@
|
||||
racket/string
|
||||
racket/tcp
|
||||
net/base64
|
||||
"config.rkt"
|
||||
"manager-ini.rkt"
|
||||
"report.rkt")
|
||||
|
||||
(provide maybe-send-report-mail
|
||||
@@ -113,22 +113,22 @@
|
||||
(close-input-port in)
|
||||
(close-output-port out))))
|
||||
|
||||
(define (maybe-send-report-mail config summary errors
|
||||
(define (maybe-send-report-mail ini summary errors
|
||||
#:manager-name [manager-name "FLAC 48 kHz manager"]
|
||||
#:result-label [result-label "converted"])
|
||||
(define has-errors? (positive? (summary-ref summary 'errors 0)))
|
||||
(define should-send?
|
||||
(and (manager-config-mail-enabled? config)
|
||||
(not (null? (manager-config-mail-to config)))
|
||||
(or (and has-errors? (manager-config-mail-send-on-error? config))
|
||||
(and (not has-errors?) (manager-config-mail-send-on-success? config)))))
|
||||
(and (ini-ref/bool ini 'mail 'enabled #f)
|
||||
(not (null? (ini-ref/addresses ini 'mail 'to "")))
|
||||
(or (and has-errors? (ini-ref/bool ini 'mail 'send-on-error #t))
|
||||
(and (not has-errors?) (ini-ref/bool ini 'mail 'send-on-success #f)))))
|
||||
(when should-send?
|
||||
(define from (mail-address->envelope-address (manager-config-mail-from config)))
|
||||
(define to (clean-address-list (manager-config-mail-to config)))
|
||||
(define cc (clean-address-list (manager-config-mail-cc config)))
|
||||
(define bcc (clean-address-list (manager-config-mail-bcc config)))
|
||||
(define from (mail-address->envelope-address (ini-ref/string ini 'mail 'from "")))
|
||||
(define to (clean-address-list (ini-ref/addresses ini 'mail 'to "")))
|
||||
(define cc (clean-address-list (ini-ref/addresses ini 'mail 'cc "")))
|
||||
(define bcc (clean-address-list (ini-ref/addresses ini 'mail 'bcc "")))
|
||||
(define subject (format "~a ~a: ~a error(s), ~a ~a"
|
||||
(manager-config-mail-subject-prefix config)
|
||||
(ini-ref/string ini 'mail 'subject-prefix "[flac-48khz-manager]")
|
||||
manager-name
|
||||
(summary-ref summary 'errors 0)
|
||||
(summary-ref summary 'converted 0)
|
||||
@@ -142,8 +142,8 @@
|
||||
#:bcc bcc
|
||||
#:body-content-type "text/html"))
|
||||
(strict-send-smtp-mail mail
|
||||
#:host (string-trim (manager-config-mail-host config))
|
||||
#:port (manager-config-mail-port config)
|
||||
#:tls-encode (manager-config-mail-tls? config)
|
||||
#:username (string-trim (manager-config-mail-username config))
|
||||
#:password (manager-config-mail-password config))))
|
||||
#:host (string-trim (ini-ref/string ini 'mail 'host ""))
|
||||
#:port (ini-ref/int ini 'mail 'port 25)
|
||||
#:tls-encode (ini-ref/bool ini 'mail 'tls #f)
|
||||
#:username (string-trim (ini-ref/string ini 'mail 'username ""))
|
||||
#:password (ini-ref/string ini 'mail 'password ""))))
|
||||
|
||||
Reference in New Issue
Block a user