Fix (and improve) Simba's settings.ini script methods for read/write simple things.

Author: ollydev

Source/script/imports/simba.import_misc.pas

@@ -70,27 +70,44 @@ procedure ClearSimbaOutput(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
 end;
 
 (*
-SetSimbaSetting
----------------
+GetSetting
+----------
 ```
-function SetSimbaSetting(Name: String; DefValue: String = ''): String;
+function GetSetting(Section, Name: String; DefValue: String = ''): String;
 ```
+Read a string setting from Simba's settings.ini.
+Returns `DefValue` if the setting does not exist.
 *)
-procedure _LapeGetSimpleSetting(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
+procedure _LapeGetSetting(const Params: PParamArray; const Result: Pointer); LAPE_WRAPPER_CALLING_CONV
 begin
-  PString(Result)^ := SimbaSettings.GetSimpleSetting(PString(Params^[0])^, PString(Params^[1])^);
+  PString(Result) ^:= SimbaSettings.GetSimpleSetting(PString(Params^[0])^, PString(Params^[1])^, PString(Params^[2])^);
 end;
 
 (*
-GetSimbaSetting
----------------
+SetSetting
+----------
 ```
-procedure GetSimbaSetting(Name, Value: String);
+procedure SetSetting(Section, Name: String; Value: String);
 ```
+Write a string setting in Simba's settings.ini.
 *)
-procedure _LapeSetSimpleSetting(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
+procedure _LapeSetSetting(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
 begin
-  SimbaSettings.SetSimpleSetting(PString(Params^[0])^, PString(Params^[1])^);
+  SimbaSettings.SetSimpleSetting(PString(Params^[0])^, PString(Params^[1])^, PString(Params^[2])^);
+end;
+
+(*
+RemoveSetting
+-------------
+```
+procedure RemoveSetting(Section, Name: String);
+```
+Remove a setting from Simba's setting.ini.
+If `Name` is empty, will remove the entire section.
+*)
+procedure _LapeRemoveSetting(const Params: PParamArray); LAPE_WRAPPER_CALLING_CONV
+begin
+  SimbaSettings.RemoveSimpleSetting(PString(Params^[0])^, PString(Params^[1])^);
 end;
 
 (*
@@ -581,8 +598,10 @@ procedure ImportMisc(Script: TSimbaScript);
     ]);
 
     addGlobalFunc('procedure ClearSimbaOutput', @ClearSimbaOutput);
-    addGlobalFunc('function SetSimbaSetting(Name: String; DefValue: String = ""): String', @_LapeGetSimpleSetting);
-    addGlobalFunc('procedure GetSimbaSetting(Name, Value: String);', @_LapeSetSimpleSetting);
+
+    addGlobalFunc('function GetSetting(Section, Name: String; DefValue: String = ""): String;', @_LapeGetSetting);
+    addGlobalFunc('procedure SetSetting(Section, Name, Value: String);', @_LapeSetSetting);
+    addGlobalFunc('procedure RemoveSetting(Section, Name: String);', @_LapeRemoveSetting);
     addGlobalFunc('procedure PlaySound(Sound: String)', @_LapePlaySound);
     addGlobalFunc('procedure StopSound', @_LapeStopSound);
     addGlobalFunc('procedure SetClipBoard(Data: string)', @_LapeSetClipBoard);

Source/simba.settings.pas

@@ -172,8 +172,9 @@   TSimbaSettings = class
     property FirstLaunch: Boolean read FFirstLaunch;
 
     class function GetINIFile: TINIFile;
-    class procedure SetSimpleSetting(AName, Value: String);
-    class function GetSimpleSetting(AName: String; DefValue: String = ''): String;
+    class procedure RemoveSimpleSetting(Section, Name: String);
+    class procedure SetSimpleSetting(Section: String; Name, Value: String);
+    class function GetSimpleSetting(Section: String; Name: String; DefValue: String = ''): String;
 
     procedure Load;
     procedure Save;
@@ -425,27 +426,43 @@ class function TSimbaSettings.GetINIFile: TINIFile;
   Result.SetBoolStringValues(False, ['False']);
 end;
 
-class procedure TSimbaSettings.SetSimpleSetting(AName, Value: String);
+class procedure TSimbaSettings.RemoveSimpleSetting(Section, Name: String);
 begin
   try
     with GetINIFile() do
     try
-      WriteString('Other', AName, Value);
+      if (Name = '') then
+        EraseSection(Section)
+      else
+        DeleteKey(Section, Name);
     finally
       Free();
     end;
   except
   end;
 end;
 
-class function TSimbaSettings.GetSimpleSetting(AName: String; DefValue: String): String;
+class procedure TSimbaSettings.SetSimpleSetting(Section: String; Name, Value: String);
+begin
+  try
+    with GetINIFile() do
+    try
+      WriteString(Section, Name, Value);
+    finally
+      Free();
+    end;
+  except
+  end;
+end;
+
+class function TSimbaSettings.GetSimpleSetting(Section: String; Name: String; DefValue: String): String;
 begin
   Result := '';
 
   try
     with GetINIFile() do
     try
-      Result := ReadString('Other', AName, DefValue);
+      Result := ReadString(Section, Name, DefValue);
     finally
       Free();
     end;