imp - Parse all string values

--- We need to parse all the string values to ensure that no invalid data is being entered. --- Type: imp Breaking: False Doc Required: False Backport Required: False Part: 1/1
Aptivi · Oct 1, 2024 · f5fb073 · f5fb073
1 parent c089b0e
commit f5fb073
Show file tree

Hide file tree

Showing 14 changed files with 175 additions and 123 deletions.
diff --git a/VisualCard.Calendar/Parsers/VCalendarParser.cs b/VisualCard.Calendar/Parsers/VCalendarParser.cs
@@ -168,7 +168,8 @@ public Parts.Calendar Parse()
 
                     // Handle the part type
                     Type calendarType = subPart is not null ? subPart.GetType() : calendar.GetType();
-                    string valueType = VcardCommonTools.GetFirstValue(splitArgs, defaultValue, VCalendarConstants._valueArgumentSpecifier);
+                    string valueType = VcardCommonTools.GetFirstValue(splitArgs, defaultValueType, VCalendarConstants._valueArgumentSpecifier);
+                    string finalValue = VcardParserTools.ProcessStringValue(value, valueType);
                     switch (type)
                     {
                         case PartType.Strings:
@@ -178,9 +179,6 @@ public Parts.Calendar Parse()
                                 if (!supported)
                                     continue;
 
-                                // Get the final value
-                                string finalValue = VcardParserTools.ProcessStringValue(value, valueType);
-
                                 // Set the string for real
                                 if (subPart is not null)
                                     subPart.SetString(stringType, finalValue);
@@ -196,13 +194,13 @@ public Parts.Calendar Parse()
                                     continue;
 
                                 // Get the final value
-                                double finalValue = VcardParserTools.ProcessIntegerValue(value, valueType);
+                                double finalDouble = double.Parse(finalValue);
 
                                 // Set the integer for real
                                 if (subPart is not null)
-                                    subPart.SetInteger(integerType, finalValue);
+                                    subPart.SetInteger(integerType, finalDouble);
                                 else
-                                    calendar.SetInteger(integerType, finalValue);
+                                    calendar.SetInteger(integerType, finalDouble);
                             }
                             break;
                         case PartType.PartsArray:
@@ -216,7 +214,7 @@ public Parts.Calendar Parse()
                                     continue;
 
                                 // Now, get the part info
-                                string finalValue = partsArrayType is CalendarPartsArrayEnum.IanaNames or CalendarPartsArrayEnum.NonstandardNames ? _value : value;
+                                finalValue = partsArrayType is CalendarPartsArrayEnum.IanaNames or CalendarPartsArrayEnum.NonstandardNames ? _value : value;
                                 var partInfo = fromString(finalValue, [.. finalArgs], elementTypes, valueType, CalendarVersion);
 
                                 // Set the array for real

