Changeset 168 for trunk/Forms

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk/Forms

Files:

• FormExport.pas (modified) (3 diffs)
• FormImage.lfm (modified) (2 diffs)
• FormImage.pas (modified) (2 diffs)
• FormImport.lfm (modified) (1 diff)
• FormImport.pas (modified) (4 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;

trunk/Forms/FormImage.lfm

@@ -51 +51 @@
     Anchors = [akLeft, akBottom]
     Caption = 'Clear'
-    OnClick = uttonClearClick
+    OnClick = ButtonClearClick
     TabOrder = 2
   end
   object EditUrl: TEdit
     Left = 84
-    Height = 33
-    Top = 426
+    Height = 43
+    Top = 416
     Width = 610
     Anchors = [akLeft, akRight, akBottom]
@@ -85 +85 @@
   object Label1: TLabel
     Left = 16
-    Height = 25
-    Top = 432
-    Width = 35
+    Height = 26
+    Top = 431
+    Width = 38
     Anchors = [akLeft, akBottom]
     Caption = 'URL:'

trunk/Forms/FormImage.pas

@@ -22 +22 @@
     OpenPictureDialog1: TOpenPictureDialog;
     SavePictureDialog1: TSavePictureDialog;
-    procedure uttonClearClick(Sender: TObject);
+    procedure ButtonClearClick(Sender: TObject);
     procedure ButtonLoadClick(Sender: TObject);
     procedure ButtonSaveClick(Sender: TObject);
@@ -67 +67 @@
 end;
 
-procedure TFormImage.uttonClearClick(Sender: TObject);
+procedure TFormImage.ButtonClearClick(Sender: TObject);
 begin
   Image.Clear;

trunk/Forms/FormImport.lfm

@@ -80 +80 @@
       Width = 464
       Anchors = [akTop, akLeft, akRight]
+      OnChange = EditInputFileChange
       TabOrder = 1
     end

trunk/Forms/FormImport.pas

@@ -27 +27 @@
     procedure ButtonImportClick(Sender: TObject);
     procedure ComboBoxInputFormatChange(Sender: TObject);
+    procedure EditInputFileChange(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -47 +48 @@
 
 uses
-  Core, Common, RegistryEx, VCardFile;
+  Core, Common, RegistryEx, VCardFile, VCard;
 
 { TFormImport }
@@ -61 +62 @@
 begin
   TableFormat := TTableFormat(ComboBoxInputFormat.Items.Objects[ComboBoxInputFormat.ItemIndex]);
-  Table.SetInput(TableFormat, LoadFileToStr(EditInputFile.Text));
-  Table.Title := ExtractFileNameWithoutExt(EditInputFile.Text);
+  TVCardFile(Core.Core.DataFile).VCard.ImportFromFile(EditInputFile.Text, TableFormat,
+    CheckBoxHumanReadableHeader.Checked);
 end;
 
@@ -68 +69 @@
 begin
   UpdateTableFormat;
+end;
+
+procedure TFormImport.EditInputFileChange(Sender: TObject);
+begin
+  RedrawPending := True;
 end;