From bfb0ba47f5860311a0d19da879a6505baf51b13d Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 29 Jun 2022 14:53:57 +0200 Subject: [PATCH] :lipstick: Fix linter issues on exporter --- exporter/src/app/browser.cljs | 2 -- exporter/src/app/config.cljs | 3 --- exporter/src/app/core.cljs | 2 +- exporter/src/app/handlers.cljs | 8 ++------ exporter/src/app/handlers/export_frames.cljs | 12 +++++------- exporter/src/app/handlers/export_shapes.cljs | 5 ++--- exporter/src/app/handlers/resources.cljs | 4 +--- exporter/src/app/http.cljs | 1 - exporter/src/app/redis.cljs | 2 +- exporter/src/app/renderer.cljs | 2 +- exporter/src/app/renderer/bitmap.cljs | 7 ------- exporter/src/app/renderer/pdf.cljs | 8 +------- exporter/src/app/renderer/svg.cljs | 10 ++-------- exporter/src/app/util/mime.cljs | 3 +-- exporter/src/app/util/shell.cljs | 13 ++++++------- 15 files changed, 23 insertions(+), 59 deletions(-) diff --git a/exporter/src/app/browser.cljs b/exporter/src/app/browser.cljs index 588b12749..c885a3d45 100644 --- a/exporter/src/app/browser.cljs +++ b/exporter/src/app/browser.cljs @@ -9,10 +9,8 @@ ["generic-pool" :as gp] ["generic-pool/lib/errors" :as gpe] ["playwright" :as pw] - [app.common.data :as d] [app.common.exceptions :as ex] [app.common.logging :as l] - [app.common.uuid :as uuid] [app.config :as cf] [app.util.object :as obj] [promesa.core :as p])) diff --git a/exporter/src/app/config.cljs b/exporter/src/app/config.cljs index 6a312ab68..2d8729c6d 100644 --- a/exporter/src/app/config.cljs +++ b/exporter/src/app/config.cljs @@ -7,13 +7,10 @@ (ns app.config (:refer-clojure :exclude [get]) (:require - ["fs" :as fs] ["process" :as process] - [app.common.exceptions :as ex] [app.common.data :as d] [app.common.spec :as us] [app.common.version :as v] - [app.common.uri :as u] [cljs.core :as c] [cljs.pprint] [cljs.spec.alpha :as s] diff --git a/exporter/src/app/core.cljs b/exporter/src/app/core.cljs index 79597412d..453ff720b 100644 --- a/exporter/src/app/core.cljs +++ b/exporter/src/app/core.cljs @@ -18,7 +18,7 @@ (l/initialize!) (defn start - [& args] + [& _] (l/info :msg "initializing") (p/do! (bwr/init) diff --git a/exporter/src/app/handlers.cljs b/exporter/src/app/handlers.cljs index a1a849699..14d6a862e 100644 --- a/exporter/src/app/handlers.cljs +++ b/exporter/src/app/handlers.cljs @@ -10,22 +10,18 @@ [app.common.exceptions :as ex] [app.common.logging :as l] [app.common.spec :as us] - [app.common.uri :as u] - [app.config :as cf] [app.handlers.export-frames :as export-frames] [app.handlers.export-shapes :as export-shapes] [app.handlers.resources :as resources] [app.util.transit :as t] [clojure.spec.alpha :as s] - [cuerdas.core :as str] - [promesa.core :as p] - [reitit.core :as r])) + [cuerdas.core :as str])) (l/set-level! :debug) (defn on-error [error exchange] - (let [{:keys [type message code] :as data} (ex-data error)] + (let [{:keys [type code] :as data} (ex-data error)] (cond (or (= :validation type) (= :assertion type)) diff --git a/exporter/src/app/handlers/export_frames.cljs b/exporter/src/app/handlers/export_frames.cljs index 716cc0b30..0c9816710 100644 --- a/exporter/src/app/handlers/export_frames.cljs +++ b/exporter/src/app/handlers/export_frames.cljs @@ -6,13 +6,10 @@ (ns app.handlers.export-frames (:require - ["path" :as path] [app.common.logging :as l] - [app.common.exceptions :as exc] [app.common.spec :as us] - [app.common.pprint :as pp] - [app.handlers.resources :as rsc] [app.handlers.export-shapes :refer [prepare-exports]] + [app.handlers.resources :as rsc] [app.redis :as redis] [app.renderer :as rd] [app.util.shell :as sh] @@ -41,7 +38,7 @@ :opt-un [::name])) (defn handler - [{:keys [:request/auth-token] :as exchange} {:keys [exports profile-id] :as params}] + [{:keys [:request/auth-token] :as exchange} {:keys [exports] :as params}] ;; NOTE: we need to have the `:type` prop because the exports ;; datastructure preparation uses it for creating the groups. (let [exports (-> (map #(assoc % :type :pdf :scale 1 :suffix "") exports) @@ -111,7 +108,8 @@ (-> (p/loop [exports (seq exports)] (when-let [export (first exports)] - (p/let [proc (rd/render export on-object)] + (p/do + (rd/render export on-object) (p/recur (rest exports))))) (p/then (fn [_] (deref result))) @@ -122,7 +120,7 @@ (-> (sh/stat (:path resource)) (p/then #(merge resource %))))) (p/catch on-error) - (p/finally (fn [result cause] + (p/finally (fn [_ cause] (when-not cause (on-complete))))))) diff --git a/exporter/src/app/handlers/export_shapes.cljs b/exporter/src/app/handlers/export_shapes.cljs index d50dfc7c3..02e7a824d 100644 --- a/exporter/src/app/handlers/export_shapes.cljs +++ b/exporter/src/app/handlers/export_shapes.cljs @@ -6,9 +6,7 @@ (ns app.handlers.export-shapes (:require - ["path" :as path] [app.common.data :as d] - [app.common.exceptions :as exc] [app.common.logging :as l] [app.common.spec :as us] [app.handlers.resources :as rsc] @@ -140,7 +138,8 @@ proc (-> (p/do (p/loop [exports (seq exports)] (when-let [export (first exports)] - (p/let [proc (rd/render export append)] + (p/do + (rd/render export append) (p/recur (rest exports))))) (.finalize zip)) (p/then (constantly resource)) diff --git a/exporter/src/app/handlers/resources.cljs b/exporter/src/app/handlers/resources.cljs index 02ccfe0b1..c6729b08f 100644 --- a/exporter/src/app/handlers/resources.cljs +++ b/exporter/src/app/handlers/resources.cljs @@ -9,9 +9,7 @@ (:require ["archiver" :as arc] ["fs" :as fs] - ["os" :as os] ["path" :as path] - [app.common.data :as d] [app.common.exceptions :as ex] [app.common.uuid :as uuid] [app.util.mime :as mime] @@ -49,7 +47,7 @@ "content-length" (:size stat)}})) (defn handler - [{:keys [:request/params response] :as exchange}] + [{:keys [:request/params] :as exchange}] (when-not (contains? params :id) (ex/raise :type :validation :code :missing-id)) diff --git a/exporter/src/app/http.cljs b/exporter/src/app/http.cljs index 1e3512ab7..062191169 100644 --- a/exporter/src/app/http.cljs +++ b/exporter/src/app/http.cljs @@ -12,7 +12,6 @@ ["raw-body" :as raw-body] ["stream" :as stream] [app.common.logging :as l] - [app.common.spec :as us] [app.common.transit :as t] [app.config :as cf] [app.handlers :as handlers] diff --git a/exporter/src/app/redis.cljs b/exporter/src/app/redis.cljs index 5d704bc86..10b095cf4 100644 --- a/exporter/src/app/redis.cljs +++ b/exporter/src/app/redis.cljs @@ -28,7 +28,7 @@ (.on client "reconnect" (fn [ms] (l/warn :hint "reconnecting to redis" :ms ms))) (.on client "end" - (fn [ms] (l/warn :hint "client ended, no more connections will be attempted"))) + (fn [] (l/warn :hint "client ended, no more connections will be attempted"))) client)) (defn init diff --git a/exporter/src/app/renderer.cljs b/exporter/src/app/renderer.cljs index 42ab6c6ad..63f1367f5 100644 --- a/exporter/src/app/renderer.cljs +++ b/exporter/src/app/renderer.cljs @@ -31,7 +31,7 @@ (s/def ::render-params (s/keys :req-un [::file-id ::page-id ::scale ::token ::type ::objects])) -(defn- render +(defn render [{:keys [type] :as params} on-object] (us/verify ::render-params params) (us/verify fn? on-object) diff --git a/exporter/src/app/renderer/bitmap.cljs b/exporter/src/app/renderer/bitmap.cljs index bacde909b..959da4877 100644 --- a/exporter/src/app/renderer/bitmap.cljs +++ b/exporter/src/app/renderer/bitmap.cljs @@ -7,19 +7,12 @@ (ns app.renderer.bitmap "A bitmap renderer." (:require - ["path" :as path] [app.browser :as bw] - [app.common.data :as d] - [app.common.data.macros :as dm] - [app.common.exceptions :as ex] [app.common.logging :as l] - [app.common.pages :as cp] - [app.common.spec :as us] [app.common.uri :as u] [app.config :as cf] [app.util.mime :as mime] [app.util.shell :as sh] - [cljs.spec.alpha :as s] [cuerdas.core :as str] [promesa.core :as p])) diff --git a/exporter/src/app/renderer/pdf.cljs b/exporter/src/app/renderer/pdf.cljs index 2ba6926e8..14d9be40a 100644 --- a/exporter/src/app/renderer/pdf.cljs +++ b/exporter/src/app/renderer/pdf.cljs @@ -7,18 +7,13 @@ (ns app.renderer.pdf "A pdf renderer." (:require - ["path" :as path] [app.browser :as bw] [app.common.data.macros :as dm] - [app.common.exceptions :as ex :include-macros true] [app.common.logging :as l] - [app.common.spec :as us] [app.common.uri :as u] [app.config :as cf] [app.util.mime :as mime] [app.util.shell :as sh] - [cuerdas.core :as str] - [cljs.spec.alpha :as s] [promesa.core :as p])) (defn render @@ -57,8 +52,7 @@ (render [base-uri page] (p/loop [objects (seq objects)] (when-let [object (first objects)] - (p/let [uri (prepare-uri base-uri (:id object)) - path (render-object page base-uri object)] + (p/let [path (render-object page base-uri object)] (on-object (assoc object :path path)) (p/recur (rest objects))))))] diff --git a/exporter/src/app/renderer/svg.cljs b/exporter/src/app/renderer/svg.cljs index d1c4e3fcc..39cd8d17c 100644 --- a/exporter/src/app/renderer/svg.cljs +++ b/exporter/src/app/renderer/svg.cljs @@ -6,20 +6,14 @@ (ns app.renderer.svg (:require - ["path" :as path] ["xml-js" :as xml] [app.browser :as bw] [app.common.data :as d] - [app.common.data.macros :as dm] - [app.common.exceptions :as ex :include-macros true] [app.common.logging :as l] - [app.common.pages :as cp] - [app.common.spec :as us] [app.common.uri :as u] [app.config :as cf] [app.util.mime :as mime] [app.util.shell :as sh] - [cljs.spec.alpha :as s] [clojure.walk :as walk] [cuerdas.core :as str] [promesa.core :as p])) @@ -184,7 +178,7 @@ (get-gradients [id mapping] (->> mapping - (filter (fn [[color data]] + (filter (fn [[_color data]] (= (get data "type") "gradient"))) (mapv (partial data->gradient-def id)))) @@ -227,7 +221,7 @@ elements (cond->> elements - (not (empty? gradient-defs)) + (seq gradient-defs) (into [{"type" "element" "name" "defs" "attributes" {} "elements" gradient-defs}]))] diff --git a/exporter/src/app/util/mime.cljs b/exporter/src/app/util/mime.cljs index ed5a19a4c..fef7e4053 100644 --- a/exporter/src/app/util/mime.cljs +++ b/exporter/src/app/util/mime.cljs @@ -8,7 +8,6 @@ "Mimetype and file extension helpers." (:refer-clojure :exclude [get]) (:require - [app.common.data :as d] [cljs.core :as c])) (defn get-extension @@ -20,7 +19,7 @@ :pdf ".pdf" :zip ".zip")) -(defn- get +(defn get [type] (case type :zip "application/zip" diff --git a/exporter/src/app/util/shell.cljs b/exporter/src/app/util/shell.cljs index 559174167..fcb36b981 100644 --- a/exporter/src/app/util/shell.cljs +++ b/exporter/src/app/util/shell.cljs @@ -11,9 +11,9 @@ ["fs" :as fs] ["os" :as os] ["path" :as path] + [app.common.exceptions :as ex] [app.common.logging :as l] [app.common.uuid :as uuid] - [app.common.exceptions :as ex] [cuerdas.core :as str] [promesa.core :as p])) @@ -34,11 +34,10 @@ (when (fs/existsSync path) (l/trace :hint "permanently remove tempfile" :path path) (fs/rmSync path #js {:recursive true})))] - (let [ts (js/Date.now)] - (l/trace :hint "schedule tempfile deletion" - :path path - :scheduled-at (.. (js/Date. (+ (js/Date.now) tempfile-minage)) toString)) - (js/setTimeout remote-tempfile tempfile-minage)))) + (l/trace :hint "schedule tempfile deletion" + :path path + :scheduled-at (.. (js/Date. (+ (js/Date.now) tempfile-minage)) toString)) + (js/setTimeout remote-tempfile tempfile-minage))) (defn tempfile [& {:keys [prefix suffix] @@ -86,7 +85,7 @@ (fn [resolve reject] (l/trace :fn :run-cmd :cmd cmd) (proc/exec cmd #js {:encoding "buffer"} - (fn [error stdout stderr] + (fn [error stdout _stderr] ;; (l/trace :fn :run-cmd :stdout stdout) (if error (reject error)