MohmedIbrahim/cloudstream
1
0
Fork 0
forked from recloudstream/cloudstream
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed crashing in AllMoviesForYou

Browse source
This commit is contained in:
Blatzar 2021-12-17 13:42:25 +01:00
parent a96b396307
commit 607c9e9af5
2 changed files with 99 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/lagradost/cloudstream3/movieproviders/AllMoviesForYouProvider.kt
View file

@ -75,7 +75,7 @@ class AllMoviesForYouProvider : MainAPI() {
val title = document.selectFirst("h1.Title").text() val title = document.selectFirst("h1.Title").text()
val descipt = document.selectFirst("div.Description > p").text() val descipt = document.selectFirst("div.Description > p").text()
val rating = val rating =
document.selectFirst("div.Vote > div.post-ratings > span")?.text()?.toFloatOrNull()?.times(10)?.toInt() document.selectFirst("div.Vote > div.post-ratings > span")?.text()?.toFloatOrNull()?.times(1000)?.toInt()
val year = document.selectFirst("span.Date")?.text() val year = document.selectFirst("span.Date")?.text()
val duration = document.selectFirst("span.Time").text() val duration = document.selectFirst("span.Time").text()
val backgroundPoster = fixUrl(document.selectFirst("div.Image > figure > img").attr("data-src")) val backgroundPoster = fixUrl(document.selectFirst("div.Image > figure > img").attr("data-src"))

133
app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
View file

@ -166,7 +166,12 @@ fun ResultEpisode.getWatchProgress(): Float {
class ResultFragment : Fragment() { class ResultFragment : Fragment() {
companion object { companion object {
fun newInstance(url: String, apiName: String, startAction: Int = 0, startValue: Int = 0): Bundle { fun newInstance(
url: String,
apiName: String,
startAction: Int = 0,
startValue: Int = 0
): Bundle {
return Bundle().apply { return Bundle().apply {
putString("url", url) putString("url", url)
putString("apiName", apiName) putString("apiName", apiName)
@ -177,7 +182,8 @@ class ResultFragment : Fragment() {
} }
} }
private var currentLoadingCount = 0 // THIS IS USED TO PREVENT LATE EVENTS, AFTER DISMISS WAS CLICKED private var currentLoadingCount =
0 // THIS IS USED TO PREVENT LATE EVENTS, AFTER DISMISS WAS CLICKED
private val viewModel: ResultViewModel by activityViewModels() private val viewModel: ResultViewModel by activityViewModels()
private var allEpisodes: HashMap<Int, List<ExtractorLink>> = HashMap() private var allEpisodes: HashMap<Int, List<ExtractorLink>> = HashMap()
private var allEpisodesSubs: HashMap<Int, HashMap<String, SubtitleFile>> = HashMap() private var allEpisodesSubs: HashMap<Int, HashMap<String, SubtitleFile>> = HashMap()
@ -279,15 +285,19 @@ class ResultFragment : Fragment() {
} }
private fun setFormatText(textView: TextView?, @StringRes format: Int, arg: Any?) { private fun setFormatText(textView: TextView?, @StringRes format: Int, arg: Any?) {
if (arg == null) { // java.util.IllegalFormatConversionException: f != java.lang.Integer
textView?.isVisible = false // This can fail with malformed formatting
} else { normalSafeApiCall {
val text = context?.getString(format)?.format(arg) if (arg == null) {
if (text == null) {
textView?.isVisible = false textView?.isVisible = false
} else { } else {
textView?.isVisible = true val text = context?.getString(format)?.format(arg)
textView?.text = text if (text == null) {
textView?.isVisible = false
} else {
textView?.isVisible = true
textView?.text = text
}
} }
} }
} }
@ -301,7 +311,7 @@ class ResultFragment : Fragment() {
} }
private fun setRating(rating: Int?) { private fun setRating(rating: Int?) {
setFormatText(result_meta_rating, R.string.rating_format, rating?.div(1000)) setFormatText(result_meta_rating, R.string.rating_format, rating?.div(1000f))
} }
private fun setRecommendations(rec: List<SearchResponse>?) { private fun setRecommendations(rec: List<SearchResponse>?) {
@ -392,8 +402,10 @@ class ResultFragment : Fragment() {
VISIBLE VISIBLE
castContext.addCastStateListener { state -> castContext.addCastStateListener { state ->
if (media_route_button != null) { if (media_route_button != null) {
if (state == CastState.NO_DEVICES_AVAILABLE) media_route_button.visibility = GONE else { if (state == CastState.NO_DEVICES_AVAILABLE) media_route_button.visibility =
if (media_route_button.visibility == GONE) media_route_button.visibility = VISIBLE GONE else {
if (media_route_button.visibility == GONE) media_route_button.visibility =
VISIBLE
} }
} }
} }
@ -449,7 +461,8 @@ class ResultFragment : Fragment() {
val currentLoad = currentLoadingCount val currentLoad = currentLoadingCount
if (!skipLoading) { if (!skipLoading) {
val builder = AlertDialog.Builder(requireContext(), R.style.AlertDialogCustomTransparent) val builder =
AlertDialog.Builder(requireContext(), R.style.AlertDialogCustomTransparent)
val customLayout = layoutInflater.inflate(R.layout.dialog_loading, null) val customLayout = layoutInflater.inflate(R.layout.dialog_loading, null)
builder.setView(customLayout) builder.setView(customLayout)
@ -609,7 +622,8 @@ class ResultFragment : Fragment() {
} }
.map { ExtractorSubtitleLink(it.lang, it.url, "") } .map { ExtractorSubtitleLink(it.lang, it.url, "") }
.forEach { link -> .forEach { link ->
val epName = meta.name ?: "${context?.getString(R.string.episode)} ${meta.episode}" val epName = meta.name
?: "${context?.getString(R.string.episode)} ${meta.episode}"
val fileName = val fileName =
sanitizeFilename(epName + if (downloadList.size > 1) " ${link.name}" else "") sanitizeFilename(epName + if (downloadList.size > 1) " ${link.name}" else "")
val topFolder = "$folder" val topFolder = "$folder"
@ -653,9 +667,19 @@ class ResultFragment : Fragment() {
ACTION_CLICK_DEFAULT -> { ACTION_CLICK_DEFAULT -> {
context?.let { ctx -> context?.let { ctx ->
if (ctx.isConnectedToChromecast()) { if (ctx.isConnectedToChromecast()) {
handleAction(EpisodeClickEvent(ACTION_CHROME_CAST_EPISODE, episodeClick.data)) handleAction(
EpisodeClickEvent(
ACTION_CHROME_CAST_EPISODE,
episodeClick.data
)
)
} else { } else {
handleAction(EpisodeClickEvent(ACTION_PLAY_EPISODE_IN_PLAYER, episodeClick.data)) handleAction(
EpisodeClickEvent(
ACTION_PLAY_EPISODE_IN_PLAYER,
episodeClick.data
)
)
} }
} }
} }
@ -665,7 +689,8 @@ class ResultFragment : Fragment() {
val builder = AlertDialog.Builder(ctx, R.style.AlertDialogCustom) val builder = AlertDialog.Builder(ctx, R.style.AlertDialogCustom)
var dialog: AlertDialog? = null var dialog: AlertDialog? = null
builder.setTitle(showTitle) builder.setTitle(showTitle)
val options = requireContext().resources.getStringArray(R.array.episode_long_click_options) val options =
requireContext().resources.getStringArray(R.array.episode_long_click_options)
val optionsValues = val optionsValues =
requireContext().resources.getIntArray(R.array.episode_long_click_options_values) requireContext().resources.getIntArray(R.array.episode_long_click_options_values)
@ -684,7 +709,9 @@ class ResultFragment : Fragment() {
ACTION_CHROME_CAST_MIRROR -> isConnected ACTION_CHROME_CAST_MIRROR -> isConnected
ACTION_DOWNLOAD_EPISODE -> hasDownloadSupport ACTION_DOWNLOAD_EPISODE -> hasDownloadSupport
ACTION_DOWNLOAD_MIRROR -> hasDownloadSupport ACTION_DOWNLOAD_MIRROR -> hasDownloadSupport
ACTION_PLAY_EPISODE_IN_VLC_PLAYER -> context?.isAppInstalled(VLC_PACKAGE) ?: false ACTION_PLAY_EPISODE_IN_VLC_PLAYER -> context?.isAppInstalled(
VLC_PACKAGE
) ?: false
else -> true else -> true
} }
if (add) { if (add) {
@ -696,7 +723,12 @@ class ResultFragment : Fragment() {
builder.setItems( builder.setItems(
verifiedOptions.toTypedArray() verifiedOptions.toTypedArray()
) { _, which -> ) { _, which ->
handleAction(EpisodeClickEvent(verifiedOptionsValues[which], episodeClick.data)) handleAction(
EpisodeClickEvent(
verifiedOptionsValues[which],
episodeClick.data
)
)
dialog?.dismissSafe(activity) dialog?.dismissSafe(activity)
} }
@ -819,7 +851,10 @@ class ResultFragment : Fragment() {
} }
ACTION_DOWNLOAD_EPISODE -> { ACTION_DOWNLOAD_EPISODE -> {
startDownload(currentLinks ?: return@main, currentSubs?.values?.toList() ?: emptyList()) startDownload(
currentLinks ?: return@main,
currentSubs?.values?.toList() ?: emptyList()
)
} }
ACTION_DOWNLOAD_MIRROR -> { ACTION_DOWNLOAD_MIRROR -> {
@ -828,7 +863,10 @@ class ResultFragment : Fragment() {
links,//(currentLinks ?: return@main).filter { !it.isM3u8 }, links,//(currentLinks ?: return@main).filter { !it.isM3u8 },
getString(R.string.episode_action_download_mirror) getString(R.string.episode_action_download_mirror)
) { link -> ) { link ->
startDownload(listOf(link), currentSubs?.values?.toList() ?: emptyList()) startDownload(
listOf(link),
currentSubs?.values?.toList() ?: emptyList()
)
} }
} }
} }
@ -978,7 +1016,12 @@ class ResultFragment : Fragment() {
result_dub_select.setOnClickListener { result_dub_select.setOnClickListener {
val ranges = dubRange val ranges = dubRange
if (ranges != null) { if (ranges != null) {
it.popupMenuNoIconsAndNoStringRes(ranges.map { status -> Pair(status.ordinal, status.toString()) } it.popupMenuNoIconsAndNoStringRes(ranges.map { status ->
Pair(
status.ordinal,
status.toString()
)
}
.toList()) { .toList()) {
viewModel.changeDubStatus(DubStatus.values()[itemId]) viewModel.changeDubStatus(DubStatus.values()[itemId])
} }
@ -997,7 +1040,8 @@ class ResultFragment : Fragment() {
result_episode_select.setOnClickListener { result_episode_select.setOnClickListener {
val ranges = episodeRanges val ranges = episodeRanges
if (ranges != null) { if (ranges != null) {
it.popupMenuNoIconsAndNoStringRes(ranges.mapIndexed { index, s -> Pair(index, s) }.toList()) { it.popupMenuNoIconsAndNoStringRes(ranges.mapIndexed { index, s -> Pair(index, s) }
.toList()) {
viewModel.changeRange(itemId) viewModel.changeRange(itemId)
} }
} }
@ -1090,7 +1134,8 @@ class ResultFragment : Fragment() {
showToast( showToast(
activity, activity,
context?.getString(R.string.added_sync_format)?.format(click.card.name), context?.getString(R.string.added_sync_format)
?.format(click.card.name),
Toast.LENGTH_SHORT Toast.LENGTH_SHORT
) )
@ -1120,10 +1165,13 @@ class ResultFragment : Fragment() {
result_poster?.setImage(d.posterUrl) result_poster?.setImage(d.posterUrl)
result_poster_blur?.setImageBlur(d.posterUrl, 10, 3) result_poster_blur?.setImageBlur(d.posterUrl, 10, 3)
result_poster_holder?.visibility = if (d.posterUrl.isNullOrBlank()) GONE else VISIBLE result_poster_holder?.visibility =
if (d.posterUrl.isNullOrBlank()) GONE else VISIBLE
result_play_movie?.text = result_play_movie?.text =
if (d.type == TvType.Torrent) getString(R.string.play_torrent_button) else getString(R.string.play_movie_button) if (d.type == TvType.Torrent) getString(R.string.play_torrent_button) else getString(
R.string.play_movie_button
)
//result_plot_header?.text = //result_plot_header?.text =
// if (d.type == TvType.Torrent) getString(R.string.torrent_plot) else getString(R.string.result_plot) // if (d.type == TvType.Torrent) getString(R.string.torrent_plot) else getString(R.string.result_plot)
if (!d.plot.isNullOrEmpty()) { if (!d.plot.isNullOrEmpty()) {
@ -1132,7 +1180,8 @@ class ResultFragment : Fragment() {
syno = syno.substring(0, MAX_SYNO_LENGH) + "..." syno = syno.substring(0, MAX_SYNO_LENGH) + "..."
} }
result_descript.setOnClickListener { result_descript.setOnClickListener {
val builder: AlertDialog.Builder = AlertDialog.Builder(requireContext()) val builder: AlertDialog.Builder =
AlertDialog.Builder(requireContext())
builder.setMessage(d.plot) builder.setMessage(d.plot)
.setTitle(if (d.type == TvType.Torrent) R.string.torrent_plot else R.string.result_plot) .setTitle(if (d.type == TvType.Torrent) R.string.torrent_plot else R.string.result_plot)
.show() .show()
@ -1140,7 +1189,9 @@ class ResultFragment : Fragment() {
result_descript.text = syno result_descript.text = syno
} else { } else {
result_descript.text = result_descript.text =
if (d.type == TvType.Torrent) getString(R.string.torrent_no_plot) else getString(R.string.normal_no_plot) if (d.type == TvType.Torrent) getString(R.string.torrent_no_plot) else getString(
R.string.normal_no_plot
)
} }
result_tag?.removeAllViews() result_tag?.removeAllViews()
@ -1167,18 +1218,21 @@ class ResultFragment : Fragment() {
lateFixDownloadButton(true) lateFixDownloadButton(true)
result_play_movie?.setOnClickListener { result_play_movie?.setOnClickListener {
val card = currentEpisodes?.firstOrNull() ?: return@setOnClickListener val card =
currentEpisodes?.firstOrNull() ?: return@setOnClickListener
handleAction(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card)) handleAction(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card))
} }
result_play_movie?.setOnLongClickListener { result_play_movie?.setOnLongClickListener {
val card = currentEpisodes?.firstOrNull() ?: return@setOnLongClickListener true val card = currentEpisodes?.firstOrNull()
?: return@setOnLongClickListener true
handleAction(EpisodeClickEvent(ACTION_SHOW_OPTIONS, card)) handleAction(EpisodeClickEvent(ACTION_SHOW_OPTIONS, card))
return@setOnLongClickListener true return@setOnLongClickListener true
} }
result_download_movie?.setOnLongClickListener { result_download_movie?.setOnLongClickListener {
val card = currentEpisodes?.firstOrNull() ?: return@setOnLongClickListener true val card = currentEpisodes?.firstOrNull()
?: return@setOnLongClickListener true
handleAction(EpisodeClickEvent(ACTION_SHOW_OPTIONS, card)) handleAction(EpisodeClickEvent(ACTION_SHOW_OPTIONS, card))
return@setOnLongClickListener true return@setOnLongClickListener true
} }
@ -1188,11 +1242,15 @@ class ResultFragment : Fragment() {
// handleAction(EpisodeClickEvent(ACTION_SHOW_OPTIONS, card)) // handleAction(EpisodeClickEvent(ACTION_SHOW_OPTIONS, card))
// } // }
result_download_movie?.visibility = if (hasDownloadSupport) VISIBLE else GONE result_download_movie?.visibility =
if (hasDownloadSupport) VISIBLE else GONE
if (hasDownloadSupport) { if (hasDownloadSupport) {
val localId = d.getId() val localId = d.getId()
val file = val file =
VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(requireContext(), localId) VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(
requireContext(),
localId
)
downloadButton?.dispose() downloadButton?.dispose()
downloadButton = EasyDownloadButton() downloadButton = EasyDownloadButton()
downloadButton?.setUpMaterialButton( downloadButton?.setUpMaterialButton(
@ -1237,7 +1295,11 @@ class ResultFragment : Fragment() {
) )
} }
} else { } else {
handleDownloadClick(activity, currentHeaderName, downloadClickEvent) handleDownloadClick(
activity,
currentHeaderName,
downloadClickEvent
)
} }
} }
} }
@ -1285,7 +1347,8 @@ class ResultFragment : Fragment() {
result_bookmark_button?.isVisible = ctx.isTvSettings() result_bookmark_button?.isVisible = ctx.isTvSettings()
val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx) val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
val showFillers = settingsManager.getBoolean(ctx.getString(R.string.show_fillers_key), true) val showFillers =
settingsManager.getBoolean(ctx.getString(R.string.show_fillers_key), true)
val tempUrl = url val tempUrl = url
if (tempUrl != null) { if (tempUrl != null) {