Changeset 104 for trunk

Timestamp:

Feb 9, 2022, 5:07:14 PM (3 years ago)

Author:

chronos

Message:

• Modified: Updated speed of loading of big number of contacts.
• Added: Contact field indexes cache for faster reverse search of contact fields by its index.

Location:

trunk

Files:

• Forms/UFormContact.pas (modified) (2 diffs)
• Forms/UFormContacts.pas (modified) (3 diffs)
• Forms/UFormProperties.pas (modified) (1 diff)
• Forms/UFormTest.pas (modified) (1 diff)
• Languages/vCardStudio.cs.po (modified) (1 diff)
• Languages/vCardStudio.pot (modified) (1 diff)
• UContact.pas (modified) (6 diffs)

trunk/Forms/UFormContact.pas

@@ -685 +685 @@
   if EditHomeAddressCity.Text <> '' then Address := Address + ' ' + EditHomeAddressCity.Text;
   if EditHomeAddressCountry.Text <> '' then Address := Address + ' ' + EditHomeAddressCountry.Text;
-  OpenURL(Core.MapUrl + URLEncode(Trim(Address)));
+  if Trim(Address) <> '' then
+    OpenURL(Core.MapUrl + URLEncode(Trim(Address)));
 end;
 
@@ -704 +705 @@
   if EditWorkAddressCity.Text <> '' then Address := Address + ' ' + EditWorkAddressCity.Text;
   if EditWorkAddressCountry.Text <> '' then Address := Address + ' ' + EditWorkAddressCountry.Text;
-  OpenURL(Core.MapUrl + URLEncode(Trim(Address)));
+  if Trim(Address) <> '' then
+    OpenURL(Core.MapUrl + URLEncode(Trim(Address)));
 end;
 

trunk/Forms/UFormContacts.pas

@@ -258 +258 @@
   Text: string;
   SelectedCount: Integer;
-begin
+  Selected: Boolean;
+begin
+  Selected := Assigned(ListView1.Selected);
   AAdd.Enabled := Assigned(Contacts);
-  AModify.Enabled := Assigned(Contacts) and Assigned(ListView1.Selected);
-  ARemove.Enabled := Assigned(Contacts) and Assigned(ListView1.Selected);
+  AModify.Enabled := Assigned(Contacts) and Selected;
+  ARemove.Enabled := Assigned(Contacts) and Selected;
+  AAdd.Enabled := Assigned(Contacts);
+  AModify.Enabled := Assigned(Contacts) and Selected;
+  AClone.Enabled := Assigned(Contacts) and Selected;
+  ARemove.Enabled := Assigned(Contacts) and Selected;
+  ASelectAll.Enabled := ListView1.Items.Count > 0;
+  ALoadFromFile.Enabled := Assigned(Contacts) and Selected;
+  ASaveToFile.Enabled := Assigned(Contacts) and Selected;
+  ACopy.Enabled := Assigned(Contacts) and Selected;
+  ACut.Enabled := Assigned(Contacts) and Selected;
+  APaste.Enabled := Assigned(Contacts) and (Clipboard.AsText <> '');
 
   Text := '';
@@ -273 +285 @@
   end;
   StatusBar1.Panels[0].Text := Text;
+
+  UpdateColumns;
 end;
 
@@ -613 +627 @@
 begin
   if FUpdateCount = 0 then DoUpdateInterface;
-  AAdd.Enabled := Assigned(Contacts);
-  AModify.Enabled := Assigned(Contacts) and Assigned(ListView1.Selected);
-  AClone.Enabled := Assigned(Contacts) and Assigned(ListView1.Selected);
-  ARemove.Enabled := Assigned(Contacts) and Assigned(ListView1.Selected);
-  ASelectAll.Enabled := ListView1.Items.Count > 0;
-  ALoadFromFile.Enabled := Assigned(Contacts) and Assigned(ListView1.Selected);
-  ASaveToFile.Enabled := Assigned(Contacts) and Assigned(ListView1.Selected);
-  ACopy.Enabled := Assigned(Contacts) and Assigned(ListView1.Selected);
-  ACut.Enabled := Assigned(Contacts) and Assigned(ListView1.Selected);
-  APaste.Enabled := Assigned(Contacts) and (Clipboard.AsText <> '');
-
-  UpdateColumns;
 end;
 

trunk/Forms/UFormProperties.pas

@@ -369 +369 @@
   Text: string;
   SelectedCount: Integer;
-begin
+  Selected: Boolean;
+begin
+  Selected := Assigned(ListView1.Selected);
   AAdd.Enabled := Assigned(Properties);
