Merge pull request #2 from JensBorrisholt/Issue-out-of-memory

Issue: Out of memory error and High CPU usage
JensBorrisholt · Mar 28, 2021 · 51c4031 · 51c4031
2 parents 0777630 + 601fb67
commit 51c4031
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/Generator GUI/MainFormU.fmx b/Generator GUI/MainFormU.fmx
@@ -123,6 +123,7 @@ object MainForm: TMainForm
             '"'
           ''
           'See also the possibilities in the MenuBar')
+        OnChangeTracking = MemoJSONChangeTracking
         Align = Client
         Size.Width = 613.000000000000000000
         Size.Height = 355.000000000000000000

diff --git a/Generator GUI/MainFormU.pas b/Generator GUI/MainFormU.pas
@@ -74,10 +74,14 @@   TMainForm = class(TForm)
     procedure Label1Click(Sender: TObject);
     procedure ActionList1Update(Action: TBasicAction; var Handled: Boolean);
     procedure EditClassNameChange(Sender: TObject);
+    procedure MemoJSONChangeTracking(Sender: TObject);
+  private type
+    TValidationTypes = (vtUnchecked, vtValid, vtInvalid);
   private
     { Private declarations }
     FCheckVersionResponse: TRelease;
     FJsonMapper: TPkgJsonMapper;
+    FIsValid: TValidationTypes;
   public
     { Public declarations }
   end;
@@ -211,10 +215,20 @@ procedure TMainForm.ActionList1Update(Action: TBasicAction; var Handled: Boolean
   if not OutputFormatDict.TryGetValue(TabControl1.ActiveTab, OutputFormat) then
     OutputFormat := nil;
 
-  actConvert.Enabled := FJsonMapper.IsValid(MemoJSON.Text.Trim);
+  if FIsValid = vtUnchecked then
+    if FJsonMapper.IsValid(MemoJSON.Text.Trim) then
+      FIsValid := vtValid
+    else
+      FIsValid := vtInvalid;
+  actConvert.Enabled := FIsValid = vtValid;
   actSaveAs.Enabled := (OutputFormat <> nil) and (actConvert.Enabled);
 end;
 
+procedure TMainForm.MemoJSONChangeTracking(Sender: TObject);
+begin
+  FIsValid := vtUnchecked;
+end;
+
 procedure TMainForm.actOnlineValidationExecute(Sender: TObject);
 const
   JsonValidatorUrl = 'https://jsonformatter.curiousconcept.com/?data=%s&process=true';

diff --git a/Lib/Pkg.Json.Mapper.pas b/Lib/Pkg.Json.Mapper.pas
@@ -268,8 +268,13 @@ function TPkgJsonMapper.GetJsonType(aJsonValue: TJsonValue): TJsonType;
 end;
 
 function TPkgJsonMapper.IsValid(aJsonString: string): boolean;
+var
+  Value: TJSONValue;
 begin
-  Result := TJSONObject.ParseJSONValue(aJsonString) <> nil;
+  Value := TJSONObject.ParseJSONValue(aJsonString);
+  Result := Value <> nil;
+  if Result then
+    Value.Free;
 end;
 
 function TPkgJsonMapper.LoadFormFile(aJsonFile: string): TPkgJsonMapper;