Changeset 92

Timestamp:

Feb 3, 2022, 10:08:07 PM (2 years ago)

Author:

chronos

Message:

• Added: Detect used max line length. Default max line length should be 75 characters.
• Added: Escape new lines in text strings.
• Modified: Extended tests.
• Fixed: Wrong max line length was used for UTF-8 strings during save.

Location:

trunk

Files:

• Forms/UFormTest.pas (modified) (3 diffs)
• UContact.pas (modified) (19 diffs)
• vCardStudio.lpi (modified) (2 diffs)

trunk/Forms/UFormTest.pas

@@ -48 +48 @@
 
 uses
-  UCore, UFormTestCase;
+  UCore, UFormTestCase, UContact;
 
 { TFormTest }
@@ -119 +119 @@
   with TestCases do begin
     with TTestCaseLoadSave(AddNew('Load and save', TTestCaseLoadSave)) do begin
-      Input := 'BEGIN:VCARD' + LineEnding +
+      Input := VCardBegin + LineEnding +
         'VERSION:2.1' + LineEnding +
         'N:Surname;Name' + LineEnding +
         'FN:Name Surname' + LineEnding +
-        'END:VCARD' + LineEnding;
+        VCardEnd + LineEnding;
+      Output := Input;
+    end;
+    with TTestCaseLoadSave(AddNew('Long text', TTestCaseLoadSave)) do begin
+      Input := VCardBegin + LineEnding +
+        'VERSION:2.1' + LineEnding +
+        'NOTE:This is some long test which is really multi-lined each line is on d' + LineEnding +
+        ' ifferent line so it is on multiple lines.' + LineEnding +
+        VCardEnd + LineEnding;
       Output := Input;
     end;
     with TTestCaseLoadSave(AddNew('Multi-line', TTestCaseLoadSave)) do begin
-      Input := 'BEGIN:VCARD' + LineEnding +
+      Input := VCardBegin + LineEnding +
         'VERSION:2.1' + LineEnding +
-        'NOTE:This is some long test which is really multi-lined\neach line\nis on' + LineEnding +
-        ' different\nline so it is on multiple\nlines.'  + LineEnding +
-        'END:VCARD' + LineEnding;
+        'NOTE:First line\nsecond line\nempty line\n\nlast line' + LineEnding +
+        VCardEnd + LineEnding;
       Output := Input;
     end;
@@ -142 +149 @@
     end;
     with TTestCaseLoadSave(AddNew('Begin only', TTestCaseLoadSave)) do begin
-      Input := 'BEGIN:VCARD';
+      Input := VCardBegin;
       Output := '';
     end;
     with TTestCaseLoadSave(AddNew('Missing end', TTestCaseLoadSave)) do begin
-      Input := 'BEGIN:VCARD' + LineEnding +
+      Input := VCardBegin + LineEnding +
         'VERSION:2.1' + LineEnding +
         'N:Surname;Name' + LineEnding +
         'FN:Name Surname' + LineEnding;
+      Output := '';
+    end;
+    with TTestCaseLoadSave(AddNew('Missing start', TTestCaseLoadSave)) do begin
+      Input := 'VERSION:2.1' + LineEnding +
+        'N:Surname;Name' + LineEnding +
+        'FN:Name Surname' + LineEnding +
+        VCardEnd + LineEnding;
       Output := '';
     end;

trunk/UContact.pas

@@ -127 +127 @@
     procedure SetModified(AValue: Boolean);
     procedure DoOnModify;
+    procedure DetectMaxLineLength(Text: string);
   public
     Properties: TContactProperties;
@@ -170 +171 @@
   TContactsFile = class(TDataFile)
   private
+    FMaxLineLength: Integer;
     FOnError: TErrorEvent;
     procedure Error(Text: string; Line: Integer);
@@ -184 +186 @@
     constructor Create; override;
     destructor Destroy; override;
+  published
     property OnError: TErrorEvent read FOnError write FOnError;
+    property MaxLineLength: Integer read FMaxLineLength write FMaxLineLength;
   end;
 
 const
   VCardFileExt = '.vcf';
+  VCardBegin = 'BEGIN:VCARD';
+  VCardEnd = 'END:VCARD';
 
 
@@ -197 +203 @@
 
 const
-  VCardBegin = 'BEGIN:VCARD';
-  VCardEnd = 'END:VCARD';
+  DefaultMaxLineLength = 75;
 
 resourcestring
@@ -323 +328 @@
   I: Integer;
   O: Integer;
+  InNewLine: Boolean;
 begin
   Result := '';
