✨ Improve command line helpers.

backend/deps.edn

@@ -74,6 +74,14 @@
     mockery/mockery {:mvn/version "0.1.4"}}
    :extra-paths ["tests"]}
 
+  :fn-media-loader
+  {:fn uxbox.cli.media-loader/run
+   :args {}}
+
+  :fn-fixtures
+  {:fn uxbox.cli.fixtures/run
+   :args {}}
+
   :lint
   {:main-opts ["-m" "clj-kondo.main"]}
 

backend/resources/log4j2.xml

@@ -29,6 +29,11 @@
 
     <Logger name="io.lettuce" level="error" additivity="false" />
 
+
+    <Logger name="uxbox.cli" level="debug" additivity="false">
+      <AppenderRef ref="console"/>
+    </Logger>
+
     <Logger name="uxbox" level="debug" additivity="false">
       <AppenderRef ref="file-debug" level="debug" />
       <AppenderRef ref="file" level="info" />

backend/src/uxbox/cli/fixtures.clj

@@ -2,9 +2,12 @@
 ;; License, v. 2.0. If a copy of the MPL was not distributed with this
 ;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ;;
-;; Copyright (c) 2019 Andrey Antukh <niwi@niwi.nz>
+;; This Source Code Form is "Incompatible With Secondary Licenses", as
+;; defined by the Mozilla Public License, v. 2.0.
+;;
+;; Copyright (c) 2020 UXBOX Labs SL
 
-(ns uxbox.fixtures
+(ns uxbox.cli.fixtures
   "A initial fixtures."
   (:require
    [clojure.tools.logging :as log]
@@ -246,7 +249,7 @@
         (assign-teams-and-profiles conn teams (map :id profiles))
         (run! (partial create-draft-files conn) profiles)))))
 
-(defn run
+(defn run*
   [preset]
   (let [preset (if (map? preset)
                  preset
@@ -257,13 +260,16 @@
                    preset-small))]
     (impl-run preset)))
 
-(defn -main
-  [& args]
+(defn run
+  [{:keys [preset]
+    :or {preset :small}}]
   (try
     (-> (mount/only #{#'uxbox.config/config
                       #'uxbox.db/pool
                       #'uxbox.migrations/migrations})
         (mount/start))
-    (run (first args))
+    (run* preset)
+    (catch Exception e
+      (log/errorf e "Unhandled exception."))
     (finally
       (mount/stop))))

backend/src/uxbox/cli/media_loader.clj

@@ -7,36 +7,27 @@
 ;;
 ;; Copyright (c) 2016-2020 Andrey Antukh <niwi@niwi.nz>
 
-(ns uxbox.media-loader
+(ns uxbox.cli.media-loader
   "Media libraries importer (command line helper)."
   (:require
    [clojure.tools.logging :as log]
    [clojure.spec.alpha :as s]
-   [clojure.pprint :refer [pprint]]
    [clojure.java.io :as io]
-   [clojure.edn :as edn]
    [mount.core :as mount]
    [datoteka.core :as fs]
-   [cuerdas.core :as str]
    [uxbox.config]
    [uxbox.common.spec :as us]
    [uxbox.db :as db]
-   [uxbox.http]
+   [uxbox.media]
+   [uxbox.media-storage]
    [uxbox.migrations]
-   [uxbox.util.svg :as svg]
-   [uxbox.util.transit :as t]
-   [uxbox.util.blob :as blob]
    [uxbox.common.uuid :as uuid]
-   [uxbox.util.data :as data]
    [uxbox.services.mutations.projects :as projects]
    [uxbox.services.mutations.files :as files]
    [uxbox.services.mutations.colors :as colors]
-   [uxbox.services.mutations.media :as media]
-   [uxbox.util.storage :as ust])
+   [uxbox.services.mutations.media :as media])
   (:import
-   java.io.Reader
-   java.io.PushbackReader
-   org.im4java.core.Info))
+   java.io.PushbackReader))
 
 ;; --- Constants & Helpers
 
