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

Merge pull request #4145 from penpot/niwinz-staging-tmp

Browse source 
✨ Minor improvements on TMP storage API
This commit is contained in:
Alejandro 2024-02-19 07:16:36 +01:00 • committed by GitHub
commit 7ac4b89a0e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 59 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

47
backend/src/app/features/components_v2.clj
View file

@ -1524,21 +1524,9 @@
(cfv/validate-file! file libs)
(cfv/validate-file-schema! file))
(defn- process-file
[{:keys [::db/conn] :as system} {:keys [id] :as file} & {:keys [validate?]}]
(let [libs (->> (files/get-file-libraries conn id)
(into [file] (comp (map :id)
(map (partial get-file system))))
(d/index-by :id))
file (-> file
(update :data migrate-fdata libs)
(update :features conj "components/v2"))
_ (when validate?
(validate-file! file libs))
file (if (contains? (:features file) "fdata/objects-map")
(defn- persist-file!
[{:keys [::db/conn] :as system} {:keys [id] :as file}]
(let [file (if (contains? (:features file) "fdata/objects-map")
(fdata/enable-objects-map file)
file)
@ -1547,15 +1535,32 @@
(let [file (fdata/enable-pointer-map file)]
(fdata/persist-pointers! system id)
file))
file)]
file)
;; Ensure all files has :data with id
file (update file :data assoc :id id)]
(db/update! conn :file
{:data (blob/encode (:data file))
:features (db/create-array conn "text" (:features file))
:revn (:revn file)}
{:id (:id file)})
{:id (:id file)})))
(dissoc file :data)))
(defn- process-file!
[{:keys [::db/conn] :as system} {:keys [id] :as file} & {:keys [validate?]}]
(let [libs (->> (files/get-file-libraries conn id)
(into [file] (comp (map :id)
(map (partial get-file system))))
(d/index-by :id))
file (-> file
(update :data migrate-fdata libs)
(update :features conj "components/v2"))]
(when validate?
(validate-file! file libs))
file))
(def ^:private sql:get-and-lock-team-files
"SELECT f.id
@ -1605,13 +1610,15 @@
(when (string? label)
(fsnap/take-file-snapshot! system {:file-id file-id
:label (str "migration/" label)}))
(let [file (get-file system file-id)]
(let [file (get-file system file-id)
file (process-file! system file :validate? validate?)]
(events/tap :progress
{:op :migrate-file
:name (:name file)
:id (:id file)})
(process-file system file :validate? validate?)))))
(persist-file! system file)))))
(catch Throwable cause
(vreset! err true)

19
backend/src/app/storage/tmp.clj
View file

@ -19,6 +19,8 @@
[promesa.exec :as px]
[promesa.exec.csp :as sp]))
(def default-tmp-dir "/tmp/penpot")
(declare ^:private remove-temp-file)
(declare ^:private io-loop)
@ -33,6 +35,7 @@
(defmethod ig/init-key ::cleaner
[_ cfg]
(fs/create-dir default-tmp-dir)
(px/fn->thread (partial io-loop cfg)
{:name "penpot/storage/tmp-cleaner" :virtual true}))
@ -70,18 +73,14 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defn tempfile
"Returns a tmpfile candidate (without creating it)"
[& {:keys [suffix prefix min-age]
:or {prefix "penpot."
suffix ".tmp"}}]
(let [path (fs/tempfile :suffix suffix :prefix prefix)]
(sp/offer! queue [path (some-> min-age dt/duration)])
path))
(defn create-tempfile
[& {:keys [suffix prefix min-age]
:or {prefix "penpot."
suffix ".tmp"}}]
(let [path (fs/create-tempfile :suffix suffix :prefix prefix)]
(let [path (fs/create-tempfile
:perms "rw-r--r--"
:dir default-tmp-dir
:suffix suffix
:prefix prefix)]
(fs/delete-on-exit! path)
(sp/offer! queue [path (some-> min-age dt/duration)])
path))