@@ -330 +336 @@
   while I <= Length(Text) do begin
     if Text[I] in [',', '\', ';'] then begin
+      InNewLine := False;
+      Result[O] := '\';
+      SetLength(Result, Length(Result) + 1);
+      Inc(O);
+      Result[O] := Text[I];
+      Inc(O);
+    end else
+    if Text[I] in [#13, #10] then begin
+      if not InNewLine then begin
         Result[O] := '\';
         Inc(O);
-        Result[O] := Text[I];
         SetLength(Result, Length(Result) + 1);
+        Result[O] := 'n';
         Inc(O);
-      end else begin
-        Result[O] := Text[I];
-        Inc(O);
+        InNewLine := True;
       end;
+    end else begin
+      InNewLine := False;
+      Result[O] := Text[I];
+      Inc(O);
+    end;
     Inc(I);
   end;
@@ -357 +375 @@
   while I <= Length(Text) do begin
     if Escaped then begin
-      Result[O] := Text[I];
-      Inc(O);
+      if Text[I] = 'n' then begin
+        Result[O] := #13;
+        Inc(O);
+        Result[O] := #10;
+        Inc(O);
+      end else begin
+        Result[O] := Text[I];
+        Inc(O);
+      end;
       Escaped := False;
     end else begin
@@ -940 +965 @@
   Field: TContactField;
 begin
-  if not Assigned(ContactsFile) then raise Exception.Create(SContactHasNoParent);
+  if not Assigned(ContactsFile) then
+    raise Exception.Create(SContactHasNoParent);
   Field := GetFields.GetByIndex(Index);
   if Assigned(Field) then begin
@@ -947 +973 @@
       if Field.ValueIndex <> -1 then begin
         Result := DecodeEscaped(Prop.ValueItem[Field.ValueIndex])
-      end else Result := Prop.Value;
+      end else begin
+        if Field.DataType = dtString then Result := DecodeEscaped(Prop.Value)
+          else Result := Prop.Value;
+      end;
     end else Result := '';
   end else raise Exception.Create(SFieldIndexNotDefined);
@@ -958 +987 @@
   I: Integer;
 begin
-  if not Assigned(ContactsFile) then raise Exception.Create(SContactHasNoParent);
+  if not Assigned(ContactsFile) then
+    raise Exception.Create(SContactHasNoParent);
   Field := GetFields.GetByIndex(Index);
   if Assigned(Field) then begin
@@ -972 +1002 @@
       if Field.ValueIndex <> -1 then begin
         Prop.ValueItem[Field.ValueIndex] := EncodeEscaped(AValue);
-      end else Prop.Value := AValue;
+      end else begin
+        if Field.DataType = dtString then Prop.Value := EncodeEscaped(AValue)
+          else Prop.Value := EncodeEscaped(AValue);
+      end;
 
       // Remove if empty
@@ -993 +1026 @@
 begin
   if Assigned(FOnModify) then FOnModify(Self);
+end;
+
+procedure TContact.DetectMaxLineLength(Text: string);
+var
+  LineLength: Integer;
+begin
+  LineLength := UTF8Length(Text);
+  if LineLength > 1 then begin
+    // Count one character less for folded line
+    if Text[1] = ' ' then
+      Dec(LineLength);
+  end;
+  if LineLength > ContactsFile.MaxLineLength then
+    ContactsFile.MaxLineLength := LineLength;
 end;
 
@@ -1087 +1134 @@
   LineIndex: Integer;
   OutText: string;
+  CutText: string;
   LinePrefix: string;
   CutLength: Integer;
-const
-  MaxLineLength = 73;
 begin
     with Output do begin
@@ -1115 +1161 @@
           LinePrefix := '';
           while True do begin
-            if Length(OutText) > MaxLineLength then begin
-              CutLength := MaxLineLength;
+            if UTF8Length(OutText) > ContactsFile.MaxLineLength then begin
+              CutLength := ContactsFile.MaxLineLength;
               if Encoding = 'QUOTED-PRINTABLE' then begin
                 // Do not cut encoded items
@@ -1124 +1170 @@
                   Dec(CutLength, 1);
               end;
-              Add(LinePrefix + Copy(OutText, 1, CutLength));
+              CutText := UTF8Copy(OutText, 1, CutLength);
+              Add(LinePrefix + CutText);
               LinePrefix := ' ';
-              System.Delete(OutText, 1, CutLength);
+              System.Delete(OutText, 1, Length(CutText));
               Inc(LineIndex);
               Continue;
@@ -1157 +1204 @@
   I := StartLine;
   while I < Lines.Count do begin
-    Line := Trim(Lines[I]);
+    Line := Lines[I];
+    DetectMaxLineLength(Line);
+
     if Line = '' then begin
       // Skip empty lines
@@ -1184 +1233 @@
           if I >= Lines.Count then Break;
           Line2 := Lines[I];
+          DetectMaxLineLength(Line2);
           if (Length(Line2) > 0) and (Line2[1] = ' ') then begin
-            Value := Value + Trim(Line2);
+            Value := Value + Copy(Line2, 2, MaxInt);
           end else
           if (Length(Line2) > 0) and (Length(Value) > 0) and (Value[Length(Value)] = '=') and
             (Line2[1] = '=') then begin
-            Value := Value + Copy(Trim(Line2), 2, MaxInt);
+            Value := Value + Copy(Line2, 2, MaxInt);
           end else begin
             Dec(I);
@@ -1289 +1339 @@
 begin
   Contacts.Clear;
+  MaxLineLength := 10;
 
   I := 0;
@@ -1353 +1404 @@
   Contacts := TContacts.Create;
   Contacts.ContactsFile := Self;
+  MaxLineLength := DefaultMaxLineLength;
 end;
 

trunk/vCardStudio.lpi

@@ -202 +202 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormTest"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit15>
@@ -212 +213 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormTestCase"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit17>