Changeset 151 for trunk/Packages

Timestamp:

Jun 6, 2023, 11:15:57 AM (19 months ago)

Author:

chronos

Message:

• Added: New file compare dialog with additional normalize options.
• Modified: Compare action uses external compare tool.

Location:

trunk/Packages

Files:

• Common/DataFile.pas (modified) (1 diff)
• VCard/VCard.pas (modified) (4 diffs)

trunk/Packages/Common/DataFile.pas

@@ -77 +77 @@
 procedure TDataFile.Assign(Source: TPersistent);
 begin
-  inherited;
   if Source is TDataFile then begin
     FFileName := TDataFile(Source).FFileName;
     FModified := TDataFile(Source).FModified;
-  end;
+  end else inherited;
 end;
 

trunk/Packages/VCard/VCard.pas

@@ -147 +147 @@
     procedure AssignToList(List: TObjects);
     function GetByName(Name: string): TContactProperty;
+    function GetMultipleByName(Name: string): TContactProperties;
     function GetByNameGroups(Name: string; Groups: TStringArray;
       NoGroups: TStringArray): TContactProperty;
     function GetByNameGroupsMultiple(Name: string; Groups: TStringArray;
       NoGroups: TStringArray): TContactProperties;
+    function RemoveExactDuplicates: Integer;
   end;
 
@@ -572 +574 @@
 procedure TVCard.Assign(Source: TPersistent);
 begin
-  inherited;
-  if Source is TVCard then Contacts.Assign((Source as TVCard).Contacts);
+  if Source is TVCard then
+    Contacts.Assign((Source as TVCard).Contacts)
+  else inherited;
 end;
 
@@ -1005 +1008 @@
 end;
 
+function TContactProperties.GetMultipleByName(Name: string): TContactProperties;
+var
+  I: Integer;
+begin
+  Result := TContactProperties.Create(False);
+  for I  := 0 to Count - 1 do
+  if (Items[I].Name = Name) or EndsWith(Items[I].Name, '.' + Name) then
+    Result.Add(Items[I]);
+end;
+
 function TContactProperties.GetByNameGroups(Name: string; Groups: TStringArray;
   NoGroups: TStringArray): TContactProperty;
@@ -1025 +1038 @@
   if Items[I].MatchNameGroups(Name, Groups, NoGroups) then
     Result.Add(Items[I]);
+end;
+
+function TContactProperties.RemoveExactDuplicates: Integer;
+var
+  I: Integer;
+  J: Integer;
+begin
+  Result := 0;
+  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]);
+        Inc(Result);
+      end;
 end;