feat: Enhance writeJsonFile to support appending data

zackspear · zackspear · commit 6f0af9e7bfe0 · 2025-03-18T15:49:37.000-07:00
diff --git a/emhttp/plugins/dynamix/include/ReplaceKey.php b/emhttp/plugins/dynamix/include/ReplaceKey.php
@@ -147,11 +147,17 @@ private function installNewKey($key)
         $KeyInstaller->installKey($key);
     }
 
-    private function writeJsonFile($file, $data)
+    private function writeJsonFile($file, $data, $append = false)
     {
-        if (!is_dir(dirname($file))) { // prevents errors when directory doesn't exist
+        if (!is_dir(dirname($file))) {
             mkdir(dirname($file));
         }
+
+        if ($append && file_exists($file)) {
+            $existing = json_decode(file_get_contents($file), true) ?: [];
+            $data = array_merge_recursive($existing, $data);
+        }
+
         file_put_contents($file, json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
     }
 
@@ -188,7 +194,9 @@ public function check(bool $forceCheck = false)
                 '/tmp/ReplaceKey/error.json',
                 [
                     'error' => 'Failed to retrieve latest key after getting a `hasNewerKeyfile` in the validation response.',
-                ]
+                    'ts' => time(),
+                ],
+                true,
             );
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -147,11 +147,17 @@ private function installNewKey($key)`
`147`	`147`	`$KeyInstaller->installKey($key);`
`148`	`148`	`}`
`149`	`149`
`150`		`- private function writeJsonFile($file, $data)`
	`150`	`+ private function writeJsonFile($file, $data, $append = false)`
`151`	`151`	`{`
`152`		`- if (!is_dir(dirname($file))) { // prevents errors when directory doesn't exist`
	`152`	`+ if (!is_dir(dirname($file))) {`
`153`	`153`	`mkdir(dirname($file));`
`154`	`154`	`}`
	`155`	`+`
	`156`	`+ if ($append && file_exists($file)) {`
	`157`	`+ $existing = json_decode(file_get_contents($file), true) ?: [];`
	`158`	`+ $data = array_merge_recursive($existing, $data);`
	`159`	`+ }`
	`160`	`+`
`155`	`161`	`file_put_contents($file, json_encode($data, JSON_PRETTY_PRINT \| JSON_UNESCAPED_SLASHES));`
`156`	`162`	`}`
`157`	`163`
`@@ -188,7 +194,9 @@ public function check(bool $forceCheck = false)`
`188`	`194`	`'/tmp/ReplaceKey/error.json',`
`189`	`195`	`[`
`190`	`196`	'error' => 'Failed to retrieve latest key after getting a `hasNewerKeyfile` in the validation response.',
`191`		`- ]`
	`197`	`+ 'ts' => time(),`
	`198`	`+ ],`
	`199`	`+ true,`
`192`	`200`	`);`
`193`	`201`	`return;`
`194`	`202`	`}`