recloudstream/cloudstream
2
2
Fork 1
mirror of https://github.com/recloudstream/cloudstream.git synced 2024-08-15 01:53:11 +00:00
Code Issues Releases Wiki Activity

Add more checks

Browse source
This commit is contained in:
Luna712 2023-10-23 15:02:21 -06:00
parent ad836a6e93
commit 14ee49402d
2 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt
View file

@ -1252,6 +1252,12 @@ interface LoadResponse {
} }
} }
fun LoadResponse.getTMDbId(): String? {
return normalSafeApiCall {
SimklApi.readIdFromString(this.syncData[simklIdPrefix])?.get(SimklApi.Companion.SyncServices.Tmdb)
}
}
fun LoadResponse.addMalId(id: Int?) { fun LoadResponse.addMalId(id: Int?) {
this.syncData[malIdPrefix] = (id ?: return).toString() this.syncData[malIdPrefix] = (id ?: return).toString()
this.addSimklId(SimklApi.Companion.SyncServices.Mal, id.toString()) this.addSimklId(SimklApi.Companion.SyncServices.Mal, id.toString())

37
app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
View file

@ -26,7 +26,6 @@ import com.lagradost.cloudstream3.CommonActivity.getCastSession
import com.lagradost.cloudstream3.CommonActivity.showToast import com.lagradost.cloudstream3.CommonActivity.showToast
import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer
import com.lagradost.cloudstream3.LoadResponse.Companion.getAniListId import com.lagradost.cloudstream3.LoadResponse.Companion.getAniListId
import com.lagradost.cloudstream3.LoadResponse.Companion.getImdbId
import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId
import com.lagradost.cloudstream3.LoadResponse.Companion.isMovie import com.lagradost.cloudstream3.LoadResponse.Companion.isMovie
import com.lagradost.cloudstream3.metaproviders.SyncRedirector import com.lagradost.cloudstream3.metaproviders.SyncRedirector
@ -135,7 +134,7 @@ data class ResultData(
data class CheckDuplicateData( data class CheckDuplicateData(
val name: String, val name: String,
val year: Int?, val year: Int?,
val imdbId: String? val syncData: Map<String, String>?
) )
enum class LibraryListType { enum class LibraryListType {
@ -851,7 +850,7 @@ class ResultViewModel2 : ViewModel() {
CheckDuplicateData( CheckDuplicateData(
name = response.name, name = response.name,
year = response.year, year = response.year,
imdbId = response.getImdbId(), syncData = response.syncData,
), ),
bookmarkedData bookmarkedData
) { shouldContinue: Boolean, duplicateIds: List<Int?> -> ) { shouldContinue: Boolean, duplicateIds: List<Int?> ->
@ -927,7 +926,7 @@ class ResultViewModel2 : ViewModel() {
CheckDuplicateData( CheckDuplicateData(
name = response.name, name = response.name,
year = response.year, year = response.year,
imdbId = response.getImdbId(), syncData = response.syncData,
), ),
getAllSubscriptions(), getAllSubscriptions(),
) { shouldContinue: Boolean, duplicateIds: List<Int?> -> ) { shouldContinue: Boolean, duplicateIds: List<Int?> ->
@ -994,7 +993,7 @@ class ResultViewModel2 : ViewModel() {
CheckDuplicateData( CheckDuplicateData(
name = response.name, name = response.name,
year = response.year, year = response.year,
imdbId = response.getImdbId(), syncData = response.syncData,
), ),
getAllFavorites(), getAllFavorites(),
) { shouldContinue: Boolean, duplicateIds: List<Int?> -> ) { shouldContinue: Boolean, duplicateIds: List<Int?> ->
@ -1044,6 +1043,7 @@ class ResultViewModel2 : ViewModel() {
data: List<DataStoreHelper.LibrarySearchResponse>, data: List<DataStoreHelper.LibrarySearchResponse>,
checkDuplicatesCallback: (shouldContinue: Boolean, duplicateIds: List<Int?>) -> Unit checkDuplicatesCallback: (shouldContinue: Boolean, duplicateIds: List<Int?>) -> Unit
) { ) {
val whitespaceRegex = "\\s+".toRegex()
fun normalizeString(input: String): String { fun normalizeString(input: String): String {
/** /**
* Trim the input string and replace consecutive spaces with a single space. * Trim the input string and replace consecutive spaces with a single space.
@ -1051,15 +1051,22 @@ class ResultViewModel2 : ViewModel() {
* and one provider has the title with an extra whitespace. This is minor enough that * and one provider has the title with an extra whitespace. This is minor enough that
* it should still match in this case. * it should still match in this case.
*/ */
val regex = "\\s+".toRegex() return input.trim().replace(whitespaceRegex, " ")
return input.trim().replace(regex, " ")
} }
val duplicateEntries = data.filter { val duplicateEntries = data.filter {
checkDuplicateData.imdbId != null && val syncData = checkDuplicateData.syncData
getImdbIdFromSyncData(it.syncData) == checkDuplicateData.imdbId || val librarySyncData = it.syncData
normalizeString(it.name) == normalizeString(checkDuplicateData.name) &&
it.year == checkDuplicateData.year val checks = listOf(
{ getImdbIdFromSyncData(syncData) != null && getImdbIdFromSyncData(librarySyncData) == getImdbIdFromSyncData(syncData) },
{ getTMDbIdFromSyncData(syncData) != null && getTMDbIdFromSyncData(librarySyncData) == getTMDbIdFromSyncData(syncData) },
{ syncData?.get(AccountManager.malApi.idPrefix) != null && librarySyncData?.get(AccountManager.malApi.idPrefix) == syncData[AccountManager.malApi.idPrefix] },
{ syncData?.get(AccountManager.aniListApi.idPrefix) != null && librarySyncData?.get(AccountManager.aniListApi.idPrefix) == syncData[AccountManager.aniListApi.idPrefix] },
{ normalizeString(it.name) == normalizeString(checkDuplicateData.name) && it.year == checkDuplicateData.year }
)
checks.any { it() }
} }
if (duplicateEntries.isEmpty() || context == null) { if (duplicateEntries.isEmpty() || context == null) {
@ -1128,6 +1135,14 @@ class ResultViewModel2 : ViewModel() {
} }
} }
private fun getTMDbIdFromSyncData(syncData: Map<String, String>?): String? {
return normalSafeApiCall {
SimklApi.readIdFromString(
syncData?.get(AccountManager.simklApi.idPrefix)
)[SimklApi.Companion.SyncServices.Tmdb]
}
}
private fun startChromecast( private fun startChromecast(
activity: Activity?, activity: Activity?,
result: ResultEpisode, result: ResultEpisode,