From 7b81ec01b5663522d87b36837befc3265f9d809a Mon Sep 17 00:00:00 2001 From: LagradOst Date: Thu, 20 May 2021 23:25:41 +0200 Subject: [PATCH] vlc test --- app/src/main/AndroidManifest.xml | 11 +++ .../lagradost/cloudstream3/MainActivity.kt | 7 ++ .../com/lagradost/cloudstream3/UIHelper.kt | 19 +++++ .../cloudstream3/ui/result/ResultFragment.kt | 83 ++++++++++++++++--- .../cloudstream3/ui/result/ResultViewModel.kt | 2 +- app/src/main/res/xml/provider_paths.xml | 18 ++++ 6 files changed, 127 insertions(+), 13 deletions(-) create mode 100644 app/src/main/res/xml/provider_paths.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6c6c9f43..311e64d1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt index 41078eff..7eda817a 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt @@ -6,6 +6,8 @@ import androidx.appcompat.app.AppCompatActivity import androidx.navigation.findNavController import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.setupWithNavController +import com.lagradost.cloudstream3.UIHelper.checkWrite +import com.lagradost.cloudstream3.UIHelper.requestRW class MainActivity : AppCompatActivity() { private fun AppCompatActivity.backPressed(): Boolean { @@ -41,5 +43,10 @@ class MainActivity : AppCompatActivity() { R.id.navigation_home, R.id.navigation_search, R.id.navigation_notifications)) //setupActionBarWithNavController(navController, appBarConfiguration) navView.setupWithNavController(navController) + + if (!checkWrite()) { + requestRW() + if (checkWrite()) return + } } } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/UIHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/UIHelper.kt index 940d3152..466e07a5 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/UIHelper.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/UIHelper.kt @@ -1,9 +1,13 @@ package com.lagradost.cloudstream3 +import android.Manifest import android.app.Activity +import android.content.pm.PackageManager import android.content.res.Resources import android.view.View import androidx.appcompat.app.AppCompatActivity +import androidx.core.app.ActivityCompat +import androidx.core.content.ContextCompat import androidx.preference.PreferenceManager import com.lagradost.cloudstream3.ui.result.ResultFragment @@ -13,6 +17,21 @@ object UIHelper { val Int.toDp: Int get() = (this / Resources.getSystem().displayMetrics.density).toInt() val Float.toDp: Float get() = (this / Resources.getSystem().displayMetrics.density) + fun Activity.checkWrite(): Boolean { + return (ContextCompat.checkSelfPermission(this, + Manifest.permission.WRITE_EXTERNAL_STORAGE) + == PackageManager.PERMISSION_GRANTED) + } + + fun Activity.requestRW() { + ActivityCompat.requestPermissions(this, + arrayOf( + Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE + ), + 1337) + } + fun AppCompatActivity.loadResult(url: String, slug: String, apiName: String) { this.runOnUiThread { this.supportFragmentManager.beginTransaction() diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt index 1e76c07b..649c2bf3 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt @@ -1,16 +1,21 @@ package com.lagradost.cloudstream3.ui.result +import android.Manifest import android.annotation.SuppressLint +import android.app.Activity +import android.content.ComponentName +import android.content.Intent +import android.content.Intent.* +import android.content.pm.PackageManager import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AlertDialog -import androidx.core.view.marginBottom -import androidx.core.view.marginLeft -import androidx.core.view.marginRight -import androidx.core.view.marginTop +import androidx.core.app.ActivityCompat +import androidx.core.content.ContextCompat +import androidx.core.content.FileProvider +import androidx.core.net.toUri import androidx.core.widget.NestedScrollView import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider @@ -19,19 +24,18 @@ import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.bumptech.glide.load.model.GlideUrl import com.bumptech.glide.request.RequestOptions.bitmapTransform -import com.lagradost.cloudstream3.APIHolder.getApiFromName import com.lagradost.cloudstream3.AnimeLoadResponse import com.lagradost.cloudstream3.LoadResponse import com.lagradost.cloudstream3.R +import com.lagradost.cloudstream3.UIHelper.checkWrite import com.lagradost.cloudstream3.UIHelper.fixPaddingStatusbar -import com.lagradost.cloudstream3.UIHelper.getStatusBarHeight +import com.lagradost.cloudstream3.UIHelper.requestRW import com.lagradost.cloudstream3.mvvm.Resource import com.lagradost.cloudstream3.mvvm.observe -import com.lagradost.cloudstream3.mvvm.safeApiCall import com.lagradost.cloudstream3.utils.ExtractorLink import jp.wasabeef.glide.transformations.BlurTransformation import kotlinx.android.synthetic.main.fragment_result.* -import kotlinx.android.synthetic.main.fragment_search.* +import java.io.File const val MAX_SYNO_LENGH = 600 @@ -128,9 +132,64 @@ class ResultFragment : Fragment() { fun playEpisode(data: ArrayList?) { if (data != null) { - for (d in data) { - println(d) + if (activity?.checkWrite() != true) { + activity?.requestRW() + if (activity?.checkWrite() == true) return } + + val outputDir = context!!.cacheDir // context being the Activity pointer + val outputFile = File.createTempFile("mirrorlist", ".m3u8", outputDir) + var text = "#EXTM3U"; + for (d in data.sortedBy { -it.quality }) { + text += "\n#EXTINF:, ${d.name}\n${d.url}" + } + outputFile.writeText(text) + val VLC_PACKAGE = "org.videolan.vlc" + val VLC_INTENT_ACTION_RESULT = "org.videolan.vlc.player.result" + val VLC_COMPONENT: ComponentName = + ComponentName(VLC_PACKAGE, "org.videolan.vlc.gui.video.VideoPlayerActivity") + val REQUEST_CODE = 42 + + val FROM_START = -1 + val FROM_PROGRESS = -2 + + + val vlcIntent = Intent(VLC_INTENT_ACTION_RESULT) + + vlcIntent.setPackage(VLC_PACKAGE) + // vlcIntent.setDataAndTypeAndNormalize(outputFile.toUri(), "video/*") + vlcIntent.addFlags(FLAG_GRANT_PERSISTABLE_URI_PERMISSION) + vlcIntent.addFlags(FLAG_GRANT_PREFIX_URI_PERMISSION) + vlcIntent.addFlags(FLAG_GRANT_READ_URI_PERMISSION) + vlcIntent.addFlags(FLAG_GRANT_WRITE_URI_PERMISSION) + + vlcIntent.setDataAndType(FileProvider.getUriForFile(activity!!, + activity!!.applicationContext.packageName + ".provider", + outputFile), "video/*") + + val startId = FROM_PROGRESS + + var position = startId + if (startId == FROM_START) { + position = 1 + } else if (startId == FROM_PROGRESS) { + position = 0 + } + + vlcIntent.putExtra("position", position) + //vlcIntent.putExtra("title", episodeName) +/* + if (subFile != null) { + val sfile: Unit = Android.Net.Uri.FromFile(subFile) + vlcIntent.PutExtra("subtitles_location", sfile.Path) + //vlcIntent.PutExtra("sub_mrl", "file://" sfile.Path); + //vlcIntent.PutExtra("subtitles_location", "file:///storage/emulated/0/Download/mirrorlist.srt"); + }*/ + + vlcIntent.setComponent(VLC_COMPONENT) + + //lastId = episodeId + activity?.startActivityForResult(vlcIntent, REQUEST_CODE) } } @@ -198,7 +257,7 @@ class ResultFragment : Fragment() { i, apiName, (slug + index).hashCode(), - (index * 0.1f),//TODO TEST; REMOVE + 0f,//(index * 0.1f),//TODO TEST; REMOVE )) } (result_episodes.adapter as EpisodeAdapter).cardList = episodes diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel.kt index eddb3278..255a397e 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel.kt @@ -33,7 +33,7 @@ class ResultViewModel : ViewModel() { } val links = ArrayList() val data = safeApiCall { - getApiFromName(episode.apiName).loadLinks(episode.data, false) { //TODO IMPLEMENT CASTING + getApiFromName(episode.apiName).loadLinks(episode.data, true) { //TODO IMPLEMENT CASTING links.add(it) _allEpisodes.value?.set(episode.id, links) // _allEpisodes.value?.get(episode.id)?.add(it) diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml new file mode 100644 index 00000000..f0dc0092 --- /dev/null +++ b/app/src/main/res/xml/provider_paths.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file