Merge branch 'hotfix/2.6.1'

0xced · Nov 7, 2018 · e22660c · e22660c
2 parents ab5794e + 10665a6
commit e22660c
Show file tree

Hide file tree

Showing 18 changed files with 366 additions and 425 deletions.
diff --git a/...TubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testConnectionErrorWithDashManifest.json b/...TubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testConnectionErrorWithDashManifest.json
diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testExpiredLiveVideo.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testExpiredLiveVideo.json
diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testGeoblockedVideo.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testGeoblockedVideo.json
diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testLiveVideo.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testLiveVideo.json
diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testMobileRestrictedVideo.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testMobileRestrictedVideo.json
diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testRemovedVideo.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testRemovedVideo.json
diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testRestrictedVideo.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testRestrictedVideo.json
diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testThatVideoHasMetadata.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testThatVideoHasMetadata.json
diff --git a/...ts/Cassettes/XCDYouTubeClientTestCase/testThatVideoIsAvailalbeOnDetailPageEventLabel.json b/...ts/Cassettes/XCDYouTubeClientTestCase/testThatVideoIsAvailalbeOnDetailPageEventLabel.json
diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testVideoThatHasCaptions.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testVideoThatHasCaptions.json
diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testVideoWithDashManifest.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeClientTestCase/testVideoWithDashManifest.json
diff --git a/...ests/Cassettes/XCDYouTubeClientTestCase/testVideoWithUndeterminedCaptionLanguageCode.json b/...ests/Cassettes/XCDYouTubeClientTestCase/testVideoWithUndeterminedCaptionLanguageCode.json
diff --git a/...ts/Cassettes/XCDYouTubeProtectedVideosTestCase/testDASHAudioWithRateBypassIsPlayable.json b/...ts/Cassettes/XCDYouTubeProtectedVideosTestCase/testDASHAudioWithRateBypassIsPlayable.json
diff --git a/...ubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOIsPlayable.json b/...ubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOIsPlayable.json
diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOVideo1.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOVideo1.json
diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOVideo2.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOVideo2.json
diff --git a/XCDYouTubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOVideo3.json b/XCDYouTubeKit Tests/Cassettes/XCDYouTubeProtectedVideosTestCase/testProtectedVEVOVideo3.json
diff --git a/XCDYouTubeKit/XCDYouTubePlayerScript.m b/XCDYouTubeKit/XCDYouTubePlayerScript.m
@@ -72,7 +72,8 @@ - (instancetype) initWithString:(NSString *)string
     NSArray<NSString *>*patterns = @[@"\\.sig\\|\\|([a-zA-Z0-9$]+)\\(",
                                      @"[\"']signature[\"']\\s*,\\s*([^\\(]+)",
                                      @"yt\\.akamaized\\.net/\\)\\s*\\|\\|\\s*.*?\\s*c\\s*&&d.set\\([^,]+\\s*,\\s*([a-zA-Z0-9$]+)",
-                                     @"\\bcs*&&\\s*d\\.set\\([^,]+\\s*,\\s*([a-zA-Z0-9$]+)\\C"
+                                     @"\\bcs*&&\\s*d\\.set\\([^,]+\\s*,\\s*([a-zA-Z0-9$]+)\\C",
+				     @"\\bc\\s*&&\\s*d\\.set\\([^,]+\\s*,\\s*\\([^)]*\\)\\s*\\(\\s*([a-zA-Z0-9$]+)\\("
                                      ];
 
     NSMutableArray<NSRegularExpression *>*validRegularExpressions = [NSMutableArray new];