From 37fe18ef1675728822286165e51f4b64f81f05d8 Mon Sep 17 00:00:00 2001
From: shabinder <dev.shabinder@gmail.com>
Date: Sun, 11 Jul 2021 10:04:48 +0530
Subject: [PATCH] Saavn Link Extraction Fix

---
 .../kotlin/com/shabinder/common/uikit/DesktopImages.kt   | 2 +-
 .../com/shabinder/common/di/providers/SaavnProvider.kt   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/DesktopImages.kt b/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/DesktopImages.kt
index b0403d07..ee2f49e3 100644
--- a/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/DesktopImages.kt
+++ b/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/DesktopImages.kt
@@ -88,7 +88,7 @@ actual fun GithubLogo() = rememberVectorPainter(vectorXmlResource("drawable/ic_g
 actual fun PaypalLogo() = rememberVectorPainter(vectorXmlResource("drawable/ic_paypal_logo.xml")) as Painter
 
 @Composable
-actual fun OpenCollectiveLogo() = rememberVectorPainter(vectorXmlResource("drawable/ic_opencollective_icon")) as Painter
+actual fun OpenCollectiveLogo() = rememberVectorPainter(vectorXmlResource("drawable/ic_opencollective_icon.xml")) as Painter
 
 @Composable
 actual fun RazorPay() = rememberVectorPainter(vectorXmlResource("drawable/ic_indian_rupee.xml")) as Painter
diff --git a/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/providers/SaavnProvider.kt b/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/providers/SaavnProvider.kt
index 7188ada4..491d1c0b 100644
--- a/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/providers/SaavnProvider.kt
+++ b/common/dependency-injection/src/commonMain/kotlin/com/shabinder/common/di/providers/SaavnProvider.kt
@@ -31,8 +31,9 @@ class SaavnProvider(
             trackList = listOf(),
             Source.JioSaavn
         ).apply {
-            when (fullLink.substringAfter("saavn.com/").substringBefore("/")) {
-                "song" -> {
+            val pageLink = fullLink.substringAfter("saavn.com/").substringBefore("?")
+            when {
+                pageLink.contains("/song/",true) -> {
                     getSong(fullLink).value.let {
                         folderType = "Tracks"
                         subFolder = ""
@@ -41,7 +42,7 @@ class SaavnProvider(
                         coverUrl = it.image.replace("http:", "https:")
                     }
                 }
-                "album" -> {
+                pageLink.contains("/album/",true) -> {
                     getAlbum(fullLink).value.let {
                         folderType = "Albums"
                         subFolder = removeIllegalChars(it.title)
@@ -50,7 +51,7 @@ class SaavnProvider(
                         coverUrl = it.image.replace("http:", "https:")
                     }
                 }
-                "featured" -> { // Playlist
+                pageLink.contains("/featured/",true) -> { // Playlist
                     getPlaylist(fullLink).value.let {
                         folderType = "Playlists"
                         subFolder = removeIllegalChars(it.listname)