Changeset 45 for trunk/UContact.pas

Timestamp:

Dec 2, 2021, 3:19:57 PM (3 years ago)

Author:

chronos

Message:

• Added: Allow to load photo from file or save it to file.

File:

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

trunk/UContact.pas

@@ -64 +64 @@
     procedure EvaluateAttributes;
     function GetDecodedValue: string;
+    function GetEncodedValue: string;
     function MatchNameGroups(AName: string; Groups: TStringArray;
       NoGroups: TStringArray): Boolean;
@@ -343 +344 @@
 begin
   if Encoding = 'BASE64' then begin
-    Result := DecodeStringBase64(Value)
+    Result := DecodeStringBase64(Value);
   end else
   if Encoding = 'QUOTED-PRINTABLE' then begin
-    Result := DecodeQuotedPrintable(Value)
+    Result := DecodeQuotedPrintable(Value);
   end
   else Result := '';
 end;
 
+function TContactProperty.GetEncodedValue: string;
+begin
+  if Encoding = 'BASE64' then begin
+    Result := EncodeStringBase64(Value);
+  end else
+  if Encoding = 'QUOTED-PRINTABLE' then begin
+    Result := EncodeQuotedPrintable(Value);
+  end
+  else Result := '';
+end;
+
 function TContactProperty.MatchNameGroups(AName: string; Groups: TStringArray;
   NoGroups: TStringArray): Boolean;
 var
   I: Integer;
-  Attr: string;
-begin
-  Attr := Attributes.DelimitedText;
+begin
   Result := Name = AName;
   if Result and (Length(Groups) > 0) then begin
@@ -680 +690 @@
   J: Integer;
   NameText: string;
+  Value2: string;
 begin
   inherited;
@@ -689 +700 @@
       for J := 0 to Properties.Count - 1 do
       with Properties[J] do begin
-        if Pos(LineEnding, Value) > 0 then begin
-          NameText := Name;
-          if Attributes.Count > 0 then
-            NameText := NameText + ';' + Attributes.DelimitedText;
-          Add(NameText + ':' + GetNext(Value, LineEnding));
-          while Pos(LineEnding, Value) > 0 do begin
-            Add(' ' + GetNext(Value, LineEnding));
+        NameText := Name;
+        if Attributes.Count > 0 then
+          NameText := NameText + ';' + Attributes.DelimitedText;
+        if Encoding <> '' then begin
+          Value2 := GetEncodedValue;
+          NameText := NameText + ';' + Encoding;
+        end else Value2 := Value;
+        if Pos(LineEnding, Value2) > 0 then begin
+          Add(NameText + ':' + GetNext(Value2, LineEnding));
+          while Pos(LineEnding, Value2) > 0 do begin
+            Add(' ' + GetNext(Value2, LineEnding));
           end;
-          Add(' ' + GetNext(Value, LineEnding));
+          Add(' ' + GetNext(Value2, LineEnding));
           Add('');
         end else begin
-          NameText := Name;
-          if Attributes.Count > 0 then
-            NameText := NameText + ';' + Attributes.DelimitedText;
-          Add(NameText + ':' + Value);
+          Add(NameText + ':' + Value2);
         end;
       end;
@@ -769 +781 @@
             NewRecord.Properties.Add(NewProperty);
           end;
-          NewProperty.Attributes.DelimitedText := UpperCase(Names);
+          NewProperty.Attributes.DelimitedText := Names;
           if NewProperty.Attributes.Count > 0 then begin
             NewProperty.Name := NewProperty.Attributes[0];