fix(Instagram): debug build

Udhayarajan · Jun 30, 2023 · c475e3c · c475e3c
1 parent ec54f16
commit c475e3c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -27,7 +27,7 @@ plugins {
 }
 
 group = "io.github.udhayarajan"
-version = "5.5.7"
+version = "5.5.8"
 //Version Naming incremented if "<NEW_FEATURE_ADDED>.<WORKED_ON_BUG>.<BETA_VERSION_COUNT>"
 //Priority on incrementing Feature > BugFix > Beta
 

diff --git a/src/commonMain/kotlin/com/mugames/vidsnapkit/JsonExt.kt b/src/commonMain/kotlin/com/mugames/vidsnapkit/JsonExt.kt
@@ -39,7 +39,7 @@ fun JSONObject.getNullableJSONObject(name: String): JSONObject? = try {
 fun JSONArray.getNullableJSONObject(index: Int): JSONObject? = try {
     getJSONObject(index)
 } catch (e: JSONException) {
-    logger.warn("${toString()} \nis only available")
+    logger.warn("keyIdx=$index ${toString()} \nis only available")
     null
 }
 
@@ -53,21 +53,21 @@ fun JSONArray.getNullableJSONArray(index: Int): JSONArray? = try {
 fun JSONObject.getNullableJSONArray(name: String): JSONArray? = try {
     getJSONArray(name)
 } catch (e: JSONException) {
-    logger.warn("${toString()} \nis only available")
+    logger.warn("key =${name} ${toString()} \nis only available")
     null
 }
 
 fun JSONObject.getNullableString(name: String): String? = try {
     getString(name)
 } catch (e: JSONException) {
-    logger.warn("${toString()} \nis only available")
+    logger.warn("key =${name} ${toString()} \nis only available")
     null
 }
 
 fun JSONObject.getNullable(name: String): String? = try {
     get(name).toString()
 } catch (e: JSONException) {
-    logger.warn("${toString()} \nis only available")
+    logger.warn("key =${name}  ${toString()} \nis only available")
     null
 }
 

diff --git a/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Extractor.kt b/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Extractor.kt
@@ -121,7 +121,7 @@ abstract class Extractor(
 
     private suspend fun safeAnalyze() {
         try {
-            if (inputUrl.contains("facebook") || inputUrl.contains("fb")) {
+            if (inputUrl.contains("facebook")) {
                 if (inputUrl.contains("instagram.com")) {
                     logger.info("Insta embedded FB post, redirecting to Instagram")
                     val instaURL = Pattern.compile("\\?.*?u=(.*?)&").matcher(inputUrl).run {

diff --git a/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Instagram.kt b/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Instagram.kt
@@ -58,7 +58,7 @@ class Instagram internal constructor(url: String) : Extractor(url) {
         if (res.status == HttpStatusCode.Found) {
             val newLoc = res.headers["location"].toString()
             logger.info("new loc = $newLoc")
-            val restrictedKeywords = listOf("privacy/checks", "challenge", "coig_restricted")
+            val restrictedKeywords = listOf("privacy/checks", "challenge", "coig_restricted", "accounts/login")
             val containsRestrictedKeyword = restrictedKeywords.any { keyword ->
                 newLoc.contains(keyword, ignoreCase = true)
             }
@@ -164,7 +164,7 @@ class Instagram internal constructor(url: String) : Extractor(url) {
             if (!isCookieValid()) {
                 cookies = null
             }
-            if (load?.get("forced") == true) {
+            if (load?.get("forced") == true && cookies != null) {
                 logger.info("direct ex as forced")
                 directExtraction()
                 return
@@ -250,8 +250,8 @@ class Instagram internal constructor(url: String) : Extractor(url) {
                         .getJSONArray("items")
                 )
             } catch (e: JSONException) {
-                logger.info("direct ex as JSONException arises")
-                directExtraction()
+                onProgress(Result.Failed(Error.LoginRequired))
+                return
             }
         }