Skip to content

Feat: Small change for Search in other extensions #3213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ByAyzen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feat: Small change for Search in other extensions #3213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 42 additions & 13 deletions app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
import com.lagradost.cloudstream3.CommonActivity.activity
import com.lagradost.cloudstream3.HomePageList
import com.lagradost.cloudstream3.R
import com.lagradost.cloudstream3.TvType
import com.lagradost.cloudstream3.databinding.QuickSearchBinding
import com.lagradost.cloudstream3.mvvm.Resource
import com.lagradost.cloudstream3.mvvm.logError
Expand All @@ -42,6 +43,7 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.filterSearchResultByFilm
import com.lagradost.cloudstream3.utils.AppContextUtils.isRecyclerScrollable
import com.lagradost.cloudstream3.utils.AppContextUtils.ownShow
import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
import com.lagradost.cloudstream3.utils.DataStoreHelper
import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
Expand All @@ -55,23 +57,31 @@ class QuickSearchFragment : BaseFragment<QuickSearchBinding>(
companion object {
const val AUTOSEARCH_KEY = "autosearch"
const val PROVIDER_KEY = "providers"
const val TV_TYPE_KEY = "tv_type"

private val ANIME_TYPES = setOf(TvType.Anime, TvType.AnimeMovie, TvType.OVA)

fun pushSearch(
autoSearch: String? = null,
providers: Array<String>? = null
providers: Array<String>? = null,
type: TvType? = null
) {
pushSearch(activity, autoSearch, providers)
pushSearch(activity, autoSearch, providers, type)
}

fun pushSearch(
activity: Activity?,
autoSearch: String? = null,
providers: Array<String>? = null
providers: Array<String>? = null,
type: TvType? = null
) {
activity.navigate(R.id.global_to_navigation_quick_search, Bundle().apply {
providers?.let {
putStringArray(PROVIDER_KEY, it)
}
type?.let {
putString(TV_TYPE_KEY, it.name)
}
autoSearch?.let {
putString(
AUTOSEARCH_KEY,
Expand All @@ -89,6 +99,7 @@ class QuickSearchFragment : BaseFragment<QuickSearchBinding>(
}

private var providers: Set<String>? = null
private var searchType: TvType? = null
private lateinit var searchViewModel: SearchViewModel

private var bottomSheetDialog: BottomSheetDialog? = null
Expand Down Expand Up @@ -121,23 +132,41 @@ class QuickSearchFragment : BaseFragment<QuickSearchBinding>(
}

fun search(context: Context?, query: String, isQuickSearch: Boolean): Boolean {
(providers ?: context?.filterProviderByPreferredMedia(hasHomePageIsRequired = false)
?.map { it.name }?.toSet())?.let { active ->
searchViewModel.searchAndCancel(
query = query,
ignoreSettings = false,
providersActive = active,
isQuickSearch = isQuickSearch
)
return true
val explicitProviders = providers
val active = explicitProviders ?: run {
val selected = DataStoreHelper.searchPreferenceProviders.toSet()
val preferredMediaApis =
context?.filterProviderByPreferredMedia(hasHomePageIsRequired = false).orEmpty()
val typeProviders = searchType?.let { type ->
preferredMediaApis.filter { api ->
val types = api.supportedTypes
types.contains(type) ||
(type in ANIME_TYPES && types.any { it in ANIME_TYPES })
}.map { it.name }.toSet()
}.orEmpty()

(selected + typeProviders).ifEmpty {
preferredMediaApis.map { it.name }.toSet()
}
}
return false
if (active.isEmpty()) return false

searchViewModel.searchAndCancel(
query = query,
ignoreSettings = false,
providersActive = active,
isQuickSearch = isQuickSearch
)
return true
}

override fun onBindingCreated(binding: QuickSearchBinding) {
arguments?.getStringArray(PROVIDER_KEY)?.let {
providers = it.toSet()
}
arguments?.getString(TV_TYPE_KEY)?.let { name ->
searchType = runCatching { TvType.valueOf(name) }.getOrNull()
}

val isSingleProvider = providers?.size == 1
val isSingleProviderQuickSearch = if (isSingleProvider) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ open class ResultFragmentPhone : BaseFragment<FragmentResultSwipeBinding>(
binding.apply {
resultSearch.isGone = d.title.isBlank()
resultSearch.setOnClickListener {
QuickSearchFragment.pushSearch(activity, d.title)
QuickSearchFragment.pushSearch(activity, d.title, type = d.type)
}

resultShare.setOnClickListener {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@ class ResultFragmentTv : BaseFragment<FragmentResultTvBinding>(
}

resultSearchButton.setOnClickListener {
QuickSearchFragment.pushSearch(activity, d.title)
QuickSearchFragment.pushSearch(activity, d.title, type = d.type)
}
}

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ data class ResultData(
val nextAiringEpisode: UiText?,
val plotHeaderText: UiText,
val posterHeaders: Map<String, String>? = null,
val type: TvType? = null,
)

data class CheckDuplicateData(
Expand Down Expand Up @@ -278,6 +279,7 @@ fun LoadResponse.toResultData(repo: APIRepository): ResultData {
}
val dur = duration
return ResultData(
type = type,
syncData = syncData,
plotHeaderText = txt(
when (this.type) {
Expand Down
Loading