refactor effects and improve error handling

Author: sprocketc

src/electron/file.cljs

@@ -90,16 +90,17 @@
 
 (defn print!
   [content]
-  (let [window (BrowserWindow.
-                #js {:show false
-                     :frame false})]
-    (.on (.-webContents window) "did-finish-load"
-         #(.print
-           (.-webContents window)
-           #js {}
-           (fn [success, error]
-             (if success
-               (js/Promise.resolve nil)
-               (js/Promise.reject error)))))
+  (let [window (BrowserWindow. #js {:show false
+                                    :frame false})]
+    (js/Promise.
+     (fn [res rej]
+       (.on (.-webContents window) "did-finish-load"
+            #(.print
+              (.-webContents window)
+              #js {}
+              (fn [success error]
+                (if success
+                  (res)
+                  (rej error)))))
 
-    (.loadURL window (str "data:text/html;charset=utf-8," content))))
+       (.loadURL window (str "data:text/html;charset=utf-8," content))))))

src/renderer/app/effects.cljs

@@ -8,7 +8,6 @@
    [renderer.history.handlers :as history.h]
    [renderer.notification.events :as-alias notification.e]
    [renderer.utils.dom :as dom]
-   [renderer.utils.drop :as drop]
    [renderer.utils.file :as file]))
 
 (rf.storage/reg-co-fx! config/app-key {:cofx :store})
@@ -39,12 +38,6 @@
  (fn [coeffects _]
    (assoc coeffects :now (.now js/Date))))
 
