3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-29 08:46:49 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix custom font upload fails silently for unsupported formats

Browse source
This commit is contained in:
Pablo Alba 2022-10-06 09:55:51 +02:00 • committed by Eva
parent ac3251b29e
commit 88cd19d21a
5 changed files with 44 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

37
frontend/src/app/main/data/fonts.cljs
View file

@ -12,8 +12,11 @@
[app.common.media :as cm]
[app.common.spec :as us]
[app.common.uuid :as uuid]
[app.main.data.messages :as dm]
[app.main.fonts :as fonts]
[app.main.repo :as rp]
[app.main.store :as st]
[app.util.i18n :refer [tr]]
[app.util.storage :refer [storage]]
[app.util.webapi :as wa]
[beicon.core :as rx]
@ -133,17 +136,35 @@
{:data data
:name (.-name blob)
:type (parse-mtype data)}))
(rx/mapcat (fn [{:keys [type] :as font}]
(if type
(rx/catch (fn []
(rx/of {:error (.-name blob)})))
(rx/mapcat (fn [{:keys [type, error] :as font}]
(if (or type error)
(rx/of font)
(rx/empty))))))]
(->> (rx/from blobs)
(rx/mapcat read-blob)
(rx/map parse-font)
(rx/filter some?)
(rx/map prepare)
(rx/reduce join {}))))
(let [fonts (->> (rx/from blobs)
(rx/mapcat read-blob))
errors (->> fonts
(rx/filter #(some? (:error %)))
(rx/reduce (fn [acc font]
(conj acc (str "'" (:error font) "'")))
[]))]
(rx/subscribe errors
#(when
(not-empty %)
(st/emit!
(dm/error
(if (> (count %) 1)
(tr "errors.bad-font-plural" (str/join ", " %))
(tr "errors.bad-font" (first %)))))))
(->> fonts
(rx/filter #(nil? (:error %)))
(rx/map parse-font)
(rx/filter some?)
(rx/map prepare)
(rx/reduce join {})))))
(defn- calculate-family-to-id-mapping
[existing]

3
frontend/src/app/main/ui/dashboard/fonts.cljs
View file

@ -303,8 +303,7 @@
[:div.table-field.search-input
[:input {:placeholder (tr "labels.search-font")
:default-value ""
:on-change on-change
}]]]
:on-change on-change}]]]
(cond
(seq fonts)