From 95d942424bed5cb063534590b1e4ffd1b983b2d0 Mon Sep 17 00:00:00 2001 From: Karlos Martins Date: Sun, 1 Dec 2019 20:46:25 +0000 Subject: [PATCH 1/3] Import .dmvbrew/.orcbrew, export .dmvbrew --- src/cljs/orcpub/dnd/e5/events.cljs | 10 +++++----- src/cljs/orcpub/dnd/e5/views.cljs | 28 ++++++++++++++++++---------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/cljs/orcpub/dnd/e5/events.cljs b/src/cljs/orcpub/dnd/e5/events.cljs index 1873c43fa..6132284e7 100644 --- a/src/cljs/orcpub/dnd/e5/events.cljs +++ b/src/cljs/orcpub/dnd/e5/events.cljs @@ -3127,7 +3127,7 @@ (let [blob (js/Blob. (clj->js [(str plugin)]) (clj->js {:type "text/plain;charset=utf-8"}))] - (js/saveAs blob (str name ".orcbrew")) + (js/saveAs blob (str name ".dmvbrew")) {}))) (reg-event-fx @@ -3136,7 +3136,7 @@ (let [blob (js/Blob. (clj->js [(str @(subscribe [::e5/plugins]))]) (clj->js {:type "text/plain;charset=utf-8"}))] - (js/saveAs blob (str "all-content.orcbrew")) + (js/saveAs blob (str "all-content.dmvbrew")) {}))) (reg-event-fx @@ -3145,7 +3145,7 @@ (let [blob (js/Blob. (clj->js [(with-out-str (pprint/pprint plugin))]) (clj->js {:type "text/plain;charset=utf-8"}))] - (js/saveAs blob (str name ".orcbrew")) + (js/saveAs blob (str name ".dmvbrew")) {}))) (reg-event-fx ::e5/export-all-plugins-pretty-print @@ -3153,7 +3153,7 @@ (let [blob (js/Blob. (clj->js [(with-out-str (pprint/pprint @(subscribe [::e5/plugins])))]) (clj->js {:type "text/plain;charset=utf-8"}))] - (js/saveAs blob (str "all-content.orcbrew")) + (js/saveAs blob (str "all-content.dmvbrew")) {}))) (reg-event-fx @@ -3197,7 +3197,7 @@ (spec/explain-data ::e5/plugins plugin)) (prn "INVALID PLUGIN FILE" (spec/explain-data ::e5/plugin plugin)) - {:dispatch [:show-error-message "Invalid .orcbrew file"]}))))) + {:dispatch [:show-error-message "Invalid .orcbrew/.dmvbrew file"]}))))) (reg-event-db ::spells/set-spell diff --git a/src/cljs/orcpub/dnd/e5/views.cljs b/src/cljs/orcpub/dnd/e5/views.cljs index b35a25a8d..061479689 100644 --- a/src/cljs/orcpub/dnd/e5/views.cljs +++ b/src/cljs/orcpub/dnd/e5/views.cljs @@ -6982,15 +6982,23 @@ (defn import-file [e] (let [reader (js/FileReader.) file (.. e -target -files (item 0)) - filename (.-name file) - nm (first (s/split filename #".orcbrew"))] - (.addEventListener - reader - "load" - (fn [e] - (let [text (.. e -target -result)] - (dispatch [::e5/import-plugin nm text])))) - (.readAsText reader file))) + filename (.-name file)] + (if (s/includes? filename ".orcbrew") (let [nm (first (s/split filename (or #".orcbrew")))] + (.addEventListener + reader + "load" + (fn [e] + (let [text (.. e -target -result)] + (dispatch [::e5/import-plugin nm text])))) + (.readAsText reader file)) + (let [nm (first (s/split filename (or #".dmvbrew")))] + (.addEventListener + reader + "load" + (fn [e] + (let [text (.. e -target -result)] + (dispatch [::e5/import-plugin nm text])))) + (.readAsText reader file))))) (defn capitalize-words [s] @@ -7253,7 +7261,7 @@ [:div.p-20.bg-lighter.main-text-color.m-b-10.m-l-10.m-r-10.b-rad-5 [:div.f-w-b.f-s-24.m-b-5 "Import Option Source"] [:input {:type "file" - :accept ".orcbrew" + :accept [".orcbrew", ".dmvbrew"] :on-change import-file}]] [my-content]]]) From bdeefb05d70be540c768a948243b70e771b06760 Mon Sep 17 00:00:00 2001 From: Dawn Date: Tue, 3 Dec 2019 12:11:17 +0000 Subject: [PATCH 2/3] .vaultbrew --- src/cljs/orcpub/dnd/e5/events.cljs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cljs/orcpub/dnd/e5/events.cljs b/src/cljs/orcpub/dnd/e5/events.cljs index 6132284e7..0a186f7dd 100644 --- a/src/cljs/orcpub/dnd/e5/events.cljs +++ b/src/cljs/orcpub/dnd/e5/events.cljs @@ -3127,7 +3127,7 @@ (let [blob (js/Blob. (clj->js [(str plugin)]) (clj->js {:type "text/plain;charset=utf-8"}))] - (js/saveAs blob (str name ".dmvbrew")) + (js/saveAs blob (str name ".vaultbrew")) {}))) (reg-event-fx @@ -3136,7 +3136,7 @@ (let [blob (js/Blob. (clj->js [(str @(subscribe [::e5/plugins]))]) (clj->js {:type "text/plain;charset=utf-8"}))] - (js/saveAs blob (str "all-content.dmvbrew")) + (js/saveAs blob (str "all-content.vaultbrew")) {}))) (reg-event-fx @@ -3145,7 +3145,7 @@ (let [blob (js/Blob. (clj->js [(with-out-str (pprint/pprint plugin))]) (clj->js {:type "text/plain;charset=utf-8"}))] - (js/saveAs blob (str name ".dmvbrew")) + (js/saveAs blob (str name ".vaultbrew")) {}))) (reg-event-fx ::e5/export-all-plugins-pretty-print @@ -3153,7 +3153,7 @@ (let [blob (js/Blob. (clj->js [(with-out-str (pprint/pprint @(subscribe [::e5/plugins])))]) (clj->js {:type "text/plain;charset=utf-8"}))] - (js/saveAs blob (str "all-content.dmvbrew")) + (js/saveAs blob (str "all-content.vaultbrew")) {}))) (reg-event-fx @@ -3197,7 +3197,7 @@ (spec/explain-data ::e5/plugins plugin)) (prn "INVALID PLUGIN FILE" (spec/explain-data ::e5/plugin plugin)) - {:dispatch [:show-error-message "Invalid .orcbrew/.dmvbrew file"]}))))) + {:dispatch [:show-error-message "Invalid .orcbrew/.vaultbrew file"]}))))) (reg-event-db ::spells/set-spell From 3deea9cc8098e6322a63727b3b94f94001dc067a Mon Sep 17 00:00:00 2001 From: Dawn Date: Tue, 3 Dec 2019 12:12:19 +0000 Subject: [PATCH 3/3] .vaultbrew in views --- src/cljs/orcpub/dnd/e5/views.cljs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cljs/orcpub/dnd/e5/views.cljs b/src/cljs/orcpub/dnd/e5/views.cljs index 061479689..57a045c15 100644 --- a/src/cljs/orcpub/dnd/e5/views.cljs +++ b/src/cljs/orcpub/dnd/e5/views.cljs @@ -6991,7 +6991,7 @@ (let [text (.. e -target -result)] (dispatch [::e5/import-plugin nm text])))) (.readAsText reader file)) - (let [nm (first (s/split filename (or #".dmvbrew")))] + (let [nm (first (s/split filename (or #".vaultbrew")))] (.addEventListener reader "load" @@ -7261,7 +7261,7 @@ [:div.p-20.bg-lighter.main-text-color.m-b-10.m-l-10.m-r-10.b-rad-5 [:div.f-w-b.f-s-24.m-b-5 "Import Option Source"] [:input {:type "file" - :accept [".orcbrew", ".dmvbrew"] + :accept [".orcbrew", ".vaultbrew"] :on-change import-file}]] [my-content]]])