-(rf/reg-fx
- ::data-transfer
- (fn [[position data-transfer]]
-   (drop/items! position (.-items data-transfer))
-   (drop/files! position (.-files data-transfer))))
-
 (rf/reg-fx
  ::persist
  (fn [db]
@@ -79,17 +72,18 @@
 
 (rf/reg-fx
  ::query-local-fonts
- (fn [{:keys [on-resolution formatter]}]
+ (fn [{:keys [on-success on-error formatter]}]
    (when-not (undefined? js/window.queryLocalFonts)
      (-> (.queryLocalFonts js/window)
-         (.then #(rf/dispatch [on-resolution (cond-> % formatter formatter)]))))))
+         (.then #(when on-success (rf/dispatch (conj on-success (cond-> % formatter formatter)))))
+         (.catch #(when on-error (rf/dispatch (conj on-error %))))))))
 
 (rf/reg-fx
- ::save
+ ::file-save
  file/save!)
 
 (rf/reg-fx
- ::open
+ ::file-open
  file/open!)
 
 (rf/reg-fx

src/renderer/app/events.cljs

@@ -9,7 +9,6 @@
    [renderer.notification.handlers :as notification.h]
    [renderer.notification.views :as notification.v]
    [renderer.utils.i18n :as i18n]
-   [renderer.utils.system :as system]
    [renderer.window.effects :as-alias window.fx]))
 
 (rf/reg-event-db
@@ -86,10 +85,20 @@
 (rf/reg-event-fx
  ::load-system-fonts
  (fn [_ [_ file-path]]
-   (if system/electron?
-     {::window.fx/ipc-invoke {:channel "load-system-fonts"
-                              :data file-path
-                              :on-resolution ::set-system-fonts
-                              :formatter #(js->clj % :keywordize-keys true)}}
-     {::fx/query-local-fonts {:on-resolution ::set-system-fonts
-                              :formatter #(mapv ->font-map %)}})))
+   {::window.fx/ipc-invoke {:channel "load-system-fonts"
+                            :data file-path
+                            :on-success [::set-system-fonts]
+                            :on-error [::notification.e/exception]
+                            :formatter #(js->clj % :keywordize-keys true)}}))
+
+(rf/reg-event-fx
+ ::query-local-fonts
+ (fn [_ _]
+   {::fx/query-local-fonts {:on-success [::set-system-fonts]
+                            :on-error [::notification.e/exception]
+                            :formatter #(mapv ->font-map %)}}))
+
+(rf/reg-event-fx
+ ::file-open
+ (fn [_ [_ options]]
+   {::fx/file-open options}))

src/renderer/attribute/impl/font_family.cljs

@@ -48,7 +48,7 @@
       {:modal true
        :onOpenChange (fn [state]
                        (when (and state (empty? suggestions))
-                         (rf/dispatch [::app.e/load-system-fonts])))}
+                         (rf/dispatch [::app.e/query-local-fonts])))}
       [:> Popover/Trigger
        {:class "form-control-button"
         :disabled (:disabled attrs)}

src/renderer/attribute/impl/href.cljs

@@ -3,28 +3,20 @@
   (:require
    [clojure.string :as str]
    [re-frame.core :as rf]
+   [renderer.app.events :as app.e]
    [renderer.attribute.hierarchy :as hierarchy]
    [renderer.attribute.views :as v]
    [renderer.element.events :as-alias element.e]
    [renderer.tool.events :as-alias tool.e]
+   [renderer.tool.handlers :as tool.h]
    [renderer.tool.subs :as-alias tool.s]
-   [renderer.ui :as ui]
-   [renderer.utils.file :as file]))
+   [renderer.ui :as ui]))
 
 (defmethod hierarchy/description [:default :href]
   []
   "The href attribute defines a link to a resource as a reference URL.
    The exact meaning of that link depends on the context of each element using it.")
 
-(defn update-href!
-  [^js/File file]
-  (let [reader (js/FileReader.)]
-    (.addEventListener
-     reader
-     "load"
-     #(rf/dispatch [::element.e/set-attr :href (.-result reader)]))
-    (.readAsDataURL reader file)))
-
 (defmethod hierarchy/form-element [:default :href]
   [_ k v {:keys [disabled]}]
   (let [state-default? (= @(rf/subscribe [::tool.s/state]) :idle)
@@ -38,12 +30,26 @@
      [:button.form-control-button
       {:title "Select file"
        :disabled disabled
-       :on-click #(file/open!
-                   {:options {:startIn "pictures"
-                              :types [{:accept {"image/png" [".png"]
-                                                "image/jpeg" [".jpeg" ".jpg"]
-                                                "image/bmp" [".fmp"]}}]}
-                    :callback (fn [file]
-                                (rf/dispatch [::tool.e/activate :transform])
-                                (update-href! file))})}
+       :on-click #(rf/dispatch
+                   [::app.e/file-open {:options {:startIn "pictures"
+                                                 :types [{:accept {"image/png" [".png"]
+                                                                   "image/jpeg" [".jpeg" ".jpg"]
+                                                                   "image/bmp" [".fmp"]}}]}
+                                       :on-success [::success]}])}
       [ui/icon "folder"]]]))
+
+(rf/reg-event-fx
+ ::success
+ (fn [{:keys [db]} [_ file]]
+   {:db (tool.h/activate db :transform)
+    ::update-href file}))
+
+(rf/reg-fx
+ ::update-href
+ (fn [^js/File file]
+   (let [reader (js/FileReader.)]
+     (.addEventListener
+      reader
+      "load"
+      #(rf/dispatch [::element.e/set-attr :href (.-result reader)]))
+     (.readAsDataURL reader file))))

src/renderer/color/effects.cljs

@@ -9,5 +9,5 @@
  (fn [{:keys [on-success on-error]}]
    (-> (js/EyeDropper.)
        (.open)
-       (.then (fn [color] (when on-success (rf/dispatch [on-success color]))))
-       (.catch (fn [error] (when on-error (rf/dispatch [on-error error])))))))
+       (.then (fn [color] (when on-success (rf/dispatch (conj on-success color)))))
+       (.catch (fn [error] (when on-error (rf/dispatch (conj on-error error))))))))

src/renderer/core.cljs

@@ -15,6 +15,7 @@
    [renderer.color.events]
    [renderer.dialog.events]
    [renderer.dialog.subs]
+   [renderer.document.effects]
    [renderer.document.events :as document.e]
    [renderer.document.subs]
    [renderer.element.effects]
@@ -124,14 +125,14 @@
   (rf/dispatch-sync [::theme.e/set-native-mode (theme.fx/native-mode! theme.fx/native-query!)])
   (rf/dispatch-sync [::theme.e/add-native-listener])
   (rf/dispatch-sync [::theme.e/set-document-attr])
-  (rf/dispatch-sync [::app.e/load-system-fonts])
   (rf/dispatch-sync [::rp/add-keyboard-event-listener "keydown"])
   (rf/dispatch-sync [::rp/set-keydown-rules keyb/keydown-rules])
 
   (.setup paper)
 
   (if system/electron?
-    (register-ipc-on-events!)
+    (do (register-ipc-on-events!)
+        (rf/dispatch [::app.e/load-system-fonts]))
     (add-listeners!))
 
   (mount-root!))

src/renderer/document/effects.cljs

@@ -0,0 +1,19 @@
+(ns renderer.document.effects
+  (:require
+   [clojure.edn :as edn]
+   [re-frame.core :as rf]
+   [renderer.document.events :as-alias document.e]))
+
+(rf/reg-fx
+ ::read
+ (fn [^js/File file]
+   (let [reader (js/FileReader.)]
+     (.addEventListener
+      reader
+      "load"
+      #(let [document (-> (.. % -target -result)
+                          (edn/read-string)
+                          (assoc :title (.-name file)
+                                 :path (.-path file)))]
+         (rf/dispatch [::document.e/load document])))
+     (.readAsText reader file))))

src/renderer/document/events.cljs

@@ -9,9 +9,11 @@
    [renderer.dialog.handlers :as dialog.h]
    [renderer.dialog.views :as dialog.v]
    [renderer.document.db :as db]
+   [renderer.document.effects :as-alias fx]
    [renderer.document.handlers :as h]
    [renderer.element.handlers :as element.h]
    [renderer.history.handlers :as history.h]
+   [renderer.notification.events :as notification.e]
    [renderer.notification.handlers :as notification.h]
    [renderer.notification.views :as notification.v]
    [renderer.snap.handlers :as snap.h]
@@ -169,13 +171,24 @@
    (if system/electron?
      {::window.fx/ipc-invoke {:channel "open-documents"
                               :data file-path
-                              :on-resolution ::load-multiple
+                              :on-success [::load-multiple]
+                              :on-error [::notification.e/exception]
                               :formatter #(mapv edn/read-string %)}}
-     {::app.fx/open {:options file-picker-options
-                     :on-resolution ::load
-                     :formatter #(-> (edn/read-string %)
-                                     (assoc :title (.-name %)
-                                            :path (.-path %)))}})))
+     {::app.fx/file-open {:options file-picker-options
+                          :on-success [::file-read]
+                          :on-error [::file-error]}})))
+
+(rf/reg-event-fx
+ ::file-read
+ (fn [_ [_ file]]
+   {::fx/read file}))
+
+(rf/reg-event-fx
+ ::file-error
+ (fn [{:keys [db]} [_ ^js/Error error]]
+   (cond-> db
+     (not= (.-name error) "AbortError")
+     (notification.h/add (notification.v/exception error)))))
 
 (rf/reg-event-fx
  ::open-directory
@@ -212,13 +225,15 @@
      (if system/electron?
        {::window.fx/ipc-invoke {:channel "save-document"
                                 :data (pr-str document)
-                                :on-resolution ::saved
+                                :on-success [::saved]
+                                :on-error [::notification.e/exception]
                                 :formatter edn/read-string}}
-       {::app.fx/save {:data (h/save-format document)
-                       :options file-picker-options
-                       :formatter (fn [file] {:id (:id document)
-                                              :title (.-name file)})
-                       :on-resolution ::saved}}))))
+       {::app.fx/file-save {:data (h/save-format document)
+                            :options file-picker-options
+                            :formatter (fn [file] {:id (:id document)
+                                                   :title (.-name file)})
+                            :on-success [::saved]
+                            :on-error [::file-error]}}))))
 
 (rf/reg-event-fx
  ::download
@@ -234,13 +249,15 @@
      (if system/electron?
        {::window.fx/ipc-invoke {:channel "save-document"
                                 :data (pr-str document)
-                                :on-resolution ::close-saved
+                                :on-success [::close-saved]
+                                :on-error [::notification.e/exception]
                                 :formatter edn/read-string}}
-       {::app.fx/save {:data (h/save-format document)
-                       :options file-picker-options
-                       :formatter (fn [file] {:id id
-                                              :title (.-name file)})
-                       :on-resolution ::close-saved}}))))
+       {::app.fx/file-save {:data (h/save-format document)
+                            :options file-picker-options
+                            :formatter (fn [file] {:id id
+                                                   :title (.-name file)})
+                            :on-success [::close-saved]
+                            :on-error [::file-error]}}))))
 
 (rf/reg-event-fx
  ::save-as
@@ -249,13 +266,15 @@
      (if system/electron?
        {::window.fx/ipc-invoke {:channel "save-document-as"
                                 :data (pr-str document)
-                                :on-resolution ::saved
+                                :on-success [::saved]
+                                :on-error [::notification.e/exception]
                                 :formatter edn/read-string}}
-       {::app.fx/save {:data (h/save-format document)
-                       :options file-picker-options
-                       :formatter (fn [file] {:id (:id document)
-                                              :title (.-name file)})
-                       :on-resolution ::saved}}))))
+       {::app.fx/file-save {:data (h/save-format document)
+                            :options file-picker-options
+                            :formatter (fn [file] {:id (:id document)
+                                                   :title (.-name file)})
+                            :on-success [::saved]
+                            :on-error [::file-error]}}))))
 
 (rf/reg-event-db
  ::saved
@@ -291,3 +310,4 @@
    (-> db
        (h/set-active id)
        (h/center))))