-  AModify.Enabled := Assigned(Properties) and Assigned(ListView1.Selected);
-  AClone.Enabled := Assigned(Properties) and Assigned(ListView1.Selected);;
-  ARemove.Enabled := Assigned(Properties) and Assigned(ListView1.Selected);
-  ALoadValueFromFile.Enabled := Assigned(Properties) and Assigned(ListView1.Selected);
-  ASaveValueToFile.Enabled := Assigned(Properties) and Assigned(ListView1.Selected);
+  AModify.Enabled := Assigned(Properties) and Selected;
+  AClone.Enabled := Assigned(Properties) and Selected;
+  ARemove.Enabled := Assigned(Properties) and Selected;
+  ALoadValueFromFile.Enabled := Assigned(Properties) and Selected;
+  ASaveValueToFile.Enabled := Assigned(Properties) and Selected;
   ASelectAll.Enabled := ListView1.Items.Count > 0;
 

trunk/Forms/UFormTest.pas

@@ -76 +76 @@
 
 procedure TFormTest.UpdateInterface;
-begin
-  ARun.Enabled := Assigned(ListViewTestCases.Selected);
-  AShow.Enabled := Assigned(ListViewTestCases.Selected);
+var
+  Selected: Boolean;
+begin
+  Selected := Assigned(ListViewTestCases.Selected);
+  ARun.Enabled := Selected;
+  AShow.Enabled := Selected;
 end;
 

trunk/Languages/vCardStudio.cs.po

@@ -1011 +1011 @@
 msgstr "Index pole nenalezen"
 
+#: ucontact.sfieldindexredefined
+#, object-pascal-format
+msgid "Field index %d redefined"
+msgstr "Index pole %d předefinován"
+
 #: ucontact.sfirstname
 msgid "First Name"

trunk/Languages/vCardStudio.pot

@@ -985 +985 @@
 msgstr ""
 
+#: ucontact.sfieldindexredefined
+#, object-pascal-format
+msgid "Field index %d redefined"
+msgstr ""
+
 #: ucontact.sfirstname
 msgid "First Name"

trunk/UContact.pas

@@ -71 +71 @@
 
   TContactFields = class(TFPGObjectList<TContactField>)
+  private
+    Indexes: array[TContactFieldIndex] of TContactField;
+    IndexesUpdated: Boolean;
+  public
+    procedure UpdateIndexes;
     function AddNew(Name: string; Groups: array of string; NoGroups: array of string;
       Title: string; Index: TContactFieldIndex; DataType:
@@ -209 +214 @@
 resourcestring
   SVCardFile = 'vCard file';
+  SFieldIndexRedefined = 'Field index %d redefined';
   SExpectedVCardBegin = 'Expected vCard begin';
   SFieldIndexNotDefined = 'Field index not defined';
@@ -779 +785 @@
 { TContactFields }
 
+procedure TContactFields.UpdateIndexes;
+var
+  I: Integer;
+  Index: TContactFieldIndex;
+begin
+  for Index := Low(TContactFieldIndex) to High(TContactFieldIndex) do
+    Indexes[Index] := nil;
+  for I := 0 to Count - 1 do
+    if not Assigned(Indexes[Items[I].Index]) then Indexes[Items[I].Index] := Items[I]
+      else raise Exception.Create(Format(SFieldIndexRedefined, [Integer(Items[I].Index)]));
+  IndexesUpdated := True;
+end;
+
 function TContactFields.AddNew(Name: string; Groups: array of string;
   NoGroups: array of string; Title: string; Index: TContactFieldIndex;
@@ -798 +817 @@
   Result.DataType := DataType;
   Add(Result);
+  IndexesUpdated := False;
 end;
 
@@ -825 +845 @@
   I: Integer;
 begin
-  I := 0;
-  while (I < Count) and (Items[I].Index <> Index) do Inc(I);
-  if I < Count then Result := Items[I]
-    else Result := nil;
+  if IndexesUpdated then Result := Indexes[Index]
+  else begin
+    I := 0;
+    while (I < Count) and (Items[I].Index <> Index) do Inc(I);
+    if I < Count then Result := Items[I]
+      else Result := nil;
+  end;
 end;
 
@@ -958 +981 @@
     with AddNew('X-MYSPACE', [], [], SMySpace, cfMySpace, dtString) do
       AddAlternative('X-SOCIALPROFILE', ['MYSPACE'], []);
+    UpdateIndexes;
     end;
   end;