Skip to content

Use staging endpoint for image assets #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OtterleyW merged 2 commits into from
Jan 22, 2026
Merged

Use staging endpoint for image assets #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e815d6a
Use stage assets command
OtterleyW Jan 22, 2026
26433f9
Filter out .DS_store files
OtterleyW Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 85 additions & 7 deletions src/sharetribe/flex_cli/commands/assets.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,52 @@
(when-not (io-util/dir? path)
(io-util/mkdirp path)))

(defn- stage-asset
[params ctx]
(go-try
(let [{:keys [api-client marketplace]} ctx
{:keys [filename path data-raw] :as asset} params
file-name (or filename path)]
(when-not data-raw
(exception/throw! :assets/stage-api-call-failed
{:asset-path path}))

(let [form-data (doto (FormData.)
(.append "file" data-raw file-name))]
(try
(let [res (<? (do-multipart-post api-client "/assets/stage"
{:marketplace marketplace}
form-data))
staging-id (-> res :data :staging-id)]
(assoc asset :staging-id staging-id))
(catch js/Error e
(if (= :api/error (exception/type e))
(throw (exception/exception :assets/stage-api-call-failed
{:asset-path path
:api-error-data (exception/data e)}))
(throw e))))))))

(defn- to-multipart-form-data
[{:keys [current-version assets]}]
(:form-data
(reduce
(fn [{:keys [form-data i]} {:keys [path op data-raw filename]}]
(fn [{:keys [form-data i]} {:keys [path op data-raw filename staging-id]}]
{:form-data (case op
:delete
(doto form-data
(.append (str "path-" i) path)
(.append (str "op-" i) "delete"))

(:upsert nil)
(doto form-data
(.append (str "path-" i) path)
(.append (str "op-" i) "upsert")
(.append (str "data-raw-" i) data-raw filename)))
(let [form-data (doto form-data
(.append (str "path-" i) path)
(.append (str "op-" i) "upsert"))]
(when staging-id
(.append form-data (str "staging-id-" i) (str staging-id)))
(when (and (not staging-id) data-raw)
(let [fname (or filename path)]
(.append form-data (str "data-raw-" i) data-raw fname)))
form-data))
:i (inc i)})
{:form-data (doto (FormData.)
(.append "current-version" current-version))
Expand Down Expand Up @@ -163,7 +193,11 @@

{:keys [version assets] :as asset-meta} (io-util/read-asset-meta path)
local-assets (io-util/read-assets path)
changed-assets (filter-assets-to-upload assets local-assets)
changed-assets (into [] (filter-assets-to-upload assets local-assets))
json-asset? (fn [{:keys [path]}]
(let [path-lower (str/lower-case path)]
(str/ends-with? path-lower ".json")))
stageable-assets (into [] (remove json-asset? changed-assets))

_ (validate-assets! local-assets)

Expand All @@ -183,9 +217,32 @@
(if no-ops?
(io-util/ppd [:span "Assets are up to date."])
(let [query-params {:marketplace marketplace}
_ (when (seq stageable-assets)
(io-util/log (.green chalk (str "Staging assets: "
(str/join ", " (map :path stageable-assets))))))
staged-assets (when (seq stageable-assets)
(loop [acc []
remaining stageable-assets]
(if-let [asset (first remaining)]
(let [staged (<? (stage-asset asset ctx))]
(recur (conj acc staged) (rest remaining)))
acc)))
staged-by-path (into {} (map (juxt :path :staging-id)) (or staged-assets []))
upsert-ops (into []
(map (fn [asset]
(let [path (:path asset)
staging-id (get staged-by-path path)]
(cond-> {:path path
:op :upsert}
staging-id (assoc :staging-id staging-id)
(and (not staging-id) (:data-raw asset))
(assoc :data-raw (:data-raw asset)
:filename (:filename asset)
:full-path (:full-path asset))))))
changed-assets)
body-params (to-multipart-form-data
{:current-version (if version version "nil") ;; stringify nil as initial version
:assets (concat changed-assets delete-assets)})
:assets (concat upsert-ops (or delete-assets []))})

res (try
(<? (do-multipart-post api-client "/assets/push" query-params body-params))
Expand All @@ -205,6 +262,27 @@
(io-util/ppd [:span
"Assets are up to date."])))))))

(defmethod exception/format-exception :assets/stage-api-call-failed [_ _ {:keys [asset-path api-error-data]}]
(let [error (when api-error-data (api.client/api-error api-error-data))
detail (or (:detail error) (:message error))
suggestion "Fix the file and rerun assets push to retry staging."
bold-path (.bold chalk (or asset-path "<unknown>"))]
(if (= :asset-invalid-content (:code error))
[:span
(.bold.red chalk "Failed to stage image ") bold-path ": "
(or detail "The file is missing or uses an unsupported format.")
:line suggestion]
(let [fallback (cond
api-error-data (api.client/default-error-format api-error-data)
:else [:span "Staging failed due to an unexpected error."])
fallback-span (if (and (vector? fallback) (= :span (first fallback)))
fallback
[:span fallback])]
(into (vec fallback-span)
[:line
"While staging image " bold-path "."
:line suggestion])))))

(comment

(sharetribe.flex-cli.core/main-dev-str "help assets pull")
Expand Down
1 change: 1 addition & 0 deletions src/sharetribe/flex_cli/io_util.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@
(comp
(remove #(= asset-meta-dirname %))
(remove #(= ".git" %))
(remove #(= ".DS_Store" %))
(mapcat (fn [dir-or-file]
(let [full-path (join path dir-or-file)]
(if (dir? full-path)
Expand Down