@takeoffmedia/react-native-penthera 0.2.40 → 0.2.42

package/android/src/main/java/com/takeoffmediareactnativepenthera/AssetQueueObserver.kt

@@ -6,12 +6,15 @@ import com.penthera.virtuososdk.client.IAsset
 import com.penthera.virtuososdk.client.IAssetManager
 import com.penthera.virtuososdk.client.IIdentifier
 import com.penthera.virtuososdk.client.Observers
+import com.penthera.virtuososdk.client.Virtuoso
 import com.takeoffmediareactnativepenthera.virtuoso.OfflineVideoEngine
 
-class AssetQueueObserver(mOfflineVideo : OfflineVideoEngine) : Observers.IQueueObserver {
+class AssetQueueObserver(mOfflineVideo : OfflineVideoEngine, virtuoso: Virtuoso) : Observers.IQueueObserver {
 
   private var lastProgress : Int = -1
   private var  mOfflineVideo : OfflineVideoEngine = mOfflineVideo
+  private var istanceVirtuoso: Virtuoso = virtuoso
+
 
   override fun engineStartedDownloadingAsset(aAsset: IIdentifier) {
     val updateAsset = aAsset as IAsset
@@ -87,61 +90,36 @@ class AssetQueueObserver(mOfflineVideo : OfflineVideoEngine) : Observers.IQueueO
 
         var progress = (asset.fractionComplete * 100.0).toInt()
         EventEmitter.sharedInstance.dispatch("penthera", PentheraEvent.PROGRESS_UPDATED, it.assetId, progress.toString())
-        // Not a repeated progress -- Keep context switches minimal due to frequency of messages, unless forced
         if (forceUpdate || progress != lastProgress) {
           val assetStatus : String
           val value: String
           val status = asset.downloadStatus
+          val allowableStorageRemaining = istanceVirtuoso.allowableStorageRemaining
           when (status) {
-
             Common.AssetStatus.DOWNLOADING -> {
               assetStatus = "Downloading"
               value = "downloading"
             }
-
-            Common.AssetStatus.DOWNLOAD_COMPLETE -> {
-              assetStatus = "Downloading"
-              value = "complete"
-            }
-
-            Common.AssetStatus.EXPIRED -> {
-              assetStatus = "Expired"
-              value = "expired"
-            }
-
             Common.AssetStatus.DOWNLOAD_DENIED_ASSET -> {
               assetStatus = "Queued"
               value = "The asset has already been downloaded as many times as permitted.  To download this asset again, administrative action is required."
             }
-
-            Common.AssetStatus.DOWNLOAD_DENIED_ACCOUNT -> {
-              assetStatus = "Queued"
-              value = "DENIED : MDA"
-            }
-
-            Common.AssetStatus.DOWNLOAD_DENIED_EXTERNAL_POLICY -> {
-              assetStatus = "Queued"
-              value = "DENIED : EXT"
-            }
-
             Common.AssetStatus.DOWNLOAD_DENIED_MAX_DEVICE_DOWNLOADS -> {
               assetStatus = "Queued"
-              value = "DENIED :MPD Test maximo copias"
-            }
-
-            Common.AssetStatus.DOWNLOAD_BLOCKED_AWAITING_PERMISSION -> {
-              assetStatus = "Queued"
-              value = "AWAITING PERMISSION"
+              value = "There are already as many downloads as permitted on this account.  To continue downloading, the user must delete downloaded assets from one of their devices."
             }
-
             Common.AssetStatus.DOWNLOAD_DENIED_COPIES -> {
               assetStatus = "Queued"
               value = "There are already as many downloaded copies of this asset as permitted on this account.  To continue downloading, the user must delete a copy of this asset from one of their devices."
             }
-
             else -> {
-              assetStatus = "Queued"
-              value = "pending"
+              if(allowableStorageRemaining == 0L) {
+                assetStatus = "Queued"
+                value = "Insufficient storage for download"
+              } else {
+                assetStatus = "Queued"
+                value = "pending"
+              }
             }
           }
           if(assetStatus !== "Downloading"){

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

@@ -46,7 +46,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
 
   private fun getVirtuoso(activity: Activity): Virtuoso {
     virtuoso = Virtuoso(context)
-    queueObserver = AssetQueueObserver(this)
+    queueObserver = AssetQueueObserver(this, virtuoso)
     onResume()
     return virtuoso
   }
@@ -126,6 +126,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
     val columnNames = cursor?.columnNames
 
       while (cursor?.moveToNext() == true && columnNames != null) {
+        val assetManager = virtuoso.assetManager
         val dataMap = mutableMapOf<String, Any>()
         for (columnName in columnNames) {
           val columnIndex = cursor.getColumnIndex(columnName)
@@ -144,10 +145,14 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
               dataMap["id"] = value
             }
             if (columnName == "durationSeconds") {
-              dataMap["duration"] = value
+              dataMap["data"] = (dataMap["data"] as? MutableMap<String, Any> ?: mutableMapOf()).apply {
+                put("duration", value)
+              }
             }
             if (columnName == "expectedSize") {
-              dataMap["estimatedSize"] = value
+              dataMap["data"] = (dataMap["data"] as? MutableMap<String, Any> ?: mutableMapOf()).apply {
+                put("estimatedSize", value)
+              }
             }
           }
         }

package/package.json

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