3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-18 20:56:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Run importation in a transaction.

Browse source 
Among other cosmetic fixes.
This commit is contained in:
Andrey Antukh 2016-11-20 21:20:41 +01:00
parent e73339d2f9
commit 4eab2f81cf
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
1 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

37
backend/src/uxbox/cli/collimp.clj
View file

@ -52,11 +52,10 @@
;; --- Colors Collections Importer ;; --- Colors Collections Importer
(def storage media/images-storage)
(defn- create-image-collection (defn- create-image-collection
"Create or replace image collection by its name." "Create or replace image collection by its name."
[conn {:keys [name] :as entry}] [conn {:keys [name] :as entry}]
(println "Creating image collection:" name)
(let [id (uuid/namespaced +imates-uuid-ns+ name) (let [id (uuid/namespaced +imates-uuid-ns+ name)
sqlv (sql/create-image-collection {:id id :name name})] sqlv (sql/create-image-collection {:id id :name name})]
(sc/execute conn sqlv) (sc/execute conn sqlv)
@ -78,7 +77,8 @@
[conn {:keys [id path] :as image}] [conn {:keys [id path] :as image}]
{:pre [(uuid? id) {:pre [(uuid? id)
(fs/path? path)]} (fs/path? path)]}
(let [sqlv (sql/delete-image {:id id})] (let [sqlv (sql/delete-image {:id id})
storage media/images-storage]
@(st/delete storage path) @(st/delete storage path)
(sc/execute conn sqlv))) (sc/execute conn sqlv)))
@ -88,7 +88,8 @@
(uuid? collid) (uuid? collid)
(uuid? imageid)]} (uuid? imageid)]}
(let [filename (fs/base-name localpath) (let [filename (fs/base-name localpath)
[width height] (retrieve-image-size localpath) storage media/images-storage
[width height] (time (retrieve-image-size localpath))
extension (second (fs/split-ext filename)) extension (second (fs/split-ext filename))
path @(st/save storage filename localpath) path @(st/save storage filename localpath)
params {:name filename params {:name filename
@ -106,7 +107,9 @@
(defn- import-image (defn- import-image
[conn id fpath] [conn id fpath]
{:pre [(uuid? id) (fs/path? fpath)]} {:pre [(uuid? id) (fs/path? fpath)]}
#_(let [imageid (uuid/namespaced +imates-uuid-ns+ (str id fpath))] (println "Importing image:" (str fpath))
(let [filename (fs/base-name fpath)
imageid (uuid/namespaced +imates-uuid-ns+ (str id filename))]
(if-let [image (retrieve-image conn imageid)] (if-let [image (retrieve-image conn imageid)]
(do (do
(delete-image conn image) (delete-image conn image)
@ -114,9 +117,10 @@
(create-image conn id imageid fpath)))) (create-image conn id imageid fpath))))
(defn- process-images-entry (defn- process-images-entry
[conn {:keys [path regex] :as entry}] [conn basedir {:keys [path regex] :as entry}]
{:pre [(s/valid? ::import-entry entry)]} {:pre [(us/valid? ::import-entry entry)]}
(let [id (uuid/random) #_(create-image-collection conn entry)] (let [id (create-image-collection conn entry)
path (fs/resolve basedir path)]
(doseq [fpath (fs/list-files path)] (doseq [fpath (fs/list-files path)]
(when (re-matches regex (str fpath)) (when (re-matches regex (str fpath))
(import-image conn id fpath))))) (import-image conn id fpath)))))
@ -145,25 +149,24 @@
(defn- start-system (defn- start-system
[] []
(-> (mount/only #{#'uxbox.config/config (mount/start))
#'uxbox.db/datasource
#'uxbox.migrations/migrations})
(mount/start)))
(defn- stop-system (defn- stop-system
[] []
(mount/stop)) (mount/stop))
(defn- run-importer (defn- run-importer
[directory data] [conn basedir data]
(println "Running importer on:") (let [images (:images data)
(pprint data)) icons (:icons data)]
(run! #(process-images-entry conn basedir %) images)))
(defn -main (defn -main
[& [path]] [& [path]]
(let [[directory data] (read-import-file path)] (let [[basedir data] (read-import-file path)]
(start-system) (start-system)
(try (try
(run-importer directory data) (with-open [conn (db/connection)]
(sc/apply-atomic conn run-importer basedir data))
(finally (finally
(stop-system))))) (stop-system)))))