Changeset 170 for trunk/Packages

Timestamp:

Jul 2, 2023, 11:07:39 PM (17 months ago)

Author:

chronos

Message:

• Fixed: Show only supported import formats.

Location:

trunk/Packages

Files:

• Common/Table.pas (modified) (5 diffs)
• VCard/VCard.pas (modified) (1 diff)

trunk/Packages/Common/Table.pas

@@ -9 +9 @@
   TTableFormat = (tfExcel, tfPlain, tfCsv, tfHtml, tfListView, tfMediaWiki,
     tfXml, tfJson);
+  TTableFormats = set of TTableFormat;
 
   { TRow }
@@ -42 +43 @@
     procedure GetOutputListView(ListView: TListView);
     function GetOutput(OutputFormat: TTableFormat): string;
-    procedure SetInputTabs(Text: string);
-    procedure SetInputPlain(Text: string);
     procedure SetInputCsv(Text: string);
-    procedure SetInputXml(Text: string);
-    procedure SetInputHtml(Text: string);
     procedure SetInputMediaWiki(Text: string);
     procedure SetInputJson(Text: string);
     procedure SetInput(OutputFormat: TTableFormat; Text: string);
+    function GetInputFormats: TTableFormats;
     constructor Create;
     destructor Destroy; override;
@@ -303 +301 @@
     else raise Exception.Create(SUnsupportedFormat);
   end;
-end;
-
-procedure TTable.SetInputTabs(Text: string);
-begin
-
-end;
-
-procedure TTable.SetInputPlain(Text: string);
-begin
-
 end;
 
@@ -339 +327 @@
     FreeAndNil(Lines);
   end;
-end;
-
-procedure TTable.SetInputXml(Text: string);
-begin
-
-end;
-
-procedure TTable.SetInputHtml(Text: string);
-begin
-
 end;
 
@@ -482 +460 @@
 begin
   case OutputFormat of
-    tfExcel: SetInputTabs(Text);
-    tfPlain: SetInputPlain(Text);
     tfCsv: SetInputCsv(Text);
-    tfHtml: SetInputHtml(Text);
     tfMediaWiki: SetInputMediaWiki(Text);
-    tfXml: SetInputXml(Text);
     tfJson: SetInputJson(Text);
     else raise Exception.Create(SUnsupportedFormat);
   end;
+end;
+
+function TTable.GetInputFormats: TTableFormats;
+begin
+  Result := [tfCsv, tfJson, tfMediaWiki];
 end;
 

trunk/Packages/VCard/VCard.pas

@@ -698 +698 @@
   Lines := TStringList.Create;
   Lines.LoadFromFile(FileName);
-  {$IF FPC_FULLVERSION>=30200}
-  if (Length(Lines.Text) > 0) and (Pos(VCardBegin, Lines.Text) = 0) then begin
-    Lines.LoadFromFile(FileName, TEncoding.Unicode);
-    if (Length(Lines.Text) > 0) and (Pos(VCardBegin, Lines.Text) = 0) then begin
-      Lines.LoadFromFile(FileName, TEncoding.BigEndianUnicode);
-    end;
-  end;
-  {$ENDIF}
   try
     ImportFromStrings(Lines, Format, HumanReadableHeader);