feat(player): improve api.video url parsing

apivideo · Jun 16, 2023 · 1aae897 · 1aae897
1 parent ceb550e
commit 1aae897
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 53 deletions.
diff --git a/player/src/main/java/video/api/player/extensions/StringExtensions.kt b/player/src/main/java/video/api/player/extensions/StringExtensions.kt
@@ -20,7 +20,4 @@ fun String.toVideoType() = VideoType.fromString(this)
  *
  * @return corresponding [VideoOptions] or an exception
  */
-fun String.parseAsVideoOptions(
-    vodDomainURL: String = VideoType.VOD.baseUrl,
-    liveDomainURL: String = VideoType.LIVE.baseUrl
-) = Utils.parseMediaUrl(this, vodDomainURL, liveDomainURL)
+fun String.parseAsVideoOptions() = Utils.parseMediaUrl(this)
diff --git a/player/src/main/java/video/api/player/extensions/URLExtensions.kt b/player/src/main/java/video/api/player/extensions/URLExtensions.kt
@@ -1,7 +1,6 @@
 package video.api.player.extensions
 
 import video.api.player.models.VideoOptions
-import video.api.player.models.VideoType
 import video.api.player.utils.Utils
 import java.net.URL
 
@@ -10,7 +9,4 @@ import java.net.URL
  *
  * @return corresponding [VideoOptions] or an exception
  */
-fun URL.parseAsVideoOptions(
-    vodDomainURL: URL = URL(VideoType.VOD.baseUrl),
-    liveDomainURL: URL = URL(VideoType.LIVE.baseUrl)
-) = Utils.parseMediaUrl(this, vodDomainURL, liveDomainURL)
+fun URL.parseAsVideoOptions() = Utils.parseMediaUrl(this)
diff --git a/player/src/main/java/video/api/player/models/VideoOptions.kt b/player/src/main/java/video/api/player/models/VideoOptions.kt
@@ -43,20 +43,16 @@ data class VideoOptions(
          * @param url the URL of the video to play
          */
         fun fromUrl(
-            url: String,
-            vodDomainURL: String = VideoType.VOD.baseUrl,
-            liveDomainURL: String = VideoType.LIVE.baseUrl
-        ) = url.parseAsVideoOptions(vodDomainURL, liveDomainURL)
+            url: String
+        ) = url.parseAsVideoOptions()
 
         /**
          * Creates a [VideoOptions] from an api.video URL.
          *
          * @param url the URL of the video to play
          */
         fun fromUrl(
-            url: URL,
-            vodDomainURL: URL = URL(VideoType.VOD.baseUrl),
-            liveDomainURL: URL = URL(VideoType.LIVE.baseUrl)
-        ) = url.parseAsVideoOptions(vodDomainURL, liveDomainURL)
+            url: URL
+        ) = url.parseAsVideoOptions()
     }
 }
diff --git a/player/src/main/java/video/api/player/utils/Utils.kt b/player/src/main/java/video/api/player/utils/Utils.kt
@@ -1,5 +1,6 @@
 package video.api.player.utils
 
+import video.api.player.extensions.toVideoType
 import video.api.player.models.VideoOptions
 import video.api.player.models.VideoType
 import java.io.IOException
