Changeset 55

Timestamp:

Dec 8, 2021, 3:49:19 PM (3 years ago)

Author:

chronos

Message:

• Added: Support more file encodings for file open.

Location:

trunk

Files:

• Languages/vCardStudio.cs.po (modified) (2 diffs)
• Languages/vCardStudio.po (modified) (1 diff)
• UContact.pas (modified) (8 diffs)

trunk/Languages/vCardStudio.cs.po

@@ -634 +634 @@
 msgstr "Očekávána vlastnost kontaktu"
 
+#: ucontact.sexpectedvcardbegin
+msgid "Expected vCard begin"
+msgstr "Očekáván začátek vCard"
+
 #: ucontact.sfax
 msgid "Fax"
@@ -948 +952 @@
 msgid "Invalid line length for encoded text"
 msgstr "Neplatná délka řádky kódovaného textu"
-

trunk/Languages/vCardStudio.po

@@ -622 +622 @@
 msgstr ""
 
+#: ucontact.sexpectedvcardbegin
+msgid "Expected vCard begin"
+msgstr ""
+
 #: ucontact.sfax
 msgid "Fax"

trunk/UContact.pas

@@ -145 +145 @@
   UQuotedPrintable;
 
+const
+  VCardBegin = 'BEGIN:VCARD';
+  VCardEnd = 'END:VCARD';
+
 resourcestring
   SVCardFile = 'vCard file';
   SFoundPropertiesBeforeBlockStart = 'Found properties before the start of block';
   SFoundBlockEndWithoutBlockStart = 'Found block end without block start';
+  SExpectedVCardBegin = 'Expected vCard begin';
   SFieldIndexNotDefined = 'Field index not defined';
   SContactHasNoParent = 'Contact has no parent';
@@ -610 +615 @@
 var
   I: Integer;
-  J: Integer;
   NameText: string;
   Value2: string;
-  Text: string;
   LineIndex: Integer;
   OutText: string;
@@ -621 +624 @@
 begin
     with Output do begin
-      Add('BEGIN:VCARD');
-      for J := 0 to Properties.Count - 1 do
-      with Properties[J] do begin
+      Add(VCardBegin);
+      for I := 0 to Properties.Count - 1 do
+      with Properties[I] do begin
         NameText := Name;
         if Attributes.Count > 0 then
@@ -657 +660 @@
         end;
       end;
-      Add('END:VCARD');
+      Add(VCardEnd);
     end;
 end;
@@ -681 +684 @@
     end else
     if ParseState = psNone then begin
-      if Line = 'BEGIN:VCARD' then begin
+      if Line = VCardBegin then begin
         ParseState := psInside;
       end else begin
-        Parent.Error('Expected vCard begin', I + 1);
+        Parent.Error(SExpectedVCardBegin, I + 1);
         I := -1;
         Break;
@@ -690 +693 @@
     end else
     if ParseState = psInside then begin
-      if Line = 'END:VCARD' then begin
+      if Line = VCardEnd then begin
         ParseState := psFinished;
         Inc(I);
@@ -756 +759 @@
   try
     Lines.LoadFromFile(FileName);
+    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;
     I := LoadFromStrings(Lines);
   finally
@@ -882 +891 @@
   Lines := TStringList.Create;
   Lines.LoadFromFile(FileName);
+  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;
   try
     I := 0;