Swift 1.2 updates

Author: gilesvangruisen

YouTubePlayer/YouTubePlayer.xcodeproj/project.pbxproj

@@ -8,14 +8,14 @@
 
 /* Begin PBXBuildFile section */
 		50E5B9C91A4CAA050099BF69 /* YTPlayer.html in Resources */ = {isa = PBXBuildFile; fileRef = 50E5B9C81A4CAA050099BF69 /* YTPlayer.html */; };
-		50E5B9CB1A4CAA150099BF69 /* VideoPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E5B9CA1A4CAA150099BF69 /* VideoPlayerView.swift */; };
+		50E5B9CB1A4CAA150099BF69 /* YouTubePlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E5B9CA1A4CAA150099BF69 /* YouTubePlayer.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		502AE85F1A475FD500306AD1 /* YouTubePlayer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = YouTubePlayer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		502AE8631A475FD500306AD1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = YouTubePlayer/Info.plist; sourceTree = "<group>"; };
 		50E5B9C81A4CAA050099BF69 /* YTPlayer.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = YTPlayer.html; path = YouTubePlayer/YTPlayer.html; sourceTree = SOURCE_ROOT; };
-		50E5B9CA1A4CAA150099BF69 /* VideoPlayerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = VideoPlayerView.swift; path = YouTubePlayer/VideoPlayerView.swift; sourceTree = SOURCE_ROOT; };
+		50E5B9CA1A4CAA150099BF69 /* YouTubePlayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YouTubePlayer.swift; path = YouTubePlayer/YouTubePlayer.swift; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -48,7 +48,7 @@
 		502AE8611A475FD500306AD1 /* YouTubePlayer */ = {
 			isa = PBXGroup;
 			children = (
-				50E5B9CA1A4CAA150099BF69 /* VideoPlayerView.swift */,
+				50E5B9CA1A4CAA150099BF69 /* YouTubePlayer.swift */,
 				50E5B9C81A4CAA050099BF69 /* YTPlayer.html */,
 				502AE8621A475FD500306AD1 /* Supporting Files */,
 			);
@@ -142,7 +142,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				50E5B9CB1A4CAA150099BF69 /* VideoPlayerView.swift in Sources */,
+				50E5B9CB1A4CAA150099BF69 /* YouTubePlayer.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

…ayer/YouTubePlayer/VideoPlayerView.swift …Player/YouTubePlayer/YouTubePlayer.swiftYouTubePlayer/YouTubePlayer/VideoPlayerView.swift renamed to YouTubePlayer/YouTubePlayer/YouTubePlayer.swift YouTubePlayer/YouTubePlayer/VideoPlayerView.swift renamed to YouTubePlayer/YouTubePlayer/YouTubePlayer.swift

@@ -62,7 +62,7 @@ private extension NSURL {
 }
 
 public func videoIDFromYouTubeURL(videoURL: NSURL) -> String? {
-    return videoURL.queryStringComponents()["v"] as String?
+    return videoURL.queryStringComponents()["v"] as? String
 }
 
 /** Embed and control YouTube videos */
@@ -87,15 +87,13 @@ public class YouTubePlayerView: UIView, UIWebViewDelegate {
     /** Used to respond to player events */
     public var delegate: YouTubePlayerDelegate?
 
-    // MARK: Various methods for initialization
 
-    override public init() {
-        super.init()
-        buildWebView(playerParameters())
-    }
+    // MARK: Various methods for initialization
 
     override public init(frame: CGRect) {
         super.init(frame: frame)
+
+        printLog("initframe")
         buildWebView(playerParameters())
     }
 
@@ -217,10 +215,10 @@ public class YouTubePlayerView: UIView, UIWebViewDelegate {
 
         // Check for error
         if let error = error {
-            println("Lookup error: no HTML file found for path, \(path)")
+            printLog("Lookup error: no HTML file found for path, \(path)")
         }
 
-        return htmlString!
+        return htmlString! as String
     }
 
 
@@ -255,12 +253,12 @@ public class YouTubePlayerView: UIView, UIWebViewDelegate {
 
         // Check for error and return nil
         if let error = error {
-            println("Error parsing JSON")
+            printLog("Error parsing JSON")
             return nil
         }
 
         // Success, return JSON string
-        return NSString(data: jsonData!, encoding: NSUTF8StringEncoding)
+        return NSString(data: jsonData!, encoding: NSUTF8StringEncoding) as? String
     }
 
 
@@ -271,38 +269,37 @@ public class YouTubePlayerView: UIView, UIWebViewDelegate {
         // Grab the last component of the queryString as string
         let data: String? = eventURL.queryStringComponents()["data"] as? String
 
-        if let host = eventURL.host {
-            if let event = YouTubePlayerEvents(rawValue: host) {
-                // Check event type and handle accordingly
-                switch event {
-                    case .YouTubeIframeAPIReady:
-                        ready = true
-                        break
+        if let host = eventURL.host, let event = YouTubePlayerEvents(rawValue: host) {
+
+            // Check event type and handle accordingly
+            switch event {
+                case .YouTubeIframeAPIReady:
+                    ready = true
+                    break
 
-                    case .Ready:
-                        delegate?.playerReady(self)
+                case .Ready:
+                    delegate?.playerReady(self)
 
-                        break
+                    break
 
-                    case .StateChange:
-                        if let newState = YouTubePlayerState(rawValue: data!) {
-                            playerState = newState
-                            delegate?.playerStateChanged(self, playerState: newState)
-                        }
+                case .StateChange:
+                    if let newState = YouTubePlayerState(rawValue: data!) {
+                        playerState = newState
+                        delegate?.playerStateChanged(self, playerState: newState)
+                    }
 
-                        break
+                    break
 
-                    case .PlaybackQualityChange:
-                        if let newQuality = YouTubePlaybackQuality(rawValue: data!) {
-                            playbackQuality = newQuality
-                            delegate?.playerQualityChanged(self, playbackQuality: newQuality)
-                        }
+                case .PlaybackQualityChange:
+                    if let newQuality = YouTubePlaybackQuality(rawValue: data!) {
+                        playbackQuality = newQuality
+                        delegate?.playerQualityChanged(self, playbackQuality: newQuality)
+                    }
 
-                        break
+                    break
 
-                    default:
-                        break
-                }
+                default:
+                    break
             }
         }
     }
@@ -315,8 +312,12 @@ public class YouTubePlayerView: UIView, UIWebViewDelegate {
         let url = request.URL
 
         // Check if ytplayer event and, if so, pass to handleJSEvent
-        if url.scheme == "ytplayer" { handleJSEvent(url) }
+        if let url = url where url.scheme == "ytplayer" { handleJSEvent(url) }
 
         return true
     }
 }
+
+private func printLog(str: String) {
+    println("[YouTubePlayer] \(str)")
+}