Skip to content

Commit

Permalink
Merge pull request #50 from Udhayarajan/insta-crash
Browse files Browse the repository at this point in the history 
Insta crash
  • Loading branch information
@Udhayarajan
Udhayarajan authored Aug 12, 2023
2 parents 93ffe12 + 44a4eb8 commit bef4d79
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 62 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ plugins {
}

group = "io.github.udhayarajan"
version = "5.7.1"
version = "5.7.2"
// Version Naming incremented if "<NEW_FEATURE_ADDED>.<WORKED_ON_BUG>.<BETA_VERSION_COUNT_OR_PRE_RELEASE>"
// Priority on incrementing Feature > BugFix > Beta

Expand Down
110 changes: 49 additions & 61 deletions src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Instagram.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,7 @@ class Instagram internal constructor(url: String) : Extractor(url) {
listOf("instapp:owner_user_id\" content=\"(\\d*?)\"".toRegex(), "owner_id\":\"(\\d*?)\"".toRegex())
for (r in regexes) {
val res = r.find(page)?.groups?.get(1)?.value
if (res != null)
return res
if (res != null) return res
}
return null
}
Expand Down Expand Up @@ -237,8 +236,7 @@ class Instagram internal constructor(url: String) : Extractor(url) {

inputUrl = inputUrl.replace("/reels/", "/reel/")
if (!inputUrl.endsWith("/")) inputUrl = "$inputUrl/"
if (!isHighlightsPost())
inputUrl = "${inputUrl.replace("/[^/?]*\$|/*\\?.*\$".toRegex(), "")}/?img_index=1"
if (!isHighlightsPost()) inputUrl = "${inputUrl.replace("/[^/?]*\$|/*\\?.*\$".toRegex(), "")}/?img_index=1"

if (isPostUrl()) {
if (!isCookieValid()) {
Expand All @@ -260,7 +258,7 @@ class Instagram internal constructor(url: String) : Extractor(url) {
directExtraction()
}

else -> extractInfoShared(res)
else -> tryWithQueryHash(res)
}
} else if (isHighlightsPost()) {
headers["User-Agent"] =
Expand Down Expand Up @@ -375,10 +373,11 @@ class Instagram internal constructor(url: String) : Extractor(url) {
return
}
val mediaId = getMediaId(page)
val response = httpRequestService.getRawResponse(MEDIA_CONTENT_LOGGED_OUT.format(mediaId, ownerId), headers) ?: run {
clientRequestError()
return
}
val response =
httpRequestService.getRawResponse(MEDIA_CONTENT_LOGGED_OUT.format(mediaId, ownerId), headers) ?: run {
clientRequestError()
return
}
val guestCookies = response.headers.getAll("set-cookie") ?: run {
logger.info("no cookies")
clientRequestError()
Expand Down Expand Up @@ -606,8 +605,7 @@ class Instagram internal constructor(url: String) : Extractor(url) {

private fun getQueryHash(js: String): String? {
val matcher = Pattern.compile("\\(.*?var \\w=\"([a-z0-9]{32})\";.*?\\)").matcher(js)
if (matcher.find() && matcher.group(0).contains("PolarisAPIQuery"))
return matcher.group(1)
if (matcher.find() && matcher.group(0).contains("PolarisAPIQuery")) return matcher.group(1)
return null
}

Expand Down Expand Up @@ -643,58 +641,48 @@ class Instagram internal constructor(url: String) : Extractor(url) {
?.getNullableJSONObject(0)?.getJSONObject("node")?.getString("text")
if (videoName == null || videoName == "null" || videoName.isEmpty()) videoName = "instagram_video"
formats.title = Util.filterName(videoName)
val fileURL: String? = media.getNullableString("video_url")
fileURL?.let { url ->
formats.videoData.add(
VideoResource(
url, MimeType.VIDEO_MP4
)
)
formats.imageData.add(
ImageResource(
resolution = Util.getResolutionFromUrl(
media.getString(
"thumbnail_src"
)
),
url = media.getString("thumbnail_src")
)
)
videoFormats.add(formats)
} ?: run {
val edges: JSONArray? =
media.getNullableJSONObject("edge_sidecar_to_children")?.getNullableJSONArray("edges")

edges?.let { edgesObj ->
for (i in 0 until edgesObj.length()) {
val format = formats.copy(videoData = mutableListOf())
val node = edgesObj.getJSONObject(i).getJSONObject("node")
if (node.getBoolean("is_video")) {
format.imageData.add(
ImageResource(
resolution = Util.getResolutionFromUrl(node.getString("display_url")),
url = node.getString("display_url")
)
)
format.videoData.add(
VideoResource(
node.getString("video_url"), MimeType.VIDEO_MP4
)
)
}
videoFormats.add(format)

fun getImageResourceFromDisplayResource(displayResources: JSONArray): MutableList<ImageResource> {
val imageList = mutableListOf<ImageResource>()
for (j in 0 until displayResources.length()) {
val resource = displayResources.getJSONObject(j)
val url = resource.getString("src")
val res = "${resource.get("config_width")}x${resource.get("config_height")}"
imageList.add(ImageResource(url, res))
}
return imageList
}

val edges: JSONArray? = media.getNullableJSONObject("edge_sidecar_to_children")?.getNullableJSONArray("edges")
edges?.let { edgesObj ->
for (i in 0 until edgesObj.length()) {
val format = formats.copy(videoData = mutableListOf(), imageData = mutableListOf())
val node = edgesObj.getJSONObject(i).getJSONObject("node")
if (node.getBoolean("is_video")) {
val imgUrl = node.getString("display_url")
val imgRes = Util.getResolutionFromUrl(imgUrl)
format.imageData.add(ImageResource(resolution = imgRes, url = imgUrl))
format.videoData.add(VideoResource(node.getString("video_url"), MimeType.VIDEO_MP4))
} else {
val displayResource = node.getJSONArray("display_resources")
format.imageData.addAll(getImageResourceFromDisplayResource(displayResource))
}
videoFormats.add(format)
}
} ?: run {
// Non carousel content
val videoURL: String? = media.getNullableString("video_url")
videoURL?.let { url ->
formats.videoData.add(VideoResource(url, MimeType.VIDEO_MP4))
val imageUrl = media.getString("thumbnail_src")
formats.imageData.add(ImageResource(resolution = Util.getResolutionFromUrl(imageUrl), url = imageUrl))
} ?: run {
onProgress(
Result.Failed(
Error.InternalError(
"Media not found", Exception("$media")
)
)
)
// non video content
val displayResource = media.getJSONArray("display_resources")
formats.imageData.addAll(getImageResourceFromDisplayResource(displayResource))
}
videoFormats.add(formats)
}

finalize()
}

Expand All @@ -718,6 +706,7 @@ class Instagram internal constructor(url: String) : Extractor(url) {
setInfo(mediaIt)
} ?: run {
internalError("MediaNotFound")
return
}
} ?: run {
extractFromItems(jsonObject.getJSONArray("items"))
Expand All @@ -737,8 +726,7 @@ class Instagram internal constructor(url: String) : Extractor(url) {
if (directExNeeded) {
logger.info("unable to even get from graphQL so trying direct ex")
directExtraction(page)
} else
loginRequired()
} else loginRequired()
return
}
setInfo(shortcodeMedia)
Expand Down

0 comments on commit bef4d79

Please sign in to comment.