From 4893d1e7d53ad2cfea21a1b9cf730b463498ad41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?=
 <dominik.pantucek@trustica.cz>
Date: Thu, 13 Apr 2023 20:02:28 +0200
Subject: [PATCH] Unify finders naming.

---
 src/cards.scm            |  2 +-
 src/hackerbase.scm       |  2 +-
 src/mbase.scm            | 37 +++++++++++++++++++++----------------
 src/members-payments.scm |  2 +-
 src/members-print.scm    |  8 ++++----
 src/web-static.scm       |  2 +-
 6 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/cards.scm b/src/cards.scm
index 5557c2d..f8e7798 100644
--- a/src/cards.scm
+++ b/src/cards.scm
@@ -42,7 +42,7 @@
 
  ;; Prints single card type records.
  (define (cards-print/type mb type)
-   (let* ((rmb (filter-members-by-predicate
+   (let* ((rmb (find-members-by-predicate
 		mb
 		(lambda (mr)
 		  (and (brmember-active? mr)
diff --git a/src/hackerbase.scm b/src/hackerbase.scm
index 5d4a7fa..2ac6162 100644
--- a/src/hackerbase.scm
+++ b/src/hackerbase.scm
@@ -276,7 +276,7 @@
        (apply cards-export MB (-fname-))
        (print "Cards export disabled with manually specified current month.")))
   ((problems)
-   (let ((num (let loop ((mb (members-base-members MB))
+   (let ((num (let loop ((mb (mbase-members MB))
 			 (num 0))
 		(if (null? mb)
 		    num
diff --git a/src/mbase.scm b/src/mbase.scm
index fb3b3eb..5b79c92 100644
--- a/src/mbase.scm
+++ b/src/mbase.scm
@@ -30,13 +30,18 @@
  (
   load-mbase
   
-  members-base-members
+  mbase-members
+
+  find-member-by-predicate
   find-member-by-id
   find-member-by-nick
+
+  find-members-by-predicate
   find-members-by-nick
+  
   list-members-ids
-  filter-members-by-predicate
   list-members-nicks
+  
   members-base-info
   members-base-stats
   get-free-members-ids
@@ -97,12 +102,12 @@
 	     mb)))))))
 
  ;; Returns the internal members list
- (define (members-base-members mb)
+ (define (mbase-members mb)
    (ldict-ref mb 'members))
 
  ;; Gets member based by generic predicate
  (define (find-member-by-predicate mb pred)
-   (let loop ((mdb (members-base-members mb)))
+   (let loop ((mdb (mbase-members mb)))
      (if (null? mdb)
 	 #f
 	 (let ((mr (car mdb)))
@@ -130,7 +135,7 @@
 
  ;; Returns a list of members whose nick contains pat
  (define (find-members-by-nick mb pat)
-   (filter-members-by-predicate
+   (find-members-by-predicate
     mb
     (lambda (mr)
       (substring-index pat (brmember-nick mr)))))
@@ -138,11 +143,16 @@
  ;; Returns all ids found in the database
  (define (list-members-ids mb)
    (map (lambda (mr) (ldict-ref mr 'id))
-	(members-base-members mb)))
+	(mbase-members mb)))
+
+ ;; Returns all nicks found in the database
+ (define (list-members-nicks mb)
+   (map (lambda (mr) (ldict-ref (ldict-ref mr 'info) 'nick))
+	(mbase-members mb)))
 
  ;; Returns a list of members which match given predicate.
- (define (filter-members-by-predicate mb pred)
-   (let loop ((mb (members-base-members mb))
+ (define (find-members-by-predicate mb pred)
+   (let loop ((mb (mbase-members mb))
 	      (res '()))
      (if (null? mb)
 	 res
@@ -152,14 +162,9 @@
 		     (cons mr res)
 		     res))))))
 
- ;; Returns all nicks found in the database
- (define (list-members-nicks mb)
-   (map (lambda (mr) (ldict-ref (ldict-ref mr 'info) 'nick))
-	(members-base-members mb)))
-
  ;; Returns dictionary with statistics about the members base.
  (define (members-base-info mb-arg)
-   (let* ((members (filter-members-by-predicate mb-arg brmember-usable?))
+   (let* ((members (find-members-by-predicate mb-arg brmember-usable?))
 	  (di0 (make-ldict))
 	  (di1 (ldict-set di0 'invalid
 			 (filter (compose not is-4digit-prime? brmember-id) members)))
@@ -220,7 +225,7 @@
 		    (if (pred? mr)
 			(proc mr)
 			mr))
-		  (members-base-members mb))))
+		  (mbase-members mb))))
 
  ;; Adds unpaired transaction to given members-base
  (define (members-base-add-unpaired mb tr)
@@ -242,7 +247,7 @@
       (lambda (mr)
 	(brmember-info mr 'mail))
       (filter brmember-active?
-	      (members-base-members mb))))
+	      (mbase-members mb))))
     string-ci<?))
 
  ;; Merges given ML members into members base
diff --git a/src/members-payments.scm b/src/members-payments.scm
index a3cbd4a..77028ef 100644
--- a/src/members-payments.scm
+++ b/src/members-payments.scm
@@ -216,7 +216,7 @@
  ;; Return members to notify because of late payments for more than
  ;; given number of months
  (define (members-to-notify mb months)
-   (filter-members-by-predicate
+   (find-members-by-predicate
     mb
     (lambda (mr)
       (let ((total (member-total-balance mr))
diff --git a/src/members-print.scm b/src/members-print.scm
index 2715041..2e0e557 100644
--- a/src/members-print.scm
+++ b/src/members-print.scm
@@ -225,14 +225,14 @@
        #:row-border #t
        #:col-border #t
        )))
-   (let ((pmrs (filter-members-by-predicate mb brmember-has-problems?)))
+   (let ((pmrs (find-members-by-predicate mb brmember-has-problems?)))
      (when (not (null? pmrs))
        (newline)
        (print "Member files with errors (" (length pmrs) "): "
 	      (string-intersperse
 	       (map brmember-file-path pmrs)
 	       ", "))))
-   (let ((pmrs (filter-members-by-predicate mb (lambda (mr)
+   (let ((pmrs (find-members-by-predicate mb (lambda (mr)
 						 (and (brmember-has-highlights? mr)
 						      (not (brmember-has-problems? mr)))))))
      (when (not (null? pmrs))
@@ -308,10 +308,10 @@
 			)))
 	      (sort
 	       (if destroyed?
-		   (members-base-members MB)
+		   (mbase-members MB)
 		   (filter (lambda (mr)
 			     (not (brmember-destroyed? mr)))
-			   (members-base-members MB)))
+			   (mbase-members MB)))
 	       brmember<?)))
 	    (balances (map (lambda (m)
 			     (list-ref m 6))
diff --git a/src/web-static.scm b/src/web-static.scm
index cccff87..eeae975 100644
--- a/src/web-static.scm
+++ b/src/web-static.scm
@@ -88,7 +88,7 @@
      (error 'gen-web-static "Directory is a file:" dir))
    (when (not (directory-exists? dir))
      (create-directory dir))
-   (let* ((members-list (members-base-members mb))
+   (let* ((members-list (mbase-members mb))
 	  (mlen0 (length members-list))
 	  (mlen (if (> mlen0 0)
 		    mlen0