Improve parsing description of calendar event

MauriceArikoglu · May 2, 2018 · 65ffad7 · 65ffad7
1 parent cdd5a05
commit 65ffad7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/CalendarKit-Swift.xcodeproj/project.pbxproj b/CalendarKit-Swift.xcodeproj/project.pbxproj
@@ -737,7 +737,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 6UJ7Z72VQ8;
+				DEVELOPMENT_TEAM = UMWTWMN2C7;
 				INFOPLIST_FILE = "CalendarKit-Swift/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -754,7 +754,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 6UJ7Z72VQ8;
+				DEVELOPMENT_TEAM = UMWTWMN2C7;
 				INFOPLIST_FILE = "CalendarKit-Swift/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

diff --git a/CalendarKit-Swift/SwiftCal/ICSEventParser.swift b/CalendarKit-Swift/SwiftCal/ICSEventParser.swift
@@ -260,23 +260,31 @@ class ICSEventParser: NSObject {
     }
 
     private static func description(from icsString: String) -> String? {
-        
+
         var descriptionString: NSString?
 
         var eventScanner = Scanner(string: icsString)
         eventScanner.charactersToBeSkipped = newlineCharacterSet()
-        eventScanner.scanUpTo(ICS.description, into: nil)
+
+        // Handle `DESCRIPTION;LANGUAGE=en-US:Dear Gary, Attached is the ...` format
+        eventScanner = Scanner(string: icsString)
+        eventScanner.charactersToBeSkipped = newlineCharacterSet()
+        eventScanner.scanUpTo(ICS.description2, into: nil)
+        eventScanner.scanUpTo(":", into: nil)
+        eventScanner.scanString(":", into: nil)
         eventScanner.scanUpTo("\n", into: &descriptionString)
+        if descriptionString != nil {
+            descriptionString = descriptionString?.replacingOccurrences(of: ICS.description2, with: "").replacingOccurrences(of: "\\n", with: "\n").replacingOccurrences(of: "\\", with: "").trimmingCharacters(in: newlineCharacterSet()) as! NSString
+        }
 
-        // Handle description that has the language tag e.g.
-        // `DESCRIPTION;LANGUAGE=en-US:Dear Gary, Attached is the ...`
-        if descriptionString == nil {
-            eventScanner = Scanner(string: icsString)
-            eventScanner.charactersToBeSkipped = newlineCharacterSet()
-            eventScanner.scanUpTo(ICS.description2, into: nil)
-            eventScanner.scanUpTo(":", into: nil)
-            eventScanner.scanString(":", into: nil)
+        // Handle `DESCRIPTION:Dear Gary, Attached is the ...` format
+        if descriptionString?.length ?? 0 == 0 {
+            eventScanner.scanLocation = 0
+            eventScanner.scanUpTo(ICS.description, into: nil)
             eventScanner.scanUpTo("\n", into: &descriptionString)
+            if descriptionString != nil {
+                descriptionString = descriptionString?.replacingOccurrences(of: ICS.description, with: "").replacingOccurrences(of: "\\n", with: "\n").replacingOccurrences(of: "\\", with: "").trimmingCharacters(in: newlineCharacterSet()) as! NSString
+            }
         }
 
         // a multi-line description can have newline characters
@@ -297,7 +305,7 @@ class ICSEventParser: NSObject {
             }
         }
 
-        return descriptionString?.replacingOccurrences(of: ICS.description, with: "").replacingOccurrences(of: "\\n", with: "\n").replacingOccurrences(of: "\\", with: "").trimmingCharacters(in: CharacterSet.newlines)
+        return descriptionString?.replacingOccurrences(of: "\\n", with: "\n").replacingOccurrences(of: "\\", with: "").trimmingCharacters(in: CharacterSet.newlines)
     }
 
     private static func newlineCharacterSet() -> CharacterSet {