Add more parameters for X-MAP

Author: wolfcon

M3U8Kit.xcodeproj/project.pbxproj

@@ -31,7 +31,7 @@
 		01C15384287D0EFB009D0C01 /* NSArray+m3u8.h in Headers */ = {isa = PBXBuildFile; fileRef = 01C15382287D0EFB009D0C01 /* NSArray+m3u8.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		01C15385287D0EFB009D0C01 /* NSArray+m3u8.m in Sources */ = {isa = PBXBuildFile; fileRef = 01C15383287D0EFB009D0C01 /* NSArray+m3u8.m */; };
 		62554C632DCCC6D700A30375 /* M3U8ExtXMap.m in Sources */ = {isa = PBXBuildFile; fileRef = 62554C622DCCC6D700A30375 /* M3U8ExtXMap.m */; };
-		62554C642DCCC6D700A30375 /* M3U8ExtXMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 62554C612DCCC6D700A30375 /* M3U8ExtXMap.h */; };
+		62554C642DCCC6D700A30375 /* M3U8ExtXMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 62554C612DCCC6D700A30375 /* M3U8ExtXMap.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		62554C652DCCC6D700A30375 /* M3U8ExtXMap.m in Sources */ = {isa = PBXBuildFile; fileRef = 62554C622DCCC6D700A30375 /* M3U8ExtXMap.m */; };
 		9D79F14A1EF784E500D16AFD /* NSString+m3u8.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D79F12F1EF784E500D16AFD /* NSString+m3u8.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9D79F14C1EF784E500D16AFD /* NSString+m3u8.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D79F1301EF784E500D16AFD /* NSString+m3u8.m */; };
@@ -271,11 +271,11 @@
 				9D79F14A1EF784E500D16AFD /* NSString+m3u8.h in Headers */,
 				9D79F1621EF784E500D16AFD /* M3U8ExtXStreamInf.h in Headers */,
 				9D79F14E1EF784E500D16AFD /* NSURL+m3u8.h in Headers */,
-				62554C642DCCC6D700A30375 /* M3U8ExtXMap.h in Headers */,
 				9D79F16A1EF784E500D16AFD /* M3U8MasterPlaylist.h in Headers */,
 				F97F1AB02204979A006F5717 /* M3U8ExtXKey.h in Headers */,
 				9D79F15A1EF784E500D16AFD /* M3U8ExtXMedia.h in Headers */,
 				012455BB2525ABA600AF62C3 /* M3U8ExtXByteRange.h in Headers */,
+				62554C642DCCC6D700A30375 /* M3U8ExtXMap.h in Headers */,
 				01C15384287D0EFB009D0C01 /* NSArray+m3u8.h in Headers */,
 				012455D42525B8EC00AF62C3 /* M3U8LineReader.h in Headers */,
 			);

Source/M3U8ExtXMap.h

@@ -6,10 +6,13 @@
 //
 
 #import <Foundation/Foundation.h>
+
+@class M3U8ExtXByteRange;
 @interface M3U8ExtXMap : NSObject
 
-- (instancetype)initWithDictionary:(NSDictionary *)dictionary;
+@property (nonatomic, readonly) NSURL *URI;
+@property (nonatomic, readonly) M3U8ExtXByteRange *byteRange;
 
-- (NSURL *)url;
+- (instancetype)initWithDictionary:(NSDictionary *)dictionary;
 
 @end

Source/M3U8ExtXMap.m

@@ -7,22 +7,25 @@
 
 #import "M3U8ExtXMap.h"
 #import "M3U8TagsAndAttributes.h"
+#import "M3U8ExtXByteRange.h"
 
 @interface M3U8ExtXMap()
 @property (nonatomic, strong) NSDictionary *dictionary;
+@property (nonatomic, strong) NSURL *URI;
+@property (nonatomic, strong) M3U8ExtXByteRange *byteRange;
 @end
 
 @implementation M3U8ExtXMap
 
 - (instancetype)initWithDictionary:(NSDictionary *)dictionary {
     if (self = [super init]) {
         self.dictionary = dictionary;
+        
+        _URI = [NSURL URLWithString:self.dictionary[M3U8_EXT_X_MAP_URI]];
+        NSString *rangeString = dictionary[M3U8_EXT_X_MAP_BYTERANGE];
+        _byteRange = [[M3U8ExtXByteRange alloc] initWithAtString:rangeString];
     }
     return self;
 }
 
-- (NSURL *)url {
-    return [NSURL URLWithString:self.dictionary[M3U8_EXT_X_MAP_URI]];
-}
-
 @end

Source/M3U8Parser.h

@@ -9,6 +9,7 @@
 #import "M3U8ExtXStreamInf.h"
 #import "M3U8ExtXStreamInfList.h"
 #import "M3U8ExtXKey.h"
+#improt "M3U8ExtXMap.h"
 #import "M3U8ExtXMedia.h"
 #import "M3U8ExtXMediaList.h"
 #import "M3U8SegmentInfo.h"