Fix a little mistake and add more tests.

M3U8Kit · Jul 13, 2022 · 91d18bc · 91d18bc
1 parent e5efb7a
commit 91d18bc
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 36 deletions.
diff --git a/M3U8Kit.xcodeproj/project.pbxproj b/M3U8Kit.xcodeproj/project.pbxproj
@@ -29,7 +29,6 @@
  01B38E4420EA30FD00AC6443 /* M3U8LineReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 01B38E4020EA30AB00AC6443 /* M3U8LineReader.m */; };
  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 */; };
- 9D79F1291EF77CE500D16AFD /* M3U8Kit.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D79F1271EF77CE500D16AFD /* M3U8Kit.h */; settings = {ATTRIBUTES = (Public, ); }; };
  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 */; };
  9D79F14E1EF784E500D16AFD /* NSURL+m3u8.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D79F1311EF784E500D16AFD /* NSURL+m3u8.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -84,7 +83,6 @@
  01C15383287D0EFB009D0C01 /* NSArray+m3u8.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSArray+m3u8.m"; sourceTree = "<group>"; };
  9D05821D18E52DF500A12776 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
  9D79F1251EF77CE400D16AFD /* M3U8Parser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = M3U8Parser.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- 9D79F1271EF77CE500D16AFD /* M3U8Kit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = M3U8Kit.h; sourceTree = "<group>"; };
  9D79F1281EF77CE500D16AFD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
  9D79F12F1EF784E500D16AFD /* NSString+m3u8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+m3u8.h"; sourceTree = "<group>"; };
  9D79F1301EF784E500D16AFD /* NSString+m3u8.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+m3u8.m"; sourceTree = "<group>"; };
@@ -176,7 +174,6 @@
  9D79F1261EF77CE500D16AFD /* M3U8Kit */ = {
  isa = PBXGroup;
  children = (
- 9D79F1271EF77CE500D16AFD /* M3U8Kit.h */,
  9D79F1281EF77CE500D16AFD /* Info.plist */,
  );
  path = M3U8Kit;
@@ -186,8 +183,8 @@
  isa = PBXGroup;
  children = (
  011650B024483537001E4A35 /* M3U8Parser.modulemap */,
- 9D79F12E1EF784E500D16AFD /* Categories */,
  9D79F1331EF784E500D16AFD /* M3U8Parser.h */,
+ 9D79F12E1EF784E500D16AFD /* Categories */,
  9D79F1341EF784E500D16AFD /* M3U8PlaylistModel.h */,
  9D79F1351EF784E500D16AFD /* M3U8PlaylistModel.m */,
  9D79F1361EF784E500D16AFD /* M3U8TagsAndAttributes.h */,
@@ -261,7 +258,6 @@
  9D79F1521EF784E500D16AFD /* M3U8Parser.h in Headers */,
  9D79F15E1EF784E500D16AFD /* M3U8ExtXMediaList.h in Headers */,
  9D79F1761EF784E500D16AFD /* M3U8SegmentInfoList.h in Headers */,
- 9D79F1291EF77CE500D16AFD /* M3U8Kit.h in Headers */,
  9D79F14A1EF784E500D16AFD /* NSString+m3u8.h in Headers */,
  9D79F1621EF784E500D16AFD /* M3U8ExtXStreamInf.h in Headers */,
  9D79F14E1EF784E500D16AFD /* NSURL+m3u8.h in Headers */,

diff --git a/M3U8Kit/M3U8Kit.h b/M3U8Kit/M3U8Kit.h
diff --git a/M3U8KitTests/M3U8KitTests.m b/M3U8KitTests/M3U8KitTests.m
@@ -66,8 +66,13 @@ - (void)testPlaylistM3U {
  M3U8SegmentInfoList *segments = playList.mainMediaPl.segmentList;
  XCTAssertEqual(segments.count, 23);
 
- NSDictionary *additionalParamaters = [segments segmentInfoAtIndex:0].additionalParameters;
- XCTAssertEqual(additionalParamaters.count, 5);
+ M3U8SegmentInfo *segment0 = [segments segmentInfoAtIndex:0];
+ XCTAssertEqual(segment0.additionalParameters.count, 5);
+ XCTAssertEqual(segment0.duration, 2.0);
+
+ M3U8SegmentInfo *segment1 = [segments segmentInfoAtIndex:1];
+ XCTAssertNil(segment1.additionalParameters);
+ XCTAssertEqual(segment1.duration, 2.0);
 
  XCTAssertNil(error);
 }

diff --git a/Source/M3U8MediaPlaylist.m b/Source/M3U8MediaPlaylist.m
@@ -13,6 +13,7 @@
 #import "M3U8LineReader.h"
 #import "M3U8ExtXKey.h"
 #import "M3U8ExtXByteRange.h"
+#import "NSArray+m3u8.h"
 
 @interface M3U8MediaPlaylist()
 
@@ -106,16 +107,15 @@ - (void)parseMediaPlaylist
  NSArray<NSString *> *components = [line componentsSeparatedByString:@","];
  NSString *info = components.firstObject;
  if (info) {
- NSArray<NSString *> *additions = [info componentsSeparatedByString:@" "];
+ NSString *blankMark = @" ";
+ NSMutableArray<NSString *> *additions = [[info componentsSeparatedByString:blankMark] mutableCopy];
  // get duration
- if (additions.count == 1) {
-  NSString *duration = additions.firstObject;
-  params[M3U8_EXTINF_DURATION] = duration;
+ NSString *duration = additions.firstObject;
+ params[M3U8_EXTINF_DURATION] = duration;
+
  // get additional parameters from Extended M3U https://en.wikipedia.org/wiki/M3U#Extended_M3U
- } else {
- NSString *extraInfo = [info stringByReplacingOccurrencesOfString:[NSString stringWithFormat:@"%@ ", additions.firstObject] withString:@""];
-
- params[M3U8_EXTINF_ADDITIONAL_PARAMETERS] = extraInfo.m3u_attributesFromAssignmentByBlank;
+ if (additions.count > 1) {
+ params[M3U8_EXTINF_ADDITIONAL_PARAMETERS] = [additions m3u_attributesFromAssignmentByMark:blankMark];
  }
  }
  if (components.count > 1) {

diff --git a/Source/NSArray+m3u8.h b/Source/NSArray+m3u8.h
@@ -13,7 +13,15 @@ NS_ASSUME_NONNULL_BEGIN
 @interface NSArray (m3u8)
 
 /** @return "key=value" transform to dictionary */
-- (NSMutableDictionary *)m3u_attributesFromAssignmentByMark:(NSString *)mark;
+- (NSMutableDictionary *)m3u_attributesFromAssignment;
+
+/**
+ If check by invalid value, value will append to last element with specific mark.
+ 
+ @param mark attribute will be ignored if it is invalid.
+ @return "key=value" transform to dictionary
+ */
+- (NSMutableDictionary *)m3u_attributesFromAssignmentByMark:(nullable NSString *)mark;
 
 @end
 

diff --git a/Source/NSArray+m3u8.m b/Source/NSArray+m3u8.m
@@ -11,6 +11,10 @@
 
 @implementation NSArray (m3u8)
 
+- (NSMutableDictionary *)m3u_attributesFromAssignment {
+ return [self m3u_attributesFromAssignmentByMark:nil];
+}
+
 - (NSMutableDictionary *)m3u_attributesFromAssignmentByMark:(NSString *)mark {
  NSMutableDictionary *dict = [NSMutableDictionary dictionary];
 
@@ -19,6 +23,7 @@ - (NSMutableDictionary *)m3u_attributesFromAssignmentByMark:(NSString *)mark {
  NSRange equalMarkRange = [keyValue rangeOfString:@"="];
  // if equal mark is not found, it means this value is previous value left. eg: CODECS=\"avc1.42c01e,mp4a.40.2\"
  if (equalMarkRange.location == NSNotFound) {
+ if (!mark) continue;
  if (!lastkey) continue;
  NSString *lastValue = dict[lastkey];
  NSString *supplement = [lastValue stringByAppendingFormat:@"%@%@", mark, keyValue.m3u_stringByTrimmingQuoteMark];