Merge branch 'release/2.7.2'

.jazzy.yaml

@@ -4,11 +4,11 @@ source_directory: XCDYouTubeKit
 framework_root: .
 umbrella_header: XCDYouTubeKit/XCDYouTubeKit.h
 module: XCDYouTubeKit
-module_version: 2.7.1
+module_version: 2.7.2
 
 author: Cédric Luthi
 author_url: https://twitter.com/0xced
 
 readme: README.md
 github_url: https://github.com/0xced/XCDYouTubeKit
-github_file_prefix: https://github.com/0xced/XCDYouTubeKit/tree/2.7.1/XCDYouTubeKit
+github_file_prefix: https://github.com/0xced/XCDYouTubeKit/tree/2.7.2/XCDYouTubeKit

CHANGELOG.md

@@ -1,3 +1,7 @@
+#### Version 2.7.2
+
+* Adaptation to YouTube API change. (#417)
+
 #### Version 2.7.1
 
 * Fixed Xcode project parsing error (#409, #411)

XCDYouTubeKit Demo/XCDYouTubeKit Demo.xcodeproj/project.pbxproj

@@ -760,7 +760,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 2.7.1;
+				CURRENT_PROJECT_VERSION = 2.7.2;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -804,7 +804,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 2.7.1;
+				CURRENT_PROJECT_VERSION = 2.7.2;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;

XCDYouTubeKit Tests/XCDYouTubeClientTestCase.m

@@ -118,7 +118,7 @@ - (void) testMobileRestrictedVideo
 - (void) testLiveVideo
 {
 	__weak XCTestExpectation *expectation = [self expectationWithDescription:@""];
-	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:@"wv8NRHysoo0" completionHandler:^(XCDYouTubeVideo *video, NSError *error)
+	[[XCDYouTubeClient defaultClient] getVideoWithIdentifier:@"c6tZznkHX6g" completionHandler:^(XCDYouTubeVideo *video, NSError *error)
 	{
 		XCTAssertNil(error);
 		XCTAssertNotNil(video.title);

XCDYouTubeKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                   = "XCDYouTubeKit"
-  s.version                = "2.7.1"
+  s.version                = "2.7.2"
   s.summary                = "YouTube video player for iOS and OS X."
   s.homepage               = "https://github.com/0xced/XCDYouTubeKit"
   s.screenshot             = "https://raw.github.com/0xced/XCDYouTubeKit/#{s.version}/Screenshots/XCDYouTubeVideoPlayerViewController.png"

XCDYouTubeKit.xcodeproj/project.pbxproj

@@ -612,10 +612,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 32;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 2.0.0;
-				DYLIB_CURRENT_VERSION = 2.7.1;
+				DYLIB_CURRENT_VERSION = 2.7.2;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -690,10 +690,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 32;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 2.0.0;
-				DYLIB_CURRENT_VERSION = 2.7.1;
+				DYLIB_CURRENT_VERSION = 2.7.2;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

XCDYouTubeKit/XCDYouTubeVideo+Private.h

@@ -13,6 +13,7 @@ extern NSString *const XCDYouTubeNoStreamVideoUserInfoKey;
 extern NSDictionary *XCDDictionaryWithQueryString(NSString *string);
 extern NSString *XCDQueryStringWithDictionary(NSDictionary *dictionary);
 extern NSArray *XCDCaptionArrayWithString(NSString *string);
+extern NSString *XCDHTTPLiveStreamingStringWithString(NSString *string);
 
 @interface XCDYouTubeVideo ()
 

XCDYouTubeKit/XCDYouTubeVideo.m

@@ -14,6 +14,23 @@
 NSString *const XCDYouTubeNoStreamVideoUserInfoKey = @"NoStreamVideo";
 NSString *const XCDYouTubeVideoQualityHTTPLiveStreaming = @"HTTPLiveStreaming";
 
+
+NSString *XCDHTTPLiveStreamingStringWithString(NSString *string)
+{
+	NSError *error = nil;
+	NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding];
+	if (!data) { return nil; }
+	NSDictionary *JSON = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingAllowFragments error:&error];
+
+	if (error) { return nil; }
+
+	NSDictionary *streamingData = JSON[@"streamingData"];
+	NSString *manifestURL = streamingData[@"hlsManifestUrl"];
+	if (manifestURL.length == 0) { return nil; }
+
+	return manifestURL;
+}
+
 NSArray <NSDictionary *> *XCDCaptionArrayWithString(NSString *string)
 {
 	NSError *error = nil;
@@ -120,8 +137,8 @@ - (instancetype) initWithIdentifier:(NSString *)identifier info:(NSDictionary *)
 	_identifier = identifier;
 
 	NSString *streamMap = info[@"url_encoded_fmt_stream_map"];
-	NSString *captionsMap = info[@"player_response"];
-	NSString *httpLiveStream = info[@"hlsvp"];
+	NSString *playerResponse = info[@"player_response"];
+	NSString *httpLiveStream = info[@"hlsvp"] ?: XCDHTTPLiveStreamingStringWithString(playerResponse);
 	NSString *adaptiveFormats = info[@"adaptive_fmts"];
 
 	NSMutableDictionary *userInfo = response.URL ? [@{ NSURLErrorKey: (id)response.URL } mutableCopy] : [NSMutableDictionary new];
@@ -146,7 +163,7 @@ - (instancetype) initWithIdentifier:(NSString *)identifier info:(NSDictionary *)
 		NSMutableDictionary *captionURLs = [NSMutableDictionary new];
 		NSMutableDictionary *autoGeneratedCaptionURLs = [NSMutableDictionary new];
 
-		for (NSDictionary *caption in XCDCaptionArrayWithString(captionsMap))
+		for (NSDictionary *caption in XCDCaptionArrayWithString(playerResponse))
 		{
 			NSString *languageCode = caption[@"languageCode"];
 			NSString *captionVersion = caption[@"vssId"];