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

Prepare for loading initial configuration.

Browse source
This commit is contained in:
Dominik Pantůček 2023-04-09 17:13:34 +02:00
parent 8dcc00b516
commit 64c1c7b4f7
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/configuration.scm
View file

@ -31,6 +31,10 @@
*current-month* *current-month*
*member-suspend-max-months* *member-suspend-max-months*
*members-directory* *members-directory*
*etc-hackerbase*
*apikeys-file*
*jendasap-checked*
*bank-dir*
) )
(import scheme (import scheme
@ -52,4 +56,16 @@
;; Needed by multiple modules actually ;; Needed by multiple modules actually
(define *members-directory* (make-parameter "members")) (define *members-directory* (make-parameter "members"))
;; Where to load initial configuration from
(define *etc-hackerbase* (make-parameter "/etc/hackerbase"))
;; List of bank accounts and Fio API keys (no support for other banks now)
(define *apikeys-file* (make-parameter "apikey.ntlm"))
;; Old last checket transaction id support
(define *jendasap-checked* (make-parameter "checked.ntlm"))
;; Where are the bank CSV files
(define *bank-dir* (make-parameter #f))
) )

11
src/hackerbase.scm
View file

@ -57,7 +57,6 @@
(newline) (newline)
;; Command-line options and configurable parameters ;; Command-line options and configurable parameters
(define -apikeys-file- (make-parameter "apikey.ntlm"))
(define -needs-bank- (make-parameter #f)) (define -needs-bank- (make-parameter #f))
(define -member-id- (make-parameter #f)) (define -member-id- (make-parameter #f))
(define -member-nick- (make-parameter #f)) (define -member-nick- (make-parameter #f))
@ -65,9 +64,7 @@
(define -fname- (make-parameter #f)) (define -fname- (make-parameter #f))
(define -run-tests?- (make-parameter #f)) (define -run-tests?- (make-parameter #f))
(define -web-dir- (make-parameter #f)) (define -web-dir- (make-parameter #f))
(define -bank-dir- (make-parameter #f))
(define -normal-month- (make-parameter #t)) (define -normal-month- (make-parameter #t))
(define -jendasap-checked- (make-parameter "checked.ntlm"))
(define -ml-all- (make-parameter #f)) (define -ml-all- (make-parameter #f))
(define -show-destroyed- (make-parameter #f)) (define -show-destroyed- (make-parameter #f))
(define -notify-months- (make-parameter 1)) (define -notify-months- (make-parameter 1))
@ -95,11 +92,11 @@
(-tstyle (style) "Use given table style: debug, ascii, unicode" (-tstyle (style) "Use given table style: debug, ascii, unicode"
(*table-border-style* (string->symbol style))) (*table-border-style* (string->symbol style)))
(-apikey (fname) "File with Fio API keys" (-apikey (fname) "File with Fio API keys"
(-apikeys-file- fname)) (*apikeys-file* fname))
(-bankdir (dir) "Where are bank CSV files" (-bankdir (dir) "Where are bank CSV files"
(-bank-dir- dir)) (*bank-dir* dir))
(-checked (file) "JendaSAP checked.ntlm file" (-checked (file) "JendaSAP checked.ntlm file"
(-jendasap-checked- file)) (*jendasap-checked* file))
(-ml-all () "Load all mailman lists" (-ml-all () "Load all mailman lists"
(-ml-all- #t)) (-ml-all- #t))
(-destroyed () "Show destroyed members in -fees" (-destroyed () "Show destroyed members in -fees"
@ -180,7 +177,7 @@
(if (-action-) (if (-action-)
(let ((mb (load-members (*members-directory*) #t))) (let ((mb (load-members (*members-directory*) #t)))
(if (-needs-bank-) (if (-needs-bank-)
(members-payments-process mb (-apikeys-file-) (-bank-dir-) (-jendasap-checked-)) (members-payments-process mb (*apikeys-file*) (*bank-dir*) (*jendasap-checked*))
mb)) mb))
#f)) #f))