@takeoffmedia/react-native-penthera 0.8.0 → 0.8.1

package/android/src/main/java/com/takeoffmediareactnativepenthera/virtuoso/OfflineVideoEngine.kt

@@ -175,6 +175,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
       val dataMap = mutableMapOf<String, Any>()
       var eap = ""
       var ead = ""
+      var creationTime = ""
       for (columnName in columnNames) {
         val columnIndex = cursor.getColumnIndex(columnName)
         if (columnIndex >= 0) {
@@ -214,6 +215,9 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
           if (columnName == "eap") {
             eap = value
           }
+          if (columnName == "creationTime") {
+            creationTime = value
+          }
           if (columnName == "activePercentOfDownloads") {
             val percentage = value.toDouble() * 100
             val isComplete = percentage == 100.0
@@ -221,6 +225,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
           }
           if (columnName == "firstPlayTime") {
             (dataMap["data"] as? MutableMap<String, Any> ?: mutableMapOf()).apply {
+              put("creationTime", if (value == "0") creationTime else value)
               put("effectiveExpiryDate", if (value == "0") ead else eap);
               put("isReproduced", value != "0");
             }.also { dataMap["data"] = it }
@@ -268,7 +273,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
                   "Asset is null"
               )
               return
-            } 
+            }
             val body: String
             val status = asset.downloadStatus
             body = when (status) {

package/ios/Penthera.swift

@@ -20,13 +20,6 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
     var assetError: String = ""
     var vcHttpServer: VirtuosoClientHTTPServer? = nil
 
-    func getAssetId(asset: VirtuosoAsset) -> String {
-      if let mediaId = asset.userInfo?["mediaId"] as? String {
-        return mediaId
-      } else {
-          return asset.assetID
-      }
-    }
 
     func updateStatusInfo() {
         DispatchQueue.global().async {
@@ -146,16 +139,7 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
         }
     }
 
-    func timeIntervalToString(_ timeInterval: TimeInterval?) -> String {
-        let formatter = DateComponentsFormatter()
-        formatter.allowedUnits = [.hour, .minute, .second]
-        formatter.unitsStyle = .positional
-        formatter.zeroFormattingBehavior = .pad
-        guard let interval = timeInterval else {
-               return "00:00:00"
-           }
-        return formatter.string(from: interval) ?? "00:00:00"
-    }
+
 
     func dateToString (_ date: Date?) -> String? {
        let dateFormatter = DateFormatter()
@@ -414,69 +398,9 @@ class Penthera: RCTEventEmitter, VirtuosoDownloadEngineNotificationsDelegate {
 
         var offlineCatalogs: [OfflineCatalog] = []
 
-        // Process completed and pending assets using a shared function
-        func processAsset(_ va: VirtuosoAsset) {
-            let thumbnail = va.findAllAncillaries(withTag: "thumbnail").first
-            let show = va.findAllAncillaries(withTag: "show").first
-            let thumbnails = Thumbnails(
-                thumbnail: thumbnail?.fileDownloadURL ?? "",
-                show: show?.fileDownloadURL ?? ""
-            )
-
-            let expiryDate = va.expiryDate
-            let effectiveExpiryDate = va.effectiveExpiryDate
-            let isReproduced = va.firstPlayDateTime
-            let creationDate = va.creationDateTime.toSeconds()
-
-            var dataItem = DataItem(
-                title: va.userInfo?["title"] as? String,
-                seasonId: va.userInfo?["seasonId"] as? String,
-                seasonTitle: va.userInfo?["seasonTitle"] as? String,
-                duration: va.duration,
-                estimatedSize: Int(va.estimatedSize),
-                dataOffers: parseDataOffersInObject(anyElement: va.userInfo?["dataOffers"] as Any),
-                expiryAfterPlay: timeIntervalToString(va.expiryAfterPlay),
-                expiryAfterDownload: timeIntervalToString(va.expiryAfterDownload),
-                isExpired: va.isExpired,
-                inForcedExpire: va.inForcedExpire,
-                isReproduced: isReproduced != nil,
-                mediaId: va.userInfo?["mediaId"] as? String,
-                vpid: va.userInfo?["vpid"] as? String
-            )
-
-            if let effectiveExpiryDate = effectiveExpiryDate {
-                dataItem.effectiveExpiryDate = isReproduced != nil ? va.expiryAfterPlay : va.expiryAfterDownload
-            }
-
-            if let expiryDate = expiryDate {
-                dataItem.expiryDate = va.expiryDate
-            }
-
-            if va.isExpired {
-                va.delete()
-            } else {
-                let catalog = OfflineCatalog(
-                    id: getAssetId(asset: va), // Change vpid to assetId
-                    title: va.description,
-                    data: dataItem,
-                    thumbnails: thumbnails,
-                    isCompleted: va.downloadCompleteDateTime != nil ? true : false,
-                    isPaused: va.isPaused,
-                    percentage: Float(va.fractionComplete),
-                    creationTime: creationDate
-                )
-                offlineCatalogs.append(catalog)
-            }
-        }
-
-        // Process completed assets
-        for case let va as VirtuosoAsset in completedAssets {
-            processAsset(va)
-        }
-
-        // Process pending assets
-        for case let va as VirtuosoAsset in pendingAssets {
-            processAsset(va)
+        let allAssets = completedAssets + pendingAssets
+        for case let va as VirtuosoAsset in allAssets {
+            offlineCatalogs.append(processAsset(va))
         }
 
         let encoder = JSONEncoder()

package/ios/Util.swift

@@ -1,5 +1,5 @@
 import Foundation
-
+import VirtuosoClientDownloadEngine
 
 extension String {
     func getDictionary() -> [String:AnyObject]? {
@@ -147,3 +147,79 @@ func extractInteger(from string: String) -> Int {
     return 0
 }
 
+// Process completed and pending assets using a shared function
+func processAsset(_ va: VirtuosoAsset) -> OfflineCatalog {
+    var catalog = OfflineCatalog(id: "", isCompleted: false, isPaused: false, creationTime: "")
+    let thumbnail = va.findAllAncillaries(withTag: "thumbnail").first
+    let show = va.findAllAncillaries(withTag: "show").first
+    let thumbnails = Thumbnails(
+        thumbnail: thumbnail?.fileDownloadURL ?? "",
+        show: show?.fileDownloadURL ?? ""
+    )
+
+    let expiryDate = va.expiryDate
+    let effectiveExpiryDate = va.effectiveExpiryDate
+    let isReproduced = va.firstPlayDateTime
+    let creationDate = va.creationDateTime.toSeconds()
+    let firstPlayDate = va.firstPlayDateTime?.toSeconds()
+
+    var dataItem = DataItem(
+        title: va.userInfo?["title"] as? String,
+        seasonId: va.userInfo?["seasonId"] as? String,
+        seasonTitle: va.userInfo?["seasonTitle"] as? String,
+        duration: va.duration,
+        estimatedSize: Int(va.estimatedSize),
+        dataOffers: parseDataOffersInObject(anyElement: va.userInfo?["dataOffers"] as Any),
+        expiryAfterPlay: timeIntervalToString(va.expiryAfterPlay),
+        expiryAfterDownload: timeIntervalToString(va.expiryAfterDownload),
+        isExpired: va.isExpired,
+        inForcedExpire: va.inForcedExpire,
+        isReproduced: isReproduced != nil,
+        mediaId: va.userInfo?["mediaId"] as? String,
+        vpid: va.userInfo?["vpid"] as? String
+    )
+
+    if effectiveExpiryDate != nil {
+        dataItem.effectiveExpiryDate = isReproduced != nil ? va.expiryAfterPlay : va.expiryAfterDownload
+    }
+
+    if expiryDate != nil {
+        dataItem.expiryDate = va.expiryDate
+    }
+
+    if va.isExpired {
+        va.delete()
+    } else {
+         catalog = OfflineCatalog(
+            id: getAssetId(asset: va), // Change vpid to assetId
+            title: va.description,
+            data: dataItem,
+            thumbnails: thumbnails,
+            isCompleted: va.downloadCompleteDateTime != nil ? true : false,
+            isPaused: va.isPaused,
+            percentage: Float(va.fractionComplete),
+            creationTime: isReproduced != nil ? firstPlayDate : creationDate
+        )
+    }
+    return catalog
+}
+
+func timeIntervalToString(_ timeInterval: TimeInterval?) -> String {
+    let formatter = DateComponentsFormatter()
+    formatter.allowedUnits = [.hour, .minute, .second]
+    formatter.unitsStyle = .positional
+    formatter.zeroFormattingBehavior = .pad
+    guard let interval = timeInterval else {
+           return "00:00:00"
+       }
+    return formatter.string(from: interval) ?? "00:00:00"
+}
+
+func getAssetId(asset: VirtuosoAsset) -> String {
+  if let mediaId = asset.userInfo?["mediaId"] as? String {
+    return mediaId
+  } else {
+      return asset.assetID
+  }
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeoffmedia/react-native-penthera",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "test",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -165,4 +165,4 @@
   "dependencies": {
     "zustand": "^4.4.0"
   }
-}
+}