Changeset 168 for trunk/Forms/FormExport.pas

Timestamp:

Jul 1, 2023, 8:17:50 PM (17 months ago)

Author:

chronos

Message:

• Modifed: Export/Import moved to TVCard class.
• Added: Export/Import tests for CSV and MediaWiki formats.

File:

• trunk/Forms/FormExport.pas (modified) (3 diffs)

trunk/Forms/FormExport.pas

@@ -36 +36 @@
     Table: TTable;
     RedrawPending: Boolean;
-    procedure PrepareTable;
     procedure UpdateFileNameExt;
     procedure LoadConfig;
@@ -62 +61 @@
 begin
   TableFormat := TTableFormat(ComboBoxOutputFormat.Items.Objects[ComboBoxOutputFormat.ItemIndex]);
-  SaveStringToFile(Table.GetOutput(TableFormat), EditOutputFile.Text);
+  TVCardFile(Core.Core.DataFile).VCard.ExportToFile(EditOutputFile.Text, TableFormat,
+    CheckBoxHumanReadableHeader.Checked);
 end;
 
@@ -118 +118 @@
 begin
   if RedrawPending then begin
-    PrepareTable;
+    TVCardFile(Core.Core.DataFile).VCard.ExportToTable(Table,
+      CheckBoxHumanReadableHeader.Checked);
     Table.GetOutputListView(ListView1);
     RedrawPending := False;
-  end;
-end;
-
-procedure TFormExport.PrepareTable;
-var
-  Row: TRow;
-  I: Integer;
-  J: Integer;
-  Values: TStringList;
-  Index: Integer;
-  Fields: TContactFields;
-  Field: TContactField;
-  Columns: TStringList;
-begin
-  Fields := TContact.GetFields;
-  Table.Clear;
-
-  Values := TStringList.Create;
-  Columns := TStringList.Create;
-  try
-    with TVCardFile(Core.Core.DataFile), VCard do begin
-      Table.Title := ExtractFileNameWithoutExt(FileName);
-
-      // Get all properties types
-      for I := 0 to Contacts.Count - 1 do begin
-        for J := 0 to Contacts[I].Properties.Count - 1 do
-        if not Contacts[I].Properties[J].Name.StartsWith('PHOTO') and
-          (Table.Columns.IndexOf(Contacts[I].Properties[J].Name) = -1) then begin
-            Table.Columns.Add(Contacts[I].Properties[J].Name);
-            Columns.Add(Contacts[I].Properties[J].Name);
-          end;
-      end;
-
-      if CheckBoxHumanReadableHeader.Checked then begin
-        for I := 0 to Table.Columns.Count - 1 do begin
-          Field := Fields.GetBySysName(Table.Columns[I]);
-          if Assigned(Field) then Table.Columns[I] := Field.Title;
-        end;
-      end;
-
-      for I := 0 to Contacts.Count - 1 do begin
-        Values.Clear;
-        for J := 0 to Columns.Count - 1 do
-          Values.Add('');
-        for J := 0 to Contacts[I].Properties.Count - 1 do begin
-          Index := Columns.IndexOf(Contacts[I].Properties[J].Name);
-          if Index <> -1 then
-            Values[Index] := Contacts[I].Properties[J].Value;
-        end;
-
-        Row := Table.AddRow;
-        for J := 0 to Values.Count - 1 do
-          Row.Cells.Add(Values[J]);
-      end;
-    end;
-  finally
-    Values.Free;
-    Columns.Free;
   end;
 end;