Unbroke SVGBezierPath file cache

pocketsvg · Jan 27, 2017 · b1353a1 · b1353a1
1 parent a9af80c
commit b1353a1
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/SVGBezierPath.mm b/SVGBezierPath.mm
@@ -26,9 +26,9 @@ - (instancetype)init
 }
 #endif
 
-+ (NSCache<NSString*, NSArray<SVGBezierPath*>*> *)_svg_pathCache
++ (NSCache<NSURL*, NSArray<SVGBezierPath*>*> *)_svg_pathCache
 {
-    static NSCache<NSString*, NSArray<SVGBezierPath*>*> *pathCache;
+    static NSCache<NSURL*, NSArray<SVGBezierPath*>*> *pathCache;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         pathCache = [NSCache new];
@@ -42,13 +42,18 @@ + (void)resetCache
 
 + (NSArray<SVGBezierPath*> *)pathsFromSVGAtURL:(NSURL *)aURL
 {
-    return [self pathsFromSVGString:[NSString stringWithContentsOfURL:aURL
-                                                         usedEncoding:NULL
-                                                                error:NULL]];
+    NSArray<SVGBezierPath*> *paths = [self.class._svg_pathCache objectForKey:aURL];
+    if (!paths) {
+        paths =  [self pathsFromSVGString:[NSString stringWithContentsOfURL:aURL
+                                                               usedEncoding:NULL
+                                                                      error:NULL]];
+        if (paths) {
+            [self.class._svg_pathCache setObject:paths forKey:aURL];
+        }
+    }
+    return [[NSArray alloc] initWithArray:paths copyItems:YES];
 }
 
-
-
 + (NSArray *)pathsFromSVGString:(NSString * const)svgString
 {
     SVGAttributeSet *cgAttrs;