✨ Add svg optimization on components migration process

backend/deps.edn

@@ -47,7 +47,6 @@
   org.lz4/lz4-java {:mvn/version "1.8.0"}
 
   org.clojars.pntblnk/clj-ldap {:mvn/version "0.0.17"}
-  integrant/integrant {:mvn/version "0.8.1"}
 
   dawran6/emoji {:mvn/version "0.1.5"}
   markdown-clj/markdown-clj {:mvn/version "1.11.4"}

backend/src/app/features/components_v2.clj

@@ -45,8 +45,6 @@
    [datoteka.io :as io]
    [promesa.exec.semaphore :as ps]))
 
-;; - What about use of svgo on converting graphics to components
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; END PROMESA HELPERS
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -443,10 +441,15 @@
 
 (defn- create-shapes-for-svg
   [{:keys [id] :as mobj} file-id objects position]
-  (let [svg-text (get-svg-content id)
-        svg-data (-> (csvg/parse svg-text)
-                     (assoc :name (:name mobj))
-                     (collect-and-persist-images file-id))]
+  (let [svg-text  (get-svg-content id)
+
+        optimizer (::csvg/optimizer *system*)
+        svg-text  (csvg/optimize optimizer svg-text)
+
+        svg-data  (-> (csvg/parse svg-text)
+                      (assoc :name (:name mobj))
+                      (collect-and-persist-images file-id))]
+
     (sbuilder/create-svg-shapes svg-data position objects uuid/zero nil #{} false)))
 
 (defn- process-media-object

backend/src/app/main.clj

@@ -10,6 +10,7 @@
    [app.auth.oidc :as-alias oidc]
    [app.auth.oidc.providers :as-alias oidc.providers]
    [app.common.logging :as l]
+   [app.common.svg :as csvg]
    [app.config :as cf]
    [app.db :as-alias db]
    [app.email :as-alias email]
@@ -412,6 +413,9 @@
     ;; module requires the migrations to run before initialize.
     ::migrations (ig/ref :app.migrations/migrations)}
 
+   ::csvg/optimizer
+   {}
+
    ::audit.tasks/archive
    {::props              (ig/ref ::setup/props)
     ::db/pool            (ig/ref ::db/pool)

backend/src/app/media.clj

@@ -14,11 +14,11 @@
    [app.common.schema.generators :as sg]
    [app.common.schema.openapi :as-alias oapi]
    [app.common.spec :as us]
+   [app.common.svg :as csvg]
    [app.config :as cf]
    [app.db :as-alias db]
    [app.storage :as-alias sto]
    [app.storage.tmp :as tmp]
-   [app.util.svg :as svg]
    [app.util.time :as dt]
    [buddy.core.bytes :as bb]
    [buddy.core.codecs :as bc]
@@ -201,7 +201,7 @@
   (us/assert ::input input)
   (let [{:keys [path mtype]} input]
     (if (= mtype "image/svg+xml")
-      (let [info (some-> path slurp svg/pre-process svg/parse get-basic-info-from-svg)]
+      (let [info (some-> path slurp csvg/parse get-basic-info-from-svg)]
         (when-not info
           (ex/raise :type :validation
                     :code :invalid-svg-file

backend/src/app/util/svg.clj

@@ -1,51 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; 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) KALEIDOS INC
-
-(ns app.util.svg
-  (:require
-   [app.common.data.macros :as dm]
-   [app.common.exceptions :as ex]
-   [app.common.logging :as l]
-   [clojure.xml :as xml]
-   [cuerdas.core :as str])
-  (:import
-   javax.xml.XMLConstants
-   java.io.InputStream
-   javax.xml.parsers.SAXParserFactory
-   clojure.lang.XMLHandler
-   org.apache.commons.io.IOUtils))
-
-(defn- secure-parser-factory
-  [^InputStream input ^XMLHandler handler]
-  (.. (doto (SAXParserFactory/newInstance)
-        (.setFeature XMLConstants/FEATURE_SECURE_PROCESSING true)
-        (.setFeature "http://apache.org/xml/features/disallow-doctype-decl" true))
-      (newSAXParser)
-      (parse input handler)))
-
-(defn parse
-  [^String data]
-  (try
-    (dm/with-open [istream (IOUtils/toInputStream data "UTF-8")]
-      (xml/parse istream secure-parser-factory))
-    (catch Exception e
-      (l/warn :hint "error on processing svg"
-              :message (ex-message e))
-      (ex/raise :type :validation
-                :code :invalid-svg-file
-                :hint "invalid svg file"
-                :cause e))))
-
-
-;; --- PROCESSORS
-
-(defn strip-doctype
-  [data]
-  (cond-> data
-    (str/includes? data "<!DOCTYPE")
-    (str/replace #"<\!DOCTYPE[^>]*>" "")))
-
-(def pre-process strip-doctype)