resolve conflicts

Addons/GoogleCast/BasicCastBuilder.swift

@@ -15,9 +15,11 @@ import GoogleCast
 
  */
 @objc public class BasicCastBuilder: NSObject {
+
     @objc public enum StreamType: Int {
         case live
         case vod
+        case unknown
     }
 
     enum BasicBuilderDataError: Error {
@@ -33,23 +35,26 @@ import GoogleCast
     @objc public var partnerID: String?
     @objc public var uiconfID: String?
     @objc public var adTagURL: String?
-    @objc public private(set) var streamType = GCKMediaStreamType.none
     @objc public var metaData: GCKMediaMetadata?
 
+    @objc public var streamType = StreamType.unknown {
+        didSet {
+            switch streamType {
+            case .live: self.gckMediaStreamType = .live
+            case .vod: self.gckMediaStreamType = .buffered
+            case .unknown: self.gckMediaStreamType = .unknown
+            }
+        }
+    }
+    private var gckMediaStreamType = GCKMediaStreamType.unknown
 
     /**
      Set - stream type
      - Parameter contentId: receiver contentId to play ( Entry id, or Asset id )
      */
     @discardableResult
-    @objc public func set(streamType: StreamType) -> Self{
-
-        switch streamType {
-        case .live:
-            self.streamType = .live
-        case .vod:
-            self.streamType = .buffered
-        }
+    @nonobjc public func set(streamType: StreamType) -> Self {
+        self.streamType = streamType
         return self
     }
 
@@ -58,7 +63,7 @@ import GoogleCast
      - Parameter contentId: receiver contentId to play ( Entry id, or Asset id )
      */
     @discardableResult
-    @nonobjc public func set(contentId: String?) -> Self{
+    @nonobjc public func set(contentId: String?) -> Self {
 
         guard contentId != nil,
             contentId?.isEmpty == false
@@ -169,11 +174,9 @@ import GoogleCast
             throw BasicCastBuilder.BasicBuilderDataError.missingContentId
         }
 
-        guard self.streamType != nil else {
+        guard self.streamType != .unknown else {
             throw BasicCastBuilder.BasicBuilderDataError.missingStreamType
         }
-
-
     }
 
 
@@ -185,7 +188,7 @@ import GoogleCast
         try self.validate()
         let customData = self.customData()
         let mediaInfo: GCKMediaInformation = GCKMediaInformation(contentID:self.contentId,
-                                                                 streamType: self.streamType,
+                                                                 streamType: self.gckMediaStreamType,
                                                                  contentType: "",
                                                                  metadata: self.metaData,
                                                                  streamDuration: 0,

Addons/GoogleCast/CastAdInfoParser.swift

@@ -27,31 +27,29 @@ public class CastAdInfoParser: NSObject, GCKRemoteMediaClientAdInfoParserDelegat
      */
     public func remoteMediaClient(_ client: GCKRemoteMediaClient, shouldSetPlayingAdIn mediaStatus: GCKMediaStatus) -> Bool {
 
-         guard let customData = mediaStatus.customData as? [String:Any],
-            let adsInfo = customData["adsInfo"] as? [String:Any],
-            let metaData : AdsMetadata = AdsMetadata(dict: adsInfo) else {
-                PKLog.warning("No Ads info from receiver")
-                return false
+        guard let customData = mediaStatus.customData as? [String: Any], let adsInfo = customData["adsInfo"] as? [String: Any] else {
+            PKLog.warning("No Ads info from receiver")
+            return false
         }
+        let metadata = AdsMetadata(dict: adsInfo)
 
-        return metaData.isPlayingAd
-
+        return metadata.isPlayingAd
     }
 
     /**
      A list of playback positions at which the ads occur.
      */
     public func remoteMediaClient(_ client: GCKRemoteMediaClient, shouldSetAdBreaksIn mediaStatus: GCKMediaStatus) -> [GCKAdBreakInfo]? {
 
-        guard let customData = mediaStatus.customData as? [String:Any],
-            let adsInfo = customData["adsInfo"] as? [String:Any],
-            let adsData : AdsMetadata = AdsMetadata(dict: adsInfo),
-            let adsBreakInfo = adsData.adsBreakInfo else {
-                PKLog.warning("No Ads info from receiver")
-                return nil
+        guard let customData = mediaStatus.customData as? [String: Any], let adsInfo = customData["adsInfo"] as? [String: Any] else {
+            PKLog.warning("No Ads info from receiver")
+            return nil
         }
 
+        let metadata = AdsMetadata(dict: adsInfo)
+        let adsBreakInfo = metadata.adsBreakInfo ?? []
         let adsBreakInfoArray = adsBreakInfo.map({ GCKAdBreakInfo(playbackPosition: TimeInterval($0)) })
+
         return adsBreakInfoArray
     }
 }
@@ -71,18 +69,16 @@ private class AdsMetadata: NSObject {
 
         if let isPlaying = dict["isPlayingAd"] as? Bool {
             self.isPlayingAd = isPlaying
-        }else{
+        } else {
             self.isPlayingAd = false
         }
 
         if let adBreaksInfo = dict["adsBreakInfo"] as? [NSNumber] {
             self.adsBreakInfo = adBreaksInfo.map({ (number:NSNumber) -> Int in
                 return number.intValue
             })
-        }else{
+        } else {
             self.adsBreakInfo  = nil
         }
-
-
     }
 }

Classes/Network/RequestExtension.swift → Classes/Backend/Base/RequestExtension.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import SwiftyJSON
+import KalturaNetKit
 
 
 extension KalturaRequestBuilder {
@@ -25,8 +26,9 @@ extension KalturaRequestBuilder {
     }
 
     @discardableResult
-    internal func setFormat(format: Int){
+    internal func setFormat(format: Int) -> Self {
         self.setBody(key: "format", value: JSON(format))
+        return self
     }
 
 

Classes/Providers/OTT/Parsers/OTTMultiResponseParser.swift → Classes/Backend/OTT/Parsers/OTTMultiResponseParser.swift

@@ -28,8 +28,6 @@ class OTTMultiResponseParser: NSObject {
                 let objectType: OTTBaseObject.Type? = OTTObjectMapper.classByJsonObject(json: jsonObject.dictionaryObject)
                 if let type = objectType {
                      object = type.init(json: jsonObject.object)
-                } else {
-                    throw OTTMultiResponseParserError.typeNotFound
                 }
 
                 if let obj = object {

Classes/Providers/OTT/Parsers/OTTObjectMapper.swift → Classes/Backend/OTT/Parsers/OTTObjectMapper.swift

@@ -21,14 +21,6 @@ class OTTObjectMapper: NSObject {
 
         if let name = className {
             switch name {
-            case "KalturaLoginResponse":
-                return OTTLoginResponse.self
-            case "KalturaSession":
-                return OTTSession.self
-            case "KalturaMediaAsset":
-                return OTTAsset.self
-            case "KalturaLoginSession":
-                return OTTLoginSession.self
             case "KalturaPlaybackSource":
                 return OTTPlaybackSource.self
             case "KalturaPlaybackContext":

Classes/Providers/OTT/Parsers/OTTResponseParser.swift → Classes/Backend/OTT/Parsers/OTTResponseParser.swift

@@ -9,7 +9,7 @@
 import UIKit
 import SwiftyJSON
 
-class OTTResponseParser: ResponseParser {
+class OTTResponseParser: NSObject {
 
     enum OTTResponseParserError: Error {
         case typeNotFound

Classes/Providers/OTT/Services/OTTAssetService.swift → Classes/Backend/OTT/Services/OTTAssetService.swift

@@ -8,25 +8,11 @@
 
 import UIKit
 import SwiftyJSON
+import KalturaNetKit
 
 class OTTAssetService {
 
-    internal static func get(baseURL: String, ks: String, assetId: String, type: AssetType) -> KalturaRequestBuilder? {
-
-        if let request: KalturaRequestBuilder = KalturaRequestBuilder(url: baseURL, service: "asset", action: "get") {
-            request
-            .setBody(key: "id", value: JSON(assetId))
-            .setBody(key: "ks", value: JSON(ks))
-            .setBody(key: "type", value: JSON(type.asString))
-            .setBody(key: "assetReferenceType", value: JSON(type.asString))
-            .setBody(key: "with", value: JSON([["type": "files", "objectType": "KalturaCatalogWithHolder"]]))
-            return request
-        } else {
-            return nil
-        }
-    }
-
-    internal static func getPlaybackContext(baseURL: String, ks: String, assetId: String, type: AssetType, playbackContextOptions: PlaybackContextOptions) -> KalturaRequestBuilder? {
+    internal static func getPlaybackContext(baseURL: String, ks: String, assetId: String, type: AssetObjectType, playbackContextOptions: PlaybackContextOptions) -> KalturaRequestBuilder? {
 
         if let request: KalturaRequestBuilder = KalturaRequestBuilder(url: baseURL, service: "asset", action: "getPlaybackContext") {
             request
@@ -38,13 +24,12 @@ class OTTAssetService {
         } else {
             return nil
         }
-
     }
 }
 
 struct PlaybackContextOptions {
 
-    internal var playbackContextType: PlaybackContextType
+    internal var playbackContextType: PlaybackType
     internal var protocls: [String]
     internal var assetFileIds: [String]?
 

Classes/Backend/OTT/Services/OTTUserService.swift

@@ -0,0 +1,27 @@
+//
+//  OTTUserService.swift
+//  Pods
+//
+//  Created by Admin on 13/11/2016.
+//
+//
+
+import UIKit
+import SwiftyJSON
+import KalturaNetKit
+
+class OTTUserService: NSObject {
+
+    internal static func anonymousLogin(baseURL: String, partnerId: Int64, udid: String? = nil) -> KalturaRequestBuilder? {
+        if let request = KalturaRequestBuilder(url: baseURL, service: "ottUser", action: "anonymousLogin") {
+            request.setBody(key: "partnerId", value: JSON(NSNumber.init(value: partnerId)))
+
+            if let deviceId = udid {
+                request.setBody(key: "udid", value: JSON(deviceId))
+            }
+            return request
+        }
+        return nil
+    }
+
+}

Classes/Providers/OTT/Services/PhoenixAPIDefines.swift → Classes/Backend/OTT/Services/PhoenixAPIDefines.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 
-@objc public enum AssetType: Int {
+enum AssetObjectType: Int {
     case media
     case epg
     case unknown
@@ -24,7 +24,7 @@ import Foundation
 }
 
 
-@objc public enum PlaybackContextType: Int {
+enum PlaybackType: Int {
 
     case trailer
     case catchup

Classes/Backend/OVP/Model/OVPLiveStreamEntry.swift

@@ -0,0 +1,24 @@
+//
+//  KalturaLiveStreamEntry.swift
+//  Pods
+//
+//  Created by Gal Orlanczyk on 07/05/2017.
+//
+//
+
+import Foundation
+import SwiftyJSON
+
+class OVPLiveStreamEntry: OVPEntry {
+
+    var dvrStatus: Bool?
+
+    let dvrStatusKey = "dvrStatus"
+
+    required init?(json: Any) {
+        super.init(json: json)
+
+        let jsonObject = JSON(json)
+        self.dvrStatus = jsonObject[dvrStatusKey].bool
+    }
+}

Classes/Providers/OVP/Parsers/OVPObjectMapper.swift → Classes/Backend/OVP/Parsers/OVPObjectMapper.swift

@@ -17,18 +17,22 @@ class OVPObjectMapper: NSObject {
 
     static func classByJsonObject(json:Any?) -> OVPBaseObject.Type? {
 
-        let jsonObject = JSON(json)
+        guard let js = json else {
+            return nil
+        }
+
+        let jsonObject = JSON(js)
         let className = jsonObject[classNameKey].string
         if let name = className{
             switch name {
             case "KalturaMediaEntry":
                 return OVPEntry.self
+            case "KalturaLiveStreamEntry":
+                return OVPLiveStreamEntry.self
             case "KalturaPlaybackContext":
                 return OVPPlaybackContext.self
             case "KalturaAPIException":
                 return OVPError.self
-            case "KalturaStartWidgetSessionResponse":
-                return OVPStartWidgetSessionResponse.self
             case "KalturaMetadata":
                 return OVPMetadata.self
             default:

Classes/Providers/OVP/Services/OVPBaseEntryService.swift → Classes/Backend/OVP/Services/OVPBaseEntryService.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import SwiftyJSON
+import KalturaNetKit
 
 
 class OVPBaseEntryService {

Classes/Providers/OVP/Services/OVPSessionService.swift → Classes/Backend/OVP/Services/OVPSessionService.swift

@@ -8,22 +8,10 @@
 
 import UIKit
 import SwiftyJSON
+import KalturaNetKit
 
 class OVPSessionService {
-
-    internal static func get(baseURL: String,
-                             ks: String) -> KalturaRequestBuilder? {
 
-        if let request: KalturaRequestBuilder = KalturaRequestBuilder(url: baseURL,
-                                                                      service: "session",
-                                                                      action: "get") {
-            request.setBody(key: "ks", value: JSON(ks))
-            return request
-        }else{
-            return nil
-        }
-    }
-
     internal static func startWidgetSession(baseURL: String,
                                             partnerId: Int64 )  -> KalturaRequestBuilder? {
 
@@ -38,14 +26,4 @@ class OVPSessionService {
         }
 
     }
-
-
-
-
-//    .service("session")
-//    .action("startWidgetSession")
-//    .method("POST")
-//    .url(baseUrl)
-//    .tag("session-startWidget")
-//    .params(params);
 }

Classes/Managers/LocalAssetsManager.swift

@@ -109,7 +109,7 @@ import AVFoundation
                 return source
             }
         } else {
-            if let source = sources.first(where: {$0.fileExt=="m3u8" && $0.drmData==nil}) {
+            if let source = sources.first(where: {$0.fileExt=="m3u8" && ($0.drmData == nil || $0.drmData!.isEmpty)}) {
                 return source
             }
         }