3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-21 23:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix import format detection and error handling

Browse source
This commit is contained in:
Andrey Antukh 2024-11-25 12:29:59 +01:00
parent ef3588d05f
commit 577b731b22
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/app/main/ui/dashboard/import.scss vendored
View file

@ -64,6 +64,7 @@
} }
.file-entry { .file-entry {
display: flex;
.file-name { .file-name {
@include flexRow; @include flexRow;
.file-icon { .file-icon {
@ -114,6 +115,8 @@
} }
.error-message, .error-message,
.progress-message { .progress-message {
display: flex;
align-items: center;
height: $s-32; height: $s-32;
color: var(--modal-text-foreground-color); color: var(--modal-text-foreground-color);
} }

14
frontend/src/app/worker/import.cljs
View file

@ -799,7 +799,8 @@
(rx/merge-map (rx/merge-map
(fn [body] (fn [body]
(let [mtype (parse-mtype body)] (let [mtype (parse-mtype body)]
(if (= "application/zip" mtype) (cond
(= "application/zip" mtype)
(->> (uz/load body) (->> (uz/load body)
(rx/merge-map read-zip-manifest) (rx/merge-map read-zip-manifest)
(rx/map (rx/map
@ -808,7 +809,13 @@
(let [manifest (decode-manifest manifest)] (let [manifest (decode-manifest manifest)]
(assoc file :type :binfile-v3 :files (:files manifest))) (assoc file :type :binfile-v3 :files (:files manifest)))
(assoc file :type :legacy-zip :body body))))) (assoc file :type :legacy-zip :body body)))))
(rx/of (assoc file :type :binfile-v1))))))
(= "application/octet-stream" mtype)
(rx/of (assoc file :type :binfile-v1))
:else
(rx/of (assoc file :type :unknown))))))
(rx/share))] (rx/share))]
(->> (rx/merge (->> (rx/merge
@ -837,9 +844,10 @@
(assoc :status :success)))))))) (assoc :status :success))))))))
(->> stream (->> stream
(rx/filter (fn [data] (= "other" (:type data)))) (rx/filter (fn [data] (= :unknown (:type data))))
(rx/map (fn [_] (rx/map (fn [_]
{:uri (:uri file) {:uri (:uri file)
:status :error
:error (tr "dashboard.import.analyze-error")})))) :error (tr "dashboard.import.analyze-error")}))))
(rx/catch (fn [cause] (rx/catch (fn [cause]