feat: Correct ZIP file match when parse.

svga · Sep 29, 2019 · f3e204f · f3e204f
1 parent eb45964
commit f3e204f
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/Source/SVGAParser.m b/Source/SVGAParser.m
@@ -13,6 +13,8 @@
 #import <SSZipArchive/SSZipArchive.h>
 #import <CommonCrypto/CommonDigest.h>
 
+#define ZIP_MAGIC_NUMBER "PK"
+
 @interface SVGAParser ()
 
 @end
@@ -176,6 +178,14 @@ - (void)clearCache:(nonnull NSString *)cacheKey {
     [[NSFileManager defaultManager] removeItemAtPath:cacheDir error:NULL];
 }
 
++ (BOOL)isZIPData:(NSData *)data {
+    BOOL result = NO;
+    if (!strncmp([data bytes], ZIP_MAGIC_NUMBER, strlen(ZIP_MAGIC_NUMBER))) {
+        result = YES;
+    }
+    return result;
+}
+
 - (void)parseWithData:(nonnull NSData *)data
              cacheKey:(nonnull NSString *)cacheKey
       completionBlock:(void ( ^ _Nullable)(SVGAVideoEntity * _Nonnull videoItem))completionBlock
@@ -192,9 +202,7 @@ - (void)parseWithData:(nonnull NSData *)data
     if (!data || data.length < 4) {
         return;
     }
-    NSData *tag = [data subdataWithRange:NSMakeRange(0, 4)];
-    NSString *fileTagDes = [tag description];
-    if (![fileTagDes containsString:@"504b0304"]) {
+    if (![SVGAParser isZIPData:data]) {
         // Maybe is SVGA 2.0.0
         [parseQueue addOperationWithBlock:^{
             NSData *inflateData = [self zlibInflate:data];