Changeset 152 for trunk/Forms/FormCompare.pas

Timestamp:

Jun 6, 2023, 5:05:18 PM (12 months ago)

Author:

chronos

Message:

• Added: VCardProcessor class for processing contacts available from VCard package.
• Added: Normalize menu action for normalization of contact property values.

File:

• trunk/Forms/FormCompare.pas (modified) (4 diffs)

trunk/Forms/FormCompare.pas

@@ -34 +34 @@
     procedure CompareExternal;
     procedure LoadConfig;
-    procedure RemoveExactDuplicates(Contacts: TContacts);
-    procedure NormalizePhoneNumbers(Contacts: TContacts);
-    procedure RemovePhotos(Contacts: TContacts);
     procedure SaveConfig;
   end;
@@ -46 +43 @@
 
 uses
-  Core, FormCompareSideBySide;
+  Core, FormCompareSideBySide, VCardProcessor;
 
 { TFormCompare }
@@ -72 +69 @@
 
 procedure TFormCompare.ButtonCompareClick(Sender: TObject);
+var
+  VCardProcessor: TVCardProcessor;
 begin
   LeftVCard.Assign(TVCardFile(Core.Core.DataFile));
   RightVCard.LoadFromFile(EditAnotherFile.Text);
 
-  if CheckBoxSortContacts.Checked then begin
-    LeftVCard.VCard.Contacts.Sort;
-    RightVCard.VCard.Contacts.Sort;
+  VCardProcessor := TVCardProcessor.Create(nil);
+  with VCardProcessor do
+  try
+    DefaultPhoneCountryCode := Core.Core.DefaultPhoneCountryCode;
+    RemovePhotos := CheckBoxWithoutPhotos.Checked;
+    RemovePhoneSpaces := CheckBoxNormalizePhoneNumbers.Checked;
+    AddDefaultPhoneCountryPrefix := CheckBoxNormalizePhoneNumbers.Checked;
+    RemoveExactDuplicates := CheckBoxRemoveExactDuplicates.Checked;
+    Order := CheckBoxSortContacts.Checked;
+  finally
+    Free;
   end;
 
-  if CheckBoxWithoutPhotos.Checked then begin
-    RemovePhotos(LeftVCard.VCard.Contacts);
-    RemovePhotos(RightVCard.VCard.Contacts);
-  end;
-
-  if CheckBoxNormalizePhoneNumbers.Checked then begin
-    NormalizePhoneNumbers(LeftVCard.VCard.Contacts);
-    NormalizePhoneNumbers(RightVCard.VCard.Contacts);
-  end;
-
-  if CheckBoxRemoveExactDuplicates.Checked then begin
-    RemoveExactDuplicates(LeftVCard.VCard.Contacts);
-    RemoveExactDuplicates(RightVCard.VCard.Contacts);
-  end;
+  LeftVCard.VCard.Contacts.Sort;
+  RightVCard.VCard.Contacts.Sort;
 
   CompareExternal;
-end;
-
-procedure TFormCompare.RemovePhotos(Contacts: TContacts);
-var
-  I: Integer;
-  J: Integer;
-  ContactProperties: TContactProperties;
-begin
-  for I := 0 to Contacts.Count - 1 do
-  with Contacts[I].Properties do begin
-    ContactProperties := GetMultipleByName('PHOTO');
-    for J := ContactProperties.Count - 1 downto 0 do
-      Remove(ContactProperties[J]);
-    ContactProperties.Free;
-  end;
-end;
-
-procedure TFormCompare.NormalizePhoneNumbers(Contacts: TContacts);
-var
-  I: Integer;
-  J: Integer;
-  ContactProperties: TContactProperties;
-begin
-  for I := 0 to Contacts.Count - 1 do
-  with Contacts[I].Properties do begin
-    ContactProperties := GetMultipleByName('TEL');
-    for J := 0 to ContactProperties.Count - 1 do begin
-      ContactProperties[J].Value := StringReplace(ContactProperties[J].Value, ' ', '', [rfReplaceAll]);
-      if not ContactProperties[J].Value.StartsWith('+') then
-        ContactProperties[J].Value := Core.Core.DefaultPhoneCountryPrefix + ContactProperties[J].Value;
-    end;
-    ContactProperties.Free;
-  end;
 end;
 
@@ -212 +174 @@
 end;
 
-procedure TFormCompare.RemoveExactDuplicates(Contacts: TContacts);
-var
-  I: Integer;
-begin
-  Contacts.RemoveExactDuplicates;
-  for I := 0 to Contacts.Count - 1 do
-    Contacts[I].Properties.RemoveExactDuplicates;
-end;
-
 procedure TFormCompare.SaveConfig;
 begin