some fixes

DerGoogler · Feb 25, 2024 · a694cc0 · a694cc0
1 parent 858457e
commit a694cc0
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 12 deletions.
diff --git a/Website/src/hooks/useModFS.tsx b/Website/src/hooks/useModFS.tsx
@@ -116,7 +116,7 @@ export const useModFS = () => {
 };
 
 export const ModFSProvider = (props: React.PropsWithChildren) => {
-  const [modFS, setModFS] = useNativeFileStorage("/data/adb/mmrl/modfs.v7.json", INITIAL_MOD_CONF, { loader: JSON });
+  const [modFS, setModFS] = useNativeFileStorage("/data/adb/mmrl/modfs.v7.json", INITIAL_MOD_CONF, { loader: "json" });
 
   const contextValue = React.useMemo(
     () => ({

diff --git a/Website/src/hooks/useNativeFileStorage.tsx b/Website/src/hooks/useNativeFileStorage.tsx
@@ -2,12 +2,12 @@ import { SetStateAction, useCallback, useEffect, useState } from "react";
 import { useLog } from "./native/useLog";
 import { SuFile } from "@Native/SuFile";
 import INI from "ini";
-import YMAL from "yaml";
+import YAML from "yaml";
 import { os } from "@Native/Os";
 import { SetValue } from "./useNativeStorage";
 import React from "react";
 
-type Loader = typeof JSON | typeof INI | typeof YMAL | null;
+type Loader = "json" | "yaml" | "yml" | "prop" | "properties" | "ini" | null;
 
 export function useNativeFileStorage<T = string>(
   key: string,
@@ -21,10 +21,18 @@ export function useNativeFileStorage<T = string>(
   const readValue = useCallback((): T => {
     try {
       if (file.exist()) {
-        if (loader) {
-          return loader.parse(file.read());
-        } else {
-          return file.read() as T;
+        switch (loader) {
+          case "json":
+            return JSON.parse(file.read());
+          case "properties":
+          case "prop":
+          case "ini":
+            return INI.parse(file.read()) as T;
+          case "yml":
+          case "yaml":
+            return YAML.parse(file.read());
+          default:
+            return file.read() as T;
         }
       } else {
         return initialValue;
@@ -39,10 +47,23 @@ export function useNativeFileStorage<T = string>(
   const setValue: SetValue<T> = (value) => {
     try {
       const newValue = value instanceof Function ? value(storedValue) : value;
-      if (loader) {
-        file.write((loader as any).stringify(newValue));
-      } else {
-        file.write(String(newValue));
+      switch (loader) {
+        case "json":
+          console.log(JSON.stringify(newValue, null, 4))
+          file.write(JSON.stringify(newValue, null, 4));
+          break;
+        case "properties":
+        case "prop":
+        case "ini":
+          file.write(INI.stringify(newValue, { whitespace:true, newline: true }));
+          break;
+        case "yml":
+        case "yaml":
+          file.write(YAML.stringify(newValue));
+          break;
+        default:
+          file.write(String(newValue));
+          break;
       }
       setStoredValue(newValue);
     } catch (error) {
@@ -78,7 +99,7 @@ export interface ConfigProvider extends React.PropsWithChildren {
 }
 
 export const ConfigProvider = (props: ConfigProvider) => {
-  const { loadFromFile, loader = JSON, initialConfig } = props;
+  const { loadFromFile, loader = "json", initialConfig } = props;
 
   if (!loadFromFile) {
     throw new TypeError('"loadFromFile" is undefined');