Changeset 126 for trunk/UContact.pas

Timestamp:

Apr 6, 2022, 11:36:27 AM (3 years ago)

Author:

chronos

Message:

• Added: Action to remove exact duplicates.
• Modified: Test cases definition moved to separate file.

File:

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

trunk/UContact.pas

@@ -136 +136 @@
       NoGroups: TStringArray): Boolean;
     procedure Assign(Source: TContactProperty);
+    function CompareTo(ContactProperty: TContactProperty): Boolean;
     constructor Create;
     destructor Destroy; override;
@@ -179 +180 @@
     procedure Assign(Source: TContact);
     function UpdateFrom(Source: TContact): Boolean;
+    function CompareTo(Contact: TContact): Boolean;
     constructor Create;
     destructor Destroy; override;
@@ -208 +210 @@
     procedure Merge(Contact: TContact; FieldIndex: TContactFieldIndex);
     function ToString: ansistring; override;
+    procedure RemoveExactDuplicates;
   end;
 
@@ -1049 +1052 @@
 end;
 
+function TContactProperty.CompareTo(ContactProperty: TContactProperty): Boolean;
+var
+  I: Integer;
+begin
+  Result := (Name = ContactProperty.Name) and (Value = ContactProperty.Value) and
+    (Attributes.Count = ContactProperty.Attributes.Count);
+  if Result then begin
+    for I := 0 to Attributes.Count - 1 do
+    if not (Attributes[I] = ContactProperty.Attributes[I]) then begin
+      Result := False;
+      Break;
+    end;
+  end;
+end;
+
 constructor TContactProperty.Create;
 begin
@@ -1080 +1098 @@
 
 procedure TContacts.AddContacts(Contacts: TContacts);
-var
-  I: Integer;
-  NewContact: TContact;
-begin
-  for I := 0 to Contacts.Count - 1 do begin
-    NewContact := TContact.Create;
-    NewContact.Assign(Contacts[I]);
-    NewContact.ContactsFile := ContactsFile;
-    Add(NewContact);
-  end;
+begin
+  InsertContacts(Count, Contacts);
 end;
 
@@ -1104 +1114 @@
     Inc(Index);
   end;
+end;
+
+procedure TContacts.RemoveExactDuplicates;
+var
+  I: Integer;
+  J: Integer;
+begin
+  for I := 0 to Count - 1 do
+    for J := Count - 1 downto I + 1 do
+      if Items[I].CompareTo(Items[J]) then begin
+        Remove(Items[J]);
+      end;
 end;
 
@@ -1554 +1576 @@
 end;
 
+function TContact.CompareTo(Contact: TContact): Boolean;
+var
+  I: Integer;
+begin
+  Result := Properties.Count = Contact.Properties.Count;
+  if Result then begin
+    for I := 0 to Properties.Count - 1 do
+    if not Properties[I].CompareTo(Contact.Properties[I]) then begin
+      Result := False;
+      Break;
+    end;
+  end;
+end;
+
 constructor TContact.Create;
 begin