Changeset 35 for trunk

Timestamp:

Nov 25, 2021, 3:04:55 PM (3 years ago)

Author:

chronos

Message:

• Added: Support for QUOTED-PRINTABLE encoding.

Location:

trunk

Files:

• Forms/UFormContact.lfm (modified) (1 diff)
• Forms/UFormContact.pas (modified) (1 diff)
• Languages/vCardStudio.cs.po (modified) (1 diff)
• Languages/vCardStudio.po (modified) (1 diff)
• UContact.pas (modified) (4 diffs)
• UQuotedPrintable.pas (added)
• vCardStudio.lpi (modified) (2 diffs)
• vCardStudio.lpr (modified) (1 diff)

trunk/Forms/UFormContact.lfm

@@ -17 +17 @@
     Top = 10
     Width = 893
-    ActivePage = TabSheetGeneral
+    ActivePage = TabSheetAll
     Anchors = [akTop, akLeft, akRight, akBottom]
     ParentFont = False
-    TabIndex = 0
+    TabIndex = 2
     TabOrder = 0
     object TabSheetGeneral: TTabSheet

trunk/Forms/UFormContact.pas

@@ -197 +197 @@
     Photo := Contact.Fields[cfPhoto];
     if (Photo <> '') and (PhotoProperty.Encoding <> '') then begin
-      Photo := PhotoProperty.GetDecodedValue;
       Stream := TMemoryStream.Create;
       try

trunk/Languages/vCardStudio.cs.po

@@ -644 +644 @@
 msgid "Modified"
 msgstr "Upraveno"
+
+#: uquotedprintable.slinelengtherr
+msgid "Invalid line length for encoded text"
+msgstr "Neplatná délka řádky kódovaného textu"

trunk/Languages/vCardStudio.po

@@ -629 +629 @@
 msgstr ""
 
+#: uquotedprintable.slinelengtherr
+msgid "Invalid line length for encoded text"
+msgstr ""
+

trunk/UContact.pas

@@ -117 +117 @@
 
 implementation
+
+uses
+  UQuotedPrintable;
 
 resourcestring
@@ -226 +229 @@
 procedure TContactProperty.EvaluateAttributes;
 var
-  Index: Integer;
+  I: Integer;
 begin
   if Attributes.IndexOf('BASE64') <> -1 then
     Encoding := 'BASE64'
   else
-  if Attributes.IndexOfName('ENCODING') <> -1 then
-    Encoding := Attributes.Values['ENCODING']
-    else Encoding := '';
+  if Attributes.IndexOfName('ENCODING') <> -1 then begin
+    Encoding := Attributes.Values['ENCODING'];
+    if (Encoding = 'QUOTED-PRINTABLE') or (Encoding = 'BASE64') then begin
+      Values.DelimitedText := GetDecodedValue;
+      Attributes.Delete(Attributes.IndexOfName('ENCODING'));
+    end;
+  end else Encoding := '';
 
   if Attributes.IndexOfName('CHARSET') <> -1 then
@@ -240 +247 @@
 
   // Simplify TYPE attribute from TYPE=VALUE into VALUE
-  Index := Attributes.IndexOfName('TYPE');
-  if Index <> -1 then
-    Attributes.Strings[Index] := Attributes.Values['TYPE'];
+  for I := 0 to Attributes.Count - 1 do begin
+    if Attributes.Names[I] = 'TYPE' then
+      Attributes.Strings[I] := Attributes.Values['TYPE'];
+  end;
 end;
 
@@ -251 +259 @@
   else
   if Encoding = 'QUOTED-PRINTABLE' then
-    Result := Values.DelimitedText
+    Result := DecodeQuotedPrintable(Values.DelimitedText)
   else Result := '';
 end;

trunk/vCardStudio.lpi

@@ -101 +101 @@
       </Item2>
     </RequiredPackages>
-    <Units Count="11">
+    <Units Count="12">
       <Unit0>
         <Filename Value="vCardStudio.lpr"/>
@@ -170 +170 @@
         <ResourceBaseClass Value="Form"/>
       </Unit10>
+      <Unit11>
+        <Filename Value="UQuotedPrintable.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit11>
     </Units>
   </ProjectOptions>

trunk/vCardStudio.lpr

@@ -9 +9 @@
   Interfaces, // this includes the LCL widgetset
   Forms, UFormMain, UCore, Common, UDataFile, SysUtils, UFormContacts,
-  UFormContact, UFormFindDuplicity, UFormGenerate, UFormError
+  UFormContact, UFormFindDuplicity, UFormGenerate, UFormError, UQuotedPrintable
   { you can add units after this };