Changeset 91 for trunk/UContact.pas

Timestamp:

Feb 2, 2022, 4:33:25 PM (2 years ago)

Author:

chronos

Message:

• Added: A windows for showing log output for selected test case.
• Added: Various load-save tests.
• Modified: Improved parsing vCard format.

File:

• trunk/UContact.pas (modified) (13 diffs)

trunk/UContact.pas

@@ -141 +141 @@
     class destructor Destroy2;
     procedure SaveToStrings(Output: TStrings);
-    function LoadFromStrings(Lines: TStrings; StartLine: Integer = 0): Integer;
+    function LoadFromStrings(Lines: TStrings; var StartLine: Integer): Boolean;
     procedure SaveToFile(FileName: string);
     procedure LoadFromFile(FileName: string);
@@ -1134 +1134 @@
             end;
           end;
-          if LinePrefix <> '' then Add('');
         end;
       end;
@@ -1141 +1140 @@
 end;
 
-function TContact.LoadFromStrings(Lines: TStrings; StartLine: Integer = 0): Integer;
+function TContact.LoadFromStrings(Lines: TStrings; var StartLine: Integer): Boolean;
 type
   TParseState = (psNone, psInside, psFinished);
@@ -1154 +1153 @@
   Names: string;
 begin
+  Result := False;
   ParseState := psNone;
   I := StartLine;
@@ -1166 +1166 @@
       end else begin
         ContactsFile.Error(SExpectedVCardBegin, I + 1);
-        I := -1;
         Break;
       end;
@@ -1174 +1173 @@
         ParseState := psFinished;
         Inc(I);
+        Result := True;
         Break;
       end else
@@ -1182 +1182 @@
         while True do begin
           Inc(I);
+          if I >= Lines.Count then Break;
           Line2 := Lines[I];
-          if (Length(Lines[I]) > 0) and (Line2[1] = ' ') then begin
-            Value := Value + Trim(Lines[I]);
+          if (Length(Line2) > 0) and (Line2[1] = ' ') then begin
+            Value := Value + Trim(Line2);
           end else
-          if (Length(Lines[I]) > 0) and (Length(Value) > 0) and (Value[Length(Value)] = '=') and
-            (Lines[I][1] = '=') then begin
-            Value := Value + Copy(Trim(Lines[I]), 2, MaxInt);
+          if (Length(Line2) > 0) and (Length(Value) > 0) and (Value[Length(Value)] = '=') and
+            (Line2[1] = '=') then begin
+            Value := Value + Copy(Trim(Line2), 2, MaxInt);
           end else begin
             Dec(I);
@@ -1208 +1209 @@
       end else begin
         ContactsFile.Error(SExpectedProperty, I + 1);
-        I := -1;
         Break;
       end;
@@ -1214 +1214 @@
     Inc(I);
   end;
-  Result := I;
+  if Result then StartLine := I;
 end;
 
@@ -1233 +1233 @@
 var
   Lines: TStringList;
+  StartLine: Integer;
 begin
   Lines := TStringList.Create;
@@ -1245 +1246 @@
     end;
     {$ENDIF}
-    LoadFromStrings(Lines);
+    StartLine := 0;
+    LoadFromStrings(Lines, StartLine);
   finally
     Lines.Free;
@@ -1285 +1287 @@
   Contact: TContact;
   I: Integer;
-  NewI: Integer;
 begin
   Contacts.Clear;
@@ -1293 +1294 @@
     Contact := TContact.Create;
     Contact.ContactsFile := Self;
-    NewI := Contact.LoadFromStrings(Lines, I);
-    if NewI <= Lines.Count then begin
-      if NewI <> -1 then begin
-        Contacts.Add(Contact);
-        I := NewI;
-      end else begin
-        FreeAndNil(Contact);
-        Inc(I);
-      end;
+    if Contact.LoadFromStrings(Lines, I) then begin
+      Contacts.Add(Contact);
     end else begin
       FreeAndNil(Contact);
-      Break;
+      Inc(I);
     end;
   end;