Added meta flag for command line.

Added printout of parameters at start of program.

src/loa/loa.clj

@@ -35,17 +35,23 @@
    (pmap #(dorun (:meta %))
          cards)))
 
+;;--------------------------------------------------
+;; Processing
+
 (defn- run-cards
-  [opt config]
-  (let [sets (apply get-sets config (:set opt))
+  [config]
+  (let [opt (:opt config)
+        sets (apply get-sets config (:set opt))
         cards (->> sets
                    (mapcat (partial command_/get-cards config))
                    (#(apply filter-cards % (:card opt)))
                    (command_/transform :loa.program.command/all)
                    (#(apply filter-cards % (:card opt)))
                    )
-        meta (mapcat (partial command_/get-meta config) sets)
-        cards (command_/add-metadata cards meta)
+        cards (if (:meta opt)
+                (let [meta (mapcat (partial command_/get-meta config) sets)]
+                  (command_/add-metadata cards meta))
+                cards)
         cards (map (fn [card]
                      (let [details (command_/get-card-details config card)]
                        (command_/add-card-details card details)))
@@ -57,12 +63,30 @@
       (pprint cards))
     (when (:write opt)
       (command_/write-cards config cards)
-      (command_/write-meta config cards sets)
+      (when (:meta opt)
+        (command_/write-meta config cards sets))
       (command_/write-setinfo config sets)
       (command_/write-cards-text config cards sets)
       (command_/create-package config))))
 
-(defn parse-args
+;;--------------------------------------------------
+;; Main
+
+(defn- print-config
+  [config]
+  (println "Paths")
+  (doseq [key [:indata :tmp :xml :text :zip]]
+    (println (format "%10s :: %s" (name key) (-> config :path key .getPath))))
+  (println "Arguments")
+  (let [opt (:opt config)]
+    (doseq [[k v] [["Write" (if (:write opt) true false)]
+                   ["Meta" (if (:meta opt) true false)]
+                   ["Debug" (if (:debug opt) true false)]
+                   ["Sets" (or (:set opt) "-")]
+                   ["Cards" (or (:card opt) "-")]]]
+      (println (format "%10s :: %s" k (str v))))))
+
+(defn- parse-args
   ([args]
      (parse-args args nil nil))
   ([args opt key]
@@ -77,9 +101,10 @@
 (defn -main
   [& args]
   (try
-    (let [config (command_/make-config ".")
-          opt (parse-args args)]
+    (let [opt (parse-args args)
+          config (command_/make-config "." opt)]
+      (print-config config)
       (command_/setup-paths config)
-      (run-cards opt config))
+      (run-cards config))
     (finally
-     (shutdown-agents))))
+      (shutdown-agents))))

src/loa/program/command.clj

@@ -23,8 +23,9 @@
 ;;
 (defn make-config
   "Construct a configuration based on the root path."
-  [rootpath]
-  (config_/create-config rootpath))
+  [rootpath opt]
+  (assoc (config_/create-config rootpath)
+    :opt opt))
 
 (defn setup-paths
   "Creates all required paths if they do not exist."
@@ -136,13 +137,14 @@
   (log_/info "Creating zip")
   (let [zipname (format "mtg-data-%s.zip"
                         (.format (SimpleDateFormat. "yyyy-MM-dd")
-                                 (System/currentTimeMillis)))]
+                                 (System/currentTimeMillis)))
+        include-meta (-> config :opt :meta)]
     (zip_/create
      (config_/get-file config :zip zipname)
      (concat (map #(vector (config_/get-file config :xml %) (str "xml/" %))
-                  ["cards.xml"
-                   "meta.xml"
-                   "setinfo.xml"])
+                  (if include-meta
+                    ["cards.xml" "meta.xml" "setinfo.xml"]
+                    ["cards.xml" "setinfo.xml"]))
              [[(config_/get-file config :indata "format.txt") "xml/format.txt"]]
              (map #(vector (config_/get-file config :text %) (str "text/" %))
                   ["mtg-data.txt"])))))