From 737e1a20662b045aaa6d9ca609f3a17b5da72591 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Wed, 12 Apr 2023 08:58:34 -0600 Subject: [PATCH] gitSync when changing playgrounds file --- projects/nat-archive-tool/src/nat/Archive.kiss | 15 +++++++++------ .../src/nat/systems/KeyShortcutSystem.kiss | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/projects/nat-archive-tool/src/nat/Archive.kiss b/projects/nat-archive-tool/src/nat/Archive.kiss index 2ae7fc1b..6188a9a2 100644 --- a/projects/nat-archive-tool/src/nat/Archive.kiss +++ b/projects/nat-archive-tool/src/nat/Archive.kiss @@ -39,7 +39,8 @@ (method changePlaygrounds [:Dynamic->Void change] (change playgrounds) - (File.saveContent (joinPath archiveDir "playgrounds.json") (haxe.Json.stringify playgrounds "\t"))) + (File.saveContent (joinPath archiveDir "playgrounds.json") (haxe.Json.stringify playgrounds "\t")) + (gitSync)) (method :String currentPlayground [] (dictGet playgrounds "default")) @@ -87,11 +88,7 @@ (doFor system systems (system.checkEntryInOrOut this e))) -(method _saveEntry [:Entry e] - (File.saveContent - (joinPath archiveDir "entries" (e.id.withExtension "json")) - (tink.Json.stringify e)) - +(method gitSync [] // Sync with git if the archive is a repository: (whenLet [(Some gitDir) gitDir gitDo ->gitArgs (assertProcess "git" gitArgs [] true archiveDir)] @@ -101,6 +98,12 @@ (gitDo ["commit" "--no-verify" "-m" "$(Date.now)"]) (gitDo ["push"]))) +(method _saveEntry [:Entry e] + (File.saveContent + (joinPath archiveDir "entries" (e.id.withExtension "json")) + (tink.Json.stringify e)) + (gitSync)) + (method fullString [:Entry e] (haxe.Json.stringify e null "\t")) diff --git a/projects/nat-archive-tool/src/nat/systems/KeyShortcutSystem.kiss b/projects/nat-archive-tool/src/nat/systems/KeyShortcutSystem.kiss index bd77a6a2..933e8781 100644 --- a/projects/nat-archive-tool/src/nat/systems/KeyShortcutSystem.kiss +++ b/projects/nat-archive-tool/src/nat/systems/KeyShortcutSystem.kiss @@ -5,7 +5,7 @@ (defNew [&prop :ArchiveController controller] [&mut :Bool setup false] (super - "KeyShortcutSystem"aaa + "KeyShortcutSystem" ->[archive e] (hasComponent e KeyShortcut) ->[archive e &opt ui]