Updated VOD URL handling

Author: jackcook

BeamAPI.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name       = "BeamAPI"
-  s.version    = "1.2.2"
+  s.version    = "1.2.3"
   s.summary    = "An interface to communicate with Beam's backend."
   s.homepage   = "https://github.com/WatchBeam/beam-client-swift"
   s.license    = "MIT"
@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
   s.requires_arc           = true
   s.ios.deployment_target  = "8.2"
   s.tvos.deployment_target = "9.0"
-  s.source                 = { :git => "https://github.com/WatchBeam/beam-client-swift.git", :tag => "1.2.2" }
+  s.source                 = { :git => "https://github.com/WatchBeam/beam-client-swift.git", :tag => "1.2.3" }
   s.source_files           = "Pod/Classes/**/*"
 
   s.dependency "Starscream", "~> 1.1"

Pod/Classes/Models/BeamVOD.swift

@@ -11,22 +11,40 @@ import SwiftyJSON
 public struct BeamVOD {
 
     public let id: Int
-    public let storageNode: String
-    public let mainUrl: String
+    public let storageNode: String?
+    public let baseUrl: String?
+    public let mainUrl: String?
     public let format: String
     public let createdAt: NSDate?
     public let updatedAt: NSDate?
     public let recordingId: Int
 
-    public var url: NSURL {
-        return NSURL(string: "https://\(storageNode)/\(id)/\(mainUrl)")!
+    public var url: NSURL? {
+        func filePath() -> String? {
+            return [
+                "dash": "manifest.mpd",
+                "hls": "manifest.m3u8",
+                "thumbnail": "source.json",
+                "raw": "source.mp4",
+                "chat": "source.json"
+            ][format]
+        }
+        
+        if let baseUrl = baseUrl, filePath = filePath() {
+            return NSURL(string: "\(baseUrl)\(filePath)")
+        } else if let storageNode = storageNode, mainUrl = mainUrl {
+            return NSURL(string: "https://\(storageNode)/\(id)/\(mainUrl)")
+        }
+        
+        return nil
     }
 
     init(json: JSON) {
         id = json["id"].int ?? 0
-        storageNode = json["storageNode"].string ?? ""
-        mainUrl = json["mainUrl"].string ?? ""
-        format = json["format"].string ?? ""
+        storageNode = json["storageNode"].string
+        baseUrl = json["baseUrl"].string
+        mainUrl = json["mainUrl"].string
+        format = json["format"].string ?? "unknown"
         createdAt = NSDate.fromBeam(json["createdAt"].string)
         updatedAt = NSDate.fromBeam(json["updatedAt"].string)
         recordingId = json["recordingId"].int ?? 0