+

src/renderer/element/effects.cljs

@@ -45,5 +45,5 @@
              :data {:label (:label image)
                     :image (.getImageData context 0 0 width height)
                     :position [x y]}
-             :on-resolution ::element.e/traced}])))))))
+             :on-success [::element.e/traced]}])))))))
 

src/renderer/element/events.cljs

@@ -150,10 +150,12 @@
          svg (element/->svg els)]
      (if system/electron?
        {::window.fx/ipc-invoke {:channel "export"
-                                :data svg}}
-       {::app.fx/save [:data svg
-                       :options {:startIn "pictures"
-                                 :types [{:accept {"image/svg+xml" [".svg"]}}]}]}))))
+                                :data svg
+                                :on-error [::notification.e/exception]}}
+       {::app.fx/file-save [:data svg
+                            :on-error [::notification.e/exception]
+                            :options {:startIn "pictures"
+                                      :types [{:accept {"image/svg+xml" [".svg"]}}]}]}))))
 
 (rf/reg-event-fx
  ::print
@@ -163,7 +165,8 @@
      (if system/electron?
        {::window.fx/ipc-invoke {:channel "print"
                                 :data svg
-                                :on-resolution ::notification.e/add}}
+                                :on-success [::notification.e/add]
+                                :on-error [::notification.e/exception]}}
        {::fx/print svg}))))
 
 (rf/reg-event-db