@@ -65,7 +56,6 @@
   ([code]
    (System/exit code)))
 
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Graphics Importer
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -109,7 +99,7 @@
     media-object-id))
 
 (defn- import-graphics
-  [conn file-id {:keys [path regex] :as graphics}]
+  [conn file-id {:keys [path regex]}]
   (run! (fn [fpath]
           (when (re-matches regex (str fpath))
             (import-media-object-if-not-exists conn file-id fpath)))
@@ -151,7 +141,7 @@
     (if row true false)))
 
 (defn- create-library-file-if-not-exists
-  [conn project-id {:keys [name] :as library-file}]
+  [conn project-id {:keys [name]}]
   (let [id (uuid/namespaced +colors-uuid-ns+ name)]
     (when-not (library-file-exists? conn id)
       (log/info "Creating library-file:" name)
@@ -164,7 +154,7 @@
     id))
 
 (defn- process-library
-  [conn basedir project-id {:keys [name graphics colors] :as library}]
+  [conn basedir project-id {:keys [graphics colors] :as library}]
   (us/verify ::import-library library)
   (let [library-file-id (create-library-file-if-not-exists conn project-id library)]
     (when graphics
@@ -197,45 +187,47 @@
 
 (defn- validate-path
   [path]
-  (when-not path
-    (log/error "No path is provided")
-    (exit! -1))
-  (when-not (fs/exists? path)
-    (log/error "Path does not exists.")
-    (exit! -1))
-  (when (fs/directory? path)
-    (log/error "The provided path is a directory.")
-    (exit! -1))
-  (fs/path path))
+  (let [path (if (symbol? path) (str path) path)]
+    (log/infof "Trying to load config from '%s'." path)
+    (when-not path
+      (log/error "No path is provided")
+      (exit! -1))
+    (when-not (fs/exists? path)
+      (log/error "Path does not exists.")
+      (exit! -1))
+    (when (fs/directory? path)
+      (log/error "The provided path is a directory.")
+      (exit! -1))
+    (fs/path path)))
 
 (defn- read-file
   [path]
-  (let [reader (java.io.PushbackReader. (io/reader path))]
+  (let [reader (PushbackReader. (io/reader path))]
     [(fs/parent path)
      (read reader)]))
 
-(defn- start-system
-  []
-  (-> (mount/except #{#'uxbox.http/server})
-      (mount/start)))
-
-(defn- stop-system
-  []
-  (mount/stop))
-
-(defn run
+(defn run*
   [path]
   (let [[basedir libraries] (read-file path)]
     (db/with-atomic [conn db/pool]
       (let [project-id (create-project-if-not-exists conn {:name "System libraries"})]
         (run! #(process-library conn basedir project-id %) libraries)))))
 
-(defn -main
-  [& [path]]
+(defn run
+  [{:keys [path] :as params}]
+  (log/infof "Starting media loader.")
   (let [path (validate-path path)]
-    (try
-      (start-system)
-      (run path)
-      (finally
-        (stop-system)))))
+
+    (try
+      (-> (mount/only #{#'uxbox.config/config
+                        #'uxbox.db/pool
+                        #'uxbox.migrations/migrations
+                        #'uxbox.media/semaphore
+                        #'uxbox.media-storage/media-storage})
+          (mount/start))
+      (run* path)
+      (catch Exception e
+        (log/errorf e "Unhandled exception."))
+      (finally
+        (mount/stop)))))
 

backend/tests/user.clj

@@ -85,18 +85,6 @@
                   {:unresolved-symbol
                    {:exclude ['(uxbox.services.mutations/defmutation)
                               '(uxbox.services.queries/defquery)
+                              '(uxbox.db/with-atomic)
                               '(promesa.core/let)]}}}})
        (kondo/print!))))
-
-;; (defn red
-;;   [items]
-;;   (as-> items $$
-;;     (reduce (fn [acc item]
-;;               (cp/process-changes acc (:changes item)))
-;;             cp/default-page-data
-;;             $$)))
-
-;; (defn update-page-data
-;;   [id data]
-;;   (let [data (blob/encode data)]
-;;     (db/query-one db/pool ["update page set data=$1 where id=$2" data id])))

backend/tests/uxbox/tests/helpers.clj

@@ -14,9 +14,7 @@
    [uxbox.services.mutations.teams :as teams]
    [uxbox.services.mutations.files :as files]
    [uxbox.services.mutations.pages :as pages]
-   ;; [uxbox.services.mutations.icons :as icons]
    [uxbox.services.mutations.colors :as colors]
-   [uxbox.fixtures :as fixtures]
    [uxbox.migrations]
    [uxbox.media]
    [uxbox.media-storage]