Skip to content

40 fix file import corruption #618

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
datdamnzotz merged 11 commits into from
Sep 5, 2025
Merged

40 fix file import corruption #618

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3b7d298
Merge remote-tracking branch 'DMV-orcpub/develop' into develop
codeGlaze Apr 8, 2023
318555d
Merge branch '602-fix-icon-asclepius-svg' into develop
codeGlaze Mar 11, 2024
dad0bba
Merge branch 'develop' of https://github.com/codeglaze/orcpub into de…
codeGlaze Oct 20, 2024
d6a5e11
Merge remote-tracking branch 'DMV-orcpub/develop' into develop
codeGlaze Oct 20, 2024
853b6f6
untracking `.gitignore`
codeGlaze Jan 18, 2025
cf81b0f
Merge remote-tracking branch 'DMV-orcpub/develop' into develop
codeGlaze Jul 26, 2025
39b1a76
Add `clean-plugin-errors` to custom handle common errors
codeGlaze Aug 3, 2025
e90a984
renamed `common-errors` to `clean-plugin-errors`
codeGlaze Aug 3, 2025
9623043
Adds default source "Default Option Source" to every builder
codeGlaze Aug 4, 2025
27d333b
Revert "Adds default source "Default Option Source" to every builder"
codeGlaze Aug 8, 2025
1f15151
Whoops. Adding `.gitignore` back
codeGlaze Aug 12, 2025
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
36 changes: 0 additions & 36 deletions .gitignore
View file
Open in desktop

This file was deleted.

14 changes: 12 additions & 2 deletions src/cljs/orcpub/dnd/e5/events.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3197,11 +3197,21 @@
(fn [{:keys [db]} [_ plugin-name type-key key]]
{:dispatch [::e5/set-plugins (-> db :plugins (update-in [plugin-name type-key key :disabled?] not))]}))

(defn clean-plugin-errors [plugin-text]
(-> plugin-text
(clojure.string/replace #"disabled\?\s+nil" "disabled? false") ; disabled? nil - replace w/disabled? false
(clojure.string/replace #"(?m)nil nil, " "") ; nil nil, - find+remove
(clojure.string/replace #":\w+\snil" "") ; :[a-0] nil - find+remove
(clojure.string/replace #"\{\"\"\s*\{:orcpub\.dnd\.e5" "{\"Default Option Source\" {:orcpub.dnd.e5")
(clojure.string/replace #":option-pack\s*\"\s*\"\s*," ":option-pack \"Default Option Source\",") ;:option-pack "",
))

(reg-event-fx
::e5/import-plugin
(fn [{:keys [db]} [_ plugin-name plugin-text]]
(let [plugin (try
(reader/read-string plugin-text)
(let [cleaned-plugin-text (clean-plugin-errors plugin-text)
plugin (try
(reader/read-string cleaned-plugin-text)
(catch js/Error e nil))]
(cond
(spec/valid? ::e5/plugin plugin)
Expand Down
Loading