From 000c8d0acd3ba0e62a999b23ad85fc1253e24bb3 Mon Sep 17 00:00:00 2001
From: Charles Fourdrignier <charles.fourdrignier@gmail.com>
Date: Sun, 25 Apr 2021 10:06:49 +0200
Subject: [PATCH] =?UTF-8?q?Cr=C3=A9ation=20d'un=20fichier=20`config.edn`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                  |  3 ++-
 config.edn.example          |  6 ++++++
 example.sh                  |  2 +-
 src/library_monkey/core.clj | 27 +++++++++++++++++++--------
 4 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 config.edn.example

diff --git a/.gitignore b/.gitignore
index 231363f..23d97c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,5 @@ gradle-app.setting
 .lein-repl-history
 .nrepl-port
 
-run.sh
\ No newline at end of file
+run.sh
+/config.edn
diff --git a/config.edn.example b/config.edn.example
new file mode 100644
index 0000000..db94c76
--- /dev/null
+++ b/config.edn.example
@@ -0,0 +1,6 @@
+{
+ :accounts
+ [{:pseudo "Toto"
+   :username "numéro de carte"
+   :password "mot de passe"}]
+}
diff --git a/example.sh b/example.sh
index 891f940..37c0497 100755
--- a/example.sh
+++ b/example.sh
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-java -jar dist/library-monkey.jar user1 password1 user2 password2
+java -jar dist/library-monkey.jar config.edn
diff --git a/src/library_monkey/core.clj b/src/library_monkey/core.clj
index 09da544..f1c3c9d 100644
--- a/src/library_monkey/core.clj
+++ b/src/library_monkey/core.clj
@@ -8,7 +8,18 @@
    [cognitect.anomalies :as anom]
    [clojure.core.async :as a :refer [<!! <! go chan]]))
 
-(s/def ::credentials (s/+ (s/cat :username string? :password string?)))
+(s/def ::numeric-string (s/and string? #(re-matches #"\d+" %)))
+(s/def ::pseudo string?)
+(s/def ::password ::numeric-string)
+(s/def ::username ::numeric-string)
+(s/def ::account (s/keys :req-un [::username ::password]
+                         :opt-un [::pseudo]))
+(s/def ::accounts (s/coll-of ::account))
+(s/def ::config (s/keys :req-un [::accounts]))
+
+(comment
+  (s/explain-data ::account {:username "TOTO" :password "156"})
+  )
 
 (def discard-chan (chan 10))
 
@@ -37,7 +48,7 @@
 
 (defn print-report [report]
   (println (format "Carte %s - %d document(s)"
-                   (:username report)
+                   (or (:pseudo report) (:username report))
                    (count (:borrowings report))))
   (if-let [cred-error (:credentials-error report)]
     (println "Erreur lors de l'authenfication : " cred-error)
@@ -92,15 +103,15 @@
       (net/renew identity (:code-barre borrowing)))))
 
 (defn -main
-  [& args]
-  (let [credentials (s/conform ::credentials args)]
-    (if (s/invalid? credentials)
+  [config-file & args]
+  (let [config (clojure.edn/read-string (slurp config-file))]
+    (if (not (s/valid? ::config config))
       (do
-        (println "Erreur dans les paramètres")
-        (s/explain ::credentials args)
+        (println "Erreur dans le format du fichier `config.edn`")
+        (s/explain ::config config)
         (flush)
         (System/exit 1))
-      (let [reports (generate-reports amiens-library credentials)]
+      (let [reports (generate-reports amiens-library (:accounts config))]
         (println) ;; Newline after dots.
         (println (format "Total : %d document(s)" (:count reports)))
         (doseq [report (:reports reports)]