diff --git a/VisualCard.Calendar/Parsers/VCalendarParserTools.cs b/VisualCard.Calendar/Parsers/VCalendarParserTools.cs
diff --git a/VisualCard.Calendar/Parts/Calendar.cs b/VisualCard.Calendar/Parts/Calendar.cs
@@ -307,14 +307,14 @@ internal string SaveToString(Version version, Dictionary<CalendarPartsArrayEnum,
                 string prefix = VCalendarParserTools.GetPrefixFromPartsArrayEnum(partsArrayEnum);
                 var type = VCalendarParserTools.GetPartType(prefix);
                 string defaultType = type.defaultType;
-                string defaultValue = type.defaultValue;
+                string defaultValueType = type.defaultValueType;
 
                 // Now, assemble the line
                 foreach (var part in array)
                 {
                     var partBuilder = new StringBuilder();
                     string partRepresentation = part.ToStringVcalendarInternal(version);
-                    string partArguments = CalendarBuilderTools.BuildArguments(part, defaultType, defaultValue);
+                    string partArguments = CalendarBuilderTools.BuildArguments(part, defaultType, defaultValueType);
                     string[] partArgumentsLines = partArguments.SplitNewLines();
                     partBuilder.Append($"{prefix}");
                     partBuilder.Append($"{partArguments}");

diff --git a/VisualCard.ShowContacts/TestFiles/picture.vcf b/VisualCard.ShowContacts/TestFiles/picture.vcf
@@ -3,6 +3,7 @@ VERSION:2.1
 N:ViceCity;EoflaOE;;;
 FN:EoflaOE ViceCity
 X-ANDROID-CUSTOM:vnd.android.cursor.item/nickname;AptiviCEO;;;;;;;;;;;;;;
+PHOTO;VALUE=uri:http://www.example.com/pub/photos/jqpublic.gif
 PHOTO;ENCODING=BASE64;PNG:iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAA
  AXNSR0IArs4c6QAAAARzQklUCAgICHwIZIgAACAASURBVHichX1ps2XJVd3K4Yx3eEMNXa2eh
  CSEaIxtZAMy2EQYGySDQ8YjAeFgCGGHA4fxX/D/8xd/tMETGix1V9Ub7nDuPUNm+sMeTp77qi

diff --git a/VisualCard.Tests/Recurrence/RecurrenceV1ParseTests.cs b/VisualCard.Tests/Recurrence/RecurrenceV1ParseTests.cs
@@ -21,6 +21,7 @@
 using Shouldly;
 using System;
 using VisualCard.Calendar.Parsers.Recurrence;
+using VisualCard.Parsers.Recurrence;
 
 namespace VisualCard.Tests.Recurrence
 {

diff --git a/VisualCard.Tests/Recurrence/RecurrenceV2ParseTests.cs b/VisualCard.Tests/Recurrence/RecurrenceV2ParseTests.cs
@@ -21,6 +21,7 @@
 using Shouldly;
 using System;
 using VisualCard.Calendar.Parsers.Recurrence;
+using VisualCard.Parsers.Recurrence;
 
 namespace VisualCard.Tests.Recurrence
 {

diff --git a/.../Parsers/Recurrence/RecurrenceParserV1.cs → .../Parsers/Recurrence/RecurrenceParserV1.cs b/.../Parsers/Recurrence/RecurrenceParserV1.cs → .../Parsers/Recurrence/RecurrenceParserV1.cs
@@ -21,8 +21,9 @@
 using System.Collections.Generic;
 using System.Globalization;
 using VisualCard.Parsers;
+using VisualCard.Parsers.Recurrence;
 
-namespace VisualCard.Calendar.Parsers.Recurrence
+namespace VisualCard.Parsers.Recurrence
 {
     /// <summary>
     /// Recurrence rule parser

diff --git a/.../Parsers/Recurrence/RecurrenceParserV2.cs → .../Parsers/Recurrence/RecurrenceParserV2.cs b/.../Parsers/Recurrence/RecurrenceParserV2.cs → .../Parsers/Recurrence/RecurrenceParserV2.cs
@@ -21,8 +21,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using VisualCard.Parsers;
+using VisualCard.Parsers.Recurrence;
 
-namespace VisualCard.Calendar.Parsers.Recurrence
+namespace VisualCard.Parsers.Recurrence
 {
     /// <summary>
     /// Recurrence rule parser

diff --git a/...ndar/Parsers/Recurrence/RecurrenceRule.cs → ...Card/Parsers/Recurrence/RecurrenceRule.cs b/...ndar/Parsers/Recurrence/RecurrenceRule.cs → ...Card/Parsers/Recurrence/RecurrenceRule.cs
@@ -21,7 +21,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace VisualCard.Calendar.Parsers.Recurrence
+namespace VisualCard.Parsers.Recurrence
 {
     /// <summary>
     /// Recurrence rule instance

diff --git a/...ers/Recurrence/RecurrenceRuleFrequency.cs → ...ers/Recurrence/RecurrenceRuleFrequency.cs b/...ers/Recurrence/RecurrenceRuleFrequency.cs → ...ers/Recurrence/RecurrenceRuleFrequency.cs
@@ -17,7 +17,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 //
 
-namespace VisualCard.Calendar.Parsers.Recurrence
+namespace VisualCard.Parsers.Recurrence
 {
     /// <summary>
     /// Recurrence rule frequency

diff --git a/VisualCard/Parsers/VcardCommonTools.cs b/VisualCard/Parsers/VcardCommonTools.cs
@@ -75,6 +75,7 @@ public static DateTimeOffset ParsePosixDate(string posixDateRepresentation, bool
                 return date;
             throw new ArgumentException($"Can't parse date {posixDateRepresentation}");
         }
+
         /// <summary>
         /// Tries to parse the POSIX date formatted with the representation according to the vCard and vCalendar specifications
         /// </summary>

diff --git a/VisualCard/Parsers/VcardParser.cs b/VisualCard/Parsers/VcardParser.cs
@@ -178,15 +178,13 @@ public Card Parse()
 
                     // Handle the part type
                     string valueType = VcardCommonTools.GetFirstValue(splitArgs, defaultValueType, VcardConstants._valueArgumentSpecifier);
+                    string finalValue = VcardParserTools.ProcessStringValue(value, valueType);
                     switch (type)
                     {
                         case PartType.Strings:
                             {
                                 StringsEnum stringType = (StringsEnum)enumeration;
 
-                                // Get the final value
-                                string finalValue = VcardParserTools.ProcessStringValue(value, valueType);
-
                                 // Let VisualCard know that we've explicitly specified a kind.
                                 if (stringType == StringsEnum.Kind)
                                 {
@@ -209,7 +207,7 @@ public Card Parse()
                                     continue;
 
                                 // Now, get the part info
-                                string finalValue = partsArrayType is PartsArrayEnum.NonstandardNames or PartsArrayEnum.IanaNames ? _value : value;
+                                finalValue = partsArrayType is PartsArrayEnum.NonstandardNames or PartsArrayEnum.IanaNames ? _value : value;
                                 var partInfo = fromString(finalValue, [.. finalArgs], altId, elementTypes, group, valueType, CardVersion);
 
                                 // Set the array for real