@@ -11,37 +12,31 @@ object Utils {
     private const val LIVE_TOKEN_DELIMITER = "private"
 
     fun parseMediaUrl(
-        mediaUrl: String,
-        vodDomainURL: String = VideoType.VOD.baseUrl,
-        liveDomainURL: String = VideoType.LIVE.baseUrl
-    ) = parseMediaUrl(URL(mediaUrl), URL(vodDomainURL), URL(liveDomainURL))
+        mediaUrl: String
+    ) = parseMediaUrl(URL(mediaUrl))
 
     fun parseMediaUrl(
-        mediaUrl: URL,
-        vodDomainURL: URL = URL(VideoType.VOD.baseUrl),
-        liveDomainURL: URL = URL(VideoType.LIVE.baseUrl)
+        mediaUrl: URL
     ): VideoOptions {
-        val regex =
-            "https:/.*[/].*/(?<id>(vi|li)[^/^.]*)[/.].*"
+        val regex = "https://[^/]+/(?>(?<type>vod|live)/)?(?>.*/)?(?<id>(vi|li)[^/^.]*).*"
         val pattern = Pattern.compile(regex)
         val matcher = pattern.matcher(mediaUrl.toString())
 
-        if (matcher.groupCount() < 2) {
+        if (matcher.groupCount() < 3) {
             throw IOException("The media url doesn't look like an api.video URL.")
         }
 
         try {
             matcher.find()
             // Group naming is not supported before Android API 26
-            val videoType =
-                if (mediaUrl.toString().startsWith(vodDomainURL.toString())) {
-                    VideoType.VOD
-                } else if (mediaUrl.toString().startsWith(liveDomainURL.toString())) {
-                    VideoType.LIVE
-                } else {
-                    throw IOException("The media url must start with $vodDomainURL or $liveDomainURL")
-                }
-            val videoId = matcher.group(1) ?: throw IOException("Failed to get videoId")
+            val videoId = matcher.group(2) ?: throw IOException("Failed to get videoId")
+
+            // For live, we might not have a type for now because there isn't any `/live/` in the URL.
+            val firstGroup = matcher.group(1)
+            val videoType = firstGroup?.toVideoType()
+                ?: if (videoId.startsWith("li")) VideoType.LIVE else throw IOException(
+                    "Failed to get videoType"
+                )
 
             val tokenDelimiter =
                 if (videoType == VideoType.VOD) VOD_TOKEN_DELIMITER else LIVE_TOKEN_DELIMITER

diff --git a/player/src/test/java/video/api/player/models/VideoOptionsTest.kt b/player/src/test/java/video/api/player/models/VideoOptionsTest.kt
@@ -1,9 +1,19 @@
 package video.api.player.models
 
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
 import org.junit.Test
 
 class VideoOptionsTest {
+    @Test
+    fun `test embed vod url`() {
+        val videoOptions = VideoOptions("vi5oNqxkifcXkT4auGNsvgZB", VideoType.VOD)
+        assertEquals(
+            "https://vod.api.video/vod/vi5oNqxkifcXkT4auGNsvgZB/hls/manifest.m3u8",
+            videoOptions.hlsManifestUrl
+        )
+    }
+
     @Test
     fun `test vod url`() {
         val videoOptions = VideoOptions("vi5oNqxkifcXkT4auGNsvgZB", VideoType.VOD)
@@ -58,13 +68,22 @@ class VideoOptionsTest {
         )
     }
 
+    @Test
+    fun `test parse embed vod url`() {
+        val videoOptions =
+            VideoOptions.fromUrl("https://embed.api.video/vod/vi5oNqxkifcXkT4auGNsvgZB")
+        assertEquals(videoOptions.videoId, "vi5oNqxkifcXkT4auGNsvgZB")
+        assertEquals(videoOptions.videoType, VideoType.VOD)
+        assertNull(videoOptions.token)
+    }
+
     @Test
     fun `test parse vod url`() {
         val videoOptions =
             VideoOptions.fromUrl("https://vod.api.video/vod/vi5oNqxkifcXkT4auGNsvgZB/hls/manifest.m3u8")
         assertEquals(videoOptions.videoId, "vi5oNqxkifcXkT4auGNsvgZB")
         assertEquals(videoOptions.videoType, VideoType.VOD)
-        assertEquals(videoOptions.token, null)
+        assertNull(videoOptions.token)
     }
 
     @Test
@@ -82,7 +101,7 @@ class VideoOptionsTest {
             VideoOptions.fromUrl("https://vod.api.video/vod/vi5oNqxkifcXkT4auGNsvgZB/mp4/source.mp4")
         assertEquals(videoOptions.videoId, "vi5oNqxkifcXkT4auGNsvgZB")
         assertEquals(videoOptions.videoType, VideoType.VOD)
-        assertEquals(videoOptions.token, null)
+        assertNull(videoOptions.token)
     }
 
     @Test
@@ -94,13 +113,22 @@ class VideoOptionsTest {
         assertEquals(videoOptions.token, "PRIVATE_TOKEN")
     }
 
+    @Test
+    fun `test parse embed live url`() {
+        val videoOptions =
+            VideoOptions.fromUrl("https://embed.api.video/live/li77ACbZjzEJgmr8d0tm4xFt")
+        assertEquals(videoOptions.videoId, "li77ACbZjzEJgmr8d0tm4xFt")
+        assertEquals(videoOptions.videoType, VideoType.LIVE)
+        assertNull(videoOptions.token)
+    }
+
     @Test
     fun `test parse live url`() {
         val videoOptions =
             VideoOptions.fromUrl("https://live.api.video/li77ACbZjzEJgmr8d0tm4xFt.m3u8")
         assertEquals(videoOptions.videoId, "li77ACbZjzEJgmr8d0tm4xFt")
         assertEquals(videoOptions.videoType, VideoType.LIVE)
-        assertEquals(videoOptions.token, null)
+        assertNull(videoOptions.token)
     }
 
     @Test
@@ -116,22 +144,18 @@ class VideoOptionsTest {
     fun `test parse vod url with custom domain`() {
         val videoOptions =
             VideoOptions.fromUrl(
-                "https://mycustom.vod.domain/vod/vi5oNqxkifcXkT4auGNsvgZB/hls/manifest.m3u8",
-                "https://mycustom.vod.domain",
-                "https://mycustom.live.domain"
+                "https://mycustom.vod.domain/vod/vi5oNqxkifcXkT4auGNsvgZB/hls/manifest.m3u8"
             )
         assertEquals(videoOptions.videoId, "vi5oNqxkifcXkT4auGNsvgZB")
         assertEquals(videoOptions.videoType, VideoType.VOD)
-        assertEquals(videoOptions.token, null)
+        assertNull(videoOptions.token)
     }
 
     @Test
     fun `test parse private vod url with custom domain`() {
         val videoOptions =
             VideoOptions.fromUrl(
-                "https://mycustom.vod.domain/vod/vi5oNqxkifcXkT4auGNsvgZB/token/PRIVATE_TOKEN/hls/manifest.m3u8",
-                "https://mycustom.vod.domain",
-                "https://mycustom.live.domain"
+                "https://mycustom.vod.domain/vod/vi5oNqxkifcXkT4auGNsvgZB/token/PRIVATE_TOKEN/hls/manifest.m3u8"
             )
         assertEquals(videoOptions.videoId, "vi5oNqxkifcXkT4auGNsvgZB")
         assertEquals(videoOptions.videoType, VideoType.VOD)
@@ -141,22 +165,18 @@ class VideoOptionsTest {
     @Test
     fun `test parse live url with custom domain`() {
         val videoOptions = VideoOptions.fromUrl(
-            "https://mycustom.live.domain/li77ACbZjzEJgmr8d0tm4xFt.m3u8",
-            "https://mycustom.vod.domain",
-            "https://mycustom.live.domain"
+            "https://mycustom.live.domain/li77ACbZjzEJgmr8d0tm4xFt.m3u8"
         )
         assertEquals(videoOptions.videoId, "li77ACbZjzEJgmr8d0tm4xFt")
         assertEquals(videoOptions.videoType, VideoType.LIVE)
-        assertEquals(videoOptions.token, null)
+        assertNull(videoOptions.token)
     }
 
     @Test
     fun `test parse private live url with custom domain`() {
         val videoOptions =
             VideoOptions.fromUrl(
-                "https://mycustom.live.domain/private/PRIVATE_TOKEN/li77ACbZjzEJgmr8d0tm4xFt.m3u8",
-                "https://mycustom.vod.domain",
-                "https://mycustom.live.domain"
+                "https://mycustom.live.domain/private/PRIVATE_TOKEN/li77ACbZjzEJgmr8d0tm4xFt.m3u8"
             )
         assertEquals(videoOptions.videoId, "li77ACbZjzEJgmr8d0tm4xFt")
         assertEquals(videoOptions.videoType, VideoType.LIVE)