diff --git a/.devcontainer.json b/.devcontainer.json new file mode 100644 index 00000000..bed109a0 --- /dev/null +++ b/.devcontainer.json @@ -0,0 +1,17 @@ +{ + "image": "mcr.microsoft.com/devcontainers/universal:2", + "postCreateCommand": "sudo chown $(whoami) /opt/android/", + "features": { + "ghcr.io/devcontainers/features/java:latest": { + "version": "17" + }, + "ghcr.io/akhildevelops/devcontainer-features/android-cli:0": {} + }, + "customizations": { + "vscode": { + "extensions": [ + "fwcd.kotlin" + ] + } + } +} diff --git a/.github/ISSUE_TEMPLATE/application-bug.yml b/.github/ISSUE_TEMPLATE/application-bug.yml index f3590067..931db3bd 100644 --- a/.github/ISSUE_TEMPLATE/application-bug.yml +++ b/.github/ISSUE_TEMPLATE/application-bug.yml @@ -80,13 +80,13 @@ body: label: Acknowledgements description: Your issue will be closed if you haven't done these steps. options: - - label: I am sure my issue is related to the app and **NOT some extension**. - required: true - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue. required: true - label: I have written a short but informative title. required: true - label: I have updated the app to pre-release version **[Latest](https://github.com/recloudstream/cloudstream/releases)**. required: true + - label: If related to a provider, I have checked the site and it works, but not the app. + required: true - label: I will fill out all of the requested information in this form. required: true diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index b56cdf8e..250734cd 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -2,7 +2,7 @@ blank_issues_enabled: false contact_links: - name: Request a new provider or report bug with an existing provider url: https://github.com/recloudstream - about: EXTREMELY IMPORTANT - Please do not report any provider bugs here or request new providers. This repository does not contain any providers. Please find the appropriate repository and report your issue there or join the discord. + about: Please do not report any provider bugs here or request new providers. This repository does not contain any providers. Please find the appropriate repository and report your issue there or join the discord. - name: Discord url: https://discord.gg/5Hus6fM about: Join our discord for faster support on smaller issues. diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml index e18daebb..9c35ba56 100644 --- a/.github/ISSUE_TEMPLATE/feature-request.yml +++ b/.github/ISSUE_TEMPLATE/feature-request.yml @@ -27,7 +27,9 @@ body: label: Acknowledgements description: Your issue will be closed if you haven't done these steps. options: - - label: My suggestion is **NOT** about adding a new provider - required: true - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue. - required: true \ No newline at end of file + required: true + - label: I have written a short but informative title. + required: true + - label: I will fill out all of the requested information in this form. + required: true diff --git a/.github/locales.py b/.github/locales.py index a74d7258..7d6d6b90 100644 --- a/.github/locales.py +++ b/.github/locales.py @@ -1,7 +1,6 @@ import re import glob import requests -import os import lxml.etree as ET # builtin library doesn't preserve comments @@ -54,16 +53,11 @@ for file in glob.glob(f"{XML_NAME}*/strings.xml"): try: tree = ET.parse(file) for child in tree.getroot(): - if not child.text: - continue if child.text.startswith("\\@string/"): print(f"[{file}] fixing {child.attrib['name']}") child.text = child.text.replace("\\@string/", "@string/") with open(file, 'wb') as fp: fp.write(b'\n') tree.write(fp, encoding="utf-8", method="xml", pretty_print=True, xml_declaration=False) - # Remove trailing new line to be consistent with weblate - fp.seek(-1, os.SEEK_END) - fp.truncate() except ET.ParseError as ex: print(f"[{file}] {ex}") diff --git a/.github/workflows/build_to_archive.yml b/.github/workflows/build_to_archive.yml index e84bb08b..3b7aa9ae 100644 --- a/.github/workflows/build_to_archive.yml +++ b/.github/workflows/build_to_archive.yml @@ -19,21 +19,21 @@ jobs: steps: - name: Generate access token id: generate_token - uses: tibdex/github-app-token@v2 + uses: tibdex/github-app-token@v1 with: app_id: ${{ secrets.GH_APP_ID }} private_key: ${{ secrets.GH_APP_KEY }} repository: "recloudstream/secrets" - name: Generate access token (archive) id: generate_archive_token - uses: tibdex/github-app-token@v2 + uses: tibdex/github-app-token@v1 with: app_id: ${{ secrets.GH_APP_ID }} private_key: ${{ secrets.GH_APP_KEY }} repository: "recloudstream/cloudstream-archive" - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v2 with: java-version: '17' distribution: 'adopt' @@ -58,7 +58,7 @@ jobs: SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }} SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }} SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }} - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 with: repository: "recloudstream/cloudstream-archive" token: ${{ steps.generate_archive_token.outputs.token }} diff --git a/.github/workflows/generate_dokka.yml b/.github/workflows/generate_dokka.yml index 96e61644..abeee0b2 100644 --- a/.github/workflows/generate_dokka.yml +++ b/.github/workflows/generate_dokka.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Generate access token id: generate_token - uses: tibdex/github-app-token@v2 + uses: tibdex/github-app-token@v1 with: app_id: ${{ secrets.GH_APP_ID }} private_key: ${{ secrets.GH_APP_KEY }} @@ -43,13 +43,12 @@ jobs: rm -rf "./-cloudstream" - name: Setup JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v1 with: java-version: 17 - distribution: 'adopt' - name: Setup Android SDK - uses: android-actions/setup-android@v3 + uses: android-actions/setup-android@v2 - name: Generate Dokka run: | diff --git a/.github/workflows/issue_action.yml b/.github/workflows/issue_action.yml index 88ab3656..108cec82 100644 --- a/.github/workflows/issue_action.yml +++ b/.github/workflows/issue_action.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Generate access token id: generate_token - uses: tibdex/github-app-token@v2 + uses: tibdex/github-app-token@v1 with: app_id: ${{ secrets.GH_APP_ID }} private_key: ${{ secrets.GH_APP_KEY }} @@ -27,7 +27,7 @@ jobs: comment-body: '${index}. ${similarity} #${number}' - name: Label if possible duplicate if: steps.similarity.outputs.similar-issues-found =='true' - uses: actions/github-script@v7 + uses: actions/github-script@v6 with: github-token: ${{ steps.generate_token.outputs.token }} script: | @@ -37,7 +37,7 @@ jobs: repo: context.repo.repo, labels: ["possible duplicate"] }) - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: Automatically close issues that dont follow the issue template uses: lucasbento/auto-close-issues@v1.0.2 with: @@ -68,7 +68,7 @@ jobs: Found provider name: `${{ steps.provider_check.outputs.name }}` - name: Label if mentions provider if: steps.provider_check.outputs.name != 'none' - uses: actions/github-script@v7 + uses: actions/github-script@v6 with: github-token: ${{ steps.generate_token.outputs.token }} script: | diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index f35cd58c..58009a7a 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -18,14 +18,14 @@ jobs: steps: - name: Generate access token id: generate_token - uses: tibdex/github-app-token@v2 + uses: tibdex/github-app-token@v1 with: app_id: ${{ secrets.GH_APP_ID }} private_key: ${{ secrets.GH_APP_KEY }} repository: "recloudstream/secrets" - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v2 with: java-version: '17' distribution: 'adopt' @@ -43,8 +43,7 @@ jobs: echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT - name: Run Gradle run: | - ./gradlew assemblePrerelease build androidSourcesJar - ./gradlew makeJar # for classes.jar, has to be done after assemblePrerelease + ./gradlew assemblePrerelease makeJar androidSourcesJar env: SIGNING_KEY_ALIAS: "key0" SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }} diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 7f6dd412..b6177710 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -6,9 +6,9 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v2 with: java-version: '17' distribution: 'adopt' @@ -17,7 +17,7 @@ jobs: - name: Run Gradle run: ./gradlew assemblePrereleaseDebug - name: Upload Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v2 with: name: pull-request-build path: "app/build/outputs/apk/prerelease/debug/*.apk" diff --git a/.github/workflows/update_locales.yml b/.github/workflows/update_locales.yml index ce140e55..628e9bc9 100644 --- a/.github/workflows/update_locales.yml +++ b/.github/workflows/update_locales.yml @@ -18,12 +18,12 @@ jobs: steps: - name: Generate access token id: generate_token - uses: tibdex/github-app-token@v2 + uses: tibdex/github-app-token@v1 with: app_id: ${{ secrets.GH_APP_ID }} private_key: ${{ secrets.GH_APP_KEY }} repository: "recloudstream/cloudstream" - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 with: token: ${{ steps.generate_token.outputs.token }} - name: Install dependencies diff --git a/.idea/gradle.xml b/.idea/gradle.xml index d7c08c9c..a8a2961a 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,16 +4,16 @@ diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d0c86bab..333fbfb8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,14 +1,12 @@ import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties import org.jetbrains.dokka.gradle.DokkaTask -import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.io.ByteArrayOutputStream import java.net.URL plugins { id("com.android.application") - id("com.google.devtools.ksp") id("kotlin-android") + id("kotlin-kapt") id("org.jetbrains.dokka") } @@ -34,16 +32,16 @@ android { enable = true } - /* disable this for now - externalNativeBuild { - cmake { - path("CMakeLists.txt") - } - }*/ + // disable this for now + //externalNativeBuild { + // cmake { + // path("CMakeLists.txt") + // } + //} signingConfigs { - if (prereleaseStoreFile != null) { - create("prerelease") { + create("prerelease") { + if (prereleaseStoreFile != null) { storeFile = file(prereleaseStoreFile) storePassword = System.getenv("SIGNING_STORE_PASSWORD") keyAlias = System.getenv("SIGNING_KEY_ALIAS") @@ -52,16 +50,16 @@ android { } } - compileSdk = 34 - buildToolsVersion = "34.0.0" + compileSdk = 33 + buildToolsVersion = "30.0.3" defaultConfig { applicationId = "com.lagradost.cloudstream3" minSdk = 21 - targetSdk = 33 /* Android 14 is Fu*ked - ^ https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading*/ - versionCode = 64 - versionName = "4.4.0" + targetSdk = 29 + + versionCode = 59 + versionName = "4.1.8" resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}") resValue("string", "commit_hash", "git rev-parse --short HEAD".execute() ?: "") @@ -71,9 +69,9 @@ android { val localProperties = gradleLocalProperties(rootDir) buildConfigField( - "long", - "BUILD_DATE", - "${System.currentTimeMillis()}" + "String", + "BUILDDATE", + "new java.text.SimpleDateFormat(\"yyyy-MM-dd HH:mm\").format(new java.util.Date(" + System.currentTimeMillis() + "L));" ) buildConfigField( "String", @@ -87,9 +85,8 @@ android { ) testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - ksp { - arg("room.schemaLocation", "$projectDir/schemas") - arg("exportSchema", "true") + kapt { + includeCompileClasspath = true } } @@ -112,7 +109,6 @@ android { ) } } - flavorDimensions.add("state") productFlavors { create("stable") { @@ -124,31 +120,30 @@ android { resValue("bool", "is_prerelease", "true") buildConfigField("boolean", "BETA", "true") applicationIdSuffix = ".prerelease" - if (signingConfigs.names.contains("prerelease")) { - signingConfig = signingConfigs.getByName("prerelease") - } else { - logger.warn("No prerelease signing config!") - } + signingConfig = signingConfigs.getByName("prerelease") versionNameSuffix = "-PRE" versionCode = (System.currentTimeMillis() / 60000).toInt() } } + //toolchain { + // languageVersion.set(JavaLanguageVersion.of(17)) + // } + // jvmToolchain(17) compileOptions { isCoreLibraryDesugaringEnabled = true + sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } - + kotlinOptions { + jvmTarget = "1.8" + freeCompilerArgs = listOf("-Xjvm-default=compatibility") + } lint { abortOnError = false checkReleaseBuilds = false } - - buildFeatures { - buildConfig = true - } - namespace = "com.lagradost.cloudstream3" } @@ -157,132 +152,127 @@ repositories { } dependencies { - // Testing - testImplementation("junit:junit:4.13.2") - testImplementation("org.json:json:20240303") - androidTestImplementation("androidx.test:core") - implementation("androidx.test.ext:junit-ktx:1.2.1") - androidTestImplementation("androidx.test.ext:junit:1.2.1") - androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") + implementation("com.google.android.mediahome:video:1.0.0") + implementation("androidx.test.ext:junit-ktx:1.1.5") + testImplementation("org.json:json:20180813") - // Android Core & Lifecycle - implementation("androidx.core:core-ktx:1.13.1") - implementation("androidx.appcompat:appcompat:1.7.0") - implementation("androidx.navigation:navigation-ui-ktx:2.7.7") - implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.8.3") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3") - implementation("androidx.navigation:navigation-fragment-ktx:2.7.7") + implementation("androidx.core:core-ktx:1.10.1") + implementation("androidx.appcompat:appcompat:1.6.1") // need target 32 for 1.5.0 - // Design & UI - implementation("jp.wasabeef:glide-transformations:4.3.0") - implementation("androidx.preference:preference-ktx:1.2.1") - implementation("com.google.android.material:material:1.12.0") + // dont change this to 1.6.0 it looks ugly af + implementation("com.google.android.material:material:1.5.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") + implementation("androidx.navigation:navigation-fragment-ktx:2.6.0") + implementation("androidx.navigation:navigation-ui-ktx:2.6.0") + implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.1") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + androidTestImplementation("androidx.test:core") + + //implementation("io.karn:khttp-android:0.1.2") //okhttp instead + // implementation("org.jsoup:jsoup:1.13.1") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1") + + implementation("androidx.preference:preference-ktx:1.2.0") + + implementation("com.github.bumptech.glide:glide:4.13.1") + kapt("com.github.bumptech.glide:compiler:4.13.1") + implementation("com.github.bumptech.glide:okhttp3-integration:4.13.0") + + implementation("jp.wasabeef:glide-transformations:4.3.0") + implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") - // Glide Module - ksp("com.github.bumptech.glide:ksp:4.16.0") - implementation("com.github.bumptech.glide:glide:4.16.0") - implementation("com.github.bumptech.glide:okhttp3-integration:4.16.0") + // implementation("androidx.leanback:leanback-paging:1.1.0-alpha09") - // For KSP -> Official Annotation Processors are Not Yet Supported for KSP - ksp("dev.zacsweers.autoservice:auto-service-ksp:1.2.0") - implementation("com.google.guava:guava:33.2.1-android") - implementation("dev.zacsweers.autoservice:auto-service-ksp:1.2.0") - - // Media 3 (ExoPlayer) - implementation("androidx.media3:media3-ui:1.1.1") - implementation("androidx.media3:media3-cast:1.1.1") + // Media 3 implementation("androidx.media3:media3-common:1.1.1") - implementation("androidx.media3:media3-session:1.1.1") implementation("androidx.media3:media3-exoplayer:1.1.1") - implementation("com.google.android.mediahome:video:1.0.0") + implementation("androidx.media3:media3-datasource-okhttp:1.1.1") + implementation("androidx.media3:media3-ui:1.1.1") + implementation("androidx.media3:media3-session:1.1.1") + implementation("androidx.media3:media3-cast:1.1.1") implementation("androidx.media3:media3-exoplayer-hls:1.1.1") implementation("androidx.media3:media3-exoplayer-dash:1.1.1") - implementation("androidx.media3:media3-datasource-okhttp:1.1.1") + // Custom ffmpeg extension for audio codecs + implementation("com.github.recloudstream:media-ffmpeg:1.1.0") - // PlayBack - implementation("com.jaredrummler:colorpicker:1.1.0") // Subtitle Color Picker - implementation("com.github.recloudstream:media-ffmpeg:1.1.0") // Custom FF-MPEG Lib for Audio Codecs - implementation("com.github.teamnewpipe:NewPipeExtractor:176da72") /* For Trailers - ^ Update to Latest Commits if Trailers Misbehave, github.com/TeamNewPipe/NewPipeExtractor/commits/dev */ - implementation("com.github.albfernandez:juniversalchardet:2.5.0") // Subtitle Decoding + //implementation("com.google.android.exoplayer:extension-leanback:2.14.0") - // Crash Reports (AcraApplication.kt) - implementation("ch.acra:acra-core:5.11.3") - implementation("ch.acra:acra-toast:5.11.3") + // Bug reports + implementation("ch.acra:acra-core:5.11.0") + implementation("ch.acra:acra-toast:5.11.0") + + compileOnly("com.google.auto.service:auto-service-annotations:1.0") + //either for java sources: + annotationProcessor("com.google.auto.service:auto-service:1.0") + //or for kotlin sources (requires kapt gradle plugin): + kapt("com.google.auto.service:auto-service:1.0") + + // subtitle color picker + implementation("com.jaredrummler:colorpicker:1.1.0") + + //run JS + // do not upgrade to 1.7.14, since in 1.7.14 Rhino uses the `SourceVersion` class, which is not + // available on Android (even when using desugaring), and `NoClassDefFoundError` is thrown + implementation("org.mozilla:rhino:1.7.13") + + // TorrentStream + //implementation("com.github.TorrentStream:TorrentStream-Android:2.7.0") + + // Downloading + implementation("androidx.work:work-runtime:2.8.1") + implementation("androidx.work:work-runtime-ktx:2.8.1") + + // Networking + // implementation("com.squareup.okhttp3:okhttp:4.9.2") + // implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1") + implementation("com.github.Blatzar:NiceHttp:0.4.3") + // To fix SSL fuckery on android 9 + implementation("org.conscrypt:conscrypt-android:2.2.1") + // Util to skip the URI file fuckery 🙏 + implementation("com.github.LagradOst:SafeFile:0.0.2") + + // API because cba maintaining it myself + implementation("com.uwetrottmann.tmdb2:tmdb-java:2.6.0") + + implementation("com.github.discord:OverlappingPanels:0.1.5") + // debugImplementation because LeakCanary should only run in debug builds. + //debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12") + + // for shimmer when loading + implementation("com.facebook.shimmer:shimmer:0.5.0") - // UI Stuff - implementation("com.facebook.shimmer:shimmer:0.5.0") // Shimmering Effect (Loading Skeleton) - implementation("androidx.palette:palette-ktx:1.0.0") // Palette For Images -> Colors implementation("androidx.tvprovider:tvprovider:1.0.0") - implementation("com.github.discord:OverlappingPanels:0.1.5") // Gestures - implementation("androidx.biometric:biometric:1.2.0-alpha05") // Fingerprint Authentication - implementation("com.github.rubensousa:previewseekbar-media3:1.1.1.0") // SeekBar Preview - implementation("io.github.g0dkar:qrcode-kotlin:4.2.0") // QR code for PIN Auth on TV - // Extensions & Other Libs - implementation("org.mozilla:rhino:1.7.15") // run JavaScript - implementation("me.xdrop:fuzzywuzzy:1.4.0") // Library/Ext Searching with Levenshtein Distance - implementation("com.github.LagradOst:SafeFile:0.0.6") // To Prevent the URI File Fu*kery - implementation("org.conscrypt:conscrypt-android:2.5.2") // To Fix SSL Fu*kery on Android 9 - implementation("com.uwetrottmann.tmdb2:tmdb-java:2.11.0") // TMDB API v3 Wrapper Made with RetroFit - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs_nio:2.0.4") //nio flavor needed for NewPipeExtractor - implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1") /* JSON Parser - ^ Don't Bump Jackson above 2.13.1 , Crashes on Android TV's and FireSticks that have Min API - Level 25 or Less. */ + // used for subtitle decoding https://github.com/albfernandez/juniversalchardet + implementation("com.github.albfernandez:juniversalchardet:2.4.0") - // Downloading & Networking - implementation("androidx.work:work-runtime:2.9.0") - implementation("androidx.work:work-runtime-ktx:2.9.0") - implementation("com.github.Blatzar:NiceHttp:0.4.11") // HTTP Lib + // newpipe yt taken from https://github.com/TeamNewPipe/NewPipe/blob/dev/app/build.gradle#L204 + // this should be updated frequently to avoid trailer fu*kery + implementation("com.github.TeamNewPipe:NewPipeExtractor:1f08d28") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.6") - implementation(project(":library") { - // There does not seem to be a good way of getting the android flavor. - val isDebug = gradle.startParameter.taskRequests.any { task -> - task.args.any { arg -> - arg.contains("debug", true) - } - } + // Library/extensions searching with Levenshtein distance + implementation("me.xdrop:fuzzywuzzy:1.4.0") - this.extra.set("isDebug", isDebug) - }) + // color palette for images -> colors + implementation("androidx.palette:palette-ktx:1.0.0") } -tasks.register("androidSourcesJar") { +tasks.register("androidSourcesJar", Jar::class) { archiveClassifier.set("sources") - from(android.sourceSets.getByName("main").java.srcDirs) // Full Sources + from(android.sourceSets.getByName("main").java.srcDirs) //full sources } -tasks.register("copyJar") { - from( - "build/intermediates/compile_app_classes_jar/prereleaseDebug", - "../library/build/libs" - ) - into("build/app-classes") - include("classes.jar", "library-jvm*.jar") - // Remove the version - rename("library-jvm.*.jar", "library-jvm.jar") -} - -// Merge the app classes and the library classes into classes.jar -tasks.register("makeJar") { - // Duplicates cause hard to catch errors, better to fail at compile time. - duplicatesStrategy = DuplicatesStrategy.FAIL - dependsOn(tasks.getByName("copyJar")) - from( - zipTree("build/app-classes/classes.jar"), - zipTree("build/app-classes/library-jvm.jar") - ) - destinationDirectory.set(layout.buildDirectory) - archivesName = "classes" -} - -tasks.withType { - kotlinOptions { - jvmTarget = "1.8" - freeCompilerArgs = listOf("-Xjvm-default=all-compatibility") - } +// this is used by the gradlew plugin +tasks.register("makeJar", Copy::class) { + from("build/intermediates/compile_app_classes_jar/prereleaseDebug") + into("build") + include("classes.jar") + dependsOn("build") } tasks.withType().configureEach { @@ -295,7 +285,6 @@ tasks.withType().configureEach { // URL showing where the source code can be accessed through the web browser remoteUrl.set(URL("https://github.com/recloudstream/cloudstream/tree/master/app/src/main/java")) - // Suffix which is used to append the line number to the URL. Use #L for GitHub remoteLineSuffix.set("#L") } diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt index c7f02baf..df41ef91 100644 --- a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt @@ -9,8 +9,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.viewbinding.ViewBinding import com.lagradost.cloudstream3.databinding.FragmentHomeBinding import com.lagradost.cloudstream3.databinding.FragmentHomeTvBinding -import com.lagradost.cloudstream3.databinding.FragmentLibraryBinding -import com.lagradost.cloudstream3.databinding.FragmentLibraryTvBinding import com.lagradost.cloudstream3.databinding.FragmentPlayerBinding import com.lagradost.cloudstream3.databinding.FragmentPlayerTvBinding import com.lagradost.cloudstream3.databinding.FragmentResultBinding @@ -19,7 +17,6 @@ import com.lagradost.cloudstream3.databinding.FragmentSearchBinding import com.lagradost.cloudstream3.databinding.FragmentSearchTvBinding import com.lagradost.cloudstream3.databinding.HomeResultGridBinding import com.lagradost.cloudstream3.databinding.HomepageParentBinding -import com.lagradost.cloudstream3.databinding.HomepageParentEmulatorBinding import com.lagradost.cloudstream3.databinding.HomepageParentTvBinding import com.lagradost.cloudstream3.databinding.PlayerCustomLayoutBinding import com.lagradost.cloudstream3.databinding.PlayerCustomLayoutTvBinding @@ -120,12 +117,9 @@ class ExampleInstrumentedTest { // testAllLayouts(activity, R.layout.home_scroll_view, R.layout.home_scroll_view_tv) // testAllLayouts(activity, R.layout.home_scroll_view, R.layout.home_scroll_view_tv) - testAllLayouts(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent_emulator, R.layout.homepage_parent) - testAllLayouts(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent_emulator, R.layout.homepage_parent) - testAllLayouts(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent_emulator, R.layout.homepage_parent) + testAllLayouts(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent) + testAllLayouts(activity, R.layout.homepage_parent_tv, R.layout.homepage_parent) - testAllLayouts(activity, R.layout.fragment_library_tv, R.layout.fragment_library) - testAllLayouts(activity, R.layout.fragment_library_tv, R.layout.fragment_library) } } } @@ -154,7 +148,7 @@ class ExampleInstrumentedTest { fun providerCorrectHomepage() { runBlocking { getAllProviders().toList().amap { api -> - TestingUtils.testHomepage(api, TestingUtils.Logger()) + TestingUtils.testHomepage(api, ::println) } } println("Done providerCorrectHomepage") @@ -166,6 +160,7 @@ class ExampleInstrumentedTest { TestingUtils.getDeferredProviderTests( this, getAllProviders(), + ::println ) { _, _ -> } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 888be999..15767d7b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,7 +6,7 @@ - + @@ -14,14 +14,8 @@ - - - - - + + tools:targetApi="o"> + android:supportsPictureInPicture="true"> @@ -97,11 +87,17 @@ --> + + + + + + @@ -165,21 +161,6 @@ - - - - - - - - - - - - @@ -187,14 +168,13 @@ - + android:exported="true"> + @@ -204,7 +184,6 @@ android:exported="false" /> diff --git a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt index d6f978fe..5f3162b4 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/AcraApplication.kt @@ -8,14 +8,12 @@ import android.content.Intent import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity -import com.lagradost.api.setContext +import com.google.auto.service.AutoService import com.lagradost.cloudstream3.mvvm.normalSafeApiCall import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall import com.lagradost.cloudstream3.plugins.PluginManager -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.AppContextUtils.openBrowser +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings +import com.lagradost.cloudstream3.utils.AppUtils.openBrowser import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread import com.lagradost.cloudstream3.utils.DataStore.getKey import com.lagradost.cloudstream3.utils.DataStore.getKeys @@ -34,11 +32,12 @@ import org.acra.sender.ReportSenderFactory import java.io.File import java.io.FileNotFoundException import java.io.PrintStream +import java.lang.Exception import java.lang.ref.WeakReference -import java.util.Locale import kotlin.concurrent.thread import kotlin.system.exitProcess + class CustomReportSender : ReportSender { // Sends all your crashes to google forms override fun send(context: Context, errorContent: CrashReportData) { @@ -66,6 +65,7 @@ class CustomReportSender : ReportSender { } } +@AutoService(ReportSenderFactory::class) class CustomSenderFactory : ReportSenderFactory { override fun create(context: Context, config: CoreConfiguration): ReportSender { return CustomReportSender() @@ -82,8 +82,14 @@ class ExceptionHandler(val errorFile: File, val onError: (() -> Unit)) : ACRA.errorReporter.handleException(error) try { PrintStream(errorFile).use { ps -> - ps.println("Currently loading extension: ${PluginManager.currentlyLoading ?: "none"}") - ps.println("Fatal exception on thread ${thread.name} (${thread.id})") + ps.println(String.format("Currently loading extension: ${PluginManager.currentlyLoading ?: "none"}")) + ps.println( + String.format( + "Fatal exception on thread %s (%d)", + thread.name, + thread.id + ) + ) error.printStackTrace(ps) } } catch (ignored: FileNotFoundException) { @@ -101,6 +107,7 @@ class AcraApplication : Application() { override fun onCreate() { super.onCreate() + //NativeCrashHandler.initCrashHandler() ExceptionHandler(filesDir.resolve("last_error")) { val intent = context!!.packageManager.getLaunchIntentForPackage(context!!.packageName) startActivity(Intent.makeRestartActivityTask(intent!!.component)) @@ -146,7 +153,6 @@ class AcraApplication : Application() { get() = _context?.get() private set(value) { _context = WeakReference(value) - setContext(WeakReference(value)) } fun getKeyClass(path: String, valueType: Class): T? { @@ -208,7 +214,7 @@ class AcraApplication : Application() { fun openBrowser(url: String, activity: FragmentActivity?) { openBrowser( url, - isLayout(TV or EMULATOR), + isTvSettings(), activity?.supportFragmentManager?.fragments?.lastOrNull() ) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt index ee3a5d12..0bcd4152 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/CommonActivity.kt @@ -5,16 +5,12 @@ import android.app.Activity import android.app.PictureInPictureParams import android.content.Context import android.content.pm.PackageManager -import android.content.res.Configuration import android.content.res.Resources import android.os.Build -import android.util.DisplayMetrics import android.util.Log -import android.view.Gravity -import android.view.KeyEvent -import android.view.View +import android.view.* import android.view.View.NO_ID -import android.view.ViewGroup +import android.widget.TextView import android.widget.Toast import androidx.activity.ComponentActivity import androidx.activity.result.contract.ActivityResultContracts @@ -30,14 +26,12 @@ import com.google.android.material.chip.ChipGroup import com.google.android.material.navigationrail.NavigationRailView import com.lagradost.cloudstream3.AcraApplication.Companion.getKey import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey -import com.lagradost.cloudstream3.MainActivity.Companion.resumeApps -import com.lagradost.cloudstream3.databinding.ToastBinding import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.ui.player.PlayerEventType import com.lagradost.cloudstream3.ui.result.ResultFragment import com.lagradost.cloudstream3.ui.result.UiText -import com.lagradost.cloudstream3.ui.settings.Globals.updateTv -import com.lagradost.cloudstream3.utils.AppContextUtils.isRtl +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.updateTv +import com.lagradost.cloudstream3.utils.AppUtils.isRtl import com.lagradost.cloudstream3.utils.DataStoreHelper import com.lagradost.cloudstream3.utils.Event import com.lagradost.cloudstream3.utils.UIHelper @@ -46,9 +40,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.shouldShowPIPMode import com.lagradost.cloudstream3.utils.UIHelper.toPx import org.schabi.newpipe.extractor.NewPipe import java.lang.ref.WeakReference -import java.util.Locale -import kotlin.math.max -import kotlin.math.min +import java.util.* enum class FocusDirection { Start, @@ -66,29 +58,11 @@ object CommonActivity { _activity = WeakReference(value) } - @MainThread - fun setActivityInstance(newActivity: Activity?) { - activity = newActivity - } - @MainThread fun Activity?.getCastSession(): CastSession? { return (this as MainActivity?)?.mSessionManager?.currentCastSession } - val displayMetrics: DisplayMetrics = Resources.getSystem().displayMetrics - - // screenWidth and screenHeight does always - // refer to the screen while in landscape mode - val screenWidth: Int - get() { - return max(displayMetrics.widthPixels, displayMetrics.heightPixels) - } - val screenHeight: Int - get() { - return min(displayMetrics.widthPixels, displayMetrics.heightPixels) - } - var canEnterPipMode: Boolean = false var canShowPipMode: Boolean = false @@ -100,7 +74,8 @@ object CommonActivity { var playerEventListener: ((PlayerEventType) -> Unit)? = null var keyEventListener: ((Pair) -> Boolean)? = null - private var currentToast: Toast? = null + + var currentToast: Toast? = null fun showToast(@StringRes message: Int, duration: Int? = null) { val act = activity ?: return @@ -156,19 +131,25 @@ object CommonActivity { } catch (e: Exception) { logError(e) } - try { - val binding = ToastBinding.inflate(act.layoutInflater) - binding.text.text = message.trim() + val inflater = + act.getSystemService(AppCompatActivity.LAYOUT_INFLATER_SERVICE) as LayoutInflater + + val layout: View = inflater.inflate( + R.layout.toast, + act.findViewById(R.id.toast_layout_root) as ViewGroup? + ) + + val text = layout.findViewById(R.id.text) as TextView + text.text = message.trim() - // custom toasts are deprecated and won't appear when cs3 sets minSDK to api30 (A11) val toast = Toast(act) - toast.duration = duration ?: Toast.LENGTH_SHORT toast.setGravity(Gravity.CENTER_HORIZONTAL or Gravity.BOTTOM, 0, 5.toPx) - toast.view = binding.root //fixme Find an alternative using default Toasts since custom toasts are deprecated and won't appear with api30 set as minSDK version. - currentToast = toast + toast.duration = duration ?: Toast.LENGTH_SHORT + toast.view = layout + //https://github.com/PureWriter/ToastCompat toast.show() - + currentToast = toast } catch (e: Exception) { logError(e) } @@ -202,25 +183,23 @@ object CommonActivity { setLocale(this, localeCode) } - fun init(act: Activity) { - setActivityInstance(act) - - val componentActivity = activity as? ComponentActivity ?: return - + fun init(act: ComponentActivity?) { + if (act == null) return + activity = act //https://stackoverflow.com/questions/52594181/how-to-know-if-user-has-disabled-picture-in-picture-feature-permission //https://developer.android.com/guide/topics/ui/picture-in-picture canShowPipMode = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && // OS SUPPORT - componentActivity.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) && // HAS FEATURE, MIGHT BE BLOCKED DUE TO POWER DRAIN - componentActivity.hasPIPPermission() // CHECK IF FEATURE IS ENABLED IN SETTINGS + act.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) && // HAS FEATURE, MIGHT BE BLOCKED DUE TO POWER DRAIN + act.hasPIPPermission() // CHECK IF FEATURE IS ENABLED IN SETTINGS - componentActivity.updateLocale() - componentActivity.updateTv() + act.updateLocale() + act.updateTv() NewPipe.init(DownloaderTestImpl.getInstance()) for (resumeApp in resumeApps) { resumeApp.launcher = - componentActivity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> + act.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> val resultCode = result.resultCode val data = result.data if (resultCode == AppCompatActivity.RESULT_OK && data != null && resumeApp.position != null && resumeApp.duration != null) { @@ -237,11 +216,11 @@ object CommonActivity { // Ask for notification permissions on Android 13 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && ContextCompat.checkSelfPermission( - componentActivity, + act, Manifest.permission.POST_NOTIFICATIONS ) != PackageManager.PERMISSION_GRANTED ) { - val requestPermissionLauncher = componentActivity.registerForActivityResult( + val requestPermissionLauncher = act.registerForActivityResult( ActivityResultContracts.RequestPermission() ) { isGranted: Boolean -> Log.d(TAG, "Notification permission: $isGranted") @@ -277,35 +256,12 @@ object CommonActivity { } } - fun updateTheme(act: Activity) { - val settingsManager = PreferenceManager.getDefaultSharedPreferences(act) - if (settingsManager - .getString(act.getString(R.string.app_theme_key), "AmoledLight") == "System" - && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - loadThemes(act) - } - } - - private fun mapSystemTheme(act: Activity): Int { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - val currentNightMode = - act.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK - return when (currentNightMode) { - Configuration.UI_MODE_NIGHT_NO -> R.style.LightMode // Night mode is not active, we're using the light theme - else -> R.style.AppTheme // Night mode is active, we're using dark theme - } - } else { - return R.style.AppTheme - } - } - fun loadThemes(act: Activity?) { if (act == null) return val settingsManager = PreferenceManager.getDefaultSharedPreferences(act) val currentTheme = when (settingsManager.getString(act.getString(R.string.app_theme_key), "AmoledLight")) { - "System" -> mapSystemTheme(act) "Black" -> R.style.AppTheme "Light" -> R.style.LightMode "Amoled" -> R.style.AmoledMode @@ -319,15 +275,12 @@ object CommonActivity { val currentOverlayTheme = when (settingsManager.getString(act.getString(R.string.primary_color_key), "Normal")) { "Normal" -> R.style.OverlayPrimaryColorNormal - "DandelionYellow" -> R.style.OverlayPrimaryColorDandelionYellow "CarnationPink" -> R.style.OverlayPrimaryColorCarnationPink - "Orange" -> R.style.OverlayPrimaryColorOrange "DarkGreen" -> R.style.OverlayPrimaryColorDarkGreen "Maroon" -> R.style.OverlayPrimaryColorMaroon "NavyBlue" -> R.style.OverlayPrimaryColorNavyBlue "Grey" -> R.style.OverlayPrimaryColorGrey "White" -> R.style.OverlayPrimaryColorWhite - "CoolBlue" -> R.style.OverlayPrimaryColorCoolBlue "Brown" -> R.style.OverlayPrimaryColorBrown "Purple" -> R.style.OverlayPrimaryColorPurple "Green" -> R.style.OverlayPrimaryColorGreen @@ -336,7 +289,6 @@ object CommonActivity { "Banana" -> R.style.OverlayPrimaryColorBanana "Party" -> R.style.OverlayPrimaryColorParty "Pink" -> R.style.OverlayPrimaryColorPink - "Lavender" -> R.style.OverlayPrimaryColorLavender "Monet" -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) R.style.OverlayPrimaryColorMonet else R.style.OverlayPrimaryColorNormal @@ -376,14 +328,6 @@ object CommonActivity { currentLook = currentLook.parent as? View ?: break }*/ - private fun View.hasContent(): Boolean { - return isShown && when (this) { - //is RecyclerView -> this.childCount > 0 - is ViewGroup -> this.childCount > 0 - else -> true - } - } - /** skips the initial stage of searching for an id using the view, see getNextFocus for specification */ fun continueGetNextFocus( root: Any?, @@ -404,17 +348,16 @@ object CommonActivity { } ?: return null next = localLook(view, nextId) ?: next - val shown = next.hasContent() // if cant focus but visible then break and let android decide // the exception if is the view is a parent and has children that wants focus val hasChildrenThatWantsFocus = (next as? ViewGroup)?.let { parent -> parent.descendantFocusability == ViewGroup.FOCUS_AFTER_DESCENDANTS && parent.childCount > 0 } ?: false - if (!next.isFocusable && shown && !hasChildrenThatWantsFocus) return null + if (!next.isFocusable && next.isShown && !hasChildrenThatWantsFocus) return null // if not shown then continue because we will "skip" over views to get to a replacement - if (!shown) { + if (!next.isShown) { // we don't want a while true loop, so we let android decide if we find a recursive view if (next == view) return null return getNextFocus(root, next, direction, depth + 1) @@ -488,6 +431,20 @@ object CommonActivity { fun onKeyDown(act: Activity?, keyCode: Int, event: KeyEvent?) { + //println("Keycode: $keyCode") + //showToast( + // this, + // "Got Keycode $keyCode | ${KeyEvent.keyCodeToString(keyCode)} \n ${event?.action}", + // Toast.LENGTH_LONG + //) + + // Tested keycodes on remote: + // KeyEvent.KEYCODE_MEDIA_FAST_FORWARD + // KeyEvent.KEYCODE_MEDIA_REWIND + // KeyEvent.KEYCODE_MENU + // KeyEvent.KEYCODE_MEDIA_NEXT + // KeyEvent.KEYCODE_MEDIA_PREVIOUS + // KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE // 149 keycode_numpad 5 when (keyCode) { diff --git a/app/src/main/java/com/lagradost/cloudstream3/DownloaderTestImpl.kt b/app/src/main/java/com/lagradost/cloudstream3/DownloaderTestImpl.kt index 8da7ca38..0a2db2bd 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/DownloaderTestImpl.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/DownloaderTestImpl.kt @@ -2,7 +2,6 @@ package com.lagradost.cloudstream3 import okhttp3.OkHttpClient import okhttp3.RequestBody -import okhttp3.RequestBody.Companion.toRequestBody import org.schabi.newpipe.extractor.downloader.Downloader import org.schabi.newpipe.extractor.downloader.Request import org.schabi.newpipe.extractor.downloader.Response @@ -11,7 +10,7 @@ import java.util.concurrent.TimeUnit class DownloaderTestImpl private constructor(builder: OkHttpClient.Builder) : Downloader() { - private val client: OkHttpClient = builder.readTimeout(30, TimeUnit.SECONDS).build() + private val client: OkHttpClient override fun execute(request: Request): Response { val httpMethod: String = request.httpMethod() val url: String = request.url() @@ -19,7 +18,7 @@ class DownloaderTestImpl private constructor(builder: OkHttpClient.Builder) : Do val dataToSend: ByteArray? = request.dataToSend() var requestBody: RequestBody? = null if (dataToSend != null) { - requestBody = dataToSend.toRequestBody(null, 0, dataToSend.size) + requestBody = RequestBody.create(null, dataToSend) } val requestBuilder: okhttp3.Request.Builder = okhttp3.Request.Builder() .method(httpMethod, requestBody).url(url) @@ -74,4 +73,8 @@ class DownloaderTestImpl private constructor(builder: OkHttpClient.Builder) : Do return instance } } + + init { + client = builder.readTimeout(30, TimeUnit.SECONDS).build() + } } \ No newline at end of file diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt similarity index 74% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt rename to app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt index 50dd667b..80332445 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt @@ -1,43 +1,46 @@ package com.lagradost.cloudstream3 +import android.annotation.SuppressLint +import android.content.Context +import android.net.Uri +import android.util.Base64.encodeToString +import androidx.annotation.WorkerThread +import androidx.preference.PreferenceManager import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.json.JsonMapper -import com.fasterxml.jackson.module.kotlin.kotlinModule +import com.fasterxml.jackson.module.kotlin.KotlinModule import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.mvvm.normalSafeApiCall +import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi +import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi +import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.simklApi import com.lagradost.cloudstream3.syncproviders.SyncIdName +import com.lagradost.cloudstream3.syncproviders.providers.SimklApi +import com.lagradost.cloudstream3.ui.player.SubtitleData import com.lagradost.cloudstream3.utils.* import com.lagradost.cloudstream3.utils.AppUtils.toJson -import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson import com.lagradost.cloudstream3.utils.Coroutines.mainWork import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf -import com.lagradost.nicehttp.RequestBodyTypes import okhttp3.Interceptor -import okhttp3.MediaType.Companion.toMediaTypeOrNull -import okhttp3.RequestBody.Companion.toRequestBody -import java.net.URI +import org.mozilla.javascript.Scriptable import java.text.SimpleDateFormat import java.util.* -import kotlin.io.encoding.Base64 -import kotlin.io.encoding.ExperimentalEncodingApi import kotlin.math.absoluteValue +const val USER_AGENT = + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36" + +//val baseHeader = mapOf("User-Agent" to USER_AGENT) +val mapper = JsonMapper.builder().addModule(KotlinModule()) + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build()!! + /** * Defines the constant for the all languages preference, if this is set then it is * the equivalent of all languages being set **/ const val AllLanguagesName = "universal" -const val USER_AGENT = - "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36" - -class ErrorLoadingException(message: String? = null) : Exception(message) - -//val baseHeader = mapOf("User-Agent" to USER_AGENT) -val mapper = JsonMapper.builder().addModule(kotlinModule()) - .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build()!! - object APIHolder { val unixTime: Long get() = System.currentTimeMillis() / 1000L @@ -108,6 +111,15 @@ object APIHolder { return null } + private fun getLoadResponseIdFromUrl(url: String, apiName: String): Int { + return url.replace(getApiFromNameNull(apiName)?.mainUrl ?: "", "").replace("/", "") + .hashCode() + } + + fun LoadResponse.getId(): Int { + return getLoadResponseIdFromUrl(url, apiName) + } + /** * Gets the website captcha token * discovered originally by https://github.com/ahmedgamal17 @@ -123,9 +135,10 @@ object APIHolder { // To get the key suspend fun getCaptchaToken(url: String, key: String, referer: String? = null): String? { try { - val uri = URI.create(url) - val domain = base64Encode( + val uri = Uri.parse(url) + val domain = encodeToString( (uri.scheme + "://" + uri.host + ":443").encodeToByteArray(), + 0 ).replace("\n", "").replace("=", ".") val vToken = @@ -164,17 +177,10 @@ object APIHolder { private var trackerCache: HashMap = hashMapOf() - /** backwards compatibility, use getTracker4 instead */ - suspend fun getTracker( - titles: List, - types: Set?, - year: Int?, - ): Tracker? = getTracker(titles, types, year, false) - /** * Get anime tracker information based on title, year and type. * Both titles are attempted to be matched with both Romaji and English title. - * Uses the anilist api. + * Uses the consumet api. * * @param titles uses first index to search, but if you have multiple titles and want extra guarantee to match you can also have that * @param types Optional parameter to narrow down the scope to Movies, TV, etc. See TrackerType.getTypes() @@ -183,8 +189,7 @@ object APIHolder { suspend fun getTracker( titles: List, types: Set?, - year: Int?, - lessAccurate: Boolean + year: Int? ): Tracker? { return try { require(titles.isNotEmpty()) { "titles must no be empty when calling getTracker" } @@ -192,73 +197,187 @@ object APIHolder { val mainTitle = titles[0] val search = trackerCache[mainTitle] - ?: searchAnilist(mainTitle)?.also { - trackerCache[mainTitle] = it - } ?: return null + ?: app.get("https://api.consumet.org/meta/anilist/$mainTitle") + .parsedSafe()?.also { + trackerCache[mainTitle] = it + } ?: return null - val res = search.data?.page?.media?.find { media -> - val matchingYears = year == null || media.seasonYear == year + val res = search.results?.find { media -> + val matchingYears = year == null || media.releaseDate == year val matchingTitles = media.title?.let { title -> titles.any { userTitle -> title.isMatchingTitles(userTitle) } } ?: false - val matchingTypes = types?.any { it.name.equals(media.format, true) } == true - if (lessAccurate) matchingTitles || matchingTypes && matchingYears else matchingTitles && matchingTypes && matchingYears + val matchingTypes = types?.any { it.name.equals(media.type, true) } == true + matchingTitles && matchingTypes && matchingYears } ?: return null - Tracker( - res.idMal, - res.id.toString(), - res.coverImage?.extraLarge ?: res.coverImage?.large, - res.bannerImage - ) + Tracker(res.malId, res.aniId, res.image, res.cover) } catch (t: Throwable) { logError(t) null } } - private suspend fun searchAnilist( - title: String?, - ): AniSearch? { - val query = """ - query ( - ${'$'}page: Int = 1 - ${'$'}search: String - ${'$'}sort: [MediaSort] = [POPULARITY_DESC, SCORE_DESC] - ${'$'}type: MediaType - ) { - Page(page: ${'$'}page, perPage: 20) { - media( - search: ${'$'}search - sort: ${'$'}sort - type: ${'$'}type - ) { - id - idMal - title { romaji english } - coverImage { extraLarge large } - bannerImage - seasonYear - format + + fun Context.getApiSettings(): HashSet { + //val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) + + val hashSet = HashSet() + val activeLangs = getApiProviderLangSettings() + val hasUniversal = activeLangs.contains(AllLanguagesName) + hashSet.addAll(synchronized(apis) { apis.filter { hasUniversal || activeLangs.contains(it.lang) } } + .map { it.name }) + + /*val set = settingsManager.getStringSet( + this.getString(R.string.search_providers_list_key), + hashSet + )?.toHashSet() ?: hashSet + + val list = HashSet() + for (name in set) { + val api = getApiFromNameNull(name) ?: continue + if (activeLangs.contains(api.lang)) { + list.add(name) } - } + }*/ + //if (list.isEmpty()) return hashSet + //return list + return hashSet + } + + fun Context.getApiDubstatusSettings(): HashSet { + val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) + val hashSet = HashSet() + hashSet.addAll(DubStatus.values()) + val list = settingsManager.getStringSet( + this.getString(R.string.display_sub_key), + hashSet.map { it.name }.toMutableSet() + ) ?: return hashSet + + val names = DubStatus.values().map { it.name }.toHashSet() + //if(realSet.isEmpty()) return hashSet + + return list.filter { names.contains(it) }.map { DubStatus.valueOf(it) }.toHashSet() + } + + fun Context.getApiProviderLangSettings(): HashSet { + val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) + val hashSet = hashSetOf(AllLanguagesName) // def is all languages +// hashSet.add("en") // def is only en + val list = settingsManager.getStringSet( + this.getString(R.string.provider_lang_key), + hashSet + ) + + if (list.isNullOrEmpty()) return hashSet + return list.toHashSet() + } + + fun Context.getApiTypeSettings(): HashSet { + val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) + val hashSet = HashSet() + hashSet.addAll(TvType.values()) + val list = settingsManager.getStringSet( + this.getString(R.string.search_types_list_key), + hashSet.map { it.name }.toMutableSet() + ) + + if (list.isNullOrEmpty()) return hashSet + + val names = TvType.values().map { it.name }.toHashSet() + val realSet = list.filter { names.contains(it) }.map { TvType.valueOf(it) }.toHashSet() + if (realSet.isEmpty()) return hashSet + + return realSet + } + + fun Context.updateHasTrailers() { + LoadResponse.isTrailersEnabled = getHasTrailers() + } + + private fun Context.getHasTrailers(): Boolean { + val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) + return settingsManager.getBoolean(this.getString(R.string.show_trailers_key), true) + } + + fun Context.filterProviderByPreferredMedia(hasHomePageIsRequired: Boolean = true): List { + // We are getting the weirdest crash ever done: + // java.lang.ClassCastException: com.lagradost.cloudstream3.TvType cannot be cast to com.lagradost.cloudstream3.TvType + // Trying fixing using classloader fuckery + val oldLoader = Thread.currentThread().contextClassLoader + Thread.currentThread().contextClassLoader = TvType::class.java.classLoader + + val default = TvType.values() + .sorted() + .filter { it != TvType.NSFW } + .map { it.ordinal } + + Thread.currentThread().contextClassLoader = oldLoader + + val defaultSet = default.map { it.toString() }.toSet() + val currentPrefMedia = try { + PreferenceManager.getDefaultSharedPreferences(this) + .getStringSet(this.getString(R.string.prefer_media_type_key), defaultSet) + ?.mapNotNull { it.toIntOrNull() ?: return@mapNotNull null } + } catch (e: Throwable) { + null + } ?: default + val langs = this.getApiProviderLangSettings() + val hasUniversal = langs.contains(AllLanguagesName) + val allApis = synchronized(apis) { + apis.filter { api -> (hasUniversal || langs.contains(api.lang)) && (api.hasMainPage || !hasHomePageIsRequired) } } - """.trimIndent().trim() + return if (currentPrefMedia.isEmpty()) { + allApis + } else { + // Filter API depending on preferred media type + allApis.filter { api -> api.supportedTypes.any { currentPrefMedia.contains(it.ordinal) } } + } + } - val data = mapOf( - "query" to query, - "variables" to mapOf( - "search" to title, - "sort" to "SEARCH_MATCH", - "type" to "ANIME", - ) - ).toJson().toRequestBody(RequestBodyTypes.JSON.toMediaTypeOrNull()) + fun Context.filterSearchResultByFilmQuality(data: List): List { + // Filter results omitting entries with certain quality + if (data.isNotEmpty()) { + val filteredSearchQuality = PreferenceManager.getDefaultSharedPreferences(this) + ?.getStringSet(getString(R.string.pref_filter_search_quality_key), setOf()) + ?.mapNotNull { entry -> + entry.toIntOrNull() ?: return@mapNotNull null + } ?: listOf() + if (filteredSearchQuality.isNotEmpty()) { + return data.filter { item -> + val searchQualVal = item.quality?.ordinal ?: -1 + //Log.i("filterSearch", "QuickSearch item => ${item.toJson()}") + !filteredSearchQuality.contains(searchQualVal) + } + } + } + return data + } - return app.post("https://graphql.anilist.co", requestBody = data) - .parsedSafe() + fun Context.filterHomePageListByFilmQuality(data: HomePageList): HomePageList { + // Filter results omitting entries with certain quality + if (data.list.isNotEmpty()) { + val filteredSearchQuality = PreferenceManager.getDefaultSharedPreferences(this) + ?.getStringSet(getString(R.string.pref_filter_search_quality_key), setOf()) + ?.mapNotNull { entry -> + entry.toIntOrNull() ?: return@mapNotNull null + } ?: listOf() + if (filteredSearchQuality.isNotEmpty()) { + return HomePageList( + name = data.name, + isHorizontalImages = data.isHorizontalImages, + list = data.list.filter { item -> + val searchQualVal = item.quality?.ordinal ?: -1 + //Log.i("filterSearch", "QuickSearch item => ${item.toJson()}") + !filteredSearchQuality.contains(searchQualVal) + } + ) + } + } + return data } } @@ -448,7 +567,7 @@ abstract class MainAPI { /**Used for testing and can be used to disable the providers if WebView is not available*/ open val usesWebView = false - /** Determines which plugin a given provider is from. This is the full path to the plugin. */ + /** Determines which plugin a given provider is from */ var sourcePlugin: String? = null open val hasMainPage = false @@ -482,7 +601,7 @@ abstract class MainAPI { //emptyList() // open val mainPage = listOf(MainPageData("", "", false)) - // @WorkerThread + @WorkerThread open suspend fun getMainPage( page: Int, request: MainPageRequest, @@ -490,17 +609,17 @@ abstract class MainAPI { throw NotImplementedError() } - // @WorkerThread + @WorkerThread open suspend fun search(query: String): List? { throw NotImplementedError() } - // @WorkerThread + @WorkerThread open suspend fun quickSearch(query: String): List? { throw NotImplementedError() } - // @WorkerThread + @WorkerThread /** * Based on data from search() or getMainPage() it generates a LoadResponse, * basically opening the info page from a link. @@ -518,13 +637,13 @@ abstract class MainAPI { * This function might be updated to include exoplayer timestamps etc in the future * if the need arises. * */ - // @WorkerThread + @WorkerThread open suspend fun extractorVerifierJob(extractorData: String?) { throw NotImplementedError() } /**Callback is fired once a link is found, will return true if method is executed successfully*/ - // @WorkerThread + @WorkerThread open suspend fun loadLinks( data: String, isCasting: Boolean, @@ -549,18 +668,31 @@ abstract class MainAPI { } /** Might need a different implementation for desktop*/ +@SuppressLint("NewApi") fun base64Decode(string: String): String { return String(base64DecodeArray(string), Charsets.ISO_8859_1) } -@OptIn(ExperimentalEncodingApi::class) + +@SuppressLint("NewApi") fun base64DecodeArray(string: String): ByteArray { - return Base64.decode(string) + return try { + android.util.Base64.decode(string, android.util.Base64.DEFAULT) + } catch (e: Exception) { + Base64.getDecoder().decode(string) + } } -@OptIn(ExperimentalEncodingApi::class) + +@SuppressLint("NewApi") fun base64Encode(array: ByteArray): String { - return Base64.encode(array) + return try { + String(android.util.Base64.encode(array, android.util.Base64.NO_WRAP), Charsets.ISO_8859_1) + } catch (e: Exception) { + String(Base64.getEncoder().encode(array)) + } } +class ErrorLoadingException(message: String? = null) : Exception(message) + fun MainAPI.fixUrlNull(url: String?): String? { if (url.isNullOrEmpty()) { return null @@ -594,6 +726,10 @@ fun sortUrls(urls: Set): List { return urls.sortedBy { t -> -t.quality } } +fun sortSubs(subs: Set): List { + return subs.sortedBy { it.name } +} + fun capitalizeString(str: String): String { return capitalizeStringNullable(str) ?: str } @@ -677,12 +813,7 @@ enum class TvType(value: Int?) { AsianDrama(9), Live(10), NSFW(11), - Others(12), - Music(13), - AudioBook(14), - - /** Wont load the built in player, make your own interaction */ - CustomMedia(15), + Others(12) } public enum class AutoDownloadMode(val value: Int) { @@ -1012,28 +1143,13 @@ interface LoadResponse { var syncData: MutableMap var posterHeaders: Map? var backgroundPosterUrl: String? - var contentRating: String? companion object { - var malIdPrefix = "" //malApi.idPrefix - var aniListIdPrefix = "" //aniListApi.idPrefix - var simklIdPrefix = "" //simklApi.idPrefix + private val malIdPrefix = malApi.idPrefix + private val aniListIdPrefix = aniListApi.idPrefix + private val simklIdPrefix = simklApi.idPrefix var isTrailersEnabled = true - /** - * The ID string is a way to keep a collection of services in one single ID using a map - * This adds a database service (like imdb) to the string and returns the new string. - */ - fun addIdToString(idString: String?, database: SimklSyncServices, id: String?): String? { - if (id == null) return idString - return (readIdFromString(idString) + mapOf(database to id)).toJson() - } - - /** Read the id string to get all other ids */ - fun readIdFromString(idString: String?): Map { - return tryParseJson(idString) ?: return emptyMap() - } - fun LoadResponse.isMovie(): Boolean { return this.type.isMovieType() || this is MovieLoadResponse } @@ -1057,12 +1173,12 @@ interface LoadResponse { * Internal helper function to add simkl ids from other databases. */ private fun LoadResponse.addSimklId( - database: SimklSyncServices, + database: SimklApi.Companion.SyncServices, id: String? ) { normalSafeApiCall { this.syncData[simklIdPrefix] = - addIdToString(this.syncData[simklIdPrefix], database, id.toString()) + SimklApi.addIdToString(this.syncData[simklIdPrefix], database, id.toString()) ?: return@normalSafeApiCall } } @@ -1080,30 +1196,18 @@ interface LoadResponse { return this.syncData[aniListIdPrefix] } - fun LoadResponse.getImdbId(): String? { - return normalSafeApiCall { - readIdFromString(this.syncData[simklIdPrefix])[SimklSyncServices.Imdb] - } - } - - fun LoadResponse.getTMDbId(): String? { - return normalSafeApiCall { - readIdFromString(this.syncData[simklIdPrefix])[SimklSyncServices.Tmdb] - } - } - fun LoadResponse.addMalId(id: Int?) { this.syncData[malIdPrefix] = (id ?: return).toString() - this.addSimklId(SimklSyncServices.Mal, id.toString()) + this.addSimklId(SimklApi.Companion.SyncServices.Mal, id.toString()) } fun LoadResponse.addAniListId(id: Int?) { this.syncData[aniListIdPrefix] = (id ?: return).toString() - this.addSimklId(SimklSyncServices.AniList, id.toString()) + this.addSimklId(SimklApi.Companion.SyncServices.AniList, id.toString()) } fun LoadResponse.addSimklId(id: Int?) { - this.addSimklId(SimklSyncServices.Simkl, id.toString()) + this.addSimklId(SimklApi.Companion.SyncServices.Simkl, id.toString()) } fun LoadResponse.addImdbUrl(url: String?) { @@ -1185,7 +1289,7 @@ interface LoadResponse { fun LoadResponse.addImdbId(id: String?) { // TODO add imdb sync - this.addSimklId(SimklSyncServices.Imdb, id) + this.addSimklId(SimklApi.Companion.SyncServices.Imdb, id) } fun LoadResponse.addTrackId(id: String?) { @@ -1198,7 +1302,7 @@ interface LoadResponse { fun LoadResponse.addTMDbId(id: String?) { // TODO add TMDb sync - this.addSimklId(SimklSyncServices.Tmdb, id) + this.addSimklId(SimklApi.Companion.SyncServices.Tmdb, id) } fun LoadResponse.addRating(text: String?) { @@ -1277,24 +1381,11 @@ fun TvType?.isEpisodeBased(): Boolean { return (this == TvType.TvSeries || this == TvType.Anime || this == TvType.AsianDrama) } + data class NextAiring( val episode: Int, val unixTime: Long, - val season: Int? = null, -) { - /** - * Secondary constructor for backwards compatibility without season. - * TODO Remove this constructor after there is a new stable release and extensions are updated to support season. - */ - constructor( - episode: Int, - unixTime: Long, - ) : this( - episode, - unixTime, - null - ) -} +) /** * @param season To be mapped with episode season, not shown in UI if displaySeason is defined @@ -1312,15 +1403,6 @@ interface EpisodeResponse { var nextAiring: NextAiring? var seasonNames: List? fun getLatestEpisodes(): Map - - /** Count all episodes in all previous seasons up until this episode to get a total count. - * Example: - * Season 1: 10 episodes. - * Season 2: 6 episodes. - * - * getTotalEpisodeIndex(episode = 3, season = 2) -> 10 + 3 = 13 - * */ - fun getTotalEpisodeIndex(episode: Int, season: Int): Int } @JvmName("addSeasonNamesString") @@ -1358,55 +1440,7 @@ data class TorrentLoadResponse( override var syncData: MutableMap = mutableMapOf(), override var posterHeaders: Map? = null, override var backgroundPosterUrl: String? = null, - override var contentRating: String? = null, -) : LoadResponse { - /** - * Secondary constructor for backwards compatibility without contentRating. - * Remove this constructor after there is a new stable release and extensions are updated to support contentRating. - */ - constructor( - name: String, - url: String, - apiName: String, - magnet: String?, - torrent: String?, - plot: String?, - type: TvType = TvType.Torrent, - posterUrl: String? = null, - year: Int? = null, - rating: Int? = null, - tags: List? = null, - duration: Int? = null, - trailers: MutableList = mutableListOf(), - recommendations: List? = null, - actors: List? = null, - comingSoon: Boolean = false, - syncData: MutableMap = mutableMapOf(), - posterHeaders: Map? = null, - backgroundPosterUrl: String? = null, - ) : this( - name, - url, - apiName, - magnet, - torrent, - plot, - type, - posterUrl, - year, - rating, - tags, - duration, - trailers, - recommendations, - actors, - comingSoon, - syncData, - posterHeaders, - backgroundPosterUrl, - null - ) -} +) : LoadResponse data class AnimeLoadResponse( var engName: String? = null, @@ -1437,7 +1471,6 @@ data class AnimeLoadResponse( override var nextAiring: NextAiring? = null, override var seasonNames: List? = null, override var backgroundPosterUrl: String? = null, - override var contentRating: String? = null, ) : LoadResponse, EpisodeResponse { override fun getLatestEpisodes(): Map { return episodes.map { (status, episodes) -> @@ -1449,77 +1482,6 @@ data class AnimeLoadResponse( .takeUnless { it == Int.MIN_VALUE } }.toMap() } - - override fun getTotalEpisodeIndex(episode: Int, season: Int): Int { - val displayMap = this.seasonNames?.associate { it.season to it.displaySeason } ?: emptyMap() - - return this.episodes.maxOf { (_, episodes) -> - episodes.count { episodeData -> - // Prioritize display season as actual season may be something random to fit multiple seasons into one. - val episodeSeason = - displayMap[episodeData.season] ?: episodeData.season ?: Int.MIN_VALUE - // Count all episodes from season 1 to below the current season. - episodeSeason in 1..> = mutableMapOf(), - showStatus: ShowStatus? = null, - plot: String? = null, - tags: List? = null, - synonyms: List? = null, - rating: Int? = null, - duration: Int? = null, - trailers: MutableList = mutableListOf(), - recommendations: List? = null, - actors: List? = null, - comingSoon: Boolean = false, - syncData: MutableMap = mutableMapOf(), - posterHeaders: Map? = null, - nextAiring: NextAiring? = null, - seasonNames: List? = null, - backgroundPosterUrl: String? = null, - ) : this( - engName, - japName, - name, - url, - apiName, - type, - posterUrl, - year, - episodes, - showStatus, - plot, - tags, - synonyms, - rating, - duration, - trailers, - recommendations, - actors, - comingSoon, - syncData, - posterHeaders, - nextAiring, - seasonNames, - backgroundPosterUrl, - null - ) } /** @@ -1571,36 +1533,7 @@ data class LiveStreamLoadResponse( override var syncData: MutableMap = mutableMapOf(), override var posterHeaders: Map? = null, override var backgroundPosterUrl: String? = null, - override var contentRating: String? = null, -) : LoadResponse { - /** - * Secondary constructor for backwards compatibility without contentRating. - * Remove this constructor after there is a new stable release and extensions are updated to support contentRating. - */ - constructor( - name: String, - url: String, - apiName: String, - dataUrl: String, - posterUrl: String? = null, - year: Int? = null, - plot: String? = null, - type: TvType = TvType.Live, - rating: Int? = null, - tags: List? = null, - duration: Int? = null, - trailers: MutableList = mutableListOf(), - recommendations: List? = null, - actors: List? = null, - comingSoon: Boolean = false, - syncData: MutableMap = mutableMapOf(), - posterHeaders: Map? = null, - backgroundPosterUrl: String? = null, - ) : this( - name, url, apiName, dataUrl, posterUrl, year, plot, type, rating, tags, duration, trailers, - recommendations, actors, comingSoon, syncData, posterHeaders, backgroundPosterUrl, null - ) -} +) : LoadResponse data class MovieLoadResponse( override var name: String, @@ -1623,36 +1556,7 @@ data class MovieLoadResponse( override var syncData: MutableMap = mutableMapOf(), override var posterHeaders: Map? = null, override var backgroundPosterUrl: String? = null, - override var contentRating: String? = null, -) : LoadResponse { - /** - * Secondary constructor for backwards compatibility without contentRating. - * Remove this constructor after there is a new stable release and extensions are updated to support contentRating. - */ - constructor( - name: String, - url: String, - apiName: String, - type: TvType, - dataUrl: String, - posterUrl: String? = null, - year: Int? = null, - plot: String? = null, - rating: Int? = null, - tags: List? = null, - duration: Int? = null, - trailers: MutableList = mutableListOf(), - recommendations: List? = null, - actors: List? = null, - comingSoon: Boolean = false, - syncData: MutableMap = mutableMapOf(), - posterHeaders: Map? = null, - backgroundPosterUrl: String? = null, - ) : this( - name, url, apiName, type, dataUrl, posterUrl, year, plot, rating, tags, duration, trailers, - recommendations, actors, comingSoon, syncData, posterHeaders, backgroundPosterUrl, null - ) -} +) : LoadResponse suspend fun MainAPI.newMovieLoadResponse( name: String, @@ -1700,17 +1604,7 @@ suspend fun MainAPI.newMovieLoadResponse( builder.initializer() return builder } -/** Episode information that will be passed to LoadLinks function & showed on UI - * @property data string used as main LoadLinks fun parameter. - * @property name Name of the Episode. - * @property season Season number. - * @property episode Episode number. - * @property posterUrl URL of Episode's poster image. - * @property rating Episode rating. - * @property date Episode air date, see addDate. - * @property runTime Episode runtime in seconds. - * @see[addDate] - * */ + data class Episode( var data: String, var name: String? = null, @@ -1720,25 +1614,7 @@ data class Episode( var rating: Int? = null, var description: String? = null, var date: Long? = null, - var runTime: Int? = null, -) { - /** - * Secondary constructor for backwards compatibility without runTime. - * TODO Remove this constructor after there is a new stable release and extensions are updated to support runTime. - */ - constructor( - data: String, - name: String? = null, - season: Int? = null, - episode: Int? = null, - posterUrl: String? = null, - rating: Int? = null, - description: String? = null, - date: Long? = null, - ) : this( - data, name, season, episode, posterUrl, rating, description, date, null - ) -} +) fun Episode.addDate(date: String?, format: String = "yyyy-MM-dd") { try { @@ -1780,28 +1656,6 @@ fun MainAPI.newEpisode( return builder } -interface IDownloadableMinimum { - val url: String - val referer: String - val headers: Map -} - -fun IDownloadableMinimum.getId(): Int { - return url.hashCode() -} - -/** - * Set of sync services simkl is compatible with. - * Add more as required: https://simkl.docs.apiary.io/#reference/search/id-lookup/get-items-by-id - */ -enum class SimklSyncServices(val originalName: String) { - Simkl("simkl"), - Imdb("imdb"), - Tmdb("tmdb"), - AniList("anilist"), - Mal("mal"), -} - data class TvSeriesLoadResponse( override var name: String, override var url: String, @@ -1826,7 +1680,6 @@ data class TvSeriesLoadResponse( override var nextAiring: NextAiring? = null, override var seasonNames: List? = null, override var backgroundPosterUrl: String? = null, - override var contentRating: String? = null, ) : LoadResponse, EpisodeResponse { override fun getLatestEpisodes(): Map { val maxSeason = @@ -1837,69 +1690,6 @@ data class TvSeriesLoadResponse( .takeUnless { it == Int.MIN_VALUE } return mapOf(DubStatus.None to max) } - - override fun getTotalEpisodeIndex(episode: Int, season: Int): Int { - val displayMap = this.seasonNames?.associate { it.season to it.displaySeason } ?: emptyMap() - - return episodes.count { episodeData -> - // Prioritize display season as actual season may be something random to fit multiple seasons into one. - val episodeSeason = - displayMap[episodeData.season] ?: episodeData.season ?: Int.MIN_VALUE - // Count all episodes from season 1 to below the current season. - episodeSeason in 1.., - posterUrl: String? = null, - year: Int? = null, - plot: String? = null, - showStatus: ShowStatus? = null, - rating: Int? = null, - tags: List? = null, - duration: Int? = null, - trailers: MutableList = mutableListOf(), - recommendations: List? = null, - actors: List? = null, - comingSoon: Boolean = false, - syncData: MutableMap = mutableMapOf(), - posterHeaders: Map? = null, - nextAiring: NextAiring? = null, - seasonNames: List? = null, - backgroundPosterUrl: String? = null, - ) : this( - name, - url, - apiName, - type, - episodes, - posterUrl, - year, - plot, - showStatus, - rating, - tags, - duration, - trailers, - recommendations, - actors, - comingSoon, - syncData, - posterHeaders, - nextAiring, - seasonNames, - backgroundPosterUrl, - null - ) } suspend fun MainAPI.newTvSeriesLoadResponse( @@ -1940,43 +1730,30 @@ data class Tracker( val cover: String? = null, ) -data class AniSearch( - @JsonProperty("data") var data: Data? = Data() +data class Title( + @JsonProperty("romaji") val romaji: String? = null, + @JsonProperty("english") val english: String? = null, ) { - data class Data( - @JsonProperty("Page") var page: Page? = Page() - ) { - data class Page( - @JsonProperty("media") var media: ArrayList = arrayListOf() - ) { - data class Media( - @JsonProperty("title") var title: Title? = null, - @JsonProperty("id") var id: Int? = null, - @JsonProperty("idMal") var idMal: Int? = null, - @JsonProperty("seasonYear") var seasonYear: Int? = null, - @JsonProperty("format") var format: String? = null, - @JsonProperty("coverImage") var coverImage: CoverImage? = null, - @JsonProperty("bannerImage") var bannerImage: String? = null, - ) { - data class CoverImage( - @JsonProperty("extraLarge") var extraLarge: String? = null, - @JsonProperty("large") var large: String? = null, - ) - - data class Title( - @JsonProperty("romaji") var romaji: String? = null, - @JsonProperty("english") var english: String? = null, - ) { - fun isMatchingTitles(title: String?): Boolean { - if (title == null) return false - return english.equals(title, true) || romaji.equals(title, true) - } - } - } - } + fun isMatchingTitles(title: String?): Boolean { + if (title == null) return false + return english.equals(title, true) || romaji.equals(title, true) } } +data class Results( + @JsonProperty("id") val aniId: String? = null, + @JsonProperty("malId") val malId: Int? = null, + @JsonProperty("title") val title: Title? = null, + @JsonProperty("releaseDate") val releaseDate: Int? = null, + @JsonProperty("type") val type: String? = null, + @JsonProperty("image") val image: String? = null, + @JsonProperty("cover") val cover: String? = null, +) + +data class AniSearch( + @JsonProperty("results") val results: ArrayList? = arrayListOf() +) + /** * used for the getTracker() method **/ diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt index 5408d2a8..fbad4fce 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt @@ -6,7 +6,6 @@ import android.content.Context import android.content.Intent import android.content.res.ColorStateList import android.content.res.Configuration -import android.graphics.Rect import android.net.Uri import android.os.Build import android.os.Bundle @@ -19,7 +18,6 @@ import android.view.View import android.view.ViewGroup import android.view.WindowManager import android.widget.Toast -import androidx.activity.OnBackPressedCallback import androidx.activity.result.ActivityResultLauncher import androidx.annotation.IdRes import androidx.annotation.MainThread @@ -28,7 +26,6 @@ import androidx.appcompat.app.AppCompatActivity import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.view.children import androidx.core.view.isGone -import androidx.core.view.isInvisible import androidx.core.view.isVisible import androidx.core.view.marginStart import androidx.fragment.app.FragmentActivity @@ -44,6 +41,9 @@ import androidx.preference.PreferenceManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearSnapHelper import androidx.recyclerview.widget.RecyclerView +import com.fasterxml.jackson.databind.DeserializationFeature +import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.google.android.gms.cast.framework.CastContext import com.google.android.gms.cast.framework.Session import com.google.android.gms.cast.framework.SessionManager @@ -52,108 +52,85 @@ import com.google.android.material.bottomnavigation.BottomNavigationView import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.navigationrail.NavigationRailView import com.google.android.material.snackbar.Snackbar -import com.google.common.collect.Comparators.min import com.jaredrummler.android.colorpicker.ColorPickerDialogListener import com.lagradost.cloudstream3.APIHolder.allProviders import com.lagradost.cloudstream3.APIHolder.apis +import com.lagradost.cloudstream3.APIHolder.getApiDubstatusSettings import com.lagradost.cloudstream3.APIHolder.initAll -import com.lagradost.cloudstream3.AcraApplication.Companion.getKey +import com.lagradost.cloudstream3.APIHolder.updateHasTrailers import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey import com.lagradost.cloudstream3.AcraApplication.Companion.setKey import com.lagradost.cloudstream3.CommonActivity.loadThemes import com.lagradost.cloudstream3.CommonActivity.onColorSelectedEvent import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent import com.lagradost.cloudstream3.CommonActivity.onUserLeaveHint -import com.lagradost.cloudstream3.CommonActivity.screenHeight -import com.lagradost.cloudstream3.CommonActivity.setActivityInstance import com.lagradost.cloudstream3.CommonActivity.showToast import com.lagradost.cloudstream3.CommonActivity.updateLocale -import com.lagradost.cloudstream3.CommonActivity.updateTheme import com.lagradost.cloudstream3.databinding.ActivityMainBinding import com.lagradost.cloudstream3.databinding.ActivityMainTvBinding import com.lagradost.cloudstream3.databinding.BottomResultviewPreviewBinding import com.lagradost.cloudstream3.mvvm.Resource +import com.lagradost.cloudstream3.mvvm.debugAssert import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.mvvm.normalSafeApiCall -import com.lagradost.cloudstream3.mvvm.observe import com.lagradost.cloudstream3.mvvm.observeNullable import com.lagradost.cloudstream3.network.initClient import com.lagradost.cloudstream3.plugins.PluginManager import com.lagradost.cloudstream3.plugins.PluginManager.loadAllOnlinePlugins import com.lagradost.cloudstream3.plugins.PluginManager.loadSinglePlugin import com.lagradost.cloudstream3.receivers.VideoDownloadRestartReceiver -import com.lagradost.cloudstream3.services.SubscriptionWorkManager -import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING -import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING_PLAYER -import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING_REPO -import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING_RESUME_WATCHING -import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING_SEARCH import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.OAuth2Apis import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.accountManagers +import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appString +import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringPlayer +import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringRepo +import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringResumeWatching +import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringSearch import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.inAppAuths -import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.localListApi -import com.lagradost.cloudstream3.syncproviders.SyncAPI import com.lagradost.cloudstream3.ui.APIRepository -import com.lagradost.cloudstream3.ui.SyncWatchType import com.lagradost.cloudstream3.ui.WatchType import com.lagradost.cloudstream3.ui.download.DOWNLOAD_NAVIGATE_TO import com.lagradost.cloudstream3.ui.home.HomeViewModel -import com.lagradost.cloudstream3.ui.library.LibraryViewModel import com.lagradost.cloudstream3.ui.player.BasicLink import com.lagradost.cloudstream3.ui.player.GeneratorPlayer import com.lagradost.cloudstream3.ui.player.LinkGenerator import com.lagradost.cloudstream3.ui.result.LinearListLayout import com.lagradost.cloudstream3.ui.result.ResultViewModel2 import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST -import com.lagradost.cloudstream3.ui.result.SyncViewModel import com.lagradost.cloudstream3.ui.result.setImage import com.lagradost.cloudstream3.ui.result.setText -import com.lagradost.cloudstream3.ui.result.setTextHtml import com.lagradost.cloudstream3.ui.result.txt import com.lagradost.cloudstream3.ui.search.SearchFragment import com.lagradost.cloudstream3.ui.search.SearchResultBuilder -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.PHONE -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.ui.settings.Globals.updateTv +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isEmulatorSettings +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.updateTv import com.lagradost.cloudstream3.ui.settings.SettingsGeneral import com.lagradost.cloudstream3.ui.setup.HAS_DONE_SETUP_KEY import com.lagradost.cloudstream3.ui.setup.SetupFragmentExtensions import com.lagradost.cloudstream3.utils.ApkInstaller -import com.lagradost.cloudstream3.utils.AppContextUtils.getApiDubstatusSettings -import com.lagradost.cloudstream3.utils.AppContextUtils.html -import com.lagradost.cloudstream3.utils.AppContextUtils.isCastApiAvailable -import com.lagradost.cloudstream3.utils.AppContextUtils.isLtr -import com.lagradost.cloudstream3.utils.AppContextUtils.isNetworkAvailable -import com.lagradost.cloudstream3.utils.AppContextUtils.isRtl -import com.lagradost.cloudstream3.utils.AppContextUtils.loadCache -import com.lagradost.cloudstream3.utils.AppContextUtils.loadRepository -import com.lagradost.cloudstream3.utils.AppContextUtils.loadResult -import com.lagradost.cloudstream3.utils.AppContextUtils.loadSearchResult -import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus -import com.lagradost.cloudstream3.utils.AppContextUtils.updateHasTrailers -import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback -import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback +import com.lagradost.cloudstream3.utils.AppUtils.html +import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable +import com.lagradost.cloudstream3.utils.AppUtils.isLtr +import com.lagradost.cloudstream3.utils.AppUtils.isNetworkAvailable +import com.lagradost.cloudstream3.utils.AppUtils.isRtl +import com.lagradost.cloudstream3.utils.AppUtils.loadCache +import com.lagradost.cloudstream3.utils.AppUtils.loadRepository +import com.lagradost.cloudstream3.utils.AppUtils.loadResult +import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult +import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus import com.lagradost.cloudstream3.utils.BackupUtils.backup import com.lagradost.cloudstream3.utils.BackupUtils.setUpBackup -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.BiometricCallback -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.biometricPrompt -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.deviceHasPasswordPinLock -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.isAuthEnabled -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.promptInfo -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.startBiometricAuthentication import com.lagradost.cloudstream3.utils.Coroutines.ioSafe import com.lagradost.cloudstream3.utils.Coroutines.main import com.lagradost.cloudstream3.utils.DataStore.getKey import com.lagradost.cloudstream3.utils.DataStore.setKey -import com.lagradost.cloudstream3.utils.DataStoreHelper -import com.lagradost.cloudstream3.utils.DataStoreHelper.accounts import com.lagradost.cloudstream3.utils.DataStoreHelper.migrateResumeWatching import com.lagradost.cloudstream3.utils.Event +import com.lagradost.cloudstream3.utils.IOnBackPressed import com.lagradost.cloudstream3.utils.InAppUpdater.Companion.runAutoUpdate import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog -import com.lagradost.cloudstream3.utils.SnackbarHelper.showSnackbar import com.lagradost.cloudstream3.utils.UIHelper.changeStatusBarState import com.lagradost.cloudstream3.utils.UIHelper.checkWrite import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute @@ -165,7 +142,8 @@ import com.lagradost.cloudstream3.utils.UIHelper.requestRW import com.lagradost.cloudstream3.utils.UIHelper.toPx import com.lagradost.cloudstream3.utils.USER_PROVIDER_API import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API -import com.lagradost.cloudstream3.utils.fcast.FcastManager +import com.lagradost.nicehttp.Requests +import com.lagradost.nicehttp.ResponseParser import com.lagradost.safefile.SafeFile import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock @@ -176,8 +154,10 @@ import java.net.URLDecoder import java.nio.charset.Charset import kotlin.math.abs import kotlin.math.absoluteValue +import kotlin.reflect.KClass import kotlin.system.exitProcess + //https://github.com/videolan/vlc-android/blob/3706c4be2da6800b3d26344fc04fab03ffa4b860/application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.kt#L1898 //https://wiki.videolan.org/Android_Player_Intents/ @@ -188,114 +168,119 @@ import kotlin.system.exitProcess //https://github.com/jellyfin/jellyfin-android/blob/6cbf0edf84a3da82347c8d59b5d5590749da81a9/app/src/main/java/org/jellyfin/mobile/bridge/ExternalPlayer.kt#L225 -class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCallback { +const val VLC_PACKAGE = "org.videolan.vlc" +const val MPV_PACKAGE = "is.xyz.mpv" +const val WEB_VIDEO_CAST_PACKAGE = "com.instantbits.cast.webvideo" + +val VLC_COMPONENT = ComponentName(VLC_PACKAGE, "$VLC_PACKAGE.gui.video.VideoPlayerActivity") +val MPV_COMPONENT = ComponentName(MPV_PACKAGE, "$MPV_PACKAGE.MPVActivity") + +//TODO REFACTOR AF +open class ResultResume( + val packageString: String, + val action: String = Intent.ACTION_VIEW, + val position: String? = null, + val duration: String? = null, + var launcher: ActivityResultLauncher? = null, +) { + val defaultTime = -1L + + val lastId get() = "${packageString}_last_open_id" + suspend fun launch(id: Int?, callback: suspend Intent.() -> Unit) { + val intent = Intent(action) + + if (id != null) + setKey(lastId, id) + else + removeKey(lastId) + + intent.setPackage(packageString) + callback.invoke(intent) + launcher?.launch(intent) + } + + open fun getPosition(intent: Intent?): Long { + return defaultTime + } + + open fun getDuration(intent: Intent?): Long { + return defaultTime + } +} + +val VLC = object : ResultResume( + VLC_PACKAGE, + // Android 13 intent restrictions fucks up specifically launching the VLC player + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { + "org.videolan.vlc.player.result" + } else { + Intent.ACTION_VIEW + }, + "extra_position", + "extra_duration", +) { + override fun getPosition(intent: Intent?): Long { + return intent?.getLongExtra(this.position, defaultTime) ?: defaultTime + } + + override fun getDuration(intent: Intent?): Long { + return intent?.getLongExtra(this.duration, defaultTime) ?: defaultTime + } +} + +val MPV = object : ResultResume( + MPV_PACKAGE, + //"is.xyz.mpv.MPVActivity.result", // resume not working :pensive: + position = "position", + duration = "duration", +) { + override fun getPosition(intent: Intent?): Long { + return intent?.getIntExtra(this.position, defaultTime.toInt())?.toLong() ?: defaultTime + } + + override fun getDuration(intent: Intent?): Long { + return intent?.getIntExtra(this.duration, defaultTime.toInt())?.toLong() ?: defaultTime + } +} + +val WEB_VIDEO = ResultResume(WEB_VIDEO_CAST_PACKAGE) + +val resumeApps = arrayOf( + VLC, MPV, WEB_VIDEO +) + +// Short name for requests client to make it nicer to use + +var app = Requests(responseParser = object : ResponseParser { + val mapper: ObjectMapper = jacksonObjectMapper().configure( + DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, + false + ) + + override fun parse(text: String, kClass: KClass): T { + return mapper.readValue(text, kClass.java) + } + + override fun parseSafe(text: String, kClass: KClass): T? { + return try { + mapper.readValue(text, kClass.java) + } catch (e: Exception) { + null + } + } + + override fun writeValueAsString(obj: Any): String { + return mapper.writeValueAsString(obj) + } +}).apply { + defaultHeaders = mapOf("user-agent" to USER_AGENT) +} + +class MainActivity : AppCompatActivity(), ColorPickerDialogListener { companion object { - const val VLC_PACKAGE = "org.videolan.vlc" - const val MPV_PACKAGE = "is.xyz.mpv" - const val WEB_VIDEO_CAST_PACKAGE = "com.instantbits.cast.webvideo" - - val VLC_COMPONENT = ComponentName(VLC_PACKAGE, "$VLC_PACKAGE.gui.video.VideoPlayerActivity") - val MPV_COMPONENT = ComponentName(MPV_PACKAGE, "$MPV_PACKAGE.MPVActivity") - - //TODO REFACTOR AF - open class ResultResume( - val packageString: String, - val action: String = Intent.ACTION_VIEW, - val position: String? = null, - val duration: String? = null, - var launcher: ActivityResultLauncher? = null, - ) { - val defaultTime = -1L - - val lastId get() = "${packageString}_last_open_id" - suspend fun launch(id: Int?, callback: suspend Intent.() -> Unit) { - val intent = Intent(action) - - if (id != null) - setKey(lastId, id) - else - removeKey(lastId) - - intent.setPackage(packageString) - callback.invoke(intent) - launcher?.launch(intent) - } - - open fun getPosition(intent: Intent?): Long { - return defaultTime - } - - open fun getDuration(intent: Intent?): Long { - return defaultTime - } - } - - val VLC = object : ResultResume( - VLC_PACKAGE, - // Android 13 intent restrictions fucks up specifically launching the VLC player - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { - "org.videolan.vlc.player.result" - } else { - Intent.ACTION_VIEW - }, - "extra_position", - "extra_duration", - ) { - override fun getPosition(intent: Intent?): Long { - return intent?.getLongExtra(this.position, defaultTime) ?: defaultTime - } - - override fun getDuration(intent: Intent?): Long { - return intent?.getLongExtra(this.duration, defaultTime) ?: defaultTime - } - } - - val MPV = object : ResultResume( - MPV_PACKAGE, - //"is.xyz.mpv.MPVActivity.result", // resume not working :pensive: - position = "position", - duration = "duration", - ) { - override fun getPosition(intent: Intent?): Long { - return intent?.getIntExtra(this.position, defaultTime.toInt())?.toLong() - ?: defaultTime - } - - override fun getDuration(intent: Intent?): Long { - return intent?.getIntExtra(this.duration, defaultTime.toInt())?.toLong() - ?: defaultTime - } - } - - val WEB_VIDEO = ResultResume(WEB_VIDEO_CAST_PACKAGE) - - val resumeApps = arrayOf( - VLC, MPV, WEB_VIDEO - ) - - const val TAG = "MAINACT" - const val ANIMATED_OUTLINE: Boolean = false var lastError: String? = null - private const val FILE_DELETE_KEY = "FILES_TO_DELETE_KEY" - - /** - * Transient files to delete on application exit. - * Deletes files on onDestroy(). - */ - private var filesToDelete: Set - // This needs to be persistent because the application may exit without calling onDestroy. - get() = getKey>(FILE_DELETE_KEY) ?: setOf() - private set(value) = setKey(FILE_DELETE_KEY, value) - - /** - * Add file to delete on Exit. - */ - fun deleteFileOnExit(file: File) { - filesToDelete = filesToDelete + file.path - } - /** * Setting this will automatically enter the query in the search * next time the search fragment is opened. @@ -319,16 +304,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa // kinda shitty solution, but cant com main->home otherwise for popups val bookmarksUpdatedEvent = Event() - /** - * Used by DataStoreHelper to fully reload home when switching accounts - */ - val reloadHomeEvent = Event() - - /** - * Used by DataStoreHelper to fully reload library when switching accounts - */ - val reloadLibraryEvent = Event() - /** * @return true if the str has launched an app task (be it successful or not) @@ -351,7 +326,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa println("Repository url: $realUrl") loadRepository(realUrl) return true - } else if (str.contains(APP_STRING)) { + } else if (str.contains(appString)) { for (api in OAuth2Apis) { if (str.contains("/${api.redirectUrl}")) { ioSafe { @@ -381,15 +356,15 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa } // This specific intent is used for the gradle deployWithAdb // https://github.com/recloudstream/gradle/blob/master/src/main/kotlin/com/lagradost/cloudstream3/gradle/tasks/DeployWithAdbTask.kt#L46 - if (str == "$APP_STRING:") { + if (str == "$appString:") { PluginManager.hotReloadAllLocalPlugins(activity) } - } else if (safeURI(str)?.scheme == APP_STRING_REPO) { - val url = str.replaceFirst(APP_STRING_REPO, "https") + } else if (safeURI(str)?.scheme == appStringRepo) { + val url = str.replaceFirst(appStringRepo, "https") loadRepository(url) return true - } else if (safeURI(str)?.scheme == APP_STRING_SEARCH) { - val query = str.substringAfter("$APP_STRING_SEARCH://") + } else if (safeURI(str)?.scheme == appStringSearch) { + val query = str.substringAfter("$appStringSearch://") nextSearchQuery = try { URLDecoder.decode(query, "UTF-8") @@ -403,7 +378,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa R.id.navigation_search activity?.findViewById(R.id.nav_rail_view)?.selectedItemId = R.id.navigation_search - } else if (safeURI(str)?.scheme == APP_STRING_PLAYER) { + } else if (safeURI(str)?.scheme == appStringPlayer) { val uri = Uri.parse(str) val name = uri.getQueryParameter("name") val url = URLDecoder.decode(uri.authority, "UTF-8") @@ -417,9 +392,9 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa ) ) ) - } else if (safeURI(str)?.scheme == APP_STRING_RESUME_WATCHING) { + } else if (safeURI(str)?.scheme == appStringResumeWatching) { val id = - str.substringAfter("$APP_STRING_RESUME_WATCHING://").toIntOrNull() + str.substringAfter("$appStringResumeWatching://").toIntOrNull() ?: return false ioSafe { val resumeWatchingCard = @@ -451,30 +426,13 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa } var lastPopup: SearchResponse? = null - fun loadPopup(result: SearchResponse, load: Boolean = true) { + fun loadPopup(result: SearchResponse) { lastPopup = result - val syncName = syncViewModel.syncName(result.apiName) - - // based on apiName we decide on if it is a local list or not, this is because - // we want to show a bit of extra UI to sync apis - if (result is SyncAPI.LibraryItem && syncName != null) { - isLocalList = false - syncViewModel.setSync(syncName, result.syncId) - syncViewModel.updateMetaAndUser() - } else { - isLocalList = true - syncViewModel.clear() - } - - if (load) { - viewModel.load( - this, result.url, result.apiName, false, if (getApiDubstatusSettings() - .contains(DubStatus.Dubbed) - ) DubStatus.Dubbed else DubStatus.Subbed, null - ) - } else { - viewModel.loadSmall(result) - } + viewModel.load( + this, result.url, result.apiName, false, if (getApiDubstatusSettings() + .contains(DubStatus.Dubbed) + ) DubStatus.Dubbed else DubStatus.Subbed, null + ) } override fun onColorSelected(dialogId: Int, color: Int) { @@ -488,7 +446,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) updateLocale() // android fucks me by chaining lang when rotating the phone - updateTheme(this) // Update if system theme val navHostFragment = supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment @@ -533,13 +490,12 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa R.id.navigation_results_phone, R.id.navigation_results_tv, R.id.navigation_player, - R.id.navigation_quick_search, ).contains(destination.id) binding?.navHostFragment?.apply { val params = layoutParams as ConstraintLayout.LayoutParams val push = - if (!dontPush && isLayout(TV or EMULATOR)) resources.getDimensionPixelSize(R.dimen.navbar_width) else 0 + if (!dontPush && isTvSettings()) resources.getDimensionPixelSize(R.dimen.navbar_width) else 0 if (!this.isLtr()) { params.setMargins( @@ -566,51 +522,26 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa } Configuration.ORIENTATION_PORTRAIT -> { - isLayout(TV or EMULATOR) + isTvSettings() } else -> { false } } - binding?.apply { - navRailView.isVisible = isNavVisible && landscape navView.isVisible = isNavVisible && !landscape + navRailView.isVisible = isNavVisible && landscape - /** - * We need to make sure if we return to a sub-fragment, - * the correct navigation item is selected so that it does not - * highlight the wrong one in UI. - */ - when (destination.id) { - in listOf(R.id.navigation_downloads, R.id.navigation_download_child) -> { - navRailView.menu.findItem(R.id.navigation_downloads).isChecked = true - navView.menu.findItem(R.id.navigation_downloads).isChecked = true - } - in listOf( - R.id.navigation_settings, - R.id.navigation_subtitles, - R.id.navigation_chrome_subtitles, - R.id.navigation_settings_player, - R.id.navigation_settings_updates, - R.id.navigation_settings_ui, - R.id.navigation_settings_account, - R.id.navigation_settings_providers, - R.id.navigation_settings_general, - R.id.navigation_settings_extensions, - R.id.navigation_settings_plugins, - R.id.navigation_test_providers - ) -> { - navRailView.menu.findItem(R.id.navigation_settings).isChecked = true - navView.menu.findItem(R.id.navigation_settings).isChecked = true - } - } + // Hide library on TV since it is not supported yet :( + val isTrueTv = isTrueTvSettings() + navView.menu.findItem(R.id.navigation_library)?.isVisible = !isTrueTv + navRailView.menu.findItem(R.id.navigation_library)?.isVisible = !isTrueTv } } //private var mCastSession: CastSession? = null - var mSessionManager: SessionManager? = null + lateinit var mSessionManager: SessionManager private val mSessionManagerListener: SessionManagerListener by lazy { SessionManagerListenerImpl() } private inner class SessionManagerListenerImpl : SessionManagerListener { @@ -647,10 +578,10 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa override fun onResume() { super.onResume() afterPluginsLoadedEvent += ::onAllPluginsLoaded - setActivityInstance(this) try { if (isCastApiAvailable()) { - mSessionManager?.addSessionManagerListener(mSessionManagerListener) + //mCastSession = mSessionManager.currentCastSession + mSessionManager.addSessionManagerListener(mSessionManagerListener) } } catch (e: Exception) { logError(e) @@ -666,7 +597,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa } try { if (isCastApiAvailable()) { - mSessionManager?.removeSessionManagerListener(mSessionManagerListener) + mSessionManager.removeSessionManagerListener(mSessionManagerListener) //mCastSession = null } } catch (e: Exception) { @@ -674,7 +605,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa } } - override fun dispatchKeyEvent(event: KeyEvent): Boolean { + override fun dispatchKeyEvent(event: KeyEvent?): Boolean { val response = CommonActivity.dispatchKeyEvent(this, event) if (response != null) return response @@ -704,16 +635,35 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa builder.show().setDefaultFocus() } - override fun onDestroy() { - filesToDelete.forEach { path -> - val result = File(path).deleteRecursively() - if (result) { - Log.d(TAG, "Deleted temporary file: $path") - } else { - Log.d(TAG, "Failed to delete temporary file: $path") - } + private fun backPressed() { + this.window?.navigationBarColor = + this.colorFromAttribute(R.attr.primaryGrayBackground) + this.updateLocale() + this.updateLocale() + + val navHostFragment = + supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment + val navController = navHostFragment?.navController + val isAtHome = + navController?.currentDestination?.matchDestination(R.id.navigation_home) == true + + if (isAtHome && isTrueTvSettings()) { + showConfirmExitDialog() + } else { + super.onBackPressed() } - filesToDelete = setOf() + } + + override fun onBackPressed() { + ((supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment?)?.childFragmentManager?.primaryNavigationFragment as? IOnBackPressed)?.onBackPressed() + ?.let { runNormal -> + if (runNormal) backPressed() + } ?: run { + backPressed() + } + } + + override fun onDestroy() { val broadcastIntent = Intent() broadcastIntent.action = "restart_service" broadcastIntent.setClass(this, VideoDownloadRestartReceiver::class.java) @@ -770,7 +720,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa list.forEach { custom -> allProviders.firstOrNull { it.javaClass.simpleName == custom.parentJavaClass } ?.let { - allProviders.add(it.javaClass.getDeclaredConstructor().newInstance().apply { + allProviders.add(it.javaClass.newInstance().apply { name = custom.name lang = custom.lang mainUrl = custom.url.trimEnd('/') @@ -792,15 +742,10 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa } lateinit var viewModel: ResultViewModel2 - lateinit var syncViewModel: SyncViewModel - private var libraryViewModel: LibraryViewModel? = null - /** kinda dirty, however it signals that we should use the watch status as sync or not*/ - var isLocalList: Boolean = false override fun onCreateView(name: String, context: Context, attrs: AttributeSet): View? { - - viewModel = ViewModelProvider(this)[ResultViewModel2::class.java] - syncViewModel = ViewModelProvider(this)[SyncViewModel::class.java] + viewModel = + ViewModelProvider(this)[ResultViewModel2::class.java] return super.onCreateView(name, context, attrs) } @@ -887,13 +832,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa focusOutline.get()?.isVisible = false } } - /*private val scrollListener = object : RecyclerView.OnScrollListener() { - override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { - super.onScrolled(recyclerView, dx, dy) - current = current.copy(x = current.x + dx, y = current.y + dy) - setTargetPosition(current) - } - }*/ private fun setTargetPosition(target: FocusTarget) { focusOutline.get()?.apply { @@ -936,10 +874,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa if (!exactlyTheSame) { lastView?.removeOnLayoutChangeListener(layoutListener) lastView?.removeOnAttachStateChangeListener(attachListener) - (lastView?.parent as? RecyclerView)?.apply { - removeOnLayoutChangeListener(layoutListener) - //removeOnScrollListener(scrollListener) - } + (lastView?.parent as? RecyclerView)?.removeOnLayoutChangeListener(layoutListener) } val wasGone = focusOutline.isGone @@ -1017,10 +952,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa focusOutline.isVisible = false } if (!exactlyTheSame) { - (newFocus.parent as? RecyclerView)?.apply { - addOnLayoutChangeListener(layoutListener) - //addOnScrollListener(scrollListener) - } + (newFocus.parent as? RecyclerView)?.addOnLayoutChangeListener(layoutListener) newFocus.addOnLayoutChangeListener(layoutListener) newFocus.addOnAttachStateChangeListener(attachListener) } @@ -1038,9 +970,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa ) // if they are the same within then snap, aka scrolling - val deltaMinX = min(end.width / 2, 60.toPx) - val deltaMinY = min(end.height / 2, 60.toPx) - if (start.width == end.width && start.height == end.height && (start.x - end.x).absoluteValue < deltaMinX && (start.y - end.y).absoluteValue < deltaMinY) { + val deltaMin = 50.toPx + if (start.width == end.width && start.height == end.height && (start.x - end.x).absoluteValue < deltaMin && (start.y - end.y).absoluteValue < deltaMin) { animator?.cancel() last = start current = end @@ -1069,7 +1000,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa // animate between a and b animator = ValueAnimator.ofFloat(0.0f, 1.0f).apply { startDelay = 0 - duration = 200 + duration = 100 addUpdateListener { animation -> val animatedValue = animation.animatedValue as Float val target = FocusTarget.lerp(last, current, minOf(animatedValue, 1.0f)) @@ -1111,22 +1042,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa } } - private fun centerView(view: View?) { - if (view == null) return - try { - Log.v(TAG, "centerView: $view") - val r = Rect(0, 0, 0, 0) - view.getDrawingRect(r) - val x = r.centerX() - val y = r.centerY() - val dx = r.width() / 2 //screenWidth / 2 - val dy = screenHeight / 2 - val r2 = Rect(x - dx, y - dy, x + dx, y + dy) - view.requestRectangleOnScreen(r2, false) - // TvFocus.current =TvFocus.current.copy(y=y.toFloat()) - } catch (_: Throwable) { - } - } override fun onCreate(savedInstanceState: Bundle?) { app.initClient(this) @@ -1151,7 +1066,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa super.onCreate(savedInstanceState) try { if (isCastApiAvailable()) { - CastContext.getSharedInstance(this) {it.run()}.addOnSuccessListener { mSessionManager = it.sessionManager } + mSessionManager = CastContext.getSharedInstance(this).sessionManager } } catch (t: Throwable) { logError(t) @@ -1161,61 +1076,29 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa updateTv() // backup when we update the app, I don't trust myself to not boot lock users, might want to make this a setting? - normalSafeApiCall { + try { val appVer = BuildConfig.VERSION_NAME val lastAppAutoBackup: String = getKey("VERSION_NAME") ?: "" if (appVer != lastAppAutoBackup) { setKey("VERSION_NAME", BuildConfig.VERSION_NAME) - normalSafeApiCall { - backup(this) - } - normalSafeApiCall { - // Recompile oat on new version - PluginManager.deleteAllOatFiles(this) - } + backup() } + } catch (t: Throwable) { + logError(t) } // just in case, MAIN SHOULD *NEVER* BOOT LOOP CRASH binding = try { - if (isLayout(TV or EMULATOR)) { + if (isTvSettings()) { val newLocalBinding = ActivityMainTvBinding.inflate(layoutInflater, null, false) setContentView(newLocalBinding.root) - - if (isLayout(TV) && ANIMATED_OUTLINE) { - TvFocus.focusOutline = WeakReference(newLocalBinding.focusOutline) - newLocalBinding.root.viewTreeObserver.addOnScrollChangedListener { - TvFocus.updateFocusView(TvFocus.lastFocus.get(), same = true) - } - newLocalBinding.root.viewTreeObserver.addOnGlobalFocusChangeListener { _, newFocus -> - TvFocus.updateFocusView(newFocus) - } - } else { - newLocalBinding.focusOutline.isVisible = false + TvFocus.focusOutline = WeakReference(newLocalBinding.focusOutline) + newLocalBinding.root.viewTreeObserver.addOnGlobalFocusChangeListener { _, newFocus -> + // println("refocus $oldFocus -> $newFocus") + TvFocus.updateFocusView(newFocus) } - - if (isLayout(TV)) { - // Put here any button you don't want focusing it to center the view - val exceptionButtons = listOf( - R.id.home_preview_play_btt, - R.id.home_preview_info_btt, - R.id.home_preview_hidden_next_focus, - R.id.home_preview_hidden_prev_focus, - R.id.result_play_movie_button, - R.id.result_play_series_button, - R.id.result_resume_series_button, - R.id.result_play_trailer_button, - R.id.result_bookmark_Button, - R.id.result_favorite_Button, - R.id.result_subscribe_Button, - R.id.result_search_Button, - R.id.result_episodes_show_button, - ) - - newLocalBinding.root.viewTreeObserver.addOnGlobalFocusChangeListener { _, newFocus -> - if (exceptionButtons.contains(newFocus?.id)) return@addOnGlobalFocusChangeListener - centerView(newFocus) - } + newLocalBinding.root.viewTreeObserver.addOnScrollChangedListener { + TvFocus.updateFocusView(TvFocus.lastFocus.get(), same = true) } ActivityMainBinding.bind(newLocalBinding.root) // this may crash @@ -1229,26 +1112,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa null } - changeStatusBarState(isLayout(EMULATOR)) - - /** Biometric stuff for users without accounts **/ - val noAccounts = settingsManager.getBoolean( - getString(R.string.skip_startup_account_select_key), - false - ) || accounts.count() <= 1 - - if (isLayout(PHONE) && isAuthEnabled(this) && noAccounts) { - if (deviceHasPasswordPinLock(this)) { - startBiometricAuthentication(this, R.string.biometric_authentication_title, false) - - promptInfo?.let { prompt -> - biometricPrompt?.authenticate(prompt) - } - - // hide background while authenticating, Sorry moms & dads 🙏 - binding?.navHostFragment?.isInvisible = true - } - } + changeStatusBarState(isEmulatorSettings()) // Automatically enable jsdelivr if cant connect to raw.githubusercontent.com if (this.getKey(getString(R.string.jsdelivr_proxy_key)) == null && isNetworkAvailable()) { @@ -1257,12 +1121,17 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa this.setKey(getString(R.string.jsdelivr_proxy_key), false) } else { this.setKey(getString(R.string.jsdelivr_proxy_key), true) - showSnackbar( - this@MainActivity, - R.string.jsdelivr_enabled, - Snackbar.LENGTH_LONG, - R.string.revert - ) { setKey(getString(R.string.jsdelivr_proxy_key), false) } + val parentView: View = findViewById(android.R.id.content) + Snackbar.make(parentView, R.string.jsdelivr_enabled, Snackbar.LENGTH_LONG) + .let { snackbar -> + snackbar.setAction(R.string.revert) { + setKey(getString(R.string.jsdelivr_proxy_key), false) + } + snackbar.setBackgroundTint(colorFromAttribute(R.attr.primaryGrayBackground)) + snackbar.setTextColor(colorFromAttribute(R.attr.textColor)) + snackbar.setActionTextColor(colorFromAttribute(R.attr.colorPrimary)) + snackbar.show() + } } } } @@ -1275,7 +1144,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa } } else if (lastError == null) { ioSafe { - DataStoreHelper.currentHomePage?.let { homeApi -> + getKey(USER_SELECTED_HOMEPAGE_API)?.let { homeApi -> mainPluginsLoadedEvent.invoke(loadSinglePlugin(this@MainActivity, homeApi)) } ?: run { mainPluginsLoadedEvent.invoke(false) @@ -1328,77 +1197,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa builder.show().setDefaultFocus() } - - fun setUserData(status: Resource?) { - if (isLocalList) return - bottomPreviewBinding?.apply { - when (status) { - is Resource.Success -> { - resultviewPreviewBookmark.isEnabled = true - resultviewPreviewBookmark.setText(status.value.status.stringRes) - resultviewPreviewBookmark.setIconResource(status.value.status.iconRes) - } - - is Resource.Failure -> { - resultviewPreviewBookmark.isEnabled = false - resultviewPreviewBookmark.setIconResource(R.drawable.ic_baseline_bookmark_border_24) - resultviewPreviewBookmark.text = status.errorString - } - - else -> { - resultviewPreviewBookmark.isEnabled = false - resultviewPreviewBookmark.setIconResource(R.drawable.ic_baseline_bookmark_border_24) - resultviewPreviewBookmark.setText(R.string.loading) - } - } - } - } - - fun setWatchStatus(state: WatchType?) { - if (!isLocalList || state == null) return - - bottomPreviewBinding?.resultviewPreviewBookmark?.apply { - setIconResource(state.iconRes) - setText(state.stringRes) - } - } - - fun setSubscribeStatus(state: Boolean?) { - bottomPreviewBinding?.resultviewPreviewSubscribe?.apply { - if (state != null) { - val drawable = if (state) { - R.drawable.ic_baseline_notifications_active_24 - } else { - R.drawable.baseline_notifications_none_24 - } - setImageResource(drawable) - } - isVisible = state != null - - setOnClickListener { - viewModel.toggleSubscriptionStatus(context) { newStatus: Boolean? -> - if (newStatus == null) return@toggleSubscriptionStatus - - val message = if (newStatus) { - // Kinda icky to have this here, but it works. - SubscriptionWorkManager.enqueuePeriodicWork(context) - R.string.subscription_new - } else { - R.string.subscription_deleted - } - - val name = (viewModel.page.value as? Resource.Success)?.value?.title - ?: txt(R.string.no_data).asStringNull(context) ?: "" - showToast(txt(message, name), Toast.LENGTH_SHORT) - } - } - } - } - - observe(viewModel.watchStatus, ::setWatchStatus) - observe(syncViewModel.userData, ::setUserData) - observeNullable(viewModel.subscribeStatus, ::setSubscribeStatus) - observeNullable(viewModel.page) { resource -> if (resource == null) { hidePreviewPopupDialog() @@ -1433,78 +1231,26 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa resultviewPreviewMetaDuration.setText(d.durationText) resultviewPreviewMetaRating.setText(d.ratingText) - resultviewPreviewDescription.setTextHtml(d.plotText) + resultviewPreviewDescription.setText(d.plotText) resultviewPreviewPoster.setImage( d.posterImage ?: d.posterBackgroundImage ) - setUserData(syncViewModel.userData.value) - setWatchStatus(viewModel.watchStatus.value) - setSubscribeStatus(viewModel.subscribeStatus.value) - - resultviewPreviewBookmark.setOnClickListener { + resultviewPreviewPoster.setOnClickListener { //viewModel.updateWatchStatus(WatchType.PLANTOWATCH) - if (isLocalList) { - val value = viewModel.watchStatus.value ?: WatchType.NONE + val value = viewModel.watchStatus.value ?: WatchType.NONE - this@MainActivity.showBottomDialog( - WatchType.entries.map { getString(it.stringRes) }.toList(), - value.ordinal, - this@MainActivity.getString(R.string.action_add_to_bookmarks), - showApply = false, - {}) { - viewModel.updateWatchStatus( - WatchType.entries[it], - this@MainActivity - ) - } - } else { - val value = - (syncViewModel.userData.value as? Resource.Success)?.value?.status - ?: SyncWatchType.NONE - - this@MainActivity.showBottomDialog( - SyncWatchType.entries.map { getString(it.stringRes) }.toList(), - value.ordinal, - this@MainActivity.getString(R.string.action_add_to_bookmarks), - showApply = false, - {}) { - syncViewModel.setStatus(SyncWatchType.entries[it].internalId) - syncViewModel.publishUserData() - } + this@MainActivity.showBottomDialog( + WatchType.values().map { getString(it.stringRes) }.toList(), + value.ordinal, + this@MainActivity.getString(R.string.action_add_to_bookmarks), + showApply = false, + {}) { + viewModel.updateWatchStatus(WatchType.values()[it]) } } - observeNullable(viewModel.favoriteStatus) observeFavoriteStatus@{ isFavorite -> - resultviewPreviewFavorite.isVisible = isFavorite != null - if (isFavorite == null) return@observeFavoriteStatus - - val drawable = if (isFavorite) { - R.drawable.ic_baseline_favorite_24 - } else { - R.drawable.ic_baseline_favorite_border_24 - } - - resultviewPreviewFavorite.setImageResource(drawable) - } - - resultviewPreviewFavorite.setOnClickListener { - viewModel.toggleFavoriteStatus(this@MainActivity) { newStatus: Boolean? -> - if (newStatus == null) return@toggleFavoriteStatus - - val message = if (newStatus) { - R.string.favorite_added - } else { - R.string.favorite_removed - } - - val name = (viewModel.page.value as? Resource.Success)?.value?.title - ?: txt(R.string.no_data).asStringNull(this@MainActivity) ?: "" - showToast(txt(message, name), Toast.LENGTH_SHORT) - } - } - - if (isLayout(PHONE)) // dont want this clickable on tv layout + if (!isTvSettings()) // dont want this clickable on tv layout resultviewPreviewDescription.setOnClickListener { view -> view.context?.let { ctx -> val builder: AlertDialog.Builder = @@ -1550,26 +1296,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa logError(e) } } - - // we need to run this after we init all apis, otherwise currentSyncApi will fuck itself - this@MainActivity.runOnUiThread { - // Change library icon with logo of current api in sync - libraryViewModel = ViewModelProvider(this@MainActivity)[LibraryViewModel::class.java] - libraryViewModel?.currentApiName?.observe(this@MainActivity) { - val syncAPI = libraryViewModel?.currentSyncApi - Log.i("SYNC_API", "${syncAPI?.name}, ${syncAPI?.idPrefix}") - val icon = if (syncAPI?.idPrefix == localListApi.idPrefix) { - R.drawable.library_icon - } else { - syncAPI?.icon ?: R.drawable.library_icon - } - - binding?.apply { - navRailView.menu.findItem(R.id.navigation_library)?.setIcon(icon) - navView.menu.findItem(R.id.navigation_library)?.setIcon(icon) - } - } - } } SearchResultBuilder.updateCache(this) @@ -1598,17 +1324,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa this.putString(SearchFragment.SEARCH_QUERY, nextSearchQuery) } } - - if (isLayout(TV or EMULATOR)) { - if (navDestination.matchDestination(R.id.navigation_home)) { - attachBackPressedCallback { - showConfirmExitDialog() - window?.navigationBarColor = - colorFromAttribute(R.attr.primaryGrayBackground) - updateLocale() - } - } else detachBackPressedCallback() - } } //val navController = findNavController(R.id.nav_host_fragment) @@ -1640,7 +1355,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa itemRippleColor = rippleColor itemActiveIndicatorColor = rippleColor setupWithNavController(navController) - if (isLayout(TV or EMULATOR)) { + if (isTvSettings()) { background?.alpha = 200 } else { background?.alpha = 255 @@ -1774,15 +1489,13 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa runAutoUpdate() } - FcastManager().init(this, false) - APIRepository.dubStatusActive = getApiDubstatusSettings() try { // this ensures that no unnecessary space is taken loadCache() File(filesDir, "exoplayer").deleteRecursively() // old cache - deleteFileOnExit(File(cacheDir, "exoplayer")) // current cache + File(cacheDir, "exoplayer").deleteOnExit() // current cache } catch (e: Exception) { logError(e) } @@ -1792,11 +1505,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa migrateResumeWatching() } - getKey(USER_SELECTED_HOMEPAGE_API)?.let { homepage -> - DataStoreHelper.currentHomePage = homepage - removeKey(USER_SELECTED_HOMEPAGE_API) - } - try { if (getKey(HAS_DONE_SETUP_KEY, false) != true) { navController.navigate(R.id.navigation_setup_language) @@ -1812,6 +1520,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa } } catch (e: Exception) { logError(e) + } finally { + setKey(HAS_DONE_SETUP_KEY, true) } // Used to check current focus for TV @@ -1823,32 +1533,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa // } // } - onBackPressedDispatcher.addCallback( - this, - object : OnBackPressedCallback(true) { - override fun handleOnBackPressed() { - window?.navigationBarColor = colorFromAttribute(R.attr.primaryGrayBackground) - updateLocale() - - // If we don't disable we end up in a loop with default behavior calling - // this callback as well, so we disable it, run default behavior, - // then re-enable this callback so it can be used for next back press. - isEnabled = false - onBackPressedDispatcher.onBackPressed() - isEnabled = true - } - } - ) - } - - /** Biometric stuff **/ - override fun onAuthenticationSuccess() { - // make background (nav host fragment) visible again - binding?.navHostFragment?.isInvisible = false - } - - override fun onAuthenticationError() { - finish() } suspend fun checkGithubConnectivity(): Boolean { @@ -1861,4 +1545,4 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa false } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/lagradost/cloudstream3/NativeCrashHandler.kt b/app/src/main/java/com/lagradost/cloudstream3/NativeCrashHandler.kt new file mode 100644 index 00000000..7be90440 --- /dev/null +++ b/app/src/main/java/com/lagradost/cloudstream3/NativeCrashHandler.kt @@ -0,0 +1,53 @@ +package com.lagradost.cloudstream3 + +import com.lagradost.cloudstream3.MainActivity.Companion.lastError +import com.lagradost.cloudstream3.mvvm.logError +import com.lagradost.cloudstream3.plugins.PluginManager.checkSafeModeFile +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch + +object NativeCrashHandler { + // external fun triggerNativeCrash() + /*private external fun initNativeCrashHandler() + private external fun getSignalStatus(): Int + + private fun initSignalPolling() = CoroutineScope(Dispatchers.IO).launch { + + //launch { + // delay(10000) + // triggerNativeCrash() + //} + + while (true) { + delay(10_000) + val signal = getSignalStatus() + // Signal is initialized to zero + if (signal == 0) continue + + // Do not crash in safe mode! + if (lastError != null) continue + if (checkSafeModeFile()) continue + + AcraApplication.exceptionHandler?.uncaughtException( + Thread.currentThread(), + RuntimeException("Native crash with code: $signal. Try uninstalling extensions.\n") + ) + } + } + + fun initCrashHandler() { + try { + System.loadLibrary("native-lib") + initNativeCrashHandler() + } catch (t: Throwable) { + // Make debug crash. + if (BuildConfig.DEBUG) throw t + logError(t) + return + } + + initSignalPolling() + }*/ +} \ No newline at end of file diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/ParCollections.kt b/app/src/main/java/com/lagradost/cloudstream3/ParCollections.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/ParCollections.kt rename to app/src/main/java/com/lagradost/cloudstream3/ParCollections.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AStreamHub.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/AStreamHub.kt similarity index 97% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AStreamHub.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/AStreamHub.kt index 23f8dcf4..b0051ba7 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AStreamHub.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/AStreamHub.kt @@ -1,6 +1,6 @@ package com.lagradost.cloudstream3.extractors -import com.lagradost.api.Log +import android.util.Log import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.utils.ExtractorApi import com.lagradost.cloudstream3.utils.ExtractorLink diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt new file mode 100644 index 00000000..c782b29d --- /dev/null +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Acefile.kt @@ -0,0 +1,39 @@ +package com.lagradost.cloudstream3.extractors + +import com.lagradost.cloudstream3.app +import com.lagradost.cloudstream3.base64Decode +import com.lagradost.cloudstream3.utils.* + +open class Acefile : ExtractorApi() { + override val name = "Acefile" + override val mainUrl = "https://acefile.co" + override val requiresReferer = false + + override suspend fun getUrl(url: String, referer: String?): List { + val sources = mutableListOf() + app.get(url).document.select("script").map { script -> + if (script.data().contains("eval(function(p,a,c,k,e,d)")) { + val data = getAndUnpack(script.data()) + val id = data.substringAfter("{\"id\":\"").substringBefore("\",") + val key = data.substringAfter("var nfck=\"").substringBefore("\";") + app.get("https://acefile.co/local/$id?key=$key").text.let { + base64Decode( + it.substringAfter("JSON.parse(atob(\"").substringBefore("\"))") + ).let { res -> + sources.add( + ExtractorLink( + name, + name, + res.substringAfter("\"file\":\"").substringBefore("\","), + "$mainUrl/", + Qualities.Unknown.value, + ) + ) + } + } + } + } + return sources + } + +} \ No newline at end of file diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AsianLoad.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/AsianLoad.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/AsianLoad.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Blogger.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Blogger.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Blogger.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Blogger.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/BullStream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/BullStream.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/BullStream.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/BullStream.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByteShare.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/ByteShare.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/ByteShare.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/ByteShare.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Cda.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Cda.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Cda.kt diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt new file mode 100644 index 00000000..b4f3d897 --- /dev/null +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Chillx.kt @@ -0,0 +1,140 @@ +package com.lagradost.cloudstream3.extractors + +import com.fasterxml.jackson.annotation.JsonProperty +import com.lagradost.cloudstream3.* +import com.lagradost.cloudstream3.utils.AppUtils +import com.lagradost.cloudstream3.utils.ExtractorApi +import com.lagradost.cloudstream3.utils.ExtractorLink +import com.lagradost.cloudstream3.utils.Qualities +import javax.crypto.Cipher +import javax.crypto.SecretKeyFactory +import javax.crypto.spec.IvParameterSpec +import javax.crypto.spec.PBEKeySpec +import javax.crypto.spec.SecretKeySpec + +class Moviesapi : Chillx() { + override val name = "Moviesapi" + override val mainUrl = "https://w1.moviesapi.club" +} + +class Bestx : Chillx() { + override val name = "Bestx" + override val mainUrl = "https://bestx.stream" +} + +class Watchx : Chillx() { + override val name = "Watchx" + override val mainUrl = "https://watchx.top" +} +open class Chillx : ExtractorApi() { + override val name = "Chillx" + override val mainUrl = "https://chillx.top" + override val requiresReferer = true + + companion object { + private const val KEY = "11x&W5UBrcqn\$9Yl" + } + + override suspend fun getUrl( + url: String, + referer: String?, + subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit + ) { + val master = Regex("MasterJS\\s*=\\s*'([^']+)").find( + app.get( + url, + referer = referer + ).text + )?.groupValues?.get(1) + val encData = AppUtils.tryParseJson(base64Decode(master ?: return)) + val decrypt = cryptoAESHandler(encData ?: return, KEY, false) + + val source = Regex(""""?file"?:\s*"([^"]+)""").find(decrypt)?.groupValues?.get(1) + val tracks = Regex("""tracks:\s*\[(.+)]""").find(decrypt)?.groupValues?.get(1) + + // required + val headers = mapOf( + "Accept" to "*/*", + "Connection" to "keep-alive", + "Sec-Fetch-Dest" to "empty", + "Sec-Fetch-Mode" to "cors", + "Sec-Fetch-Site" to "cross-site", + "Origin" to mainUrl, + ) + + callback.invoke( + ExtractorLink( + name, + name, + source ?: return, + "$mainUrl/", + Qualities.P1080.value, + headers = headers, + isM3u8 = true + ) + ) + + AppUtils.tryParseJson>("[$tracks]") + ?.filter { it.kind == "captions" }?.map { track -> + subtitleCallback.invoke( + SubtitleFile( + track.label ?: "", + track.file ?: return@map null + ) + ) + } + } + + private fun cryptoAESHandler( + data: AESData, + pass: String, + encrypt: Boolean = true + ): String { + val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512") + val spec = PBEKeySpec( + pass.toCharArray(), + data.salt?.hexToByteArray(), + data.iterations?.toIntOrNull() ?: 1, + 256 + ) + val key = factory.generateSecret(spec) + val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding") + return if (!encrypt) { + cipher.init( + Cipher.DECRYPT_MODE, + SecretKeySpec(key.encoded, "AES"), + IvParameterSpec(data.iv?.hexToByteArray()) + ) + String(cipher.doFinal(base64DecodeArray(data.ciphertext.toString()))) + } else { + cipher.init( + Cipher.ENCRYPT_MODE, + SecretKeySpec(key.encoded, "AES"), + IvParameterSpec(data.iv?.hexToByteArray()) + ) + base64Encode(cipher.doFinal(data.ciphertext?.toByteArray())) + } + } + + private fun String.hexToByteArray(): ByteArray { + check(length % 2 == 0) { "Must have an even length" } + return chunked(2) + .map { it.toInt(16).toByte() } + + .toByteArray() + } + + data class AESData( + @JsonProperty("ciphertext") val ciphertext: String? = null, + @JsonProperty("iv") val iv: String? = null, + @JsonProperty("salt") val salt: String? = null, + @JsonProperty("iterations") val iterations: String? = null, + ) + + data class Tracks( + @JsonProperty("file") val file: String? = null, + @JsonProperty("label") val label: String? = null, + @JsonProperty("kind") val kind: String? = null, + ) +} diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Dailymotion.kt similarity index 73% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Dailymotion.kt index 2343a92e..4b7cb19f 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Dailymotion.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Dailymotion.kt @@ -7,18 +7,13 @@ import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson import com.lagradost.cloudstream3.utils.ExtractorApi import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.M3u8Helper.Companion.generateM3u8 +import com.lagradost.cloudstream3.utils.Qualities import java.net.URL -class Geodailymotion : Dailymotion() { - override val name = "GeoDailymotion" - override val mainUrl = "https://geo.dailymotion.com" -} - open class Dailymotion : ExtractorApi() { override val mainUrl = "https://www.dailymotion.com" override val name = "Dailymotion" override val requiresReferer = false - private val baseUrl = "https://www.dailymotion.com" @Suppress("RegExpSimplifiable") private val videoIdRegex = "^[kx][a-zA-Z0-9]+\$".toRegex() @@ -32,16 +27,21 @@ open class Dailymotion : ExtractorApi() { callback: (ExtractorLink) -> Unit ) { val embedUrl = getEmbedUrl(url) ?: return - val req = app.get(embedUrl) + val doc = app.get(embedUrl).document val prefix = "window.__PLAYER_CONFIG__ = " - val configStr = req.document.selectFirst("script:containsData($prefix)")?.data() ?: return - val config = tryParseJson(configStr.substringAfter(prefix).substringBefore(";").trim()) ?: return + val configStr = doc.selectFirst("script:containsData($prefix)")?.data() ?: return + val config = tryParseJson(configStr.substringAfter(prefix)) ?: return val id = getVideoId(embedUrl) ?: return val dmV1st = config.dmInternalData.v1st val dmTs = config.dmInternalData.ts - val embedder = config.context.embedder - val metaDataUrl = "$baseUrl/player/metadata/video/$id?embedder=$embedder&locale=en-US&dmV1st=$dmV1st&dmTs=$dmTs&is_native_app=0" - val metaData = app.get(metaDataUrl, referer = embedUrl, cookies = req.cookies) + val metaDataUrl = + "$mainUrl/player/metadata/video/$id?locale=en&dmV1st=$dmV1st&dmTs=$dmTs&is_native_app=0" + val cookies = mapOf( + "v1st" to dmV1st, + "dmvk" to config.context.dmvk, + "ts" to dmTs.toString() + ) + val metaData = app.get(metaDataUrl, referer = embedUrl, cookies = cookies) .parsedSafe() ?: return metaData.qualities.forEach { (_, video) -> video.forEach { @@ -51,19 +51,16 @@ open class Dailymotion : ExtractorApi() { } private fun getEmbedUrl(url: String): String? { - if (url.contains("/embed/") || url.contains("/video/")) { - return url + if (url.contains("/embed/")) { + return url + } + val vid = getVideoId(url) ?: return null + return "$mainUrl/embed/video/$vid" } - if (url.contains("geo.dailymotion.com")) { - val videoId = url.substringAfter("video=") - return "$baseUrl/embed/video/$videoId" - } - return null - } private fun getVideoId(url: String): String? { val path = URL(url).path - val id = path.substringAfter("/video/") + val id = path.substringAfter("video/") if (id.matches(videoIdRegex)) { return id } @@ -87,13 +84,13 @@ open class Dailymotion : ExtractorApi() { ) data class InternalData( - val ts: Long, + val ts: Int, val v1st: String ) data class Context( @JsonProperty("access_token") val accessToken: String?, - val embedder: String?, + val dmvk: String, ) data class MetaData( diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt similarity index 73% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt index 370dcaca..8dcfb859 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/DoodExtractor.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/DoodExtractor.kt @@ -7,18 +7,6 @@ import com.lagradost.cloudstream3.utils.Qualities import com.lagradost.cloudstream3.utils.getQualityFromName import kotlinx.coroutines.delay -class D0000d : DoodLaExtractor() { - override var mainUrl = "https://d0000d.com" -} - -class D000dCom : DoodLaExtractor() { - override var mainUrl = "https://d000d.com" -} - -class DoodstreamCom : DoodLaExtractor() { - override var mainUrl = "https://doodstream.com" -} - class Dooood : DoodLaExtractor() { override var mainUrl = "https://dooood.com" } @@ -68,10 +56,9 @@ open class DoodLaExtractor : ExtractorApi() { } override suspend fun getUrl(url: String, referer: String?): List? { - val newUrl= url.replace(mainUrl, "https://d0000d.com") - val response0 = app.get(newUrl).text // html of DoodStream page to look for /pass_md5/... - val md5 ="https://d0000d.com"+(Regex("/pass_md5/[^']*").find(response0)?.value ?: return null) // get https://dood.ws/pass_md5/... - val trueUrl = app.get(md5, referer = newUrl).text + "zUEJeL3mUN?token=" + md5.substringAfterLast("/") //direct link to extract (zUEJeL3mUN is random) + val response0 = app.get(url).text // html of DoodStream page to look for /pass_md5/... + val md5 =mainUrl+(Regex("/pass_md5/[^']*").find(response0)?.value ?: return null) // get https://dood.ws/pass_md5/... + val trueUrl = app.get(md5, referer = url).text + "zUEJeL3mUN?token=" + md5.substringAfterLast("/") //direct link to extract (zUEJeL3mUN is random) val quality = Regex("\\d{3,4}p").find(response0.substringAfter("").substringBefore(""))?.groupValues?.get(0) return listOf( ExtractorLink( diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Embedgram.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Embedgram.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Embedgram.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Embedgram.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Evolaod.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Evolaod.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Evolaod.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Evolaod.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Fastream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Fastream.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Fastream.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Fastream.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filesim.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Filesim.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Filesim.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GMPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/GMPlayer.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GMPlayer.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/GMPlayer.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt similarity index 58% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt index 8d1a4d07..df9c74a4 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Gdriveplayer.kt @@ -2,10 +2,14 @@ package com.lagradost.cloudstream3.extractors import com.fasterxml.jackson.annotation.JsonProperty import com.lagradost.cloudstream3.* -import com.lagradost.cloudstream3.extractors.helper.AesHelper.cryptoAESHandler import com.lagradost.cloudstream3.utils.* import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson import org.jsoup.nodes.Element +import java.security.DigestException +import java.security.MessageDigest +import javax.crypto.Cipher +import javax.crypto.spec.IvParameterSpec +import javax.crypto.spec.SecretKeySpec class DatabaseGdrive2 : Gdriveplayer() { override var mainUrl = "https://databasegdriveplayer.co" @@ -61,6 +65,78 @@ open class Gdriveplayer : ExtractorApi() { ?.data()?.let { getAndUnpack(it) } } + private fun String.decodeHex(): ByteArray { + check(length % 2 == 0) { "Must have an even length" } + return chunked(2) + .map { it.toInt(16).toByte() } + .toByteArray() + } + + // https://stackoverflow.com/a/41434590/8166854 + private fun GenerateKeyAndIv( + password: ByteArray, + salt: ByteArray, + hashAlgorithm: String = "MD5", + keyLength: Int = 32, + ivLength: Int = 16, + iterations: Int = 1 + ): List? { + + val md = MessageDigest.getInstance(hashAlgorithm) + val digestLength = md.digestLength + val targetKeySize = keyLength + ivLength + val requiredLength = (targetKeySize + digestLength - 1) / digestLength * digestLength + val generatedData = ByteArray(requiredLength) + var generatedLength = 0 + + try { + md.reset() + + while (generatedLength < targetKeySize) { + if (generatedLength > 0) + md.update( + generatedData, + generatedLength - digestLength, + digestLength + ) + + md.update(password) + md.update(salt, 0, 8) + md.digest(generatedData, generatedLength, digestLength) + + for (i in 1 until iterations) { + md.update(generatedData, generatedLength, digestLength) + md.digest(generatedData, generatedLength, digestLength) + } + + generatedLength += digestLength + } + return listOf( + generatedData.copyOfRange(0, keyLength), + generatedData.copyOfRange(keyLength, targetKeySize) + ) + } catch (e: DigestException) { + return null + } + } + + private fun cryptoAESHandler( + data: AesData, + pass: ByteArray, + encrypt: Boolean = true + ): String? { + val (key, iv) = GenerateKeyAndIv(pass, data.s.decodeHex()) ?: return null + val cipher = Cipher.getInstance("AES/CBC/NoPadding") + return if (!encrypt) { + cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(key, "AES"), IvParameterSpec(iv)) + String(cipher.doFinal(base64DecodeArray(data.ct))) + } else { + cipher.init(Cipher.DECRYPT_MODE, SecretKeySpec(key, "AES"), IvParameterSpec(iv)) + base64Encode(cipher.doFinal(data.ct.toByteArray())) + + } + } + private fun Regex.first(str: String): String? { return find(str)?.groupValues?.getOrNull(1) } @@ -78,14 +154,14 @@ open class Gdriveplayer : ExtractorApi() { val document = app.get(url).document val eval = unpackJs(document)?.replace("\\", "") ?: return - val data = Regex("data='(\\S+?)'").first(eval) ?: return + val data = tryParseJson(Regex("data='(\\S+?)'").first(eval)) ?: return val password = Regex("null,['|\"](\\w+)['|\"]").first(eval) ?.split(Regex("\\D+")) ?.joinToString("") { Char(it.toInt()).toString() }.let { Regex("var pass = \"(\\S+?)\"").first(it ?: return)?.toByteArray() } ?: throw ErrorLoadingException("can't find password") - val decryptedData = cryptoAESHandler(data, password, false, "AES/CBC/NoPadding")?.let { getAndUnpack(it) }?.replace("\\", "") + val decryptedData = cryptoAESHandler(data, password, false)?.let { getAndUnpack(it) }?.replace("\\", "") val sourceData = decryptedData?.substringAfter("sources:[")?.substringBefore("],") val subData = decryptedData?.substringAfter("tracks:[")?.substringBefore("],") @@ -118,6 +194,12 @@ open class Gdriveplayer : ExtractorApi() { } + data class AesData( + @JsonProperty("ct") val ct: String, + @JsonProperty("iv") val iv: String, + @JsonProperty("s") val s: String + ) + data class Tracks( @JsonProperty("file") val file: String, @JsonProperty("kind") val kind: String, diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GenericM3U8.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/GenericM3U8.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GenericM3U8.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/GenericM3U8.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Gofile.kt similarity index 91% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Gofile.kt index 8d78c1a4..d76b0e11 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Gofile.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Gofile.kt @@ -19,12 +19,12 @@ open class Gofile : ExtractorApi() { subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit ) { - val id = Regex("/(?:\\?c=|d/)([\\da-zA-Z-]+)").find(url)?.groupValues?.get(1) + val id = Regex("/(?:\\?c=|d/)([\\da-zA-Z]+)").find(url)?.groupValues?.get(1) val token = app.get("$mainApi/createAccount").parsedSafe()?.data?.get("token") val websiteToken = app.get("$mainUrl/dist/js/alljs.js").text.let { - Regex("fetchData.wt\\s*=\\s*\"([^\"]+)").find(it)?.groupValues?.get(1) + Regex("websiteToken\\s*=\\s*\"([^\"]+)").find(it)?.groupValues?.get(1) } - app.get("$mainApi/getContent?contentId=$id&token=$token&wt=$websiteToken") + app.get("$mainApi/getContent?contentId=$id&token=$token&websiteToken=$websiteToken") .parsedSafe()?.data?.contents?.forEach { callback.invoke( ExtractorLink( @@ -59,4 +59,4 @@ open class Gofile : ExtractorApi() { @JsonProperty("data") val data: Data? = null, ) -} +} \ No newline at end of file diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GuardareStream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/GuardareStream.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/GuardareStream.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/GuardareStream.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Hxfile.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Hxfile.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Hxfile.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Hxfile.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/JWPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/JWPlayer.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/JWPlayer.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/JWPlayer.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jawcloud.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Jawcloud.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jawcloud.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Jawcloud.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Jeniusplay.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Jeniusplay.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Jeniusplay.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Krakenfiles.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Krakenfiles.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Krakenfiles.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Krakenfiles.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Linkbox.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt similarity index 83% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Linkbox.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt index 04a9a6ac..6a4945bb 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Linkbox.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Linkbox.kt @@ -18,8 +18,7 @@ open class Linkbox : ExtractorApi() { subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit ) { - val token = Regex("""(?:/f/|/file/|\?id=)(\w+)""").find(url)?.groupValues?.get(1) - val id = app.get("$mainUrl/api/file/share_out_list/?sortField=utime&sortAsc=0&pageNo=1&pageSize=50&shareToken=$token").parsedSafe()?.data?.itemId + val id = Regex("""(?:/f/|/file/|\?id=)(\w+)""").find(url)?.groupValues?.get(1) app.get("$mainUrl/api/file/detail?itemId=$id", referer = url) .parsedSafe()?.data?.itemInfo?.resolutionList?.map { link -> callback.invoke( @@ -45,7 +44,6 @@ open class Linkbox : ExtractorApi() { data class Data( @JsonProperty("itemInfo") val itemInfo: ItemInfo? = null, - @JsonProperty("itemId") val itemId: String? = null, ) data class Responses( diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/M3u8Manifest.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/M3u8Manifest.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/M3u8Manifest.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/M3u8Manifest.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Maxstream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Maxstream.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Maxstream.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Maxstream.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MixDrop.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/MixDrop.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MixDrop.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/MixDrop.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Moviehab.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Moviehab.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Moviehab.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Mp4Upload.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Mp4Upload.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Mp4Upload.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Mp4Upload.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MultiQuality.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/MultiQuality.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/MultiQuality.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Mvidoo.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Mvidoo.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Mvidoo.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Mvidoo.kt diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt new file mode 100644 index 00000000..70e87fbf --- /dev/null +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/OkRuExtractor.kt @@ -0,0 +1,67 @@ +package com.lagradost.cloudstream3.extractors + +import com.fasterxml.jackson.annotation.JsonProperty +import com.lagradost.cloudstream3.utils.* +import com.lagradost.cloudstream3.app +import com.lagradost.cloudstream3.utils.AppUtils.parseJson + +data class DataOptionsJson ( + @JsonProperty("flashvars") var flashvars : Flashvars? = Flashvars(), +) +data class Flashvars ( + @JsonProperty("metadata") var metadata : String? = null, + @JsonProperty("hlsManifestUrl") var hlsManifestUrl : String? = null, //m3u8 +) + +data class MetadataOkru ( + @JsonProperty("videos") var videos: ArrayList = arrayListOf(), +) + +data class Videos ( + @JsonProperty("name") var name : String, + @JsonProperty("url") var url : String, + @JsonProperty("seekSchema") var seekSchema : Int? = null, + @JsonProperty("disallowed") var disallowed : Boolean? = null +) + +class OkRuHttps: OkRu(){ + override var mainUrl = "https://ok.ru" +} + +open class OkRu : ExtractorApi() { + override var name = "Okru" + override var mainUrl = "http://ok.ru" + override val requiresReferer = false + + override suspend fun getUrl(url: String, referer: String?): List? { + val doc = app.get(url).document + val sources = ArrayList() + val datajson = doc.select("div[data-options]").attr("data-options") + if (datajson.isNotBlank()) { + val main = parseJson(datajson) + val metadatajson = parseJson(main.flashvars?.metadata!!) + val servers = metadatajson.videos + servers.forEach { + val quality = it.name.uppercase() + .replace("MOBILE","144p") + .replace("LOWEST","240p") + .replace("LOW","360p") + .replace("SD","480p") + .replace("HD","720p") + .replace("FULL","1080p") + .replace("QUAD","1440p") + .replace("ULTRA","4k") + val extractedurl = it.url.replace("\\\\u0026", "&") + sources.add(ExtractorLink( + name, + name = this.name, + extractedurl, + url, + getQualityFromName(quality), + isM3u8 = false + )) + } + } + return sources + } +} \ No newline at end of file diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Okrulink.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Okrulink.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Okrulink.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Okrulink.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Pelisplus.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt similarity index 97% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Pelisplus.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt index 4163cd94..45ec4c2f 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Pelisplus.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pelisplus.kt @@ -5,7 +5,6 @@ import com.lagradost.cloudstream3.amap import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall import com.lagradost.cloudstream3.utils.ExtractorLink -import com.lagradost.cloudstream3.utils.INFER_TYPE import com.lagradost.cloudstream3.utils.extractorApis import com.lagradost.cloudstream3.utils.getQualityFromName import com.lagradost.cloudstream3.utils.loadExtractor @@ -67,7 +66,7 @@ open class Pelisplus(val mainUrl: String) { href, page.url, getQualityFromName(qual), - type = INFER_TYPE + element.attr("href").contains(".m3u8") ) ) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Pixeldrain.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pixeldrain.kt new file mode 100644 index 00000000..9b481240 --- /dev/null +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Pixeldrain.kt @@ -0,0 +1,30 @@ +package com.lagradost.cloudstream3.extractors + +import com.lagradost.cloudstream3.SubtitleFile +import com.lagradost.cloudstream3.utils.ExtractorApi +import com.lagradost.cloudstream3.utils.ExtractorLink +import com.lagradost.cloudstream3.utils.Qualities + +open class Pixeldrain : ExtractorApi() { + override val name = "Pixeldrain" + override val mainUrl = "https://pixeldrain.com" + override val requiresReferer = false + override suspend fun getUrl( + url: String, + referer: String?, + subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit + ) { + val mId = Regex("/([ul]/[\\da-zA-Z\\-]+)").find(url)?.groupValues?.get(1)?.split("/") + callback.invoke( + ExtractorLink( + this.name, + this.name, + "$mainUrl/api/file/${mId?.last() ?: return}?download", + url, + Qualities.Unknown.value, + ) + ) + } + +} \ No newline at end of file diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt similarity index 99% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt index a4dc694e..2b286abb 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/PlayLtXyz.kt @@ -1,6 +1,6 @@ package com.lagradost.cloudstream3.extractors -import com.lagradost.api.Log +import android.util.Log import com.fasterxml.jackson.annotation.JsonProperty import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.utils.* diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayerVoxzer.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/PlayerVoxzer.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/PlayerVoxzer.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/PlayerVoxzer.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt similarity index 68% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt index 2df81bc6..0154b4e8 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Rabbitstream.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Rabbitstream.kt @@ -5,7 +5,6 @@ import com.lagradost.cloudstream3.ErrorLoadingException import com.lagradost.cloudstream3.SubtitleFile import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.base64DecodeArray -import com.lagradost.cloudstream3.base64Encode import com.lagradost.cloudstream3.utils.AppUtils import com.lagradost.cloudstream3.utils.AppUtils.parseJson import com.lagradost.cloudstream3.utils.ExtractorApi @@ -17,52 +16,13 @@ import javax.crypto.Cipher import javax.crypto.spec.IvParameterSpec import javax.crypto.spec.SecretKeySpec +// No License found in https://github.com/enimax-anime/key +// special credits to @enimax for providing key class Megacloud : Rabbitstream() { override val name = "Megacloud" override val mainUrl = "https://megacloud.tv" override val embed = "embed-2/ajax/e-1" - private val scriptUrl = "$mainUrl/js/player/a/prod/e1-player.min.js" - - override suspend fun extractRealKey(sources: String): Pair { - val rawKeys = getKeys() - val sourcesArray = sources.toCharArray() - - var extractedKey = "" - var currentIndex = 0 - for (index in rawKeys) { - val start = index[0] + currentIndex - val end = start + index[1] - for (i in start until end) { - extractedKey += sourcesArray[i].toString() - sourcesArray[i] = ' ' - } - currentIndex += index[1] - } - - return extractedKey to sourcesArray.joinToString("").replace(" ", "") - } - - private suspend fun getKeys(): List> { - val script = app.get(scriptUrl).text - fun matchingKey(value: String): String { - return Regex(",$value=((?:0x)?([0-9a-fA-F]+))").find(script)?.groupValues?.get(1) - ?.removePrefix("0x") ?: throw ErrorLoadingException("Failed to match the key") - } - - val regex = Regex("case\\s*0x[0-9a-f]+:(?![^;]*=partKey)\\s*\\w+\\s*=\\s*(\\w+)\\s*,\\s*\\w+\\s*=\\s*(\\w+);") - val indexPairs = regex.findAll(script).toList().map { match -> - val matchKey1 = matchingKey(match.groupValues[1]) - val matchKey2 = matchingKey(match.groupValues[2]) - try { - listOf(matchKey1.toInt(16), matchKey2.toInt(16)) - } catch (e: NumberFormatException) { - emptyList() - } - }.filter { it.isNotEmpty() } - - return indexPairs - } - + override val key = "https://raw.githubusercontent.com/enimax-anime/key/e6/key.txt" } class Dokicloud : Rabbitstream() { @@ -70,14 +30,12 @@ class Dokicloud : Rabbitstream() { override val mainUrl = "https://dokicloud.one" } -// Code found in https://github.com/eatmynerds/key -// special credits to @eatmynerds for providing key open class Rabbitstream : ExtractorApi() { override val name = "Rabbitstream" override val mainUrl = "https://rabbitstream.net" override val requiresReferer = false open val embed = "ajax/embed-4" - open val key = "https://raw.githubusercontent.com/eatmynerds/key/e4/key.txt" + open val key = "https://raw.githubusercontent.com/enimax-anime/key/e4/key.txt" override suspend fun getUrl( url: String, @@ -98,7 +56,7 @@ open class Rabbitstream : ExtractorApi() { val decryptedSources = if (sources == null || encryptedMap.encrypted == false) { response.parsedSafe() } else { - val (key, encData) = extractRealKey(sources) + val (key, encData) = extractRealKey(sources, getRawKey()) val decrypted = decryptMapped>(encData, key) SourcesResponses( sources = decrypted, @@ -117,8 +75,8 @@ open class Rabbitstream : ExtractorApi() { decryptedSources?.tracks?.map { track -> subtitleCallback.invoke( SubtitleFile( - track?.label ?: return@map, - track.file ?: return@map + track?.label ?: "", + track?.file ?: return@map ) ) } @@ -126,10 +84,23 @@ open class Rabbitstream : ExtractorApi() { } - open suspend fun extractRealKey(sources: String): Pair { - val rawKeys = parseJson>(app.get(key).text) - val extractedKey = base64Encode(rawKeys.map { it.toByte() }.toByteArray()) - return extractedKey to sources + private suspend fun getRawKey(): String = app.get(key).text + + private fun extractRealKey(originalString: String?, stops: String): Pair { + val table = parseJson>>(stops) + val decryptedKey = StringBuilder() + var offset = 0 + var encryptedString = originalString + + table.forEach { (start, end) -> + decryptedKey.append(encryptedString?.substring(start - offset, end - offset)) + encryptedString = encryptedString?.substring( + 0, + start - offset + ) + encryptedString?.substring(end - offset) + offset += end - start + } + return decryptedKey.toString() to encryptedString.toString() } private inline fun decryptMapped(input: String, key: String): T? { diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SBPlay.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/SBPlay.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/SBPlay.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/SBPlay.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Sendvid.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Sendvid.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Sendvid.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Sendvid.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Solidfiles.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Solidfiles.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Solidfiles.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Solidfiles.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Minoplres.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt similarity index 81% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Minoplres.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt index 702501a1..3f6fff2f 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Minoplres.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/SpeedoStream.kt @@ -7,12 +7,14 @@ import com.lagradost.cloudstream3.utils.ExtractorApi import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.M3u8Helper -open class Minoplres : ExtractorApi() { +class SpeedoStream1 : SpeedoStream() { + override val mainUrl = "https://speedostream.pm" +} - override val name = "Minoplres" // formerly SpeedoStream +open class SpeedoStream : ExtractorApi() { + override val name = "SpeedoStream" + override val mainUrl = "https://speedostream.mom" override val requiresReferer = true - override val mainUrl = "https://minoplres.xyz" // formerly speedostream.bond - private val hostUrl = "https://minoplres.xyz" override suspend fun getUrl(url: String, referer: String?): List { val sources = mutableListOf() @@ -24,7 +26,7 @@ open class Minoplres : ExtractorApi() { M3u8Helper.generateM3u8( name, it.file, - "$hostUrl/", + "$mainUrl/", ).forEach { m3uData -> sources.add(m3uData) } } } @@ -35,4 +37,6 @@ open class Minoplres : ExtractorApi() { private data class File( @JsonProperty("file") val file: String, ) + + } diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSB.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamSB.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/StreamSB.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamTape.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamTape.kt similarity index 93% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamTape.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/StreamTape.kt index 2ee98c65..ece8dc4b 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamTape.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamTape.kt @@ -9,10 +9,6 @@ class StreamTapeNet : StreamTape() { override var mainUrl = "https://streamtape.net" } -class StreamTapeXyz : StreamTape() { - override var mainUrl = "https://streamtape.xyz" -} - class ShaveTape : StreamTape(){ override var mainUrl = "https://shavetape.cash" } diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamhub.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Streamhub.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamhub.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Streamhub.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamlare.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Streamlare.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamlare.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Streamlare.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamoUpload.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/StreamoUpload.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/StreamoUpload.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/StreamoUpload.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamplay.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Streamplay.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Streamplay.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Streamplay.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Supervideo.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Supervideo.kt similarity index 97% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Supervideo.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Supervideo.kt index e70cae6b..dd49d994 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Supervideo.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Supervideo.kt @@ -13,7 +13,7 @@ data class Files( open class Supervideo : ExtractorApi() { override var name = "Supervideo" - override var mainUrl = "https://supervideo.cc" + override var mainUrl = "https://supervideo.tv" override val requiresReferer = false override suspend fun getUrl(url: String, referer: String?): List? { val extractedLinksList: MutableList = mutableListOf() diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tantifilm.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Tantifilm.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tantifilm.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Tantifilm.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tomatomatela.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Tomatomatela.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Tomatomatela.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Tomatomatela.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/UpstreamExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/UpstreamExtractor.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/UpstreamExtractor.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/UpstreamExtractor.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uqload.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Uqload.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uqload.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Uqload.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Userload.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userload.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Userload.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userscloud.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Userscloud.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Userscloud.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Userscloud.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uservideo.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Uservideo.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Uservideo.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Uservideo.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vicloud.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vicloud.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vicloud.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Vicloud.kt diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt new file mode 100644 index 00000000..a27bf188 --- /dev/null +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/VidSrcExtractor.kt @@ -0,0 +1,100 @@ +package com.lagradost.cloudstream3.extractors + +import com.lagradost.cloudstream3.SubtitleFile +import com.lagradost.cloudstream3.amap +import com.lagradost.cloudstream3.app +import com.lagradost.cloudstream3.utils.* +import kotlinx.coroutines.delay +import java.net.URI + +class VidSrcExtractor2 : VidSrcExtractor() { + override val mainUrl = "https://vidsrc.me/embed" + override suspend fun getUrl( + url: String, + referer: String?, + subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit + ) { + val newUrl = url.lowercase().replace(mainUrl, super.mainUrl) + super.getUrl(newUrl, referer, subtitleCallback, callback) + } +} + +open class VidSrcExtractor : ExtractorApi() { + override val name = "VidSrc" + private val absoluteUrl = "https://v2.vidsrc.me" + override val mainUrl = "$absoluteUrl/embed" + override val requiresReferer = false + + companion object { + /** Infinite function to validate the vidSrc pass */ + suspend fun validatePass(url: String) { + val uri = URI(url) + val host = uri.host + + // Basically turn https://tm3p.vidsrc.stream/ -> https://vidsrc.stream/ + val referer = host.split(".").let { + val size = it.size + "https://" + it.subList(maxOf(0, size - 2), size).joinToString(".") + "/" + } + + while (true) { + app.get(url, referer = referer) + delay(60_000) + } + } + } + + override suspend fun getUrl( + url: String, + referer: String?, + subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit + ) { + val iframedoc = app.get(url).document + + val serverslist = + iframedoc.select("div#sources.button_content div#content div#list div").map { + val datahash = it.attr("data-hash") + if (datahash.isNotBlank()) { + val links = try { + app.get( + "$absoluteUrl/srcrcp/$datahash", + referer = "https://rcp.vidsrc.me/" + ).url + } catch (e: Exception) { + "" + } + links + } else "" + } + + serverslist.amap { server -> + val linkfixed = server.replace("https://vidsrc.xyz/", "https://embedsito.com/") + if (linkfixed.contains("/prorcp")) { + val srcresponse = app.get(server, referer = absoluteUrl).text + val m3u8Regex = Regex("((https:|http:)//.*\\.m3u8)") + val srcm3u8 = m3u8Regex.find(srcresponse)?.value ?: return@amap + val passRegex = Regex("""['"](.*set_pass[^"']*)""") + val pass = passRegex.find(srcresponse)?.groupValues?.get(1)?.replace( + Regex("""^//"""), "https://" + ) + + callback.invoke( + ExtractorLink( + this.name, + this.name, + srcm3u8, + "https://vidsrc.stream/", + Qualities.Unknown.value, + extractorData = pass, + isM3u8 = true + ) + ) + } else { + loadExtractor(linkfixed, url, subtitleCallback, callback) + } + } + } + +} \ No newline at end of file diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoVard.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/VideoVard.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/VideoVard.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/VideoVard.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidmoly.kt similarity index 89% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Vidmoly.kt index 979fd8c5..615cfd74 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidmoly.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidmoly.kt @@ -25,13 +25,9 @@ open class Vidmoly : ExtractorApi() { subtitleCallback: (SubtitleFile) -> Unit, callback: (ExtractorLink) -> Unit ) { - val headers = mapOf( - "User-Agent" to "Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36", - "Sec-Fetch-Dest" to "iframe" - ) + val script = app.get( url, - headers = headers, referer = referer, ).document.select("script") .find { it.data().contains("sources:") }?.data() @@ -70,4 +66,4 @@ open class Vidmoly : ExtractorApi() { @JsonProperty("kind") val kind: String? = null, ) -} +} \ No newline at end of file diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vido.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vido.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vido.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Vido.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidstream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidstream.kt similarity index 97% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidstream.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Vidstream.kt index c6493dbe..7eb7fbac 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Vidstream.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Vidstream.kt @@ -5,7 +5,6 @@ import com.lagradost.cloudstream3.amap import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.argamap import com.lagradost.cloudstream3.utils.ExtractorLink -import com.lagradost.cloudstream3.utils.INFER_TYPE import com.lagradost.cloudstream3.utils.extractorApis import com.lagradost.cloudstream3.utils.getQualityFromName import com.lagradost.cloudstream3.utils.loadExtractor @@ -71,7 +70,7 @@ class Vidstream(val mainUrl: String) { href, page.url, getQualityFromName(qual), - type = INFER_TYPE + element.attr("href").contains(".m3u8") ) ) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/extractors/Voe.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Voe.kt new file mode 100644 index 00000000..2c6998de --- /dev/null +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Voe.kt @@ -0,0 +1,36 @@ +package com.lagradost.cloudstream3.extractors + +import com.lagradost.cloudstream3.SubtitleFile +import com.lagradost.cloudstream3.app +import com.lagradost.cloudstream3.utils.ExtractorApi +import com.lagradost.cloudstream3.utils.ExtractorLink +import com.lagradost.cloudstream3.utils.M3u8Helper + +class Tubeless : Voe() { + override var mainUrl = "https://tubelessceliolymph.com" +} + +open class Voe : ExtractorApi() { + override val name = "Voe" + override val mainUrl = "https://voe.sx" + override val requiresReferer = true + + override suspend fun getUrl( + url: String, + referer: String?, + subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit + ) { + val res = app.get(url, referer = referer).document + val script = res.select("script").find { it.data().contains("sources =") }?.data() + val link = Regex("[\"']hls[\"']:\\s*[\"'](.*)[\"']").find(script ?: return)?.groupValues?.get(1) + + M3u8Helper.generateM3u8( + name, + link ?: return, + "$mainUrl/", + headers = mapOf("Origin" to "$mainUrl/") + ).forEach(callback) + + } +} \ No newline at end of file diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/WatchSB.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/WatchSB.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/WatchSB.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/WatchSB.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/WcoStream.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/WcoStream.kt similarity index 96% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/WcoStream.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/WcoStream.kt index 659d7804..6cc486cd 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/WcoStream.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/WcoStream.kt @@ -7,7 +7,6 @@ import com.lagradost.cloudstream3.extractors.helper.NineAnimeHelper.encrypt import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.utils.ExtractorApi import com.lagradost.cloudstream3.utils.ExtractorLink -import com.lagradost.cloudstream3.utils.INFER_TYPE import com.lagradost.cloudstream3.utils.Qualities class Vidstreamz : WcoStream() { @@ -127,7 +126,8 @@ open class WcoStream : ExtractorApi() { if (!response.text.startsWith("{")) throw ErrorLoadingException("Seems like 9Anime kiddies changed stuff again, Go touch some grass for bout an hour Or use a different Server") return response.parsed().data.media.sources.map { - ExtractorLink(name, it.file, it.file, host, Qualities.Unknown.value, type = INFER_TYPE) + ExtractorLink(name, it.file,it.file,host,Qualities.Unknown.value,it.file.contains(".m3u8")) } + } } diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Wibufile.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Wibufile.kt similarity index 92% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Wibufile.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Wibufile.kt index c69f0938..ae1e872a 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Wibufile.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/Wibufile.kt @@ -4,8 +4,8 @@ import com.lagradost.cloudstream3.SubtitleFile import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.utils.ExtractorApi import com.lagradost.cloudstream3.utils.ExtractorLink -import com.lagradost.cloudstream3.utils.INFER_TYPE import com.lagradost.cloudstream3.utils.Qualities +import java.net.URI open class Wibufile : ExtractorApi() { override val name: String = "Wibufile" @@ -28,8 +28,10 @@ open class Wibufile : ExtractorApi() { video ?: return, "$mainUrl/", Qualities.Unknown.value, - type = INFER_TYPE + URI(url).path.endsWith(".m3u8") ) ) + } + } \ No newline at end of file diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/XStreamCdn.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/XStreamCdn.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/XStreamCdn.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YourUpload.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/YourUpload.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YourUpload.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/YourUpload.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt similarity index 94% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt index 4e854630..23704e90 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/YoutubeExtractor.kt @@ -70,18 +70,19 @@ open class YoutubeExtractor : ExtractorApi() { } } ytVideos[url]?.mapNotNull { - if (it.isVideoOnly() || it.height <= 0) return@mapNotNull null + if (it.isVideoOnly || it.height <= 0) return@mapNotNull null ExtractorLink( this.name, this.name, - it.content ?: return@mapNotNull null, + it.url ?: return@mapNotNull null, "", it.height ) }?.forEach(callback) ytVideosSubtitles[url]?.mapNotNull { - SubtitleFile(it.languageTag ?: return@mapNotNull null, it.content ?: return@mapNotNull null) + SubtitleFile(it.languageTag ?: return@mapNotNull null, it.url ?: return@mapNotNull null) }?.forEach(subtitleCallback) } + } \ No newline at end of file diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Zorofile.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Zorofile.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Zorofile.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Zorofile.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Zplayer.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/Zplayer.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/Zplayer.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/Zplayer.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt similarity index 97% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt index bd42424f..0b401c06 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/helper/AsianEmbedHelper.kt @@ -1,6 +1,6 @@ package com.lagradost.cloudstream3.extractors.helper -import com.lagradost.api.Log +import android.util.Log import com.lagradost.cloudstream3.SubtitleFile import com.lagradost.cloudstream3.amap import com.lagradost.cloudstream3.app diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/helper/GogoHelper.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/NineAnimeHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/helper/NineAnimeHelper.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/NineAnimeHelper.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/helper/NineAnimeHelper.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/VstreamhubHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/helper/VstreamhubHelper.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/VstreamhubHelper.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/helper/VstreamhubHelper.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/WcoHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/extractors/helper/WcoHelper.kt similarity index 76% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/WcoHelper.kt rename to app/src/main/java/com/lagradost/cloudstream3/extractors/helper/WcoHelper.kt index 35aec2b1..768fa1f6 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/extractors/helper/WcoHelper.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/extractors/helper/WcoHelper.kt @@ -1,6 +1,8 @@ package com.lagradost.cloudstream3.extractors.helper import com.fasterxml.jackson.annotation.JsonProperty +import com.lagradost.cloudstream3.AcraApplication.Companion.getKey +import com.lagradost.cloudstream3.AcraApplication.Companion.setKey import com.lagradost.cloudstream3.app class WcoHelper { @@ -28,7 +30,9 @@ class WcoHelper { private suspend fun getKeys() { keys = keys ?: app.get("https://raw.githubusercontent.com/reduplicated/Cloudstream/master/docs/keys.json") - .parsedSafe() + .parsedSafe()?.also { setKey(BACKUP_KEY_DATA, it) } ?: getKey( + BACKUP_KEY_DATA + ) } suspend fun getWcoKey(): ExternalKeys? { @@ -39,7 +43,9 @@ class WcoHelper { private suspend fun getNewKeys() { newKeys = newKeys ?: app.get("https://raw.githubusercontent.com/chekaslowakiya/BruhFlow/main/keys.json") - .parsedSafe() + .parsedSafe()?.also { setKey(BACKUP_KEY_DATA, it) } ?: getKey( + BACKUP_KEY_DATA + ) } suspend fun getNewWcoKey(): NewExternalKeys? { diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt new file mode 100644 index 00000000..8cfe1e9a --- /dev/null +++ b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/MultiAnimeProvider.kt @@ -0,0 +1,73 @@ +package com.lagradost.cloudstream3.metaproviders + +import com.lagradost.cloudstream3.* +import com.lagradost.cloudstream3.LoadResponse.Companion.addAniListId +import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer +import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi +import com.lagradost.cloudstream3.syncproviders.SyncAPI +import com.lagradost.cloudstream3.syncproviders.providers.AniListApi +import com.lagradost.cloudstream3.syncproviders.providers.MALApi +import com.lagradost.cloudstream3.utils.SyncUtil + +// wont be implemented +class MultiAnimeProvider : MainAPI() { + override var name = "MultiAnime" + override var lang = "en" + override val usesWebView = true + override val supportedTypes = setOf(TvType.Anime) + private val syncApi: SyncAPI = aniListApi + + private val syncUtilType by lazy { + when (syncApi) { + is AniListApi -> "anilist" + is MALApi -> "myanimelist" + else -> throw ErrorLoadingException("Invalid Api") + } + } + + private val validApis + get() = + synchronized(APIHolder.apis) { + APIHolder.apis.filter { + it.lang == this.lang && it::class.java != this::class.java && it.supportedTypes.contains( + TvType.Anime + ) + } + } + + + private fun filterName(name: String): String { + return Regex("""[^a-zA-Z0-9-]""").replace(name, "") + } + + override suspend fun search(query: String): List? { + return syncApi.search(query)?.map { + AnimeSearchResponse(it.name, it.url, this.name, TvType.Anime, it.posterUrl) + } + } + + override suspend fun load(url: String): LoadResponse? { + return syncApi.getResult(url)?.let { res -> + val data = SyncUtil.getUrlsFromId(res.id, syncUtilType).amap { url -> + validApis.firstOrNull { api -> url.startsWith(api.mainUrl) }?.load(url) + }.filterNotNull() + + val type = + if (data.any { it.type == TvType.AnimeMovie }) TvType.AnimeMovie else TvType.Anime + + newAnimeLoadResponse( + res.title ?: throw ErrorLoadingException("No Title found"), + url, + type + ) { + posterUrl = res.posterUrl + plot = res.synopsis + tags = res.genres + rating = res.publicScore + addTrailer(res.trailers) + addAniListId(res.id.toIntOrNull()) + recommendations = res.recommendations + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt index bc646a8d..75e96bec 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/SyncRedirector.kt @@ -2,13 +2,15 @@ package com.lagradost.cloudstream3.metaproviders import com.lagradost.cloudstream3.MainAPI import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall +import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis import com.lagradost.cloudstream3.syncproviders.SyncIdName object SyncRedirector { + val syncApis = SyncApis private val syncIds = listOf( - SyncIdName.MyAnimeList to Regex("""myanimelist\.net/anime/(\d+)"""), - SyncIdName.Anilist to Regex("""anilist\.co/anime/(\d+)""") + SyncIdName.MyAnimeList to Regex("""myanimelist\.net\/anime\/(\d+)"""), + SyncIdName.Anilist to Regex("""anilist\.co\/anime\/(\d+)""") ) suspend fun redirect( diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt index c5b4d453..314177af 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TmdbProvider.kt @@ -105,7 +105,6 @@ open class TmdbProvider : MainAPI() { this.id, episode.episode_number, episode.season_number, - this.name ?: this.original_name, ).toJson(), episode.name, episode.season_number, @@ -123,7 +122,6 @@ open class TmdbProvider : MainAPI() { this.id, episodeNum, season.season_number, - this.name ?: this.original_name, ).toJson(), season = season.season_number ) @@ -153,8 +151,6 @@ open class TmdbProvider : MainAPI() { recommendations = (this@toLoadResponse.recommendations ?: this@toLoadResponse.similar)?.results?.map { it.toSearchResponse() } addActors(credits?.cast?.toList().toActors()) - - contentRating = fetchContentRating(id, "US") } } @@ -197,8 +193,6 @@ open class TmdbProvider : MainAPI() { recommendations = (this@toLoadResponse.recommendations ?: this@toLoadResponse.similar)?.results?.map { it.toSearchResponse() } addActors(credits?.cast?.toList().toActors()) - - contentRating = fetchContentRating(id, "US") } } @@ -270,26 +264,6 @@ open class TmdbProvider : MainAPI() { return null } - open suspend fun fetchContentRating(id: Int?, country: String): String? { - id ?: return null - - val contentRatings = tmdb.tvService().content_ratings(id).awaitResponse().body()?.results - return if (!contentRatings.isNullOrEmpty()) { - contentRatings.firstOrNull { it: ContentRating -> - it.iso_3166_1 == country - }?.rating - } else { - val releaseDates = tmdb.moviesService().releaseDates(id).awaitResponse().body()?.results - val certification = releaseDates?.firstOrNull { it: ReleaseDatesResult -> - it.iso_3166_1 == country - }?.release_dates?.firstOrNull { it: ReleaseDate -> - !it.certification.isNullOrBlank() - }?.certification - - certification - } - } - // Possible to add recommendations and such here. override suspend fun load(url: String): LoadResponse? { // https://www.themoviedb.org/movie/7445-brothers diff --git a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt deleted file mode 100644 index addee9a0..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/metaproviders/TraktProvider.kt +++ /dev/null @@ -1,471 +0,0 @@ -package com.lagradost.cloudstream3.metaproviders - -import android.net.Uri -import com.fasterxml.jackson.annotation.JsonAlias -import com.fasterxml.jackson.annotation.JsonProperty -import com.lagradost.cloudstream3.APIHolder -import com.lagradost.cloudstream3.APIHolder.unixTimeMS -import com.lagradost.cloudstream3.Actor -import com.lagradost.cloudstream3.ActorData -import com.lagradost.cloudstream3.Episode -import com.lagradost.cloudstream3.HomePageResponse -import com.lagradost.cloudstream3.LoadResponse -import com.lagradost.cloudstream3.LoadResponse.Companion.addImdbId -import com.lagradost.cloudstream3.LoadResponse.Companion.addTMDbId -import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer -import com.lagradost.cloudstream3.MainAPI -import com.lagradost.cloudstream3.MainPageRequest -import com.lagradost.cloudstream3.NextAiring -import com.lagradost.cloudstream3.ProviderType -import com.lagradost.cloudstream3.SearchResponse -import com.lagradost.cloudstream3.ShowStatus -import com.lagradost.cloudstream3.TvType -import com.lagradost.cloudstream3.addDate -import com.lagradost.cloudstream3.app -import com.lagradost.cloudstream3.base64Decode -import com.lagradost.cloudstream3.mainPageOf -import com.lagradost.cloudstream3.mvvm.logError -import com.lagradost.cloudstream3.newHomePageResponse -import com.lagradost.cloudstream3.newMovieLoadResponse -import com.lagradost.cloudstream3.newMovieSearchResponse -import com.lagradost.cloudstream3.newTvSeriesLoadResponse -import com.lagradost.cloudstream3.newTvSeriesSearchResponse -import com.lagradost.cloudstream3.utils.AppUtils.parseJson -import com.lagradost.cloudstream3.utils.AppUtils.toJson -import java.text.SimpleDateFormat -import java.util.Locale -import kotlin.math.roundToInt - -open class TraktProvider : MainAPI() { - override var name = "Trakt" - override val hasMainPage = true - override val providerType = ProviderType.MetaProvider - override val supportedTypes = setOf( - TvType.Movie, - TvType.TvSeries, - TvType.Anime, - ) - - private val traktClientId = - base64Decode("N2YzODYwYWQzNGI4ZTZmOTdmN2I5MTA0ZWQzMzEwOGI0MmQ3MTdlMTM0MmM2NGMxMTg5NGE1MjUyYTQ3NjE3Zg==") - private val traktApiUrl = base64Decode("aHR0cHM6Ly9hcGl6LnRyYWt0LnR2") - - override val mainPage = mainPageOf( - "$traktApiUrl/movies/trending" to "Trending Movies", //Most watched movies right now - "$traktApiUrl/movies/popular" to "Popular Movies", //The most popular movies for all time - "$traktApiUrl/shows/trending" to "Trending Shows", //Most watched Shows right now - "$traktApiUrl/shows/popular" to "Popular Shows", //The most popular Shows for all time - ) - - override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse { - - val apiResponse = getApi("${request.data}?extended=cloud9,full&page=$page") - - val results = parseJson>(apiResponse).map { element -> - element.toSearchResponse() - } - return newHomePageResponse(request.name, results) - } - - private fun MediaDetails.toSearchResponse(): SearchResponse { - - val media = this.media ?: this - val mediaType = if (media.ids?.tvdb == null) TvType.Movie else TvType.TvSeries - val poster = media.images?.poster?.firstOrNull() - - if (mediaType == TvType.Movie) { - return newMovieSearchResponse( - name = media.title!!, - url = Data( - type = mediaType, - mediaDetails = media, - ).toJson(), - type = TvType.Movie, - ) { - posterUrl = fixPath(poster) - } - } else { - return newTvSeriesSearchResponse( - name = media.title!!, - url = Data( - type = mediaType, - mediaDetails = media, - ).toJson(), - type = TvType.TvSeries, - ) { - this.posterUrl = fixPath(poster) - } - } - } - - override suspend fun search(query: String): List? { - val apiResponse = - getApi("$traktApiUrl/search/movie,show?extended=cloud9,full&limit=20&page=1&query=$query") - - val results = parseJson>(apiResponse).map { element -> - element.toSearchResponse() - } - - return results - } - - override suspend fun load(url: String): LoadResponse { - - val data = parseJson(url) - val mediaDetails = data.mediaDetails - val moviesOrShows = if (data.type == TvType.Movie) "movies" else "shows" - - val posterUrl = mediaDetails?.images?.poster?.firstOrNull() - val backDropUrl = mediaDetails?.images?.fanart?.firstOrNull() - - val resActor = - getApi("$traktApiUrl/$moviesOrShows/${mediaDetails?.ids?.trakt}/people?extended=cloud9,full") - - val actors = parseJson(resActor).cast?.map { - ActorData( - Actor( - name = it.person?.name!!, - image = getWidthImageUrl(it.person.images?.headshot?.firstOrNull(), "w500") - ), - roleString = it.character - ) - } - - val resRelated = - getApi("$traktApiUrl/$moviesOrShows/${mediaDetails?.ids?.trakt}/related?extended=cloud9,full&limit=20") - - val relatedMedia = parseJson>(resRelated).map { it.toSearchResponse() } - - val isCartoon = - mediaDetails?.genres?.contains("animation") == true || mediaDetails?.genres?.contains("anime") == true - val isAnime = - isCartoon && (mediaDetails?.language == "zh" || mediaDetails?.language == "ja") - val isAsian = !isAnime && (mediaDetails?.language == "zh" || mediaDetails?.language == "ko") - val isBollywood = mediaDetails?.country == "in" - - if (data.type == TvType.Movie) { - - val linkData = LinkData( - id = mediaDetails?.ids?.tmdb, - traktId = mediaDetails?.ids?.trakt, - traktSlug = mediaDetails?.ids?.slug, - tmdbId = mediaDetails?.ids?.tmdb, - imdbId = mediaDetails?.ids?.imdb.toString(), - tvdbId = mediaDetails?.ids?.tvdb, - tvrageId = mediaDetails?.ids?.tvrage, - type = data.type.toString(), - title = mediaDetails?.title, - year = mediaDetails?.year, - orgTitle = mediaDetails?.title, - isAnime = isAnime, - //jpTitle = later if needed as it requires another network request, - airedDate = mediaDetails?.released - ?: mediaDetails?.firstAired, - isAsian = isAsian, - isBollywood = isBollywood, - ).toJson() - - return newMovieLoadResponse( - name = mediaDetails?.title!!, - url = data.toJson(), - dataUrl = linkData.toJson(), - type = if (isAnime) TvType.AnimeMovie else TvType.Movie, - ) { - this.name = mediaDetails.title - this.type = if (isAnime) TvType.AnimeMovie else TvType.Movie - this.posterUrl = getOriginalWidthImageUrl(posterUrl) - this.year = mediaDetails.year - this.plot = mediaDetails.overview - this.rating = mediaDetails.rating?.times(1000)?.roundToInt() - this.tags = mediaDetails.genres - this.duration = mediaDetails.runtime - this.recommendations = relatedMedia - this.actors = actors - this.comingSoon = isUpcoming(mediaDetails.released) - //posterHeaders - this.backgroundPosterUrl = getOriginalWidthImageUrl(backDropUrl) - this.contentRating = mediaDetails.certification - addTrailer(mediaDetails.trailer) - addImdbId(mediaDetails.ids?.imdb) - addTMDbId(mediaDetails.ids?.tmdb.toString()) - } - } else { - - val resSeasons = - getApi("$traktApiUrl/shows/${mediaDetails?.ids?.trakt.toString()}/seasons?extended=cloud9,full,episodes") - val episodes = mutableListOf() - val seasons = parseJson>(resSeasons) - var nextAir: NextAiring? = null - - seasons.forEach { season -> - - season.episodes?.map { episode -> - - val linkData = LinkData( - id = mediaDetails?.ids?.tmdb, - traktId = mediaDetails?.ids?.trakt, - traktSlug = mediaDetails?.ids?.slug, - tmdbId = mediaDetails?.ids?.tmdb, - imdbId = mediaDetails?.ids?.imdb.toString(), - tvdbId = mediaDetails?.ids?.tvdb, - tvrageId = mediaDetails?.ids?.tvrage, - type = data.type.toString(), - season = episode.season, - episode = episode.number, - title = mediaDetails?.title, - year = mediaDetails?.year, - orgTitle = mediaDetails?.title, - isAnime = isAnime, - airedYear = mediaDetails?.year, - lastSeason = seasons.size, - epsTitle = episode.title, - //jpTitle = later if needed as it requires another network request, - date = episode.firstAired, - airedDate = episode.firstAired, - isAsian = isAsian, - isBollywood = isBollywood, - isCartoon = isCartoon - ).toJson() - - episodes.add( - Episode( - data = linkData.toJson(), - name = episode.title, - season = episode.season, - episode = episode.number, - posterUrl = fixPath(episode.images?.screenshot?.firstOrNull()), - rating = episode.rating?.times(10)?.roundToInt(), - description = episode.overview, - runTime = episode.runtime - ).apply { - this.addDate(episode.firstAired, "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") - if (nextAir == null && this.date != null && this.date!! > unixTimeMS && this.season != 0) { - nextAir = NextAiring( - episode = this.episode!!, - unixTime = this.date!!.div(1000L), - season = if (this.season == 1) null else this.season, - ) - } - } - ) - } - } - - return newTvSeriesLoadResponse( - name = mediaDetails?.title!!, - url = data.toJson(), - type = if (isAnime) TvType.Anime else TvType.TvSeries, - episodes = episodes - ) { - this.name = mediaDetails.title - this.type = if (isAnime) TvType.Anime else TvType.TvSeries - this.episodes = episodes - this.posterUrl = getOriginalWidthImageUrl(posterUrl) - this.year = mediaDetails.year - this.plot = mediaDetails.overview - this.showStatus = getStatus(mediaDetails.status) - this.rating = mediaDetails.rating?.times(1000)?.roundToInt() - this.tags = mediaDetails.genres - this.duration = mediaDetails.runtime - this.recommendations = relatedMedia - this.actors = actors - this.comingSoon = isUpcoming(mediaDetails.released) - //posterHeaders - this.nextAiring = nextAir - this.backgroundPosterUrl = getOriginalWidthImageUrl(backDropUrl) - this.contentRating = mediaDetails.certification - addTrailer(mediaDetails.trailer) - addImdbId(mediaDetails.ids?.imdb) - addTMDbId(mediaDetails.ids?.tmdb.toString()) - } - } - } - - private suspend fun getApi(url: String): String { - return app.get( - url = url, - headers = mapOf( - "Content-Type" to "application/json", - "trakt-api-version" to "2", - "trakt-api-key" to traktClientId, - ) - ).toString() - } - - private fun isUpcoming(dateString: String?): Boolean { - return try { - val format = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()) - val dateTime = dateString?.let { format.parse(it)?.time } ?: return false - unixTimeMS < dateTime - } catch (t: Throwable) { - logError(t) - false - } - } - - private fun getStatus(t: String?): ShowStatus { - return when (t) { - "returning series" -> ShowStatus.Ongoing - "continuing" -> ShowStatus.Ongoing - else -> ShowStatus.Completed - } - } - - private fun fixPath(url: String?): String? { - url ?: return null - return "https://$url" - } - - private fun getWidthImageUrl(path: String?, width: String): String? { - if (path == null) return null - if (!path.contains("image.tmdb.org")) return fixPath(path) - val fileName = Uri.parse(path).lastPathSegment ?: return null - return "https://image.tmdb.org/t/p/${width}/${fileName}" - } - - private fun getOriginalWidthImageUrl(path: String?): String? { - if (path == null) return null - if (!path.contains("image.tmdb.org")) return fixPath(path) - return getWidthImageUrl(path, "original") - } - - data class Data( - val type: TvType? = null, - val mediaDetails: MediaDetails? = null, - ) - - data class MediaDetails( - @JsonProperty("title") val title: String? = null, - @JsonProperty("year") val year: Int? = null, - @JsonProperty("ids") val ids: Ids? = null, - @JsonProperty("tagline") val tagline: String? = null, - @JsonProperty("overview") val overview: String? = null, - @JsonProperty("released") val released: String? = null, - @JsonProperty("runtime") val runtime: Int? = null, - @JsonProperty("country") val country: String? = null, - @JsonProperty("updatedAt") val updatedAt: String? = null, - @JsonProperty("trailer") val trailer: String? = null, - @JsonProperty("homepage") val homepage: String? = null, - @JsonProperty("status") val status: String? = null, - @JsonProperty("rating") val rating: Double? = null, - @JsonProperty("votes") val votes: Long? = null, - @JsonProperty("comment_count") val commentCount: Long? = null, - @JsonProperty("language") val language: String? = null, - @JsonProperty("languages") val languages: List? = null, - @JsonProperty("available_translations") val availableTranslations: List? = null, - @JsonProperty("genres") val genres: List? = null, - @JsonProperty("certification") val certification: String? = null, - @JsonProperty("aired_episodes") val airedEpisodes: Int? = null, - @JsonProperty("first_aired") val firstAired: String? = null, - @JsonProperty("airs") val airs: Airs? = null, - @JsonProperty("network") val network: String? = null, - @JsonProperty("images") val images: Images? = null, - @JsonProperty("movie") @JsonAlias("show") val media: MediaDetails? = null - ) - - data class Airs( - @JsonProperty("day") val day: String? = null, - @JsonProperty("time") val time: String? = null, - @JsonProperty("timezone") val timezone: String? = null, - ) - - data class Ids( - @JsonProperty("trakt") val trakt: Int? = null, - @JsonProperty("slug") val slug: String? = null, - @JsonProperty("tvdb") val tvdb: Int? = null, - @JsonProperty("imdb") val imdb: String? = null, - @JsonProperty("tmdb") val tmdb: Int? = null, - @JsonProperty("tvrage") val tvrage: String? = null, - ) - - data class Images( - @JsonProperty("fanart") val fanart: List? = null, - @JsonProperty("poster") val poster: List? = null, - @JsonProperty("logo") val logo: List? = null, - @JsonProperty("clearart") val clearart: List? = null, - @JsonProperty("banner") val banner: List? = null, - @JsonProperty("thumb") val thumb: List? = null, - @JsonProperty("screenshot") val screenshot: List? = null, - @JsonProperty("headshot") val headshot: List? = null, - ) - - data class People( - @JsonProperty("cast") val cast: List? = null, - ) - - data class Cast( - @JsonProperty("character") val character: String? = null, - @JsonProperty("characters") val characters: List? = null, - @JsonProperty("episode_count") val episodeCount: Long? = null, - @JsonProperty("person") val person: Person? = null, - @JsonProperty("images") val images: Images? = null, - ) - - data class Person( - @JsonProperty("name") val name: String? = null, - @JsonProperty("ids") val ids: Ids? = null, - @JsonProperty("images") val images: Images? = null, - ) - - data class Seasons( - @JsonProperty("aired_episodes") val airedEpisodes: Int? = null, - @JsonProperty("episode_count") val episodeCount: Int? = null, - @JsonProperty("episodes") val episodes: List? = null, - @JsonProperty("first_aired") val firstAired: String? = null, - @JsonProperty("ids") val ids: Ids? = null, - @JsonProperty("images") val images: Images? = null, - @JsonProperty("network") val network: String? = null, - @JsonProperty("number") val number: Int? = null, - @JsonProperty("overview") val overview: String? = null, - @JsonProperty("rating") val rating: Double? = null, - @JsonProperty("title") val title: String? = null, - @JsonProperty("updated_at") val updatedAt: String? = null, - @JsonProperty("votes") val votes: Int? = null, - ) - - data class TraktEpisode( - @JsonProperty("available_translations") val availableTranslations: List? = null, - @JsonProperty("comment_count") val commentCount: Int? = null, - @JsonProperty("episode_type") val episodeType: String? = null, - @JsonProperty("first_aired") val firstAired: String? = null, - @JsonProperty("ids") val ids: Ids? = null, - @JsonProperty("images") val images: Images? = null, - @JsonProperty("number") val number: Int? = null, - @JsonProperty("number_abs") val numberAbs: Int? = null, - @JsonProperty("overview") val overview: String? = null, - @JsonProperty("rating") val rating: Double? = null, - @JsonProperty("runtime") val runtime: Int? = null, - @JsonProperty("season") val season: Int? = null, - @JsonProperty("title") val title: String? = null, - @JsonProperty("updated_at") val updatedAt: String? = null, - @JsonProperty("votes") val votes: Int? = null, - ) - - data class LinkData( - val id: Int? = null, - val traktId: Int? = null, - val traktSlug: String? = null, - val tmdbId: Int? = null, - val imdbId: String? = null, - val tvdbId: Int? = null, - val tvrageId: String? = null, - val type: String? = null, - val season: Int? = null, - val episode: Int? = null, - val aniId: String? = null, - val animeId: String? = null, - val title: String? = null, - val year: Int? = null, - val orgTitle: String? = null, - val isAnime: Boolean = false, - val airedYear: Int? = null, - val lastSeason: Int? = null, - val epsTitle: String? = null, - val jpTitle: String? = null, - val date: String? = null, - val airedDate: String? = null, - val isAsian: Boolean = false, - val isBollywood: Boolean = false, - val isCartoon: Boolean = false, - ) -} \ No newline at end of file diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt b/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt similarity index 89% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt rename to app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt index d3b4999a..eb575775 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/mvvm/ArchComponentExt.kt @@ -1,7 +1,10 @@ package com.lagradost.cloudstream3.mvvm -import com.lagradost.api.BuildConfig -import com.lagradost.api.Log +import android.util.Log +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.LiveData +import com.bumptech.glide.load.HttpException +import com.lagradost.cloudstream3.BuildConfig import com.lagradost.cloudstream3.ErrorLoadingException import kotlinx.coroutines.* import java.io.InterruptedIOException @@ -46,6 +49,14 @@ inline fun debugWarning(assert: () -> Boolean, message: () -> String) { } } +fun LifecycleOwner.observe(liveData: LiveData, action: (t: T) -> Unit) { + liveData.observe(this) { it?.let { t -> action(t) } } +} + +fun LifecycleOwner.observeNullable(liveData: LiveData, action: (t: T) -> Unit) { + liveData.observe(this) { action(it) } +} + sealed class Resource { data class Success(val value: T) : Resource() data class Failure( @@ -143,14 +154,14 @@ fun throwAbleToResource( "Connection Timeout\nPlease try again later." ) } -// is HttpException -> { -// Resource.Failure( -// false, -// throwable.statusCode, -// null, -// throwable.message ?: "HttpException" -// ) -// } + is HttpException -> { + Resource.Failure( + false, + throwable.statusCode, + null, + throwable.message ?: "HttpException" + ) + } is UnknownHostException -> { Resource.Failure(true, null, null, "Cannot connect to server, try again later.\n${throwable.message}") } diff --git a/app/src/main/java/com/lagradost/cloudstream3/mvvm/Lifecycle.kt b/app/src/main/java/com/lagradost/cloudstream3/mvvm/Lifecycle.kt deleted file mode 100644 index 3df5197c..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/mvvm/Lifecycle.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.lagradost.cloudstream3.mvvm - -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.LiveData - -/** NOTE: Only one observer at a time per value */ -fun LifecycleOwner.observe(liveData: LiveData, action: (t: T) -> Unit) { - liveData.removeObservers(this) - liveData.observe(this) { it?.let { t -> action(t) } } -} - -/** NOTE: Only one observer at a time per value */ -fun LifecycleOwner.observeNullable(liveData: LiveData, action: (t: T) -> Unit) { - liveData.removeObservers(this) - liveData.observe(this) { action(it) } -} diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt b/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt index 85a9db5d..6950d961 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/network/CloudflareKiller.kt @@ -9,10 +9,7 @@ import com.lagradost.cloudstream3.mvvm.normalSafeApiCall import com.lagradost.nicehttp.Requests.Companion.await import com.lagradost.nicehttp.cookies import kotlinx.coroutines.runBlocking -import okhttp3.Headers -import okhttp3.Interceptor -import okhttp3.Request -import okhttp3.Response +import okhttp3.* import java.net.URI @@ -20,8 +17,6 @@ import java.net.URI class CloudflareKiller : Interceptor { companion object { const val TAG = "CloudflareKiller" - private val ERROR_CODES = listOf(403, 503) - private val CLOUDFLARE_SERVERS = listOf("cloudflare-nginx", "cloudflare") fun parseCookieMap(cookie: String): Map { return cookie.split(";").associate { val split = it.split("=") @@ -53,23 +48,15 @@ class CloudflareKiller : Interceptor { override fun intercept(chain: Interceptor.Chain): Response = runBlocking { val request = chain.request() + val cookies = savedCookies[request.url.host] - when (val cookies = savedCookies[request.url.host]) { - null -> { - val response = chain.proceed(request) - if(!(response.header("Server") in CLOUDFLARE_SERVERS && response.code in ERROR_CODES)) { - return@runBlocking response - } else { - response.close() - bypassCloudflare(request)?.let { - Log.d(TAG, "Succeeded bypassing cloudflare: ${request.url}") - return@runBlocking it - } - } - } - else -> { - return@runBlocking proceed(request, cookies) + if (cookies == null) { + bypassCloudflare(request)?.let { + Log.d(TAG, "Succeeded bypassing cloudflare: ${request.url}") + return@runBlocking it } + } else { + return@runBlocking proceed(request, cookies) } debugWarning({ true }) { "Failed cloudflare at: ${request.url}" } diff --git a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt b/app/src/main/java/com/lagradost/cloudstream3/network/WebViewResolver.kt similarity index 91% rename from library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt rename to app/src/main/java/com/lagradost/cloudstream3/network/WebViewResolver.kt index 0fbc5749..9171aed9 100644 --- a/library/src/androidMain/kotlin/com/lagradost/cloudstream3/network/WebViewResolver.android.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/network/WebViewResolver.kt @@ -1,12 +1,11 @@ package com.lagradost.cloudstream3.network import android.annotation.SuppressLint -import android.content.Context import android.net.http.SslError -import android.os.Handler -import android.os.Looper import android.webkit.* -import com.lagradost.api.getContext +import com.lagradost.cloudstream3.AcraApplication +import com.lagradost.cloudstream3.AcraApplication.Companion.context +import com.lagradost.cloudstream3.USER_AGENT import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.mvvm.debugException import com.lagradost.cloudstream3.mvvm.logError @@ -28,28 +27,21 @@ import java.net.URI * @param additionalUrls this will make resolveUsingWebView also return all other requests matching the list of Regex. * @param userAgent if null then will use the default user agent * @param useOkhttp will try to use the okhttp client as much as possible, but this might cause some requests to fail. Disable for cloudflare. - * @param script pass custom js to execute - * @param scriptCallback will be called with the result from custom js - * @param timeout close webview after timeout * */ -actual class WebViewResolver actual constructor( +class WebViewResolver( val interceptUrl: Regex, - val additionalUrls: List, - val userAgent: String?, - val useOkhttp: Boolean, - val script: String?, - val scriptCallback: ((String) -> Unit)?, - val timeout: Long + val additionalUrls: List = emptyList(), + val userAgent: String? = USER_AGENT, + val useOkhttp: Boolean = true ) : Interceptor { - actual companion object { + companion object { var webViewUserAgent: String? = null - actual val DEFAULT_TIMEOUT = 60_000L @JvmName("getWebViewUserAgent1") fun getWebViewUserAgent(): String? { - return webViewUserAgent ?: (getContext() as? Context)?.let { ctx -> + return webViewUserAgent ?: context?.let { ctx -> runBlocking { mainWork { WebView(ctx).settings.userAgentString.also { userAgent -> @@ -120,7 +112,7 @@ actual class WebViewResolver actual constructor( WebView.setWebContentsDebuggingEnabled(true) try { webView = WebView( - (getContext() as? Context) + AcraApplication.context ?: throw RuntimeException("No base context in WebViewResolver") ).apply { // Bare minimum to bypass captcha @@ -144,14 +136,6 @@ actual class WebViewResolver actual constructor( val webViewUrl = request.url.toString() println("Loading WebView URL: $webViewUrl") - if (script != null) { - val handler = Handler(Looper.getMainLooper()) - handler.post { - view.evaluateJavascript("$script") - { scriptCallback?.invoke(it) } - } - } - if (interceptUrl.containsMatchIn(webViewUrl)) { fixedRequest = request.toRequest()?.also { requestCallBack(it) @@ -257,7 +241,7 @@ actual class WebViewResolver actual constructor( var loop = 0 // Timeouts after this amount, 60s - val totalTime = timeout + val totalTime = 60000L val delayTime = 100L diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/CloudstreamPlugin.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/CloudstreamPlugin.kt index ddf5b286..e89ccfeb 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/plugins/CloudstreamPlugin.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/CloudstreamPlugin.kt @@ -2,4 +2,5 @@ package com.lagradost.cloudstream3.plugins @Suppress("unused") @Target(AnnotationTarget.CLASS) -annotation class CloudstreamPlugin \ No newline at end of file +annotation class CloudstreamPlugin( +) \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt index fc836587..6b7dc90b 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/Plugin.kt @@ -34,7 +34,7 @@ abstract class Plugin { */ fun registerMainAPI(element: MainAPI) { Log.i(PLUGIN_TAG, "Adding ${element.name} (${element.mainUrl}) MainAPI") - element.sourcePlugin = this.filename + element.sourcePlugin = this.__filename // Race condition causing which would case duplicates if not for distinctBy synchronized(APIHolder.allProviders) { APIHolder.allProviders.add(element) @@ -48,7 +48,7 @@ abstract class Plugin { */ fun registerExtractorAPI(element: ExtractorApi) { Log.i(PLUGIN_TAG, "Adding ${element.name} (${element.mainUrl}) ExtractorApi") - element.sourcePlugin = this.filename + element.sourcePlugin = this.__filename extractorApis.add(element) } @@ -67,12 +67,7 @@ abstract class Plugin { * This will contain your resources if you specified requiresResources in gradle */ var resources: Resources? = null - /** Full file path to the plugin. */ - @Deprecated("Renamed to `filename` to follow conventions", replaceWith = ReplaceWith("filename")) - var __filename: String? - get() = filename - set(value) {filename = value} - var filename: String? = null + var __filename: String? = null /** * This will add a button in the settings allowing you to add custom settings diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt index bc2a1780..87b0ba3b 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/PluginManager.kt @@ -1,25 +1,24 @@ package com.lagradost.cloudstream3.plugins -import android.Manifest import android.app.* import android.content.Context -import android.content.pm.PackageManager import android.content.res.AssetManager import android.content.res.Resources import android.os.Build import android.os.Environment import android.util.Log import android.widget.Toast -import androidx.core.app.ActivityCompat import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat import androidx.fragment.app.FragmentActivity import com.fasterxml.jackson.annotation.JsonProperty import com.google.gson.Gson import com.lagradost.cloudstream3.* +import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings import com.lagradost.cloudstream3.APIHolder.removePluginMapping import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity import com.lagradost.cloudstream3.AcraApplication.Companion.getKey +import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey import com.lagradost.cloudstream3.AcraApplication.Companion.setKey import com.lagradost.cloudstream3.CommonActivity.showToast import com.lagradost.cloudstream3.MainAPI.Companion.settingsForProvider @@ -35,7 +34,6 @@ import com.lagradost.cloudstream3.ui.result.UiText import com.lagradost.cloudstream3.ui.result.txt import com.lagradost.cloudstream3.ui.settings.extensions.REPOSITORIES_KEY import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData -import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings import com.lagradost.cloudstream3.utils.Coroutines.main import com.lagradost.cloudstream3.utils.ExtractorApi import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute @@ -139,20 +137,6 @@ object PluginManager { } } - /** - * Deletes all generated oat files which will force Android to recompile the dex extensions. - * This might fix unrecoverable SIGSEGV exceptions when old oat files are loaded in a new app update. - */ - fun deleteAllOatFiles(context: Context) { - File("${context.filesDir}/${ONLINE_PLUGINS_FOLDER}").listFiles()?.forEach { repo -> - repo.listFiles { file -> file.name == "oat" && file.isDirectory }?.forEach { file -> - val success = file.deleteRecursively() - Log.i(TAG, "Deleted oat directory: ${file.absolutePath} Success=$success") - } - } - } - - fun getPluginsOnline(): Array { return getKey(PLUGINS_KEY) ?: emptyArray() } @@ -166,7 +150,7 @@ object PluginManager { private val LOCAL_PLUGINS_PATH = CLOUD_STREAM_FOLDER + "plugins" - var currentlyLoading: String? = null + public var currentlyLoading: String? = null // Maps filepath to plugin val plugins: MutableMap = @@ -342,7 +326,7 @@ object PluginManager { //Omit non-NSFW if mode is set to NSFW only if (mode == AutoDownloadMode.NsfwOnly) { - if (!tvtypes.contains(TvType.NSFW.name)) { + if (tvtypes.contains(TvType.NSFW.name) == false) { return@mapNotNull null } } @@ -431,6 +415,7 @@ object PluginManager { **/ fun loadAllLocalPlugins(context: Context, forceReload: Boolean) { val dir = File(LOCAL_PLUGINS_PATH) + removeKey(PLUGINS_KEY_LOCAL) if (!dir.exists()) { val res = dir.mkdirs() @@ -478,14 +463,6 @@ object PluginManager { Log.i(TAG, "Loading plugin: $data") return try { - // in case of android 14 then - try { - File(filePath).setReadOnly() - } catch (t: Throwable) { - Log.e(TAG, "Failed to set dex as readonly") - logError(t) - } - val loader = PathClassLoader(filePath, context.classLoader) var manifest: Plugin.Manifest loader.getResourceAsStream("manifest.json").use { stream -> @@ -507,12 +484,10 @@ object PluginManager { val version: Int = manifest.version ?: PLUGIN_VERSION_NOT_SET.also { Log.d(TAG, "No manifest version for ${data.internalName}") } - - @Suppress("UNCHECKED_CAST") val pluginClass: Class<*> = loader.loadClass(manifest.pluginClassName) as Class val pluginInstance: Plugin = - pluginClass.getDeclaredConstructor().newInstance() as Plugin + pluginClass.newInstance() as Plugin // Sets with the proper version setPluginData(data.copy(version = version)) @@ -522,16 +497,14 @@ object PluginManager { return true } - pluginInstance.filename = file.absolutePath + pluginInstance.__filename = fileName if (manifest.requiresResources) { Log.d(TAG, "Loading resources for ${data.internalName}") // based on https://stackoverflow.com/questions/7483568/dynamic-resource-loading-from-other-apk - val assets = AssetManager::class.java.getDeclaredConstructor().newInstance() + val assets = AssetManager::class.java.newInstance() val addAssetPath = AssetManager::class.java.getMethod("addAssetPath", String::class.java) addAssetPath.invoke(assets, file.absolutePath) - - @Suppress("DEPRECATION") pluginInstance.resources = Resources( assets, context.resources.displayMetrics, @@ -573,14 +546,14 @@ object PluginManager { // remove all registered apis synchronized(APIHolder.apis) { - APIHolder.apis.filter { api -> api.sourcePlugin == plugin.filename }.forEach { + APIHolder.apis.filter { api -> api.sourcePlugin == plugin.__filename }.forEach { removePluginMapping(it) } } synchronized(APIHolder.allProviders) { - APIHolder.allProviders.removeIf { provider: MainAPI -> provider.sourcePlugin == plugin.filename } + APIHolder.allProviders.removeIf { provider: MainAPI -> provider.sourcePlugin == plugin.__filename } } - extractorApis.removeIf { provider: ExtractorApi -> provider.sourcePlugin == plugin.filename } + extractorApis.removeIf { provider: ExtractorApi -> provider.sourcePlugin == plugin.__filename } classLoaders.values.removeIf { v -> v == plugin } @@ -727,14 +700,9 @@ object PluginManager { } val notification = builder.build() - // notificationId is a unique int for each notification that you must define - if (ActivityCompat.checkSelfPermission( - context, - Manifest.permission.POST_NOTIFICATIONS - ) == PackageManager.PERMISSION_GRANTED - ) { - NotificationManagerCompat.from(context) - .notify((System.currentTimeMillis() / 1000).toInt(), notification) + with(NotificationManagerCompat.from(context)) { + // notificationId is a unique int for each notification that you must define + notify((System.currentTimeMillis() / 1000).toInt(), notification) } return notification } catch (e: Exception) { diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt index c6ec9df7..b80a590e 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/RepositoryManager.kt @@ -73,7 +73,7 @@ object RepositoryManager { val PREBUILT_REPOSITORIES: Array by lazy { getKey("PREBUILT_REPOSITORIES") ?: emptyArray() } - private val GH_REGEX = Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$") + val GH_REGEX = Regex("^https://raw.githubusercontent.com/([A-Za-z0-9-]+)/([A-Za-z0-9_.-]+)/(.*)$") /* Convert raw.githubusercontent.com urls to cdn.jsdelivr.net if enabled in settings */ fun convertRawGitUrl(url: String): String { diff --git a/app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt b/app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt index d1b702f4..a45ab5f0 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/plugins/VotingApi.kt @@ -15,7 +15,7 @@ import kotlinx.coroutines.sync.withLock object VotingApi { // please do not cheat the votes lol private const val LOGKEY = "VotingApi" - private const val API_DOMAIN = "https://counterapi.com/api" + private const val apiDomain = "https://counterapi.com/api" private fun transformUrl(url: String): String = // dont touch or all votes get reset MessageDigest @@ -49,13 +49,13 @@ object VotingApi { // please do not cheat the votes lol .joinToString("-") private suspend fun readVote(pluginUrl: String): Int { - val url = "${API_DOMAIN}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}?readOnly=true" + var url = "${apiDomain}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}?readOnly=true" Log.d(LOGKEY, "Requesting: $url") return app.get(url).parsedSafe()?.value ?: 0 } private suspend fun writeVote(pluginUrl: String): Boolean { - val url = "${API_DOMAIN}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}" + var url = "${apiDomain}/cs-${getRepository(pluginUrl)}/vote/${transformUrl(pluginUrl)}" Log.d(LOGKEY, "Requesting: $url") return app.get(url).parsedSafe()?.value != null } @@ -69,7 +69,8 @@ object VotingApi { // please do not cheat the votes lol getKey("cs3-votes/${transformUrl(pluginUrl)}") ?: false fun canVote(pluginUrl: String): Boolean { - return PluginManager.urlPlugins.contains(pluginUrl) + if (!PluginManager.urlPlugins.contains(pluginUrl)) return false + return true } private val voteLock = Mutex() diff --git a/app/src/main/java/com/lagradost/cloudstream3/services/BackupWorkManager.kt b/app/src/main/java/com/lagradost/cloudstream3/services/BackupWorkManager.kt deleted file mode 100644 index 4ef841f5..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/services/BackupWorkManager.kt +++ /dev/null @@ -1,96 +0,0 @@ -package com.lagradost.cloudstream3.services - -import android.content.Context -import androidx.core.app.NotificationCompat -import androidx.work.Constraints -import androidx.work.CoroutineWorker -import androidx.work.ExistingPeriodicWorkPolicy -import androidx.work.ForegroundInfo -import androidx.work.PeriodicWorkRequest -import androidx.work.WorkManager -import androidx.work.WorkerParameters -import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.utils.AppContextUtils.createNotificationChannel -import com.lagradost.cloudstream3.utils.BackupUtils -import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute -import java.util.concurrent.TimeUnit - -const val BACKUP_CHANNEL_ID = "cloudstream3.backups" -const val BACKUP_WORK_NAME = "work_backup" -const val BACKUP_CHANNEL_NAME = "Backups" -const val BACKUP_CHANNEL_DESCRIPTION = "Notifications for background backups" -const val BACKUP_NOTIFICATION_ID = 938712898 // Random unique - -class BackupWorkManager(val context: Context, workerParams: WorkerParameters) : - CoroutineWorker(context, workerParams) { - companion object { - fun enqueuePeriodicWork(context: Context?, intervalHours: Long) { - if (context == null) return - - if (intervalHours == 0L) { - WorkManager.getInstance(context).cancelUniqueWork(BACKUP_WORK_NAME) - return - } - - val constraints = Constraints.Builder() - .setRequiresStorageNotLow(true) - .build() - - val periodicSyncDataWork = - PeriodicWorkRequest.Builder( - BackupWorkManager::class.java, - intervalHours, - TimeUnit.HOURS - ) - .addTag(BACKUP_WORK_NAME) - .setConstraints(constraints) - .build() - - WorkManager.getInstance(context).enqueueUniquePeriodicWork( - BACKUP_WORK_NAME, - ExistingPeriodicWorkPolicy.UPDATE, - periodicSyncDataWork - ) - - // Uncomment below for testing - -// val oneTimeBackupWork = -// OneTimeWorkRequest.Builder(BackupWorkManager::class.java) -// .addTag(BACKUP_WORK_NAME) -// .setConstraints(constraints) -// .build() -// -// WorkManager.getInstance(context).enqueue(oneTimeBackupWork) - } - } - - private val backupNotificationBuilder = - NotificationCompat.Builder(context, BACKUP_CHANNEL_ID) - .setColorized(true) - .setOnlyAlertOnce(true) - .setSilent(true) - .setAutoCancel(true) - .setContentTitle(context.getString(R.string.pref_category_backup)) - .setPriority(NotificationCompat.PRIORITY_DEFAULT) - .setColor(context.colorFromAttribute(R.attr.colorPrimary)) - .setSmallIcon(R.drawable.ic_cloudstream_monochrome_big) - - override suspend fun doWork(): Result { - context.createNotificationChannel( - BACKUP_CHANNEL_ID, - BACKUP_CHANNEL_NAME, - BACKUP_CHANNEL_DESCRIPTION - ) - - setForeground( - ForegroundInfo( - BACKUP_NOTIFICATION_ID, - backupNotificationBuilder.build() - ) - ) - - BackupUtils.backup(context) - - return Result.success() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt b/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt index 00c74dff..adf5abfa 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/services/SubscriptionWorkManager.kt @@ -1,6 +1,5 @@ package com.lagradost.cloudstream3.services -import android.annotation.SuppressLint import android.app.NotificationManager import android.app.PendingIntent import android.content.Context @@ -10,13 +9,13 @@ import androidx.core.app.NotificationCompat import androidx.core.net.toUri import androidx.work.* import com.lagradost.cloudstream3.* +import com.lagradost.cloudstream3.APIHolder.getApiDubstatusSettings import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.mvvm.logError +import com.lagradost.cloudstream3.mvvm.safeApiCall import com.lagradost.cloudstream3.plugins.PluginManager import com.lagradost.cloudstream3.ui.result.txt -import com.lagradost.cloudstream3.utils.AppContextUtils.createNotificationChannel -import com.lagradost.cloudstream3.utils.AppContextUtils.getApiDubstatusSettings +import com.lagradost.cloudstream3.utils.AppUtils.createNotificationChannel import com.lagradost.cloudstream3.utils.Coroutines.ioWork import com.lagradost.cloudstream3.utils.DataStoreHelper import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllSubscriptions @@ -98,138 +97,128 @@ class SubscriptionWorkManager(val context: Context, workerParams: WorkerParamete ) } - @SuppressLint("UnspecifiedImmutableFlag") override suspend fun doWork(): Result { - try { // println("Update subscriptions!") - context.createNotificationChannel( - SUBSCRIPTION_CHANNEL_ID, - SUBSCRIPTION_CHANNEL_NAME, - SUBSCRIPTION_CHANNEL_DESCRIPTION + context.createNotificationChannel( + SUBSCRIPTION_CHANNEL_ID, + SUBSCRIPTION_CHANNEL_NAME, + SUBSCRIPTION_CHANNEL_DESCRIPTION + ) + + setForeground( + ForegroundInfo( + SUBSCRIPTION_NOTIFICATION_ID, + progressNotificationBuilder.build() ) + ) - setForeground( - ForegroundInfo( - SUBSCRIPTION_NOTIFICATION_ID, - progressNotificationBuilder.build() - ) - ) + val subscriptions = getAllSubscriptions() - val subscriptions = getAllSubscriptions() - - if (subscriptions.isEmpty()) { - WorkManager.getInstance(context).cancelWorkById(this.id) - return Result.success() - } - - val max = subscriptions.size - var progress = 0 - - updateProgress(max, progress, true) - - // We need all plugins loaded. - PluginManager.loadAllOnlinePlugins(context) - PluginManager.loadAllLocalPlugins(context, false) - - subscriptions.apmap { savedData -> - try { - val id = savedData.id ?: return@apmap null - val api = getApiFromNameNull(savedData.apiName) ?: return@apmap null - - // Reasonable timeout to prevent having this worker run forever. - val response = withTimeoutOrNull(60_000) { - api.load(savedData.url) as? EpisodeResponse - } ?: return@apmap null - - val dubPreference = - getDub(id) ?: if ( - context.getApiDubstatusSettings().contains(DubStatus.Dubbed) - ) { - DubStatus.Dubbed - } else { - DubStatus.Subbed - } - - val latestEpisodes = response.getLatestEpisodes() - val latestPreferredEpisode = latestEpisodes[dubPreference] - - val (shouldUpdate, latestEpisode) = if (latestPreferredEpisode != null) { - val latestSeenEpisode = - savedData.lastSeenEpisodeCount[dubPreference] ?: Int.MIN_VALUE - val shouldUpdate = latestPreferredEpisode > latestSeenEpisode - shouldUpdate to latestPreferredEpisode - } else { - val latestEpisode = latestEpisodes[DubStatus.None] ?: Int.MIN_VALUE - val latestSeenEpisode = - savedData.lastSeenEpisodeCount[DubStatus.None] ?: Int.MIN_VALUE - val shouldUpdate = latestEpisode > latestSeenEpisode - shouldUpdate to latestEpisode - } - - DataStoreHelper.updateSubscribedData( - id, - savedData, - response - ) - - if (shouldUpdate) { - val updateHeader = savedData.name - val updateDescription = txt( - R.string.subscription_episode_released, - latestEpisode, - savedData.name - ).asString(context) - - val intent = Intent(context, MainActivity::class.java).apply { - data = savedData.url.toUri() - flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK - } - - val pendingIntent = - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - PendingIntent.getActivity( - context, - 0, - intent, - PendingIntent.FLAG_IMMUTABLE - ) - } else { - PendingIntent.getActivity(context, 0, intent, 0) - } - - val poster = ioWork { - savedData.posterUrl?.let { url -> - context.getImageBitmapFromUrl( - url, - savedData.posterHeaders - ) - } - } - - val updateNotification = - updateNotificationBuilder.setContentTitle(updateHeader) - .setContentText(updateDescription) - .setContentIntent(pendingIntent) - .setLargeIcon(poster) - .build() - - notificationManager.notify(id, updateNotification) - } - - // You can probably get some issues here since this is async but it does not matter much. - updateProgress(max, ++progress, false) - } catch (t: Throwable) { - logError(t) - } - } - - return Result.success() - } catch (t: Throwable) { - logError(t) - // ye, while this is not correct, but because gods know why android just crashes - // and this causes major battery usage as it retries it inf times. This is better, just - // in case android decides to be android and fuck us + if (subscriptions.isEmpty()) { + WorkManager.getInstance(context).cancelWorkById(this.id) return Result.success() } + + val max = subscriptions.size + var progress = 0 + + updateProgress(max, progress, true) + + // We need all plugins loaded. + PluginManager.loadAllOnlinePlugins(context) + PluginManager.loadAllLocalPlugins(context, false) + + subscriptions.apmap { savedData -> + try { + val id = savedData.id ?: return@apmap null + val api = getApiFromNameNull(savedData.apiName) ?: return@apmap null + + // Reasonable timeout to prevent having this worker run forever. + val response = withTimeoutOrNull(60_000) { + api.load(savedData.url) as? EpisodeResponse + } ?: return@apmap null + + val dubPreference = + getDub(id) ?: if ( + context.getApiDubstatusSettings().contains(DubStatus.Dubbed) + ) { + DubStatus.Dubbed + } else { + DubStatus.Subbed + } + + val latestEpisodes = response.getLatestEpisodes() + val latestPreferredEpisode = latestEpisodes[dubPreference] + + val (shouldUpdate, latestEpisode) = if (latestPreferredEpisode != null) { + val latestSeenEpisode = + savedData.lastSeenEpisodeCount[dubPreference] ?: Int.MIN_VALUE + val shouldUpdate = latestPreferredEpisode > latestSeenEpisode + shouldUpdate to latestPreferredEpisode + } else { + val latestEpisode = latestEpisodes[DubStatus.None] ?: Int.MIN_VALUE + val latestSeenEpisode = + savedData.lastSeenEpisodeCount[DubStatus.None] ?: Int.MIN_VALUE + val shouldUpdate = latestEpisode > latestSeenEpisode + shouldUpdate to latestEpisode + } + + DataStoreHelper.updateSubscribedData( + id, + savedData, + response + ) + + if (shouldUpdate) { + val updateHeader = savedData.name + val updateDescription = txt( + R.string.subscription_episode_released, + latestEpisode, + savedData.name + ).asString(context) + + val intent = Intent(context, MainActivity::class.java).apply { + data = savedData.url.toUri() + flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK + } + + val pendingIntent = + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + PendingIntent.getActivity( + context, + 0, + intent, + PendingIntent.FLAG_IMMUTABLE + ) + } else { + PendingIntent.getActivity(context, 0, intent, 0) + } + + val poster = ioWork { + savedData.posterUrl?.let { url -> + context.getImageBitmapFromUrl( + url, + savedData.posterHeaders + ) + } + } + + val updateNotification = + updateNotificationBuilder.setContentTitle(updateHeader) + .setContentText(updateDescription) + .setContentIntent(pendingIntent) + .setLargeIcon(poster) + .build() + + notificationManager.notify(id, updateNotification) + } + + // You can probably get some issues here since this is async but it does not matter much. + updateProgress(max, ++progress, false) + } catch (_: Throwable) { + } + } + + return Result.success() } } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubProvider.kt b/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubProvider.kt index df64caab..77a1b0b5 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubProvider.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubProvider.kt @@ -1,23 +1,11 @@ package com.lagradost.cloudstream3.subtitles import androidx.annotation.WorkerThread -import androidx.core.net.toUri -import com.lagradost.cloudstream3.MainActivity.Companion.deleteFileOnExit -import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleEntity import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities.SubtitleSearch import com.lagradost.cloudstream3.syncproviders.AuthAPI -import com.lagradost.cloudstream3.ui.player.SubtitleOrigin -import okio.BufferedSource -import okio.buffer -import okio.sink -import okio.source -import java.io.File -import java.util.zip.ZipInputStream interface AbstractSubProvider { - val idPrefix: String - @WorkerThread suspend fun search(query: SubtitleSearch): List? { throw NotImplementedError() @@ -27,98 +15,6 @@ interface AbstractSubProvider { suspend fun load(data: SubtitleEntity): String? { throw NotImplementedError() } - - @WorkerThread - suspend fun SubtitleResource.getResources(data: SubtitleEntity) { - this.addUrl(load(data)) - } - - @WorkerThread - suspend fun getResource(data: SubtitleEntity): SubtitleResource { - return SubtitleResource().apply { - this.getResources(data) - } - } -} - -/** - * A builder for subtitle files. - * @see addUrl - * @see addFile - */ -class SubtitleResource { - fun downloadFile(source: BufferedSource): File { - val file = File.createTempFile("temp-subtitle", ".tmp").apply { - deleteFileOnExit(this) - } - val sink = file.sink().buffer() - sink.writeAll(source) - sink.close() - source.close() - - return file - } - - private fun unzip(file: File): List> { - val entries = mutableListOf>() - - ZipInputStream(file.inputStream()).use { zipInputStream -> - var zipEntry = zipInputStream.nextEntry - - while (zipEntry != null) { - val tempFile = File.createTempFile("unzipped-subtitle", ".tmp").apply { - deleteFileOnExit(this) - } - entries.add(zipEntry.name to tempFile) - - tempFile.sink().buffer().use { buffer -> - buffer.writeAll(zipInputStream.source()) - } - - zipEntry = zipInputStream.nextEntry - } - } - return entries - } - - data class SingleSubtitleResource( - val name: String?, - val url: String, - val origin: SubtitleOrigin - ) - - private var resources: MutableList = mutableListOf() - - fun getSubtitles(): List { - return resources.toList() - } - - fun addUrl(url: String?, name: String? = null) { - if (url == null) return - this.resources.add( - SingleSubtitleResource(name, url, SubtitleOrigin.URL) - ) - } - - fun addFile(file: File, name: String? = null) { - this.resources.add( - SingleSubtitleResource(name, file.toUri().toString(), SubtitleOrigin.DOWNLOADED_FILE) - ) - deleteFileOnExit(file) - } - - suspend fun addZipUrl( - url: String, - nameGenerator: (String, File) -> String? = { _, _ -> null } - ) { - val source = app.get(url).okhttpResponse.body.source() - val zip = downloadFile(source) - val realFiles = unzip(zip) - zip.deleteRecursively() - realFiles.forEach { (name, subtitleFile) -> - addFile(subtitleFile, nameGenerator(name, subtitleFile)) - } - } } interface AbstractSubApi : AbstractSubProvider, AuthAPI \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubtitleEntities.kt b/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubtitleEntities.kt index 685b499b..f6424c4c 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubtitleEntities.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/subtitles/AbstractSubtitleEntities.kt @@ -19,11 +19,8 @@ class AbstractSubtitleEntities { data class SubtitleSearch( var query: String = "", + var imdb: Long? = null, var lang: String? = null, - var imdbId: String? = null, - var tmdbId: Int? = null, - var malId: Int? = null, - var aniListId: Int? = null, var epNumber: Int? = null, var seasonNumber: Int? = null, var year: Int? = null diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt index 2e14c3c4..8bf8dffa 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/AccountManager.kt @@ -3,26 +3,18 @@ package com.lagradost.cloudstream3.syncproviders import com.lagradost.cloudstream3.AcraApplication.Companion.getKey import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys import com.lagradost.cloudstream3.AcraApplication.Companion.setKey -import com.lagradost.cloudstream3.LoadResponse import com.lagradost.cloudstream3.syncproviders.providers.* import java.util.concurrent.TimeUnit abstract class AccountManager(private val defIndex: Int) : AuthAPI { companion object { - val malApi = MALApi(0).also { api -> - LoadResponse.Companion.malIdPrefix = api.idPrefix - } - val aniListApi = AniListApi(0).also { api -> - LoadResponse.Companion.aniListIdPrefix = api.idPrefix - } - val simklApi = SimklApi(0).also { api -> - LoadResponse.Companion.simklIdPrefix = api.idPrefix - } + val malApi = MALApi(0) + val aniListApi = AniListApi(0) val openSubtitlesApi = OpenSubtitlesApi(0) + val simklApi = SimklApi(0) + val indexSubtitlesApi = IndexSubtitleApi() val addic7ed = Addic7ed() - val subDlApi = SubDlApi(0) val localListApi = LocalList() - val subSourceApi = SubSourceApi() // used to login via app intent val OAuth2Apis @@ -33,7 +25,7 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI { // this needs init with context and can be accessed in settings val accountManagers get() = listOf( - malApi, aniListApi, openSubtitlesApi, subDlApi, simklApi //nginxApi + malApi, aniListApi, openSubtitlesApi, simklApi //nginxApi ) // used for active syncing @@ -43,35 +35,31 @@ abstract class AccountManager(private val defIndex: Int) : AuthAPI { ) val inAppAuths - get() = listOf( - openSubtitlesApi, - subDlApi - )//, nginxApi) + get() = listOf(openSubtitlesApi)//, nginxApi) val subtitleProviders get() = listOf( openSubtitlesApi, - addic7ed, - subDlApi, - subSourceApi + indexSubtitlesApi, // they got anti scraping measures in place :( + addic7ed ) - const val APP_STRING = "cloudstreamapp" - const val APP_STRING_REPO = "cloudstreamrepo" - const val APP_STRING_PLAYER = "cloudstreamplayer" + const val appString = "cloudstreamapp" + const val appStringRepo = "cloudstreamrepo" + const val appStringPlayer = "cloudstreamplayer" // Instantly start the search given a query - const val APP_STRING_SEARCH = "cloudstreamsearch" + const val appStringSearch = "cloudstreamsearch" // Instantly resume watching a show - const val APP_STRING_RESUME_WATCHING = "cloudstreamcontinuewatching" + const val appStringResumeWatching = "cloudstreamcontinuewatching" val unixTime: Long get() = System.currentTimeMillis() / 1000L val unixTimeMs: Long get() = System.currentTimeMillis() - const val MAX_STALE = 60 * 10 + const val maxStale = 60 * 10 fun secondsToReadable(seconds: Int, completedValue: String): String { var secondsLong = seconds.toLong() diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/OAuth2API.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/OAuth2API.kt index 3d0bb940..ef74edfc 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/OAuth2API.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/OAuth2API.kt @@ -5,23 +5,7 @@ import androidx.fragment.app.FragmentActivity interface OAuth2API : AuthAPI { val key: String val redirectUrl: String - val supportDeviceAuth: Boolean suspend fun handleRedirect(url: String) : Boolean fun authenticate(activity: FragmentActivity?) - suspend fun getDevicePin() : PinAuthData? { - return null - } - - suspend fun handleDeviceAuth(pinAuthData: PinAuthData) : Boolean { - return false - } - - data class PinAuthData( - val deviceCode: String, - val userCode: String, - val verificationUrl: String, - val expiresIn: Int, - val interval: Int, - ) } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt similarity index 91% rename from app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncApi.kt rename to app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt index dcb8bbea..ed496326 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncApi.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/SyncAPI.kt @@ -1,11 +1,18 @@ package com.lagradost.cloudstream3.syncproviders import com.lagradost.cloudstream3.* -import com.lagradost.cloudstream3.ui.SyncWatchType import com.lagradost.cloudstream3.ui.library.ListSorting import com.lagradost.cloudstream3.ui.result.UiText import me.xdrop.fuzzywuzzy.FuzzySearch -import java.util.Date + +enum class SyncIdName { + Anilist, + MyAnimeList, + Trakt, + Imdb, + Simkl, + LocalList, +} interface SyncAPI : OAuth2API { /** @@ -54,7 +61,7 @@ interface SyncAPI : OAuth2API { ) : SearchResponse abstract class AbstractSyncStatus { - abstract var status: SyncWatchType + abstract var status: Int /** 1-10 */ abstract var score: Int? @@ -63,9 +70,8 @@ interface SyncAPI : OAuth2API { abstract var maxEpisodes: Int? } - data class SyncStatus( - override var status: SyncWatchType, + override var status: Int, /** 1-10 */ override var score: Int?, override var watchedEpisodes: Int?, @@ -125,8 +131,6 @@ interface SyncAPI : OAuth2API { ListSorting.AlphabeticalZ -> items.sortedBy { it.name }.reversed() ListSorting.UpdatedNew -> items.sortedBy { it.lastUpdatedUnixTime?.times(-1) } ListSorting.UpdatedOld -> items.sortedBy { it.lastUpdatedUnixTime } - ListSorting.ReleaseDateNew -> items.sortedByDescending { it.releaseDate } - ListSorting.ReleaseDateOld -> items.sortedBy { it.releaseDate } else -> items } } @@ -161,10 +165,6 @@ interface SyncAPI : OAuth2API { override var posterUrl: String?, override var posterHeaders: Map?, override var quality: SearchQuality?, - val releaseDate: Date?, override var id: Int? = null, - val plot : String? = null, - val rating: Int? = null, - val tags: List? = null ) : SearchResponse } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Addic7ed.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Addic7ed.kt index db467639..507c5e2a 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Addic7ed.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Addic7ed.kt @@ -18,13 +18,13 @@ class Addic7ed : AbstractSubApi { override fun logOut() {} companion object { - const val HOST = "https://www.addic7ed.com" + const val host = "https://www.addic7ed.com" const val TAG = "ADDIC7ED" } private fun fixUrl(url: String): String { - return if (url.startsWith("/")) HOST + url - else if (!url.startsWith("http")) "$HOST/$url" + return if (url.startsWith("/")) host + url + else if (!url.startsWith("http")) "$host/$url" else url } @@ -62,7 +62,7 @@ class Addic7ed : AbstractSubApi { } val title = queryText.substringBefore("(").trim() - val url = "$HOST/search.php?search=${title}&Submit=Search" + val url = "$host/search.php?search=${title}&Submit=Search" val hostDocument = app.get(url).document var searchResult = "" if (!hostDocument.select("span:contains($title)").isNullOrEmpty()) searchResult = url @@ -74,8 +74,8 @@ class Addic7ed : AbstractSubApi { hostDocument.selectFirst("#sl button")?.attr("onmouseup")?.substringAfter("(") ?.substringBefore(",") val doc = app.get( - "$HOST/ajax_loadShow.php?show=$show&season=$seasonNum&langs=&hd=undefined&hi=undefined", - referer = "$HOST/" + "$host/ajax_loadShow.php?show=$show&season=$seasonNum&langs=&hd=undefined&hi=undefined", + referer = "$host/" ).document doc.select("#season tr:contains($queryLang)").mapNotNull { node -> if (node.selectFirst("td")?.text() @@ -97,7 +97,7 @@ class Addic7ed : AbstractSubApi { val link = fixUrl(node.select("a.buttonDownload").attr("href")) val isHearingImpaired = !node.parent()!!.select("tr:last-child [title=\"Hearing Impaired\"]").isNullOrEmpty() - cleanResources(results, name, link, mapOf("referer" to "$HOST/"), isHearingImpaired) + cleanResources(results, name, link, mapOf("referer" to "$host/"), isHearingImpaired) } return results } diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt index 6112c7db..d0c88901 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/AniListApi.kt @@ -13,19 +13,17 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager import com.lagradost.cloudstream3.syncproviders.AuthAPI import com.lagradost.cloudstream3.syncproviders.SyncAPI import com.lagradost.cloudstream3.syncproviders.SyncIdName -import com.lagradost.cloudstream3.ui.SyncWatchType import com.lagradost.cloudstream3.ui.library.ListSorting import com.lagradost.cloudstream3.ui.result.txt -import com.lagradost.cloudstream3.utils.AppContextUtils.splitQuery import com.lagradost.cloudstream3.utils.AppUtils.parseJson +import com.lagradost.cloudstream3.utils.AppUtils.splitQuery import com.lagradost.cloudstream3.utils.AppUtils.toJson import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson import com.lagradost.cloudstream3.utils.Coroutines.ioSafe import com.lagradost.cloudstream3.utils.DataStore.toKotlinObject -import com.lagradost.cloudstream3.utils.DataStoreHelper.toYear import java.net.URL import java.net.URLEncoder -import java.util.Locale +import java.util.* class AniListApi(index: Int) : AccountManager(index), SyncAPI { override var name = "AniList" @@ -33,7 +31,6 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { override val redirectUrl = "anilistlogin" override val idPrefix = "anilist" override var requireLibraryRefresh = true - override val supportDeviceAuth = false override var mainUrl = "https://anilist.co" override val icon = R.drawable.ic_anilist_icon override val requiresLogin = false @@ -64,7 +61,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { override suspend fun handleRedirect(url: String): Boolean { val sanitizer = - splitQuery(URL(url.replace(APP_STRING, "https").replace("/#", "?"))) // FIX ERROR + splitQuery(URL(url.replace(appString, "https").replace("/#", "?"))) // FIX ERROR val token = sanitizer["access_token"]!! val expiresIn = sanitizer["expires_in"]!! @@ -88,7 +85,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { override suspend fun search(name: String): List? { val data = searchShows(name) ?: return null - return data.data?.page?.media?.map { + return data.data?.Page?.media?.map { SyncAPI.SyncSearchResult( it.title.romaji ?: return null, this.name, @@ -102,7 +99,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { override suspend fun getResult(id: String): SyncAPI.SyncResult { val internalId = (Regex("anilist\\.co/anime/(\\d*)").find(id)?.groupValues?.getOrNull(1) ?: id).toIntOrNull() ?: throw ErrorLoadingException("Invalid internalId") - val season = getSeason(internalId).data.media + val season = getSeason(internalId).data.Media return SyncAPI.SyncResult( season.id.toString(), @@ -168,7 +165,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { return SyncAPI.SyncStatus( score = data.score, watchedEpisodes = data.progress, - status = SyncWatchType.fromInternalId(data.type?.value ?: return null), + status = data.type?.value ?: return null, isFavorite = data.isFavourite, maxEpisodes = data.episodes, ) @@ -177,7 +174,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean { return postDataAboutId( id.toIntOrNull() ?: return false, - fromIntToAnimeStatus(status.status.internalId), + fromIntToAnimeStatus(status.status), status.score, status.watchedEpisodes ).also { @@ -302,12 +299,12 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { //println("NAME $name NEW NAME ${name.replace(blackListRegex, "")}") val shows = searchShows(name.replace(blackListRegex, "")) - shows?.data?.page?.media?.find { + shows?.data?.Page?.media?.find { (malId ?: "NONE") == it.idMal.toString() }?.let { return it } val filtered = - shows?.data?.page?.media?.filter { + shows?.data?.Page?.media?.filter { (((it.startDate.year ?: year.toString()) == year.toString() || year == null)) } @@ -497,7 +494,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { val data = postApi(q, true) val d = parseJson(data ?: return null) - val main = d.data?.media + val main = d.data?.Media if (main?.mediaListEntry != null) { return AniListTitleHolder( title = main.title, @@ -537,7 +534,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { headers = mapOf( "Authorization" to "Bearer " + (getAuth() ?: return@suspendSafeApiCall null), - if (cache) "Cache-Control" to "max-stale=$MAX_STALE" else "Cache-Control" to "no-cache" + if (cache) "Cache-Control" to "max-stale=$maxStale" else "Cache-Control" to "no-cache" ), cacheTime = 0, data = mapOf( @@ -598,7 +595,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { //@JsonProperty("source") val source: String, @JsonProperty("episodes") val episodes: Int, @JsonProperty("title") val title: Title, - @JsonProperty("description") val description: String?, + //@JsonProperty("description") val description: String, @JsonProperty("coverImage") val coverImage: CoverImage, @JsonProperty("synonyms") val synonyms: List, @JsonProperty("nextAiringEpisode") val nextAiringEpisode: SeasonNextAiringEpisode?, @@ -632,9 +629,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { ?: this.media.coverImage.medium, null, null, - this.media.seasonYear.toYear(), - null, - plot = this.media.description, + null ) } } @@ -649,7 +644,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { ) data class Data( - @JsonProperty("MediaListCollection") val mediaListCollection: MediaListCollection + @JsonProperty("MediaListCollection") val MediaListCollection: MediaListCollection ) private fun getAniListListCached(): Array? { @@ -661,7 +656,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { if (checkToken()) return null return if (requireLibraryRefresh) { - val list = getFullAniListList()?.data?.mediaListCollection?.lists?.toTypedArray() + val list = getFullAniListList()?.data?.MediaListCollection?.lists?.toTypedArray() if (list != null) { setKey(ANILIST_CACHED_LIST, list) } @@ -680,7 +675,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { // To fill empty lists when AniList does not return them val baseMap = - AniListStatusType.entries.filter { it.value >= 0 }.associate { + AniListStatusType.values().filter { it.value >= 0 }.associate { it.stringRes to emptyList() } @@ -691,8 +686,6 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { ListSorting.AlphabeticalZ, ListSorting.UpdatedNew, ListSorting.UpdatedOld, - ListSorting.ReleaseDateNew, - ListSorting.ReleaseDateOld, ListSorting.RatingHigh, ListSorting.RatingLow, ) @@ -768,7 +761,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { /** Used to query a saved MediaItem on the list to get the id for removal */ data class MediaListItemRoot(@JsonProperty("data") val data: MediaListItem? = null) - data class MediaListItem(@JsonProperty("MediaList") val mediaList: MediaListId? = null) + data class MediaListItem(@JsonProperty("MediaList") val MediaList: MediaListId? = null) data class MediaListId(@JsonProperty("id") val id: Long? = null) private suspend fun postDataAboutId( @@ -791,7 +784,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { """ val response = postApi(idQuery) val listId = - tryParseJson(response)?.data?.mediaList?.id ?: return false + tryParseJson(response)?.data?.MediaList?.id ?: return false """ mutation(${'$'}id: Int = $listId) { DeleteMediaListEntry(id: ${'$'}id) { @@ -840,7 +833,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { val data = postApi(q) if (data.isNullOrBlank()) return null val userData = parseJson(data) - val u = userData.data?.viewer + val u = userData.data?.Viewer val user = AniListUser( u?.id, u?.name, @@ -862,8 +855,8 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { suspend fun getSeasonRecursive(id: Int) { val season = getSeason(id) seasons.add(season) - if (season.data.media.format?.startsWith("TV") == true) { - season.data.media.relations?.edges?.forEach { + if (season.data.Media.format?.startsWith("TV") == true) { + season.data.Media.relations?.edges?.forEach { if (it.node?.format != null) { if (it.relationType == "SEQUEL" && it.node.format.startsWith("TV")) { getSeasonRecursive(it.node.id) @@ -882,7 +875,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { ) data class SeasonData( - @JsonProperty("Media") val media: SeasonMedia, + @JsonProperty("Media") val Media: SeasonMedia, ) data class SeasonMedia( @@ -1054,7 +1047,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { ) data class AniListData( - @JsonProperty("Viewer") val viewer: AniListViewer?, + @JsonProperty("Viewer") val Viewer: AniListViewer?, ) data class AniListRoot( @@ -1094,7 +1087,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { ) data class LikeData( - @JsonProperty("Viewer") val viewer: LikeViewer?, + @JsonProperty("Viewer") val Viewer: LikeViewer?, ) data class LikeRoot( @@ -1134,7 +1127,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { ) data class GetDataData( - @JsonProperty("Media") val media: GetDataMedia?, + @JsonProperty("Media") val Media: GetDataMedia?, ) data class GetDataRoot( @@ -1167,7 +1160,7 @@ class AniListApi(index: Int) : AccountManager(index), SyncAPI { ) data class GetSearchPage( - @JsonProperty("Page") val page: GetSearchData?, + @JsonProperty("Page") val Page: GetSearchData?, ) data class GetSearchData( diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/DropboxApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/DropboxApi.kt index 94537ea3..7ec168da 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/DropboxApi.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/DropboxApi.kt @@ -11,7 +11,6 @@ class Dropbox : OAuth2API { override val key = "zlqsamadlwydvb2" override val redirectUrl = "dropboxlogin" override val requiresLogin = true - override val supportDeviceAuth = false override val createAccountUrl: String? = null override val icon: Int diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/IndexSubtitleApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/IndexSubtitleApi.kt new file mode 100644 index 00000000..668d10bd --- /dev/null +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/IndexSubtitleApi.kt @@ -0,0 +1,265 @@ +package com.lagradost.cloudstream3.syncproviders.providers + +import android.util.Log +import com.lagradost.cloudstream3.TvType +import com.lagradost.cloudstream3.app +import com.lagradost.cloudstream3.imdbUrlToIdNullable +import com.lagradost.cloudstream3.subtitles.AbstractSubApi +import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities +import com.lagradost.cloudstream3.utils.SubtitleHelper + +class IndexSubtitleApi : AbstractSubApi { + override val name = "IndexSubtitle" + override val idPrefix = "indexsubtitle" + override val requiresLogin = false + override val icon: Nothing? = null + override val createAccountUrl: Nothing? = null + + override fun loginInfo(): Nothing? = null + + override fun logOut() {} + + + companion object { + const val host = "https://indexsubtitle.com" + const val TAG = "INDEXSUBS" + } + + private fun fixUrl(url: String): String { + if (url.startsWith("http")) { + return url + } + if (url.isEmpty()) { + return "" + } + + val startsWithNoHttp = url.startsWith("//") + if (startsWithNoHttp) { + return "https:$url" + } else { + if (url.startsWith('/')) { + return host + url + } + return "$host/$url" + } + } + + private fun getOrdinal(num: Int?): String? { + return when (num) { + 1 -> "First" + 2 -> "Second" + 3 -> "Third" + 4 -> "Fourth" + 5 -> "Fifth" + 6 -> "Sixth" + 7 -> "Seventh" + 8 -> "Eighth" + 9 -> "Ninth" + 10 -> "Tenth" + 11 -> "Eleventh" + 12 -> "Twelfth" + 13 -> "Thirteenth" + 14 -> "Fourteenth" + 15 -> "Fifteenth" + 16 -> "Sixteenth" + 17 -> "Seventeenth" + 18 -> "Eighteenth" + 19 -> "Nineteenth" + 20 -> "Twentieth" + 21 -> "Twenty-First" + 22 -> "Twenty-Second" + 23 -> "Twenty-Third" + 24 -> "Twenty-Fourth" + 25 -> "Twenty-Fifth" + 26 -> "Twenty-Sixth" + 27 -> "Twenty-Seventh" + 28 -> "Twenty-Eighth" + 29 -> "Twenty-Ninth" + 30 -> "Thirtieth" + 31 -> "Thirty-First" + 32 -> "Thirty-Second" + 33 -> "Thirty-Third" + 34 -> "Thirty-Fourth" + 35 -> "Thirty-Fifth" + else -> null + } + } + + private fun isRightEps(text: String, seasonNum: Int?, epNum: Int?): Boolean { + val FILTER_EPS_REGEX = + Regex("(?i)((Chapter\\s?0?${epNum})|((Season)?\\s?0?${seasonNum}?\\s?(Episode)\\s?0?${epNum}[^0-9]))|(?i)((S?0?${seasonNum}?E0?${epNum}[^0-9])|(0?${seasonNum}[a-z]0?${epNum}[^0-9]))") + return text.contains(FILTER_EPS_REGEX) + } + + private fun haveEps(text: String): Boolean { + val HAVE_EPS_REGEX = + Regex("(?i)((Chapter\\s?0?\\d)|((Season)?\\s?0?\\d?\\s?(Episode)\\s?0?\\d))|(?i)((S?0?\\d?E0?\\d)|(0?\\d[a-z]0?\\d))") + return text.contains(HAVE_EPS_REGEX) + } + + override suspend fun search(query: AbstractSubtitleEntities.SubtitleSearch): List { + val imdbId = query.imdb ?: 0 + val lang = query.lang + val queryLang = SubtitleHelper.fromTwoLettersToLanguage(lang.toString()) + val queryText = query.query + val epNum = query.epNumber ?: 0 + val seasonNum = query.seasonNumber ?: 0 + val yearNum = query.year ?: 0 + + val urlItems = ArrayList() + + fun cleanResources( + results: MutableList, + name: String, + link: String + ) { + results.add( + AbstractSubtitleEntities.SubtitleEntity( + idPrefix = idPrefix, + name = name, + lang = queryLang.toString(), + data = link, + source = this.name, + type = if (seasonNum > 0) TvType.TvSeries else TvType.Movie, + epNumber = epNum, + seasonNumber = seasonNum, + year = yearNum, + ) + ) + } + + val document = app.get("$host/?search=$queryText").document + + document.select("div.my-3.p-3 div.media").map { block -> + if (seasonNum > 0) { + val name = block.select("strong.text-primary, strong.text-info").text().trim() + val season = getOrdinal(seasonNum) + if ((block.selectFirst("a")?.attr("href") + ?.contains( + "$season", + ignoreCase = true + )!! || name.contains( + "$season", + ignoreCase = true + )) && name.contains(queryText, ignoreCase = true) + ) { + block.select("div.media").mapNotNull { + urlItems.add( + fixUrl( + it.selectFirst("a")!!.attr("href") + ) + ) + } + } + } else { + if (block.selectFirst("strong")!!.text().trim() + .matches(Regex("(?i)^$queryText\$")) + ) { + if (block.select("span[title=Release]").isNullOrEmpty()) { + block.select("div.media").mapNotNull { + val urlItem = fixUrl( + it.selectFirst("a")!!.attr("href") + ) + val itemDoc = app.get(urlItem).document + val id = imdbUrlToIdNullable( + itemDoc.selectFirst("div.d-flex span.badge.badge-primary")?.parent() + ?.attr("href") + )?.toLongOrNull() + val year = itemDoc.selectFirst("div.d-flex span.badge.badge-success") + ?.ownText() + ?.trim().toString() + Log.i(TAG, "id => $id \nyear => $year||$yearNum") + if (imdbId > 0) { + if (id == imdbId) { + urlItems.add(urlItem) + } + } else { + if (year.contains("$yearNum")) { + urlItems.add(urlItem) + } + } + } + } else { + if (block.select("span[title=Release]").text().trim() + .contains("$yearNum") + ) { + block.select("div.media").mapNotNull { + urlItems.add( + fixUrl( + it.selectFirst("a")!!.attr("href") + ) + ) + } + } + } + } + } + } + Log.i(TAG, "urlItems => $urlItems") + val results = mutableListOf() + + urlItems.forEach { url -> + val request = app.get(url) + if (request.isSuccessful) { + request.document.select("div.my-3.p-3 div.media").map { block -> + if (block.select("span.d-block span[data-original-title=Language]").text() + .trim() + .contains("$queryLang") + ) { + var name = block.select("strong.text-primary, strong.text-info").text().trim() + val link = fixUrl(block.selectFirst("a")!!.attr("href")) + if (seasonNum > 0) { + when { + isRightEps(name, seasonNum, epNum) -> { + cleanResources(results, name, link) + } + !(haveEps(name)) -> { + name = "$name (S${seasonNum}:E${epNum})" + cleanResources(results, name, link) + } + } + } else { + cleanResources(results, name, link) + } + } + } + } + } + return results + } + + override suspend fun load(data: AbstractSubtitleEntities.SubtitleEntity): String? { + val seasonNum = data.seasonNumber + val epNum = data.epNumber + + val req = app.get(data.data) + + if (req.isSuccessful) { + val document = req.document + val link = if (document.select("div.my-3.p-3 div.media").size == 1) { + fixUrl( + document.selectFirst("div.my-3.p-3 div.media a")!!.attr("href") + ) + } else { + document.select("div.my-3.p-3 div.media").firstNotNullOf { block -> + val name = + block.selectFirst("strong.d-block")?.text()?.trim().toString() + if (seasonNum!! > 0) { + if (isRightEps(name, seasonNum, epNum)) { + fixUrl(block.selectFirst("a")!!.attr("href")) + } else { + null + } + } else { + fixUrl(block.selectFirst("a")!!.attr("href")) + } + } + } + return link + } + + return null + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt index 0d9a4d13..e6ca9711 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/LocalList.kt @@ -8,10 +8,7 @@ import com.lagradost.cloudstream3.syncproviders.SyncIdName import com.lagradost.cloudstream3.ui.WatchType import com.lagradost.cloudstream3.ui.library.ListSorting import com.lagradost.cloudstream3.ui.result.txt -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout import com.lagradost.cloudstream3.utils.Coroutines.ioWork -import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllFavorites import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllSubscriptions import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllWatchStateIds import com.lagradost.cloudstream3.utils.DataStoreHelper.getBookmarkedData @@ -21,7 +18,6 @@ class LocalList : SyncAPI { override val name = "Local" override val icon: Int = R.drawable.ic_baseline_storage_24 override val requiresLogin = false - override val supportDeviceAuth = false override val createAccountUrl: Nothing? = null override val idPrefix = "local" override var requireLibraryRefresh = true @@ -73,57 +69,31 @@ class LocalList : SyncAPI { }?.distinctBy { it.first } ?: return null val list = ioWork { - val isTrueTv = isLayout(TV) - - val baseMap = WatchType.entries.filter { it != WatchType.NONE }.associate { - // None is not something to display - it.stringRes to emptyList() - } + mapOf( - R.string.favorites_list_name to emptyList() - ) + if (!isTrueTv) { - mapOf( - R.string.subscription_list_name to emptyList() - ) - } else { - emptyMap() - } - - val watchStatusMap = watchStatusIds.groupBy { it.second.stringRes }.mapValues { group -> + watchStatusIds.groupBy { + it.second.stringRes + }.mapValues { group -> group.value.mapNotNull { getBookmarkedData(it.first)?.toLibraryItem(it.first.toString()) } - } - - val favoritesMap = mapOf(R.string.favorites_list_name to getAllFavorites().mapNotNull { + } + mapOf(R.string.subscription_list_name to getAllSubscriptions().mapNotNull { it.toLibraryItem() }) - - // Don't show subscriptions on TV - val result = if (isTrueTv) { - baseMap + watchStatusMap + favoritesMap - } else { - val subscriptionsMap = mapOf(R.string.subscription_list_name to getAllSubscriptions().mapNotNull { - it.toLibraryItem() - }) - - baseMap + watchStatusMap + subscriptionsMap + favoritesMap - } - - result } + val baseMap = WatchType.values().filter { it != WatchType.NONE }.associate { + // None is not something to display + it.stringRes to emptyList() + } + mapOf(R.string.subscription_list_name to emptyList()) + return SyncAPI.LibraryMetadata( - list.map { SyncAPI.LibraryList(txt(it.key), it.value) }, + (baseMap + list).map { SyncAPI.LibraryList(txt(it.key), it.value) }, setOf( ListSorting.AlphabeticalA, ListSorting.AlphabeticalZ, - ListSorting.UpdatedNew, - ListSorting.UpdatedOld, - ListSorting.ReleaseDateNew, - ListSorting.ReleaseDateOld, +// ListSorting.UpdatedNew, +// ListSorting.UpdatedOld, // ListSorting.RatingHigh, // ListSorting.RatingLow, - ) ) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt index 08c18653..02826401 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/MALApi.kt @@ -16,22 +16,16 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager import com.lagradost.cloudstream3.syncproviders.AuthAPI import com.lagradost.cloudstream3.syncproviders.SyncAPI import com.lagradost.cloudstream3.syncproviders.SyncIdName -import com.lagradost.cloudstream3.ui.SyncWatchType import com.lagradost.cloudstream3.ui.library.ListSorting import com.lagradost.cloudstream3.ui.result.txt -import com.lagradost.cloudstream3.utils.AppContextUtils.splitQuery import com.lagradost.cloudstream3.utils.AppUtils.parseJson +import com.lagradost.cloudstream3.utils.AppUtils.splitQuery import com.lagradost.cloudstream3.utils.DataStore.toKotlinObject import java.net.URL import java.security.SecureRandom import java.text.ParseException import java.text.SimpleDateFormat -import java.time.Instant -import java.time.format.DateTimeFormatter -import java.util.Calendar -import java.util.Date -import java.util.Locale -import java.util.TimeZone +import java.util.* /** max 100 via https://myanimelist.net/apiconfig/references/api/v2#tag/anime */ const val MAL_MAX_SEARCH_LIMIT = 25 @@ -45,7 +39,6 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { private val apiUrl = "https://api.myanimelist.net" override val icon = R.drawable.mal_logo override val requiresLogin = false - override val supportDeviceAuth = false override val syncIdName = SyncIdName.MyAnimeList override var requireLibraryRefresh = true override val createAccountUrl = "$mainUrl/register.php" @@ -56,6 +49,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { } override fun loginInfo(): AuthAPI.LoginInfo? { + //getMalUser(true)? getKey(accountId, MAL_USER_KEY)?.let { user -> return AuthAPI.LoginInfo( profilePicture = user.picture, @@ -88,7 +82,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { this.name, node.id.toString(), "$mainUrl/anime/${node.id}/", - node.mainPicture?.large ?: node.mainPicture?.medium + node.main_picture?.large ?: node.main_picture?.medium ) } } @@ -100,7 +94,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean { return setScoreRequest( id.toIntOrNull() ?: return false, - fromIntToAnimeStatus(status.status.internalId), + fromIntToAnimeStatus(status.status), status.score, status.watchedEpisodes ).also { @@ -182,7 +176,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { private fun parseDate(string: String?): Long? { return try { - SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).parse(string ?: return null)?.time + SimpleDateFormat("yyyy-MM-dd")?.parse(string ?: return null)?.time } catch (e: Exception) { null } @@ -194,7 +188,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { apiName = this.name, syncId = node.id.toString(), url = "$mainUrl/anime/${node.id}", - posterUrl = node.mainPicture?.large + posterUrl = node.main_picture?.large ) } @@ -248,12 +242,12 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { val internalId = id.toIntOrNull() ?: return null val data = - getDataAboutMalId(internalId)?.myListStatus //?: throw ErrorLoadingException("No my_list_status") + getDataAboutMalId(internalId)?.my_list_status //?: throw ErrorLoadingException("No my_list_status") return SyncAPI.SyncStatus( score = data?.score, - status = SyncWatchType.fromInternalId(malStatusAsString.indexOf(data?.status)), + status = malStatusAsString.indexOf(data?.status), isFavorite = null, - watchedEpisodes = data?.numEpisodesWatched, + watchedEpisodes = data?.num_episodes_watched, ) } @@ -295,7 +289,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { private fun parseDateLong(string: String?): Long? { return try { - SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.getDefault()).parse( + SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").parse( string ?: return null )?.time?.div(1000) } catch (e: Exception) { @@ -306,7 +300,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { override suspend fun handleRedirect(url: String): Boolean { val sanitizer = - splitQuery(URL(url.replace(APP_STRING, "https").replace("/#", "?"))) // FIX ERROR + splitQuery(URL(url.replace(appString, "https").replace("/#", "?"))) // FIX ERROR val state = sanitizer["state"]!! if (state == "RequestID$requestId") { val currentCode = sanitizer["code"]!! @@ -355,9 +349,9 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { try { if (response != "") { val token = parseJson(response) - setKey(accountId, MAL_UNIXTIME_KEY, (token.expiresIn + unixTime)) - setKey(accountId, MAL_REFRESH_TOKEN_KEY, token.refreshToken) - setKey(accountId, MAL_TOKEN_KEY, token.accessToken) + setKey(accountId, MAL_UNIXTIME_KEY, (token.expires_in + unixTime)) + setKey(accountId, MAL_REFRESH_TOKEN_KEY, token.refresh_token) + setKey(accountId, MAL_TOKEN_KEY, token.access_token) requireLibraryRefresh = true } } catch (e: Exception) { @@ -399,62 +393,55 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { data class Node( @JsonProperty("id") val id: Int, @JsonProperty("title") val title: String, - @JsonProperty("main_picture") val mainPicture: MainPicture?, - @JsonProperty("alternative_titles") val alternativeTitles: AlternativeTitles?, - @JsonProperty("media_type") val mediaType: String?, - @JsonProperty("num_episodes") val numEpisodes: Int?, + @JsonProperty("main_picture") val main_picture: MainPicture?, + @JsonProperty("alternative_titles") val alternative_titles: AlternativeTitles?, + @JsonProperty("media_type") val media_type: String?, + @JsonProperty("num_episodes") val num_episodes: Int?, @JsonProperty("status") val status: String?, - @JsonProperty("start_date") val startDate: String?, - @JsonProperty("end_date") val endDate: String?, - @JsonProperty("average_episode_duration") val averageEpisodeDuration: Int?, + @JsonProperty("start_date") val start_date: String?, + @JsonProperty("end_date") val end_date: String?, + @JsonProperty("average_episode_duration") val average_episode_duration: Int?, @JsonProperty("synopsis") val synopsis: String?, @JsonProperty("mean") val mean: Double?, @JsonProperty("genres") val genres: List?, @JsonProperty("rank") val rank: Int?, @JsonProperty("popularity") val popularity: Int?, - @JsonProperty("num_list_users") val numListUsers: Int?, - @JsonProperty("num_favorites") val numFavorites: Int?, - @JsonProperty("num_scoring_users") val numScoringUsers: Int?, - @JsonProperty("start_season") val startSeason: StartSeason?, + @JsonProperty("num_list_users") val num_list_users: Int?, + @JsonProperty("num_favorites") val num_favorites: Int?, + @JsonProperty("num_scoring_users") val num_scoring_users: Int?, + @JsonProperty("start_season") val start_season: StartSeason?, @JsonProperty("broadcast") val broadcast: Broadcast?, @JsonProperty("nsfw") val nsfw: String?, - @JsonProperty("created_at") val createdAt: String?, - @JsonProperty("updated_at") val updatedAt: String? + @JsonProperty("created_at") val created_at: String?, + @JsonProperty("updated_at") val updated_at: String? ) data class ListStatus( @JsonProperty("status") val status: String?, @JsonProperty("score") val score: Int, - @JsonProperty("num_episodes_watched") val numEpisodesWatched: Int, - @JsonProperty("is_rewatching") val isRewatching: Boolean, - @JsonProperty("updated_at") val updatedAt: String, + @JsonProperty("num_episodes_watched") val num_episodes_watched: Int, + @JsonProperty("is_rewatching") val is_rewatching: Boolean, + @JsonProperty("updated_at") val updated_at: String, ) data class Data( @JsonProperty("node") val node: Node, - @JsonProperty("list_status") val listStatus: ListStatus?, + @JsonProperty("list_status") val list_status: ListStatus?, ) { fun toLibraryItem(): SyncAPI.LibraryItem { return SyncAPI.LibraryItem( this.node.title, "https://myanimelist.net/anime/${this.node.id}/", this.node.id.toString(), - this.listStatus?.numEpisodesWatched, - this.node.numEpisodes, - this.listStatus?.score?.times(10), - parseDateLong(this.listStatus?.updatedAt), + this.list_status?.num_episodes_watched, + this.node.num_episodes, + this.list_status?.score?.times(10), + parseDateLong(this.list_status?.updated_at), "MAL", TvType.Anime, - this.node.mainPicture?.large ?: this.node.mainPicture?.medium, + this.node.main_picture?.large ?: this.node.main_picture?.medium, null, null, - plot = this.node.synopsis, - releaseDate = if (this.node.startDate == null) null else try {Date.from( - Instant.from( - DateTimeFormatter.ofPattern(if (this.node.startDate.length == 4) "yyyy" else if (this.node.startDate.length == 7) "yyyy-MM" else "yyyy-MM-dd") - .parse(this.node.startDate) - ) - )} catch (_: RuntimeException) {null} ) } } @@ -480,8 +467,8 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { ) data class Broadcast( - @JsonProperty("day_of_the_week") val dayOfTheWeek: String?, - @JsonProperty("start_time") val startTime: String? + @JsonProperty("day_of_the_week") val day_of_the_week: String?, + @JsonProperty("start_time") val start_time: String? ) private fun getMalAnimeListCached(): Array? { @@ -501,14 +488,14 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { override suspend fun getPersonalLibrary(): SyncAPI.LibraryMetadata { val list = getMalAnimeListSmart()?.groupBy { - convertToStatus(it.listStatus?.status ?: "").stringRes + convertToStatus(it.list_status?.status ?: "").stringRes }?.mapValues { group -> group.value.map { it.toLibraryItem() } } ?: emptyMap() // To fill empty lists when MAL does not return them val baseMap = - MalStatusType.entries.filter { it.value >= 0 }.associate { + MalStatusType.values().filter { it.value >= 0 }.associate { it.stringRes to emptyList() } @@ -519,8 +506,6 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { ListSorting.AlphabeticalZ, ListSorting.UpdatedNew, ListSorting.UpdatedOld, - ListSorting.ReleaseDateNew, - ListSorting.ReleaseDateOld, ListSorting.RatingHigh, ListSorting.RatingLow, ) @@ -585,7 +570,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { ).text val values = parseJson(res) val titles = - values.data.map { MalTitleHolder(it.listStatus, it.node.id, it.node.title) } + values.data.map { MalTitleHolder(it.list_status, it.node.id, it.node.title) } for (t in titles) { allTitles[t.id] = t } @@ -594,13 +579,11 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { } } - private fun convertJapanTimeToTimeRemaining(date: String, endDate: String? = null): String? { + fun convertJapanTimeToTimeRemaining(date: String, endDate: String? = null): String? { // No time remaining if the show has already ended try { endDate?.let { - if (SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).parse(it) - ?.before(Date.from(Instant.now())) != false - ) return@convertJapanTimeToTimeRemaining null + if (SimpleDateFormat("yyyy-MM-dd").parse(it).time < System.currentTimeMillis()) return@convertJapanTimeToTimeRemaining null } } catch (e: ParseException) { logError(e) @@ -617,7 +600,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { val currentWeek = currentDate.get(Calendar.WEEK_OF_MONTH) val currentYear = currentDate.get(Calendar.YEAR) - val dateFormat = SimpleDateFormat("yyyy MM W EEEE HH:mm", Locale.getDefault()) + val dateFormat = SimpleDateFormat("yyyy MM W EEEE HH:mm") dateFormat.timeZone = TimeZone.getTimeZone("Japan") val parsedDate = dateFormat.parse("$currentYear $currentMonth $currentWeek $date") ?: return null @@ -661,13 +644,13 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { id: Int, status: MalStatusType? = null, score: Int? = null, - numWatchedEpisodes: Int? = null, + num_watched_episodes: Int? = null, ): Boolean { val res = setScoreRequest( id, if (status == null) null else malStatusAsString[maxOf(0, status.value)], score, - numWatchedEpisodes + num_watched_episodes ) return if (res.isNullOrBlank()) { @@ -684,18 +667,17 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { } } - @Suppress("UNCHECKED_CAST") private suspend fun setScoreRequest( id: Int, status: String? = null, score: Int? = null, - numWatchedEpisodes: Int? = null, + num_watched_episodes: Int? = null, ): String? { val data = mapOf( "status" to status, "score" to score?.toString(), - "num_watched_episodes" to numWatchedEpisodes?.toString() - ).filterValues { it != null } as Map + "num_watched_episodes" to num_watched_episodes?.toString() + ).filter { it.value != null } as Map return app.put( "$apiUrl/v2/anime/$id/my_list_status", @@ -708,10 +690,10 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { data class ResponseToken( - @JsonProperty("token_type") val tokenType: String, - @JsonProperty("expires_in") val expiresIn: Int, - @JsonProperty("access_token") val accessToken: String, - @JsonProperty("refresh_token") val refreshToken: String, + @JsonProperty("token_type") val token_type: String, + @JsonProperty("expires_in") val expires_in: Int, + @JsonProperty("access_token") val access_token: String, + @JsonProperty("refresh_token") val refresh_token: String, ) data class MalRoot( @@ -720,7 +702,7 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { data class MalDatum( @JsonProperty("node") val node: MalNode, - @JsonProperty("list_status") val listStatus: MalStatus, + @JsonProperty("list_status") val list_status: MalStatus, ) data class MalNode( @@ -737,16 +719,16 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { data class MalStatus( @JsonProperty("status") val status: String, @JsonProperty("score") val score: Int, - @JsonProperty("num_episodes_watched") val numEpisodesWatched: Int, - @JsonProperty("is_rewatching") val isRewatching: Boolean, - @JsonProperty("updated_at") val updatedAt: String, + @JsonProperty("num_episodes_watched") val num_episodes_watched: Int, + @JsonProperty("is_rewatching") val is_rewatching: Boolean, + @JsonProperty("updated_at") val updated_at: String, ) data class MalUser( @JsonProperty("id") val id: Int, @JsonProperty("name") val name: String, @JsonProperty("location") val location: String, - @JsonProperty("joined_at") val joinedAt: String, + @JsonProperty("joined_at") val joined_at: String, @JsonProperty("picture") val picture: String?, ) @@ -759,9 +741,9 @@ class MALApi(index: Int) : AccountManager(index), SyncAPI { data class SmallMalAnime( @JsonProperty("id") val id: Int, @JsonProperty("title") val title: String?, - @JsonProperty("num_episodes") val numEpisodes: Int, - @JsonProperty("my_list_status") val myListStatus: MalStatus?, - @JsonProperty("main_picture") val mainPicture: MalMainPicture?, + @JsonProperty("num_episodes") val num_episodes: Int, + @JsonProperty("my_list_status") val my_list_status: MalStatus?, + @JsonProperty("main_picture") val main_picture: MalMainPicture?, ) data class MalSearchNode( diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt index 37b95614..3e372c2d 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt @@ -2,13 +2,12 @@ package com.lagradost.cloudstream3.syncproviders.providers import android.util.Log import com.fasterxml.jackson.annotation.JsonProperty +import com.google.common.collect.BiMap +import com.google.common.collect.HashBiMap +import com.lagradost.cloudstream3.* import com.lagradost.cloudstream3.AcraApplication.Companion.getKey import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey import com.lagradost.cloudstream3.AcraApplication.Companion.setKey -import com.lagradost.cloudstream3.ErrorLoadingException -import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.TvType -import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.subtitles.AbstractSubApi import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities @@ -16,8 +15,8 @@ import com.lagradost.cloudstream3.syncproviders.AuthAPI import com.lagradost.cloudstream3.syncproviders.InAppAuthAPI import com.lagradost.cloudstream3.syncproviders.InAppAuthAPIManager import com.lagradost.cloudstream3.utils.AppUtils -import okhttp3.Interceptor -import okhttp3.Response +import java.net.URLEncoder +import java.nio.charset.StandardCharsets class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi { override val idPrefix = "opensubtitles" @@ -29,31 +28,14 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi companion object { const val OPEN_SUBTITLES_USER_KEY: String = "open_subtitles_user" // user data like profile - const val API_KEY = "uyBLgFD17MgrYmA0gSXoKllMJBelOYj2" - const val HOST = "https://api.opensubtitles.com/api/v1" + const val apiKey = "uyBLgFD17MgrYmA0gSXoKllMJBelOYj2" + const val host = "https://api.opensubtitles.com/api/v1" const val TAG = "OPENSUBS" - const val COOLDOWN_DURATION: Long = 1000L * 30L // CoolDown if 429 error code in ms + const val coolDownDuration: Long = 1000L * 30L // CoolDown if 429 error code in ms var currentCoolDown: Long = 0L var currentSession: SubtitleOAuthEntity? = null } - private val headerInterceptor = OpenSubtitleInterceptor() - - /** Automatically adds required api headers */ - private class OpenSubtitleInterceptor : Interceptor { - /** Required user agent! */ - private val userAgent = "Cloudstream3 v0.1" - override fun intercept(chain: Interceptor.Chain): Response { - return chain.proceed( - chain.request().newBuilder() - .removeHeader("user-agent") - .addHeader("user-agent", userAgent) - .addHeader("Api-Key", API_KEY) - .build() - ) - } - } - private fun canDoRequest(): Boolean { return unixTimeMs > currentCoolDown } @@ -65,7 +47,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi } private fun throwGotTooManyRequests() { - currentCoolDown = unixTimeMs + COOLDOWN_DURATION + currentCoolDown = unixTimeMs + coolDownDuration throw ErrorLoadingException("Too many requests") } @@ -114,15 +96,15 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi private suspend fun initLogin(username: String, password: String): Boolean { //Log.i(TAG, "DATA = [$username] [$password]") val response = app.post( - url = "$HOST/login", + url = "$host/login", headers = mapOf( - "Content-Type" to "application/json", + "Api-Key" to apiKey, + "Content-Type" to "application/json" ), data = mapOf( "username" to username, "password" to password - ), - interceptor = headerInterceptor + ) ) //Log.i(TAG, "Responsecode = ${response.code}") //Log.i(TAG, "Result => ${response.text}") @@ -133,7 +115,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi SubtitleOAuthEntity( user = username, pass = password, - accessToken = token.token ?: run { + access_token = token.token ?: run { return false }) ) @@ -167,13 +149,11 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi // "pt" to "pt-PT", // "pt" to "pt-BR" ) - - private fun fixLanguage(language: String?): String? { + private fun fixLanguage(language: String?) : String? { return languageExceptions[language] ?: language } - // O(n) but good enough, BiMap did not want to work properly - private fun fixLanguageReverse(language: String?): String? { + private fun fixLanguageReverse(language: String?) : String? { return languageExceptions.entries.firstOrNull { it.value == language }?.key ?: language } @@ -185,7 +165,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi throwIfCantDoRequest() val fixedLang = fixLanguage(query.lang) - val imdbId = query.imdbId?.replace("tt", "")?.toInt() ?: 0 + val imdbId = query.imdb ?: 0 val queryText = query.query val epNum = query.epNumber ?: 0 val seasonNum = query.seasonNumber ?: 0 @@ -196,16 +176,16 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi val searchQueryUrl = when (imdbId > 0) { //Use imdb_id to search if its valid - true -> "$HOST/subtitles?imdb_id=$imdbId&languages=${fixedLang}$yearQuery$epQuery$seasonQuery" - false -> "$HOST/subtitles?query=${queryText}&languages=${fixedLang}$yearQuery$epQuery$seasonQuery" + true -> "$host/subtitles?imdb_id=$imdbId&languages=${fixedLang}$yearQuery$epQuery$seasonQuery" + false -> "$host/subtitles?query=${queryText}&languages=${fixedLang}$yearQuery$epQuery$seasonQuery" } val req = app.get( url = searchQueryUrl, headers = mapOf( + Pair("Api-Key", apiKey), Pair("Content-Type", "application/json") - ), - interceptor = headerInterceptor + ) ) Log.i(TAG, "Search Req => ${req.text}") if (!req.isSuccessful) { @@ -227,12 +207,12 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi //Use any valid name/title in hierarchy val name = filename ?: featureDetails?.movieName ?: featureDetails?.title ?: featureDetails?.parentTitle ?: attr.release ?: query.query - val lang = fixLanguageReverse(attr.language) ?: "" + val lang = fixLanguageReverse(attr.language)?: "" val resEpNum = featureDetails?.episodeNumber ?: query.epNumber val resSeasonNum = featureDetails?.seasonNumber ?: query.seasonNumber val year = featureDetails?.year ?: query.year val type = if ((resSeasonNum ?: 0) > 0) TvType.TvSeries else TvType.Movie - val isHearingImpaired = attr.hearingImpaired ?: false + val isHearingImpaired = attr.hearing_impaired ?: false //Log.i(TAG, "Result id/name => ${item.id} / $name") item.attributes?.files?.forEach { file -> val resultData = file.fileId?.toString() ?: "" @@ -265,19 +245,19 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi throwIfCantDoRequest() val req = app.post( - url = "$HOST/download", + url = "$host/download", headers = mapOf( Pair( "Authorization", - "Bearer ${currentSession?.accessToken ?: throw ErrorLoadingException("No access token active in current session")}" + "Bearer ${currentSession?.access_token ?: throw ErrorLoadingException("No access token active in current session")}" ), + Pair("Api-Key", apiKey), Pair("Content-Type", "application/json"), Pair("Accept", "*/*") ), data = mapOf( Pair("file_id", data.data) - ), - interceptor = headerInterceptor + ) ) Log.i(TAG, "Request result => (${req.code}) ${req.text}") //Log.i(TAG, "Request headers => ${req.headers}") @@ -298,7 +278,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi data class SubtitleOAuthEntity( var user: String, var pass: String, - var accessToken: String, + var access_token: String, ) data class OAuthToken( @@ -323,7 +303,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi @JsonProperty("url") var url: String? = null, @JsonProperty("files") var files: List? = listOf(), @JsonProperty("feature_details") var featDetails: ResultFeatureDetails? = ResultFeatureDetails(), - @JsonProperty("hearing_impaired") var hearingImpaired: Boolean? = null, + @JsonProperty("hearing_impaired") var hearing_impaired: Boolean? = null, ) data class ResultFiles( diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt index 50517f9d..b4a9d789 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SimklApi.kt @@ -5,33 +5,26 @@ import androidx.core.net.toUri import androidx.fragment.app.FragmentActivity import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty -import com.lagradost.cloudstream3.AcraApplication import com.lagradost.cloudstream3.AcraApplication.Companion.getKey -import com.lagradost.cloudstream3.AcraApplication.Companion.getKeys import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey import com.lagradost.cloudstream3.AcraApplication.Companion.setKey import com.lagradost.cloudstream3.BuildConfig -import com.lagradost.cloudstream3.LoadResponse.Companion.readIdFromString import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.SimklSyncServices import com.lagradost.cloudstream3.TvType import com.lagradost.cloudstream3.app -import com.lagradost.cloudstream3.mapper import com.lagradost.cloudstream3.mvvm.debugAssert import com.lagradost.cloudstream3.mvvm.debugPrint import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall import com.lagradost.cloudstream3.syncproviders.AccountManager import com.lagradost.cloudstream3.syncproviders.AuthAPI -import com.lagradost.cloudstream3.syncproviders.OAuth2API import com.lagradost.cloudstream3.syncproviders.SyncAPI import com.lagradost.cloudstream3.syncproviders.SyncIdName -import com.lagradost.cloudstream3.ui.SyncWatchType import com.lagradost.cloudstream3.ui.library.ListSorting import com.lagradost.cloudstream3.ui.result.txt import com.lagradost.cloudstream3.utils.AppUtils.toJson -import com.lagradost.cloudstream3.utils.DataStoreHelper.toYear +import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson import okhttp3.Interceptor import okhttp3.Response import java.math.BigInteger @@ -39,17 +32,12 @@ import java.security.SecureRandom import java.text.SimpleDateFormat import java.time.Instant import java.util.Date -import java.util.Locale import java.util.TimeZone -import kotlin.time.Duration -import kotlin.time.DurationUnit -import kotlin.time.toDuration class SimklApi(index: Int) : AccountManager(index), SyncAPI { override var name = "Simkl" override val key = "simkl-key" override val redirectUrl = "simkl" - override val supportDeviceAuth = true override val idPrefix = "simkl" override var requireLibraryRefresh = true override var mainUrl = "https://api.simkl.com" @@ -71,83 +59,9 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { */ private var lastScoreTime = -1L - private object SimklCache { - private const val SIMKL_CACHE_KEY = "SIMKL_API_CACHE" - - enum class CacheTimes(val value: String) { - OneMonth("30d"), - ThirtyMinutes("30m") - } - - private class SimklCacheWrapper( - @JsonProperty("obj") val obj: T?, - @JsonProperty("validUntil") val validUntil: Long, - @JsonProperty("cacheTime") val cacheTime: Long = unixTime, - ) { - /** Returns true if cache is newer than cacheDays */ - fun isFresh(): Boolean { - return validUntil > unixTime - } - - fun remainingTime(): Duration { - val unixTime = unixTime - return if (validUntil > unixTime) { - (validUntil - unixTime).toDuration(DurationUnit.SECONDS) - } else { - Duration.ZERO - } - } - } - - fun cleanOldCache() { - getKeys(SIMKL_CACHE_KEY)?.forEach { - val isOld = AcraApplication.getKey>(it)?.isFresh() == false - if (isOld) { - removeKey(it) - } - } - } - - fun setKey(path: String, value: T, cacheTime: Duration) { - debugPrint { "Set cache: $SIMKL_CACHE_KEY/$path for ${cacheTime.inWholeDays} days or ${cacheTime.inWholeSeconds} seconds." } - setKey( - SIMKL_CACHE_KEY, - path, - // Storing as plain sting is required to make generics work. - SimklCacheWrapper(value, unixTime + cacheTime.inWholeSeconds).toJson() - ) - } - - /** - * Gets cached object, if object is not fresh returns null and removes it from cache - */ - inline fun getKey(path: String): T? { - // Required for generic otherwise "LinkedHashMap cannot be cast to MediaObject" - val type = mapper.typeFactory.constructParametricType( - SimklCacheWrapper::class.java, - T::class.java - ) - val cache = getKey(SIMKL_CACHE_KEY, path)?.let { - mapper.readValue>(it, type) - } - - return if (cache?.isFresh() == true) { - debugPrint { - "Cache hit at: $SIMKL_CACHE_KEY/$path. " + - "Remains fresh for ${cache.remainingTime().inWholeDays} days or ${cache.remainingTime().inWholeSeconds} seconds." - } - cache.obj - } else { - debugPrint { "Cache miss at: $SIMKL_CACHE_KEY/$path" } - removeKey(SIMKL_CACHE_KEY, path) - null - } - } - } - companion object { - private const val CLIENT_ID: String = BuildConfig.SIMKL_CLIENT_ID - private const val CLIENT_SECRET: String = BuildConfig.SIMKL_CLIENT_SECRET + private const val clientId: String = BuildConfig.SIMKL_CLIENT_ID + private const val clientSecret: String = BuildConfig.SIMKL_CLIENT_SECRET private var lastLoginState = "" const val SIMKL_TOKEN_KEY: String = "simkl_token" @@ -156,10 +70,10 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { const val SIMKL_CACHED_LIST_TIME: String = "simkl_cached_time" /** 2014-09-01T09:10:11Z -> 1409562611 */ - private const val SIMKL_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'" + private const val simklDateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'" fun getUnixTime(string: String?): Long? { return try { - SimpleDateFormat(SIMKL_DATE_FORMAT, Locale.getDefault()).apply { + SimpleDateFormat(simklDateFormat).apply { this.timeZone = TimeZone.getTimeZone("UTC") }.parse( string ?: return null @@ -173,7 +87,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { /** 1409562611 -> 2014-09-01T09:10:11Z */ fun getDateTime(unixTime: Long?): String? { return try { - SimpleDateFormat(SIMKL_DATE_FORMAT, Locale.getDefault()).apply { + SimpleDateFormat(simklDateFormat).apply { this.timeZone = TimeZone.getTimeZone("UTC") }.format( Date.from( @@ -187,6 +101,32 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { } } + /** + * Set of sync services simkl is compatible with. + * Add more as required: https://simkl.docs.apiary.io/#reference/search/id-lookup/get-items-by-id + */ + enum class SyncServices(val originalName: String) { + Simkl("simkl"), + Imdb("imdb"), + Tmdb("tmdb"), + AniList("anilist"), + Mal("mal"), + } + + /** + * The ID string is a way to keep a collection of services in one single ID using a map + * This adds a database service (like imdb) to the string and returns the new string. + */ + fun addIdToString(idString: String?, database: SyncServices, id: String?): String? { + if (id == null) return idString + return (readIdFromString(idString) + mapOf(database to id)).toJson() + } + + /** Read the id string to get all other ids */ + private fun readIdFromString(idString: String?): Map { + return tryParseJson(idString) ?: return emptyMap() + } + fun getPosterUrl(poster: String): String { return "https://wsrv.nl/?url=https://simkl.in/posters/${poster}_m.webp" } @@ -210,7 +150,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { companion object { fun fromString(string: String): SimklListStatusType? { - return SimklListStatusType.entries.firstOrNull { + return SimklListStatusType.values().firstOrNull { it.originalName == string } } @@ -221,17 +161,17 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { @JsonInclude(JsonInclude.Include.NON_EMPTY) data class TokenRequest( @JsonProperty("code") val code: String, - @JsonProperty("client_id") val clientId: String = CLIENT_ID, - @JsonProperty("client_secret") val clientSecret: String = CLIENT_SECRET, - @JsonProperty("redirect_uri") val redirectUri: String = "$APP_STRING://simkl", - @JsonProperty("grant_type") val grantType: String = "authorization_code" + @JsonProperty("client_id") val client_id: String = clientId, + @JsonProperty("client_secret") val client_secret: String = clientSecret, + @JsonProperty("redirect_uri") val redirect_uri: String = "$appString://simkl", + @JsonProperty("grant_type") val grant_type: String = "authorization_code" ) data class TokenResponse( /** No expiration date */ - @JsonProperty("access_token") val accessToken: String, - @JsonProperty("token_type") val tokenType: String, - @JsonProperty("scope") val scope: String + val access_token: String, + val token_type: String, + val scope: String ) // ------------------- @@ -246,32 +186,17 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { ) } - data class PinAuthResponse( - @JsonProperty("result") val result: String, - @JsonProperty("device_code") val deviceCode: String, - @JsonProperty("user_code") val userCode: String, - @JsonProperty("verification_url") val verificationUrl: String, - @JsonProperty("expires_in") val expiresIn: Int, - @JsonProperty("interval") val interval: Int, - ) - - data class PinExchangeResponse( - @JsonProperty("result") val result: String, - @JsonProperty("message") val message: String? = null, - @JsonProperty("access_token") val accessToken: String? = null, - ) - // ------------------- data class ActivitiesResponse( - @JsonProperty("all") val all: String?, - @JsonProperty("tv_shows") val tvShows: UpdatedAt, - @JsonProperty("anime") val anime: UpdatedAt, - @JsonProperty("movies") val movies: UpdatedAt, + val all: String?, + val tv_shows: UpdatedAt, + val anime: UpdatedAt, + val movies: UpdatedAt, ) { data class UpdatedAt( - @JsonProperty("all") val all: String?, - @JsonProperty("removed_from_list") val removedFromList: String?, - @JsonProperty("rated_at") val ratedAt: String?, + val all: String?, + val removed_from_list: String?, + val rated_at: String?, ) } @@ -285,18 +210,18 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { @JsonProperty("img") val img: String? ) { companion object { - fun convertToEpisodes(list: List?): List? { + fun convertToEpisodes(list: List?): List { return list?.map { MediaObject.Season.Episode(it.episode) - } + } ?: emptyList() } - fun convertToSeasons(list: List?): List? { + fun convertToSeasons(list: List?): List { return list?.filter { it.season != null }?.groupBy { it.season - }?.mapNotNull { (season, episodes) -> - convertToEpisodes(episodes)?.let { MediaObject.Season(season!!, it) } - }?.ifEmpty { null } + }?.map { (season, episodes) -> + MediaObject.Season(season!!, convertToEpisodes(episodes)) + } ?: emptyList() } } } @@ -310,17 +235,11 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { @JsonProperty("title") val title: String?, @JsonProperty("year") val year: Int?, @JsonProperty("ids") val ids: Ids?, - @JsonProperty("total_episodes") val totalEpisodes: Int? = null, - @JsonProperty("status") val status: String? = null, @JsonProperty("poster") val poster: String? = null, @JsonProperty("type") val type: String? = null, @JsonProperty("seasons") val seasons: List? = null, @JsonProperty("episodes") val episodes: List? = null ) { - fun hasEnded(): Boolean { - return status == "released" || status == "ended" - } - @JsonInclude(JsonInclude.Include.NON_EMPTY) data class Season( @JsonProperty("number") val number: Int, @@ -338,13 +257,13 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { @JsonProperty("anilist") val anilist: String? = null, ) { companion object { - fun fromMap(map: Map): Ids { + fun fromMap(map: Map): Ids { return Ids( - simkl = map[SimklSyncServices.Simkl]?.toIntOrNull(), - imdb = map[SimklSyncServices.Imdb], - tmdb = map[SimklSyncServices.Tmdb], - mal = map[SimklSyncServices.Mal], - anilist = map[SimklSyncServices.AniList] + simkl = map[SyncServices.Simkl]?.toIntOrNull(), + imdb = map[SyncServices.Imdb], + tmdb = map[SyncServices.Tmdb], + mal = map[SyncServices.Mal], + anilist = map[SyncServices.AniList] ) } } @@ -362,214 +281,13 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { } } - class SimklScoreBuilder private constructor() { - data class Builder( - private var url: String? = null, - private var interceptor: Interceptor? = null, - private var ids: MediaObject.Ids? = null, - private var score: Int? = null, - private var status: Int? = null, - private var addEpisodes: Pair?, List?>? = null, - private var removeEpisodes: Pair?, List?>? = null, - // Required for knowing if the status should be overwritten - private var onList: Boolean = false - ) { - fun interceptor(interceptor: Interceptor) = apply { this.interceptor = interceptor } - fun apiUrl(url: String) = apply { this.url = url } - fun ids(ids: MediaObject.Ids) = apply { this.ids = ids } - fun score(score: Int?, oldScore: Int?) = apply { - if (score != oldScore) { - this.score = score - } - } - - fun status(newStatus: Int?, oldStatus: Int?) = apply { - onList = oldStatus != null - // Only set status if its new - if (newStatus != oldStatus) { - this.status = newStatus - } else { - this.status = null - } - } - - fun episodes( - allEpisodes: List?, - newEpisodes: Int?, - oldEpisodes: Int?, - ) = apply { - if (allEpisodes == null || newEpisodes == null) return@apply - - fun getEpisodes(rawEpisodes: List) = - if (rawEpisodes.any { it.season != null }) { - EpisodeMetadata.convertToSeasons(rawEpisodes) to null - } else { - null to EpisodeMetadata.convertToEpisodes(rawEpisodes) - } - - // Do not add episodes if there is no change - if (newEpisodes > (oldEpisodes ?: 0)) { - this.addEpisodes = getEpisodes(allEpisodes.take(newEpisodes)) - - // Set to watching if episodes are added and there is no current status - if (!onList) { - status = SimklListStatusType.Watching.value - } - } - if ((oldEpisodes ?: 0) > newEpisodes) { - this.removeEpisodes = getEpisodes(allEpisodes.drop(newEpisodes)) - } - } - - suspend fun execute(): Boolean { - val time = getDateTime(unixTime) - - return if (this.status == SimklListStatusType.None.value) { - app.post( - "$url/sync/history/remove", - json = StatusRequest( - shows = listOf(HistoryMediaObject(ids = ids)), - movies = emptyList() - ), - interceptor = interceptor - ).isSuccessful - } else { - val statusResponse = this.status?.let { setStatus -> - val newStatus = - SimklListStatusType.entries - .firstOrNull { it.value == setStatus }?.originalName - ?: SimklListStatusType.Watching.originalName!! - - app.post( - "${this.url}/sync/add-to-list", - json = StatusRequest( - shows = listOf( - StatusMediaObject( - null, - null, - ids, - newStatus, - ) - ), movies = emptyList() - ), - interceptor = interceptor - ).isSuccessful - } ?: true - - val episodeRemovalResponse = removeEpisodes?.let { (seasons, episodes) -> - app.post( - "${this.url}/sync/history/remove", - json = StatusRequest( - shows = listOf( - HistoryMediaObject( - ids = ids, - seasons = seasons, - episodes = episodes - ) - ), - movies = emptyList() - ), - interceptor = interceptor - ).isSuccessful - } ?: true - - // You cannot rate if you are planning to watch it. - val shouldRate = - score != null && status != SimklListStatusType.Planning.value - val realScore = if (shouldRate) score else null - - val historyResponse = - // Only post if there are episodes or score to upload - if (addEpisodes != null || shouldRate) { - app.post( - "${this.url}/sync/history", - json = StatusRequest( - shows = listOf( - HistoryMediaObject( - null, - null, - ids, - addEpisodes?.first, - addEpisodes?.second, - realScore, - realScore?.let { time }, - ) - ), movies = emptyList() - ), - interceptor = interceptor - ).isSuccessful - } else { - true - } - - statusResponse && episodeRemovalResponse && historyResponse - } - } - } - } - - suspend fun getEpisodes( - simklId: Int?, - type: String?, - episodes: Int?, - hasEnded: Boolean? - ): Array? { - if (simklId == null) return null - - val cacheKey = "Episodes/$simklId" - val cache = SimklCache.getKey>(cacheKey) - - // Return cached result if its higher or equal the amount of episodes. - if (cache != null && cache.size >= (episodes ?: 0)) { - return cache - } - - // There is always one season in Anime -> no request necessary - if (type == "anime" && episodes != null) { - return episodes.takeIf { it > 0 }?.let { - (1..it).map { episode -> - EpisodeMetadata( - null, null, null, episode, null - ) - }.toTypedArray() - } - } - val url = when (type) { - "anime" -> "https://api.simkl.com/anime/episodes/$simklId" - "tv" -> "https://api.simkl.com/tv/episodes/$simklId" - "movie" -> return null - else -> return null - } - - debugPrint { "Requesting episodes from $url" } - return app.get(url, params = mapOf("client_id" to CLIENT_ID)) - .parsedSafe>()?.also { - val cacheTime = - if (hasEnded == true) SimklCache.CacheTimes.OneMonth.value else SimklCache.CacheTimes.ThirtyMinutes.value - - // 1 Month cache - SimklCache.setKey(cacheKey, it, Duration.parse(cacheTime)) - } - } - - @JsonInclude(JsonInclude.Include.NON_EMPTY) - class HistoryMediaObject( - @JsonProperty("title") title: String? = null, - @JsonProperty("year") year: Int? = null, - @JsonProperty("ids") ids: Ids? = null, - @JsonProperty("seasons") seasons: List? = null, - @JsonProperty("episodes") episodes: List? = null, - @JsonProperty("rating") val rating: Int? = null, - @JsonProperty("rated_at") val ratedAt: String? = null, - ) : MediaObject(title, year, ids, seasons = seasons, episodes = episodes) - @JsonInclude(JsonInclude.Include.NON_EMPTY) class RatingMediaObject( @JsonProperty("title") title: String?, @JsonProperty("year") year: Int?, @JsonProperty("ids") ids: Ids?, @JsonProperty("rating") val rating: Int, - @JsonProperty("rated_at") val ratedAt: String? = getDateTime(unixTime) + @JsonProperty("rated_at") val rated_at: String? = getDateTime(unixTime) ) : MediaObject(title, year, ids) @JsonInclude(JsonInclude.Include.NON_EMPTY) @@ -578,9 +296,18 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { @JsonProperty("year") year: Int?, @JsonProperty("ids") ids: Ids?, @JsonProperty("to") val to: String, - @JsonProperty("watched_at") val watchedAt: String? = getDateTime(unixTime) + @JsonProperty("watched_at") val watched_at: String? = getDateTime(unixTime) ) : MediaObject(title, year, ids) + @JsonInclude(JsonInclude.Include.NON_EMPTY) + class HistoryMediaObject( + @JsonProperty("title") title: String?, + @JsonProperty("year") year: Int?, + @JsonProperty("ids") ids: Ids?, + @JsonProperty("seasons") seasons: List?, + @JsonProperty("episodes") episodes: List?, + ) : MediaObject(title, year, ids, seasons = seasons, episodes = episodes) + @JsonInclude(JsonInclude.Include.NON_EMPTY) data class StatusRequest( @JsonProperty("movies") val movies: List, @@ -633,24 +360,24 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { } interface Metadata { - val lastWatchedAt: String? + val last_watched_at: String? val status: String? - val userRating: Int? - val lastWatched: String? - val watchedEpisodesCount: Int? - val totalEpisodesCount: Int? + val user_rating: Int? + val last_watched: String? + val watched_episodes_count: Int? + val total_episodes_count: Int? fun getIds(): ShowMetadata.Show.Ids fun toLibraryItem(): SyncAPI.LibraryItem } data class MovieMetadata( - @JsonProperty("last_watched_at") override val lastWatchedAt: String?, - @JsonProperty("status") override val status: String, - @JsonProperty("user_rating") override val userRating: Int?, - @JsonProperty("last_watched") override val lastWatched: String?, - @JsonProperty("watched_episodes_count") override val watchedEpisodesCount: Int?, - @JsonProperty("total_episodes_count") override val totalEpisodesCount: Int?, + override val last_watched_at: String?, + override val status: String, + override val user_rating: Int?, + override val last_watched: String?, + override val watched_episodes_count: Int?, + override val total_episodes_count: Int?, val movie: ShowMetadata.Show ) : Metadata { override fun getIds(): ShowMetadata.Show.Ids { @@ -662,29 +389,28 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { this.movie.title, "https://simkl.com/tv/${movie.ids.simkl}", movie.ids.simkl.toString(), - this.watchedEpisodesCount, - this.totalEpisodesCount, - this.userRating?.times(10), - getUnixTime(lastWatchedAt) ?: 0, + this.watched_episodes_count, + this.total_episodes_count, + this.user_rating?.times(10), + getUnixTime(last_watched_at) ?: 0, "Simkl", TvType.Movie, this.movie.poster?.let { getPosterUrl(it) }, null, null, - this.movie.year?.toYear(), movie.ids.simkl ) } } data class ShowMetadata( - @JsonProperty("last_watched_at") override val lastWatchedAt: String?, - @JsonProperty("status") override val status: String, - @JsonProperty("user_rating") override val userRating: Int?, - @JsonProperty("last_watched") override val lastWatched: String?, - @JsonProperty("watched_episodes_count") override val watchedEpisodesCount: Int?, - @JsonProperty("total_episodes_count") override val totalEpisodesCount: Int?, - @JsonProperty("show") val show: Show + override val last_watched_at: String?, + override val status: String, + override val user_rating: Int?, + override val last_watched: String?, + override val watched_episodes_count: Int?, + override val total_episodes_count: Int?, + val show: Show ) : Metadata { override fun getIds(): Show.Ids { return this.show.ids @@ -695,46 +421,45 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { this.show.title, "https://simkl.com/tv/${show.ids.simkl}", show.ids.simkl.toString(), - this.watchedEpisodesCount, - this.totalEpisodesCount, - this.userRating?.times(10), - getUnixTime(lastWatchedAt) ?: 0, + this.watched_episodes_count, + this.total_episodes_count, + this.user_rating?.times(10), + getUnixTime(last_watched_at) ?: 0, "Simkl", TvType.Anime, this.show.poster?.let { getPosterUrl(it) }, null, null, - this.show.year?.toYear(), show.ids.simkl ) } data class Show( - @JsonProperty("title") val title: String, - @JsonProperty("poster") val poster: String?, - @JsonProperty("year") val year: Int?, - @JsonProperty("ids") val ids: Ids, + val title: String, + val poster: String?, + val year: Int?, + val ids: Ids, ) { data class Ids( - @JsonProperty("simkl") val simkl: Int, - @JsonProperty("slug") val slug: String?, - @JsonProperty("imdb") val imdb: String?, - @JsonProperty("zap2it") val zap2it: String?, - @JsonProperty("tmdb") val tmdb: String?, - @JsonProperty("offen") val offen: String?, - @JsonProperty("tvdb") val tvdb: String?, - @JsonProperty("mal") val mal: String?, - @JsonProperty("anidb") val anidb: String?, - @JsonProperty("anilist") val anilist: String?, - @JsonProperty("traktslug") val traktslug: String? + val simkl: Int, + val slug: String?, + val imdb: String?, + val zap2it: String?, + val tmdb: String?, + val offen: String?, + val tvdb: String?, + val mal: String?, + val anidb: String?, + val anilist: String?, + val traktslug: String? ) { - fun matchesId(database: SimklSyncServices, id: String): Boolean { + fun matchesId(database: SyncServices, id: String): Boolean { return when (database) { - SimklSyncServices.Simkl -> this.simkl == id.toIntOrNull() - SimklSyncServices.AniList -> this.anilist == id - SimklSyncServices.Mal -> this.mal == id - SimklSyncServices.Tmdb -> this.tmdb == id - SimklSyncServices.Imdb -> this.imdb == id + SyncServices.Simkl -> this.simkl == id.toIntOrNull() + SyncServices.AniList -> this.anilist == id + SyncServices.Mal -> this.mal == id + SyncServices.Tmdb -> this.tmdb == id + SyncServices.Imdb -> this.imdb == id } } } @@ -753,7 +478,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { chain.request() .newBuilder() .addHeader("Authorization", "Bearer $token") - .addHeader("simkl-api-key", CLIENT_ID) + .addHeader("simkl-api-key", clientId) .build() ) } @@ -766,58 +491,20 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { } } - /** - * Useful to get episodes on demand to prevent unnecessary requests. - */ - class SimklEpisodeConstructor( - private val simklId: Int?, - private val type: String?, - private val totalEpisodeCount: Int?, - private val hasEnded: Boolean? - ) { - suspend fun getEpisodes(): Array? { - return getEpisodes(simklId, type, totalEpisodeCount, hasEnded) - } - } - class SimklSyncStatus( - override var status: SyncWatchType, + override var status: Int, override var score: Int?, - val oldScore: Int?, override var watchedEpisodes: Int?, - val episodeConstructor: SimklEpisodeConstructor, + val episodes: Array?, override var isFavorite: Boolean? = null, override var maxEpisodes: Int? = null, /** Save seen episodes separately to know the change from old to new. * Required to remove seen episodes if count decreases */ val oldEpisodes: Int, - val oldStatus: String? ) : SyncAPI.AbstractSyncStatus() override suspend fun getStatus(id: String): SyncAPI.AbstractSyncStatus? { val realIds = readIdFromString(id) - - // Key which assumes all ids are the same each time :/ - // This could be some sort of reference system to make multiple IDs - // point to the same key. - val idKey = - realIds.toList().map { "${it.first.originalName}=${it.second}" }.sorted().joinToString() - - val cachedObject = SimklCache.getKey(idKey) - val searchResult: MediaObject = cachedObject - ?: (searchByIds(realIds)?.firstOrNull()?.also { result -> - val cacheTime = - if (result.hasEnded()) SimklCache.CacheTimes.OneMonth.value else SimklCache.CacheTimes.ThirtyMinutes.value - SimklCache.setKey(idKey, result, Duration.parse(cacheTime)) - }) ?: return null - - val episodeConstructor = SimklEpisodeConstructor( - searchResult.ids?.simkl, - searchResult.type, - searchResult.totalEpisodes, - searchResult.hasEnded() - ) - val foundItem = getSyncListSmart()?.let { list -> listOf(list.shows, list.anime, list.movies).flatten().firstOrNull { show -> realIds.any { (database, id) -> @@ -826,96 +513,208 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { } } + // Search to get episodes + val searchResult = searchByIds(realIds)?.firstOrNull() + val episodes = getEpisodes(searchResult?.ids?.simkl, searchResult?.type) + if (foundItem != null) { return SimklSyncStatus( - status = foundItem.status?.let { - SyncWatchType.fromInternalId( - SimklListStatusType.fromString( - it - )?.value - ) - } + status = foundItem.status?.let { SimklListStatusType.fromString(it)?.value } ?: return null, - score = foundItem.userRating, - watchedEpisodes = foundItem.watchedEpisodesCount, - maxEpisodes = searchResult.totalEpisodes, - episodeConstructor = episodeConstructor, - oldEpisodes = foundItem.watchedEpisodesCount ?: 0, - oldScore = foundItem.userRating, - oldStatus = foundItem.status + score = foundItem.user_rating, + watchedEpisodes = foundItem.watched_episodes_count, + maxEpisodes = foundItem.total_episodes_count, + episodes = episodes, + oldEpisodes = foundItem.watched_episodes_count ?: 0, ) } else { - return SimklSyncStatus( - status = SyncWatchType.fromInternalId(SimklListStatusType.None.value), - score = 0, - watchedEpisodes = 0, - maxEpisodes = if (searchResult.type == "movie") 0 else searchResult.totalEpisodes, - episodeConstructor = episodeConstructor, - oldEpisodes = 0, - oldStatus = null, - oldScore = null - ) + return if (searchResult != null) { + SimklSyncStatus( + status = SimklListStatusType.None.value, + score = 0, + watchedEpisodes = 0, + maxEpisodes = if (searchResult.type == "movie") 0 else null, + episodes = episodes, + oldEpisodes = 0, + ) + } else { + null + } } } override suspend fun score(id: String, status: SyncAPI.AbstractSyncStatus): Boolean { val parsedId = readIdFromString(id) lastScoreTime = unixTime + + if (status.status == SimklListStatusType.None.value) { + return app.post( + "$mainUrl/sync/history/remove", + json = StatusRequest( + shows = listOf( + HistoryMediaObject( + null, + null, + MediaObject.Ids.fromMap(parsedId), + emptyList(), + emptyList() + ) + ), + movies = emptyList() + ), + interceptor = interceptor + ).isSuccessful + } + + val realScore = status.score + val ratingResponseSuccess = if (realScore != null) { + // Remove rating if score is 0 + val ratingsSuffix = if (realScore == 0) "/remove" else "" + debugPrint { "Rate ${this.name} item: rating=$realScore" } + app.post( + "$mainUrl/sync/ratings$ratingsSuffix", + json = StatusRequest( + // Not possible to know if TV or Movie + shows = listOf( + RatingMediaObject( + null, + null, + MediaObject.Ids.fromMap(parsedId), + realScore + ) + ), + movies = emptyList() + ), + interceptor = interceptor + ).isSuccessful + } else { + true + } + val simklStatus = status as? SimklSyncStatus - - val builder = SimklScoreBuilder.Builder() - .apiUrl(this.mainUrl) - .score(status.score, simklStatus?.oldScore) - .status( - status.status.internalId, - (status as? SimklSyncStatus)?.oldStatus?.let { oldStatus -> - SimklListStatusType.entries.firstOrNull { - it.originalName == oldStatus - }?.value - }) - .interceptor(interceptor) - .ids(MediaObject.Ids.fromMap(parsedId)) - - - // Get episodes only when required - val episodes = simklStatus?.episodeConstructor?.getEpisodes() - // All episodes if marked as completed - val watchedEpisodes = if (status.status.internalId == SimklListStatusType.Completed.value) { - episodes?.size + val watchedEpisodes = if (status.status == SimklListStatusType.Completed.value) { + simklStatus?.episodes?.size } else { status.watchedEpisodes } - builder.episodes(episodes?.toList(), watchedEpisodes, simklStatus?.oldEpisodes) + // Only post episodes if available episodes and the status is correct + val episodeResponseSuccess = + if (simklStatus != null && watchedEpisodes != null && !simklStatus.episodes.isNullOrEmpty() && listOf( + SimklListStatusType.Paused.value, + SimklListStatusType.Dropped.value, + SimklListStatusType.Watching.value, + SimklListStatusType.Completed.value, + SimklListStatusType.ReWatching.value + ).contains(status.status) + ) { + suspend fun postEpisodes( + url: String, + rawEpisodes: List + ): Boolean { + val (seasons, episodes) = if (rawEpisodes.any { it.season != null }) { + EpisodeMetadata.convertToSeasons(rawEpisodes) to null + } else { + null to EpisodeMetadata.convertToEpisodes(rawEpisodes) + } + debugPrint { "Synced history using $url: seasons=${seasons?.toList()}, episodes=${episodes?.toList()}" } + return app.post( + url, + json = StatusRequest( + shows = listOf( + HistoryMediaObject( + null, + null, + MediaObject.Ids.fromMap(parsedId), + seasons, + episodes + ) + ), + movies = emptyList() + ), + interceptor = interceptor + ).isSuccessful + } + // If episodes decrease: remove all episodes beyond watched episodes. + val removeResponse = if (simklStatus.oldEpisodes > watchedEpisodes) { + val removeEpisodes = simklStatus.episodes + .drop(watchedEpisodes) + postEpisodes("$mainUrl/sync/history/remove", removeEpisodes) + } else { + true + } + val cutEpisodes = simklStatus.episodes.take(watchedEpisodes) + val addResponse = postEpisodes("$mainUrl/sync/history/", cutEpisodes) + + removeResponse && addResponse + } else true + + val newStatus = + SimklListStatusType.values().firstOrNull { it.value == status.status }?.originalName + ?: SimklListStatusType.Watching.originalName + + val statusResponseSuccess = if (newStatus != null) { + debugPrint { "Add to ${this.name} list: status=$newStatus" } + app.post( + "$mainUrl/sync/add-to-list", + json = StatusRequest( + shows = listOf( + StatusMediaObject( + null, + null, + MediaObject.Ids.fromMap(parsedId), + newStatus + ) + ), + movies = emptyList() + ), + interceptor = interceptor + ).isSuccessful + } else { + true + } + + debugPrint { "All scoring complete: rating=$ratingResponseSuccess, status=$statusResponseSuccess, episode=$episodeResponseSuccess" } requireLibraryRefresh = true - return builder.execute() + return ratingResponseSuccess && statusResponseSuccess && episodeResponseSuccess } /** See https://simkl.docs.apiary.io/#reference/search/id-lookup/get-items-by-id */ - private suspend fun searchByIds(serviceMap: Map): Array? { + suspend fun searchByIds(serviceMap: Map): Array? { if (serviceMap.isEmpty()) return emptyArray() return app.get( "$mainUrl/search/id", - params = mapOf("client_id" to CLIENT_ID) + serviceMap.map { (service, id) -> + params = mapOf("client_id" to clientId) + serviceMap.map { (service, id) -> service.originalName to id } ).parsedSafe() } + suspend fun getEpisodes(simklId: Int?, type: String?): Array? { + if (simklId == null) return null + val url = when (type) { + "anime" -> "https://api.simkl.com/anime/episodes/$simklId" + "tv" -> "https://api.simkl.com/tv/episodes/$simklId" + "movie" -> return null + else -> return null + } + return app.get(url, params = mapOf("client_id" to clientId)).parsedSafe() + } + override suspend fun search(name: String): List? { return app.get( - "$mainUrl/search/", params = mapOf("client_id" to CLIENT_ID, "q" to name) + "$mainUrl/search/", params = mapOf("client_id" to clientId, "q" to name) ).parsedSafe>()?.mapNotNull { it.toSyncSearchResult() } } override fun authenticate(activity: FragmentActivity?) { lastLoginState = BigInteger(130, SecureRandom()).toString(32) val url = - "https://simkl.com/oauth/authorize?response_type=code&client_id=$CLIENT_ID&redirect_uri=$APP_STRING://${redirectUrl}&state=$lastLoginState" + "https://simkl.com/oauth/authorize?response_type=code&client_id=$clientId&redirect_uri=$appString://${redirectUrl}&state=$lastLoginState" openBrowser(url, activity) } @@ -938,17 +737,16 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { return null } - private suspend fun getSyncListSince(since: Long?): AllItemsResponse? { + private suspend fun getSyncListSince(since: Long?): AllItemsResponse { val params = getDateTime(since)?.let { mapOf("date_from" to it) } ?: emptyMap() - // Can return null on no change. return app.get( "$mainUrl/sync/all-items/", params = params, interceptor = interceptor - ).parsedSafe() + ).parsed() } private suspend fun getActivities(): ActivitiesResponse? { @@ -965,15 +763,15 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { val activities = getActivities() val lastCacheUpdate = getKey(accountId, SIMKL_CACHED_LIST_TIME) val lastRemoval = listOf( - activities?.tvShows?.removedFromList, - activities?.anime?.removedFromList, - activities?.movies?.removedFromList + activities?.tv_shows?.removed_from_list, + activities?.anime?.removed_from_list, + activities?.movies?.removed_from_list ).maxOf { getUnixTime(it) ?: -1 } val lastRealUpdate = listOf( - activities?.tvShows?.all, + activities?.tv_shows?.all, activities?.anime?.all, activities?.movies?.all, ).maxOf { @@ -1005,7 +803,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { val list = getSyncListSmart() ?: return null val baseMap = - SimklListStatusType.entries + SimklListStatusType.values() .filter { it.value >= 0 && it.value != SimklListStatusType.ReWatching.value } .associate { it.stringRes to emptyList() @@ -1030,8 +828,6 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { ListSorting.AlphabeticalZ, ListSorting.UpdatedNew, ListSorting.UpdatedOld, - ListSorting.ReleaseDateNew, - ListSorting.ReleaseDateOld, ListSorting.RatingHigh, ListSorting.RatingLow, ) @@ -1043,44 +839,6 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { return simklUrlRegex.find(url)?.groupValues?.get(1) ?: "" } - override suspend fun getDevicePin(): OAuth2API.PinAuthData? { - val pinAuthResp = app.get( - "$mainUrl/oauth/pin?client_id=$CLIENT_ID&redirect_uri=$APP_STRING://${redirectUrl}" - ).parsedSafe() ?: return null - - return OAuth2API.PinAuthData( - deviceCode = pinAuthResp.deviceCode, - userCode = pinAuthResp.userCode, - verificationUrl = pinAuthResp.verificationUrl, - expiresIn = pinAuthResp.expiresIn, - interval = pinAuthResp.interval - ) - } - - override suspend fun handleDeviceAuth(pinAuthData: OAuth2API.PinAuthData): Boolean { - val pinAuthResp = app.get( - "$mainUrl/oauth/pin/${pinAuthData.userCode}?client_id=$CLIENT_ID" - ).parsedSafe() ?: return false - - if (pinAuthResp.accessToken != null) { - switchToNewAccount() - setKey(accountId, SIMKL_TOKEN_KEY, pinAuthResp.accessToken) - - val user = getUser() - if (user == null) { - removeKey(accountId, SIMKL_TOKEN_KEY) - switchToOldAccount() - return false - } - - setKey(accountId, SIMKL_USER_KEY, user) - registerAccount() - requireLibraryRefresh = true - return true - } - return false - } - override suspend fun handleRedirect(url: String): Boolean { val uri = url.toUri() val state = uri.getQueryParameter("state") @@ -1094,7 +852,7 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { ).parsedSafe() ?: return false switchToNewAccount() - setKey(accountId, SIMKL_TOKEN_KEY, token.accessToken) + setKey(accountId, SIMKL_TOKEN_KEY, token.access_token) val user = getUser() if (user == null) { @@ -1109,4 +867,4 @@ class SimklApi(index: Int) : AccountManager(index), SyncAPI { return true } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt deleted file mode 100644 index 8dad1f88..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt +++ /dev/null @@ -1,159 +0,0 @@ -package com.lagradost.cloudstream3.syncproviders.providers - -import com.fasterxml.jackson.annotation.JsonProperty -import com.lagradost.cloudstream3.TvType -import com.lagradost.cloudstream3.app -import com.lagradost.cloudstream3.subtitles.AbstractSubProvider -import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities -import com.lagradost.cloudstream3.subtitles.SubtitleResource -import com.lagradost.cloudstream3.utils.AppUtils.parseJson -import com.lagradost.cloudstream3.utils.AppUtils.toJson -import com.lagradost.cloudstream3.utils.SubtitleHelper - -class SubSourceApi : AbstractSubProvider { - override val idPrefix = "subsource" - val name = "SubSource" - - companion object { - const val APIURL = "https://api.subsource.net/api" - const val DOWNLOADENDPOINT = "https://api.subsource.net/api/downloadSub" - } - - override suspend fun search(query: AbstractSubtitleEntities.SubtitleSearch): List? { - - //Only supports Imdb Id search for now - if (query.imdbId == null) return null - val queryLang = SubtitleHelper.fromTwoLettersToLanguage(query.lang!!) - val type = if ((query.seasonNumber ?: 0) > 0) TvType.TvSeries else TvType.Movie - - val searchRes = app.post( - url = "$APIURL/searchMovie", - data = mapOf( - "query" to query.imdbId!! - ) - ).parsedSafe() ?: return null - - val postData = if (type == TvType.TvSeries) { - mapOf( - "langs" to "[]", - "movieName" to searchRes.found.first().linkName, - "season" to "season-${query.seasonNumber}" - ) - } else { - mapOf( - "langs" to "[]", - "movieName" to searchRes.found.first().linkName, - ) - } - - val getMovieRes = app.post( - url = "$APIURL/getMovie", - data = postData - ).parsedSafe().let { - // api doesn't has episode number or lang filtering - if (type == TvType.Movie) { - it?.subs?.filter { sub -> - sub.lang == queryLang - } - } else { - it?.subs?.filter { sub -> - sub.releaseName!!.contains( - String.format( - null, - "E%02d", - query.epNumber - ) - ) && sub.lang == queryLang - } - } - } ?: return null - - return getMovieRes.map { subtitle -> - AbstractSubtitleEntities.SubtitleEntity( - idPrefix = this.idPrefix, - name = subtitle.releaseName!!, - lang = subtitle.lang!!, - data = SubData( - movie = subtitle.linkName!!, - lang = subtitle.lang, - id = subtitle.subId.toString(), - ).toJson(), - type = type, - source = this.name, - epNumber = query.epNumber, - seasonNumber = query.seasonNumber, - isHearingImpaired = subtitle.hi == 1, - ) - } - } - - override suspend fun SubtitleResource.getResources(data: AbstractSubtitleEntities.SubtitleEntity) { - - val parsedSub = parseJson(data.data) - - val subRes = app.post( - url = "$APIURL/getSub", - data = mapOf( - "movie" to parsedSub.movie, - "lang" to data.lang, - "id" to parsedSub.id - ) - ).parsedSafe() ?: return - - this.addZipUrl( - "$DOWNLOADENDPOINT/${subRes.sub.downloadToken}" - ) { name, _ -> - name - } - } - - data class ApiSearch( - @JsonProperty("success") val success: Boolean, - @JsonProperty("found") val found: List, - ) - - data class Found( - @JsonProperty("id") val id: Long, - @JsonProperty("title") val title: String, - @JsonProperty("seasons") val seasons: Long, - @JsonProperty("type") val type: String, - @JsonProperty("releaseYear") val releaseYear: Long, - @JsonProperty("linkName") val linkName: String, - ) - - data class ApiResponse( - @JsonProperty("success") val success: Boolean, - @JsonProperty("movie") val movie: Movie, - @JsonProperty("subs") val subs: List, - ) - - data class Movie( - @JsonProperty("id") val id: Long? = null, - @JsonProperty("type") val type: String? = null, - @JsonProperty("year") val year: Long? = null, - @JsonProperty("fullName") val fullName: String? = null, - ) - - data class Sub( - @JsonProperty("hi") val hi: Int? = null, - @JsonProperty("fullLink") val fullLink: String? = null, - @JsonProperty("linkName") val linkName: String? = null, - @JsonProperty("lang") val lang: String? = null, - @JsonProperty("releaseName") val releaseName: String? = null, - @JsonProperty("subId") val subId: Long? = null, - ) - - data class SubData( - @JsonProperty("movie") val movie: String, - @JsonProperty("lang") val lang: String, - @JsonProperty("id") val id: String, - ) - - data class SubTitleLink( - @JsonProperty("sub") val sub: SubToken, - ) - - data class SubToken( - @JsonProperty("downloadToken") val downloadToken: String, - ) -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Subdl.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Subdl.kt deleted file mode 100644 index 29544e65..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/Subdl.kt +++ /dev/null @@ -1,247 +0,0 @@ -package com.lagradost.cloudstream3.syncproviders.providers - -import com.fasterxml.jackson.annotation.JsonProperty -import com.lagradost.cloudstream3.AcraApplication.Companion.getKey -import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey -import com.lagradost.cloudstream3.AcraApplication.Companion.setKey -import com.lagradost.cloudstream3.ErrorLoadingException -import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.TvType -import com.lagradost.cloudstream3.app -import com.lagradost.cloudstream3.mvvm.logError -import com.lagradost.cloudstream3.subtitles.AbstractSubApi -import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities -import com.lagradost.cloudstream3.subtitles.SubtitleResource -import com.lagradost.cloudstream3.syncproviders.AuthAPI.LoginInfo -import com.lagradost.cloudstream3.syncproviders.InAppAuthAPI -import com.lagradost.cloudstream3.syncproviders.InAppAuthAPIManager - -class SubDlApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi { - override val idPrefix = "subdl" - override val name = "SubDL" - override val icon = R.drawable.subdl_logo_big - override val requiresPassword = true - override val requiresEmail = true - override val createAccountUrl = "https://subdl.com/login" - - companion object { - const val APIURL = "https://api.subdl.com" - const val APIENDPOINT = "$APIURL/api/v1/subtitles" - const val DOWNLOADENDPOINT = "https://dl.subdl.com" - const val SUBDL_SUBTITLES_USER_KEY: String = "subdl_user" - var currentSession: SubtitleOAuthEntity? = null - } - - override suspend fun initialize() { - currentSession = getAuthKey() - } - - override fun logOut() { - setAuthKey(null) - removeAccountKeys() - currentSession = getAuthKey() - } - override suspend fun login(data: InAppAuthAPI.LoginData): Boolean { - val email = data.email ?: throw ErrorLoadingException("Requires Email") - val password = data.password ?: throw ErrorLoadingException("Requires Password") - switchToNewAccount() - try { - if (initLogin(email, password)) { - registerAccount() - return true - } - } catch (e: Exception) { - logError(e) - switchToOldAccount() - } - switchToOldAccount() - return false - } - - override fun getLatestLoginData(): InAppAuthAPI.LoginData? { - val current = getAuthKey() ?: return null - return InAppAuthAPI.LoginData( - email = current.userEmail, - password = current.pass - ) - } - - override fun loginInfo(): LoginInfo? { - getAuthKey()?.let { user -> - return LoginInfo( - profilePicture = null, - name = user.name ?: user.userEmail, - accountIndex = accountIndex - ) - } - return null - } - - override suspend fun search(query: AbstractSubtitleEntities.SubtitleSearch): List? { - - val queryText = query.query - val epNum = query.epNumber ?: 0 - val seasonNum = query.seasonNumber ?: 0 - val yearNum = query.year ?: 0 - - val idQuery = when { - query.imdbId != null -> "&imdb_id=${query.imdbId}" - query.tmdbId != null -> "&tmdb_id=${query.tmdbId}" - else -> null - } - - val epQuery = if (epNum > 0) "&episode_number=$epNum" else "" - val seasonQuery = if (seasonNum > 0) "&season_number=$seasonNum" else "" - val yearQuery = if (yearNum > 0) "&year=$yearNum" else "" - - val searchQueryUrl = when (idQuery) { - //Use imdb/tmdb id to search if its valid - null -> "$APIENDPOINT?api_key=${currentSession?.apiKey}&film_name=$queryText&languages=${query.lang}$epQuery$seasonQuery$yearQuery" - else -> "$APIENDPOINT?api_key=${currentSession?.apiKey}$idQuery&languages=${query.lang}$epQuery$seasonQuery$yearQuery" - } - - val req = app.get( - url = searchQueryUrl, - headers = mapOf( - "Accept" to "application/json" - ) - ) - - return req.parsedSafe()?.subtitles?.map { subtitle -> - - val lang = subtitle.lang.replaceFirstChar { it.uppercase() } - val resEpNum = subtitle.episode ?: query.epNumber - val resSeasonNum = subtitle.season ?: query.seasonNumber - val type = if ((resSeasonNum ?: 0) > 0) TvType.TvSeries else TvType.Movie - - AbstractSubtitleEntities.SubtitleEntity( - idPrefix = this.idPrefix, - name = subtitle.releaseName, - lang = lang, - data = "${DOWNLOADENDPOINT}${subtitle.url}", - type = type, - source = this.name, - epNumber = resEpNum, - seasonNumber = resSeasonNum, - isHearingImpaired = subtitle.hearingImpaired ?: false, - ) - } - } - - override suspend fun SubtitleResource.getResources(data: AbstractSubtitleEntities.SubtitleEntity) { - this.addZipUrl(data.data) { name, _ -> - name - } - } - - private suspend fun initLogin(useremail: String, password: String): Boolean { - - val tokenResponse = app.post( - url = "$APIURL/login", - data = mapOf( - "email" to useremail, - "password" to password - ) - ).parsedSafe() - - if (tokenResponse?.token == null) return false - - val apiResponse = app.get( - url = "$APIURL/user/userApi", - headers = mapOf( - "Authorization" to "Bearer ${tokenResponse.token}" - ) - ).parsedSafe() - - if (apiResponse?.ok == false) return false - - setAuthKey( - SubtitleOAuthEntity( - userEmail = useremail, - pass = password, - name = tokenResponse.userData?.username ?: tokenResponse.userData?.name, - accessToken = tokenResponse.token, - apiKey = apiResponse?.apiKey - ) - ) - return true - } - - private fun getAuthKey(): SubtitleOAuthEntity? { - return getKey(accountId, SUBDL_SUBTITLES_USER_KEY) - } - - private fun setAuthKey(data: SubtitleOAuthEntity?) { - if (data == null) removeKey( - accountId, - SUBDL_SUBTITLES_USER_KEY - ) - currentSession = data - setKey(accountId, SUBDL_SUBTITLES_USER_KEY, data) - } - - data class SubtitleOAuthEntity( - @JsonProperty("userEmail") var userEmail: String, - @JsonProperty("pass") var pass: String, - @JsonProperty("name") var name: String? = null, - @JsonProperty("accessToken") var accessToken: String? = null, - @JsonProperty("apiKey") var apiKey: String? = null, - ) - - data class OAuthTokenResponse( - @JsonProperty("token") val token: String? = null, - @JsonProperty("userData") val userData: UserData? = null, - @JsonProperty("status") val status: Boolean? = null, - @JsonProperty("message") val message: String? = null, - ) - - data class UserData( - @JsonProperty("email") val email: String, - @JsonProperty("name") val name: String, - @JsonProperty("country") val country: String, - @JsonProperty("scStepCode") val scStepCode: String, - @JsonProperty("scVerified") val scVerified: Boolean, - @JsonProperty("username") val username: String? = null, - @JsonProperty("scUsername") val scUsername: String, - ) - - data class ApiKeyResponse( - @JsonProperty("ok") val ok: Boolean? = false, - @JsonProperty("api_key") val apiKey: String? = null, - @JsonProperty("usage") val usage: Usage? = null, - ) - - data class Usage( - @JsonProperty("total") val total: Long? = 0, - @JsonProperty("today") val today: Long? = 0, - ) - - data class ApiResponse( - @JsonProperty("status") val status: Boolean? = null, - @JsonProperty("results") val results: List? = null, - @JsonProperty("subtitles") val subtitles: List? = null, - ) - - data class Result( - @JsonProperty("sd_id") val sdId: Int? = null, - @JsonProperty("type") val type: String? = null, - @JsonProperty("name") val name: String? = null, - @JsonProperty("imdb_id") val imdbId: String? = null, - @JsonProperty("tmdb_id") val tmdbId: Long? = null, - @JsonProperty("first_air_date") val firstAirDate: String? = null, - @JsonProperty("year") val year: Int? = null, - ) - - data class Subtitle( - @JsonProperty("release_name") val releaseName: String, - @JsonProperty("name") val name: String, - @JsonProperty("lang") val lang: String, - @JsonProperty("author") val author: String? = null, - @JsonProperty("url") val url: String? = null, - @JsonProperty("subtitlePage") val subtitlePage: String? = null, - @JsonProperty("season") val season: Int? = null, - @JsonProperty("episode") val episode: Int? = null, - @JsonProperty("language") val language: String? = null, - @JsonProperty("hi") val hearingImpaired: Boolean? = null, - ) -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt index 9150cfc5..4ab2e8e2 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/APIRepository.kt @@ -1,24 +1,16 @@ package com.lagradost.cloudstream3.ui +import com.lagradost.cloudstream3.* import com.lagradost.cloudstream3.APIHolder.unixTime import com.lagradost.cloudstream3.APIHolder.unixTimeMS -import com.lagradost.cloudstream3.DubStatus -import com.lagradost.cloudstream3.ErrorLoadingException -import com.lagradost.cloudstream3.HomePageResponse -import com.lagradost.cloudstream3.LoadResponse -import com.lagradost.cloudstream3.MainAPI import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent -import com.lagradost.cloudstream3.MainPageRequest -import com.lagradost.cloudstream3.SearchResponse -import com.lagradost.cloudstream3.SubtitleFile -import com.lagradost.cloudstream3.TvType -import com.lagradost.cloudstream3.fixUrl import com.lagradost.cloudstream3.mvvm.Resource import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.mvvm.safeApiCall import com.lagradost.cloudstream3.utils.Coroutines.threadSafeListOf import com.lagradost.cloudstream3.utils.ExtractorLink import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope.coroutineContext import kotlinx.coroutines.async import kotlinx.coroutines.delay @@ -50,7 +42,7 @@ class APIRepository(val api: MainAPI) { private val cache = threadSafeListOf() private var cacheIndex: Int = 0 - const val CACHE_SIZE = 20 + const val cacheSize = 20 } private fun afterPluginsLoaded(forceReload: Boolean) { @@ -94,9 +86,9 @@ class APIRepository(val api: MainAPI) { val add = SavedLoadResponse(unixTime, response, lookingForHash) synchronized(cache) { - if (cache.size > CACHE_SIZE) { + if (cache.size > cacheSize) { cache[cacheIndex] = add // rolling cache - cacheIndex = (cacheIndex + 1) % CACHE_SIZE + cacheIndex = (cacheIndex + 1) % cacheSize } else { cache.add(add) } @@ -182,7 +174,7 @@ class APIRepository(val api: MainAPI) { data: String, isCasting: Boolean, subtitleCallback: (SubtitleFile) -> Unit, - callback: (ExtractorLink) -> Unit, + callback: (ExtractorLink) -> Unit ): Boolean { if (isInvalidData(data)) return false // this makes providers cleaner return try { diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/CustomRecyclerViews.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/AutofitRecyclerView.kt similarity index 78% rename from app/src/main/java/com/lagradost/cloudstream3/ui/CustomRecyclerViews.kt rename to app/src/main/java/com/lagradost/cloudstream3/ui/AutofitRecyclerView.kt index 78ad2a6b..28ced48c 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/CustomRecyclerViews.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/AutofitRecyclerView.kt @@ -3,13 +3,12 @@ package com.lagradost.cloudstream3.ui import android.content.Context import android.util.AttributeSet import android.view.View -import androidx.core.view.children import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import kotlin.math.abs -class GrdLayoutManager(val context: Context, spanCount: Int) : - GridLayoutManager(context, spanCount) { +class GrdLayoutManager(val context: Context, _spanCount: Int) : + GridLayoutManager(context, _spanCount) { override fun onFocusSearchFailed( focused: View, focusDirection: Int, @@ -71,8 +70,8 @@ class GrdLayoutManager(val context: Context, spanCount: Int) : val orientation = this.orientation // fixes arabic by inverting left and right layout focus - val correctDirection = if (this.isLayoutRTL) { - when (direction) { + val correctDirection = if(this.isLayoutRTL) { + when(direction) { View.FOCUS_RIGHT -> View.FOCUS_LEFT View.FOCUS_LEFT -> View.FOCUS_RIGHT else -> direction @@ -84,15 +83,12 @@ class GrdLayoutManager(val context: Context, spanCount: Int) : View.FOCUS_DOWN -> { return spanCount } - View.FOCUS_UP -> { return -spanCount } - View.FOCUS_RIGHT -> { return 1 } - View.FOCUS_LEFT -> { return -1 } @@ -102,15 +98,12 @@ class GrdLayoutManager(val context: Context, spanCount: Int) : View.FOCUS_DOWN -> { return 1 } - View.FOCUS_UP -> { return -1 } - View.FOCUS_RIGHT -> { return spanCount } - View.FOCUS_LEFT -> { return -spanCount } @@ -162,32 +155,4 @@ class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: Att layoutManager = manager } -} - -/** - * Recyclerview wherein the max item width or height is set by the biggest view to prevent inconsistent view sizes. - */ -class MaxRecyclerView(ctx: Context, attrs: AttributeSet) : RecyclerView(ctx, attrs) { - private var biggestObserved: Int = 0 - private val orientation = LayoutManager.getProperties(context, attrs, 0, 0).orientation - private val isHorizontal = orientation == HORIZONTAL - private fun View.updateMaxSize() { - if (isHorizontal) { - this.minimumHeight = biggestObserved - } else { - this.minimumWidth = biggestObserved - } - } - - override fun onChildAttachedToWindow(child: View) { - child.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED) - val observed = if (isHorizontal) child.measuredHeight else child.measuredWidth - if (observed > biggestObserved) { - biggestObserved = observed - children.forEach { it.updateMaxSize() } - } else { - child.updateMaxSize() - } - super.onChildAttachedToWindow(child) - } } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt deleted file mode 100644 index e930961c..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/BaseAdapter.kt +++ /dev/null @@ -1,252 +0,0 @@ -package com.lagradost.cloudstream3.ui - -import android.view.View -import android.view.ViewGroup -import androidx.core.view.children -import androidx.fragment.app.Fragment -import androidx.fragment.app.viewModels -import androidx.lifecycle.ViewModel -import androidx.recyclerview.widget.AsyncDifferConfig -import androidx.recyclerview.widget.AsyncListDiffer -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.RecyclerView -import androidx.recyclerview.widget.RecyclerView.ViewHolder -import androidx.viewbinding.ViewBinding -import java.util.concurrent.CopyOnWriteArrayList - -open class ViewHolderState(val view: ViewBinding) : ViewHolder(view.root) { - open fun save(): T? = null - open fun restore(state: T) = Unit - open fun onViewAttachedToWindow() = Unit - open fun onViewDetachedFromWindow() = Unit - open fun onViewRecycled() = Unit -} - - -// Based of the concept https://github.com/brahmkshatriya/echo/blob/main/app%2Fsrc%2Fmain%2Fjava%2Fdev%2Fbrahmkshatriya%2Fecho%2Fui%2Fadapters%2FMediaItemsContainerAdapter.kt#L108-L154 -class StateViewModel : ViewModel() { - val layoutManagerStates = hashMapOf>() -} - -abstract class NoStateAdapter(fragment: Fragment) : BaseAdapter(fragment, 0) - -/** - * BaseAdapter is a persistent state stored adapter that supports headers and footers. - * This should be used for restoring eg scroll or focus related to a view when it is recreated. - * - * Id is a per fragment based unique id used to store the underlying data done in an internal ViewModel. - * - * diffCallback is how the view should be handled when updating, override onUpdateContent for updates - * - * NOTE: - * - * By default it should save automatically, but you can also call save(recycle) - * - * By default no state is stored, but doing an id != 0 will store - * - * By default no headers or footers exist, override footers and headers count - */ -abstract class BaseAdapter< - T : Any, - S : Any>( - fragment: Fragment, - val id: Int = 0, - diffCallback: DiffUtil.ItemCallback = BaseDiffCallback() -) : RecyclerView.Adapter>() { - open val footers: Int = 0 - open val headers: Int = 0 - - fun getItem(position: Int): T { - return mDiffer.currentList[position] - } - - fun getItemOrNull(position: Int): T? { - return mDiffer.currentList.getOrNull(position) - } - - private val mDiffer: AsyncListDiffer = AsyncListDiffer( - object : NonFinalAdapterListUpdateCallback(this) { - override fun onMoved(fromPosition: Int, toPosition: Int) { - super.onMoved(fromPosition + headers, toPosition + headers) - } - - override fun onRemoved(position: Int, count: Int) { - super.onRemoved(position + headers, count) - } - - override fun onChanged(position: Int, count: Int, payload: Any?) { - super.onChanged(position + headers, count, payload) - } - - override fun onInserted(position: Int, count: Int) { - super.onInserted(position + headers, count) - } - }, - AsyncDifferConfig.Builder(diffCallback).build() - ) - - open fun submitList(list: List?) { - // deep copy at least the top list, because otherwise adapter can go crazy - mDiffer.submitList(list?.let { CopyOnWriteArrayList(it) }) - } - - override fun getItemCount(): Int { - return mDiffer.currentList.size + footers + headers - } - - open fun onUpdateContent(holder: ViewHolderState, item: T, position: Int) = - onBindContent(holder, item, position) - - open fun onBindContent(holder: ViewHolderState, item: T, position: Int) = Unit - open fun onBindFooter(holder: ViewHolderState) = Unit - open fun onBindHeader(holder: ViewHolderState) = Unit - open fun onCreateContent(parent: ViewGroup): ViewHolderState = throw NotImplementedError() - open fun onCreateFooter(parent: ViewGroup): ViewHolderState = throw NotImplementedError() - open fun onCreateHeader(parent: ViewGroup): ViewHolderState = throw NotImplementedError() - - override fun onViewAttachedToWindow(holder: ViewHolderState) { - holder.onViewAttachedToWindow() - } - - override fun onViewDetachedFromWindow(holder: ViewHolderState) { - holder.onViewDetachedFromWindow() - } - - @Suppress("UNCHECKED_CAST") - fun save(recyclerView: RecyclerView) { - for (child in recyclerView.children) { - val holder = - recyclerView.findContainingViewHolder(child) as? ViewHolderState ?: continue - setState(holder) - } - } - - fun clear() { - stateViewModel.layoutManagerStates[id]?.clear() - } - - @Suppress("UNCHECKED_CAST") - private fun getState(holder: ViewHolderState): S? = - stateViewModel.layoutManagerStates[id]?.get(holder.absoluteAdapterPosition) as? S - - private fun setState(holder: ViewHolderState) { - if(id == 0) return - - if (!stateViewModel.layoutManagerStates.contains(id)) { - stateViewModel.layoutManagerStates[id] = HashMap() - } - stateViewModel.layoutManagerStates[id]?.let { map -> - map[holder.absoluteAdapterPosition] = holder.save() - } - } - - private val attachListener = object : View.OnAttachStateChangeListener { - override fun onViewAttachedToWindow(v: View) = Unit - override fun onViewDetachedFromWindow(v: View) { - if (v !is RecyclerView) return - save(v) - } - } - - final override fun onAttachedToRecyclerView(recyclerView: RecyclerView) { - recyclerView.addOnAttachStateChangeListener(attachListener) - super.onAttachedToRecyclerView(recyclerView) - } - - final override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { - recyclerView.removeOnAttachStateChangeListener(attachListener) - super.onDetachedFromRecyclerView(recyclerView) - } - - final override fun getItemViewType(position: Int): Int { - if (position < headers) { - return HEADER - } - if (position - headers >= mDiffer.currentList.size) { - return FOOTER - } - - return CONTENT - } - - private val stateViewModel: StateViewModel by fragment.viewModels() - - final override fun onViewRecycled(holder: ViewHolderState) { - setState(holder) - holder.onViewRecycled() - super.onViewRecycled(holder) - } - - final override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolderState { - return when (viewType) { - CONTENT -> onCreateContent(parent) - HEADER -> onCreateHeader(parent) - FOOTER -> onCreateFooter(parent) - else -> throw NotImplementedError() - } - } - - // https://medium.com/@domen.lanisnik/efficiently-updating-recyclerview-items-using-payloads-1305f65f3068 - override fun onBindViewHolder( - holder: ViewHolderState, - position: Int, - payloads: MutableList - ) { - if (payloads.isEmpty()) { - super.onBindViewHolder(holder, position, payloads) - return - } - when (getItemViewType(position)) { - CONTENT -> { - val realPosition = position - headers - val item = getItem(realPosition) - onUpdateContent(holder, item, realPosition) - } - - FOOTER -> { - onBindFooter(holder) - } - - HEADER -> { - onBindHeader(holder) - } - } - } - - final override fun onBindViewHolder(holder: ViewHolderState, position: Int) { - when (getItemViewType(position)) { - CONTENT -> { - val realPosition = position - headers - val item = getItem(realPosition) - onBindContent(holder, item, realPosition) - } - - FOOTER -> { - onBindFooter(holder) - } - - HEADER -> { - onBindHeader(holder) - } - } - - getState(holder)?.let { state -> - holder.restore(state) - } - } - - companion object { - private const val HEADER: Int = 1 - private const val FOOTER: Int = 2 - private const val CONTENT: Int = 0 - } -} - -class BaseDiffCallback( - val itemSame: (T, T) -> Boolean = { a, b -> a.hashCode() == b.hashCode() }, - val contentSame: (T, T) -> Boolean = { a, b -> a.hashCode() == b.hashCode() } -) : DiffUtil.ItemCallback() { - override fun areItemsTheSame(oldItem: T, newItem: T): Boolean = itemSame(oldItem, newItem) - override fun areContentsTheSame(oldItem: T, newItem: T): Boolean = contentSame(oldItem, newItem) - override fun getChangePayload(oldItem: T, newItem: T): Any = Any() -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt index 1eaac505..46ddce09 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/ControllerActivity.kt @@ -6,10 +6,9 @@ import android.view.Menu import android.view.View.* import android.widget.* import androidx.appcompat.app.AlertDialog -import androidx.media3.common.util.UnstableApi import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.json.JsonMapper -import com.fasterxml.jackson.module.kotlin.kotlinModule +import com.fasterxml.jackson.module.kotlin.KotlinModule import com.google.android.gms.cast.MediaQueueItem import com.google.android.gms.cast.MediaSeekOptions import com.google.android.gms.cast.MediaStatus.REPEAT_MODE_REPEAT_OFF @@ -24,13 +23,12 @@ import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.mvvm.Resource import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.mvvm.safeApiCall +import com.lagradost.cloudstream3.sortSubs import com.lagradost.cloudstream3.sortUrls -import com.lagradost.cloudstream3.ui.player.LoadType import com.lagradost.cloudstream3.ui.player.RepoLinkGenerator import com.lagradost.cloudstream3.ui.player.SubtitleData import com.lagradost.cloudstream3.ui.result.ResultEpisode import com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment -import com.lagradost.cloudstream3.utils.AppContextUtils.sortSubs import com.lagradost.cloudstream3.utils.AppUtils.toJson import com.lagradost.cloudstream3.utils.CastHelper.awaitLinks import com.lagradost.cloudstream3.utils.CastHelper.getMediaInfo @@ -99,7 +97,7 @@ data class MetadataHolder( class SelectSourceController(val view: ImageView, val activity: ControllerActivity) : UIController() { - private val mapper: JsonMapper = JsonMapper.builder().addModule(kotlinModule()) + private val mapper: JsonMapper = JsonMapper.builder().addModule(KotlinModule()) .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build() init { @@ -264,7 +262,6 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi var isLoadingMore = false - override fun onMediaStatusUpdated() { super.onMediaStatusUpdated() val meta = getCurrentMetaData() @@ -297,8 +294,7 @@ class SelectSourceController(val view: ImageView, val activity: ControllerActivi val generator = RepoLinkGenerator(listOf(epData)) val isSuccessful = safeApiCall { - generator.generateLinks( - clearCache = false, type = LoadType.Chromecast, + generator.generateLinks(clearCache = false, isCasting = true, callback = { it.first?.let { link -> currentLinks.add(link) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt index 4879d2e0..c7041776 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/EasterEggMonke.kt @@ -51,7 +51,7 @@ class EasterEggMonke : AppCompatActivity() { FrameLayout.LayoutParams.WRAP_CONTENT) binding.frame.addView(newStar) - newStar.scaleX += Math.random().toFloat() * 1.5f + newStar.scaleX = Math.random().toFloat() * 1.5f + newStar.scaleX newStar.scaleY = newStar.scaleX starW *= newStar.scaleX starH *= newStar.scaleY diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/NonFinalAdapterListUpdateCallback.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/NonFinalAdapterListUpdateCallback.kt deleted file mode 100644 index 12a5ae2a..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/NonFinalAdapterListUpdateCallback.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.lagradost.cloudstream3.ui - -import android.annotation.SuppressLint -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.ListUpdateCallback -import androidx.recyclerview.widget.RecyclerView - - -/** - * ListUpdateCallback that dispatches update events to the given adapter. - * - * @see DiffUtil.DiffResult.dispatchUpdatesTo - */ -open class NonFinalAdapterListUpdateCallback -/** - * Creates an AdapterListUpdateCallback that will dispatch update events to the given adapter. - * - * @param mAdapter The Adapter to send updates to. - */(private var mAdapter: RecyclerView.Adapter<*>) : - ListUpdateCallback { - - override fun onInserted(position: Int, count: Int) { - mAdapter.notifyItemRangeInserted(position, count) - } - - override fun onRemoved(position: Int, count: Int) { - mAdapter.notifyItemRangeRemoved(position, count) - } - - override fun onMoved(fromPosition: Int, toPosition: Int) { - mAdapter.notifyItemMoved(fromPosition, toPosition) - } - - @SuppressLint("UnknownNullness") // b/240775049: Cannot annotate properly - override fun onChanged(position: Int, count: Int, payload: Any?) { - mAdapter.notifyItemRangeChanged(position, count, payload) - } -} - diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt index b778ba5a..eb4eb666 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WatchType.kt @@ -13,29 +13,6 @@ enum class WatchType(val internalId: Int, @StringRes val stringRes: Int, @Drawab NONE(5, R.string.type_none, R.drawable.ic_baseline_add_24); companion object { - fun fromInternalId(id: Int?) = entries.find { value -> value.internalId == id } ?: NONE + fun fromInternalId(id: Int?) = values().find { value -> value.internalId == id } ?: NONE } -} - -enum class SyncWatchType(val internalId: Int, @StringRes val stringRes: Int, @DrawableRes val iconRes: Int) { - /* - -1 -> None - 0 -> Watching - 1 -> Completed - 2 -> OnHold - 3 -> Dropped - 4 -> PlanToWatch - 5 -> ReWatching - */ - NONE(-1, R.string.type_none, R.drawable.ic_baseline_add_24), - WATCHING(0, R.string.type_watching, R.drawable.ic_baseline_bookmark_24), - COMPLETED(1, R.string.type_completed, R.drawable.ic_baseline_bookmark_24), - ONHOLD(2, R.string.type_on_hold, R.drawable.ic_baseline_bookmark_24), - DROPPED(3, R.string.type_dropped, R.drawable.ic_baseline_bookmark_24), - PLANTOWATCH(4, R.string.type_plan_to_watch, R.drawable.ic_baseline_bookmark_24), - REWATCHING(5, R.string.type_re_watching, R.drawable.ic_baseline_bookmark_24); - - companion object { - fun fromInternalId(id: Int?) = entries.find { value -> value.internalId == id } ?: NONE - } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt index 5e2b97e5..9ed58e2c 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WebviewFragment.kt @@ -8,16 +8,14 @@ import android.webkit.JavascriptInterface import android.webkit.WebResourceRequest import android.webkit.WebView import android.webkit.WebViewClient -import androidx.annotation.OptIn import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity -import androidx.media3.common.util.UnstableApi import androidx.navigation.fragment.findNavController import com.lagradost.cloudstream3.MainActivity import com.lagradost.cloudstream3.USER_AGENT import com.lagradost.cloudstream3.databinding.FragmentWebviewBinding import com.lagradost.cloudstream3.network.WebViewResolver -import com.lagradost.cloudstream3.utils.AppContextUtils.loadRepository +import com.lagradost.cloudstream3.utils.AppUtils.loadRepository class WebviewFragment : Fragment() { @@ -31,7 +29,6 @@ class WebviewFragment : Fragment() { } binding?.webView?.webViewClient = object : WebViewClient() { - @OptIn(UnstableApi::class) override fun shouldOverrideUrlLoading( view: WebView?, request: WebResourceRequest? diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/WhoIsWatchingAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/WhoIsWatchingAdapter.kt new file mode 100644 index 00000000..6b3090a9 --- /dev/null +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/WhoIsWatchingAdapter.kt @@ -0,0 +1,106 @@ +package com.lagradost.cloudstream3.ui + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.core.view.isVisible +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.ListAdapter +import androidx.recyclerview.widget.RecyclerView +import androidx.viewbinding.ViewBinding +import com.lagradost.cloudstream3.databinding.WhoIsWatchingAccountAddBinding +import com.lagradost.cloudstream3.databinding.WhoIsWatchingAccountBinding +import com.lagradost.cloudstream3.ui.result.setImage +import com.lagradost.cloudstream3.utils.DataStoreHelper + +class WhoIsWatchingAdapter( + private val selectCallBack: (DataStoreHelper.Account) -> Unit = { }, + private val editCallBack: (DataStoreHelper.Account) -> Unit = { }, + private val addAccountCallback: () -> Unit = {} +) : + ListAdapter(DiffCallback()) { + + companion object { + const val FOOTER = 1 + const val NORMAL = 0 + } + + override fun getItemCount(): Int { + return currentList.size + 1 + } + + override fun getItemViewType(position: Int): Int = when (position) { + currentList.size -> FOOTER + else -> NORMAL + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): WhoIsWatchingHolder = + WhoIsWatchingHolder( + binding = when (viewType) { + NORMAL -> WhoIsWatchingAccountBinding.inflate( + LayoutInflater.from(parent.context), + parent, + false + ) + + FOOTER -> WhoIsWatchingAccountAddBinding.inflate( + LayoutInflater.from(parent.context), + parent, + false + ) + + else -> throw NotImplementedError() + }, + selectCallBack = selectCallBack, + addAccountCallback = addAccountCallback, + editCallBack = editCallBack, + ) + + + override fun onBindViewHolder(holder: WhoIsWatchingHolder, position: Int) = + holder.bind(currentList.getOrNull(position)) + + class WhoIsWatchingHolder( + val binding: ViewBinding, + val selectCallBack: (DataStoreHelper.Account) -> Unit, + val addAccountCallback: () -> Unit, + val editCallBack: (DataStoreHelper.Account) -> Unit + ) : + RecyclerView.ViewHolder(binding.root) { + + fun bind(card: DataStoreHelper.Account?) { + when (binding) { + is WhoIsWatchingAccountBinding -> binding.apply { + if(card == null) return@apply + outline.isVisible = card.keyIndex == DataStoreHelper.selectedKeyIndex + profileText.text = card.name + profileImageBackground.setImage(card.image) + root.setOnClickListener { + selectCallBack(card) + } + root.setOnLongClickListener { + editCallBack(card) + return@setOnLongClickListener true + } + } + + is WhoIsWatchingAccountAddBinding -> binding.apply { + root.setOnClickListener { + addAccountCallback() + } + } + } + } + } + + class DiffCallback : DiffUtil.ItemCallback() { + override fun areItemsTheSame( + oldItem: DataStoreHelper.Account, + newItem: DataStoreHelper.Account + ): Boolean = oldItem.keyIndex == newItem.keyIndex + + override fun areContentsTheSame( + oldItem: DataStoreHelper.Account, + newItem: DataStoreHelper.Account + ): Boolean = oldItem == newItem + } +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt deleted file mode 100644 index de0b5c05..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountAdapter.kt +++ /dev/null @@ -1,200 +0,0 @@ -package com.lagradost.cloudstream3.ui.account - -import android.view.LayoutInflater -import android.view.ViewGroup -import androidx.core.content.ContextCompat -import androidx.core.view.isVisible -import androidx.recyclerview.widget.RecyclerView -import androidx.viewbinding.ViewBinding -import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.databinding.AccountListItemAddBinding -import com.lagradost.cloudstream3.databinding.AccountListItemBinding -import com.lagradost.cloudstream3.databinding.AccountListItemEditBinding -import com.lagradost.cloudstream3.ui.account.AccountHelper.showAccountEditDialog -import com.lagradost.cloudstream3.ui.result.setImage -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.DataStoreHelper -import com.lagradost.cloudstream3.utils.UIHelper.setImage - -class AccountAdapter( - private val accounts: List, - private val accountSelectCallback: (DataStoreHelper.Account) -> Unit, - private val accountCreateCallback: (DataStoreHelper.Account) -> Unit, - private val accountEditCallback: (DataStoreHelper.Account) -> Unit, - private val accountDeleteCallback: (DataStoreHelper.Account) -> Unit -) : RecyclerView.Adapter() { - - companion object { - const val VIEW_TYPE_SELECT_ACCOUNT = 0 - const val VIEW_TYPE_ADD_ACCOUNT = 1 - const val VIEW_TYPE_EDIT_ACCOUNT = 2 - } - - inner class AccountViewHolder(private val binding: ViewBinding) : - RecyclerView.ViewHolder(binding.root) { - - fun bind(account: DataStoreHelper.Account?) { - when (binding) { - is AccountListItemBinding -> binding.apply { - if (account == null) return@apply - - val isTv = isLayout(TV or EMULATOR) || !root.isInTouchMode - - val isLastUsedAccount = account.keyIndex == DataStoreHelper.selectedKeyIndex - - accountName.text = account.name - accountImage.setImage(account.image) - lockIcon.isVisible = account.lockPin != null - outline.isVisible = !isTv && isLastUsedAccount - - if (isTv) { - // For emulator but this is fine on TV also - root.isFocusableInTouchMode = true - if (isLastUsedAccount) { - root.requestFocus() - } - - root.foreground = ContextCompat.getDrawable( - root.context, - R.drawable.outline_drawable - ) - } else { - root.setOnLongClickListener { - showAccountEditDialog( - context = root.context, - account = account, - isNewAccount = false, - accountEditCallback = { account -> accountEditCallback.invoke(account) }, - accountDeleteCallback = { account -> accountDeleteCallback.invoke(account) } - ) - - true - } - } - - root.setOnClickListener { - accountSelectCallback.invoke(account) - } - } - - is AccountListItemEditBinding -> binding.apply { - if (account == null) return@apply - - val isTv = isLayout(TV or EMULATOR) || !root.isInTouchMode - - val isLastUsedAccount = account.keyIndex == DataStoreHelper.selectedKeyIndex - - accountName.text = account.name - accountImage.setImage( - account.image, - fadeIn = false, - radius = 10 - ) - lockIcon.isVisible = account.lockPin != null - outline.isVisible = !isTv && isLastUsedAccount - - if (isTv) { - // For emulator but this is fine on TV also - root.isFocusableInTouchMode = true - if (isLastUsedAccount) { - root.requestFocus() - } - - root.foreground = ContextCompat.getDrawable( - root.context, - R.drawable.outline_drawable - ) - } - - root.setOnClickListener { - showAccountEditDialog( - context = root.context, - account = account, - isNewAccount = false, - accountEditCallback = { account -> accountEditCallback.invoke(account) }, - accountDeleteCallback = { account -> accountDeleteCallback.invoke(account) } - ) - } - } - - is AccountListItemAddBinding -> binding.apply { - root.setOnClickListener { - val remainingImages = - DataStoreHelper.profileImages.toSet() - accounts.filter { it.customImage == null } - .mapNotNull { DataStoreHelper.profileImages.getOrNull(it.defaultImageIndex) }.toSet() - - val image = - DataStoreHelper.profileImages.indexOf(remainingImages.randomOrNull() ?: DataStoreHelper.profileImages.random()) - val keyIndex = (accounts.maxOfOrNull { it.keyIndex } ?: 0) + 1 - - val accountName = root.context.getString(R.string.account) - - showAccountEditDialog( - root.context, - DataStoreHelper.Account( - keyIndex = keyIndex, - name = "$accountName $keyIndex", - customImage = null, - defaultImageIndex = image - ), - isNewAccount = true, - accountEditCallback = { account -> accountCreateCallback.invoke(account) }, - accountDeleteCallback = {} - ) - } - } - } - } - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AccountViewHolder = - AccountViewHolder( - binding = when (viewType) { - VIEW_TYPE_SELECT_ACCOUNT -> { - AccountListItemBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - } - VIEW_TYPE_ADD_ACCOUNT -> { - AccountListItemAddBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - } - VIEW_TYPE_EDIT_ACCOUNT -> { - AccountListItemEditBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false - ) - } - else -> throw IllegalArgumentException("Invalid view type") - } - ) - - override fun onBindViewHolder(holder: AccountViewHolder, position: Int) { - holder.bind(accounts.getOrNull(position)) - } - - var viewType = 0 - - override fun getItemViewType(position: Int): Int { - if (viewType != 0 && position != accounts.count()) { - return viewType - } - - return when (position) { - accounts.count() -> VIEW_TYPE_ADD_ACCOUNT - else -> VIEW_TYPE_SELECT_ACCOUNT - } - } - - override fun getItemCount(): Int { - return accounts.count() + 1 - } -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt deleted file mode 100644 index d2aca862..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountHelper.kt +++ /dev/null @@ -1,356 +0,0 @@ -package com.lagradost.cloudstream3.ui.account - -import android.app.Activity -import android.content.Context -import android.content.DialogInterface -import android.content.Intent -import android.text.Editable -import android.view.LayoutInflater -import android.view.inputmethod.EditorInfo -import android.widget.TextView -import androidx.annotation.StringRes -import androidx.appcompat.app.AlertDialog -import androidx.core.view.isGone -import androidx.core.view.isVisible -import androidx.core.widget.doOnTextChanged -import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import com.google.android.material.bottomsheet.BottomSheetDialog -import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity -import com.lagradost.cloudstream3.MainActivity -import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.databinding.AccountEditDialogBinding -import com.lagradost.cloudstream3.databinding.AccountSelectLinearBinding -import com.lagradost.cloudstream3.databinding.LockPinDialogBinding -import com.lagradost.cloudstream3.mvvm.logError -import com.lagradost.cloudstream3.mvvm.observe -import com.lagradost.cloudstream3.ui.result.setImage -import com.lagradost.cloudstream3.ui.result.setLinearListLayout -import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus -import com.lagradost.cloudstream3.utils.DataStoreHelper -import com.lagradost.cloudstream3.utils.DataStoreHelper.getDefaultAccount -import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe -import com.lagradost.cloudstream3.utils.UIHelper.showInputMethod - -object AccountHelper { - fun showAccountEditDialog( - context: Context, - account: DataStoreHelper.Account, - isNewAccount: Boolean, - accountEditCallback: (DataStoreHelper.Account) -> Unit, - accountDeleteCallback: (DataStoreHelper.Account) -> Unit - ) { - val binding = AccountEditDialogBinding.inflate(LayoutInflater.from(context), null, false) - val builder = AlertDialog.Builder(context, R.style.AlertDialogCustom) - .setView(binding.root) - - var currentEditAccount = account - val dialog = builder.show() - - if (!isNewAccount) binding.title.setText(R.string.edit_account) - - // Set up the dialog content - binding.accountName.text = Editable.Factory.getInstance()?.newEditable(account.name) - binding.accountName.doOnTextChanged { text, _, _, _ -> - currentEditAccount = currentEditAccount.copy(name = text?.toString() ?: "") - } - - binding.deleteBtt.isGone = isNewAccount - binding.deleteBtt.setOnClickListener { - val dialogClickListener = DialogInterface.OnClickListener { _, which -> - when (which) { - DialogInterface.BUTTON_POSITIVE -> { - accountDeleteCallback.invoke(account) - dialog?.dismissSafe() - } - - DialogInterface.BUTTON_NEGATIVE -> { - dialog?.dismissSafe() - } - } - } - - try { - AlertDialog.Builder(context).setTitle(R.string.delete).setMessage( - context.getString(R.string.delete_message).format( - currentEditAccount.name - ) - ) - .setPositiveButton(R.string.delete, dialogClickListener) - .setNegativeButton(R.string.cancel, dialogClickListener) - .show().setDefaultFocus() - } catch (t: Throwable) { - logError(t) - } - } - - binding.cancelBtt.setOnClickListener { - dialog?.dismissSafe() - } - - // Handle the profile picture and its interactions - binding.accountImage.setImage(account.image) - binding.accountImage.setOnClickListener { - // Roll the image forwards once - currentEditAccount = - currentEditAccount.copy(defaultImageIndex = (currentEditAccount.defaultImageIndex + 1) % DataStoreHelper.profileImages.size) - binding.accountImage.setImage(currentEditAccount.image) - } - - // Handle applying changes - binding.applyBtt.setOnClickListener { - if (currentEditAccount.lockPin != null) { - // Ask for the current PIN - showPinInputDialog(context, currentEditAccount.lockPin, false) { pin -> - if (pin == null) return@showPinInputDialog - // PIN is correct, proceed to update the account - accountEditCallback.invoke(currentEditAccount) - dialog.dismissSafe() - } - } else { - // No lock PIN set, proceed to update the account - accountEditCallback.invoke(currentEditAccount) - dialog.dismissSafe() - } - } - - // Handle setting or changing the PIN - if (currentEditAccount.keyIndex == getDefaultAccount(context).keyIndex) { - binding.lockProfileCheckbox.isVisible = false - if (currentEditAccount.lockPin != null) { - currentEditAccount = currentEditAccount.copy(lockPin = null) - } - } - - var canSetPin = true - - binding.lockProfileCheckbox.isChecked = currentEditAccount.lockPin != null - - binding.lockProfileCheckbox.setOnCheckedChangeListener { _, isChecked -> - if (isChecked) { - if (canSetPin) { - showPinInputDialog(context, null, true) { pin -> - if (pin == null) { - binding.lockProfileCheckbox.isChecked = false - return@showPinInputDialog - } - - currentEditAccount = currentEditAccount.copy(lockPin = pin) - } - } - } else { - if (currentEditAccount.lockPin != null) { - // Ask for the current PIN - showPinInputDialog(context, currentEditAccount.lockPin, true) { pin -> - if (pin == null || pin != currentEditAccount.lockPin) { - canSetPin = false - binding.lockProfileCheckbox.isChecked = true - } else { - currentEditAccount = currentEditAccount.copy(lockPin = null) - } - } - } - } - } - - canSetPin = true - } - - fun showPinInputDialog( - context: Context, - currentPin: String?, - editAccount: Boolean, - forStartup: Boolean = false, - errorText: String? = null, - callback: (String?) -> Unit - ) { - fun TextView.visibleWithText(@StringRes textRes: Int) { - isVisible = true - setText(textRes) - } - - fun TextView.visibleWithText(text: String?) { - isVisible = true - setText(text) - } - - val binding = LockPinDialogBinding.inflate(LayoutInflater.from(context)) - - val isPinSet = currentPin != null - val isNewPin = editAccount && !isPinSet - val isEditPin = editAccount && isPinSet - - val titleRes = if (isEditPin) R.string.enter_current_pin else R.string.enter_pin - - var isPinValid = false - - val builder = AlertDialog.Builder(context, R.style.AlertDialogCustom) - .setView(binding.root) - .setTitle(titleRes) - .setNegativeButton(R.string.cancel) { _, _ -> - callback.invoke(null) - } - .setOnCancelListener { - callback.invoke(null) - } - .setOnDismissListener { - if (!isPinValid) { - callback.invoke(null) - } - } - - if (forStartup) { - val currentAccount = DataStoreHelper.accounts.firstOrNull { - it.keyIndex == DataStoreHelper.selectedKeyIndex - } - - builder.setTitle(context.getString(R.string.enter_pin_with_name, currentAccount?.name)) - builder.setOnDismissListener { - if (!isPinValid) { - context.getActivity()?.finish() - } - } - // So that if they don't know the PIN for the current account, - // they don't get completely locked out - builder.setNeutralButton(R.string.use_default_account) { _, _ -> - val activity = context.getActivity() - if (activity is AccountSelectActivity) { - isPinValid = true - activity.viewModel.handleAccountSelect(getDefaultAccount(context), activity) - } - } - } - - if (isNewPin) { - if (errorText != null) binding.pinEditTextError.visibleWithText(errorText) - builder.setPositiveButton(R.string.setup_done) { _, _ -> - if (!isPinValid) { - // If the done button is pressed and there is an error, - // ask again, and mention the error that caused this. - showPinInputDialog( - context = binding.root.context, - currentPin = null, - editAccount = true, - errorText = binding.pinEditTextError.text.toString(), - callback = callback - ) - } else { - val enteredPin = binding.pinEditText.text.toString() - callback.invoke(enteredPin) - } - } - } - - val dialog = builder.create() - - binding.pinEditText.doOnTextChanged { text, _, _, _ -> - val enteredPin = text.toString() - val isEnteredPinValid = enteredPin.length == 4 - - if (isEnteredPinValid) { - if (isPinSet) { - if (enteredPin != currentPin) { - binding.pinEditTextError.visibleWithText(R.string.pin_error_incorrect) - binding.pinEditText.text = null - isPinValid = false - } else { - binding.pinEditTextError.isVisible = false - isPinValid = true - - callback.invoke(enteredPin) - dialog.dismissSafe() - } - } else { - binding.pinEditTextError.isVisible = false - isPinValid = true - } - } else if (isNewPin) { - binding.pinEditTextError.visibleWithText(R.string.pin_error_length) - isPinValid = false - } - } - - // Detect IME_ACTION_DONE - binding.pinEditText.setOnEditorActionListener { _, actionId, _ -> - if (actionId == EditorInfo.IME_ACTION_DONE && isPinValid) { - val enteredPin = binding.pinEditText.text.toString() - callback.invoke(enteredPin) - dialog.dismissSafe() - } - true - } - - // We don't want to accidentally have the dialog dismiss when clicking outside of it. - // That is what the cancel button is for. - dialog.setCanceledOnTouchOutside(false) - - dialog.show() - - // Auto focus on PIN input and show keyboard - binding.pinEditText.requestFocus() - binding.pinEditText.postDelayed({ - showInputMethod(binding.pinEditText) - }, 200) - } - - fun Activity?.showAccountSelectLinear() { - val activity = this as? MainActivity ?: return - val viewModel = ViewModelProvider(activity)[AccountViewModel::class.java] - - val binding: AccountSelectLinearBinding = AccountSelectLinearBinding.inflate( - LayoutInflater.from(activity) - ) - - val builder = BottomSheetDialog(activity) - builder.setContentView(binding.root) - builder.show() - - binding.manageAccountsButton.setOnClickListener { - val accountSelectIntent = Intent(activity, AccountSelectActivity::class.java) - accountSelectIntent.putExtra("isEditingFromMainActivity", true) - activity.startActivity(accountSelectIntent) - builder.dismissSafe() - } - - val recyclerView: RecyclerView = binding.accountRecyclerView - - val itemSize = recyclerView.resources.getDimensionPixelSize( - R.dimen.account_select_linear_item_size - ) - - recyclerView.addItemDecoration(AccountSelectLinearItemDecoration(itemSize)) - - recyclerView.setLinearListLayout(isHorizontal = true) - - val currentAccount = DataStoreHelper.accounts.firstOrNull { - it.keyIndex == DataStoreHelper.selectedKeyIndex - } ?: getDefaultAccount(activity) - - // We want to make sure the accounts are up-to-date - viewModel.handleAccountSelect( - currentAccount, - activity, - reloadForActivity = true - ) - - activity.observe(viewModel.accounts) { liveAccounts -> - recyclerView.adapter = AccountAdapter( - liveAccounts, - accountSelectCallback = { account -> - viewModel.handleAccountSelect(account, activity) - builder.dismissSafe() - }, - accountCreateCallback = { viewModel.handleAccountUpdate(it, activity) }, - accountEditCallback = { viewModel.handleAccountUpdate(it, activity) }, - accountDeleteCallback = { viewModel.handleAccountDelete(it, activity) } - ) - - activity.observe(viewModel.selectedKeyIndex) { selectedKeyIndex -> - // Scroll to current account (which is focused by default) - val layoutManager = recyclerView.layoutManager as LinearLayoutManager - layoutManager.scrollToPositionWithOffset(selectedKeyIndex, 0) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt deleted file mode 100644 index 0da69f9c..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt +++ /dev/null @@ -1,199 +0,0 @@ -package com.lagradost.cloudstream3.ui.account - -import android.annotation.SuppressLint -import android.content.Intent -import android.os.Bundle -import android.util.Log -import androidx.appcompat.app.AppCompatActivity -import androidx.lifecycle.ViewModelProvider -import androidx.preference.PreferenceManager -import androidx.recyclerview.widget.GridLayoutManager -import com.lagradost.cloudstream3.CommonActivity -import com.lagradost.cloudstream3.CommonActivity.loadThemes -import com.lagradost.cloudstream3.CommonActivity.showToast -import com.lagradost.cloudstream3.MainActivity -import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.databinding.ActivityAccountSelectBinding -import com.lagradost.cloudstream3.mvvm.observe -import com.lagradost.cloudstream3.ui.AutofitRecyclerView -import com.lagradost.cloudstream3.ui.account.AccountAdapter.Companion.VIEW_TYPE_EDIT_ACCOUNT -import com.lagradost.cloudstream3.ui.account.AccountAdapter.Companion.VIEW_TYPE_SELECT_ACCOUNT -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.PHONE -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.BiometricAuthenticator -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.BiometricCallback -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.biometricPrompt -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.deviceHasPasswordPinLock -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.isAuthEnabled -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.promptInfo -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.startBiometricAuthentication -import com.lagradost.cloudstream3.utils.DataStoreHelper.accounts -import com.lagradost.cloudstream3.utils.DataStoreHelper.selectedKeyIndex -import com.lagradost.cloudstream3.utils.DataStoreHelper.setAccount -import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute - -class AccountSelectActivity : AppCompatActivity(), BiometricCallback { - - lateinit var viewModel: AccountViewModel - - @SuppressLint("NotifyDataSetChanged") - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - loadThemes(this) - - window.navigationBarColor = colorFromAttribute(R.attr.primaryBlackBackground) - - // Are we editing and coming from MainActivity? - val isEditingFromMainActivity = intent.getBooleanExtra( - "isEditingFromMainActivity", - false - ) - - val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) - val skipStartup = settingsManager.getBoolean(getString(R.string.skip_startup_account_select_key), false - ) || accounts.count() <= 1 - - viewModel = ViewModelProvider(this)[AccountViewModel::class.java] - - fun askBiometricAuth() { - - if (isLayout(PHONE) && isAuthEnabled(this)) { - if (deviceHasPasswordPinLock(this)) { - startBiometricAuthentication( - this, - R.string.biometric_authentication_title, - false - ) - - promptInfo?.let { prompt -> - biometricPrompt?.authenticate(prompt) - } - } - } - } - - observe(viewModel.isAllowedLogin) { isAllowedLogin -> - if (isAllowedLogin) { - // We are allowed to continue to MainActivity - navigateToMainActivity() - } - } - - // Don't show account selection if there is only - // one account that exists - if (!isEditingFromMainActivity && skipStartup) { - val currentAccount = accounts.firstOrNull { it.keyIndex == selectedKeyIndex } - if (currentAccount?.lockPin != null) { - CommonActivity.init(this) - viewModel.handleAccountSelect(currentAccount, this, true) - } else { - if (accounts.count() > 1) { - showToast(this, getString( - R.string.logged_account, - currentAccount?.name - )) - } - - navigateToMainActivity() - } - - return - } - - CommonActivity.init(this) - - val binding = ActivityAccountSelectBinding.inflate(layoutInflater) - setContentView(binding.root) - - val recyclerView: AutofitRecyclerView = binding.accountRecyclerView - - observe(viewModel.accounts) { liveAccounts -> - val adapter = AccountAdapter( - liveAccounts, - // Handle the selected account - accountSelectCallback = { - viewModel.handleAccountSelect(it, this) - }, - accountCreateCallback = { viewModel.handleAccountUpdate(it, this) }, - accountEditCallback = { - viewModel.handleAccountUpdate(it, this) - - // We came from MainActivity, return there - // and switch to the edited account - if (isEditingFromMainActivity) { - setAccount(it) - navigateToMainActivity() - } - }, - accountDeleteCallback = { viewModel.handleAccountDelete(it,this) } - ) - - recyclerView.adapter = adapter - - if (isLayout(TV or EMULATOR)) { - binding.editAccountButton.setBackgroundResource( - R.drawable.player_button_tv_attr_no_bg - ) - } - - observe(viewModel.selectedKeyIndex) { selectedKeyIndex -> - // Scroll to current account (which is focused by default) - val layoutManager = recyclerView.layoutManager as GridLayoutManager - layoutManager.scrollToPositionWithOffset(selectedKeyIndex, 0) - } - - observe(viewModel.isEditing) { isEditing -> - if (isEditing) { - binding.editAccountButton.setImageResource(R.drawable.ic_baseline_close_24) - binding.title.setText(R.string.manage_accounts) - adapter.viewType = VIEW_TYPE_EDIT_ACCOUNT - } else { - binding.editAccountButton.setImageResource(R.drawable.ic_baseline_edit_24) - binding.title.setText(R.string.select_an_account) - adapter.viewType = VIEW_TYPE_SELECT_ACCOUNT - } - - adapter.notifyDataSetChanged() - } - - if (isEditingFromMainActivity) { - viewModel.setIsEditing(true) - } - - binding.editAccountButton.setOnClickListener { - // We came from MainActivity, return there - // and resume its state - if (isEditingFromMainActivity) { - navigateToMainActivity() - return@setOnClickListener - } - - viewModel.toggleIsEditing() - } - - if (isLayout(TV or EMULATOR)) { - recyclerView.spanCount = if (liveAccounts.count() + 1 <= 6) { - liveAccounts.count() + 1 - } else 6 - } - } - - askBiometricAuth() - } - - private fun navigateToMainActivity() { - val mainIntent = Intent(this, MainActivity::class.java) - startActivity(mainIntent) - finish() // Finish the account selection activity - } - - override fun onAuthenticationSuccess() { - Log.i(BiometricAuthenticator.TAG,"Authentication successful in AccountSelectActivity") - } - - override fun onAuthenticationError() { - finish() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectLinearItemDecoration.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectLinearItemDecoration.kt deleted file mode 100644 index eb907b34..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectLinearItemDecoration.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.lagradost.cloudstream3.ui.account - -import android.graphics.Rect -import android.view.View -import androidx.recyclerview.widget.RecyclerView - -class AccountSelectLinearItemDecoration(private val size: Int) : RecyclerView.ItemDecoration() { - override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { - val layoutParams = view.layoutParams as RecyclerView.LayoutParams - layoutParams.width = size - layoutParams.height = size - view.layoutParams = layoutParams - } -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountViewModel.kt deleted file mode 100644 index 14559607..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountViewModel.kt +++ /dev/null @@ -1,123 +0,0 @@ -package com.lagradost.cloudstream3.ui.account - -import android.content.Context -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.ViewModel -import com.lagradost.cloudstream3.AcraApplication.Companion.context -import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys -import com.lagradost.cloudstream3.ui.account.AccountHelper.showPinInputDialog -import com.lagradost.cloudstream3.utils.DataStoreHelper -import com.lagradost.cloudstream3.utils.DataStoreHelper.getAccounts -import com.lagradost.cloudstream3.utils.DataStoreHelper.getDefaultAccount -import com.lagradost.cloudstream3.utils.DataStoreHelper.setAccount - -class AccountViewModel : ViewModel() { - private fun getAllAccounts(): List { - return context?.let { getAccounts(it) } ?: DataStoreHelper.accounts.toList() - } - - private val _accounts: MutableLiveData> = MutableLiveData(getAllAccounts()) - val accounts: LiveData> = _accounts - - private val _isEditing = MutableLiveData(false) - val isEditing: LiveData = _isEditing - - private val _isAllowedLogin = MutableLiveData(false) - val isAllowedLogin: LiveData = _isAllowedLogin - - private val _selectedKeyIndex = MutableLiveData( - getAllAccounts().indexOfFirst { - it.keyIndex == DataStoreHelper.selectedKeyIndex - } - ) - val selectedKeyIndex: LiveData = _selectedKeyIndex - - fun setIsEditing(value: Boolean) { - _isEditing.postValue(value) - } - - fun toggleIsEditing() { - _isEditing.postValue(!(_isEditing.value ?: false)) - } - - fun handleAccountUpdate( - account: DataStoreHelper.Account, - context: Context - ) { - val currentAccounts = getAccounts(context).toMutableList() - - val overrideIndex = currentAccounts.indexOfFirst { it.keyIndex == account.keyIndex } - - if (overrideIndex != -1) { - currentAccounts[overrideIndex] = account - } else currentAccounts.add(account) - - val currentHomePage = DataStoreHelper.currentHomePage - - setAccount(account) - - DataStoreHelper.currentHomePage = currentHomePage - DataStoreHelper.accounts = currentAccounts.toTypedArray() - - _accounts.postValue(getAccounts(context)) - _selectedKeyIndex.postValue(getAccounts(context).indexOf(account)) - } - - fun handleAccountDelete( - account: DataStoreHelper.Account, - context: Context - ) { - removeKeys(account.keyIndex.toString()) - - val currentAccounts = getAccounts(context).toMutableList() - - currentAccounts.removeIf { it.keyIndex == account.keyIndex } - - DataStoreHelper.accounts = currentAccounts.toTypedArray() - - if (account.keyIndex == DataStoreHelper.selectedKeyIndex) { - setAccount(getDefaultAccount(context)) - } - - _accounts.postValue(getAccounts(context)) - _selectedKeyIndex.postValue(getAllAccounts().indexOfFirst { - it.keyIndex == DataStoreHelper.selectedKeyIndex - }) - } - - fun handleAccountSelect( - account: DataStoreHelper.Account, - context: Context, - forStartup: Boolean = false, - reloadForActivity: Boolean = false - ) { - if (reloadForActivity) { - _accounts.postValue(getAccounts(context)) - _selectedKeyIndex.postValue(getAccounts(context).indexOf(account)) - return - } - - // Check if the selected account has a lock PIN set - if (account.lockPin != null) { - // The selected account has a PIN set, prompt the user to enter the PIN - showPinInputDialog( - context, - account.lockPin, - false, - forStartup - ) { pin -> - if (pin == null) return@showPinInputDialog - // Pin is correct, proceed - _isAllowedLogin.postValue(true) - _selectedKeyIndex.postValue(getAccounts(context).indexOf(account)) - setAccount(account) - } - } else { - // No PIN set for the selected account, proceed - _isAllowedLogin.postValue(true) - _selectedKeyIndex.postValue(getAccounts(context).indexOf(account)) - setAccount(account) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt deleted file mode 100644 index d211cb87..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadAdapter.kt +++ /dev/null @@ -1,414 +0,0 @@ -package com.lagradost.cloudstream3.ui.download - -import android.text.format.Formatter.formatShortFileSize -import android.view.LayoutInflater -import android.view.ViewGroup -import android.widget.CheckBox -import androidx.core.content.ContextCompat -import androidx.core.view.isVisible -import androidx.recyclerview.widget.DiffUtil -import androidx.recyclerview.widget.ListAdapter -import androidx.recyclerview.widget.RecyclerView -import androidx.viewbinding.ViewBinding -import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.databinding.DownloadChildEpisodeBinding -import com.lagradost.cloudstream3.databinding.DownloadHeaderEpisodeBinding -import com.lagradost.cloudstream3.mvvm.logError -import com.lagradost.cloudstream3.ui.download.button.DownloadStatusTell -import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull -import com.lagradost.cloudstream3.utils.DataStoreHelper.fixVisual -import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos -import com.lagradost.cloudstream3.utils.UIHelper.setImage -import com.lagradost.cloudstream3.utils.VideoDownloadHelper - -const val DOWNLOAD_ACTION_PLAY_FILE = 0 -const val DOWNLOAD_ACTION_DELETE_FILE = 1 -const val DOWNLOAD_ACTION_RESUME_DOWNLOAD = 2 -const val DOWNLOAD_ACTION_PAUSE_DOWNLOAD = 3 -const val DOWNLOAD_ACTION_DOWNLOAD = 4 -const val DOWNLOAD_ACTION_LONG_CLICK = 5 - -const val DOWNLOAD_ACTION_GO_TO_CHILD = 0 -const val DOWNLOAD_ACTION_LOAD_RESULT = 1 - -sealed class VisualDownloadCached { - abstract val currentBytes: Long - abstract val totalBytes: Long - abstract val data: VideoDownloadHelper.DownloadCached - abstract var isSelected: Boolean - - data class Child( - override val currentBytes: Long, - override val totalBytes: Long, - override val data: VideoDownloadHelper.DownloadEpisodeCached, - override var isSelected: Boolean, - ) : VisualDownloadCached() - - data class Header( - override val currentBytes: Long, - override val totalBytes: Long, - override val data: VideoDownloadHelper.DownloadHeaderCached, - override var isSelected: Boolean, - val child: VideoDownloadHelper.DownloadEpisodeCached?, - val currentOngoingDownloads: Int, - val totalDownloads: Int, - ) : VisualDownloadCached() -} - -data class DownloadClickEvent( - val action: Int, - val data: VideoDownloadHelper.DownloadEpisodeCached -) - -data class DownloadHeaderClickEvent( - val action: Int, - val data: VideoDownloadHelper.DownloadHeaderCached -) - -class DownloadAdapter( - private val onHeaderClickEvent: (DownloadHeaderClickEvent) -> Unit, - private val onItemClickEvent: (DownloadClickEvent) -> Unit, - private val onItemSelectionChanged: (Int, Boolean) -> Unit, -) : ListAdapter(DiffCallback()) { - - private var isMultiDeleteState: Boolean = false - - companion object { - private const val VIEW_TYPE_HEADER = 0 - private const val VIEW_TYPE_CHILD = 1 - } - - inner class DownloadViewHolder( - private val binding: ViewBinding - ) : RecyclerView.ViewHolder(binding.root) { - - fun bind(card: VisualDownloadCached?) { - when (binding) { - is DownloadHeaderEpisodeBinding -> bindHeader(card as? VisualDownloadCached.Header) - is DownloadChildEpisodeBinding -> bindChild(card as? VisualDownloadCached.Child) - } - } - - private fun bindHeader(card: VisualDownloadCached.Header?) { - if (binding !is DownloadHeaderEpisodeBinding || card == null) return - - val data = card.data - binding.apply { - episodeHolder.apply { - if (isMultiDeleteState) { - setOnClickListener { - toggleIsChecked(deleteCheckbox, data.id) - } - } - - setOnLongClickListener { - toggleIsChecked(deleteCheckbox, data.id) - true - } - } - - downloadHeaderPoster.apply { - setImage(data.poster) - if (isMultiDeleteState) { - setOnClickListener { - toggleIsChecked(deleteCheckbox, data.id) - } - } else { - setOnClickListener { - onHeaderClickEvent.invoke( - DownloadHeaderClickEvent( - DOWNLOAD_ACTION_LOAD_RESULT, - data - ) - ) - } - } - - setOnLongClickListener { - toggleIsChecked(deleteCheckbox, data.id) - true - } - } - downloadHeaderTitle.text = data.name - val formattedSize = formatShortFileSize(itemView.context, card.totalBytes) - - if (card.child != null) { - handleChildDownload(card, formattedSize) - } else handleParentDownload(card, formattedSize) - - if (isMultiDeleteState) { - deleteCheckbox.setOnCheckedChangeListener { _, isChecked -> - onItemSelectionChanged.invoke(data.id, isChecked) - } - } else deleteCheckbox.setOnCheckedChangeListener(null) - - deleteCheckbox.apply { - isVisible = isMultiDeleteState - isChecked = card.isSelected - } - } - } - - private fun DownloadHeaderEpisodeBinding.handleChildDownload( - card: VisualDownloadCached.Header, - formattedSize: String - ) { - card.child ?: return - downloadHeaderGotoChild.isVisible = false - - val posDur = getViewPos(card.data.id) - downloadHeaderEpisodeProgress.apply { - isVisible = posDur != null - posDur?.let { - val visualPos = it.fixVisual() - max = (visualPos.duration / 1000).toInt() - progress = (visualPos.position / 1000).toInt() - } - } - - val status = downloadButton.getStatus(card.child.id, card.currentBytes, card.totalBytes) - if (status == DownloadStatusTell.IsDone) { - // We do this here instead if we are finished downloading - // so that we can use the value from the view model - // rather than extra unneeded disk operations and to prevent a - // delay in updating download icon state. - downloadButton.setProgress(card.currentBytes, card.totalBytes) - downloadButton.applyMetaData(card.child.id, card.currentBytes, card.totalBytes) - // We will let the view model handle this - downloadButton.doSetProgress = false - downloadButton.progressBar.progressDrawable = - downloadButton.getDrawableFromStatus(status) - ?.let { ContextCompat.getDrawable(downloadButton.context, it) } - downloadHeaderInfo.text = formattedSize - } else { - // We need to make sure we restore the correct progress - // when we refresh data in the adapter. - downloadButton.resetView() - val drawable = downloadButton.getDrawableFromStatus(status)?.let { - ContextCompat.getDrawable(downloadButton.context, it) - } - downloadButton.statusView.setImageDrawable(drawable) - downloadButton.progressBar.progressDrawable = - ContextCompat.getDrawable( - downloadButton.context, - downloadButton.progressDrawable - ) - } - - downloadButton.setDefaultClickListener(card.child, downloadHeaderInfo, onItemClickEvent) - downloadButton.isVisible = !isMultiDeleteState - - if (!isMultiDeleteState) { - episodeHolder.setOnClickListener { - onItemClickEvent.invoke( - DownloadClickEvent( - DOWNLOAD_ACTION_PLAY_FILE, - card.child - ) - ) - } - } - } - - private fun DownloadHeaderEpisodeBinding.handleParentDownload( - card: VisualDownloadCached.Header, - formattedSize: String - ) { - downloadButton.isVisible = false - downloadHeaderEpisodeProgress.isVisible = false - downloadHeaderGotoChild.isVisible = !isMultiDeleteState - - try { - downloadHeaderInfo.text = - downloadHeaderInfo.context.getString(R.string.extra_info_format).format( - card.totalDownloads, - downloadHeaderInfo.context.resources.getQuantityString( - R.plurals.episodes, - card.totalDownloads - ), - formattedSize - ) - } catch (e: Exception) { - downloadHeaderInfo.text = null - logError(e) - } - - if (!isMultiDeleteState) { - episodeHolder.setOnClickListener { - onHeaderClickEvent.invoke( - DownloadHeaderClickEvent( - DOWNLOAD_ACTION_GO_TO_CHILD, - card.data - ) - ) - } - } - } - - private fun bindChild(card: VisualDownloadCached.Child?) { - if (binding !is DownloadChildEpisodeBinding || card == null) return - - val data = card.data - binding.apply { - val posDur = getViewPos(data.id) - downloadChildEpisodeProgress.apply { - isVisible = posDur != null - posDur?.let { - val visualPos = it.fixVisual() - max = (visualPos.duration / 1000).toInt() - progress = (visualPos.position / 1000).toInt() - } - } - - val status = downloadButton.getStatus(data.id, card.currentBytes, card.totalBytes) - if (status == DownloadStatusTell.IsDone) { - // We do this here instead if we are finished downloading - // so that we can use the value from the view model - // rather than extra unneeded disk operations and to prevent a - // delay in updating download icon state. - downloadButton.setProgress(card.currentBytes, card.totalBytes) - downloadButton.applyMetaData(data.id, card.currentBytes, card.totalBytes) - // We will let the view model handle this - downloadButton.doSetProgress = false - downloadButton.progressBar.progressDrawable = - downloadButton.getDrawableFromStatus(status) - ?.let { ContextCompat.getDrawable(downloadButton.context, it) } - downloadChildEpisodeTextExtra.text = - formatShortFileSize(downloadChildEpisodeTextExtra.context, card.totalBytes) - } else { - // We need to make sure we restore the correct progress - // when we refresh data in the adapter. - downloadButton.resetView() - val drawable = downloadButton.getDrawableFromStatus(status)?.let { - ContextCompat.getDrawable(downloadButton.context, it) - } - downloadButton.statusView.setImageDrawable(drawable) - downloadButton.progressBar.progressDrawable = - ContextCompat.getDrawable( - downloadButton.context, - downloadButton.progressDrawable - ) - } - - downloadButton.setDefaultClickListener( - data, - downloadChildEpisodeTextExtra, - onItemClickEvent - ) - downloadButton.isVisible = !isMultiDeleteState - - downloadChildEpisodeText.apply { - text = context.getNameFull(data.name, data.episode, data.season) - isSelected = true // Needed for text repeating - } - - downloadChildEpisodeHolder.setOnClickListener { - onItemClickEvent.invoke(DownloadClickEvent(DOWNLOAD_ACTION_PLAY_FILE, data)) - } - - downloadChildEpisodeHolder.apply { - when { - isMultiDeleteState -> { - setOnClickListener { - toggleIsChecked(deleteCheckbox, data.id) - } - } - - else -> { - setOnClickListener { - onItemClickEvent.invoke( - DownloadClickEvent( - DOWNLOAD_ACTION_PLAY_FILE, - data - ) - ) - } - } - } - - setOnLongClickListener { - toggleIsChecked(deleteCheckbox, data.id) - true - } - } - - if (isMultiDeleteState) { - deleteCheckbox.setOnCheckedChangeListener { _, isChecked -> - onItemSelectionChanged.invoke(data.id, isChecked) - } - } else deleteCheckbox.setOnCheckedChangeListener(null) - - deleteCheckbox.apply { - isVisible = isMultiDeleteState - isChecked = card.isSelected - } - } - } - } - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DownloadViewHolder { - val inflater = LayoutInflater.from(parent.context) - val binding = when (viewType) { - VIEW_TYPE_HEADER -> DownloadHeaderEpisodeBinding.inflate(inflater, parent, false) - VIEW_TYPE_CHILD -> DownloadChildEpisodeBinding.inflate(inflater, parent, false) - else -> throw IllegalArgumentException("Invalid view type") - } - return DownloadViewHolder(binding) - } - - override fun onBindViewHolder(holder: DownloadViewHolder, position: Int) { - holder.bind(getItem(position)) - } - - override fun getItemViewType(position: Int): Int { - return when (getItem(position)) { - is VisualDownloadCached.Child -> VIEW_TYPE_CHILD - is VisualDownloadCached.Header -> VIEW_TYPE_HEADER - else -> throw IllegalArgumentException("Invalid data type at position $position") - } - } - - fun setIsMultiDeleteState(value: Boolean) { - if (isMultiDeleteState == value) return - isMultiDeleteState = value - notifyItemRangeChanged(0, itemCount) - } - - fun notifyAllSelected() { - currentList.indices.forEach { index -> - if (!currentList[index].isSelected) { - notifyItemChanged(index) - } - } - } - - fun notifySelectionStates() { - currentList.indices.forEach { index -> - if (currentList[index].isSelected) { - notifyItemChanged(index) - } - } - } - - private fun toggleIsChecked(checkbox: CheckBox, itemId: Int) { - val isChecked = !checkbox.isChecked - checkbox.isChecked = isChecked - onItemSelectionChanged.invoke(itemId, isChecked) - } - - class DiffCallback : DiffUtil.ItemCallback() { - override fun areItemsTheSame( - oldItem: VisualDownloadCached, - newItem: VisualDownloadCached - ): Boolean { - return oldItem.data.id == newItem.data.id - } - - override fun areContentsTheSame( - oldItem: VisualDownloadCached, - newItem: VisualDownloadCached - ): Boolean { - return oldItem == newItem - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt index 494e82e5..10ce67a7 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadButtonSetup.kt @@ -1,30 +1,28 @@ package com.lagradost.cloudstream3.ui.download +import android.app.Activity import android.content.DialogInterface -import android.net.Uri +import android.widget.Toast import androidx.appcompat.app.AlertDialog -import com.google.android.material.snackbar.Snackbar import com.lagradost.cloudstream3.AcraApplication.Companion.getKey -import com.lagradost.cloudstream3.AcraApplication.Companion.getKeys import com.lagradost.cloudstream3.CommonActivity.activity +import com.lagradost.cloudstream3.CommonActivity.showToast import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.ui.player.DownloadFileGenerator -import com.lagradost.cloudstream3.ui.player.ExtractorUri import com.lagradost.cloudstream3.ui.player.GeneratorPlayer -import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull -import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus -import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE +import com.lagradost.cloudstream3.utils.AppUtils.getNameFull +import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE -import com.lagradost.cloudstream3.utils.SnackbarHelper.showSnackbar +import com.lagradost.cloudstream3.utils.ExtractorUri import com.lagradost.cloudstream3.utils.UIHelper.navigate import com.lagradost.cloudstream3.utils.VideoDownloadHelper import com.lagradost.cloudstream3.utils.VideoDownloadManager -import kotlinx.coroutines.MainScope object DownloadButtonSetup { fun handleDownloadClick(click: DownloadClickEvent) { val id = click.data.id + if (click.data !is VideoDownloadHelper.DownloadEpisodeCached) return when (click.action) { DOWNLOAD_ACTION_DELETE_FILE -> { activity?.let { ctx -> @@ -33,15 +31,9 @@ object DownloadButtonSetup { DialogInterface.OnClickListener { _, which -> when (which) { DialogInterface.BUTTON_POSITIVE -> { - VideoDownloadManager.deleteFilesAndUpdateSettings( - ctx, - setOf(id), - MainScope() - ) + VideoDownloadManager.deleteFileAndUpdateSettings(ctx, id) } - DialogInterface.BUTTON_NEGATIVE -> { - // Do nothing on cancel } } } @@ -66,13 +58,11 @@ object DownloadButtonSetup { } } } - DOWNLOAD_ACTION_PAUSE_DOWNLOAD -> { VideoDownloadManager.downloadEvent.invoke( Pair(click.data.id, VideoDownloadManager.DownloadActionType.Pause) ) } - DOWNLOAD_ACTION_RESUME_DOWNLOAD -> { activity?.let { ctx -> if (VideoDownloadManager.downloadStatus.containsKey(id) && VideoDownloadManager.downloadStatus[id] == VideoDownloadManager.DownloadType.IsPaused) { @@ -91,7 +81,6 @@ object DownloadButtonSetup { } } } - DOWNLOAD_ACTION_LONG_CLICK -> { activity?.let { act -> val length = @@ -101,80 +90,64 @@ object DownloadButtonSetup { )?.fileLength ?: 0 if (length > 0) { - showSnackbar( - act, - R.string.offline_file, - Snackbar.LENGTH_LONG - ) + showToast(R.string.delete, Toast.LENGTH_LONG) + } else { + showToast(R.string.download, Toast.LENGTH_LONG) } } } - DOWNLOAD_ACTION_PLAY_FILE -> { activity?.let { act -> + val info = + VideoDownloadManager.getDownloadFileInfoAndUpdateSettings( + act, + click.data.id + ) ?: return + val keyInfo = getKey( + VideoDownloadManager.KEY_DOWNLOAD_INFO, + click.data.id.toString() + ) ?: return val parent = getKey( DOWNLOAD_HEADER_CACHE, click.data.parentId.toString() ) ?: return - val episodes = getKeys(DOWNLOAD_EPISODE_CACHE) - ?.mapNotNull { - getKey(it) - } - ?.filter { it.parentId == click.data.parentId } - - val currentSeason = click.data.season ?: 0 - val currentEpisode = click.data.episode - - val items = mutableListOf() - - // Make sure we only get this episode and episodes after it, - // and that we can go to the next season if we need to. - val allRelevantEpisodes = episodes - ?.sortedWith( - compareByDescending { it.id == click.data.id } - .thenBy { it.season ?: 0 } - .thenBy { it.episode } - ) - ?.filter { - if (it.season == null) return@filter true - val isCurrentOrLaterInSeason = it.season == currentSeason && (it.episode >= currentEpisode || it.id == click.data.id) - val isInFutureSeasons = it.season > currentSeason - - isCurrentOrLaterInSeason || isInFutureSeasons - } - - allRelevantEpisodes?.forEach { - val keyInfo = getKey( - VideoDownloadManager.KEY_DOWNLOAD_INFO, - it.id.toString() - ) ?: return@forEach - - items.add( - ExtractorUri( - // We just use a temporary placeholder for the URI, - // it will be updated in generateLinks(). - // We just do this for performance since getting - // all paths at once can be quite expensive. - uri = Uri.EMPTY, - id = it.id, - parentId = it.parentId, - name = act.getString(R.string.downloaded_file), - season = it.season, - episode = it.episode, - headerName = parent.name, - tvType = parent.type, - basePath = keyInfo.basePath, - displayName = keyInfo.displayName, - relativePath = keyInfo.relativePath, - ) - ) - } - act.navigate( R.id.global_to_navigation_player, GeneratorPlayer.newInstance( - DownloadFileGenerator(items) + DownloadFileGenerator( + listOf( + ExtractorUri( + uri = info.path, + + id = click.data.id, + parentId = click.data.parentId, + name = act.getString(R.string.downloaded_file), //click.data.name ?: keyInfo.displayName + season = click.data.season, + episode = click.data.episode, + headerName = parent.name, + tvType = parent.type, + + basePath = keyInfo.basePath, + displayName = keyInfo.displayName, + relativePath = keyInfo.relativePath, + ) + ) + ) ) + //R.id.global_to_navigation_player, PlayerFragment.newInstance( + // UriData( + // info.path.toString(), + // keyInfo.basePath, + // keyInfo.relativePath, + // keyInfo.displayName, + // click.data.parentId, + // click.data.id, + // headerName ?: "null", + // if (click.data.episode <= 0) null else click.data.episode, + // click.data.season + // ), + // getViewPos(click.data.id)?.position ?: 0 + //) ) } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildAdapter.kt new file mode 100644 index 00000000..1d7b5a83 --- /dev/null +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildAdapter.kt @@ -0,0 +1,94 @@ +package com.lagradost.cloudstream3.ui.download + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import com.lagradost.cloudstream3.databinding.DownloadChildEpisodeBinding +import com.lagradost.cloudstream3.utils.AppUtils.getNameFull +import com.lagradost.cloudstream3.utils.DataStoreHelper.fixVisual +import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos +import com.lagradost.cloudstream3.utils.VideoDownloadHelper + +const val DOWNLOAD_ACTION_PLAY_FILE = 0 +const val DOWNLOAD_ACTION_DELETE_FILE = 1 +const val DOWNLOAD_ACTION_RESUME_DOWNLOAD = 2 +const val DOWNLOAD_ACTION_PAUSE_DOWNLOAD = 3 +const val DOWNLOAD_ACTION_DOWNLOAD = 4 +const val DOWNLOAD_ACTION_LONG_CLICK = 5 + +data class VisualDownloadChildCached( + val currentBytes: Long, + val totalBytes: Long, + val data: VideoDownloadHelper.DownloadEpisodeCached, +) + +data class DownloadClickEvent(val action: Int, val data: VideoDownloadHelper.DownloadEpisodeCached) + +class DownloadChildAdapter( + var cardList: List, + private val clickCallback: (DownloadClickEvent) -> Unit, +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + return DownloadChildViewHolder( + DownloadChildEpisodeBinding.inflate(LayoutInflater.from(parent.context), parent, false), + clickCallback + ) + } + + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + when (holder) { + is DownloadChildViewHolder -> { + holder.bind(cardList[position]) + } + } + } + + override fun getItemCount(): Int { + return cardList.size + } + + class DownloadChildViewHolder + constructor( + val binding: DownloadChildEpisodeBinding, + private val clickCallback: (DownloadClickEvent) -> Unit, + ) : RecyclerView.ViewHolder(binding.root) { + + /*private val title: TextView = itemView.download_child_episode_text + private val extraInfo: TextView = itemView.download_child_episode_text_extra + private val holder: CardView = itemView.download_child_episode_holder + private val progressBar: ContentLoadingProgressBar = itemView.download_child_episode_progress + private val progressBarDownload: ContentLoadingProgressBar = itemView.download_child_episode_progress_downloaded + private val downloadImage: ImageView = itemView.download_child_episode_download*/ + + + fun bind(card: VisualDownloadChildCached) { + val d = card.data + + val posDur = getViewPos(d.id) + binding.downloadChildEpisodeProgress.apply { + if (posDur != null) { + val visualPos = posDur.fixVisual() + max = (visualPos.duration / 1000).toInt() + progress = (visualPos.position / 1000).toInt() + visibility = View.VISIBLE + } else { + visibility = View.GONE + } + } + + binding.downloadButton.setDefaultClickListener(card.data, binding.downloadChildEpisodeTextExtra, clickCallback) + + binding.downloadChildEpisodeText.apply { + text = context.getNameFull(d.name, d.episode, d.season) + isSelected = true // is needed for text repeating + } + + + binding.downloadChildEpisodeHolder.setOnClickListener { + clickCallback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_PLAY_FILE, d)) + } + } + } +} diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt index 09c48a04..f62482ed 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt @@ -1,33 +1,26 @@ package com.lagradost.cloudstream3.ui.download import android.os.Bundle -import android.os.Handler -import android.os.Looper -import android.text.format.Formatter.formatShortFileSize import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.core.view.isVisible import androidx.fragment.app.Fragment -import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.RecyclerView import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.databinding.FragmentChildDownloadsBinding -import com.lagradost.cloudstream3.mvvm.observe import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick import com.lagradost.cloudstream3.ui.result.FOCUS_SELF import com.lagradost.cloudstream3.ui.result.setLinearListLayout -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.PHONE -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback -import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback +import com.lagradost.cloudstream3.utils.Coroutines.main +import com.lagradost.cloudstream3.utils.DataStore.getKey +import com.lagradost.cloudstream3.utils.DataStore.getKeys import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar -import com.lagradost.cloudstream3.utils.UIHelper.setAppBarNoScrollFlagsOnTV +import com.lagradost.cloudstream3.utils.VideoDownloadHelper +import com.lagradost.cloudstream3.utils.VideoDownloadManager +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext class DownloadChildFragment : Fragment() { - private lateinit var downloadsViewModel: DownloadViewModel - private var binding: FragmentChildDownloadsBinding? = null - companion object { fun newInstance(headerName: String, folder: String): Bundle { return Bundle().apply { @@ -38,170 +31,92 @@ class DownloadChildFragment : Fragment() { } override fun onDestroyView() { - detachBackPressedCallback() + downloadDeleteEventListener?.let { VideoDownloadManager.downloadDeleteEvent -= it } binding = null super.onDestroyView() } + var binding: FragmentChildDownloadsBinding? = null override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { - downloadsViewModel = ViewModelProvider(this)[DownloadViewModel::class.java] val localBinding = FragmentChildDownloadsBinding.inflate(inflater, container, false) binding = localBinding - return localBinding.root + return localBinding.root//inflater.inflate(R.layout.fragment_child_downloads, container, false) } + private fun updateList(folder: String) = main { + context?.let { ctx -> + val data = withContext(Dispatchers.IO) { ctx.getKeys(folder) } + val eps = withContext(Dispatchers.IO) { + data.mapNotNull { key -> + context?.getKey(key) + }.mapNotNull { + val info = VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(ctx, it.id) + ?: return@mapNotNull null + VisualDownloadChildCached(info.fileLength, info.totalBytes, it) + } + }.sortedBy { it.data.episode + (it.data.season ?: 0) * 100000 } + if (eps.isEmpty()) { + activity?.onBackPressed() + return@main + } + + (binding?.downloadChildList?.adapter as DownloadChildAdapter? ?: return@main).cardList = + eps + binding?.downloadChildList?.adapter?.notifyDataSetChanged() + } + } + + private var downloadDeleteEventListener: ((Int) -> Unit)? = null + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - /** - * We never want to retain multi-delete state - * when navigating to downloads. Setting this state - * immediately can sometimes result in the observer - * not being notified in time to update the UI. - * - * By posting to the main looper, we ensure that this - * operation is executed after the view has been fully created - * and all initializations are completed, allowing the - * observer to properly receive and handle the state change. - */ - Handler(Looper.getMainLooper()).post { - downloadsViewModel.setIsMultiDeleteState(false) - } - - /** - * We have to make sure selected items are - * cleared here as well so we don't run in an - * inconsistent state where selected items do - * not match the multi delete state we are in. - */ - downloadsViewModel.clearSelectedItems() - val folder = arguments?.getString("folder") val name = arguments?.getString("name") if (folder == null) { - activity?.onBackPressedDispatcher?.onBackPressed() + activity?.onBackPressed() // TODO FIX return } + fixPaddingStatusbar(binding?.downloadChildRoot) binding?.downloadChildToolbar?.apply { title = name - if (isLayout(PHONE or EMULATOR)) { - setNavigationIcon(R.drawable.ic_baseline_arrow_back_24) - setNavigationOnClickListener { - activity?.onBackPressedDispatcher?.onBackPressed() + setNavigationIcon(R.drawable.ic_baseline_arrow_back_24) + setNavigationOnClickListener { + activity?.onBackPressed() + } + } + + + val adapter: RecyclerView.Adapter = + DownloadChildAdapter( + ArrayList(), + ) { click -> + handleDownloadClick(click) + } + + downloadDeleteEventListener = { id: Int -> + val list = (binding?.downloadChildList?.adapter as DownloadChildAdapter?)?.cardList + if (list != null) { + if (list.any { it.data.id == id }) { + updateList(folder) } } - setAppBarNoScrollFlagsOnTV() } - binding?.downloadDeleteAppbar?.setAppBarNoScrollFlagsOnTV() + downloadDeleteEventListener?.let { VideoDownloadManager.downloadDeleteEvent += it } - observe(downloadsViewModel.childCards) { - if (it.isEmpty()) { - activity?.onBackPressedDispatcher?.onBackPressed() - return@observe - } + binding?.downloadChildList?.adapter = adapter + binding?.downloadChildList?.setLinearListLayout( + isHorizontal = false, + nextDown = FOCUS_SELF, + nextRight = FOCUS_SELF + )//layoutManager = GridLayoutManager(context, 1) - (binding?.downloadChildList?.adapter as? DownloadAdapter)?.submitList(it) - } - observe(downloadsViewModel.isMultiDeleteState) { isMultiDeleteState -> - val adapter = binding?.downloadChildList?.adapter as? DownloadAdapter - adapter?.setIsMultiDeleteState(isMultiDeleteState) - binding?.downloadDeleteAppbar?.isVisible = isMultiDeleteState - if (!isMultiDeleteState) { - detachBackPressedCallback() - downloadsViewModel.clearSelectedItems() - binding?.downloadChildToolbar?.isVisible = true - } - } - observe(downloadsViewModel.selectedBytes) { - updateDeleteButton(downloadsViewModel.selectedItemIds.value?.count() ?: 0, it) - } - observe(downloadsViewModel.selectedItemIds) { - handleSelectedChange(it) - updateDeleteButton(it.count(), downloadsViewModel.selectedBytes.value ?: 0L) - - binding?.btnDelete?.isVisible = it.isNotEmpty() - binding?.selectItemsText?.isVisible = it.isEmpty() - - val allSelected = downloadsViewModel.isAllSelected() - if (allSelected) { - binding?.btnToggleAll?.setText(R.string.deselect_all) - } else binding?.btnToggleAll?.setText(R.string.select_all) - } - - val adapter = DownloadAdapter( - {}, - { click -> - if (click.action == DOWNLOAD_ACTION_DELETE_FILE) { - context?.let { ctx -> - downloadsViewModel.handleSingleDelete(ctx, click.data.id) - } - } else handleDownloadClick(click) - }, - { itemId, isChecked -> - if (isChecked) { - downloadsViewModel.addSelected(itemId) - } else downloadsViewModel.removeSelected(itemId) - } - ) - - binding?.downloadChildList?.apply { - setHasFixedSize(true) - setItemViewCacheSize(20) - this.adapter = adapter - setLinearListLayout( - isHorizontal = false, - nextRight = FOCUS_SELF, - nextDown = FOCUS_SELF, - ) - } - - context?.let { downloadsViewModel.updateChildList(it, folder) } - fixPaddingStatusbar(binding?.downloadChildRoot) - } - - private fun handleSelectedChange(selected: MutableSet) { - if (selected.isNotEmpty()) { - binding?.downloadDeleteAppbar?.isVisible = true - binding?.downloadChildToolbar?.isVisible = false - activity?.attachBackPressedCallback { - downloadsViewModel.setIsMultiDeleteState(false) - } - - binding?.btnDelete?.setOnClickListener { - context?.let { ctx -> - downloadsViewModel.handleMultiDelete(ctx) - } - } - - binding?.btnCancel?.setOnClickListener { - downloadsViewModel.setIsMultiDeleteState(false) - } - - binding?.btnToggleAll?.setOnClickListener { - val allSelected = downloadsViewModel.isAllSelected() - val adapter = binding?.downloadChildList?.adapter as? DownloadAdapter - if (allSelected) { - adapter?.notifySelectionStates() - downloadsViewModel.clearSelectedItems() - } else { - adapter?.notifyAllSelected() - downloadsViewModel.selectAllItems() - } - } - - downloadsViewModel.setIsMultiDeleteState(true) - } - } - - private fun updateDeleteButton(count: Int, selectedBytes: Long) { - val formattedSize = formatShortFileSize(context, selectedBytes) - binding?.btnDelete?.text = - getString(R.string.delete_format).format(count, formattedSize) + updateList(folder) } } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt index 447b4f13..27c2e1a3 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt @@ -1,62 +1,55 @@ package com.lagradost.cloudstream3.ui.download -import android.app.Activity import android.app.Dialog import android.content.ClipboardManager import android.content.Context -import android.content.Intent -import android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION import android.os.Build import android.os.Bundle -import android.os.Handler -import android.os.Looper -import android.text.format.Formatter.formatShortFileSize import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.LinearLayout -import android.widget.TextView import android.widget.Toast -import androidx.activity.result.contract.ActivityResultContracts -import androidx.annotation.StringRes +import androidx.appcompat.app.AppCompatActivity import androidx.core.view.isGone import androidx.core.view.isVisible -import androidx.core.widget.doOnTextChanged import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.RecyclerView import com.lagradost.cloudstream3.CommonActivity.showToast import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.databinding.FragmentDownloadsBinding -import com.lagradost.cloudstream3.databinding.StreamInputBinding -import com.lagradost.cloudstream3.isEpisodeBased -import com.lagradost.cloudstream3.mvvm.normalSafeApiCall +import com.lagradost.cloudstream3.isMovieType import com.lagradost.cloudstream3.mvvm.observe import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick -import com.lagradost.cloudstream3.ui.player.BasicLink import com.lagradost.cloudstream3.ui.player.GeneratorPlayer import com.lagradost.cloudstream3.ui.player.LinkGenerator -import com.lagradost.cloudstream3.ui.player.OfflinePlaybackHelper.playUri -import com.lagradost.cloudstream3.ui.result.FOCUS_SELF -import com.lagradost.cloudstream3.ui.result.setLinearListLayout -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.AppContextUtils.loadResult -import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback -import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback +import com.lagradost.cloudstream3.utils.AppUtils.loadResult +import com.lagradost.cloudstream3.utils.Coroutines.main import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE -import com.lagradost.cloudstream3.utils.DataStore.getFolderName +import com.lagradost.cloudstream3.utils.DataStore import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard import com.lagradost.cloudstream3.utils.UIHelper.navigate -import com.lagradost.cloudstream3.utils.UIHelper.setAppBarNoScrollFlagsOnTV +import com.lagradost.cloudstream3.utils.VideoDownloadHelper +import com.lagradost.cloudstream3.utils.VideoDownloadManager +import android.text.format.Formatter.formatShortFileSize +import androidx.core.widget.doOnTextChanged +import com.lagradost.cloudstream3.databinding.FragmentDownloadsBinding +import com.lagradost.cloudstream3.databinding.StreamInputBinding +import com.lagradost.cloudstream3.mvvm.normalSafeApiCall +import com.lagradost.cloudstream3.ui.player.BasicLink +import com.lagradost.cloudstream3.ui.result.FOCUS_SELF +import com.lagradost.cloudstream3.ui.result.setLinearListLayout +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings import java.net.URI + const val DOWNLOAD_NAVIGATE_TO = "downloadpage" class DownloadFragment : Fragment() { private lateinit var downloadsViewModel: DownloadViewModel - private var binding: FragmentDownloadsBinding? = null private fun View.setLayoutWidth(weight: Long) { val param = LinearLayout.LayoutParams( @@ -67,325 +60,221 @@ class DownloadFragment : Fragment() { this.layoutParams = param } + private fun setList(list: List) { + main { + (binding?.downloadList?.adapter as DownloadHeaderAdapter?)?.cardList = list + binding?.downloadList?.adapter?.notifyDataSetChanged() + } + } + override fun onDestroyView() { - detachBackPressedCallback() + if (downloadDeleteEventListener != null) { + VideoDownloadManager.downloadDeleteEvent -= downloadDeleteEventListener!! + downloadDeleteEventListener = null + } binding = null super.onDestroyView() } + var binding: FragmentDownloadsBinding? = null + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View { - downloadsViewModel = ViewModelProvider(this)[DownloadViewModel::class.java] + ): View? { + downloadsViewModel = + ViewModelProvider(this)[DownloadViewModel::class.java] + val localBinding = FragmentDownloadsBinding.inflate(inflater, container, false) binding = localBinding - return localBinding.root + return localBinding.root//inflater.inflate(R.layout.fragment_downloads, container, false) } + private var downloadDeleteEventListener: ((Int) -> Unit)? = null + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) hideKeyboard() - binding?.downloadStorageAppbar?.setAppBarNoScrollFlagsOnTV() - binding?.downloadDeleteAppbar?.setAppBarNoScrollFlagsOnTV() - /** - * We never want to retain multi-delete state - * when navigating to downloads. Setting this state - * immediately can sometimes result in the observer - * not being notified in time to update the UI. - * - * By posting to the main looper, we ensure that this - * operation is executed after the view has been fully created - * and all initializations are completed, allowing the - * observer to properly receive and handle the state change. - */ - Handler(Looper.getMainLooper()).post { - downloadsViewModel.setIsMultiDeleteState(false) + observe(downloadsViewModel.noDownloadsText) { + binding?.textNoDownloads?.text = it } - - /** - * We have to make sure selected items are - * cleared here as well so we don't run in an - * inconsistent state where selected items do - * not match the multi delete state we are in. - */ - downloadsViewModel.clearSelectedItems() - observe(downloadsViewModel.headerCards) { - (binding?.downloadList?.adapter as? DownloadAdapter)?.submitList(it) + setList(it) binding?.downloadLoading?.isVisible = false - binding?.textNoDownloads?.isVisible = it.isEmpty() } observe(downloadsViewModel.availableBytes) { - updateStorageInfo( - view.context, - it, - R.string.free_storage, - binding?.downloadFreeTxt, - binding?.downloadFree - ) + binding?.downloadFreeTxt?.text = + getString(R.string.storage_size_format).format( + getString(R.string.free_storage), + formatShortFileSize(view.context, it) + ) + binding?.downloadFree?.setLayoutWidth(it) } observe(downloadsViewModel.usedBytes) { - updateStorageInfo( - view.context, - it, - R.string.used_storage, - binding?.downloadUsedTxt, - binding?.downloadUsed - ) - - // Prevent race condition and make sure - // we don't display it early - if ( - downloadsViewModel.isMultiDeleteState.value == null || - downloadsViewModel.isMultiDeleteState.value == false - ) binding?.downloadStorageAppbar?.isVisible = it > 0 + binding?.apply { + downloadUsedTxt.text = + getString(R.string.storage_size_format).format( + getString(R.string.used_storage), + formatShortFileSize(view.context, it) + ) + downloadUsed.setLayoutWidth(it) + downloadStorageAppbar.isVisible = it > 0 + } } observe(downloadsViewModel.downloadBytes) { - updateStorageInfo( - view.context, - it, - R.string.app_storage, - binding?.downloadAppTxt, - binding?.downloadApp + binding?.apply { + downloadAppTxt.text = + getString(R.string.storage_size_format).format( + getString(R.string.app_storage), + formatShortFileSize(view.context, it) + ) + downloadApp.setLayoutWidth(it) + } + } + + val adapter: RecyclerView.Adapter = + DownloadHeaderAdapter( + ArrayList(), + { click -> + when (click.action) { + 0 -> { + if (click.data.type.isMovieType()) { + //wont be called + } else { + val folder = DataStore.getFolderName( + DOWNLOAD_EPISODE_CACHE, + click.data.id.toString() + ) + activity?.navigate( + R.id.action_navigation_downloads_to_navigation_download_child, + DownloadChildFragment.newInstance(click.data.name, folder) + ) + } + } + + 1 -> { + (activity as AppCompatActivity?)?.loadResult( + click.data.url, + click.data.apiName + ) + } + } + + }, + { downloadClickEvent -> + if (downloadClickEvent.data !is VideoDownloadHelper.DownloadEpisodeCached) return@DownloadHeaderAdapter + handleDownloadClick(downloadClickEvent) + if (downloadClickEvent.action == DOWNLOAD_ACTION_DELETE_FILE) { + context?.let { ctx -> + downloadsViewModel.updateList(ctx) + } + } + } ) - } - observe(downloadsViewModel.selectedBytes) { - updateDeleteButton(downloadsViewModel.selectedItemIds.value?.count() ?: 0, it) - } - observe(downloadsViewModel.isMultiDeleteState) { isMultiDeleteState -> - val adapter = binding?.downloadList?.adapter as? DownloadAdapter - adapter?.setIsMultiDeleteState(isMultiDeleteState) - binding?.downloadDeleteAppbar?.isVisible = isMultiDeleteState - if (!isMultiDeleteState) { - detachBackPressedCallback() - downloadsViewModel.clearSelectedItems() - // Prevent race condition and make sure - // we don't display it early - if (downloadsViewModel.usedBytes.value?.let { it > 0 } == true) { - binding?.downloadStorageAppbar?.isVisible = true + + downloadDeleteEventListener = { id -> + val list = (binding?.downloadList?.adapter as DownloadHeaderAdapter?)?.cardList + if (list != null) { + if (list.any { it.data.id == id }) { + context?.let { ctx -> + setList(ArrayList()) + downloadsViewModel.updateList(ctx) + } } } } - observe(downloadsViewModel.selectedItemIds) { - handleSelectedChange(it) - updateDeleteButton(it.count(), downloadsViewModel.selectedBytes.value ?: 0L) - binding?.btnDelete?.isVisible = it.isNotEmpty() - binding?.selectItemsText?.isVisible = it.isEmpty() - - val allSelected = downloadsViewModel.isAllSelected() - if (allSelected) { - binding?.btnToggleAll?.setText(R.string.deselect_all) - } else binding?.btnToggleAll?.setText(R.string.select_all) - } - - val adapter = DownloadAdapter( - { click -> handleItemClick(click) }, - { click -> - if (click.action == DOWNLOAD_ACTION_DELETE_FILE) { - context?.let { ctx -> - downloadsViewModel.handleSingleDelete(ctx, click.data.id) - } - } else handleDownloadClick(click) - }, - { itemId, isChecked -> - if (isChecked) { - downloadsViewModel.addSelected(itemId) - } else downloadsViewModel.removeSelected(itemId) - } - ) + downloadDeleteEventListener?.let { VideoDownloadManager.downloadDeleteEvent += it } binding?.downloadList?.apply { - setHasFixedSize(true) - setItemViewCacheSize(20) this.adapter = adapter setLinearListLayout( isHorizontal = false, nextRight = FOCUS_SELF, - nextDown = FOCUS_SELF, + nextUp = FOCUS_SELF, + nextDown = FOCUS_SELF ) + //layoutManager = GridLayoutManager(context, 1) } - binding?.apply { - openLocalVideoButton.apply { - isGone = isLayout(TV) - setOnClickListener { openLocalVideo() } - } - downloadStreamButton.apply { - isGone = isLayout(TV) - setOnClickListener { showStreamInputDialog(it.context) } - } - } + // Should be visible in emulator layout + binding?.downloadStreamButton?.isGone = isTrueTvSettings() + binding?.downloadStreamButton?.setOnClickListener { + val dialog = + Dialog(it.context ?: return@setOnClickListener, R.style.AlertDialogCustom) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - binding?.downloadList?.setOnScrollChangeListener { _, _, scrollY, _, oldScrollY -> - handleScroll(scrollY - oldScrollY) - } - } + val binding = StreamInputBinding.inflate(dialog.layoutInflater) - context?.let { downloadsViewModel.updateHeaderList(it) } - fixPaddingStatusbar(binding?.downloadRoot) - } + dialog.setContentView(binding.root) - private fun handleItemClick(click: DownloadHeaderClickEvent) { - when (click.action) { - DOWNLOAD_ACTION_GO_TO_CHILD -> { - if (click.data.type.isEpisodeBased()) { - val folder = - getFolderName(DOWNLOAD_EPISODE_CACHE, click.data.id.toString()) - activity?.navigate( - R.id.action_navigation_downloads_to_navigation_download_child, - DownloadChildFragment.newInstance(click.data.name, folder) - ) - } + dialog.show() + + // If user has clicked the switch do not interfere + var preventAutoSwitching = false + binding.hlsSwitch.setOnClickListener { + preventAutoSwitching = true } - DOWNLOAD_ACTION_LOAD_RESULT -> { - activity?.loadResult(click.data.url, click.data.apiName) - } - } - } - - private fun handleSelectedChange(selected: MutableSet) { - if (selected.isNotEmpty()) { - binding?.downloadDeleteAppbar?.isVisible = true - binding?.downloadStorageAppbar?.isVisible = false - activity?.attachBackPressedCallback { - downloadsViewModel.setIsMultiDeleteState(false) + fun activateSwitchOnHls(text: String?) { + binding.hlsSwitch.isChecked = normalSafeApiCall { + URI(text).path?.substringAfterLast(".")?.contains("m3u") + } == true } - binding?.btnDelete?.setOnClickListener { - context?.let { ctx -> - downloadsViewModel.handleMultiDelete(ctx) - } + binding.streamReferer.doOnTextChanged { text, _, _, _ -> + if (!preventAutoSwitching) + activateSwitchOnHls(text?.toString()) } - binding?.btnCancel?.setOnClickListener { - downloadsViewModel.setIsMultiDeleteState(false) + (activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager?)?.primaryClip?.getItemAt( + 0 + )?.text?.toString()?.let { copy -> + val fixedText = copy.trim() + binding.streamUrl.setText(fixedText) + activateSwitchOnHls(fixedText) } - binding?.btnToggleAll?.setOnClickListener { - val allSelected = downloadsViewModel.isAllSelected() - val adapter = binding?.downloadList?.adapter as? DownloadAdapter - if (allSelected) { - adapter?.notifySelectionStates() - downloadsViewModel.clearSelectedItems() + binding.applyBtt.setOnClickListener { + val url = binding.streamUrl.text?.toString() + if (url.isNullOrEmpty()) { + showToast(R.string.error_invalid_url, Toast.LENGTH_SHORT) } else { - adapter?.notifyAllSelected() - downloadsViewModel.selectAllItems() - } - } + val referer = binding.streamReferer.text?.toString() - downloadsViewModel.setIsMultiDeleteState(true) - } - } - - private fun updateDeleteButton(count: Int, selectedBytes: Long) { - val formattedSize = formatShortFileSize(context, selectedBytes) - binding?.btnDelete?.text = - getString(R.string.delete_format).format(count, formattedSize) - } - - private fun updateStorageInfo( - context: Context, - bytes: Long, - @StringRes stringRes: Int, - textView: TextView?, - view: View? - ) { - textView?.text = getString(R.string.storage_size_format).format( - getString(stringRes), - formatShortFileSize(context, bytes) - ) - view?.setLayoutWidth(bytes) - } - - private fun openLocalVideo() { - val intent = Intent() - .setAction(Intent.ACTION_GET_CONTENT) - .setType("video/*") - .addCategory(Intent.CATEGORY_OPENABLE) - .addFlags(FLAG_GRANT_READ_URI_PERMISSION) // Request temporary access - normalSafeApiCall { - videoResultLauncher.launch( - Intent.createChooser( - intent, - getString(R.string.open_local_video) - ) - ) - } - } - - private fun showStreamInputDialog(context: Context) { - val dialog = Dialog(context, R.style.AlertDialogCustom) - val binding = StreamInputBinding.inflate(dialog.layoutInflater) - dialog.setContentView(binding.root) - dialog.show() - - var preventAutoSwitching = false - binding.hlsSwitch.setOnClickListener { preventAutoSwitching = true } - - binding.streamReferer.doOnTextChanged { text, _, _, _ -> - if (!preventAutoSwitching) activateSwitchOnHls(text?.toString(), binding) - } - - (activity?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager)?.primaryClip?.getItemAt( - 0 - )?.text?.toString()?.let { copy -> - val fixedText = copy.trim() - binding.streamUrl.setText(fixedText) - activateSwitchOnHls(fixedText, binding) - } - - binding.applyBtt.setOnClickListener { - val url = binding.streamUrl.text?.toString() - if (url.isNullOrEmpty()) { - showToast(R.string.error_invalid_url, Toast.LENGTH_SHORT) - } else { - val referer = binding.streamReferer.text?.toString() - activity?.navigate( - R.id.global_to_navigation_player, - GeneratorPlayer.newInstance( - LinkGenerator( - listOf(BasicLink(url)), - extract = true, - referer = referer, - isM3u8 = binding.hlsSwitch.isChecked + activity?.navigate( + R.id.global_to_navigation_player, + GeneratorPlayer.newInstance( + LinkGenerator( + listOf(BasicLink(url)), + extract = true, + referer = referer, + isM3u8 = binding.hlsSwitch.isChecked + ) ) ) - ) + + dialog.dismissSafe(activity) + } + } + + binding.cancelBtt.setOnClickListener { dialog.dismissSafe(activity) } } - - binding.cancelBtt.setOnClickListener { - dialog.dismissSafe(activity) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + binding?.downloadList?.setOnScrollChangeListener { _, _, scrollY, _, oldScrollY -> + val dy = scrollY - oldScrollY + if (dy > 0) { //check for scroll down + binding?.downloadStreamButton?.shrink() // hide + } else if (dy < -5) { + binding?.downloadStreamButton?.extend() // show + } + } } - } + downloadsViewModel.updateList(requireContext()) - private fun activateSwitchOnHls(text: String?, binding: StreamInputBinding) { - binding.hlsSwitch.isChecked = normalSafeApiCall { - URI(text).path?.substringAfterLast(".")?.contains("m3u") - } == true - } - - private fun handleScroll(dy: Int) { - if (dy > 0) { - binding?.downloadStreamButton?.shrink() - } else if (dy < -5) { - binding?.downloadStreamButton?.extend() - } - } - - // Open local video from files using content provider x safeFile - private val videoResultLauncher = registerForActivityResult( - ActivityResultContracts.StartActivityForResult() - ) { result -> - if (result.resultCode != Activity.RESULT_OK) return@registerForActivityResult - val selectedVideoUri = result?.data?.data ?: return@registerForActivityResult - playUri(activity ?: return@registerForActivityResult, selectedVideoUri) + fixPaddingStatusbar(binding?.downloadRoot) } } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadHeaderAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadHeaderAdapter.kt new file mode 100644 index 00000000..65a6441f --- /dev/null +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadHeaderAdapter.kt @@ -0,0 +1,149 @@ +package com.lagradost.cloudstream3.ui.download + +import android.annotation.SuppressLint +import android.text.format.Formatter.formatShortFileSize +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.core.view.isVisible +import androidx.recyclerview.widget.RecyclerView +import com.lagradost.cloudstream3.R +import com.lagradost.cloudstream3.databinding.DownloadHeaderEpisodeBinding +import com.lagradost.cloudstream3.mvvm.logError +import com.lagradost.cloudstream3.utils.UIHelper.setImage +import com.lagradost.cloudstream3.utils.VideoDownloadHelper +import java.util.* + +data class VisualDownloadHeaderCached( + val currentOngoingDownloads: Int, + val totalDownloads: Int, + val totalBytes: Long, + val currentBytes: Long, + val data: VideoDownloadHelper.DownloadHeaderCached, + val child: VideoDownloadHelper.DownloadEpisodeCached?, +) + +data class DownloadHeaderClickEvent( + val action: Int, + val data: VideoDownloadHelper.DownloadHeaderCached +) + +class DownloadHeaderAdapter( + var cardList: List, + private val clickCallback: (DownloadHeaderClickEvent) -> Unit, + private val movieClickCallback: (DownloadClickEvent) -> Unit, +) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + return DownloadHeaderViewHolder( + DownloadHeaderEpisodeBinding.inflate( + LayoutInflater.from(parent.context), + parent, + false + ), + clickCallback, + movieClickCallback + ) + } + + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + when (holder) { + is DownloadHeaderViewHolder -> { + holder.bind(cardList[position]) + } + } + } + + override fun getItemCount(): Int { + return cardList.size + } + + class DownloadHeaderViewHolder + constructor( + val binding: DownloadHeaderEpisodeBinding, + private val clickCallback: (DownloadHeaderClickEvent) -> Unit, + private val movieClickCallback: (DownloadClickEvent) -> Unit, + ) : RecyclerView.ViewHolder(binding.root) { + + /*private val poster: ImageView? = itemView.download_header_poster + private val title: TextView = itemView.download_header_title + private val extraInfo: TextView = itemView.download_header_info + private val holder: CardView = itemView.episode_holder + + private val downloadBar: ContentLoadingProgressBar = itemView.download_header_progress_downloaded + private val downloadImage: ImageView = itemView.download_header_episode_download + private val normalImage: ImageView = itemView.download_header_goto_child*/ + + @SuppressLint("SetTextI18n") + fun bind(card: VisualDownloadHeaderCached) { + val d = card.data + + binding.downloadHeaderPoster.apply { + setImage(d.poster) + setOnClickListener { + clickCallback.invoke(DownloadHeaderClickEvent(1, d)) + } + } + + binding.apply { + + binding.downloadHeaderTitle.text = d.name + val mbString = formatShortFileSize(itemView.context, card.totalBytes) + + //val isMovie = d.type.isMovieType() + if (card.child != null) { + //downloadHeaderProgressDownloaded.visibility = View.VISIBLE + + // downloadHeaderEpisodeDownload.visibility = View.VISIBLE + binding.downloadHeaderGotoChild.visibility = View.GONE + + downloadButton.setDefaultClickListener(card.child, downloadHeaderInfo, movieClickCallback) + downloadButton.isVisible = true + /*setUpButton( + card.currentBytes, + card.totalBytes, + downloadBar, + downloadImage, + extraInfo, + card.child, + movieClickCallback + )*/ + + episodeHolder.setOnClickListener { + movieClickCallback.invoke( + DownloadClickEvent( + DOWNLOAD_ACTION_PLAY_FILE, + card.child + ) + ) + } + } else { + downloadButton.isVisible = false + // downloadHeaderProgressDownloaded.visibility = View.GONE + // downloadHeaderEpisodeDownload.visibility = View.GONE + binding.downloadHeaderGotoChild.visibility = View.VISIBLE + + try { + downloadHeaderInfo.text = + downloadHeaderInfo.context.getString(R.string.extra_info_format).format( + card.totalDownloads, + if (card.totalDownloads == 1) downloadHeaderInfo.context.getString(R.string.episode) else downloadHeaderInfo.context.getString( + R.string.episodes + ), + mbString + ) + } catch (t: Throwable) { + // you probably formatted incorrectly + downloadHeaderInfo.text = "Error" + logError(t) + } + + + episodeHolder.setOnClickListener { + clickCallback.invoke(DownloadHeaderClickEvent(0, d)) + } + } + } + } + } +} diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt index 137f1355..3a74a715 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadViewModel.kt @@ -1,439 +1,122 @@ package com.lagradost.cloudstream3.ui.download import android.content.Context -import android.content.DialogInterface import android.os.Environment import android.os.StatFs -import androidx.appcompat.app.AlertDialog import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.isEpisodeBased +import com.lagradost.cloudstream3.isMovieType import com.lagradost.cloudstream3.mvvm.launchSafe import com.lagradost.cloudstream3.mvvm.logError -import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull -import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE import com.lagradost.cloudstream3.utils.DataStore.getFolderName import com.lagradost.cloudstream3.utils.DataStore.getKey import com.lagradost.cloudstream3.utils.DataStore.getKeys import com.lagradost.cloudstream3.utils.VideoDownloadHelper -import com.lagradost.cloudstream3.utils.VideoDownloadManager.deleteFilesAndUpdateSettings -import com.lagradost.cloudstream3.utils.VideoDownloadManager.getDownloadFileInfoAndUpdateSettings +import com.lagradost.cloudstream3.utils.VideoDownloadManager import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch import kotlinx.coroutines.withContext class DownloadViewModel : ViewModel() { + private val _noDownloadsText = MutableLiveData().apply { + value = "" + } + val noDownloadsText: LiveData = _noDownloadsText - private val _headerCards = MutableLiveData>() - val headerCards: LiveData> = _headerCards - - private val _childCards = MutableLiveData>() - val childCards: LiveData> = _childCards + private val _headerCards = + MutableLiveData>().apply { listOf() } + val headerCards: LiveData> = _headerCards private val _usedBytes = MutableLiveData() - val usedBytes: LiveData = _usedBytes - private val _availableBytes = MutableLiveData() - val availableBytes: LiveData = _availableBytes - private val _downloadBytes = MutableLiveData() + + val usedBytes: LiveData = _usedBytes + val availableBytes: LiveData = _availableBytes val downloadBytes: LiveData = _downloadBytes - private val _selectedBytes = MutableLiveData(0) - val selectedBytes: LiveData = _selectedBytes - - private val _isMultiDeleteState = MutableLiveData(false) - val isMultiDeleteState: LiveData = _isMultiDeleteState - - private val _selectedItemIds = MutableLiveData>(mutableSetOf()) - val selectedItemIds: LiveData> = _selectedItemIds - - private var previousVisual: List? = null - - fun setIsMultiDeleteState(value: Boolean) { - _isMultiDeleteState.postValue(value) - } - - fun addSelected(itemId: Int) { - updateSelectedItems { it.add(itemId) } - } - - fun removeSelected(itemId: Int) { - updateSelectedItems { it.remove(itemId) } - } - - fun selectAllItems() { - val items = headerCards.value.orEmpty() + childCards.value.orEmpty() - updateSelectedItems { it.addAll(items.map { item -> item.data.id }) } - } - - fun clearSelectedItems() { - // We need this to be done immediately - // so we can't use postValue - _selectedItemIds.value = mutableSetOf() - updateSelectedItems { it.clear() } - } - - fun isAllSelected(): Boolean { - val currentSelected = selectedItemIds.value ?: return false - val items = headerCards.value.orEmpty() + childCards.value.orEmpty() - return items.count() == currentSelected.count() && items.all { it.data.id in currentSelected } - } - - private fun updateSelectedItems(action: (MutableSet) -> Unit) { - val currentSelected = selectedItemIds.value ?: mutableSetOf() - action(currentSelected) - _selectedItemIds.postValue(currentSelected) - updateSelectedBytes() - updateSelectedCards() - } - - private fun updateSelectedBytes() = viewModelScope.launchSafe { - val selectedItemsList = getSelectedItemsData() ?: return@launchSafe - val totalSelectedBytes = selectedItemsList.sumOf { it.totalBytes } - _selectedBytes.postValue(totalSelectedBytes) - } - - private fun updateSelectedCards() = viewModelScope.launchSafe { - val currentSelected = selectedItemIds.value ?: return@launchSafe - - headerCards.value?.let { headers -> - headers.forEach { header -> - header.isSelected = header.data.id in currentSelected - } - _headerCards.postValue(headers) - } - - childCards.value?.let { children -> - children.forEach { child -> - child.isSelected = child.data.id in currentSelected - } - _childCards.postValue(children) - } - } - - fun updateHeaderList(context: Context) = viewModelScope.launchSafe { - val visual = withContext(Dispatchers.IO) { - val children = context.getKeys(DOWNLOAD_EPISODE_CACHE) - .mapNotNull { context.getKey(it) } + fun updateList(context: Context) = viewModelScope.launchSafe { + val children = withContext(Dispatchers.IO) { + val headers = context.getKeys(DOWNLOAD_EPISODE_CACHE) + headers.mapNotNull { context.getKey(it) } .distinctBy { it.id } // Remove duplicates - - val (totalBytesUsedByChild, currentBytesUsedByChild, totalDownloads) = - calculateDownloadStats(context, children) - - val cached = context.getKeys(DOWNLOAD_HEADER_CACHE) - .mapNotNull { context.getKey(it) } - - createVisualDownloadList( - context, cached, totalBytesUsedByChild, currentBytesUsedByChild, totalDownloads - ) } - if (visual != previousVisual) { - previousVisual = visual - updateStorageStats(visual) - _headerCards.postValue(visual) - } - } - - private fun calculateDownloadStats( - context: Context, - children: List - ): Triple, Map, Map> { // parentId : bytes - val totalBytesUsedByChild = mutableMapOf() + val totalBytesUsedByChild = HashMap() // parentId : bytes - val currentBytesUsedByChild = mutableMapOf() + val currentBytesUsedByChild = HashMap() // parentId : downloadsCount - val totalDownloads = mutableMapOf() + val totalDownloads = HashMap() - children.forEach { child -> - val childFile = getDownloadFileInfoAndUpdateSettings(context, child.id) ?: return@forEach - if (childFile.fileLength <= 1) return@forEach - val len = childFile.totalBytes - val flen = childFile.fileLength + // Gets all children downloads + withContext(Dispatchers.IO) { + for (c in children) { + val childFile = VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(context, c.id) ?: continue - totalBytesUsedByChild.merge(child.parentId, len, Long::plus) - currentBytesUsedByChild.merge(child.parentId, flen, Long::plus) - totalDownloads.merge(child.parentId, 1, Int::plus) + if (childFile.fileLength <= 1) continue + val len = childFile.totalBytes + val flen = childFile.fileLength + + totalBytesUsedByChild[c.parentId] = totalBytesUsedByChild[c.parentId]?.plus(len) ?: len + currentBytesUsedByChild[c.parentId] = currentBytesUsedByChild[c.parentId]?.plus(flen) ?: flen + totalDownloads[c.parentId] = totalDownloads[c.parentId]?.plus(1) ?: 1 + } } - return Triple(totalBytesUsedByChild, currentBytesUsedByChild, totalDownloads) - } - private fun createVisualDownloadList( - context: Context, - cached: List, - totalBytesUsedByChild: Map, - currentBytesUsedByChild: Map, - totalDownloads: Map - ): List { - return cached.mapNotNull { - val downloads = totalDownloads[it.id] ?: 0 - val bytes = totalBytesUsedByChild[it.id] ?: 0 - val currentBytes = currentBytesUsedByChild[it.id] ?: 0 - if (bytes <= 0 || downloads <= 0) return@mapNotNull null - - val isSelected = selectedItemIds.value?.contains(it.id) ?: false - val movieEpisode = if (it.type.isEpisodeBased()) null else context.getKey( - DOWNLOAD_EPISODE_CACHE, - getFolderName(it.id.toString(), it.id.toString()) - ) - - VisualDownloadCached.Header( - currentBytes = currentBytes, - totalBytes = bytes, - data = it, - child = movieEpisode, - currentOngoingDownloads = 0, - totalDownloads = downloads, - isSelected = isSelected, - ) - // Prevent order being almost completely random, - // making things difficult to find. - }.sortedWith(compareBy { - // Sort by isEpisodeBased() ascending. We put those that - // are episode based at the bottom for UI purposes and to - // make it easier to find by grouping them together. - it.data.type.isEpisodeBased() - }.thenBy { - // Then we sort alphabetically by name (case-insensitive). - // Again, we do this to make things easier to find. - it.data.name.lowercase() - }) - } - - fun updateChildList(context: Context, folder: String) = viewModelScope.launchSafe { - val visual = withContext(Dispatchers.IO) { - context.getKeys(folder).mapNotNull { key -> - context.getKey(key) - }.mapNotNull { - val isSelected = selectedItemIds.value?.contains(it.id) ?: false - val info = getDownloadFileInfoAndUpdateSettings(context, it.id) ?: return@mapNotNull null - VisualDownloadCached.Child( - currentBytes = info.fileLength, - totalBytes = info.totalBytes, - isSelected = isSelected, - data = it, + val cached = withContext(Dispatchers.IO) { // wont fetch useless keys + totalDownloads.entries.filter { it.value > 0 }.mapNotNull { + context.getKey( + DOWNLOAD_HEADER_CACHE, + it.key.toString() ) } - }.sortedWith(compareBy( - // Sort by season first, and then by episode number, - // to ensure sorting is consistent. - { it.data.season ?: 0 }, - { it.data.episode } - )) - - if (previousVisual != visual) { - previousVisual = visual - _childCards.postValue(visual) } - } - private fun removeItems(idsToRemove: Set) = viewModelScope.launchSafe { - val updatedHeaders = headerCards.value.orEmpty().filter { it.data.id !in idsToRemove } - val updatedChildren = childCards.value.orEmpty().filter { it.data.id !in idsToRemove } - _headerCards.postValue(updatedHeaders) - _childCards.postValue(updatedChildren) - } - - private fun updateStorageStats(visual: List) { + val visual = withContext(Dispatchers.IO) { + cached.mapNotNull { // TODO FIX + val downloads = totalDownloads[it.id] ?: 0 + val bytes = totalBytesUsedByChild[it.id] ?: 0 + val currentBytes = currentBytesUsedByChild[it.id] ?: 0 + if (bytes <= 0 || downloads <= 0) return@mapNotNull null + val movieEpisode = + if (!it.type.isMovieType()) null + else context.getKey( + DOWNLOAD_EPISODE_CACHE, + getFolderName(it.id.toString(), it.id.toString()) + ) + VisualDownloadHeaderCached( + 0, + downloads, + bytes, + currentBytes, + it, + movieEpisode + ) + }.sortedBy { + (it.child?.episode ?: 0) + (it.child?.season?.times(10000) ?: 0) + } // episode sorting by episode, lowest to highest + } try { val stat = StatFs(Environment.getExternalStorageDirectory().path) - val localBytesAvailable = stat.availableBytes + + val localBytesAvailable = stat.availableBytes//stat.blockSizeLong * stat.blockCountLong val localTotalBytes = stat.blockSizeLong * stat.blockCountLong val localDownloadedBytes = visual.sumOf { it.totalBytes } - val localUsedBytes = localTotalBytes - localBytesAvailable - _usedBytes.postValue(localUsedBytes) + + _usedBytes.postValue(localTotalBytes - localBytesAvailable - localDownloadedBytes) _availableBytes.postValue(localBytesAvailable) _downloadBytes.postValue(localDownloadedBytes) - } catch (t: Throwable) { + } catch (t : Throwable) { _downloadBytes.postValue(0) logError(t) } + + _headerCards.postValue(visual) } - - fun handleMultiDelete(context: Context) = viewModelScope.launchSafe { - val selectedItemsList = getSelectedItemsData().orEmpty() - val deleteData = processSelectedItems(context, selectedItemsList) - val message = buildDeleteMessage(context, deleteData) - showDeleteConfirmationDialog(context, message, deleteData.ids, deleteData.parentIds) - } - - fun handleSingleDelete( - context: Context, - itemId: Int - ) = viewModelScope.launchSafe { - val itemData = getItemDataFromId(itemId) - val deleteData = processSelectedItems(context, itemData) - val message = buildDeleteMessage(context, deleteData) - showDeleteConfirmationDialog(context, message, deleteData.ids, deleteData.parentIds) - } - - private fun processSelectedItems( - context: Context, - selectedItemsList: List - ): DeleteData { - val names = mutableListOf() - val seriesNames = mutableListOf() - - val ids = mutableSetOf() - val parentIds = mutableSetOf() - - var parentName: String? = null - - selectedItemsList.forEach { item -> - when (item) { - is VisualDownloadCached.Header -> { - if (item.data.type.isEpisodeBased()) { - val episodes = context.getKeys(DOWNLOAD_EPISODE_CACHE) - .mapNotNull { - context.getKey( - it - ) - } - .filter { it.parentId == item.data.id } - .map { it.id } - ids.addAll(episodes) - parentIds.add(item.data.id) - - val episodeInfo = "${item.data.name} (${item.totalDownloads} ${ - context.resources.getQuantityString( - R.plurals.episodes, - item.totalDownloads - ).lowercase() - })" - seriesNames.add(episodeInfo) - } else { - ids.add(item.data.id) - names.add(item.data.name) - } - } - - is VisualDownloadCached.Child -> { - ids.add(item.data.id) - val parent = context.getKey( - DOWNLOAD_HEADER_CACHE, - item.data.parentId.toString() - ) - parentName = parent?.name - names.add( - context.getNameFull( - item.data.name, - item.data.episode, - item.data.season - ) - ) - } - } - } - - return DeleteData(ids, parentIds, seriesNames, names, parentName) - } - - private fun buildDeleteMessage( - context: Context, - data: DeleteData - ): String { - val formattedNames = data.names.sortedBy { it.lowercase() } - .joinToString(separator = "\n") { "• $it" } - val formattedSeriesNames = data.seriesNames.sortedBy { it.lowercase() } - .joinToString(separator = "\n") { "• $it" } - - return when { - data.ids.count() == 1 -> { - context.getString(R.string.delete_message).format( - data.names.firstOrNull() - ) - } - - data.seriesNames.isNotEmpty() && data.names.isEmpty() -> { - context.getString(R.string.delete_message_series_only).format(formattedSeriesNames) - } - - data.parentName != null && data.names.isNotEmpty() -> { - context.getString(R.string.delete_message_series_episodes) - .format(data.parentName, formattedNames) - } - - data.seriesNames.isNotEmpty() -> { - val seriesSection = context.getString(R.string.delete_message_series_section) - .format(formattedSeriesNames) - context.getString(R.string.delete_message_multiple) - .format(formattedNames) + "\n\n" + seriesSection - } - - else -> context.getString(R.string.delete_message_multiple).format(formattedNames) - } - } - - private fun showDeleteConfirmationDialog( - context: Context, - message: String, - ids: Set, - parentIds: Set - ) { - val builder = AlertDialog.Builder(context) - val dialogClickListener = - DialogInterface.OnClickListener { _, which -> - when (which) { - DialogInterface.BUTTON_POSITIVE -> { - viewModelScope.launchSafe { - setIsMultiDeleteState(false) - deleteFilesAndUpdateSettings(context, ids, this) { successfulIds -> - // We always remove parent because if we are deleting from here - // and we have it as non-empty, it was triggered on - // parent header card - removeItems(successfulIds + parentIds) - } - } - } - - DialogInterface.BUTTON_NEGATIVE -> { - // Do nothing on cancel - } - } - } - - try { - val title = if (ids.count() == 1) { - R.string.delete_file - } else R.string.delete_files - builder.setTitle(title) - .setMessage(message) - .setPositiveButton(R.string.delete, dialogClickListener) - .setNegativeButton(R.string.cancel, dialogClickListener) - .show().setDefaultFocus() - } catch (e: Exception) { - logError(e) - } - } - - private fun getSelectedItemsData(): List? { - val headers = headerCards.value.orEmpty() - val children = childCards.value.orEmpty() - - return selectedItemIds.value?.mapNotNull { id -> - headers.find { it.data.id == id } ?: children.find { it.data.id == id } - } - } - - private fun getItemDataFromId(itemId: Int): List { - val headers = headerCards.value.orEmpty() - val children = childCards.value.orEmpty() - - return (headers + children).filter { it.data.id == itemId } - } - - private data class DeleteData( - val ids: Set, - val parentIds: Set, - val seriesNames: List, - val names: List, - val parentName: String? - ) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt index 908e3a80..b43f1aac 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/BaseFetchButton.kt @@ -1,7 +1,7 @@ package com.lagradost.cloudstream3.ui.download.button import android.content.Context -import android.text.format.Formatter.formatShortFileSize +import android.text.format.Formatter import android.util.AttributeSet import android.widget.FrameLayout import android.widget.TextView @@ -9,8 +9,6 @@ import androidx.annotation.LayoutRes import androidx.core.view.isVisible import androidx.core.widget.ContentLoadingProgressBar import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.utils.Coroutines.ioSafe -import com.lagradost.cloudstream3.utils.Coroutines.mainWork import com.lagradost.cloudstream3.utils.VideoDownloadManager typealias DownloadStatusTell = VideoDownloadManager.DownloadType @@ -36,7 +34,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) : lateinit var progressBar: ContentLoadingProgressBar var progressText: TextView? = null - /* val gid: String? get() = sessionIdToGid[persistentId] + /*val gid: String? get() = sessionIdToGid[persistentId] // used for resuming data var _lastRequestOverride: UriRequest? = null @@ -46,7 +44,7 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) : _lastRequestOverride = value } - var files: List = emptyList() */ + var files: List = emptyList()*/ protected var isZeroBytes: Boolean = true fun inflate(@LayoutRes layout: Int) { @@ -54,16 +52,12 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) : } init { - @Suppress("LeakingThis") resetViewData() } - var doSetProgress = true - open fun resetViewData() { // lastRequest = null isZeroBytes = true - doSetProgress = true persistentId = null } @@ -74,45 +68,37 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) : persistentId = id currentMetaData.id = id - if (!doSetProgress) return + VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(context, id)?.let { savedData -> + val downloadedBytes = savedData.fileLength + val totalBytes = savedData.totalBytes - ioSafe { - val savedData = VideoDownloadManager.getDownloadFileInfoAndUpdateSettings(context, id) + /*lastRequest = savedData.uriRequest + files = savedData.files - mainWork { - if (savedData != null) { - val downloadedBytes = savedData.fileLength - val totalBytes = savedData.totalBytes - - setProgress(downloadedBytes, totalBytes) - applyMetaData(id, downloadedBytes, totalBytes) - } else run { resetView() } + var totalBytes: Long = 0 + var downloadedBytes: Long = 0 + for (file in savedData.files) { + downloadedBytes += file.completedLength + totalBytes += file.length + }*/ + setProgress(downloadedBytes, totalBytes) + // some extra padding for just in case + val status = VideoDownloadManager.downloadStatus[id] + ?: if (downloadedBytes > 1024L && downloadedBytes + 1024L >= totalBytes) DownloadStatusTell.IsDone else DownloadStatusTell.IsPaused + currentMetaData.apply { + this.id = id + this.downloadedLength = downloadedBytes + this.totalLength = totalBytes + this.status = status } + setStatus(status) + } ?: run { + resetView() } } abstract fun setStatus(status: VideoDownloadManager.DownloadType?) - fun getStatus(id: Int, downloadedBytes: Long, totalBytes: Long): DownloadStatusTell { - // some extra padding for just in case - return VideoDownloadManager.downloadStatus[id] - ?: if (downloadedBytes > 1024L && downloadedBytes + 1024L >= totalBytes) { - DownloadStatusTell.IsDone - } else DownloadStatusTell.IsPaused - } - - fun applyMetaData(id: Int, downloadedBytes: Long, totalBytes: Long) { - val status = getStatus(id, downloadedBytes, totalBytes) - - currentMetaData.apply { - this.id = id - this.downloadedLength = downloadedBytes - this.totalLength = totalBytes - this.status = status - } - setStatus(status) - } - open fun setProgress(downloadedBytes: Long, totalBytes: Long) { isZeroBytes = downloadedBytes == 0L progressBar.post { @@ -138,16 +124,13 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) : if (isZeroBytes) { progressText?.isVisible = false } else { - if (doSetProgress) { - progressText?.apply { - val currentFormattedSizeString = - formatShortFileSize(context, downloadedBytes) - val totalFormattedSizeString = formatShortFileSize(context, totalBytes) - text = - // if (isTextPercentage) "%d%%".format(setCurrentBytes * 100L / setTotalBytes) else - context?.getString(R.string.download_size_format) - ?.format(currentFormattedSizeString, totalFormattedSizeString) - } + progressText?.apply { + val currentMbString = Formatter.formatShortFileSize(context, downloadedBytes) + val totalMbString = Formatter.formatShortFileSize(context, totalBytes) + text = + //if (isTextPercentage) "%d%%".format(setCurrentBytes * 100L / setTotalBytes) else + context?.getString(R.string.download_size_format) + ?.format(currentMbString, totalMbString) } } @@ -184,8 +167,8 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) : override fun onAttachedToWindow() { VideoDownloadManager.downloadStatusEvent += ::downloadStatusEvent - // VideoDownloadManager.downloadDeleteEvent += ::downloadDeleteEvent - // VideoDownloadManager.downloadEvent += ::downloadEvent + //VideoDownloadManager.downloadDeleteEvent += ::downloadDeleteEvent + //VideoDownloadManager.downloadEvent += ::downloadEvent VideoDownloadManager.downloadProgressEvent += ::downloadProgressEvent val pid = persistentId @@ -199,8 +182,8 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) : override fun onDetachedFromWindow() { VideoDownloadManager.downloadStatusEvent -= ::downloadStatusEvent - // VideoDownloadManager.downloadDeleteEvent -= ::downloadDeleteEvent - // VideoDownloadManager.downloadEvent -= ::downloadEvent + //VideoDownloadManager.downloadDeleteEvent -= ::downloadDeleteEvent + //VideoDownloadManager.downloadEvent -= ::downloadEvent VideoDownloadManager.downloadProgressEvent -= ::downloadProgressEvent super.onDetachedFromWindow() @@ -215,4 +198,5 @@ abstract class BaseFetchButton(context: Context, attributeSet: AttributeSet) : * Get a clean slate again, might be useful in recyclerview? * */ abstract fun resetView() + } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/DownloadButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/DownloadButton.kt index 20a44461..d97a4b88 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/DownloadButton.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/DownloadButton.kt @@ -13,7 +13,7 @@ import com.lagradost.cloudstream3.utils.VideoDownloadHelper class DownloadButton(context: Context, attributeSet: AttributeSet) : PieFetchButton(context, attributeSet) { - private var mainText: TextView? = null + var mainText: TextView? = null override fun onAttachedToWindow() { super.onAttachedToWindow() progressText = findViewById(R.id.result_movie_download_text_precentage) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt index 29c2daa2..d20fcf93 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/button/PieFetchButton.kt @@ -1,20 +1,17 @@ package com.lagradost.cloudstream3.ui.download.button import android.content.Context -import android.os.Looper +import android.graphics.drawable.Drawable import android.util.AttributeSet import android.util.Log import android.view.View import android.view.animation.AnimationUtils import android.widget.ImageView import android.widget.TextView -import androidx.annotation.MainThread import androidx.core.content.ContextCompat import androidx.core.view.isGone import androidx.core.view.isVisible -import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DELETE_FILE import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK @@ -25,7 +22,7 @@ import com.lagradost.cloudstream3.ui.download.DownloadClickEvent import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIcons import com.lagradost.cloudstream3.utils.VideoDownloadHelper import com.lagradost.cloudstream3.utils.VideoDownloadManager -import com.lagradost.cloudstream3.utils.VideoDownloadManager.KEY_RESUME_PACKAGES + open class PieFetchButton(context: Context, attributeSet: AttributeSet) : BaseFetchButton(context, attributeSet) { @@ -44,8 +41,6 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) : private var iconPaused: Int = 0 private var hideWhenIcon: Boolean = true - var progressDrawable: Int = 0 - var overrideLayout: Int? = null companion object { @@ -58,7 +53,7 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) : } private var progressBarBackground: View - var statusView: ImageView + private var statusView: ImageView open fun onInflate() {} @@ -116,10 +111,10 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) : R.styleable.PieFetchButton_download_icon_complete, R.drawable.download_icon_done ) iconPaused = getResourceId( - R.styleable.PieFetchButton_download_icon_paused, 0 // R.drawable.download_icon_pause + R.styleable.PieFetchButton_download_icon_paused, 0//R.drawable.download_icon_pause ) iconActive = getResourceId( - R.styleable.PieFetchButton_download_icon_active, 0 // R.drawable.download_icon_load + R.styleable.PieFetchButton_download_icon_active, 0 //R.drawable.download_icon_load ) iconWaiting = getResourceId( R.styleable.PieFetchButton_download_icon_waiting, 0 @@ -130,7 +125,7 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) : val fillIndex = getInt(R.styleable.PieFetchButton_download_fill, 0) - progressDrawable = getResourceId( + val progressDrawable = getResourceId( R.styleable.PieFetchButton_download_fill_override, fillArray[fillIndex] ) @@ -169,9 +164,8 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) : this.setPersistentId(card.id) view.setOnClickListener { if (isZeroBytes) { - removeKey(KEY_RESUME_PACKAGES, card.id.toString()) callback(DownloadClickEvent(DOWNLOAD_ACTION_DOWNLOAD, card)) - // callback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_DOWNLOAD, data)) + //callback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_DOWNLOAD, data)) } else { val list = arrayListOf( Pair(DOWNLOAD_ACTION_PLAY_FILE, R.string.popup_play_file), @@ -198,7 +192,7 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) : list ) { callback(DownloadClickEvent(itemId, card)) - // callback.invoke(DownloadClickEvent(itemId, data)) + //callback.invoke(DownloadClickEvent(itemId, data)) } } } @@ -206,7 +200,7 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) : view.setOnLongClickListener { callback(DownloadClickEvent(DOWNLOAD_ACTION_LONG_CLICK, card)) - // clickCallback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_LONG_CLICK, data)) + //clickCallback.invoke(DownloadClickEvent(DOWNLOAD_ACTION_LONG_CLICK, data)) return@setOnLongClickListener true } } @@ -219,7 +213,7 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) : setDefaultClickListener(this, textView, card, callback) } - /* open fun setDefaultClickListener(requestGetter: suspend BaseFetchButton.() -> List) { + /*open fun setDefaultClickListener(requestGetter: suspend BaseFetchButton.() -> List) { this.setOnClickListener { when (this.currentStatus) { null -> { @@ -245,57 +239,42 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) : else -> {} } } - } */ - - @MainThread - private fun setStatusInternal(status: DownloadStatusTell?) { - val isPreActive = isZeroBytes && status == DownloadStatusTell.IsDownloading - if (animateWaiting && (status == DownloadStatusTell.IsPending || isPreActive)) { - val animation = AnimationUtils.loadAnimation(context, waitingAnimation) - progressBarBackground.startAnimation(animation) - } else { - progressBarBackground.clearAnimation() - } - - val progressDrawable = - if (status == DownloadStatusTell.IsDownloading && !isPreActive) activeOutline else nonActiveOutline - - progressBarBackground.background = - ContextCompat.getDrawable(context, progressDrawable) - - val drawable = - getDrawableFromStatus(status)?.let { ContextCompat.getDrawable(this.context, it) } - statusView.setImageDrawable(drawable) - val isDrawable = drawable != null - - statusView.isVisible = isDrawable - val hide = hideWhenIcon && isDrawable - if (hide) { - progressBar.clearAnimation() - progressBarBackground.clearAnimation() - } - progressBarBackground.isGone = hide - progressBar.isGone = hide - } + }*/ /** Also sets currentStatus */ override fun setStatus(status: DownloadStatusTell?) { currentStatus = status - // Runs on the main thread, but also instant if it already is - if (Looper.myLooper() == Looper.getMainLooper()) { - try { - setStatusInternal(status) - } catch (t: Throwable) { - logError(t) // Just in case setStatusInternal throws because thread - progressBarBackground.post { - setStatusInternal(status) - } + //progressBar.isVisible = + // status != null && status != DownloadStatusTell.Complete && status != DownloadStatusTell.Error + //progressBarBackground.isVisible = status != null && status != DownloadStatusTell.Complete + progressBarBackground.post { + val isPreActive = isZeroBytes && status == DownloadStatusTell.IsDownloading + if (animateWaiting && (status == DownloadStatusTell.IsPending || isPreActive)) { + val animation = AnimationUtils.loadAnimation(context, waitingAnimation) + progressBarBackground.startAnimation(animation) + } else { + progressBarBackground.clearAnimation() } - } else { - progressBarBackground.post { - setStatusInternal(status) + + val progressDrawable = + if (status == DownloadStatusTell.IsDownloading && !isPreActive) activeOutline else nonActiveOutline + + progressBarBackground.background = + ContextCompat.getDrawable(context, progressDrawable) + + val drawable = getDrawableFromStatus(status) + statusView.setImageDrawable(drawable) + val isDrawable = drawable != null + + statusView.isVisible = isDrawable + val hide = hideWhenIcon && isDrawable + if (hide) { + progressBar.clearAnimation() + progressBarBackground.clearAnimation() } + progressBarBackground.isGone = hide + progressBar.isGone = hide } } @@ -303,7 +282,6 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) : setStatus(null) currentMetaData = DownloadMetadata(0, 0, 0, null) isZeroBytes = true - doSetProgress = true progressBar.progress = 0 } @@ -327,13 +305,19 @@ open class PieFetchButton(context: Context, attributeSet: AttributeSet) : } } - open fun getDrawableFromStatus(status: DownloadStatusTell?): Int? = when (status) { - DownloadStatusTell.IsPaused -> iconPaused - DownloadStatusTell.IsPending -> iconWaiting - DownloadStatusTell.IsDownloading -> iconActive - DownloadStatusTell.IsFailed -> iconError - DownloadStatusTell.IsDone -> iconComplete - DownloadStatusTell.IsStopped -> iconRemoved - else -> iconInit - }.takeIf { it != 0 } + open fun getDrawableFromStatus(status: DownloadStatusTell?): Drawable? { + val drawableInt = when (status) { + DownloadStatusTell.IsPaused -> iconPaused + DownloadStatusTell.IsPending -> iconWaiting + DownloadStatusTell.IsDownloading -> iconActive + DownloadStatusTell.IsFailed -> iconError + DownloadStatusTell.IsDone -> iconComplete + DownloadStatusTell.IsStopped -> iconRemoved + null -> iconInit + } + if (drawableInt == 0) { + return null + } + return ContextCompat.getDrawable(this.context, drawableInt) + } } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt index b25486eb..f84966eb 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeChildItemAdapter.kt @@ -2,59 +2,32 @@ package com.lagradost.cloudstream3.ui.home import android.view.LayoutInflater import android.view.ViewGroup -import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.RecyclerView import androidx.viewbinding.ViewBinding import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.SearchResponse import com.lagradost.cloudstream3.databinding.HomeResultGridBinding import com.lagradost.cloudstream3.databinding.HomeResultGridExpandedBinding -import com.lagradost.cloudstream3.ui.BaseAdapter -import com.lagradost.cloudstream3.ui.ViewHolderState -import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD import com.lagradost.cloudstream3.ui.search.SearchClickCallback import com.lagradost.cloudstream3.ui.search.SearchResultBuilder -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.UIHelper.isBottomLayout +import com.lagradost.cloudstream3.utils.AppUtils.isRtl +import com.lagradost.cloudstream3.utils.UIHelper.IsBottomLayout import com.lagradost.cloudstream3.utils.UIHelper.toPx -class HomeScrollViewHolderState(view: ViewBinding) : ViewHolderState(view) { - /*private fun recursive(view : View) : Boolean { - if (view.isFocused) { - println("VIEW: $view | id=${view.id}") - } - return (view as? ViewGroup)?.children?.any { recursive(it) } ?: false - }*/ - - // very shitty that we cant store the state when the view clears, - // but this is because the focus clears before the view is removed - // so we have to manually store it - var wasFocused: Boolean = false - override fun save(): Boolean = wasFocused - override fun restore(state: Boolean) { - if (state) { - wasFocused = false - // only refocus if tv - if(isLayout(TV)) { - itemView.requestFocus() - } - } - } -} - class HomeChildItemAdapter( - fragment: Fragment, - id: Int, + val cardList: MutableList, + private val nextFocusUp: Int? = null, private val nextFocusDown: Int? = null, private val clickCallback: (SearchClickCallback) -> Unit, ) : - BaseAdapter(fragment, id) { + RecyclerView.Adapter() { var isHorizontal: Boolean = false var hasNext: Boolean = false - override fun onCreateContent(parent: ViewGroup): ViewHolderState { - val expanded = parent.context.isBottomLayout() + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + val expanded = parent.context.IsBottomLayout() /* val layout = if (bottom) R.layout.home_result_grid_expanded else R.layout.home_result_grid val root = LayoutInflater.from(parent.context).inflate(layout, parent, false) @@ -66,77 +39,164 @@ class HomeChildItemAdapter( parent, false ) else HomeResultGridBinding.inflate(inflater, parent, false) - return HomeScrollViewHolderState(binding) + + + return CardViewHolder( + binding, + clickCallback, + itemCount, + nextFocusUp, + nextFocusDown, + isHorizontal, + parent.isRtl() + ) } - override fun onBindContent( - holder: ViewHolderState, - item: SearchResponse, - position: Int - ) { - when (val binding = holder.view) { - is HomeResultGridBinding -> { - binding.backgroundCard.apply { - val min = 114.toPx - val max = 180.toPx - - layoutParams = - layoutParams.apply { - width = if (!isHorizontal) { - min - } else { - max - } - height = if (!isHorizontal) { - max - } else { - min - } - } - } - } - - is HomeResultGridExpandedBinding -> { - binding.backgroundCard.apply { - val min = 114.toPx - val max = 180.toPx - - layoutParams = - layoutParams.apply { - width = if (!isHorizontal) { - min - } else { - max - } - height = if (!isHorizontal) { - max - } else { - min - } - } - } - - if (position == 0) { // to fix tv - binding.backgroundCard.nextFocusLeftId = R.id.nav_rail_view - } + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + when (holder) { + is CardViewHolder -> { + holder.itemCount = itemCount // i know ugly af + holder.bind(cardList[position], position) } } + } - SearchResultBuilder.bind( - clickCallback = { click -> - // ok, so here we hijack the callback to fix the focus - when (click.action) { - SEARCH_ACTION_LOAD -> (holder as? HomeScrollViewHolderState)?.wasFocused = true - } - clickCallback(click) - }, - item, - position, - holder.itemView, - nextFocusUp, - nextFocusDown + override fun getItemCount(): Int { + return cardList.size + } + + override fun getItemId(position: Int): Long { + return (cardList[position].id ?: position).toLong() + } + + fun updateList(newList: List) { + val diffResult = DiffUtil.calculateDiff( + HomeChildDiffCallback(this.cardList, newList) ) - holder.itemView.tag = position + cardList.clear() + cardList.addAll(newList) + + diffResult.dispatchUpdatesTo(this) + } + + class CardViewHolder + constructor( + val binding: ViewBinding, + private val clickCallback: (SearchClickCallback) -> Unit, + var itemCount: Int, + private val nextFocusUp: Int? = null, + private val nextFocusDown: Int? = null, + private val isHorizontal: Boolean = false, + private val isRtl: Boolean + ) : + RecyclerView.ViewHolder(binding.root) { + + fun bind(card: SearchResponse, position: Int) { + + // TV focus fixing + /*val nextFocusBehavior = when (position) { + 0 -> true + itemCount - 1 -> false + else -> null + } + + if (position == 0) { // to fix tv + if (isRtl) { + itemView.nextFocusRightId = R.id.nav_rail_view + itemView.nextFocusLeftId = -1 + } + else { + itemView.nextFocusLeftId = R.id.nav_rail_view + itemView.nextFocusRightId = -1 + } + } else { + itemView.nextFocusRightId = -1 + itemView.nextFocusLeftId = -1 + }*/ + + + when (binding) { + is HomeResultGridBinding -> { + binding.backgroundCard.apply { + val min = 114.toPx + val max = 180.toPx + + layoutParams = + layoutParams.apply { + width = if (!isHorizontal) { + min + } else { + max + } + height = if (!isHorizontal) { + max + } else { + min + } + } + } + + + } + + is HomeResultGridExpandedBinding -> { + binding.backgroundCard.apply { + val min = 114.toPx + val max = 180.toPx + + layoutParams = + layoutParams.apply { + width = if (!isHorizontal) { + min + } else { + max + } + height = if (!isHorizontal) { + max + } else { + min + } + } + } + + if (position == 0) { // to fix tv + binding.backgroundCard.nextFocusLeftId = R.id.nav_rail_view + } + } + } + + SearchResultBuilder.bind( + clickCallback, + card, + position, + itemView, + null, // nextFocusBehavior, + nextFocusUp, + nextFocusDown + ) + itemView.tag = position + + //val ani = ScaleAnimation(0.9f, 1.0f, 0.9f, 1f) + //ani.fillAfter = true + //ani.duration = 200 + //itemView.startAnimation(ani) + } } } + +class HomeChildDiffCallback( + private val oldList: List, + private val newList: List +) : + DiffUtil.Callback() { + override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) = + oldList[oldItemPosition].name == newList[newItemPosition].name + + override fun getOldListSize() = oldList.size + + override fun getNewListSize() = newList.size + + override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) = + oldList[oldItemPosition] == newList[newItemPosition] && oldItemPosition < oldList.size - 1 // always update the last item +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt index 49de2503..b84c619e 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt @@ -7,6 +7,7 @@ import android.content.DialogInterface import android.content.Intent import android.content.res.Configuration import android.net.Uri +import android.os.Build import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -17,14 +18,23 @@ import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels +import androidx.lifecycle.* import androidx.preference.PreferenceManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog +import com.google.android.material.button.MaterialButton import com.google.android.material.chip.Chip +import com.google.android.material.chip.ChipGroup import com.lagradost.cloudstream3.* import com.lagradost.cloudstream3.APIHolder.apis +import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia +import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings +import com.lagradost.cloudstream3.AcraApplication.Companion.getKey import com.lagradost.cloudstream3.CommonActivity.showToast +import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent +import com.lagradost.cloudstream3.MainActivity.Companion.bookmarksUpdatedEvent +import com.lagradost.cloudstream3.MainActivity.Companion.mainPluginsLoadedEvent import com.lagradost.cloudstream3.databinding.FragmentHomeBinding import com.lagradost.cloudstream3.databinding.HomeEpisodesExpandedBinding import com.lagradost.cloudstream3.databinding.HomeSelectMainpageBinding @@ -35,31 +45,38 @@ import com.lagradost.cloudstream3.mvvm.observe import com.lagradost.cloudstream3.mvvm.observeNullable import com.lagradost.cloudstream3.ui.APIRepository.Companion.noneApi import com.lagradost.cloudstream3.ui.APIRepository.Companion.randomApi -import com.lagradost.cloudstream3.ui.account.AccountHelper.showAccountSelectLinear +import com.lagradost.cloudstream3.ui.WatchType +import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment import com.lagradost.cloudstream3.ui.result.txt import com.lagradost.cloudstream3.ui.search.* import com.lagradost.cloudstream3.ui.search.SearchHelper.handleSearchClickCallback -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.PHONE -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia -import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings -import com.lagradost.cloudstream3.utils.AppContextUtils.isRecyclerScrollable -import com.lagradost.cloudstream3.utils.AppContextUtils.loadSearchResult -import com.lagradost.cloudstream3.utils.AppContextUtils.ownHide -import com.lagradost.cloudstream3.utils.AppContextUtils.ownShow -import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings +import com.lagradost.cloudstream3.utils.AppUtils.addProgramsToContinueWatching +import com.lagradost.cloudstream3.utils.AppUtils.isRecyclerScrollable +import com.lagradost.cloudstream3.utils.AppUtils.loadResult +import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult +import com.lagradost.cloudstream3.utils.AppUtils.ownHide +import com.lagradost.cloudstream3.utils.AppUtils.ownShow +import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus import com.lagradost.cloudstream3.utils.Coroutines.ioSafe +import com.lagradost.cloudstream3.utils.DataStore.getKey +import com.lagradost.cloudstream3.utils.DataStore.setKey import com.lagradost.cloudstream3.utils.DataStoreHelper import com.lagradost.cloudstream3.utils.Event import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe +import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes +import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API + import java.util.* +const val HOME_BOOKMARK_VALUE_LIST = "home_bookmarked_last_list" +const val HOME_PREF_HOMEPAGE = "home_pref_homepage" + class HomeFragment : Fragment() { companion object { val configEvent = Event() @@ -233,7 +250,7 @@ class HomeFragment : Fragment() { return bottomSheetDialogBuilder } - private fun getPairList( + fun getPairList( anime: Chip?, cartoons: Chip?, tvs: Chip?, @@ -312,7 +329,7 @@ class HomeFragment : Fragment() { button?.isVisible = isValid button?.isChecked = isValid && selectedTypes.any { types.contains(it) } button?.isFocusable = true - if (isLayout(TV)) { + if (isTrueTvSettings()) { button?.isFocusableInTouchMode = true } @@ -361,7 +378,10 @@ class HomeFragment : Fragment() { var currentApiName = selectedApiName var currentValidApis: MutableList = mutableListOf() - val preSelectedTypes = DataStoreHelper.homePreference.toMutableList() + val preSelectedTypes = this.getKey>(HOME_PREF_HOMEPAGE) + ?.mapNotNull { listName -> TvType.values().firstOrNull { it.name == listName } } + ?.toMutableList() + ?: mutableListOf(TvType.Movie, TvType.TvSeries) binding.cancelBtt.setOnClickListener { dialog.dismissSafe() @@ -389,7 +409,7 @@ class HomeFragment : Fragment() { } fun updateList() { - DataStoreHelper.homePreference = preSelectedTypes + this.setKey(HOME_PREF_HOMEPAGE, preSelectedTypes) arrayAdapter.clear() currentValidApis = validAPIs.filter { api -> @@ -436,7 +456,7 @@ class HomeFragment : Fragment() { bottomSheetDialog?.ownShow() val layout = - if (isLayout(TV or EMULATOR)) R.layout.fragment_home_tv else R.layout.fragment_home + if (isTvSettings()) R.layout.fragment_home_tv else R.layout.fragment_home val root = inflater.inflate(layout, container, false) binding = try { FragmentHomeBinding.bind(root) @@ -450,7 +470,6 @@ class HomeFragment : Fragment() { } override fun onDestroyView() { - bottomSheetDialog?.ownHide() binding = null super.onDestroyView() @@ -487,10 +506,6 @@ class HomeFragment : Fragment() { private var bottomSheetDialog: BottomSheetDialog? = null - // https://github.com/vivchar/RendererRecyclerViewAdapter/blob/185251ee9d94fb6eb3e063b00d646b745186c365/example/src/main/java/com/github/vivchar/example/pages/github/GithubFragment.kt#L32 - // cry about it, but this is android we are talking about, we cant do the most simple shit without making a global variable - private var instanceState: Bundle = Bundle() - private var homeMasterAdapter: HomeParentItemAdapterPreview? = null @SuppressLint("SetTextI18n") override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -502,23 +517,23 @@ class HomeFragment : Fragment() { //homeChangeApiLoading.setOnClickListener(apiChangeClickListener) homeApiFab.setOnClickListener(apiChangeClickListener) homeChangeApi.setOnClickListener(apiChangeClickListener) - homeSwitchAccount.setOnClickListener { - activity?.showAccountSelectLinear() + homeSwitchAccount.setOnClickListener { v -> + DataStoreHelper.showWhoIsWatching(v?.context ?: return@setOnClickListener) } - homeRandom.setOnClickListener { if (listHomepageItems.isNotEmpty()) { activity.loadSearchResult(listHomepageItems.random()) } } - homeMasterAdapter = HomeParentItemAdapterPreview( - fragment = this@HomeFragment, - homeViewModel, - ) - homeMasterRecycler.adapter = homeMasterAdapter + + homeMasterRecycler.adapter = + HomeParentItemAdapterPreview( + mutableListOf(), + homeViewModel + ) //fixPaddingStatusbar(homeLoadingStatusbar) - homeApiFab.isVisible = isLayout(PHONE) + homeApiFab.isVisible = !isTvSettings() homeMasterRecycler.addOnScrollListener(object : RecyclerView.OnScrollListener() { override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { @@ -526,7 +541,7 @@ class HomeFragment : Fragment() { homeApiFab.shrink() // hide homeRandom.shrink() } else if (dy < -5) { - if (isLayout(PHONE)) { + if (!isTvSettings()) { homeApiFab.extend() // show homeRandom.extend() } @@ -534,7 +549,6 @@ class HomeFragment : Fragment() { super.onScrolled(recyclerView, dx, dy) } }) - } @@ -545,7 +559,7 @@ class HomeFragment : Fragment() { settingsManager.getBoolean( getString(R.string.random_button_key), false - ) && isLayout(PHONE) + ) && !isTvSettings() binding?.homeRandom?.visibility = View.GONE } @@ -565,11 +579,10 @@ class HomeFragment : Fragment() { val mutableListOfResponse = mutableListOf() listHomepageItems.clear() - (homeMasterRecycler.adapter as? ParentItemAdapter)?.submitList(d.values.map { - it.copy( - list = it.list.copy(list = it.list.list.toMutableList()) - ) - }.toMutableList()) + (homeMasterRecycler.adapter as? ParentItemAdapter)?.updateList( + d.values.toMutableList(), + homeMasterRecycler + ) homeLoading.isVisible = false homeLoadingError.isVisible = false @@ -618,7 +631,7 @@ class HomeFragment : Fragment() { } is Resource.Loading -> { - (homeMasterRecycler.adapter as? ParentItemAdapter)?.submitList(listOf()) + (homeMasterRecycler.adapter as? ParentItemAdapter)?.updateList(listOf()) homeLoadingShimmer.startShimmer() homeLoading.isVisible = true homeLoadingError.isVisible = false @@ -656,7 +669,7 @@ class HomeFragment : Fragment() { } homeViewModel.reloadStored() - homeViewModel.loadAndCancel(DataStoreHelper.currentHomePage, false) + homeViewModel.loadAndCancel(getKey(USER_SELECTED_HOMEPAGE_API), false) //loadHomePage(false) // nice profile pic on homepage diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt index 8bc0aa28..163a60a1 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapter.kt @@ -1,30 +1,22 @@ package com.lagradost.cloudstream3.ui.home -import android.os.Build -import android.os.Bundle -import android.os.Parcelable import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.fragment.app.Fragment +import android.widget.TextView +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.ListUpdateCallback import androidx.recyclerview.widget.RecyclerView -import androidx.viewbinding.ViewBinding import com.lagradost.cloudstream3.HomePageList import com.lagradost.cloudstream3.LoadResponse import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.databinding.HomepageParentBinding -import com.lagradost.cloudstream3.mvvm.logError -import com.lagradost.cloudstream3.ui.BaseAdapter -import com.lagradost.cloudstream3.ui.BaseDiffCallback -import com.lagradost.cloudstream3.ui.ViewHolderState import com.lagradost.cloudstream3.ui.result.FOCUS_SELF import com.lagradost.cloudstream3.ui.result.setLinearListLayout import com.lagradost.cloudstream3.ui.search.SearchClickCallback -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.PHONE -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.AppContextUtils.isRecyclerScrollable +import com.lagradost.cloudstream3.ui.search.SearchFragment.Companion.filterSearchResponse +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings +import com.lagradost.cloudstream3.utils.AppUtils.isRecyclerScrollable class LoadClickCallback( val action: Int = 0, @@ -34,89 +26,191 @@ class LoadClickCallback( ) open class ParentItemAdapter( - open val fragment: Fragment, - id: Int, + private var items: MutableList, + //private val viewModel: HomeViewModel, private val clickCallback: (SearchClickCallback) -> Unit, private val moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit, private val expandCallback: ((String) -> Unit)? = null, -) : BaseAdapter( - fragment, - id, - diffCallback = BaseDiffCallback( - itemSame = { a, b -> a.list.name == b.list.name }, - contentSame = { a, b -> - a.list.list == b.list.list +) : RecyclerView.Adapter() { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + + val root = LayoutInflater.from(parent.context).inflate( + if (isTvSettings()) R.layout.homepage_parent_tv else R.layout.homepage_parent, + parent, + false + ) + + val binding = HomepageParentBinding.bind(root) + + return ParentViewHolder( + binding, + clickCallback, + moreInfoClickCallback, + expandCallback + ) + } + + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + when (holder) { + is ParentViewHolder -> { + holder.bind(items[position]) + } + } + } + + override fun getItemCount(): Int { + return items.size + } + + override fun getItemId(position: Int): Long { + return items[position].list.name.hashCode().toLong() + } + + @JvmName("updateListHomePageList") + fun updateList(newList: List) { + updateList(newList.map { HomeViewModel.ExpandableHomepageList(it, 1, false) } + .toMutableList()) + } + + @JvmName("updateListExpandableHomepageList") + fun updateList( + newList: MutableList, + recyclerView: RecyclerView? = null + ) { + // this + // 1. prevents deep copy that makes this.items == newList + // 2. filters out undesirable results + // 3. moves empty results to the bottom (sortedBy is a stable sort) + val new = + newList.map { it.copy(list = it.list.copy(list = it.list.list.filterSearchResponse())) } + .sortedBy { it.list.list.isEmpty() } + + val diffResult = DiffUtil.calculateDiff( + SearchDiffCallback(items, new) + ) + items.clear() + items.addAll(new) + + //val mAdapter = this + val delta = if (this@ParentItemAdapter is HomeParentItemAdapterPreview) { + headItems + } else { + 0 + } + + diffResult.dispatchUpdatesTo(object : ListUpdateCallback { + override fun onInserted(position: Int, count: Int) { + //notifyItemRangeChanged(position + delta, count) + notifyItemRangeInserted(position + delta, count) + } + + override fun onRemoved(position: Int, count: Int) { + notifyItemRangeRemoved(position + delta, count) + } + + override fun onMoved(fromPosition: Int, toPosition: Int) { + notifyItemMoved(fromPosition + delta, toPosition + delta) + } + + override fun onChanged(_position: Int, count: Int, payload: Any?) { + + val position = _position + delta + + // I know kinda messy, what this does is using the update or bind instead of onCreateViewHolder -> bind + recyclerView?.apply { + // this loops every viewHolder in the recycle view and checks the position to see if it is within the update range + val missingUpdates = (position until (position + count)).toMutableSet() + for (i in 0 until itemCount) { + val child = getChildAt(i) ?: continue + val viewHolder = getChildViewHolder(child) ?: continue + if (viewHolder !is ParentViewHolder) continue + + val absolutePosition = viewHolder.bindingAdapterPosition + if (absolutePosition >= position && absolutePosition < position + count) { + val expand = items.getOrNull(absolutePosition - delta) ?: continue + missingUpdates -= absolutePosition + //println("Updating ${viewHolder.title.text} ($absolutePosition $position) -> ${expand.list.name}") + if (viewHolder.title.text == expand.list.name) { + viewHolder.update(expand) + } else { + viewHolder.bind(expand) + } + } + } + + // just in case some item did not get updated + for (i in missingUpdates) { + notifyItemChanged(i, payload) + } + } ?: run { + // in case we don't have a nice + notifyItemRangeChanged(position, count, payload) + } + } }) -) { - data class ParentItemHolder(val binding: ViewBinding) : ViewHolderState(binding) { - override fun save(): Bundle = Bundle().apply { - val recyclerView = (binding as? HomepageParentBinding)?.homeChildRecyclerview - putParcelable( - "value", - recyclerView?.layoutManager?.onSaveInstanceState() - ) - (recyclerView?.adapter as? BaseAdapter<*, *>)?.save(recyclerView) + + //diffResult.dispatchUpdatesTo(this) + } + + class ParentViewHolder + constructor( + val binding: HomepageParentBinding, + // val viewModel: HomeViewModel, + private val clickCallback: (SearchClickCallback) -> Unit, + private val moreInfoClickCallback: (HomeViewModel.ExpandableHomepageList) -> Unit, + private val expandCallback: ((String) -> Unit)? = null, + ) : + RecyclerView.ViewHolder(binding.root) { + val title: TextView = binding.homeChildMoreInfo + private val recyclerView: RecyclerView = binding.homeChildRecyclerview + private val startFocus = R.id.nav_rail_view + private val endFocus = FOCUS_SELF + fun update(expand: HomeViewModel.ExpandableHomepageList) { + val info = expand.list + (recyclerView.adapter as? HomeChildItemAdapter?)?.apply { + updateList(info.list.toMutableList()) + hasNext = expand.hasNext + } ?: run { + recyclerView.adapter = HomeChildItemAdapter( + info.list.toMutableList(), + clickCallback = clickCallback, + nextFocusUp = recyclerView.nextFocusUpId, + nextFocusDown = recyclerView.nextFocusDownId, + ).apply { + isHorizontal = info.isHorizontalImages + hasNext = expand.hasNext + } + recyclerView.setLinearListLayout( + isHorizontal = true, + nextLeft = startFocus, + nextRight = endFocus, + ) + } } - override fun restore(state: Bundle) { - (binding as? HomepageParentBinding)?.homeChildRecyclerview?.layoutManager?.onRestoreInstanceState( - state.getSafeParcelable("value") - ) - } - } - - override fun submitList(list: List?) { - super.submitList(list?.sortedBy { it.list.list.isEmpty() }) - } - - override fun onUpdateContent( - holder: ViewHolderState, - item: HomeViewModel.ExpandableHomepageList, - position: Int - ) { - val binding = holder.view - if (binding !is HomepageParentBinding) return - (binding.homeChildRecyclerview.adapter as? HomeChildItemAdapter)?.submitList(item.list.list) - } - - override fun onBindContent( - holder: ViewHolderState, - item: HomeViewModel.ExpandableHomepageList, - position: Int - ) { - val startFocus = R.id.nav_rail_view - val endFocus = FOCUS_SELF - val binding = holder.view - if (binding !is HomepageParentBinding) return - val info = item.list - binding.apply { - homeChildRecyclerview.adapter = HomeChildItemAdapter( - fragment = fragment, - id = id + position + 100, + fun bind(expand: HomeViewModel.ExpandableHomepageList) { + val info = expand.list + recyclerView.adapter = HomeChildItemAdapter( + info.list.toMutableList(), clickCallback = clickCallback, - nextFocusUp = homeChildRecyclerview.nextFocusUpId, - nextFocusDown = homeChildRecyclerview.nextFocusDownId, + nextFocusUp = recyclerView.nextFocusUpId, + nextFocusDown = recyclerView.nextFocusDownId, ).apply { isHorizontal = info.isHorizontalImages - hasNext = item.hasNext - submitList(item.list.list) + hasNext = expand.hasNext } - homeChildRecyclerview.setLinearListLayout( + recyclerView.setLinearListLayout( isHorizontal = true, nextLeft = startFocus, nextRight = endFocus, ) - homeChildMoreInfo.text = info.name + title.text = info.name - homeChildRecyclerview.addOnScrollListener(object : - RecyclerView.OnScrollListener() { + recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() { var expandCount = 0 - val name = item.list.name + val name = expand.list.name - override fun onScrollStateChanged( - recyclerView: RecyclerView, - newState: Int - ) { + override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { super.onScrollStateChanged(recyclerView, newState) val adapter = recyclerView.adapter @@ -140,40 +234,27 @@ open class ParentItemAdapter( }) //(recyclerView.adapter as HomeChildItemAdapter).notifyDataSetChanged() - if (isLayout(PHONE)) { - homeChildMoreInfo.setOnClickListener { - moreInfoClickCallback.invoke(item) + if (!isTvSettings()) { + title.setOnClickListener { + moreInfoClickCallback.invoke(expand) } } } } - - override fun onCreateContent(parent: ViewGroup): ParentItemHolder { - val layoutResId = when { - isLayout(TV) -> R.layout.homepage_parent_tv - isLayout(EMULATOR) -> R.layout.homepage_parent_emulator - else -> R.layout.homepage_parent - } - - val inflater = LayoutInflater.from(parent.context) - val binding = try { - HomepageParentBinding.bind(inflater.inflate(layoutResId, parent, false)) - } catch (t: Throwable) { - logError(t) - // just in case someone forgot we don't want to crash - HomepageParentBinding.inflate(inflater) - } - - return ParentItemHolder(binding) - } - - fun updateList(newList: List) { - submitList(newList.map { HomeViewModel.ExpandableHomepageList(it, 1, false) } - .toMutableList()) - } } -@Suppress("DEPRECATION") -inline fun Bundle.getSafeParcelable(key: String): T? = - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) getParcelable(key) - else getParcelable(key, T::class.java) \ No newline at end of file +class SearchDiffCallback( + private val oldList: List, + private val newList: List +) : + DiffUtil.Callback() { + override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) = + oldList[oldItemPosition].list.name == newList[newItemPosition].list.name + + override fun getOldListSize() = oldList.size + + override fun getNewListSize() = newList.size + + override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean = + oldList[oldItemPosition] == newList[newItemPosition] +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt index 339ef1e1..1d8e1399 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt @@ -1,7 +1,5 @@ package com.lagradost.cloudstream3.ui.home -import android.os.Bundle -import android.os.Parcelable import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -9,13 +7,13 @@ import androidx.appcompat.widget.SearchView import androidx.core.content.ContextCompat import androidx.core.view.isGone import androidx.core.view.isVisible -import androidx.fragment.app.Fragment import androidx.lifecycle.findViewTreeLifecycleOwner import androidx.recyclerview.widget.RecyclerView import androidx.viewbinding.ViewBinding import androidx.viewpager2.widget.ViewPager2 import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipGroup +import com.lagradost.cloudstream3.APIHolder.getId import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity import com.lagradost.cloudstream3.CommonActivity.activity import com.lagradost.cloudstream3.HomePageList @@ -28,21 +26,16 @@ import com.lagradost.cloudstream3.databinding.FragmentHomeHeadTvBinding import com.lagradost.cloudstream3.mvvm.Resource import com.lagradost.cloudstream3.mvvm.debugException import com.lagradost.cloudstream3.mvvm.observe -import com.lagradost.cloudstream3.ui.ViewHolderState import com.lagradost.cloudstream3.ui.WatchType -import com.lagradost.cloudstream3.ui.account.AccountHelper.showAccountSelectLinear import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.selectHomepage import com.lagradost.cloudstream3.ui.result.FOCUS_SELF import com.lagradost.cloudstream3.ui.result.ResultViewModel2 import com.lagradost.cloudstream3.ui.result.START_ACTION_RESUME_LATEST -import com.lagradost.cloudstream3.ui.result.getId import com.lagradost.cloudstream3.ui.result.setLinearListLayout import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_SHOW_METADATA import com.lagradost.cloudstream3.ui.search.SearchClickCallback -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings import com.lagradost.cloudstream3.utils.DataStoreHelper import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showOptionSelectStringRes @@ -51,84 +44,91 @@ import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbarView import com.lagradost.cloudstream3.utils.UIHelper.populateChips class HomeParentItemAdapterPreview( - override val fragment: Fragment, + items: MutableList, private val viewModel: HomeViewModel, -) : ParentItemAdapter(fragment, id = "HomeParentItemAdapterPreview".hashCode(), - clickCallback = { - viewModel.click(it) - }, moreInfoClickCallback = { - viewModel.popup(it) - }, expandCallback = { - viewModel.expand(it) - }) { - override val headers = 1 - override fun onCreateHeader(parent: ViewGroup): ViewHolderState { - val inflater = LayoutInflater.from(parent.context) - val binding = if (isLayout(TV or EMULATOR)) FragmentHomeHeadTvBinding.inflate( - inflater, - parent, - false - ) else FragmentHomeHeadBinding.inflate(inflater, parent, false) +) : ParentItemAdapter(items, clickCallback = { + viewModel.click(it) +}, moreInfoClickCallback = { + viewModel.popup(it) +}, expandCallback = { + viewModel.expand(it) +}) { + val headItems = 1 - if (binding is FragmentHomeHeadTvBinding && isLayout(EMULATOR)) { - binding.homeBookmarkParentItemMoreInfo.isVisible = true - - val marginInDp = 50 - val density = binding.horizontalScrollChips.context.resources.displayMetrics.density - val marginInPixels = (marginInDp * density).toInt() - - val params = binding.horizontalScrollChips.layoutParams as ViewGroup.MarginLayoutParams - params.marginEnd = marginInPixels - binding.horizontalScrollChips.layoutParams = params - binding.homeWatchParentItemTitle.setCompoundDrawablesWithIntrinsicBounds( - null, - null, - ContextCompat.getDrawable( - parent.context, - R.drawable.ic_baseline_arrow_forward_24 - ), - null - ) - } - - return HeaderViewHolder(binding, viewModel, fragment = fragment) + companion object { + private const val VIEW_TYPE_HEADER = 2 + private const val VIEW_TYPE_ITEM = 1 } - override fun onBindHeader(holder: ViewHolderState) { - (holder as? HeaderViewHolder)?.bind() + override fun getItemViewType(position: Int) = when (position) { + 0 -> VIEW_TYPE_HEADER + else -> VIEW_TYPE_ITEM } - private class HeaderViewHolder( - val binding: ViewBinding, val viewModel: HomeViewModel, fragment: Fragment, - ) : - ViewHolderState(binding) { - - override fun save(): Bundle = - Bundle().apply { - putParcelable( - "resumeRecyclerView", - resumeRecyclerView.layoutManager?.onSaveInstanceState() - ) - putParcelable( - "bookmarkRecyclerView", - bookmarkRecyclerView.layoutManager?.onSaveInstanceState() - ) - //putInt("previewViewpager", previewViewpager.currentItem) - } - - override fun restore(state: Bundle) { - state.getSafeParcelable("resumeRecyclerView")?.let { recycle -> - resumeRecyclerView.layoutManager?.onRestoreInstanceState(recycle) - } - state.getSafeParcelable("bookmarkRecyclerView")?.let { recycle -> - bookmarkRecyclerView.layoutManager?.onRestoreInstanceState(recycle) - } + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + when (holder) { + is HeaderViewHolder -> {} + else -> super.onBindViewHolder(holder, position - headItems) } + } - val previewAdapter = HomeScrollAdapter(fragment = fragment) - private val resumeAdapter = HomeChildItemAdapter( - fragment, - id = "resumeAdapter".hashCode(), + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + return when (viewType) { + VIEW_TYPE_HEADER -> { + val inflater = LayoutInflater.from(parent.context) + val binding = if (isTvSettings()) FragmentHomeHeadTvBinding.inflate( + inflater, + parent, + false + ) else FragmentHomeHeadBinding.inflate(inflater, parent, false) + HeaderViewHolder( + binding, + viewModel, + ) + } + + VIEW_TYPE_ITEM -> super.onCreateViewHolder(parent, viewType) + else -> error("Unhandled viewType=$viewType") + } + } + + override fun getItemCount(): Int { + return super.getItemCount() + headItems + } + + override fun getItemId(position: Int): Long { + if (position == 0) return 0//previewData.hashCode().toLong() + return super.getItemId(position - headItems) + } + + override fun onViewDetachedFromWindow(holder: RecyclerView.ViewHolder) { + when (holder) { + is HeaderViewHolder -> { + holder.onViewDetachedFromWindow() + } + + else -> super.onViewDetachedFromWindow(holder) + } + } + + override fun onViewAttachedToWindow(holder: RecyclerView.ViewHolder) { + when (holder) { + is HeaderViewHolder -> { + holder.onViewAttachedToWindow() + } + + else -> super.onViewAttachedToWindow(holder) + } + } + + class HeaderViewHolder + constructor( + val binding: ViewBinding, + val viewModel: HomeViewModel, + ) : RecyclerView.ViewHolder(binding.root) { + private var previewAdapter: HomeScrollAdapter = HomeScrollAdapter() + private var resumeAdapter: HomeChildItemAdapter = HomeChildItemAdapter( + ArrayList(), nextFocusUp = itemView.nextFocusUpId, nextFocusDown = itemView.nextFocusDownId ) { callback -> @@ -183,9 +183,8 @@ class HomeParentItemAdapterPreview( } } } - private val bookmarkAdapter = HomeChildItemAdapter( - fragment, - id = "bookmarkAdapter".hashCode(), + private var bookmarkAdapter: HomeChildItemAdapter = HomeChildItemAdapter( + ArrayList(), nextFocusUp = itemView.nextFocusUpId, nextFocusDown = itemView.nextFocusDownId ) { callback -> @@ -193,12 +192,6 @@ class HomeParentItemAdapterPreview( viewModel.click(callback) return@HomeChildItemAdapter } - - (callback.view.context?.getActivity() as? MainActivity)?.loadPopup( - callback.card, - load = false - ) - /* callback.view.context?.getActivity()?.showOptionSelectStringRes( callback.view, callback.card.posterUrl, @@ -244,9 +237,9 @@ class HomeParentItemAdapterPreview( } } } - */ } + private val previewViewpager: ViewPager2 = itemView.findViewById(R.id.home_preview_viewpager) @@ -254,24 +247,34 @@ class HomeParentItemAdapterPreview( itemView.findViewById(R.id.home_preview_viewpager_text) // private val previewHeader: FrameLayout = itemView.findViewById(R.id.home_preview) - private val resumeHolder: View = itemView.findViewById(R.id.home_watch_holder) - private val resumeRecyclerView: RecyclerView = + private var resumeHolder: View = itemView.findViewById(R.id.home_watch_holder) + private var resumeRecyclerView: RecyclerView = itemView.findViewById(R.id.home_watch_child_recyclerview) - private val bookmarkHolder: View = itemView.findViewById(R.id.home_bookmarked_holder) - private val bookmarkRecyclerView: RecyclerView = + private var bookmarkHolder: View = itemView.findViewById(R.id.home_bookmarked_holder) + private var bookmarkRecyclerView: RecyclerView = itemView.findViewById(R.id.home_bookmarked_child_recyclerview) - private val homeAccount: View? = itemView.findViewById(R.id.home_preview_switch_account) - private val alternativeHomeAccount: View? = - itemView.findViewById(R.id.alternative_switch_account) + private var homeAccount: View? = + itemView.findViewById(R.id.home_preview_switch_account) - private val topPadding: View? = itemView.findViewById(R.id.home_padding) - - private val alternativeAccountPadding: View? = - itemView.findViewById(R.id.alternative_account_padding) + private var topPadding: View? = itemView.findViewById(R.id.home_padding) private val homeNonePadding: View = itemView.findViewById(R.id.home_none_padding) + private val previewCallback: ViewPager2.OnPageChangeCallback = + object : ViewPager2.OnPageChangeCallback() { + override fun onPageSelected(position: Int) { + previewAdapter.apply { + if (position >= itemCount - 1 && hasMoreItems) { + hasMoreItems = false // don't make two requests + viewModel.loadMoreHomeScrollResponses() + } + } + val item = previewAdapter.getItem(position) ?: return + onSelect(item, position) + } + } + fun onSelect(item: LoadResponse, position: Int) { (binding as? FragmentHomeHeadTvBinding)?.apply { homePreviewDescription.isGone = @@ -282,7 +285,7 @@ class HomeParentItemAdapterPreview( homePreviewText.text = item.name populateChips( homePreviewTags, - item.tags?.take(6) ?: emptyList(), + item.tags ?: emptyList(), R.style.ChipFilledSemiTransparent ) @@ -344,54 +347,66 @@ class HomeParentItemAdapterPreview( homePreviewBookmark.setOnClickListener { fab -> fab.context.getActivity()?.showBottomDialog( - WatchType.entries + WatchType.values() .map { fab.context.getString(it.stringRes) } .toList(), DataStoreHelper.getResultWatchState(id).ordinal, fab.context.getString(R.string.action_add_to_bookmarks), showApply = false, {}) { - val newValue = WatchType.entries[it] + val newValue = WatchType.values()[it] + homePreviewBookmark.setCompoundDrawablesWithIntrinsicBounds( + null, + ContextCompat.getDrawable( + homePreviewBookmark.context, + newValue.iconRes + ), + null, + null + ) + homePreviewBookmark.setText(newValue.stringRes) - ResultViewModel2().updateWatchStatus( - newValue, - fab.context, - item - ) { statusChanged: Boolean -> - if (!statusChanged) return@updateWatchStatus - - homePreviewBookmark.setCompoundDrawablesWithIntrinsicBounds( - null, - ContextCompat.getDrawable( - homePreviewBookmark.context, - newValue.iconRes - ), - null, - null - ) - homePreviewBookmark.setText(newValue.stringRes) - } + ResultViewModel2.updateWatchStatus( + item, + newValue + ) } } } } - private val previewCallback: ViewPager2.OnPageChangeCallback = - object : ViewPager2.OnPageChangeCallback() { - override fun onPageSelected(position: Int) { - previewAdapter.apply { - if (position >= itemCount - 1 && hasMoreItems) { - hasMoreItems = false // don't make two requests - viewModel.loadMoreHomeScrollResponses() + fun onViewDetachedFromWindow() { + previewViewpager.unregisterOnPageChangeCallback(previewCallback) + } + + fun onViewAttachedToWindow() { + previewViewpager.registerOnPageChangeCallback(previewCallback) + + binding.root.findViewTreeLifecycleOwner()?.apply { + observe(viewModel.preview) { + updatePreview(it) + } + if (binding is FragmentHomeHeadTvBinding) { + observe(viewModel.apiName) { name -> + binding.homePreviewChangeApi.text = name + } + } + observe(viewModel.resumeWatching) { + updateResume(it) + } + observe(viewModel.bookmarks) { + updateBookmarks(it) + } + observe(viewModel.availableWatchStatusTypes) { (checked, visible) -> + for ((chip, watch) in toggleList) { + chip.apply { + isVisible = visible.contains(watch) + isChecked = checked.contains(watch) } } - val item = previewAdapter.getItemOrNull(position) ?: return - onSelect(item, position) + toggleListHolder?.isGone = visible.isEmpty() } - } - - override fun onViewDetachedFromWindow() { - previewViewpager.unregisterOnPageChangeCallback(previewCallback) + } ?: debugException { "Expected findViewTreeLifecycleOwner" } } private val toggleList = listOf>( @@ -404,8 +419,6 @@ class HomeParentItemAdapterPreview( private val toggleListHolder: ChipGroup? = itemView.findViewById(R.id.home_type_holder) - fun bind() = Unit - init { previewViewpager.setPageTransformer(HomeScrollTransformer()) @@ -437,12 +450,8 @@ class HomeParentItemAdapterPreview( } } - homeAccount?.setOnClickListener { - activity?.showAccountSelectLinear() - } - - alternativeHomeAccount?.setOnClickListener { - activity?.showAccountSelectLinear() + homeAccount?.setOnClickListener { v -> + DataStoreHelper.showWhoIsWatching(v?.context ?: return@setOnClickListener) } (binding as? FragmentHomeHeadTvBinding)?.apply { @@ -452,11 +461,6 @@ class HomeParentItemAdapterPreview( } } - homePreviewSearchButton.setOnClickListener { _ -> - // Open blank screen. - viewModel.queryTextSubmit("") - } - // This makes the hidden next buttons only available when on the info button // Otherwise you might be able to go to the next item without being at the info button homePreviewInfoBtt.setOnFocusChangeListener { _, hasFocus -> @@ -512,9 +516,7 @@ class HomeParentItemAdapterPreview( when (preview) { is Resource.Success -> { - previewAdapter.submitList(preview.value.second) - previewAdapter.hasMoreItems = preview.value.first - /*if (!.setItems( + if (!previewAdapter.setItems( preview.value.second, preview.value.first ) @@ -526,20 +528,17 @@ class HomeParentItemAdapterPreview( previewViewpager.fakeDragBy(1f) previewViewpager.endFakeDrag() previewCallback.onPageSelected(0) + previewViewpager.isVisible = true + previewViewpagerText.isVisible = true //previewHeader.isVisible = true - }*/ - - previewViewpager.isVisible = true - previewViewpagerText.isVisible = true - alternativeAccountPadding?.isVisible = false + } } else -> { - previewAdapter.submitList(listOf()) + previewAdapter.setItems(listOf(), false) previewViewpager.setCurrentItem(0, false) previewViewpager.isVisible = false previewViewpagerText.isVisible = false - alternativeAccountPadding?.isVisible = true //previewHeader.isVisible = false } } @@ -547,21 +546,14 @@ class HomeParentItemAdapterPreview( private fun updateResume(resumeWatching: List) { resumeHolder.isVisible = resumeWatching.isNotEmpty() - resumeAdapter.submitList(resumeWatching) + resumeAdapter.updateList(resumeWatching) - if ( - binding is FragmentHomeHeadBinding || - binding is FragmentHomeHeadTvBinding && - isLayout(EMULATOR) - ) { - val title = (binding as? FragmentHomeHeadBinding)?.homeWatchParentItemTitle - ?: (binding as? FragmentHomeHeadTvBinding)?.homeWatchParentItemTitle - - title?.setOnClickListener { + if (binding is FragmentHomeHeadBinding) { + binding.homeWatchParentItemTitle.setOnClickListener { viewModel.popup( HomeViewModel.ExpandableHomepageList( HomePageList( - title.text.toString(), + binding.homeWatchParentItemTitle.text.toString(), resumeWatching, false ), 1, false @@ -577,17 +569,10 @@ class HomeParentItemAdapterPreview( private fun updateBookmarks(data: Pair>) { val (visible, list) = data bookmarkHolder.isVisible = visible - bookmarkAdapter.submitList(list) + bookmarkAdapter.updateList(list) - if ( - binding is FragmentHomeHeadBinding || - binding is FragmentHomeHeadTvBinding && - isLayout(EMULATOR) - ) { - val title = (binding as? FragmentHomeHeadBinding)?.homeBookmarkParentItemTitle - ?: (binding as? FragmentHomeHeadTvBinding)?.homeBookmarkParentItemTitle - - title?.setOnClickListener { + if (binding is FragmentHomeHeadBinding) { + binding.homeBookmarkParentItemTitle.setOnClickListener { val items = toggleList.map { it.first }.filter { it.isChecked } if (items.isEmpty()) return@setOnClickListener // we don't want to show an empty dialog val textSum = items @@ -607,35 +592,5 @@ class HomeParentItemAdapterPreview( } } } - - override fun onViewAttachedToWindow() { - previewViewpager.registerOnPageChangeCallback(previewCallback) - - binding.root.findViewTreeLifecycleOwner()?.apply { - observe(viewModel.preview) { - updatePreview(it) - } - if (binding is FragmentHomeHeadTvBinding) { - observe(viewModel.apiName) { name -> - binding.homePreviewChangeApi.text = name - } - } - observe(viewModel.resumeWatching) { - updateResume(it) - } - observe(viewModel.bookmarks) { - updateBookmarks(it) - } - observe(viewModel.availableWatchStatusTypes) { (checked, visible) -> - for ((chip, watch) in toggleList) { - chip.apply { - isVisible = visible.contains(watch) - isChecked = checked.contains(watch) - } - } - toggleListHolder?.isGone = visible.isEmpty() - } - } ?: debugException { "Expected findViewTreeLifecycleOwner" } - } } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt index 29186e83..9d95a5fa 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt @@ -4,61 +4,111 @@ import android.content.res.Configuration import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.view.isGone -import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.RecyclerView +import androidx.viewbinding.ViewBinding import com.lagradost.cloudstream3.LoadResponse import com.lagradost.cloudstream3.databinding.HomeScrollViewBinding import com.lagradost.cloudstream3.databinding.HomeScrollViewTvBinding -import com.lagradost.cloudstream3.ui.NoStateAdapter -import com.lagradost.cloudstream3.ui.ViewHolderState -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings import com.lagradost.cloudstream3.utils.UIHelper.setImage -class HomeScrollAdapter( - fragment: Fragment -) : NoStateAdapter(fragment) { +class HomeScrollAdapter : RecyclerView.Adapter() { + private var items: MutableList = mutableListOf() var hasMoreItems: Boolean = false - override fun onCreateContent(parent: ViewGroup): ViewHolderState { + fun getItem(position: Int): LoadResponse? { + return items.getOrNull(position) + } + + fun setItems(newItems: List, hasNext: Boolean): Boolean { + val isSame = newItems.firstOrNull()?.url == items.firstOrNull()?.url + hasMoreItems = hasNext + + val diffResult = DiffUtil.calculateDiff( + HomeScrollDiffCallback(this.items, newItems) + ) + + items.clear() + items.addAll(newItems) + + + diffResult.dispatchUpdatesTo(this) + + return isSame + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { val inflater = LayoutInflater.from(parent.context) - val binding = if (isLayout(TV or EMULATOR)) { + val binding = if (isTvSettings()) { HomeScrollViewTvBinding.inflate(inflater, parent, false) } else { HomeScrollViewBinding.inflate(inflater, parent, false) } - return ViewHolderState(binding) + return CardViewHolder( + binding, + //forceHorizontalPosters + ) } - override fun onBindContent( - holder: ViewHolderState, - item: LoadResponse, - position: Int, - ) { - val binding = holder.view - val itemView = holder.itemView - val isHorizontal = - binding is HomeScrollViewTvBinding || itemView.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE - - val posterUrl = - if (isHorizontal) item.backgroundPosterUrl ?: item.posterUrl else item.posterUrl - ?: item.backgroundPosterUrl - - when (binding) { - is HomeScrollViewBinding -> { - binding.homeScrollPreview.setImage(posterUrl) - binding.homeScrollPreviewTags.apply { - text = item.tags?.joinToString(" • ") ?: "" - isGone = item.tags.isNullOrEmpty() - maxLines = 2 - } - binding.homeScrollPreviewTitle.text = item.name - } - - is HomeScrollViewTvBinding -> { - binding.homeScrollPreview.setImage(posterUrl) + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + when (holder) { + is CardViewHolder -> { + holder.bind(items[position]) } } } + + class CardViewHolder + constructor( + val binding: ViewBinding, + //private val forceHorizontalPosters: Boolean? = null + ) : + RecyclerView.ViewHolder(binding.root) { + + fun bind(card: LoadResponse) { + val isHorizontal = + binding is HomeScrollViewTvBinding || itemView.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE + + val posterUrl = + if (isHorizontal) card.backgroundPosterUrl ?: card.posterUrl else card.posterUrl + ?: card.backgroundPosterUrl + + when (binding) { + is HomeScrollViewBinding -> { + binding.homeScrollPreview.setImage(posterUrl) + binding.homeScrollPreviewTags.apply { + text = card.tags?.joinToString(" • ") ?: "" + isGone = card.tags.isNullOrEmpty() + } + binding.homeScrollPreviewTitle.text = card.name + } + + is HomeScrollViewTvBinding -> { + binding.homeScrollPreview.setImage(posterUrl) + } + } + } + } + + class HomeScrollDiffCallback( + private val oldList: List, + private val newList: List + ) : + DiffUtil.Callback() { + override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) = + oldList[oldItemPosition].url == newList[newItemPosition].url + + override fun getOldListSize() = oldList.size + + override fun getNewListSize() = newList.size + + override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) = + oldList[oldItemPosition] == newList[newItemPosition] + } + + override fun getItemCount(): Int { + return items.size + } } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt index 24ca4df2..b27223ec 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeViewModel.kt @@ -6,9 +6,13 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.lagradost.cloudstream3.APIHolder.apis +import com.lagradost.cloudstream3.APIHolder.filterHomePageListByFilmQuality +import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia +import com.lagradost.cloudstream3.APIHolder.filterSearchResultByFilmQuality import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull import com.lagradost.cloudstream3.AcraApplication.Companion.context import com.lagradost.cloudstream3.AcraApplication.Companion.getKey +import com.lagradost.cloudstream3.AcraApplication.Companion.setKey import com.lagradost.cloudstream3.CommonActivity.activity import com.lagradost.cloudstream3.HomePageList import com.lagradost.cloudstream3.LoadResponse @@ -31,16 +35,13 @@ import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_FOCUSED import com.lagradost.cloudstream3.ui.search.SearchClickCallback import com.lagradost.cloudstream3.ui.search.SearchHelper -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.AppContextUtils.addProgramsToContinueWatching -import com.lagradost.cloudstream3.utils.AppContextUtils.filterHomePageListByFilmQuality -import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia -import com.lagradost.cloudstream3.utils.AppContextUtils.filterSearchResultByFilmQuality -import com.lagradost.cloudstream3.utils.AppContextUtils.loadResult +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings +import com.lagradost.cloudstream3.utils.AppUtils.addProgramsToContinueWatching +import com.lagradost.cloudstream3.utils.AppUtils.loadResult import com.lagradost.cloudstream3.utils.Coroutines.ioSafe import com.lagradost.cloudstream3.utils.DOWNLOAD_HEADER_CACHE import com.lagradost.cloudstream3.utils.DataStoreHelper +import com.lagradost.cloudstream3.utils.DataStoreHelper.deleteAllBookmarkedData import com.lagradost.cloudstream3.utils.DataStoreHelper.deleteAllResumeStateIds import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllResumeStateIds import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllWatchStateIds @@ -48,12 +49,12 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper.getBookmarkedData import com.lagradost.cloudstream3.utils.DataStoreHelper.getLastWatched import com.lagradost.cloudstream3.utils.DataStoreHelper.getResultWatchState import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos +import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API import com.lagradost.cloudstream3.utils.VideoDownloadHelper import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.withContext import java.util.EnumSet -import java.util.concurrent.CopyOnWriteArrayList import kotlin.collections.set class HomeViewModel : ViewModel() { @@ -103,6 +104,11 @@ class HomeViewModel : ViewModel() { loadStoredData() } + fun deleteBookmarks() { + deleteAllBookmarkedData() + loadStoredData() + } + var repo: APIRepository? = null private val _apiName = MutableLiveData() @@ -126,7 +132,7 @@ class HomeViewModel : ViewModel() { private val _resumeWatching = MutableLiveData>() private val _preview = MutableLiveData>>>() - private val previewResponses = CopyOnWriteArrayList() + private val previewResponses = mutableListOf() private val previewResponsesAdded = mutableSetOf() val resumeWatching: LiveData> = _resumeWatching @@ -134,7 +140,7 @@ class HomeViewModel : ViewModel() { private fun loadResumeWatching() = viewModelScope.launchSafe { val resumeWatchingResult = getResumeWatching() - if (isLayout(TV) && resumeWatchingResult != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + if (isTrueTvSettings() && resumeWatchingResult != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { ioSafe { // this WILL crash on non tvs, so keep this inside a try catch activity?.addProgramsToContinueWatching(resumeWatchingResult) @@ -152,7 +158,7 @@ class HomeViewModel : ViewModel() { } }?.distinctBy { it.first } ?: return@launchSafe - val length = WatchType.entries.size + val length = WatchType.values().size val currentWatchTypes = mutableSetOf() for (watch in watchStatusIds) { @@ -165,7 +171,10 @@ class HomeViewModel : ViewModel() { currentWatchTypes.remove(WatchType.NONE) if (currentWatchTypes.size <= 0) { - DataStoreHelper.homeBookmarkedList = intArrayOf() + setKey( + HOME_BOOKMARK_VALUE_LIST, + intArrayOf() + ) _availableWatchStatusTypes.postValue(setOf() to setOf()) _bookmarks.postValue(Pair(false, ArrayList())) return@launchSafe @@ -173,14 +182,16 @@ class HomeViewModel : ViewModel() { val watchPrefNotNull = preferredWatchStatus ?: EnumSet.of(currentWatchTypes.first()) //if (currentWatchTypes.any { watchPrefNotNull.contains(it) }) watchPrefNotNull else listOf(currentWatchTypes.first()) - - DataStoreHelper.homeBookmarkedList = watchPrefNotNull.map { it.internalId }.toIntArray() + setKey( + HOME_BOOKMARK_VALUE_LIST, + watchPrefNotNull.map { it.internalId }.toIntArray() + ) _availableWatchStatusTypes.postValue( - - watchPrefNotNull to - currentWatchTypes, - + Pair( + watchPrefNotNull, + currentWatchTypes, ) + ) val list = withContext(Dispatchers.IO) { watchStatusIds.filter { watchPrefNotNull.contains(it.second) } @@ -328,13 +339,7 @@ class HomeViewModel : ViewModel() { val filteredList = context?.filterHomePageListByFilmQuality(list) ?: list expandable[list.name] = - ExpandableHomepageList( - filteredList.copy( - list = CopyOnWriteArrayList( - filteredList.list - ) - ), 1, home.hasNext - ) + ExpandableHomepageList(filteredList, 1, home.hasNext) } } @@ -349,7 +354,8 @@ class HomeViewModel : ViewModel() { val currentList = items.shuffled().filter { it.list.isNotEmpty() } .flatMap { it.list } - .distinctBy { it.url }.toList() + .distinctBy { it.url } + .toList() if (currentList.isNotEmpty()) { val randomItems = @@ -387,9 +393,7 @@ class HomeViewModel : ViewModel() { } is Resource.Failure -> { - @Suppress("UNNECESSARY_NOT_NULL_ASSERTION") _page.postValue(data!!) - @Suppress("UNNECESSARY_NOT_NULL_ASSERTION") _preview.postValue(data!!) } @@ -399,7 +403,9 @@ class HomeViewModel : ViewModel() { } fun click(callback: SearchClickCallback) { - if (callback.action != SEARCH_ACTION_FOCUSED) { + if (callback.action == SEARCH_ACTION_FOCUSED) { + //focusCallback(callback.card) + } else { SearchHelper.handleSearchClickCallback(callback) } } @@ -420,29 +426,23 @@ class HomeViewModel : ViewModel() { } private fun afterPluginsLoaded(forceReload: Boolean) { - loadAndCancel(DataStoreHelper.currentHomePage, forceReload) + loadAndCancel(getKey(USER_SELECTED_HOMEPAGE_API), forceReload) } private fun afterMainPluginsLoaded(unused: Boolean = false) { - loadAndCancel(DataStoreHelper.currentHomePage, false) - } - - private fun reloadHome(unused: Boolean = false) { - loadAndCancel(DataStoreHelper.currentHomePage, true) + loadAndCancel(getKey(USER_SELECTED_HOMEPAGE_API), false) } init { MainActivity.bookmarksUpdatedEvent += ::bookmarksUpdated MainActivity.afterPluginsLoadedEvent += ::afterPluginsLoaded MainActivity.mainPluginsLoadedEvent += ::afterMainPluginsLoaded - MainActivity.reloadHomeEvent += ::reloadHome } override fun onCleared() { MainActivity.bookmarksUpdatedEvent -= ::bookmarksUpdated MainActivity.afterPluginsLoadedEvent -= ::afterPluginsLoaded MainActivity.mainPluginsLoadedEvent -= ::afterMainPluginsLoaded - MainActivity.reloadHomeEvent -= ::reloadHome super.onCleared() } @@ -458,7 +458,7 @@ class HomeViewModel : ViewModel() { fun loadStoredData() { val list = EnumSet.noneOf(WatchType::class.java) - DataStoreHelper.homeBookmarkedList.map { WatchType.fromInternalId(it) }.let { + getKey(HOME_BOOKMARK_VALUE_LIST)?.map { WatchType.fromInternalId(it) }?.let { list.addAll(it) } loadStoredData(list) @@ -495,7 +495,7 @@ class HomeViewModel : ViewModel() { val api = getApiFromNameNull(preferredApiName) if (preferredApiName == noneApi.name) { // just set to random - if (fromUI) DataStoreHelper.currentHomePage = noneApi.name + if (fromUI) setKey(USER_SELECTED_HOMEPAGE_API, noneApi.name) loadAndCancel(noneApi) } else if (preferredApiName == randomApi.name) { // randomize the api, if none exist like if not loaded or not installed @@ -506,7 +506,7 @@ class HomeViewModel : ViewModel() { } else { val apiRandom = validAPIs.random() loadAndCancel(apiRandom) - if (fromUI) DataStoreHelper.currentHomePage = apiRandom.name + if (fromUI) setKey(USER_SELECTED_HOMEPAGE_API, apiRandom.name) } } else if (api == null) { // API is not found aka not loaded or removed, post the loading @@ -516,11 +516,11 @@ class HomeViewModel : ViewModel() { } else { _page.postValue(Resource.Loading()) if (preferredApiName != null) - _apiName.postValue(preferredApiName!!) + _apiName.postValue(preferredApiName) } } else { // if the api is found, then set it to it and save key - if (fromUI) DataStoreHelper.currentHomePage = api.name + if (fromUI) setKey(USER_SELECTED_HOMEPAGE_API, api.name) loadAndCancel(api) } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt index 5b240693..04ef3d96 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt @@ -1,73 +1,50 @@ package com.lagradost.cloudstream3.ui.library -import android.annotation.SuppressLint import android.app.Activity import android.content.Context import android.content.res.Configuration import android.os.Bundle import android.os.Handler import android.os.Looper -import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.view.ViewGroup.FOCUS_AFTER_DESCENDANTS -import android.view.ViewGroup.FOCUS_BLOCK_DESCENDANTS import android.view.animation.AlphaAnimation -import android.widget.ImageView -import android.widget.TextView -import android.widget.Toast import androidx.annotation.StringRes import androidx.appcompat.widget.SearchView -import androidx.core.view.allViews -import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import androidx.preference.PreferenceManager -import androidx.recyclerview.widget.RecyclerView -import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayoutMediator import com.lagradost.cloudstream3.APIHolder import com.lagradost.cloudstream3.APIHolder.allProviders import com.lagradost.cloudstream3.AcraApplication.Companion.getKey import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser import com.lagradost.cloudstream3.AcraApplication.Companion.setKey -import com.lagradost.cloudstream3.CommonActivity -import com.lagradost.cloudstream3.MainActivity import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.SearchResponse import com.lagradost.cloudstream3.databinding.FragmentLibraryBinding import com.lagradost.cloudstream3.mvvm.Resource import com.lagradost.cloudstream3.mvvm.debugAssert -import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.mvvm.observe import com.lagradost.cloudstream3.syncproviders.SyncAPI import com.lagradost.cloudstream3.syncproviders.SyncIdName -import com.lagradost.cloudstream3.ui.AutofitRecyclerView import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment import com.lagradost.cloudstream3.ui.result.txt import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_LOAD import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_SHOW_METADATA -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.PHONE -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.AppContextUtils.loadResult -import com.lagradost.cloudstream3.utils.AppContextUtils.loadSearchResult -import com.lagradost.cloudstream3.utils.AppContextUtils.reduceDragSensitivity -import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount +import com.lagradost.cloudstream3.utils.AppUtils.loadResult +import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult +import com.lagradost.cloudstream3.utils.AppUtils.reduceDragSensitivity import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount -import java.util.concurrent.CopyOnWriteArrayList import kotlin.math.abs const val LIBRARY_FOLDER = "library_folder" enum class LibraryOpenerType(@StringRes val stringRes: Int) { - Default(R.string.action_default), + Default(R.string.default_subtitles), // TODO FIX AFTER MERGE Provider(R.string.none), Browser(R.string.browser), Search(R.string.search), @@ -86,8 +63,6 @@ data class ProviderLibraryData( class LibraryFragment : Fragment() { companion object { - - val listLibraryItems = mutableListOf() fun newInstance() = LibraryFragment() /** @@ -99,26 +74,13 @@ class LibraryFragment : Fragment() { private val libraryViewModel: LibraryViewModel by activityViewModels() var binding: FragmentLibraryBinding? = null - private var toggleRandomButton = false override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { - val layout = - if (isLayout(TV or EMULATOR)) R.layout.fragment_library_tv else R.layout.fragment_library - val root = inflater.inflate(layout, container, false) - binding = try { - FragmentLibraryBinding.bind(root) - } catch (t: Throwable) { - CommonActivity.showToast( - txt(R.string.unable_to_inflate, t.message ?: ""), - Toast.LENGTH_LONG - ) - logError(t) - null - } - - return root + val localBinding = FragmentLibraryBinding.inflate(inflater, container, false) + binding = localBinding + return localBinding.root //return inflater.inflate(R.layout.fragment_library, container, false) } @@ -135,45 +97,24 @@ class LibraryFragment : Fragment() { super.onSaveInstanceState(outState) } - private fun updateRandom() { - val position = libraryViewModel.currentPage.value ?: 0 - val pages = (libraryViewModel.pages.value as? Resource.Success)?.value ?: return - if (toggleRandomButton) { - listLibraryItems.clear() - listLibraryItems.addAll(pages[position].items) - binding?.libraryRandom?.isVisible = listLibraryItems.isNotEmpty() - } else { - binding?.libraryRandom?.isGone = true - } - } - - @SuppressLint("ResourceType", "CutPasteId") override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) fixPaddingStatusbar(binding?.searchStatusBarPadding) - binding?.sortFab?.setOnClickListener(sortChangeClickListener) - binding?.librarySort?.setOnClickListener(sortChangeClickListener) - - binding?.libraryRoot?.findViewById(R.id.search_src_text)?.apply { - tag = "tv_no_focus_tag" - //Expand the Appbar when search bar is focused, fixing scroll up issue - setOnFocusChangeListener { _, _ -> - binding?.searchBar?.setExpanded(true) + binding?.sortFab?.setOnClickListener { + val methods = libraryViewModel.sortingMethods.map { + txt(it.stringRes).asString(view.context) } - } - // Set the color for the search exit icon to the correct theme text color - val searchExitIcon = - binding?.mainSearch?.findViewById(androidx.appcompat.R.id.search_close_btn) - val searchExitIconColor = TypedValue() - - activity?.theme?.resolveAttribute(android.R.attr.textColor, searchExitIconColor, true) - searchExitIcon?.setColorFilter(searchExitIconColor.data) - - val searchCallback = Runnable { - val newText = binding?.mainSearch?.query?.toString() ?: return@Runnable - libraryViewModel.sort(ListSorting.Query, newText) + activity?.showBottomDialog(methods, + libraryViewModel.sortingMethods.indexOf(libraryViewModel.currentSortingMethod), + txt(R.string.sort_by).asString(view.context), + false, + {}, + { + val method = libraryViewModel.sortingMethods[it] + libraryViewModel.sort(method) + }) } binding?.mainSearch?.setOnQueryTextListener(object : SearchView.OnQueryTextListener { @@ -192,12 +133,7 @@ class LibraryFragment : Fragment() { return true } - binding?.mainSearch?.removeCallbacks(searchCallback) - - // Delay the execution of the search operation by 1 second (adjust as needed) - // this prevents running search when the user is typing - binding?.mainSearch?.postDelayed(searchCallback, 1000) - + libraryViewModel.sort(ListSorting.Query, newText) return true } }) @@ -218,25 +154,6 @@ class LibraryFragment : Fragment() { } } - //Load value for toggling Random button. Hide at startup - context?.let { - val settingsManager = PreferenceManager.getDefaultSharedPreferences(it) - toggleRandomButton = - settingsManager.getBoolean( - getString(R.string.random_button_key), - false - ) && isLayout(PHONE) - binding?.libraryRandom?.visibility = View.GONE - } - - binding?.libraryRandom?.setOnClickListener { - if (listLibraryItems.isNotEmpty()) { - val listLibraryItem = listLibraryItems.random() - libraryViewModel.currentSyncApi?.syncIdName?.let { - loadLibraryItem(it, listLibraryItem.syncId, listLibraryItem) - } - } - } /** * Shows a plugin selection dialogue and saves the response @@ -263,7 +180,7 @@ class LibraryFragment : Fragment() { val items = baseOptions.map { txt(it.stringRes).asString(this) } + availableProviders - val savedSelection = getKey("$currentAccount/$LIBRARY_FOLDER", key) + val savedSelection = getKey(LIBRARY_FOLDER, key) val selectedIndex = when { savedSelection == null -> 0 @@ -298,7 +215,7 @@ class LibraryFragment : Fragment() { } setKey( - "$currentAccount/$LIBRARY_FOLDER", + LIBRARY_FOLDER, key, savedData, ) @@ -311,52 +228,87 @@ class LibraryFragment : Fragment() { } binding?.viewpager?.setPageTransformer(LibraryScrollTransformer()) + binding?.viewpager?.adapter = + binding?.viewpager?.adapter ?: ViewpagerAdapter( + mutableListOf(), + { isScrollingDown: Boolean -> + if (isScrollingDown) { + binding?.sortFab?.shrink() + } else { + binding?.sortFab?.extend() + } + }) callback@{ searchClickCallback -> + // To prevent future accidents + debugAssert({ + searchClickCallback.card !is SyncAPI.LibraryItem + }, { + "searchClickCallback ${searchClickCallback.card} is not a LibraryItem" + }) - binding?.viewpager?.adapter = ViewpagerAdapter( - fragment = this, - { isScrollingDown: Boolean -> - if (isScrollingDown) { - binding?.sortFab?.shrink() - binding?.libraryRandom?.shrink() - } else { - binding?.sortFab?.extend() - binding?.libraryRandom?.extend() - } - }) callback@{ searchClickCallback -> - // To prevent future accidents - debugAssert({ - searchClickCallback.card !is SyncAPI.LibraryItem - }, { - "searchClickCallback ${searchClickCallback.card} is not a LibraryItem" - }) + val syncId = (searchClickCallback.card as SyncAPI.LibraryItem).syncId + val syncName = + libraryViewModel.currentSyncApi?.syncIdName ?: return@callback - val syncId = (searchClickCallback.card as SyncAPI.LibraryItem).syncId - val syncName = - libraryViewModel.currentSyncApi?.syncIdName ?: return@callback - - when (searchClickCallback.action) { - SEARCH_ACTION_SHOW_METADATA -> { - (activity as? MainActivity)?.loadPopup( - searchClickCallback.card, - load = false - ) - /*activity?.showPluginSelectionDialog( + when (searchClickCallback.action) { + SEARCH_ACTION_SHOW_METADATA -> { + activity?.showPluginSelectionDialog( syncId, syncName, searchClickCallback.card.apiName - )*/ - } + ) + } - SEARCH_ACTION_LOAD -> { - loadLibraryItem(syncName, syncId, searchClickCallback.card) + SEARCH_ACTION_LOAD -> { + // This basically first selects the individual opener and if that is default then + // selects the whole list opener + val savedListSelection = + getKey(LIBRARY_FOLDER, syncName.name) + val savedSelection = getKey(LIBRARY_FOLDER, syncId).takeIf { + it?.openType != LibraryOpenerType.Default + } ?: savedListSelection + + when (savedSelection?.openType) { + null, LibraryOpenerType.Default -> { + // Prevents opening MAL/AniList as a provider + if (APIHolder.getApiFromNameNull(searchClickCallback.card.apiName) != null) { + activity?.loadSearchResult( + searchClickCallback.card + ) + } else { + // Search when no provider can open + QuickSearchFragment.pushSearch( + activity, + searchClickCallback.card.name + ) + } + } + + LibraryOpenerType.None -> {} + LibraryOpenerType.Provider -> + savedSelection.providerData?.apiName?.let { apiName -> + activity?.loadResult( + searchClickCallback.card.url, + apiName, + ) + } + + LibraryOpenerType.Browser -> + openBrowser(searchClickCallback.card.url) + + LibraryOpenerType.Search -> { + QuickSearchFragment.pushSearch( + activity, + searchClickCallback.card.name + ) + } + } + } } } - } binding?.apply { viewpager.offscreenPageLimit = 2 viewpager.reduceDragSensitivity() - searchBar.setExpanded(true) } val startLoading = Runnable { @@ -387,6 +339,7 @@ class LibraryFragment : Fragment() { val pages = resource.value val showNotice = pages.all { it.items.isEmpty() } + binding?.apply { emptyListTextview.isVisible = showNotice if (showNotice) { @@ -397,28 +350,12 @@ class LibraryFragment : Fragment() { } } - (viewpager.adapter as? ViewpagerAdapter)?.submitList(pages.map { - it.copy( - items = CopyOnWriteArrayList(it.items) - ) - }) - //fix focus on the viewpager itself - (viewpager.getChildAt(0) as RecyclerView).apply { - tag = "tv_no_focus_tag" - //isFocusable = false - } - + (viewpager.adapter as? ViewpagerAdapter)?.pages = pages // Using notifyItemRangeChanged keeps the animations when sorting - /*viewpager.adapter?.notifyItemRangeChanged( + viewpager.adapter?.notifyItemRangeChanged( 0, viewpager.adapter?.itemCount ?: 0 - )*/ - - libraryViewModel.currentPage.value?.let { page -> - binding?.viewpager?.setCurrentItem(page, false) - } - - updateRandom() + ) // Only stop loading after 300ms to hide the fade effect the viewpager produces when updating // Without this there would be a flashing effect: @@ -455,32 +392,13 @@ class LibraryFragment : Fragment() { viewpager, ) { tab, position -> tab.text = pages.getOrNull(position)?.title?.asStringNull(context) - tab.view.tag = "tv_no_focus_tag" - tab.view.nextFocusDownId = R.id.search_result_root - tab.view.setOnClickListener { val currentItem = binding?.viewpager?.currentItem ?: return@setOnClickListener val distance = abs(position - currentItem) hideViewpager(distance) } - //Expand the appBar on tab focus - tab.view.setOnFocusChangeListener { _, _ -> - binding?.searchBar?.setExpanded(true) - } }.attach() - - binding?.libraryTabLayout?.addOnTabSelectedListener(object : - TabLayout.OnTabSelectedListener { - override fun onTabSelected(tab: TabLayout.Tab?) { - binding?.libraryTabLayout?.selectedTabPosition?.let { page -> - libraryViewModel.switchPage(page) - } - } - - override fun onTabUnselected(tab: TabLayout.Tab?) = Unit - override fun onTabReselected(tab: TabLayout.Tab?) = Unit - }) } } @@ -496,108 +414,16 @@ class LibraryFragment : Fragment() { } } } - - observe(libraryViewModel.currentPage) { position -> - updateRandom() - val all = binding?.viewpager?.allViews?.toList() - ?.filterIsInstance() - - all?.forEach { view -> - view.isVisible = view.tag == position - view.isFocusable = view.tag == position - - if (view.tag == position) - view.descendantFocusability = FOCUS_AFTER_DESCENDANTS - else - view.descendantFocusability = FOCUS_BLOCK_DESCENDANTS - } - } - - /*binding?.viewpager?.registerOnPageChangeCallback(object : - ViewPager2.OnPageChangeCallback() { - override fun onPageSelected(position: Int) { - - super.onPageSelected(position) - } - })*/ } - private fun loadLibraryItem( - syncName: SyncIdName, - syncId: String, - card: SearchResponse - ) { - // This basically first selects the individual opener and if that is default then - // selects the whole list opener - val savedListSelection = - getKey("$currentAccount/$LIBRARY_FOLDER", syncName.name) - - val savedSelection = getKey( - "$currentAccount/$LIBRARY_FOLDER", - syncId - ).takeIf { - it?.openType != LibraryOpenerType.Default - } ?: savedListSelection - - when (savedSelection?.openType) { - null, LibraryOpenerType.Default -> { - // Prevents opening MAL/AniList as a provider - if (APIHolder.getApiFromNameNull(card.apiName) != null) { - activity?.loadSearchResult( - card - ) - } else { - // Search when no provider can open - QuickSearchFragment.pushSearch( - activity, - card.name - ) - } - } - - LibraryOpenerType.None -> {} - LibraryOpenerType.Provider -> - savedSelection.providerData?.apiName?.let { apiName -> - activity?.loadResult( - card.url, - apiName, - ) - } - - LibraryOpenerType.Browser -> - openBrowser(card.url) - - LibraryOpenerType.Search -> { - QuickSearchFragment.pushSearch( - activity, - card.name - ) - } - } - - } - - @SuppressLint("NotifyDataSetChanged") override fun onConfigurationChanged(newConfig: Configuration) { - binding?.viewpager?.adapter?.notifyDataSetChanged() + (binding?.viewpager?.adapter as? ViewpagerAdapter)?.rebind() super.onConfigurationChanged(newConfig) } - - private val sortChangeClickListener = View.OnClickListener { view -> - val methods = libraryViewModel.sortingMethods.map { - txt(it.stringRes).asString(view.context) - } - - activity?.showBottomDialog(methods, - libraryViewModel.sortingMethods.indexOf(libraryViewModel.currentSortingMethod), - txt(R.string.sort_by).asString(view.context), - false, - {}, - { - val method = libraryViewModel.sortingMethods[it] - libraryViewModel.sort(method) - }) - } } -class MenuSearchView(context: Context) : SearchView(context) \ No newline at end of file +class MenuSearchView(context: Context) : SearchView(context) { + override fun onActionViewCollapsed() { + super.onActionViewCollapsed() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt index 6c602e6c..14d31356 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryViewModel.kt @@ -6,14 +6,11 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.lagradost.cloudstream3.AcraApplication.Companion.getKey import com.lagradost.cloudstream3.AcraApplication.Companion.setKey -import com.lagradost.cloudstream3.MainActivity import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.mvvm.Resource import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis import com.lagradost.cloudstream3.syncproviders.SyncAPI import com.lagradost.cloudstream3.utils.Coroutines.ioSafe -import com.lagradost.cloudstream3.utils.DataStoreHelper -import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount enum class ListSorting(@StringRes val stringRes: Int) { Query(R.string.none), @@ -23,20 +20,11 @@ enum class ListSorting(@StringRes val stringRes: Int) { UpdatedOld(R.string.sort_updated_old), AlphabeticalA(R.string.sort_alphabetical_a), AlphabeticalZ(R.string.sort_alphabetical_z), - ReleaseDateNew(R.string.sort_release_date_new), - ReleaseDateOld(R.string.sort_release_date_old), } const val LAST_SYNC_API_KEY = "last_sync_api" class LibraryViewModel : ViewModel() { - fun switchPage(page : Int) { - _currentPage.postValue(page) - } - - private val _currentPage: MutableLiveData = MutableLiveData(0) - val currentPage: LiveData = _currentPage - private val _pages: MutableLiveData>> = MutableLiveData(null) val pages: LiveData>> = _pages @@ -47,12 +35,12 @@ class LibraryViewModel : ViewModel() { get() = SyncApis.filter { it.hasAccount() } var currentSyncApi = availableSyncApis.let { allApis -> - val lastSelection = getKey("$currentAccount/$LAST_SYNC_API_KEY") + val lastSelection = getKey(LAST_SYNC_API_KEY) availableSyncApis.firstOrNull { it.name == lastSelection } ?: allApis.firstOrNull() } private set(value) { field = value - setKey("$currentAccount/$LAST_SYNC_API_KEY", field?.name) + setKey(LAST_SYNC_API_KEY, field?.name) } val availableApiNames: List @@ -70,21 +58,13 @@ class LibraryViewModel : ViewModel() { reloadPages(true) } - fun sort(method: ListSorting, query: String? = null) = ioSafe { - val value = _pages.value ?: return@ioSafe - if (value is Resource.Success) { - sort(method, query, value.value) - } - } - - private fun sort(method: ListSorting, query: String? = null, items: List) { + fun sort(method: ListSorting, query: String? = null) { + val currentList = pages.value ?: return currentSortingMethod = method - DataStoreHelper.librarySortingMode = method.ordinal - - items.forEach { page -> + (currentList as? Resource.Success)?.value?.forEachIndexed { _, page -> page.sort(method, query) } - _pages.postValue(Resource.Success(items)) + _pages.postValue(currentList) } fun reloadPages(forceReload: Boolean) { @@ -105,6 +85,8 @@ class LibraryViewModel : ViewModel() { val library = (libraryResource as? Resource.Success)?.value ?: return@let sortingMethods = library.supportedListSorting.toList() + currentSortingMethod = null + repo.requireLibraryRefresh = false val pages = library.allLibraryLists.map { @@ -114,24 +96,8 @@ class LibraryViewModel : ViewModel() { ) } - val desiredSortingMethod = - ListSorting.entries.getOrNull(DataStoreHelper.librarySortingMode) - if (desiredSortingMethod != null && library.supportedListSorting.contains(desiredSortingMethod)) { - sort(desiredSortingMethod, null, pages) - } else { - // null query = no sorting - sort(ListSorting.Query, null, pages) - } + _pages.postValue(Resource.Success(pages)) } } } - - init { - MainActivity.reloadLibraryEvent += ::reloadPages - } - - override fun onCleared() { - MainActivity.reloadLibraryEvent -= ::reloadPages - super.onCleared() - } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt index b2de307f..b8feb656 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/PageAdapter.kt @@ -16,7 +16,7 @@ import com.lagradost.cloudstream3.syncproviders.SyncAPI import com.lagradost.cloudstream3.ui.AutofitRecyclerView import com.lagradost.cloudstream3.ui.search.SearchClickCallback import com.lagradost.cloudstream3.ui.search.SearchResultBuilder -import com.lagradost.cloudstream3.utils.AppContextUtils +import com.lagradost.cloudstream3.utils.AppUtils import com.lagradost.cloudstream3.utils.UIHelper.toPx import kotlin.math.roundToInt @@ -26,7 +26,7 @@ class PageAdapter( private val resView: AutofitRecyclerView, val clickCallback: (SearchClickCallback) -> Unit ) : - AppContextUtils.DiffAdapter(items) { + AppUtils.DiffAdapter(items) { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { return LibraryItemViewHolder( diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt index 0110187f..95fefcbe 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/ViewpagerAdapter.kt @@ -1,124 +1,90 @@ package com.lagradost.cloudstream3.ui.library import android.os.Build -import android.os.Bundle -import android.os.Parcelable import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.view.doOnAttach -import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.OnFlingListener -import com.google.android.material.appbar.AppBarLayout -import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.databinding.LibraryViewpagerPageBinding import com.lagradost.cloudstream3.syncproviders.SyncAPI -import com.lagradost.cloudstream3.ui.BaseAdapter -import com.lagradost.cloudstream3.ui.BaseDiffCallback -import com.lagradost.cloudstream3.ui.ViewHolderState -import com.lagradost.cloudstream3.ui.home.getSafeParcelable import com.lagradost.cloudstream3.ui.search.SearchClickCallback -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount -class ViewpagerAdapterViewHolderState(val binding: LibraryViewpagerPageBinding) : - ViewHolderState(binding) { - override fun save(): Bundle = - Bundle().apply { - putParcelable( - "pageRecyclerview", - binding.pageRecyclerview.layoutManager?.onSaveInstanceState() - ) - } - - override fun restore(state: Bundle) { - state.getSafeParcelable("pageRecyclerview")?.let { recycle -> - binding.pageRecyclerview.layoutManager?.onRestoreInstanceState(recycle) - } - } -} - class ViewpagerAdapter( - fragment: Fragment, + var pages: List, val scrollCallback: (isScrollingDown: Boolean) -> Unit, val clickCallback: (SearchClickCallback) -> Unit -) : BaseAdapter(fragment, - id = "ViewpagerAdapter".hashCode(), - diffCallback = BaseDiffCallback( - itemSame = { a, b -> - a.title == b.title - }, - contentSame = { a, b -> - a.items == b.items && a.title == b.title - } -)) { - override fun onCreateContent(parent: ViewGroup): ViewHolderState { - return ViewpagerAdapterViewHolderState( +) : RecyclerView.Adapter() { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + return PageViewHolder( LibraryViewpagerPageBinding.inflate(LayoutInflater.from(parent.context), parent, false) ) } - override fun onUpdateContent( - holder: ViewHolderState, - item: SyncAPI.Page, - position: Int - ) { - val binding = holder.view - if (binding !is LibraryViewpagerPageBinding) return - (binding.pageRecyclerview.adapter as? PageAdapter)?.updateList(item.items) - } - - override fun onBindContent(holder: ViewHolderState, item: SyncAPI.Page, position: Int) { - val binding = holder.view - if (binding !is LibraryViewpagerPageBinding) return - - binding.pageRecyclerview.tag = position - binding.pageRecyclerview.apply { - spanCount = - binding.root.context.getSpanCount() ?: 3 - if (adapter == null) { // || rebind - // Only add the items after it has been attached since the items rely on ItemWidth - // Which is only determined after the recyclerview is attached. - // If this fails then item height becomes 0 when there is only one item - doOnAttach { - adapter = PageAdapter( - item.items.toMutableList(), - this, - clickCallback - ) - } - } else { - (adapter as? PageAdapter)?.updateList(item.items) - // scrollToPosition(0) - } - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - setOnScrollChangeListener { _, _, scrollY, _, oldScrollY -> - val diff = scrollY - oldScrollY - - //Expand the top Appbar based on scroll direction up/down, simulate phone behavior - if (isLayout(TV or EMULATOR)) { - binding.root.rootView.findViewById(R.id.search_bar) - .apply { - if (diff <= 0) - setExpanded(true) - else - setExpanded(false) - } - } - if (diff == 0) return@setOnScrollChangeListener - - scrollCallback.invoke(diff > 0) - } - } else { - onFlingListener = object : OnFlingListener() { - override fun onFling(velocityX: Int, velocityY: Int): Boolean { - scrollCallback.invoke(velocityY > 0) - return false - } - } + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + when (holder) { + is PageViewHolder -> { + holder.bind(pages[position], unbound.remove(position)) } } } + + private val unbound = mutableSetOf() + + /** + * Used to mark all pages for re-binding and forces all items to be refreshed + * Without this the pages will still use the same adapters + **/ + fun rebind() { + unbound.addAll(0..pages.size) + this.notifyItemRangeChanged(0, pages.size) + } + + inner class PageViewHolder(private val binding: LibraryViewpagerPageBinding) : + RecyclerView.ViewHolder(binding.root) { + fun bind(page: SyncAPI.Page, rebind: Boolean) { + binding.pageRecyclerview.apply { + spanCount = + this@PageViewHolder.itemView.context.getSpanCount() ?: 3 + if (adapter == null || rebind) { + // Only add the items after it has been attached since the items rely on ItemWidth + // Which is only determined after the recyclerview is attached. + // If this fails then item height becomes 0 when there is only one item + doOnAttach { + adapter = PageAdapter( + page.items.toMutableList(), + this, + clickCallback + ) + } + } else { + (adapter as? PageAdapter)?.updateList(page.items) + scrollToPosition(0) + } + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + setOnScrollChangeListener { _, _, scrollY, _, oldScrollY -> + val diff = scrollY - oldScrollY + if (diff == 0) return@setOnScrollChangeListener + + scrollCallback.invoke(diff > 0) + } + } else { + onFlingListener = object : OnFlingListener() { + override fun onFling(velocityX: Int, velocityY: Int): Boolean { + scrollCallback.invoke(velocityY > 0) + return false + } + } + } + } + + + } + } + + override fun getItemCount(): Int { + return pages.size + } } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt index ee987f44..53ee5e12 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/AbstractPlayerFragment.kt @@ -1,16 +1,12 @@ package com.lagradost.cloudstream3.ui.player import android.annotation.SuppressLint -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent -import android.content.IntentFilter +import android.content.* import android.graphics.drawable.AnimatedImageDrawable import android.graphics.drawable.AnimatedVectorDrawable import android.media.metrics.PlaybackErrorEvent import android.os.Build import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -21,26 +17,22 @@ import android.widget.ProgressBar import android.widget.Toast import androidx.annotation.LayoutRes import androidx.annotation.StringRes -import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.fragment.app.Fragment +import androidx.preference.PreferenceManager +import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat import androidx.media3.common.PlaybackException import androidx.media3.exoplayer.ExoPlayer import androidx.media3.session.MediaSession import androidx.media3.ui.AspectRatioFrameLayout -import androidx.media3.ui.DefaultTimeBar import androidx.media3.ui.PlayerView import androidx.media3.ui.SubtitleView -import androidx.media3.ui.TimeBar -import androidx.preference.PreferenceManager -import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat -import com.github.rubensousa.previewseekbar.PreviewBar -import com.github.rubensousa.previewseekbar.media3.PreviewTimeBar +import com.lagradost.cloudstream3.AcraApplication.Companion.getKey +import com.lagradost.cloudstream3.AcraApplication.Companion.setKey import com.lagradost.cloudstream3.CommonActivity.canEnterPipMode import com.lagradost.cloudstream3.CommonActivity.isInPIPMode import com.lagradost.cloudstream3.CommonActivity.keyEventListener import com.lagradost.cloudstream3.CommonActivity.playerEventListener -import com.lagradost.cloudstream3.CommonActivity.screenWidth import com.lagradost.cloudstream3.CommonActivity.showToast import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.mvvm.logError @@ -48,9 +40,8 @@ import com.lagradost.cloudstream3.mvvm.normalSafeApiCall import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.unixTimeMs import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment -import com.lagradost.cloudstream3.utils.AppContextUtils -import com.lagradost.cloudstream3.utils.AppContextUtils.requestLocalAudioFocus -import com.lagradost.cloudstream3.utils.DataStoreHelper +import com.lagradost.cloudstream3.utils.AppUtils +import com.lagradost.cloudstream3.utils.AppUtils.requestLocalAudioFocus import com.lagradost.cloudstream3.utils.EpisodeSkip import com.lagradost.cloudstream3.utils.UIHelper import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI @@ -83,12 +74,12 @@ abstract class AbstractPlayerFragment( var isBuffering = true protected open var hasPipModeSupport = true - var playerPausePlayHolderHolder: FrameLayout? = null - var playerPausePlay: ImageView? = null - var playerBuffering: ProgressBar? = null - var playerView: PlayerView? = null - var piphide: FrameLayout? = null - var subtitleHolder: FrameLayout? = null + var playerPausePlayHolderHolder : FrameLayout? = null + var playerPausePlay : ImageView? = null + var playerBuffering : ProgressBar? = null + var playerView : PlayerView? = null + var piphide : FrameLayout? = null + var subtitleHolder : FrameLayout? = null @LayoutRes protected open var layout: Int = R.layout.fragment_player @@ -101,13 +92,11 @@ abstract class AbstractPlayerFragment( throw NotImplementedError() } - open fun playerPositionChanged(position: Long, duration: Long) { + open fun playerPositionChanged(posDur: Pair) { throw NotImplementedError() } - open fun playerStatusChanged(){} - - open fun playerDimensionsLoaded(width: Int, height: Int) { + open fun playerDimensionsLoaded(widthHeight: Pair) { throw NotImplementedError() } @@ -143,10 +132,8 @@ abstract class AbstractPlayerFragment( } } - private fun updateIsPlaying( - wasPlaying: CSPlayerLoading, - isPlaying: CSPlayerLoading - ) { + private fun updateIsPlaying(playing: Pair) { + val (wasPlaying, isPlaying) = playing val isPlayingRightNow = CSPlayerLoading.IsPlaying == isPlaying val isPausedRightNow = CSPlayerLoading.IsPaused == isPlaying @@ -194,11 +181,7 @@ abstract class AbstractPlayerFragment( canEnterPipMode = isPlayingRightNow && hasPipModeSupport if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { activity?.let { act -> - PlayerPipHelper.updatePIPModeActions( - act, - isPlayingRightNow, - player.getAspectRatio() - ) + PlayerPipHelper.updatePIPModeActions(act, isPlayingRightNow, player.getAspectRatio()) } } } @@ -220,10 +203,10 @@ abstract class AbstractPlayerFragment( return } player.handleEvent( - CSPlayerEvent.entries[intent.getIntExtra( + CSPlayerEvent.values()[intent.getIntExtra( EXTRA_CONTROL_TYPE, 0 - )], source = PlayerEventSource.UI + )] ) } } @@ -233,7 +216,7 @@ abstract class AbstractPlayerFragment( val isPlaying = player.getIsPlaying() val isPlayingValue = if (isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused - updateIsPlaying(isPlayingValue, isPlayingValue) + updateIsPlaying(Pair(isPlayingValue, isPlayingValue)) } else { // Restore the full-screen UI. piphide?.isVisible = true @@ -262,11 +245,11 @@ abstract class AbstractPlayerFragment( private fun requestAudioFocus() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - activity?.requestLocalAudioFocus(AppContextUtils.getFocusRequest()) + activity?.requestLocalAudioFocus(AppUtils.getFocusRequest()) } } - open fun playerError(exception: Throwable) { + open fun playerError(exception: Exception) { fun showToast(message: String, gotoNext: Boolean = false) { if (gotoNext && hasNextMirror()) { showToast( @@ -343,7 +326,6 @@ abstract class AbstractPlayerFragment( } } - @SuppressLint("UnsafeOptInUsageError") private fun playerUpdated(player: Any?) { if (player is ExoPlayer) { context?.let { ctx -> @@ -384,174 +366,39 @@ abstract class AbstractPlayerFragment( // } //} - /** This receives the events from the player, if you want to append functionality you do it here, - * do note that this only receives events for UI changes, - * and returning early WONT stop it from changing in eg the player time or pause status */ - open fun mainCallback(event: PlayerEvent) { - Log.i(TAG, "Handle event: $event") - when (event) { - is ResizedEvent -> { - playerDimensionsLoaded(event.width, event.height) - } - is PlayerAttachedEvent -> { - playerUpdated(event.player) - } - - is SubtitlesUpdatedEvent -> { - subtitlesChanged() - } - - is TimestampSkippedEvent -> { - onTimestampSkipped(event.timestamp) - } - - is TimestampInvokedEvent -> { - onTimestamp(event.timestamp) - } - - is TracksChangedEvent -> { - onTracksInfoChanged() - } - - is EmbeddedSubtitlesFetchedEvent -> { - embeddedSubtitlesFetched(event.tracks) - } - - is ErrorEvent -> { - playerError(event.error) - } - - is RequestAudioFocusEvent -> { - requestAudioFocus() - } - - is EpisodeSeekEvent -> { - when (event.offset) { - -1 -> prevEpisode() - 1 -> nextEpisode() - else -> {} - } - } - - is StatusEvent -> { - updateIsPlaying(wasPlaying = event.wasPlaying, isPlaying = event.isPlaying) - playerStatusChanged() - } - - is PositionEvent -> { - playerPositionChanged(position = event.toMs, duration = event.durationMs) - } - - is VideoEndedEvent -> { - context?.let { ctx -> - // Resets subtitle delay on ended video - player.setSubtitleOffset(0) - - // Only play next episode if autoplay is on (default) - if (PreferenceManager.getDefaultSharedPreferences(ctx) - ?.getBoolean( - ctx.getString(R.string.autoplay_next_key), - true - ) == true - ) { - player.handleEvent( - CSPlayerEvent.NextEpisode, - source = PlayerEventSource.Player - ) - } - } - } - - is PauseEvent -> Unit - is PlayEvent -> Unit - } - } - - @SuppressLint("SetTextI18n", "UnsafeOptInUsageError") + @SuppressLint("SetTextI18n") override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - resizeMode = DataStoreHelper.resizeMode + resizeMode = getKey(RESIZE_MODE_KEY) ?: 0 resize(resizeMode, false) player.releaseCallbacks() player.initCallbacks( - eventHandler = ::mainCallback, + playerUpdated = ::playerUpdated, + updateIsPlaying = ::updateIsPlaying, + playerError = ::playerError, + requestAutoFocus = ::requestAudioFocus, + nextEpisode = ::nextEpisode, + prevEpisode = ::prevEpisode, + playerPositionChanged = ::playerPositionChanged, + playerDimensionsLoaded = ::playerDimensionsLoaded, requestedListeningPercentages = listOf( SKIP_OP_VIDEO_PERCENTAGE, PRELOAD_NEXT_EPISODE_PERCENTAGE, NEXT_WATCH_EPISODE_PERCENTAGE, UPDATE_SYNC_PROGRESS_PERCENTAGE, ), + subtitlesUpdates = ::subtitlesChanged, + embeddedSubtitlesFetched = ::embeddedSubtitlesFetched, + onTracksInfoChanged = ::onTracksInfoChanged, + onTimestampInvoked = ::onTimestamp, + onTimestampSkipped = ::onTimestampSkipped ) if (player is CS3IPlayer) { - // preview bar - val progressBar: PreviewTimeBar? = playerView?.findViewById(R.id.exo_progress) - val previewImageView: ImageView? = playerView?.findViewById(R.id.previewImageView) - val previewFrameLayout: FrameLayout? = playerView?.findViewById(R.id.previewFrameLayout) - if (progressBar != null && previewImageView != null && previewFrameLayout != null) { - var resume = false - progressBar.addOnScrubListener(object : PreviewBar.OnScrubListener { - override fun onScrubStart(previewBar: PreviewBar?) { - val hasPreview = player.hasPreview() - progressBar.isPreviewEnabled = hasPreview - resume = player.getIsPlaying() - if (resume) player.handleEvent( - CSPlayerEvent.Pause, - PlayerEventSource.Player - ) - } - - override fun onScrubMove( - previewBar: PreviewBar?, - progress: Int, - fromUser: Boolean - ) { - } - - override fun onScrubStop(previewBar: PreviewBar?) { - if (resume) player.handleEvent(CSPlayerEvent.Play, PlayerEventSource.Player) - } - }) - progressBar.attachPreviewView(previewFrameLayout) - progressBar.setPreviewLoader { currentPosition, max -> - val bitmap = player.getPreview(currentPosition.toFloat().div(max.toFloat())) - previewImageView.isGone = bitmap == null - previewImageView.setImageBitmap(bitmap) - } - } - subView = playerView?.findViewById(R.id.exo_subtitles) subStyle = SubtitlesFragment.getCurrentSavedStyle() player.initSubtitles(subView, subtitleHolder, subStyle) - (player.imageGenerator as? PreviewGenerator)?.params = ImageParams.new16by9(screenWidth) - - /*previewImageView?.doOnLayout { - (player.imageGenerator as? PreviewGenerator)?.params = ImageParams( - it.measuredWidth, - it.measuredHeight - ) - }*/ - /** this might seam a bit fucky and that is because it is, the seek event is captured twice, once by the player - * and once by the UI even if it should only be registered once by the UI */ - playerView?.findViewById(R.id.exo_progress) - ?.addListener(object : TimeBar.OnScrubListener { - override fun onScrubStart(timeBar: TimeBar, position: Long) = Unit - override fun onScrubMove(timeBar: TimeBar, position: Long) = Unit - override fun onScrubStop(timeBar: TimeBar, position: Long, canceled: Boolean) { - if (canceled) return - val playerDuration = player.getDuration() ?: return - val playerPosition = player.getPosition() ?: return - mainCallback( - PositionEvent( - source = PlayerEventSource.UI, - durationMs = playerDuration, - fromMs = playerPosition, - toMs = position - ) - ) - } - }) SubtitlesFragment.applyStyleEvent += ::onSubStyleChanged @@ -599,7 +446,6 @@ abstract class AbstractPlayerFragment( canEnterPipMode = false mMediaSession?.release() mMediaSession = null - playerView?.player = null SubtitlesFragment.applyStyleEvent -= ::onSubStyleChanged keepScreenOn(false) @@ -607,17 +453,16 @@ abstract class AbstractPlayerFragment( } fun nextResize() { - resizeMode = (resizeMode + 1) % PlayerResize.entries.size + resizeMode = (resizeMode + 1) % PlayerResize.values().size resize(resizeMode, true) } fun resize(resize: Int, showToast: Boolean) { - resize(PlayerResize.entries[resize], showToast) + resize(PlayerResize.values()[resize], showToast) } - @SuppressLint("UnsafeOptInUsageError") fun resize(resize: PlayerResize, showToast: Boolean) { - DataStoreHelper.resizeMode = resize.ordinal + setKey(RESIZE_MODE_KEY, resize.ordinal) val type = when (resize) { PlayerResize.Fill -> AspectRatioFrameLayout.RESIZE_MODE_FILL PlayerResize.Fit -> AspectRatioFrameLayout.RESIZE_MODE_FIT diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt index 86d67b28..e46bd885 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CS3IPlayer.kt @@ -1,19 +1,13 @@ package com.lagradost.cloudstream3.ui.player -import android.annotation.SuppressLint import android.content.Context -import android.graphics.Bitmap import android.net.Uri import android.os.Handler import android.os.Looper import android.util.Log import android.util.Rational import android.widget.FrameLayout -import androidx.annotation.OptIn -import androidx.media3.common.C.TIME_UNSET -import androidx.media3.common.C.TRACK_TYPE_AUDIO -import androidx.media3.common.C.TRACK_TYPE_TEXT -import androidx.media3.common.C.TRACK_TYPE_VIDEO +import androidx.media3.common.C.* import androidx.media3.common.Format import androidx.media3.common.MediaItem import androidx.media3.common.MimeTypes @@ -23,10 +17,9 @@ import androidx.media3.common.TrackGroup import androidx.media3.common.TrackSelectionOverride import androidx.media3.common.Tracks import androidx.media3.common.VideoSize -import androidx.media3.common.util.UnstableApi import androidx.media3.database.StandaloneDatabaseProvider import androidx.media3.datasource.DataSource -import androidx.media3.datasource.DefaultDataSource +import androidx.media3.datasource.DefaultDataSourceFactory import androidx.media3.datasource.DefaultHttpDataSource import androidx.media3.datasource.HttpDataSource import androidx.media3.datasource.cache.CacheDataSource @@ -38,10 +31,6 @@ import androidx.media3.exoplayer.DefaultRenderersFactory import androidx.media3.exoplayer.DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON import androidx.media3.exoplayer.ExoPlayer import androidx.media3.exoplayer.SeekParameters -import androidx.media3.exoplayer.dash.DashMediaSource -import androidx.media3.exoplayer.drm.DefaultDrmSessionManager -import androidx.media3.exoplayer.drm.FrameworkMediaDrm -import androidx.media3.exoplayer.drm.LocalMediaDrmCallback import androidx.media3.exoplayer.source.ClippingMediaSource import androidx.media3.exoplayer.source.ConcatenatingMediaSource import androidx.media3.exoplayer.source.DefaultMediaSourceFactory @@ -55,23 +44,18 @@ import androidx.preference.PreferenceManager import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull import com.lagradost.cloudstream3.AcraApplication.Companion.getKey import com.lagradost.cloudstream3.AcraApplication.Companion.setKey -import com.lagradost.cloudstream3.MainActivity.Companion.deleteFileOnExit import com.lagradost.cloudstream3.USER_AGENT import com.lagradost.cloudstream3.app -import com.lagradost.cloudstream3.mvvm.debugAssert import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.mvvm.normalSafeApiCall import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle -import com.lagradost.cloudstream3.utils.AppContextUtils.isUsingMobileData -import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount -import com.lagradost.cloudstream3.utils.DrmExtractorLink +import com.lagradost.cloudstream3.utils.AppUtils.isUsingMobileData import com.lagradost.cloudstream3.utils.EpisodeSkip import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.ExtractorLinkPlayList -import com.lagradost.cloudstream3.utils.ExtractorLinkType +import com.lagradost.cloudstream3.utils.ExtractorUri import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTwoLettersToLanguage import java.io.File -import java.util.UUID import javax.net.ssl.HttpsURLConnection import javax.net.ssl.SSLContext import javax.net.ssl.SSLSession @@ -88,24 +72,14 @@ const val toleranceBeforeUs = 300_000L * seek position, in microseconds. Must be non-negative. */ const val toleranceAfterUs = 300_000L -@OptIn(UnstableApi::class) + class CS3IPlayer : IPlayer { private var isPlaying = false private var exoPlayer: ExoPlayer? = null - set(value) { - // If the old value is not null then the player has not been properly released. - debugAssert( - { field != null && value != null }, - { "Previous player instance should be released!" }) - field = value - } - var cacheSize = 0L var simpleCacheSize = 0L var videoBufferMs = 0L - val imageGenerator = IPreviewGenerator.new() - private val seekActionTime = 30000L private var ignoreSSL: Boolean = true @@ -116,6 +90,7 @@ class CS3IPlayer : IPlayer { private var currentLink: ExtractorLink? = null private var currentDownloadedFile: ExtractorUri? = null private var hasUsedFirstRender = false + private var shouldPauseUnfocused = true private var currentWindow: Int = 0 private var playbackPosition: Long = 0 @@ -128,16 +103,7 @@ class CS3IPlayer : IPlayer { * */ data class MediaItemSlice( val mediaItem: MediaItem, - val durationUs: Long, - val drm: DrmMetadata? = null - ) - - data class DrmMetadata( - val kid: String, - val key: String, - val uuid: UUID, - val kty: String, - val keyRequestParameters: HashMap, + val durationUs: Long ) override fun getDuration(): Long? = exoPlayer?.duration @@ -151,24 +117,80 @@ class CS3IPlayer : IPlayer { * Boolean = if it's active * */ private var playerSelectedSubtitleTracks = listOf>() + + /** isPlaying */ + private var updateIsPlaying: ((Pair) -> Unit)? = null + private var requestAutoFocus: (() -> Unit)? = null + private var playerError: ((Exception) -> Unit)? = null + private var subtitlesUpdates: (() -> Unit)? = null + + /** width x height */ + private var playerDimensionsLoaded: ((Pair) -> Unit)? = null + + /** used for playerPositionChanged */ private var requestedListeningPercentages: List? = null - private var eventHandler: ((PlayerEvent) -> Unit)? = null + /** Fired when seeking the player or on requestedListeningPercentages, + * used to make things appear on que + * position, duration */ + private var playerPositionChanged: ((Pair) -> Unit)? = null - fun event(event: PlayerEvent) { - eventHandler?.invoke(event) - } + private var nextEpisode: (() -> Unit)? = null + private var prevEpisode: (() -> Unit)? = null + + private var playerUpdated: ((Any?) -> Unit)? = null + private var embeddedSubtitlesFetched: ((List) -> Unit)? = null + private var onTracksInfoChanged: (() -> Unit)? = null + private var onTimestampInvoked: ((EpisodeSkip.SkipStamp?) -> Unit)? = null + private var onTimestampSkipped: ((EpisodeSkip.SkipStamp) -> Unit)? = null override fun releaseCallbacks() { - eventHandler = null + playerUpdated = null + updateIsPlaying = null + requestAutoFocus = null + playerError = null + playerDimensionsLoaded = null + requestedListeningPercentages = null + playerPositionChanged = null + nextEpisode = null + prevEpisode = null + subtitlesUpdates = null + onTracksInfoChanged = null + onTimestampInvoked = null + requestSubtitleUpdate = null + onTimestampSkipped = null } override fun initCallbacks( - eventHandler: ((PlayerEvent) -> Unit), + playerUpdated: (Any?) -> Unit, + updateIsPlaying: ((Pair) -> Unit)?, + requestAutoFocus: (() -> Unit)?, + playerError: ((Exception) -> Unit)?, + playerDimensionsLoaded: ((Pair) -> Unit)?, requestedListeningPercentages: List?, + playerPositionChanged: ((Pair) -> Unit)?, + nextEpisode: (() -> Unit)?, + prevEpisode: (() -> Unit)?, + subtitlesUpdates: (() -> Unit)?, + embeddedSubtitlesFetched: ((List) -> Unit)?, + onTracksInfoChanged: (() -> Unit)?, + onTimestampInvoked: ((EpisodeSkip.SkipStamp?) -> Unit)?, + onTimestampSkipped: ((EpisodeSkip.SkipStamp) -> Unit)?, ) { + this.playerUpdated = playerUpdated + this.updateIsPlaying = updateIsPlaying + this.requestAutoFocus = requestAutoFocus + this.playerError = playerError + this.playerDimensionsLoaded = playerDimensionsLoaded this.requestedListeningPercentages = requestedListeningPercentages - this.eventHandler = eventHandler + this.playerPositionChanged = playerPositionChanged + this.nextEpisode = nextEpisode + this.prevEpisode = prevEpisode + this.subtitlesUpdates = subtitlesUpdates + this.embeddedSubtitlesFetched = embeddedSubtitlesFetched + this.onTracksInfoChanged = onTracksInfoChanged + this.onTimestampInvoked = onTimestampInvoked + this.onTimestampSkipped = onTimestampSkipped } // I know, this is not a perfect solution, however it works for fixing subs @@ -177,7 +199,7 @@ class CS3IPlayer : IPlayer { try { Handler(it).post { try { - seekTime(1L, source = PlayerEventSource.Player) + seekTime(1L) } catch (e: Exception) { logError(e) } @@ -192,14 +214,6 @@ class CS3IPlayer : IPlayer { subtitleHelper.initSubtitles(subView, subHolder, style) } - override fun getPreview(fraction: Float): Bitmap? { - return imageGenerator.getPreviewImage(fraction) - } - - override fun hasPreview(): Boolean { - return imageGenerator.hasPreview() - } - override fun loadPlayer( context: Context, sameEpisode: Boolean, @@ -208,8 +222,7 @@ class CS3IPlayer : IPlayer { startPosition: Long?, subtitles: Set, subtitle: SubtitleData?, - autoPlay: Boolean?, - preview: Boolean, + autoPlay: Boolean? ) { Log.i(TAG, "loadPlayer") if (sameEpisode) { @@ -228,30 +241,11 @@ class CS3IPlayer : IPlayer { // release the current exoplayer and cache releasePlayer() - if (link != null) { - // only video support atm - (imageGenerator as? PreviewGenerator)?.let { gen -> - if (preview) { - gen.load(link, sameEpisode) - } else { - gen.clear(sameEpisode) - } - } loadOnlinePlayer(context, link) } else if (data != null) { - (imageGenerator as? PreviewGenerator)?.let { gen -> - if (preview) { - gen.load(context, data, sameEpisode) - } else { - gen.clear(sameEpisode) - } - } loadOfflinePlayer(context, data) - } else { - throw IllegalArgumentException("Requires link or uri") } - } override fun setActiveSubtitles(subtitles: Set) { @@ -259,7 +253,7 @@ class CS3IPlayer : IPlayer { subtitleHelper.setAllSubtitles(subtitles) } - private var currentSubtitles: SubtitleData? = null + var currentSubtitles: SubtitleData? = null private fun List.getTrack(id: String?): Pair? { if (id == null) return null @@ -451,7 +445,7 @@ class CS3IPlayer : IPlayer { } ?: false } - private var currentSubtitleOffset: Long = 0 + var currentSubtitleOffset: Long = 0 override fun setSubtitleOffset(offset: Long) { currentSubtitleOffset = offset @@ -459,7 +453,7 @@ class CS3IPlayer : IPlayer { } override fun getSubtitleOffset(): Long { - return currentSubtitleOffset + return currentSubtitleOffset //currentTextRenderer?.getRenderOffsetMs() ?: currentSubtitleOffset } override fun getCurrentPreferredSubtitle(): SubtitleData? { @@ -486,7 +480,7 @@ class CS3IPlayer : IPlayer { exoPlayer?.let { exo -> playbackPosition = exo.currentPosition - currentWindow = exo.currentMediaItemIndex + currentWindow = exo.currentWindowIndex isPlaying = exo.isPlaying } } @@ -497,11 +491,7 @@ class CS3IPlayer : IPlayer { if (saveTime) updatedTime() - exoPlayer?.apply { - playWhenReady = false - stop() - release() - } + exoPlayer?.release() //simpleCache?.release() currentTextRenderer = null @@ -513,14 +503,15 @@ class CS3IPlayer : IPlayer { Log.i(TAG, "onStop") saveData() - handleEvent(CSPlayerEvent.Pause, PlayerEventSource.Player) + exoPlayer?.pause() //releasePlayer() } override fun onPause() { Log.i(TAG, "onPause") saveData() - handleEvent(CSPlayerEvent.Pause, PlayerEventSource.Player) + if (shouldPauseUnfocused) + exoPlayer?.pause() //releasePlayer() } @@ -530,7 +521,6 @@ class CS3IPlayer : IPlayer { } override fun release() { - imageGenerator.release() releasePlayer() } @@ -545,15 +535,12 @@ class CS3IPlayer : IPlayer { **/ var preferredAudioTrackLanguage: String? = null get() { - return field ?: getKey( - "$currentAccount/$PREFERRED_AUDIO_LANGUAGE_KEY", - field - )?.also { + return field ?: getKey(PREFERRED_AUDIO_LANGUAGE_KEY, field)?.also { field = it } } set(value) { - setKey("$currentAccount/$PREFERRED_AUDIO_LANGUAGE_KEY", value) + setKey(PREFERRED_AUDIO_LANGUAGE_KEY, value) field = value } @@ -601,16 +588,57 @@ class CS3IPlayer : IPlayer { } private fun Context.createOfflineSource(): DataSource.Factory { - return DefaultDataSource.Factory(this, DefaultHttpDataSource.Factory().setUserAgent(USER_AGENT)) + return DefaultDataSourceFactory(this, USER_AGENT) } + /*private fun getSubSources( + onlineSourceFactory: DataSource.Factory?, + offlineSourceFactory: DataSource.Factory?, + subHelper: PlayerSubtitleHelper, + ): Pair, List> { + val activeSubtitles = ArrayList() + val subSources = subHelper.getAllSubtitles().mapNotNull { sub -> + val subConfig = MediaItem.SubtitleConfiguration.Builder(Uri.parse(sub.url)) + .setMimeType(sub.mimeType) + .setLanguage("_${sub.name}") + .setSelectionFlags(C.SELECTION_FLAG_DEFAULT) + .build() + when (sub.origin) { + SubtitleOrigin.DOWNLOADED_FILE -> { + if (offlineSourceFactory != null) { + activeSubtitles.add(sub) + SingleSampleMediaSource.Factory(offlineSourceFactory) + .createMediaSource(subConfig, C.TIME_UNSET) + } else { + null + } + } + SubtitleOrigin.URL -> { + if (onlineSourceFactory != null) { + activeSubtitles.add(sub) + SingleSampleMediaSource.Factory(onlineSourceFactory) + .createMediaSource(subConfig, C.TIME_UNSET) + } else { + null + } + } + SubtitleOrigin.OPEN_SUBTITLES -> { + // TODO + throw NotImplementedError() + } + } + } + println("SUBSRC: ${subSources.size} activeSubtitles : ${activeSubtitles.size} of ${subHelper.getAllSubtitles().size} ") + return Pair(subSources, activeSubtitles) + }*/ + private fun getCache(context: Context, cacheSize: Long): SimpleCache? { return try { val databaseProvider = StandaloneDatabaseProvider(context) SimpleCache( File( context.cacheDir, "exoplayer" - ).also { deleteFileOnExit(it) }, // Ensures always fresh file + ).also { it.deleteOnExit() }, // Ensures always fresh file LeastRecentlyUsedCacheEvictor(cacheSize), databaseProvider ) @@ -682,13 +710,13 @@ class CS3IPlayer : IPlayer { metadataRendererOutput ).map { if (it is TextRenderer) { - val currentTextRenderer = CustomTextRenderer( + currentTextRenderer = CustomTextRenderer( subtitleOffset, textRendererOutput, eventHandler.looper, CustomSubtitleDecoderFactory() - ).also { renderer -> this.currentTextRenderer = renderer } - currentTextRenderer + ) + currentTextRenderer!! } else it }.toTypedArray() } @@ -732,33 +760,15 @@ class CS3IPlayer : IPlayer { // If there is only one item then treat it as normal, if multiple: concatenate the items. val videoMediaSource = if (mediaItemSlices.size == 1) { - val item = mediaItemSlices.first() - - item.drm?.let { drm -> - val drmCallback = - LocalMediaDrmCallback("{\"keys\":[{\"kty\":\"${drm.kty}\",\"k\":\"${drm.key}\",\"kid\":\"${drm.kid}\"}],\"type\":\"temporary\"}".toByteArray()) - val manager = DefaultDrmSessionManager.Builder() - .setPlayClearSamplesWithoutKeys(true) - .setMultiSession(false) - .setKeyRequestParameters(drm.keyRequestParameters) - .setUuidAndExoMediaDrmProvider(drm.uuid, FrameworkMediaDrm.DEFAULT_PROVIDER) - .build(drmCallback) - val manifestDataSourceFactory = DefaultHttpDataSource.Factory() - - DashMediaSource.Factory(manifestDataSourceFactory) - .setDrmSessionManagerProvider { manager } - .createMediaSource(item.mediaItem) - } ?: run { - factory.createMediaSource(item.mediaItem) - } + factory.createMediaSource(mediaItemSlices.first().mediaItem) } else { val source = ConcatenatingMediaSource() - mediaItemSlices.map { item -> + mediaItemSlices.map { source.addMediaSource( // The duration MUST be known for it to work properly, see https://github.com/google/ExoPlayer/issues/4727 ClippingMediaSource( - factory.createMediaSource(item.mediaItem), - item.durationUs + factory.createMediaSource(it.mediaItem), + it.durationUs ) ) } @@ -791,55 +801,43 @@ class CS3IPlayer : IPlayer { return null } - fun updatedTime( - writePosition: Long? = null, - source: PlayerEventSource = PlayerEventSource.Player - ) { + fun updatedTime(writePosition: Long? = null) { val position = writePosition ?: exoPlayer?.currentPosition getCurrentTimestamp(position)?.let { timestamp -> - event(TimestampInvokedEvent(timestamp, source)) + onTimestampInvoked?.invoke(timestamp) } val duration = exoPlayer?.contentDuration if (duration != null && position != null) { - event( - PositionEvent( - source, - fromMs = exoPlayer?.currentPosition ?: 0, - position, - duration - ) - ) + playerPositionChanged?.invoke(Pair(position, duration)) } } - override fun seekTime(time: Long, source: PlayerEventSource) { - exoPlayer?.seekTime(time, source) + override fun seekTime(time: Long) { + exoPlayer?.seekTime(time) } - override fun seekTo(time: Long, source: PlayerEventSource) { - updatedTime(time, source) + override fun seekTo(time: Long) { + updatedTime(time) exoPlayer?.seekTo(time) } - private fun ExoPlayer.seekTime(time: Long, source: PlayerEventSource) { - updatedTime(currentPosition + time, source) + private fun ExoPlayer.seekTime(time: Long) { + updatedTime(currentPosition + time) seekTo(currentPosition + time) } - override fun handleEvent(event: CSPlayerEvent, source: PlayerEventSource) { + override fun handleEvent(event: CSPlayerEvent) { Log.i(TAG, "handleEvent ${event.name}") try { exoPlayer?.apply { when (event) { CSPlayerEvent.Play -> { - event(PlayEvent(source)) play() } CSPlayerEvent.Pause -> { - event(PauseEvent(source)) pause() } @@ -856,48 +854,32 @@ class CS3IPlayer : IPlayer { CSPlayerEvent.PlayPauseToggle -> { if (isPlaying) { - handleEvent(CSPlayerEvent.Pause, source) + pause() } else { - handleEvent(CSPlayerEvent.Play, source) + play() } } - CSPlayerEvent.SeekForward -> seekTime(seekActionTime, source) - - CSPlayerEvent.SeekBack -> seekTime(-seekActionTime, source) - - CSPlayerEvent.Restart -> seekTo(0, source) - - CSPlayerEvent.NextEpisode -> event( - EpisodeSeekEvent( - offset = 1, - source = source - ) - ) - - CSPlayerEvent.PrevEpisode -> event( - EpisodeSeekEvent( - offset = -1, - source = source - ) - ) - + CSPlayerEvent.SeekForward -> seekTime(seekActionTime) + CSPlayerEvent.SeekBack -> seekTime(-seekActionTime) + CSPlayerEvent.NextEpisode -> nextEpisode?.invoke() + CSPlayerEvent.PrevEpisode -> prevEpisode?.invoke() CSPlayerEvent.SkipCurrentChapter -> { //val dur = this@CS3IPlayer.getDuration() ?: return@apply getCurrentTimestamp()?.let { lastTimeStamp -> if (lastTimeStamp.skipToNextEpisode) { - handleEvent(CSPlayerEvent.NextEpisode, source) + handleEvent(CSPlayerEvent.NextEpisode) } else { seekTo(lastTimeStamp.endMs + 1L) } - event(TimestampSkippedEvent(timestamp = lastTimeStamp, source = source)) + onTimestampSkipped?.invoke(lastTimeStamp) } } } } - } catch (t: Throwable) { - Log.e(TAG, "handleEvent error", t) - event(ErrorEvent(t)) + } catch (e: Exception) { + Log.e(TAG, "handleEvent error", e) + playerError?.invoke(e) } } @@ -936,14 +918,18 @@ class CS3IPlayer : IPlayer { requestSubtitleUpdate = ::reloadSubs - event(PlayerAttachedEvent(exoPlayer)) + playerUpdated?.invoke(exoPlayer) exoPlayer?.prepare() exoPlayer?.let { exo -> - event(StatusEvent(CSPlayerLoading.IsBuffering, CSPlayerLoading.IsBuffering)) + updateIsPlaying?.invoke( + Pair( + CSPlayerLoading.IsBuffering, + CSPlayerLoading.IsBuffering + ) + ) isPlaying = exo.isPlaying } - exoPlayer?.addListener(object : Player.Listener { override fun onTracksChanged(tracks: Tracks) { normalSafeApiCall { @@ -973,24 +959,27 @@ class CS3IPlayer : IPlayer { format.id!!, SubtitleOrigin.EMBEDDED_IN_VIDEO, format.sampleMimeType ?: MimeTypes.APPLICATION_SUBRIP, - emptyMap(), - format.language + emptyMap() ) } - event(EmbeddedSubtitlesFetchedEvent(tracks = exoPlayerReportedTracks)) - event(TracksChangedEvent()) - event(SubtitlesUpdatedEvent()) + embeddedSubtitlesFetched?.invoke(exoPlayerReportedTracks) + onTracksInfoChanged?.invoke() + subtitlesUpdates?.invoke() + + // if there are no video tracks, but there are audio tracks, don't pause playback while in background + val videoTrackCount = tracks.groups.filter { it.type == TRACK_TYPE_VIDEO }.size + val audioTrackCount = tracks.groups.filter { it.type == TRACK_TYPE_AUDIO }.size + shouldPauseUnfocused = videoTrackCount > 0 || audioTrackCount == 0 } } - //fixme: Use onPlaybackStateChanged(int) and onPlayWhenReadyChanged(boolean, int) instead. override fun onPlayerStateChanged(playWhenReady: Boolean, playbackState: Int) { exoPlayer?.let { exo -> - event( - StatusEvent( - wasPlaying = if (isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused, - isPlaying = if (playbackState == Player.STATE_BUFFERING) CSPlayerLoading.IsBuffering else if (exo.isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused + updateIsPlaying?.invoke( + Pair( + if (isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused, + if (playbackState == Player.STATE_BUFFERING) CSPlayerLoading.IsBuffering else if (exo.isPlaying) CSPlayerLoading.IsPlaying else CSPlayerLoading.IsPaused ) ) isPlaying = exo.isPlaying @@ -1012,15 +1001,23 @@ class CS3IPlayer : IPlayer { } Player.STATE_ENDED -> { - event(VideoEndedEvent()) + // Only play next episode if autoplay is on (default) + if (PreferenceManager.getDefaultSharedPreferences(context) + ?.getBoolean( + context.getString(com.lagradost.cloudstream3.R.string.autoplay_next_key), + true + ) == true + ) { + handleEvent(CSPlayerEvent.NextEpisode) + } } Player.STATE_BUFFERING -> { - updatedTime(source = PlayerEventSource.Player) + updatedTime() } Player.STATE_IDLE -> { - + // IDLE } else -> Unit @@ -1045,7 +1042,7 @@ class CS3IPlayer : IPlayer { } else -> { - event(ErrorEvent(error)) + playerError?.invoke(error) } } @@ -1059,7 +1056,7 @@ class CS3IPlayer : IPlayer { override fun onIsPlayingChanged(isPlaying: Boolean) { super.onIsPlayingChanged(isPlaying) if (isPlaying) { - event(RequestAudioFocusEvent()) + requestAutoFocus?.invoke() onRenderFirst() } } @@ -1072,9 +1069,6 @@ class CS3IPlayer : IPlayer { } Player.STATE_ENDED -> { - // Resets subtitle delay on ended video - setSubtitleOffset(0) - // Only play next episode if autoplay is on (default) if (PreferenceManager.getDefaultSharedPreferences(context) ?.getBoolean( @@ -1082,15 +1076,12 @@ class CS3IPlayer : IPlayer { true ) == true ) { - handleEvent( - CSPlayerEvent.NextEpisode, - source = PlayerEventSource.Player - ) + handleEvent(CSPlayerEvent.NextEpisode) } } Player.STATE_BUFFERING -> { - updatedTime(source = PlayerEventSource.Player) + updatedTime() } Player.STATE_IDLE -> { @@ -1103,28 +1094,27 @@ class CS3IPlayer : IPlayer { override fun onVideoSizeChanged(videoSize: VideoSize) { super.onVideoSizeChanged(videoSize) - event(ResizedEvent(height = videoSize.height, width = videoSize.width)) + playerDimensionsLoaded?.invoke(Pair(videoSize.width, videoSize.height)) } override fun onRenderedFirstFrame() { super.onRenderedFirstFrame() onRenderFirst() - updatedTime(source = PlayerEventSource.Player) + updatedTime() } }) - } catch (t: Throwable) { - Log.e(TAG, "loadExo error", t) - event(ErrorEvent(t)) + } catch (e: Exception) { + Log.e(TAG, "loadExo error", e) + playerError?.invoke(e) } } private var lastTimeStamps: List = emptyList() - override fun addTimeStamps(timeStamps: List) { lastTimeStamps = timeStamps timeStamps.forEach { timestamp -> exoPlayer?.createMessage { _, _ -> - updatedTime(source = PlayerEventSource.Player) + updatedTime() //if (payload is EpisodeSkip.SkipStamp) // this should always be true // onTimestampInvoked?.invoke(payload) } @@ -1134,7 +1124,7 @@ class CS3IPlayer : IPlayer { ?.setDeleteAfterDelivery(false) ?.send() } - updatedTime(source = PlayerEventSource.Player) + updatedTime() } fun onRenderFirst() { @@ -1154,7 +1144,7 @@ class CS3IPlayer : IPlayer { if (invalid) { releasePlayer(saveTime = false) - event(ErrorEvent(InvalidFileException("Too short playback"))) + playerError?.invoke(InvalidFileException("Too short playback")) return } @@ -1163,7 +1153,7 @@ class CS3IPlayer : IPlayer { val width = format?.width val height = format?.height if (height != null && width != null) { - event(ResizedEvent(width = width, height = height)) + playerDimensionsLoaded?.invoke(Pair(width, height)) updatedTime() exoPlayer?.apply { requestedListeningPercentages?.forEach { percentage -> @@ -1197,9 +1187,9 @@ class CS3IPlayer : IPlayer { subtitleHelper.setActiveSubtitles(activeSubtitles.toSet()) loadExo(context, listOf(MediaItemSlice(mediaItem, Long.MIN_VALUE)), subSources) - } catch (t: Throwable) { - Log.e(TAG, "loadOfflinePlayer error", t) - event(ErrorEvent(t)) + } catch (e: Exception) { + Log.e(TAG, "loadOfflinePlayer error", e) + playerError?.invoke(e) } } @@ -1214,7 +1204,7 @@ class CS3IPlayer : IPlayer { .setMimeType(sub.mimeType) .setLanguage("_${sub.name}") .setId(sub.getId()) - .setSelectionFlags(0) + .setSelectionFlags(SELECTION_FLAG_DEFAULT) .build() when (sub.origin) { SubtitleOrigin.DOWNLOADED_FILE -> { @@ -1258,7 +1248,6 @@ class CS3IPlayer : IPlayer { return exoPlayer != null } - @SuppressLint("UnsafeOptInUsageError") private fun loadOnlinePlayer(context: Context, link: ExtractorLink) { Log.i(TAG, "loadOnlinePlayer $link") try { @@ -1275,37 +1264,18 @@ class CS3IPlayer : IPlayer { HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.socketFactory) } - val mime = when (link.type) { - ExtractorLinkType.M3U8 -> MimeTypes.APPLICATION_M3U8 - ExtractorLinkType.DASH -> MimeTypes.APPLICATION_MPD - ExtractorLinkType.VIDEO -> MimeTypes.VIDEO_MP4 - ExtractorLinkType.TORRENT -> throw IllegalArgumentException("No torrent support") - ExtractorLinkType.MAGNET -> throw IllegalArgumentException("No magnet support") + val mime = when { + link.isM3u8 -> MimeTypes.APPLICATION_M3U8 + link.isDash -> MimeTypes.APPLICATION_MPD + else -> MimeTypes.VIDEO_MP4 } - - val mediaItems = when (link) { - is ExtractorLinkPlayList -> link.playlist.map { + val mediaItems = if (link is ExtractorLinkPlayList) { + link.playlist.map { MediaItemSlice(getMediaItem(mime, it.url), it.durationUs) } - - is DrmExtractorLink -> { - listOf( - // Single sliced list with unset length - MediaItemSlice( - getMediaItem(mime, link.url), Long.MIN_VALUE, - drm = DrmMetadata( - kid = link.kid, - key = link.key, - uuid = link.uuid, - kty = link.kty, - keyRequestParameters = link.keyRequestParameters - ) - ) - ) - } - - else -> listOf( + } else { + listOf( // Single sliced list with unset length MediaItemSlice(getMediaItem(mime, link.url), Long.MIN_VALUE) ) @@ -1331,16 +1301,16 @@ class CS3IPlayer : IPlayer { } loadExo(context, mediaItems, subSources, cacheFactory) - } catch (t: Throwable) { - Log.e(TAG, "loadOnlinePlayer error", t) - event(ErrorEvent(t)) + } catch (e: Exception) { + Log.e(TAG, "loadOnlinePlayer error", e) + playerError?.invoke(e) } } override fun reloadPlayer(context: Context) { Log.i(TAG, "reloadPlayer") - releasePlayer(false) + exoPlayer?.release() currentLink?.let { loadOnlinePlayer(context, it) } ?: currentDownloadedFile?.let { diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt index 07ce413e..b830d4e0 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomSubtitleDecoderFactory.kt @@ -2,11 +2,9 @@ package com.lagradost.cloudstream3.ui.player import android.content.Context import android.util.Log -import androidx.annotation.OptIn import androidx.preference.PreferenceManager import androidx.media3.common.Format import androidx.media3.common.MimeTypes -import androidx.media3.common.util.UnstableApi import androidx.media3.exoplayer.text.ExoplayerCuesDecoder import androidx.media3.exoplayer.text.SubtitleDecoderFactory import androidx.media3.extractor.text.SubtitleDecoder @@ -32,7 +30,6 @@ import java.nio.charset.Charset * @param fallbackFormat used to create a decoder based on mimetype if the subtitle string is not * enough to identify the subtitle format. **/ -@OptIn(UnstableApi::class) class CustomDecoder(private val fallbackFormat: Format?) : SubtitleDecoder { companion object { fun updateForcedEncoding(context: Context) { @@ -73,7 +70,7 @@ class CustomDecoder(private val fallbackFormat: Format?) : SubtitleDecoder { RegexOption.IGNORE_CASE ), ) - val captionRegex = listOf(Regex("""(-\s?|)[\[({][\w\s]*?[])}]\s*""")) + val captionRegex = listOf(Regex("""(-\s?|)[\[({][\w\d\s]*?[])}]\s*""")) //https://emptycharacter.com/ //https://www.fileformat.info/info/unicode/char/200b/index.htm @@ -263,7 +260,6 @@ class CustomDecoder(private val fallbackFormat: Format?) : SubtitleDecoder { } /** See https://github.com/google/ExoPlayer/blob/release-v2/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderFactory.java */ -@OptIn(UnstableApi::class) class CustomSubtitleDecoderFactory : SubtitleDecoderFactory { override fun supportsFormat(format: Format): Boolean { // return SubtitleDecoderFactory.DEFAULT.supportsFormat(format) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomTextRenderer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomTextRenderer.kt index f2b863fb..514aaeab 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomTextRenderer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/CustomTextRenderer.kt @@ -1,12 +1,9 @@ package com.lagradost.cloudstream3.ui.player import android.os.Looper -import androidx.annotation.OptIn -import androidx.media3.common.util.UnstableApi import androidx.media3.exoplayer.text.SubtitleDecoderFactory import androidx.media3.exoplayer.text.TextOutput -@OptIn(UnstableApi::class) class CustomTextRenderer( offset: Long, output: TextOutput?, diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt index c7db7d04..baf7ed52 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadFileGenerator.kt @@ -1,15 +1,11 @@ package com.lagradost.cloudstream3.ui.player -import android.net.Uri import com.lagradost.cloudstream3.AcraApplication.Companion.context -import com.lagradost.cloudstream3.CommonActivity.activity import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.ui.player.PlayerSubtitleHelper.Companion.toSubtitleMimeType import com.lagradost.cloudstream3.utils.ExtractorLink -import com.lagradost.cloudstream3.utils.SubtitleUtils.cleanDisplayName -import com.lagradost.cloudstream3.utils.SubtitleUtils.isMatchingSubtitle -import com.lagradost.cloudstream3.utils.VideoDownloadManager.getDownloadFileInfoAndUpdateSettings -import com.lagradost.cloudstream3.utils.VideoDownloadManager.getFolder +import com.lagradost.cloudstream3.utils.ExtractorUri +import com.lagradost.cloudstream3.utils.VideoDownloadManager import kotlin.math.max import kotlin.math.min @@ -18,7 +14,6 @@ class DownloadFileGenerator( private var currentIndex: Int = 0 ) : IGenerator { override val hasCache = false - override val canSkipLoading = false override fun hasNext(): Boolean { return currentIndex < episodes.size - 1 @@ -57,50 +52,44 @@ class DownloadFileGenerator( override suspend fun generateLinks( clearCache: Boolean, - type: LoadType, + isCasting: Boolean, callback: (Pair) -> Unit, subtitleCallback: (SubtitleData) -> Unit, - offset: Int + offset: Int, ): Boolean { val meta = episodes[currentIndex + offset] + callback(Pair(null, meta)) - if (meta.uri == Uri.EMPTY) { - // We do this here so that we only load it when - // we actually need it as it can be more expensive. - val info = meta.id?.let { id -> - activity?.let { act -> - getDownloadFileInfoAndUpdateSettings(act, id) + context?.let { ctx -> + val relative = meta.relativePath + val display = meta.displayName + + if (display == null || relative == null) { + return@let + } + VideoDownloadManager.getFolder(ctx, relative, meta.basePath) + ?.forEach { file -> + val name = display.removeSuffix(".mp4") + if (file.first != meta.displayName && file.first.startsWith(name)) { + val realName = file.first.removePrefix(name) + .removeSuffix(".vtt") + .removeSuffix(".srt") + .removeSuffix(".txt") + .trim() + .removePrefix("(") + .removeSuffix(")") + + subtitleCallback( + SubtitleData( + realName.ifBlank { ctx.getString(R.string.default_subtitles) }, + file.second.toString(), + SubtitleOrigin.DOWNLOADED_FILE, + name.toSubtitleMimeType(), + emptyMap() + ) + ) + } } - } - - if (info != null) { - val newMeta = meta.copy(uri = info.path) - callback(null to newMeta) - } else callback(null to meta) - } else callback(null to meta) - - val ctx = context ?: return true - val relative = meta.relativePath ?: return true - val display = meta.displayName ?: return true - - val cleanDisplay = cleanDisplayName(display) - - getFolder(ctx, relative, meta.basePath)?.forEach { (name, uri) -> - if (isMatchingSubtitle(name, display, cleanDisplay)) { - val cleanName = cleanDisplayName(name) - val realName = cleanName.removePrefix(cleanDisplay) - - subtitleCallback( - SubtitleData( - realName.ifBlank { ctx.getString(R.string.default_subtitles) }, - uri.toString(), - SubtitleOrigin.DOWNLOADED_FILE, - name.toSubtitleMimeType(), - emptyMap(), - null - ) - ) - } } return true diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt index c38160c2..d181e175 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt @@ -1,21 +1,22 @@ package com.lagradost.cloudstream3.ui.player +import android.content.ContentUris import android.content.Intent +import android.net.Uri import android.os.Bundle import android.util.Log import android.view.KeyEvent import androidx.appcompat.app.AppCompatActivity import com.lagradost.cloudstream3.CommonActivity import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.mvvm.normalSafeApiCall -import com.lagradost.cloudstream3.ui.player.OfflinePlaybackHelper.playLink -import com.lagradost.cloudstream3.ui.player.OfflinePlaybackHelper.playUri -import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback +import com.lagradost.cloudstream3.utils.ExtractorUri +import com.lagradost.cloudstream3.utils.UIHelper.navigate +import com.lagradost.safefile.SafeFile + +const val DTAG = "PlayerActivity" class DownloadedPlayerActivity : AppCompatActivity() { - private val dTAG = "DownloadedPlayerAct" - - override fun dispatchKeyEvent(event: KeyEvent): Boolean { + override fun dispatchKeyEvent(event: KeyEvent?): Boolean { CommonActivity.dispatchKeyEvent(this, event)?.let { return it } @@ -33,18 +34,57 @@ class DownloadedPlayerActivity : AppCompatActivity() { CommonActivity.onUserLeaveHint(this) } + override fun onBackPressed() { + finish() + } + + private fun playLink(url: String) { + this.navigate( + R.id.global_to_navigation_player, GeneratorPlayer.newInstance( + LinkGenerator( + listOf( + BasicLink(url) + ) + ) + ) + ) + } + + private fun playUri(uri: Uri) { + val name = SafeFile.fromUri(this, uri)?.name() + this.navigate( + R.id.global_to_navigation_player, GeneratorPlayer.newInstance( + DownloadFileGenerator( + listOf( + ExtractorUri( + uri = uri, + name = name ?: getString(R.string.downloaded_file), + // well not the same as a normal id, but we take it as users may want to + // play downloaded files and save the location + id = kotlin.runCatching { ContentUris.parseId(uri) }.getOrNull()?.hashCode() + ) + ) + ) + ) + ) + } + override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) + Log.i(DTAG, "onCreate") + CommonActivity.loadThemes(this) + super.onCreate(savedInstanceState) CommonActivity.init(this) + setContentView(R.layout.empty_layout) - Log.i(dTAG, "onCreate") val data = intent.data if (intent?.action == Intent.ACTION_SEND) { - val extraText = normalSafeApiCall { // I dont trust android + val extraText = try { // I dont trust android intent.getStringExtra(Intent.EXTRA_TEXT) + } catch (e: Exception) { + null } val cd = intent.clipData val item = if (cd != null && cd.itemCount > 0) cd.getItemAt(0) else null @@ -52,29 +92,22 @@ class DownloadedPlayerActivity : AppCompatActivity() { // idk what I am doing, just hope any of these work if (item?.uri != null) - playUri(this, item.uri) + playUri(item.uri) else if (url != null) - playLink(this, url) + playLink(url) else if (data != null) - playUri(this, data) + playUri(data) else if (extraText != null) - playLink(this, extraText) + playLink(extraText) else { finish() return } } else if (data?.scheme == "content") { - playUri(this, data) + playUri(data) } else { finish() return } - - attachBackPressedCallback { finish() } - } - - override fun onResume() { - super.onResume() - CommonActivity.setActivityInstance(this) } } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt index ec485f1c..7c19e97d 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/ExtractorLinkGenerator.kt @@ -1,13 +1,13 @@ package com.lagradost.cloudstream3.ui.player import com.lagradost.cloudstream3.utils.ExtractorLink +import com.lagradost.cloudstream3.utils.ExtractorUri class ExtractorLinkGenerator( private val links: List, private val subtitles: List, ) : IGenerator { override val hasCache = false - override val canSkipLoading = true override fun getCurrentId(): Int? { return null @@ -37,17 +37,14 @@ class ExtractorLinkGenerator( override suspend fun generateLinks( clearCache: Boolean, - type: LoadType, + isCasting: Boolean, callback: (Pair) -> Unit, subtitleCallback: (SubtitleData) -> Unit, offset: Int ): Boolean { subtitles.forEach(subtitleCallback) - val allowedTypes = type.toSet() links.forEach { - if(allowedTypes.contains(it.type)) { - callback.invoke(it to null) - } + callback.invoke(it to null) } return true diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt index b2e80749..0f3c189d 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt @@ -7,13 +7,14 @@ import android.content.Context import android.content.pm.ActivityInfo import android.content.res.ColorStateList import android.content.res.Configuration +import android.content.res.Resources import android.graphics.Color import android.media.AudioManager import android.os.Build import android.os.Bundle import android.provider.Settings import android.text.Editable -import android.text.format.DateUtils +import android.util.DisplayMetrics import android.view.KeyEvent import android.view.LayoutInflater import android.view.MotionEvent @@ -25,25 +26,18 @@ import android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHO import android.view.animation.AlphaAnimation import android.view.animation.Animation import android.view.animation.AnimationUtils -import androidx.annotation.OptIn -import android.widget.LinearLayout import androidx.appcompat.app.AlertDialog import androidx.core.graphics.blue import androidx.core.graphics.green import androidx.core.graphics.red -import androidx.core.view.children import androidx.core.view.isGone -import androidx.core.view.isInvisible import androidx.core.view.isVisible import androidx.core.widget.doOnTextChanged -import androidx.media3.common.util.UnstableApi import androidx.preference.PreferenceManager -import com.google.android.material.button.MaterialButton +import com.lagradost.cloudstream3.AcraApplication.Companion.getKey +import com.lagradost.cloudstream3.AcraApplication.Companion.setKey import com.lagradost.cloudstream3.CommonActivity.keyEventListener import com.lagradost.cloudstream3.CommonActivity.playerEventListener -import com.lagradost.cloudstream3.CommonActivity.screenHeight -import com.lagradost.cloudstream3.CommonActivity.screenWidth -import com.lagradost.cloudstream3.LoadResponse import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.databinding.PlayerCustomLayoutBinding import com.lagradost.cloudstream3.databinding.SubtitleOffsetBinding @@ -52,11 +46,7 @@ import com.lagradost.cloudstream3.ui.player.GeneratorPlayer.Companion.subsProvid import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper import com.lagradost.cloudstream3.ui.result.setText import com.lagradost.cloudstream3.ui.result.txt -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.AppContextUtils.isUsingMobileData -import com.lagradost.cloudstream3.utils.DataStoreHelper +import com.lagradost.cloudstream3.utils.AppUtils.isUsingMobileData import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe @@ -66,13 +56,9 @@ import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage import com.lagradost.cloudstream3.utils.UIHelper.showSystemUI import com.lagradost.cloudstream3.utils.UIHelper.toPx -import com.lagradost.cloudstream3.utils.UserPreferenceDelegate import com.lagradost.cloudstream3.utils.Vector2 -import kotlin.math.abs -import kotlin.math.ceil -import kotlin.math.max -import kotlin.math.min -import kotlin.math.round +import kotlin.math.* + const val MINIMUM_SEEK_TIME = 7000L // when swipe seeking const val MINIMUM_VERTICAL_SWIPE = 2.0f // in percentage @@ -86,12 +72,12 @@ private const val SUBTITLE_DELAY_BUNDLE_KEY = "subtitle_delay" // All the UI Logic for the player open class FullScreenPlayer : AbstractPlayerFragment() { - private var isVerticalOrientation: Boolean = false protected open var lockRotation = true protected open var isFullScreenPlayer = true + protected open var isTv = false + protected var playerBinding: PlayerCustomLayoutBinding? = null - private var durationMode: Boolean by UserPreferenceDelegate("duration_mode", false) // state of player UI protected var isShowing = false @@ -122,9 +108,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() { protected var playerResizeEnabled = false protected var doubleTapEnabled = false protected var doubleTapPauseEnabled = true - protected var playerRotateEnabled = false - protected var autoPlayerRotateEnabled = false - private var hideControlsNames = false protected var subtitleDelay set(value) = try { @@ -143,6 +126,19 @@ open class FullScreenPlayer : AbstractPlayerFragment() { protected var useTrueSystemBrightness = true private val fullscreenNotch = true //TODO SETTING + protected val displayMetrics: DisplayMetrics = Resources.getSystem().displayMetrics + + // screenWidth and screenHeight does always + // refer to the screen while in landscape mode + protected val screenWidth: Int + get() { + return max(displayMetrics.widthPixels, displayMetrics.heightPixels) + } + protected val screenHeight: Int + get() { + return min(displayMetrics.widthPixels, displayMetrics.heightPixels) + } + private var statusBarHeight: Int? = null private var navigationBarHeight: Int? = null @@ -194,7 +190,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() { open fun openOnlineSubPicker( context: Context, - loadResponse: LoadResponse?, + imdbId: Long?, dismissCallback: (() -> Unit) ) { throw NotImplementedError() @@ -246,7 +242,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() { fadeAnimation.duration = 100 fadeAnimation.fillAfter = true - @OptIn(UnstableApi::class) val sView = subView val sStyle = subStyle if (sView != null && sStyle != null) { @@ -260,6 +255,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() { val playerSourceMove = if (isShowing) 0f else -50.toPx.toFloat() + playerBinding?.apply { playerOpenSource.let { ObjectAnimator.ofFloat(it, "translationY", playerSourceMove).apply { @@ -300,74 +296,31 @@ open class FullScreenPlayer : AbstractPlayerFragment() { player.getCurrentPreferredSubtitle() == null } - private fun restoreOrientationWithSensor(activity: Activity) { - val currentOrientation = activity.resources.configuration.orientation - val orientation = when (currentOrientation) { - Configuration.ORIENTATION_LANDSCAPE -> - ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE - - Configuration.ORIENTATION_PORTRAIT -> - ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT - - else -> dynamicOrientation() - } - activity.requestedOrientation = orientation - } - - private fun toggleOrientationWithSensor(activity: Activity) { - val currentOrientation = activity.resources.configuration.orientation - val orientation: Int = when (currentOrientation) { - Configuration.ORIENTATION_LANDSCAPE -> - ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT - - Configuration.ORIENTATION_PORTRAIT -> - ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE - - else -> dynamicOrientation() - } - activity.requestedOrientation = orientation - } - open fun lockOrientation(activity: Activity) { - @Suppress("DEPRECATION") - val display = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) + val display = (activity.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay - else activity.display!! val rotation = display.rotation val currentOrientation = activity.resources.configuration.orientation - val orientation: Int + var orientation = 0 when (currentOrientation) { - Configuration.ORIENTATION_LANDSCAPE -> - orientation = - if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_90) - ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE - else - ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE + Configuration.ORIENTATION_LANDSCAPE -> orientation = + if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_90) ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE else ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE - Configuration.ORIENTATION_PORTRAIT -> - orientation = - if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_270) - ActivityInfo.SCREEN_ORIENTATION_PORTRAIT - else - ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT - - else -> orientation = dynamicOrientation() + Configuration.ORIENTATION_SQUARE, Configuration.ORIENTATION_UNDEFINED, Configuration.ORIENTATION_PORTRAIT -> ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE + //Configuration.ORIENTATION_PORTRAIT -> orientation = + // if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_270) ActivityInfo.SCREEN_ORIENTATION_PORTRAIT else ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT } activity.requestedOrientation = orientation } - private fun updateOrientation(ignoreDynamicOrientation: Boolean = false) { + private fun updateOrientation() { activity?.apply { - if (lockRotation) { - if (isLocked) { + if(lockRotation) { + if(isLocked) { lockOrientation(this) - } else { - if (ignoreDynamicOrientation) { - // restore when lock is disabled - restoreOrientationWithSensor(this) - } else { - this.requestedOrientation = dynamicOrientation() - } + } + else { + requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE } } } @@ -386,6 +339,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() { } protected fun exitFullscreen() { + activity?.showSystemUI() //if (lockRotation) activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER @@ -397,7 +351,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() { WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT } activity?.window?.attributes = lp - activity?.showSystemUI() } override fun onResume() { @@ -414,7 +367,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() { private fun setPlayBackSpeed(speed: Float) { try { - DataStoreHelper.playBackSpeed = speed + setKey(PLAYBACK_SPEED_KEY, speed) playerBinding?.playerSpeedBtt?.text = getString(R.string.player_speed_text_format).format(speed) .replace(".0x", "x") @@ -504,11 +457,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() { dialog.dismissSafe(activity) player.seekTime(1L) } - resetBtt.setOnClickListener { - subtitleDelay = 0 - dialog.dismissSafe(activity) - player.seekTime(1L) - } cancelBtt.setOnClickListener { subtitleDelay = beforeOffset dialog.dismissSafe(activity) @@ -646,7 +594,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() { } isLocked = !isLocked - updateOrientation(true) // set true to ignore auto rotate to stay in current orientation + updateOrientation() if (isLocked && isShowing) { playerBinding?.playerHolder?.postDelayed({ @@ -740,15 +688,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() { private var currentTapIndex = 0 protected fun autoHide() { currentTapIndex++ - delayHide() - } - - override fun playerStatusChanged() { - super.playerStatusChanged() - delayHide() - } - - private fun delayHide() { val index = currentTapIndex playerBinding?.playerHolder?.postDelayed({ if (!isCurrentTouchValid && isShowing && index == currentTapIndex && player.getIsPlaying()) { @@ -935,7 +874,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() { currentTouch )?.let { seekTo -> if (abs(seekTo - startTime) > MINIMUM_SEEK_TIME) { - player.seekTo(seekTo, PlayerEventSource.UI) + player.seekTo(seekTo) } } } @@ -970,10 +909,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() { } else -> { - player.handleEvent( - CSPlayerEvent.PlayPauseToggle, - PlayerEventSource.UI - ) + player.handleEvent(CSPlayerEvent.PlayPauseToggle) } } } else if (doubleTapEnabled && isFullScreenPlayer) { @@ -1166,7 +1102,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() { return true } - @SuppressLint("GestureBackNavigation") private fun handleKeyEvent(event: KeyEvent, hasNavigated: Boolean): Boolean { if (hasNavigated) { autoHide() @@ -1183,7 +1118,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() { } } - KeyEvent.KEYCODE_DPAD_DOWN, KeyEvent.KEYCODE_DPAD_UP -> { if (!isShowing) { onClickChange() @@ -1232,7 +1166,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() { // netflix capture back and hide ~monke KeyEvent.KEYCODE_BACK -> { - if (isShowing && isLayout(TV or EMULATOR)) { + if (isShowing && isTv) { onClickChange() return true } @@ -1250,7 +1184,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() { // if nothing has loaded these buttons should not be visible playerBinding?.apply { playerSkipEpisode.isVisible = false - playerGoForward.isVisible = false playerTracksBtt.isVisible = false playerSkipOp.isVisible = false shadowOverlay.isVisible = false @@ -1272,7 +1205,7 @@ open class FullScreenPlayer : AbstractPlayerFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) // init variables - setPlayBackSpeed(DataStoreHelper.playBackSpeed) + setPlayBackSpeed(getKey(PLAYBACK_SPEED_KEY) ?: 1.0f) savedInstanceState?.getLong(SUBTITLE_DELAY_BUNDLE_KEY)?.let { subtitleDelay = it } @@ -1324,10 +1257,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() { player.handleEvent(CSPlayerEvent.SeekBack) } - PlayerEventType.Restart -> { - player.handleEvent(CSPlayerEvent.Restart) - } - PlayerEventType.ToggleMute -> { player.handleEvent(CSPlayerEvent.ToggleMute) } @@ -1363,6 +1292,15 @@ open class FullScreenPlayer : AbstractPlayerFragment() { } else false } + //player_episodes_button?.setOnClickListener { + // player_episodes_button?.isGone = true + // player_episode_list?.isVisible = true + //} +// + //player_episode_list?.adapter = PlayerEpisodeAdapter { click -> +// + //} + try { context?.let { ctx -> val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx) @@ -1398,14 +1336,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() { ctx.getString(R.string.playback_speed_enabled_key), false ) - playerRotateEnabled = settingsManager.getBoolean( - ctx.getString(R.string.rotate_video_key), - false - ) - autoPlayerRotateEnabled = settingsManager.getBoolean( - ctx.getString(R.string.auto_rotate_video_key), - false - ) playerResizeEnabled = settingsManager.getBoolean( ctx.getString(R.string.player_resize_enabled_key), @@ -1423,8 +1353,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() { false ) - hideControlsNames = settingsManager.getBoolean(ctx.getString(R.string.hide_player_control_names_key), false) - val profiles = QualityDataHelper.getProfiles() val type = if (ctx.isUsingMobileData()) QualityDataHelper.QualityProfileType.Data @@ -1444,57 +1372,20 @@ open class FullScreenPlayer : AbstractPlayerFragment() { playerBinding?.apply { playerSpeedBtt.isVisible = playBackSpeedEnabled playerResizeBtt.isVisible = playerResizeEnabled - playerRotateBtt.isVisible = playerRotateEnabled - if (hideControlsNames) { - hideControlsNames() - } } } catch (e: Exception) { logError(e) } - playerBinding?.apply { - - if (isLayout(TV or EMULATOR)) { - mapOf( - playerGoBack to playerGoBackText, - playerRestart to playerRestartText, - playerGoForward to playerGoForwardText - ).forEach { (button, text) -> - button.setOnFocusChangeListener { _, hasFocus -> - if (!hasFocus) { - text.isSelected = false - text.isVisible = false - return@setOnFocusChangeListener - } - text.isSelected = true - text.isVisible = true - } - } - } - playerPausePlay.setOnClickListener { autoHide() player.handleEvent(CSPlayerEvent.PlayPauseToggle) } - exoDuration.setOnClickListener { - setRemainingTimeCounter(true) - } - - timeLeft.setOnClickListener { - setRemainingTimeCounter(false) - } - skipChapterButton.setOnClickListener { player.handleEvent(CSPlayerEvent.SkipCurrentChapter) } - playerRotateBtt.setOnClickListener { - autoHide() - toggleRotate() - } - // init clicks playerResizeBtt.setOnClickListener { autoHide() @@ -1516,16 +1407,6 @@ open class FullScreenPlayer : AbstractPlayerFragment() { player.handleEvent(CSPlayerEvent.NextEpisode) } - playerGoForward.setOnClickListener { - autoHide() - player.handleEvent(CSPlayerEvent.NextEpisode) - } - - playerRestart.setOnClickListener { - autoHide() - player.handleEvent(CSPlayerEvent.Restart) - } - playerLock.setOnClickListener { autoHide() toggleLock() @@ -1580,74 +1461,34 @@ open class FullScreenPlayer : AbstractPlayerFragment() { return@setOnTouchListener false } } - // cs3 is peak media center - setRemainingTimeCounter(durationMode || isLayout(TV)) - playerBinding?.exoPosition?.doOnTextChanged { _, _, _, _ -> - updateRemainingTime() - } // init UI try { uiReset() + + // init chromecast UI + // removed due to having no use and bugging + //activity?.let { + // if (it.isCastApiAvailable()) { + // try { + // CastButtonFactory.setUpMediaRouteButton(it, player_media_route_button) + // val castContext = CastContext.getSharedInstance(it.applicationContext) + // + // player_media_route_button?.isGone = + // castContext.castState == CastState.NO_DEVICES_AVAILABLE + // castContext.addCastStateListener { state -> + // player_media_route_button?.isGone = + // state == CastState.NO_DEVICES_AVAILABLE + // } + // } catch (e: Exception) { + // logError(e) + // } + // } else { + // // if cast is not possible hide UI + // player_media_route_button?.isGone = true + // } + //} } catch (e: Exception) { logError(e) } } - - @SuppressLint("SourceLockedOrientationActivity") - private fun toggleRotate() { - activity?.let { - toggleOrientationWithSensor(it) - } - } - - private fun PlayerCustomLayoutBinding.hideControlsNames() { - fun iterate(layout: LinearLayout) { - layout.children.forEach { - if (it is MaterialButton) { - it.textSize = 0f - it.iconPadding = 0 - it.iconGravity = MaterialButton.ICON_GRAVITY_TEXT_START - it.setPadding(0,0,0,0) - } else if (it is LinearLayout) { - iterate(it) - } - } - } - iterate(playerLockHolder.parent as LinearLayout) - } - - override fun playerDimensionsLoaded(width: Int, height: Int) { - isVerticalOrientation = height > width - updateOrientation() - } - - private fun updateRemainingTime() { - val duration = player.getDuration() - val position = player.getPosition() - - if (duration != null && duration > 1 && position != null) { - val remainingTimeSeconds = (duration - position + 500) / 1000 - val formattedTime = "-${DateUtils.formatElapsedTime(remainingTimeSeconds)}" - - playerBinding?.timeLeft?.text = formattedTime - } - } - - private fun setRemainingTimeCounter(showRemaining: Boolean) { - durationMode = showRemaining - playerBinding?.exoDuration?.isInvisible = showRemaining - playerBinding?.timeLeft?.isVisible = showRemaining - } - - private fun dynamicOrientation(): Int { - return if (autoPlayerRotateEnabled) { - if (isVerticalOrientation) { - ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT - } else { - ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE - } - } else { - ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE // default orientation - } - } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt index d4fd047c..2b9304b6 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt @@ -6,7 +6,6 @@ import android.app.Dialog import android.content.Context import android.content.Intent import android.content.res.ColorStateList -import android.os.Build import android.os.Bundle import android.util.Log import android.view.LayoutInflater @@ -14,7 +13,6 @@ import android.view.View import android.view.ViewGroup import android.widget.* import androidx.activity.result.contract.ActivityResultContracts -import androidx.annotation.OptIn import androidx.core.animation.addListener import androidx.core.content.ContextCompat import androidx.core.view.isGone @@ -23,21 +21,14 @@ import androidx.lifecycle.ViewModelProvider import androidx.preference.PreferenceManager import androidx.media3.common.Format.NO_VALUE import androidx.media3.common.MimeTypes -import androidx.media3.common.util.UnstableApi import com.lagradost.cloudstream3.* import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull -import com.lagradost.cloudstream3.AcraApplication.Companion.setKey import com.lagradost.cloudstream3.CommonActivity.showToast -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.getTMDbId import com.lagradost.cloudstream3.databinding.DialogOnlineSubtitlesBinding import com.lagradost.cloudstream3.databinding.FragmentPlayerBinding import com.lagradost.cloudstream3.databinding.PlayerSelectSourceAndSubsBinding import com.lagradost.cloudstream3.databinding.PlayerSelectTracksBinding import com.lagradost.cloudstream3.mvvm.* -import com.lagradost.cloudstream3.subtitles.AbstractSubApi import com.lagradost.cloudstream3.subtitles.AbstractSubtitleEntities import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.subtitleProviders import com.lagradost.cloudstream3.ui.player.CS3IPlayer.Companion.preferredAudioTrackLanguage @@ -46,14 +37,9 @@ import com.lagradost.cloudstream3.ui.player.PlayerSubtitleHelper.Companion.toSub import com.lagradost.cloudstream3.ui.player.source_priority.QualityDataHelper import com.lagradost.cloudstream3.ui.player.source_priority.QualityProfileDialog import com.lagradost.cloudstream3.ui.result.* -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.PHONE -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.ui.subtitles.SUBTITLE_AUTO_SELECT_KEY +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.getAutoSelectLanguageISO639_1 import com.lagradost.cloudstream3.utils.* -import com.lagradost.cloudstream3.utils.AppContextUtils.sortSubs import com.lagradost.cloudstream3.utils.Coroutines.ioSafe import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog @@ -66,7 +52,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage import com.lagradost.cloudstream3.utils.UIHelper.toPx import com.lagradost.safefile.SafeFile import kotlinx.coroutines.Job -import java.io.Serializable import java.util.* import kotlin.math.abs @@ -82,10 +67,7 @@ class GeneratorPlayer : FullScreenPlayer() { } val subsProviders - get() = subtitleProviders.filter { provider -> - (provider as? AbstractSubApi)?.let { !it.requiresLogin || it.loginInfo() != null } - ?: true - } + get() = subtitleProviders.filter { !it.requiresLogin || it.loginInfo() != null } val subsProvidersIsActive get() = subsProviders.isNotEmpty() } @@ -118,33 +100,10 @@ class GeneratorPlayer : FullScreenPlayer() { binding?.playerLoadingOverlay?.isVisible = true } - private fun setSubtitles(subtitle: SubtitleData?): Boolean { - // If subtitle is changed -> Save the language - if (subtitle != currentSelectedSubtitles) { - val subtitleLanguage639 = if (subtitle == null) { - // "" is No Subtitles - "" - } else if (subtitle.languageCode != null) { - // Could be "English 4" which is why it is trimmed. - val trimmedLanguage = subtitle.languageCode.replace(Regex("\\d"), "").trim() - - languages.firstOrNull { language -> - language.languageName.equals(trimmedLanguage, ignoreCase = true) || - language.ISO_639_1 == subtitle.languageCode - }?.ISO_639_1 - } else { - null - } - - if (subtitleLanguage639 != null) { - setKey(SUBTITLE_AUTO_SELECT_KEY, subtitleLanguage639) - preferredAutoSelectSubtitles = subtitleLanguage639 - } - } - - currentSelectedSubtitles = subtitle - //Log.i(TAG, "setSubtitles = $subtitle") - return player.setPreferredSubtitles(subtitle) + private fun setSubtitles(sub: SubtitleData?): Boolean { + currentSelectedSubtitles = sub + //Log.i(TAG, "setSubtitles = $sub") + return player.setPreferredSubtitles(sub) } override fun embeddedSubtitlesFetched(subtitles: List) { @@ -162,13 +121,6 @@ class GeneratorPlayer : FullScreenPlayer() { } } - override fun playerStatusChanged() { - super.playerStatusChanged() - if (player.getIsPlaying()) { - viewModel.forceClearCache = false - } - } - private fun noSubtitles(): Boolean { return setSubtitles(null) } @@ -228,7 +180,6 @@ class GeneratorPlayer : FullScreenPlayer() { (if (sameEpisode) currentSelectedSubtitles else null) ?: getAutoSelectSubtitle( currentSubs, settings = true, downloads = true ), - preview = isFullScreenPlayer ) } @@ -238,7 +189,7 @@ class GeneratorPlayer : FullScreenPlayer() { private fun closestQuality(target: Int?): Qualities { if (target == null) return Qualities.Unknown - return Qualities.entries.minBy { abs(it.value - target) } + return Qualities.values().minBy { abs(it.value - target) } } private fun getLinkPriority( @@ -268,7 +219,6 @@ class GeneratorPlayer : FullScreenPlayer() { var episode: Int? = null, var season: Int? = null, var name: String? = null, - var imdbId: String? = null, ) private fun getMetaData(): TempMetaData { @@ -295,7 +245,7 @@ class GeneratorPlayer : FullScreenPlayer() { } override fun openOnlineSubPicker( - context: Context, loadResponse: LoadResponse?, dismissCallback: (() -> Unit) + context: Context, imdbId: Long?, dismissCallback: (() -> Unit) ) { val providers = subsProviders val isSingleProvider = subsProviders.size == 1 @@ -371,6 +321,8 @@ class GeneratorPlayer : FullScreenPlayer() { binding.subtitleAdapter.choiceMode = AbsListView.CHOICE_MODE_SINGLE binding.subtitleAdapter.adapter = arrayAdapter + val adapter = + binding.subtitleAdapter.adapter as? ArrayAdapter binding.subtitleAdapter.setOnItemClickListener { _, _, position, _ -> currentSubtitle = currentSubtitles.getOrNull(position) ?: return@setOnItemClickListener @@ -381,12 +333,11 @@ class GeneratorPlayer : FullScreenPlayer() { fun setSubtitlesList(list: List) { currentSubtitles = list - arrayAdapter.clear() - arrayAdapter.addAll(currentSubtitles) + adapter?.clear() + adapter?.addAll(currentSubtitles) } val currentTempMeta = getMetaData() - // bruh idk why it is not correct val color = ColorStateList.valueOf(context.colorFromAttribute(R.attr.colorAccent)) binding.searchLoadingBar.progressTintList = color @@ -434,10 +385,7 @@ class GeneratorPlayer : FullScreenPlayer() { val search = AbstractSubtitleEntities.SubtitleSearch( query = query ?: return@ioSafe, - imdbId = loadResponse?.getImdbId(), - tmdbId = loadResponse?.getTMDbId()?.toInt(), - malId = loadResponse?.getMalId()?.toInt(), - aniListId = loadResponse?.getAniListId()?.toInt(), + imdb = imdbId, epNumber = currentTempMeta.episode, seasonNumber = currentTempMeta.season, lang = currentLanguageTwoLetters.ifBlank { null }, @@ -493,21 +441,16 @@ class GeneratorPlayer : FullScreenPlayer() { currentSubtitle?.let { currentSubtitle -> providers.firstOrNull { it.idPrefix == currentSubtitle.idPrefix }?.let { api -> ioSafe { - val subtitles = - api.getResource(currentSubtitle).getSubtitles().map { resource -> - SubtitleData( - name = resource.name ?: getName(currentSubtitle, true), - url = resource.url, - origin = resource.origin, - mimeType = resource.url.toSubtitleMimeType(), - headers = currentSubtitle.headers, - currentSubtitle.lang - ) - } - if (subtitles.isNotEmpty()) { - runOnMainThread { - addAndSelectSubtitles(*subtitles.toTypedArray()) - } + val url = api.load(currentSubtitle) ?: return@ioSafe + val subtitle = SubtitleData( + name = getName(currentSubtitle, true), + url = url, + origin = SubtitleOrigin.URL, + mimeType = url.toSubtitleMimeType(), + headers = currentSubtitle.headers + ) + runOnMainThread { + addAndSelectSubtitles(subtitle) } } } @@ -524,7 +467,7 @@ class GeneratorPlayer : FullScreenPlayer() { //TODO: Set year text from currently loaded movie on Player //dialog.subtitles_search_year?.setText(currentTempMeta.year) } - @OptIn(UnstableApi::class) + private fun openSubPicker() { try { subsPathPicker.launch( @@ -545,11 +488,7 @@ class GeneratorPlayer : FullScreenPlayer() { } } - private fun addAndSelectSubtitles( - vararg subtitleData: SubtitleData - ) { - if (subtitleData.isEmpty()) return - val selectedSubtitle = subtitleData.first() + private fun addAndSelectSubtitles(subtitleData: SubtitleData) { val ctx = context ?: return val subs = currentSubs + subtitleData @@ -561,13 +500,13 @@ class GeneratorPlayer : FullScreenPlayer() { player.saveData() player.reloadPlayer(ctx) - setSubtitles(selectedSubtitle) - viewModel.addSubtitles(subtitleData.toSet()) + setSubtitles(subtitleData) + viewModel.addSubtitles(setOf(subtitleData)) selectSourceDialog?.dismissSafe() showToast( - String.format(ctx.getString(R.string.player_loaded_subtitles), selectedSubtitle.name), + String.format(ctx.getString(R.string.player_loaded_subtitles), subtitleData.name), Toast.LENGTH_LONG ) } @@ -596,8 +535,7 @@ class GeneratorPlayer : FullScreenPlayer() { uri.toString(), SubtitleOrigin.DOWNLOADED_FILE, name.toSubtitleMimeType(), - emptyMap(), - null + emptyMap() ) addAndSelectSubtitles(subtitleData) @@ -613,7 +551,7 @@ class GeneratorPlayer : FullScreenPlayer() { //println("CURRENT SELECTED :$currentSelectedSubtitles of $currentSubs") context?.let { ctx -> val isPlaying = player.getIsPlaying() - player.handleEvent(CSPlayerEvent.Pause, PlayerEventSource.UI) + player.handleEvent(CSPlayerEvent.Pause) val currentSubtitles = sortSubs(currentSubs) val sourceDialog = Dialog(ctx, R.style.AlertDialogCustomBlack) @@ -646,8 +584,6 @@ class GeneratorPlayer : FullScreenPlayer() { } if (subsProvidersIsActive) { - val currentLoadResponse = viewModel.getLoadResponse() - val loadFromOpenSubsFooter: TextView = layoutInflater.inflate( R.layout.sort_bottom_footer_add_choice, null ) as TextView @@ -658,7 +594,7 @@ class GeneratorPlayer : FullScreenPlayer() { loadFromOpenSubsFooter.setOnClickListener { shouldDismiss = false sourceDialog.dismissSafe(activity) - openOnlineSubPicker(it.context, currentLoadResponse) { + openOnlineSubPicker(it.context, null) { dismiss() } } @@ -797,6 +733,7 @@ class GeneratorPlayer : FullScreenPlayer() { settingsManager.edit().putString( ctx.getString(R.string.subtitles_encoding_key), prefValues[it] ).apply() + updateForcedEncoding(ctx) dismiss() player.seekTime(-1) // to update subtitles, a dirty trick @@ -946,17 +883,12 @@ class GeneratorPlayer : FullScreenPlayer() { } - override fun playerError(exception: Throwable) { + override fun playerError(exception: Exception) { Log.i(TAG, "playerError = $currentSelectedLink") - if (!hasNextMirror()) { - viewModel.forceClearCache = true - } super.playerError(exception) } private fun noLinksFound() { - viewModel.forceClearCache = true - showToast(R.string.no_links_found_toast, Toast.LENGTH_SHORT) activity?.popCurrentPage() } @@ -1013,13 +945,14 @@ class GeneratorPlayer : FullScreenPlayer() { var maxEpisodeSet: Int? = null var hasRequestedStamps: Boolean = false - override fun playerPositionChanged(position: Long, duration: Long) { + override fun playerPositionChanged(posDur: Pair) { // Don't save livestream data if ((currentMeta as? ResultEpisode)?.tvType?.isLiveStream() == true) return // Don't save NSFW data if ((currentMeta as? ResultEpisode)?.tvType == TvType.NSFW) return + val (position, duration) = posDur if (duration <= 0L) return // idk how you achieved this, but div by zero crash if (!hasRequestedStamps) { hasRequestedStamps = true @@ -1090,7 +1023,7 @@ class GeneratorPlayer : FullScreenPlayer() { ctx.getString(R.string.episode_sync_enabled_key), true ) ) maxEpisodeSet = meta.episode - sync.modifyMaxEpisode(meta.totalEpisodeIndex ?: meta.episode) + sync.modifyMaxEpisode(meta.episode) } } @@ -1099,15 +1032,8 @@ class GeneratorPlayer : FullScreenPlayer() { } playerBinding?.playerSkipOp?.isVisible = isOpVisible - - when { - isLayout(PHONE) -> - playerBinding?.playerSkipEpisode?.isVisible = - !isOpVisible && viewModel.hasNextEpisode() == true - - else -> - playerBinding?.playerGoForward?.isVisible = viewModel.hasNextEpisode() == true - } + playerBinding?.playerSkipEpisode?.isVisible = + !isOpVisible && viewModel.hasNextEpisode() == true if (percentage >= PRELOAD_NEXT_EPISODE_PERCENTAGE) { viewModel.preLoadNextLinks() @@ -1263,7 +1189,7 @@ class GeneratorPlayer : FullScreenPlayer() { fun setPlayerDimen(widthHeight: Pair?) { val extra = if (widthHeight != null) { val (width, height) = widthHeight - "- ${width}x${height}" + "${width}x${height}" } else { "" } @@ -1274,7 +1200,7 @@ class GeneratorPlayer : FullScreenPlayer() { 0 -> "" 1 -> extra 2 -> source - 3 -> "$source $extra" + 3 -> "$source - $extra" else -> "" } playerBinding?.playerVideoTitleRez?.apply { @@ -1283,15 +1209,14 @@ class GeneratorPlayer : FullScreenPlayer() { } } - override fun playerDimensionsLoaded(width: Int, height: Int) { - super.playerDimensionsLoaded(width, height) - setPlayerDimen(width to height) + override fun playerDimensionsLoaded(widthHeight: Pair) { + setPlayerDimen(widthHeight) } private fun unwrapBundle(savedInstanceState: Bundle?) { Log.i(TAG, "unwrapBundle = $savedInstanceState") savedInstanceState?.let { bundle -> - sync.addSyncs(bundle.getSafeSerializable>("syncData")) + sync.addSyncs(bundle.getSerializable("syncData") as? HashMap?) } } @@ -1299,8 +1224,8 @@ class GeneratorPlayer : FullScreenPlayer() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { // this is used instead of layout-television to follow the settings and some TV devices are not classified as TV for some reason - layout = - if (isLayout(TV or EMULATOR)) R.layout.fragment_player_tv else R.layout.fragment_player + isTv = isTvSettings() + layout = if (isTv) R.layout.fragment_player_tv else R.layout.fragment_player viewModel = ViewModelProvider(this)[PlayerGeneratorViewModel::class.java] sync = ViewModelProvider(this)[SyncViewModel::class.java] @@ -1430,7 +1355,6 @@ class GeneratorPlayer : FullScreenPlayer() { } binding?.playerLoadingGoBack?.setOnClickListener { - exitFullscreen() player.release() activity?.popCurrentPage() } @@ -1462,7 +1386,7 @@ class GeneratorPlayer : FullScreenPlayer() { observe(viewModel.currentLinks) { currentLinks = it - val turnVisible = it.isNotEmpty() && lastUsedGenerator?.canSkipLoading == true + val turnVisible = it.isNotEmpty() val wasGone = binding?.overlayLoadingSkipButton?.isGone == true binding?.overlayLoadingSkipButton?.isVisible = turnVisible @@ -1508,6 +1432,3 @@ class GeneratorPlayer : FullScreenPlayer() { } } } - -@Suppress("DEPRECATION") -inline fun Bundle.getSafeSerializable(key: String) : T? = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) getSerializable(key) as? T else getSerializable(key, T::class.java) \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IGenerator.kt index 6b8e6ea8..a1287e6a 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IGenerator.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IGenerator.kt @@ -1,51 +1,10 @@ package com.lagradost.cloudstream3.ui.player import com.lagradost.cloudstream3.utils.ExtractorLink -import com.lagradost.cloudstream3.utils.ExtractorLinkType - -enum class LoadType { - Unknown, - InApp, - InAppDownload, - ExternalApp, - Browser, - Chromecast, - Fcast -} - -fun LoadType.toSet() : Set { - return when(this) { - LoadType.InApp -> setOf( - ExtractorLinkType.VIDEO, - ExtractorLinkType.DASH, - ExtractorLinkType.M3U8 - ) - LoadType.Browser -> setOf( - ExtractorLinkType.VIDEO, - ExtractorLinkType.DASH, - ExtractorLinkType.M3U8 - ) - LoadType.InAppDownload -> setOf( - ExtractorLinkType.VIDEO, - ExtractorLinkType.M3U8 - ) - LoadType.ExternalApp, LoadType.Unknown -> ExtractorLinkType.entries.toSet() - LoadType.Chromecast -> setOf( - ExtractorLinkType.VIDEO, - ExtractorLinkType.DASH, - ExtractorLinkType.M3U8 - ) - LoadType.Fcast -> setOf( - ExtractorLinkType.VIDEO, - ExtractorLinkType.DASH, - ExtractorLinkType.M3U8 - ) - } -} +import com.lagradost.cloudstream3.utils.ExtractorUri interface IGenerator { val hasCache: Boolean - val canSkipLoading: Boolean fun hasNext(): Boolean fun hasPrev(): Boolean @@ -54,15 +13,15 @@ interface IGenerator { fun goto(index: Int) fun getCurrentId(): Int? // this is used to save data or read data about this id - fun getCurrent(offset: Int = 0): Any? // this is used to get metadata about the current playing, can return null - fun getAll(): List? // this us used to get the metadata about all entries, not needed + fun getCurrent(offset : Int = 0): Any? // this is used to get metadata about the current playing, can return null + fun getAll() : List? // this us used to get the metadata about all entries, not needed /* not safe, must use try catch */ suspend fun generateLinks( clearCache: Boolean, - type: LoadType, + isCasting: Boolean, callback: (Pair) -> Unit, subtitleCallback: (SubtitleData) -> Unit, - offset: Int = 0, + offset : Int = 0, ): Boolean } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt index 89c6f73b..3038cb8d 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/IPlayer.kt @@ -1,13 +1,14 @@ package com.lagradost.cloudstream3.ui.player import android.content.Context -import android.graphics.Bitmap import android.util.Rational import com.lagradost.cloudstream3.ui.subtitles.SaveCaptionStyle import com.lagradost.cloudstream3.utils.EpisodeSkip import com.lagradost.cloudstream3.utils.ExtractorLink +import com.lagradost.cloudstream3.utils.ExtractorUri enum class PlayerEventType(val value: Int) { + //Stop(-1), Pause(0), Play(1), SeekForward(2), @@ -25,7 +26,6 @@ enum class PlayerEventType(val value: Int) { Resize(13), SearchSubtitlesOnline(14), SkipOp(15), - Restart(16), } enum class CSPlayerEvent(val value: Int) { @@ -39,127 +39,15 @@ enum class CSPlayerEvent(val value: Int) { PrevEpisode(6), PlayPauseToggle(7), ToggleMute(8), - Restart(9), } enum class CSPlayerLoading { IsPaused, IsPlaying, IsBuffering, + //IsDone, } -enum class PlayerEventSource { - /** This event was invoked from the user pressing some button or selecting something */ - UI, - - /** This event was invoked automatically */ - Player, - - /** This event was invoked from a external sync tool like WatchTogether */ - Sync, -} - -abstract class PlayerEvent { - abstract val source: PlayerEventSource -} - -/** this is used to update UI based of the current time, - * using requestedListeningPercentages as well as saving time */ -data class PositionEvent( - override val source: PlayerEventSource, - val fromMs: Long, - val toMs: Long, - /** duration of the entire video */ - val durationMs: Long, -) : PlayerEvent() { - /** how many ms (+-) we have skipped */ - val seekMs : Long get() = toMs - fromMs -} - -/** player error when rendering or misc, used to display toast or log */ -data class ErrorEvent( - val error: Throwable, - override val source: PlayerEventSource = PlayerEventSource.Player, -) : PlayerEvent() - -/** Event when timestamps appear, null when it should disappear */ -data class TimestampInvokedEvent( - val timestamp: EpisodeSkip.SkipStamp, - override val source: PlayerEventSource = PlayerEventSource.Player, -) : PlayerEvent() - -/** Event for when a chapter is skipped, aka when event is handled (or for future use when skip automatically ads/sponsor) */ -data class TimestampSkippedEvent( - val timestamp: EpisodeSkip.SkipStamp, - override val source: PlayerEventSource = PlayerEventSource.Player, -) : PlayerEvent() - -/** this is used by the player to load the next or prev episode */ -data class EpisodeSeekEvent( - /** -1 = prev, 1 = next, will never be 0, atm the user cant seek more than +-1 */ - val offset: Int, - override val source: PlayerEventSource = PlayerEventSource.Player, -) : PlayerEvent() { - init { - assert(offset != 0) - } -} - -/** Event when the video is resized aka changed resolution or mirror */ -data class ResizedEvent( - val height: Int, - val width: Int, - override val source: PlayerEventSource = PlayerEventSource.Player, -) : PlayerEvent() - -/** Event when the player status update, along with the previous status (for animation)*/ -data class StatusEvent( - val wasPlaying: CSPlayerLoading, - val isPlaying: CSPlayerLoading, - override val source: PlayerEventSource = PlayerEventSource.Player -) : PlayerEvent() - -/** Event when tracks are changed, used for UI changes */ -data class TracksChangedEvent( - override val source: PlayerEventSource = PlayerEventSource.Player -) : PlayerEvent() - -/** Event from player to give all embedded subtitles */ -data class EmbeddedSubtitlesFetchedEvent( - val tracks: List, - override val source: PlayerEventSource = PlayerEventSource.Player -) : PlayerEvent() - -/** on attach player to view */ -data class PlayerAttachedEvent( - val player: Any?, - override val source: PlayerEventSource = PlayerEventSource.Player -) : PlayerEvent() - -/** Event from player to inform that subtitles have updated in some way */ -data class SubtitlesUpdatedEvent( - override val source: PlayerEventSource = PlayerEventSource.Player -) : PlayerEvent() - -/** current player starts, asking for all other programs to shut the fuck up */ -data class RequestAudioFocusEvent( - override val source: PlayerEventSource = PlayerEventSource.Player -) : PlayerEvent() - -/** Pause event, separate from StatusEvent */ -data class PauseEvent( - override val source: PlayerEventSource = PlayerEventSource.Player -) : PlayerEvent() - -/** Play event, separate from StatusEvent */ -data class PlayEvent( - override val source: PlayerEventSource = PlayerEventSource.Player -) : PlayerEvent() - -/** Event when the player video has ended, up to the settings on what to do when that happens */ -data class VideoEndedEvent( - override val source: PlayerEventSource = PlayerEventSource.Player -) : PlayerEvent() interface Track { /** @@ -199,8 +87,17 @@ data class CurrentTracks( class InvalidFileException(msg: String) : Exception(msg) //http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4 +const val STATE_RESUME_WINDOW = "resumeWindow" +const val STATE_RESUME_POSITION = "resumePosition" +const val STATE_PLAYER_FULLSCREEN = "playerFullscreen" +const val STATE_PLAYER_PLAYING = "playerOnPlay" const val ACTION_MEDIA_CONTROL = "media_control" const val EXTRA_CONTROL_TYPE = "control_type" +const val PLAYBACK_SPEED = "playback_speed" +const val RESIZE_MODE_KEY = "resize_mode" // Last used resize mode +const val PLAYBACK_SPEED_KEY = "playback_speed" // Last used playback speed +const val PREFERRED_SUBS_KEY = "preferred_subtitles" // Last used resize mode +//const val PLAYBACK_FASTFORWARD = "playback_fastforward" // Last used resize mode /** Abstract Exoplayer logic, can be expanded to other players */ interface IPlayer { @@ -211,16 +108,27 @@ interface IPlayer { fun getDuration(): Long? fun getPosition(): Long? - fun seekTime(time: Long, source: PlayerEventSource = PlayerEventSource.UI) - fun seekTo(time: Long, source: PlayerEventSource = PlayerEventSource.UI) + fun seekTime(time: Long) + fun seekTo(time: Long) fun getSubtitleOffset(): Long // in ms fun setSubtitleOffset(offset: Long) // in ms fun initCallbacks( - eventHandler: ((PlayerEvent) -> Unit), - /** this is used to request when the player should report back view percentage */ - requestedListeningPercentages: List? = null, + playerUpdated: (Any?) -> Unit, // attach player to view + updateIsPlaying: ((Pair) -> Unit)? = null, // (wasPlaying, isPlaying) + requestAutoFocus: (() -> Unit)? = null, // current player starts, asking for all other programs to shut the fuck up + playerError: ((Exception) -> Unit)? = null, // player error when rendering or misc, used to display toast or log + playerDimensionsLoaded: ((Pair) -> Unit)? = null, // (with, height), for UI + requestedListeningPercentages: List? = null, // this is used to request when the player should report back view percentage + playerPositionChanged: ((Pair) -> Unit)? = null,// (position, duration) this is used to update UI based of the current time + nextEpisode: (() -> Unit)? = null, // this is used by the player to load the next episode + prevEpisode: (() -> Unit)? = null, // this is used by the player to load the previous episode + subtitlesUpdates: (() -> Unit)? = null, // callback from player to inform that subtitles have updated in some way + embeddedSubtitlesFetched: ((List) -> Unit)? = null, // callback from player to give all embedded subtitles + onTracksInfoChanged: (() -> Unit)? = null, // Callback when tracks are changed, used for UI changes + onTimestampInvoked: ((EpisodeSkip.SkipStamp?) -> Unit)? = null, // Callback when timestamps appear, null when it should disappear + onTimestampSkipped: ((EpisodeSkip.SkipStamp) -> Unit)? = null, // callback for when a chapter is skipped, aka when event is handled (or for future use when skip automatically ads/sponsor) ) fun releaseCallbacks() @@ -238,20 +146,16 @@ interface IPlayer { startPosition: Long? = null, subtitles: Set, subtitle: SubtitleData?, - autoPlay: Boolean? = true, - preview : Boolean = true, + autoPlay: Boolean? = true ) fun reloadPlayer(context: Context) - fun getPreview(fraction : Float) : Bitmap? - fun hasPreview() : Boolean - fun setActiveSubtitles(subtitles: Set) fun setPreferredSubtitles(subtitle: SubtitleData?): Boolean // returns true if the player requires a reload, null for nothing fun getCurrentPreferredSubtitle(): SubtitleData? - fun handleEvent(event: CSPlayerEvent, source: PlayerEventSource = PlayerEventSource.UI) + fun handleEvent(event: CSPlayerEvent) fun onStop() fun onPause() diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt index 20feae41..0b560857 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/LinkGenerator.kt @@ -1,29 +1,9 @@ package com.lagradost.cloudstream3.ui.player -import android.net.Uri -import com.lagradost.cloudstream3.TvType import com.lagradost.cloudstream3.amap -import com.lagradost.cloudstream3.utils.ExtractorLink -import com.lagradost.cloudstream3.utils.INFER_TYPE -import com.lagradost.cloudstream3.utils.Qualities -import com.lagradost.cloudstream3.utils.loadExtractor -import com.lagradost.cloudstream3.utils.unshortenLinkSafe - -data class ExtractorUri( - val uri: Uri, - val name: String, - - val basePath: String? = null, - val relativePath: String? = null, - val displayName: String? = null, - - val id: Int? = null, - val parentId: Int? = null, - val episode: Int? = null, - val season: Int? = null, - val headerName: String? = null, - val tvType: TvType? = null, -) +import com.lagradost.cloudstream3.mvvm.normalSafeApiCall +import com.lagradost.cloudstream3.utils.* +import java.net.URI /** * Used to open the player more easily with the LinkGenerator @@ -39,7 +19,6 @@ class LinkGenerator( private val isM3u8: Boolean? = null ) : IGenerator { override val hasCache = false - override val canSkipLoading = true override fun getCurrentId(): Int? { return null @@ -69,7 +48,7 @@ class LinkGenerator( override suspend fun generateLinks( clearCache: Boolean, - type: LoadType, + isCasting: Boolean, callback: (Pair) -> Unit, subtitleCallback: (SubtitleData) -> Unit, offset: Int @@ -88,8 +67,9 @@ class LinkGenerator( link.name ?: link.url, unshortenLinkSafe(link.url), // unshorten because it might be a raw link referer ?: "", - Qualities.Unknown.value, - type = INFER_TYPE, + Qualities.Unknown.value, isM3u8 ?: normalSafeApiCall { + URI(link.url).path?.substringAfterLast(".")?.contains("m3u") + } ?: false ) to null ) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java index 232440cc..b5ecfe8f 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/NonFinalTextRenderer.java @@ -27,16 +27,13 @@ import android.os.Looper; import android.os.Message; import androidx.annotation.IntDef; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.annotation.OptIn; import androidx.media3.common.C; import androidx.media3.common.Format; import androidx.media3.common.text.Cue; import androidx.media3.common.text.CueGroup; import androidx.media3.common.MimeTypes; import androidx.media3.common.util.Log; -import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; import androidx.media3.exoplayer.BaseRenderer; import androidx.media3.exoplayer.FormatHolder; @@ -67,7 +64,6 @@ import java.util.stream.Collectors; * obtained from a {@link SubtitleDecoderFactory}. The actual rendering of the subtitle {@link Cue}s * is delegated to a {@link TextOutput}. */ -@OptIn(markerClass = UnstableApi.class) public class NonFinalTextRenderer extends BaseRenderer implements Callback { private static final String TAG = "TextRenderer"; @@ -75,7 +71,7 @@ public class NonFinalTextRenderer extends BaseRenderer implements Callback { /** * @param trackType The track type that the renderer handles. One of the {@link C} {@code * TRACK_TYPE_*} constants. - * @param outputHandler todo description + * @param outputHandler */ public NonFinalTextRenderer(int trackType, @Nullable Handler outputHandler) { super(trackType); @@ -167,14 +163,13 @@ public class NonFinalTextRenderer extends BaseRenderer implements Callback { finalStreamEndPositionUs = C.TIME_UNSET; } - @NonNull @Override public String getName() { return TAG; } @Override - public @Capabilities int supportsFormat(@NonNull Format format) { + public @Capabilities int supportsFormat(Format format) { if (decoderFactory.supportsFormat(format)) { return RendererCapabilities.create( format.cryptoType == C.CRYPTO_TYPE_NONE ? C.FORMAT_HANDLED : C.FORMAT_UNSUPPORTED_DRM); @@ -417,11 +412,13 @@ public class NonFinalTextRenderer extends BaseRenderer implements Callback { @SuppressWarnings("unchecked") @Override public boolean handleMessage(Message msg) { - if (msg.what == MSG_UPDATE_OUTPUT) { - invokeUpdateOutputInternal((List) msg.obj); - return true; + switch (msg.what) { + case MSG_UPDATE_OUTPUT: + invokeUpdateOutputInternal((List) msg.obj); + return true; + default: + throw new IllegalStateException(); } - throw new IllegalStateException(); } private void invokeUpdateOutputInternal(List cues) { @@ -440,6 +437,7 @@ public class NonFinalTextRenderer extends BaseRenderer implements Callback { } ).collect(Collectors.toList()); + output.onCues(fixedCues); output.onCues(new CueGroup(fixedCues, 0L)); } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt deleted file mode 100644 index f00f8a61..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/OfflinePlaybackHelper.kt +++ /dev/null @@ -1,43 +0,0 @@ -package com.lagradost.cloudstream3.ui.player - -import android.app.Activity -import android.content.ContentUris -import android.net.Uri -import androidx.core.content.ContextCompat.getString -import androidx.media3.common.util.UnstableApi -import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.utils.UIHelper.navigate -import com.lagradost.safefile.SafeFile - -object OfflinePlaybackHelper { - fun playLink(activity: Activity, url: String) { - activity.navigate( - R.id.global_to_navigation_player, GeneratorPlayer.newInstance( - LinkGenerator( - listOf( - BasicLink(url) - ) - ) - ) - ) - } - - fun playUri(activity: Activity, uri: Uri) { - val name = SafeFile.fromUri(activity, uri)?.name() - activity.navigate( - R.id.global_to_navigation_player, GeneratorPlayer.newInstance( - DownloadFileGenerator( - listOf( - ExtractorUri( - uri = uri, - name = name ?: getString(activity, R.string.downloaded_file), - // well not the same as a normal id, but we take it as users may want to - // play downloaded files and save the location - id = kotlin.runCatching { ContentUris.parseId(uri) }.getOrNull()?.hashCode() - ) - ) - ) - ) - ) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt index 122eaa97..1b13b519 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt @@ -5,22 +5,20 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.lagradost.cloudstream3.LoadResponse import com.lagradost.cloudstream3.mvvm.Resource import com.lagradost.cloudstream3.mvvm.launchSafe -import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.mvvm.normalSafeApiCall import com.lagradost.cloudstream3.mvvm.safeApiCall import com.lagradost.cloudstream3.ui.result.ResultEpisode import com.lagradost.cloudstream3.utils.Coroutines.ioSafe import com.lagradost.cloudstream3.utils.EpisodeSkip import com.lagradost.cloudstream3.utils.ExtractorLink +import com.lagradost.cloudstream3.utils.ExtractorUri import kotlinx.coroutines.Job -import kotlinx.coroutines.launch class PlayerGeneratorViewModel : ViewModel() { companion object { - const val TAG = "PlayViewGen" + val TAG = "PlayViewGen" } private var generator: IGenerator? = null @@ -40,13 +38,6 @@ class PlayerGeneratorViewModel : ViewModel() { private val _currentSubtitleYear = MutableLiveData(null) val currentSubtitleYear: LiveData = _currentSubtitleYear - /** - * Save the Episode ID to prevent starting multiple link loading Jobs when preloading links. - */ - private var currentLoadingEpisodeId: Int? = null - - var forceClearCache = false - fun setSubtitleYear(year: Int?) { _currentSubtitleYear.postValue(year) } @@ -81,39 +72,22 @@ class PlayerGeneratorViewModel : ViewModel() { } fun preLoadNextLinks() { - val id = getId() - // Do not preload if already loading - if (id == currentLoadingEpisodeId) return - Log.i(TAG, "preLoadNextLinks") currentJob?.cancel() - currentLoadingEpisodeId = id - - currentJob = viewModelScope.launch { - try { - if (generator?.hasCache == true && generator?.hasNext() == true) { - safeApiCall { - generator?.generateLinks( - type = LoadType.InApp, - clearCache = false, - callback = {}, - subtitleCallback = {}, - offset = 1 - ) - } - } - } catch (t: Throwable) { - logError(t) - } finally { - if (currentLoadingEpisodeId == id) { - currentLoadingEpisodeId = null + currentJob = viewModelScope.launchSafe { + if (generator?.hasCache == true && generator?.hasNext() == true) { + safeApiCall { + generator?.generateLinks( + clearCache = false, + isCasting = false, + {}, + {}, + offset = 1 + ) } } } } - fun getLoadResponse(): LoadResponse? { - return normalSafeApiCall { (generator as? RepoLinkGenerator?)?.page } - } fun getMeta(): Any? { return normalSafeApiCall { generator?.getCurrent() } @@ -173,7 +147,7 @@ class PlayerGeneratorViewModel : ViewModel() { } } - fun loadLinks(type: LoadType = LoadType.InApp) { + fun loadLinks(clearCache: Boolean = false, isCasting: Boolean = false) { Log.i(TAG, "loadLinks") currentJob?.cancel() @@ -188,14 +162,14 @@ class PlayerGeneratorViewModel : ViewModel() { // load more data _loadingLinks.postValue(Resource.Loading()) val loadingState = safeApiCall { - generator?.generateLinks(type = type, clearCache = forceClearCache, callback = { + generator?.generateLinks(clearCache = clearCache, isCasting = isCasting, { currentLinks.add(it) // Clone to prevent ConcurrentModificationException normalSafeApiCall { // Extra normalSafeApiCall since .toSet() iterates. _currentLinks.postValue(currentLinks.toSet()) } - }, subtitleCallback = { + }, { currentSubs.add(it) normalSafeApiCall { _currentSubs.postValue(currentSubs.toSet()) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt index 02a7ee03..e532d1a3 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerSubtitleHelper.kt @@ -4,9 +4,7 @@ import android.util.Log import android.util.TypedValue import android.view.ViewGroup import android.widget.FrameLayout -import androidx.annotation.OptIn import androidx.media3.common.MimeTypes -import androidx.media3.common.util.UnstableApi import androidx.media3.ui.SubtitleView import com.lagradost.cloudstream3.SubtitleFile import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.regexSubtitlesToRemoveBloat @@ -32,15 +30,13 @@ enum class SubtitleOrigin { * @param name To be displayed in the player * @param url Url for the subtitle, when EMBEDDED_IN_VIDEO this variable is used as the real backend id * @param headers if empty it will use the base onlineDataSource headers else only the specified headers - * @param languageCode Not guaranteed to follow any standard. Could be something like "English 4" or "en". * */ data class SubtitleData( val name: String, val url: String, val origin: SubtitleOrigin, val mimeType: String, - val headers: Map, - val languageCode: String? + val headers: Map ) { /** Internal ID for exoplayer, unique for each link*/ fun getId(): String { @@ -49,7 +45,6 @@ data class SubtitleData( } } -@OptIn(UnstableApi::class) class PlayerSubtitleHelper { private var activeSubtitles: Set = emptySet() private var allSubtitles: Set = emptySet() @@ -85,8 +80,7 @@ class PlayerSubtitleHelper { url = subtitleFile.url, origin = SubtitleOrigin.URL, mimeType = subtitleFile.url.toSubtitleMimeType(), - headers = emptyMap(), - languageCode = subtitleFile.lang + headers = emptyMap() ) } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PreviewGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PreviewGenerator.kt deleted file mode 100644 index ae800dbd..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PreviewGenerator.kt +++ /dev/null @@ -1,547 +0,0 @@ -package com.lagradost.cloudstream3.ui.player - -import android.content.Context -import android.graphics.Bitmap -import android.media.MediaMetadataRetriever -import android.net.Uri -import android.os.Build -import android.util.Log -import androidx.annotation.WorkerThread -import androidx.core.graphics.scale -import androidx.preference.PreferenceManager -import com.lagradost.cloudstream3.AcraApplication -import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.mvvm.logError -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.Coroutines.ioSafe -import com.lagradost.cloudstream3.utils.ExtractorLink -import com.lagradost.cloudstream3.utils.ExtractorLinkType -import com.lagradost.cloudstream3.utils.M3u8Helper -import com.lagradost.cloudstream3.utils.M3u8Helper2 -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Job -import kotlinx.coroutines.isActive -import kotlinx.coroutines.withContext -import kotlin.math.absoluteValue -import kotlin.math.ceil -import kotlin.math.log2 - -const val MAX_LOD = 6 -const val MIN_LOD = 3 - -data class ImageParams( - val width: Int, - val height: Int, -) { - companion object { - val DEFAULT = ImageParams(200, 320) - fun new16by9(width: Int): ImageParams { - if (width < 100) { - return DEFAULT - } - return ImageParams( - width / 4, - (width * 9) / (4 * 16) - ) - } - } - - init { - assert(width > 0 && height > 0) - } -} - -interface IPreviewGenerator { - fun hasPreview(): Boolean - fun getPreviewImage(fraction: Float): Bitmap? - fun release() - - var params: ImageParams - - var durationMs: Long - var loadedImages: Int - - companion object { - fun new(): IPreviewGenerator { - val userDisabled = AcraApplication.context?.let { ctx -> - PreferenceManager.getDefaultSharedPreferences(ctx)?.getBoolean( - ctx.getString(R.string.preview_seekbar_key), true) == false - } ?: false - /** because TV has low ram + not show we disable this for now */ - return if (isLayout(TV) || userDisabled) { - empty() - } else { - PreviewGenerator() - } - } - - fun empty(): IPreviewGenerator { - return NoPreviewGenerator() - } - } -} - -private fun rescale(image: Bitmap, params: ImageParams): Bitmap { - if (image.width <= params.width && image.height <= params.height) return image - val new = image.scale(params.width, params.height) - // throw away the old image - if (new != image) { - image.recycle() - } - return new -} - -/** rescale to not take up as much memory */ -private fun MediaMetadataRetriever.image(timeUs: Long, params: ImageParams): Bitmap? { - /*if (timeUs <= 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { - try { - val primary = this.primaryImage - if (primary != null) { - return rescale(primary, params) - } - } catch (t: Throwable) { - logError(t) - } - }*/ - - return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) { - this.getScaledFrameAtTime( - timeUs, - MediaMetadataRetriever.OPTION_CLOSEST_SYNC, - params.width, - params.height - ) - } else { - return rescale(this.getFrameAtTime(timeUs) ?: return null, params) - } -} - -/** PreviewGenerator that hides the implementation details of the sub generators that is used, used for source switch cache */ -class PreviewGenerator : IPreviewGenerator { - - /** the most up to date generator, will always mirror the actual source in the player */ - private var currentGenerator: IPreviewGenerator = NoPreviewGenerator() - - /** the longest generated preview of the same episode */ - private var lastGenerator: IPreviewGenerator = NoPreviewGenerator() - - /** always NoPreviewGenerator, used as a cache for nothing */ - private val dummy: IPreviewGenerator = NoPreviewGenerator() - - /** if the current generator is the same as the last by checking time */ - private fun isSameLength(): Boolean = - currentGenerator.durationMs.minus(lastGenerator.durationMs).absoluteValue < 10_000L - - /** use the backup if the current generator is init or if they have the same length */ - private val backupGenerator: IPreviewGenerator - get() { - if (currentGenerator.durationMs == 0L || isSameLength()) { - return lastGenerator - } - return dummy - } - - override fun hasPreview(): Boolean { - return currentGenerator.hasPreview() || backupGenerator.hasPreview() - } - - override fun getPreviewImage(fraction: Float): Bitmap? { - return try { - currentGenerator.getPreviewImage(fraction) ?: backupGenerator.getPreviewImage(fraction) - } catch (t: Throwable) { - logError(t) - null - } - } - - override fun release() { - lastGenerator.release() - currentGenerator.release() - lastGenerator = NoPreviewGenerator() - currentGenerator = NoPreviewGenerator() - } - - override var params: ImageParams = ImageParams.DEFAULT - set(value) { - field = value - lastGenerator.params = value - backupGenerator.params = value - currentGenerator.params = value - } - - override var durationMs: Long - get() = currentGenerator.durationMs - set(_) {} - override var loadedImages: Int - get() = currentGenerator.loadedImages - set(_) {} - - fun clear(keepCache: Boolean) { - if (keepCache) { - if (!isSameLength() || currentGenerator.loadedImages >= lastGenerator.loadedImages || lastGenerator.durationMs == 0L) { - // the current generator is better than the last generator, therefore keep the current - // or the lengths are not the same, therefore favoring the more recent selection - - // if they are the same we favor the current generator - lastGenerator.release() - lastGenerator = currentGenerator - } else { - // otherwise just keep the last generator and throw away the current generator - currentGenerator.release() - } - } else { - // we switched the episode, therefore keep nothing - lastGenerator.release() - lastGenerator = NoPreviewGenerator() - currentGenerator.release() - // we assume that we set currentGenerator right after this, so currentGenerator != NoPreviewGenerator - } - } - - fun load(link: ExtractorLink, keepCache: Boolean) { - clear(keepCache) - - when (link.type) { - ExtractorLinkType.M3U8 -> { - currentGenerator = M3u8PreviewGenerator(params).apply { - load(url = link.url, headers = link.getAllHeaders()) - } - } - - ExtractorLinkType.VIDEO -> { - currentGenerator = Mp4PreviewGenerator(params).apply { - load(url = link.url, headers = link.getAllHeaders()) - } - } - - else -> { - Log.i("PreviewImg", "unsupported format for $link") - } - } - } - - fun load(context: Context, link: ExtractorUri, keepCache: Boolean) { - clear(keepCache) - currentGenerator = Mp4PreviewGenerator(params).apply { - load(keepCache = keepCache, context = context, uri = link.uri) - } - } -} - -@Suppress("UNUSED_PARAMETER") -private class NoPreviewGenerator : IPreviewGenerator { - override fun hasPreview(): Boolean = false - override fun getPreviewImage(fraction: Float): Bitmap? = null - override fun release() = Unit - override var params: ImageParams - get() = ImageParams(0, 0) - set(value) {} - override var durationMs: Long = 0L - override var loadedImages: Int = 0 -} - -private class M3u8PreviewGenerator(override var params: ImageParams) : IPreviewGenerator { - // generated images 1:1 to idx of hsl - private var images: Array = arrayOf() - - companion object { - private const val TAG = "PreviewImgM3u8" - } - - - - // prefixSum[i] = sum(hsl.ts[0..i].time) - // where [0] = 0, [1] = hsl.ts[0].time aka time at start of segment, do [b] - [a] for range a,b - private var prefixSum: Array = arrayOf() - - // how many images has been generated - override var loadedImages: Int = 0 - - // how many images we can generate in total, == hsl.size ?: 0 - private var totalImages: Int = 0 - - override fun hasPreview(): Boolean { - return totalImages > 0 && loadedImages >= minOf(totalImages, 4) - } - - override fun getPreviewImage(fraction: Float): Bitmap? { - var bestIdx = -1 - var bestDiff = Double.MAX_VALUE - synchronized(images) { - // just find the best one in a for loop, we don't care about bin searching rn - for (i in 0..images.size) { - val diff = prefixSum[i].minus(fraction).absoluteValue - if (diff > bestDiff) { - break - } - if (images[i] != null) { - bestIdx = i - bestDiff = diff - } - } - return images.getOrNull(bestIdx) - } - /* - val targetIndex = prefixSum.binarySearch(target) - var ret = images[targetIndex] - if (ret != null) { - return ret - } - for (i in 0..images.size) { - ret = images.getOrNull(i+targetIndex) ?: - }*/ - } - - private fun clear() { - synchronized(images) { - currentJob?.cancel() - // for (i in images.indices) { - // images[i]?.recycle() - // } - images = arrayOf() - prefixSum = arrayOf() - loadedImages = 0 - totalImages = 0 - } - } - - override fun release() { - clear() - images = arrayOf() - } - - override var durationMs: Long = 0L - - private var currentJob: Job? = null - fun load(url: String, headers: Map) { - clear() - currentJob?.cancel() - currentJob = ioSafe { - withContext(Dispatchers.IO) { - Log.i(TAG, "Loading with url = $url headers = $headers") - //tmpFile = - // File.createTempFile("video", ".ts", context.cacheDir).apply { - // deleteOnExit() - // } - val retriever = MediaMetadataRetriever() - val hsl = M3u8Helper2.hslLazy( - listOf( - M3u8Helper.M3u8Stream( - streamUrl = url, - headers = headers - ) - ), - selectBest = false - ) - - // no support for encryption atm - if (hsl.isEncrypted) { - Log.i(TAG, "m3u8 is encrypted") - totalImages = 0 - return@withContext - } - - // total duration of the entire m3u8 in seconds - val duration = hsl.allTsLinks.sumOf { it.time ?: 0.0 } - durationMs = (duration * 1000.0).toLong() - val durationInv = 1.0 / duration - - // if the total duration is less then 10s then something is very wrong or - // too short playback to matter - if (duration <= 10.0) { - totalImages = 0 - return@withContext - } - - totalImages = hsl.allTsLinks.size - - // we cant init directly as it is no guarantee of in order - prefixSum = Array(hsl.allTsLinks.size + 1) { 0.0 } - var runningSum = 0.0 - for (i in hsl.allTsLinks.indices) { - runningSum += (hsl.allTsLinks[i].time ?: 0.0) - prefixSum[i + 1] = runningSum * durationInv - } - synchronized(images) { - images = Array(hsl.size) { null } - loadedImages = 0 - } - - val maxLod = ceil(log2(duration)).toInt().coerceIn(MIN_LOD, MAX_LOD) - val count = hsl.allTsLinks.size - for (l in 1..maxLod) { - val items = (1 shl (l - 1)) - for (i in 0 until items) { - val index = (count.div(1 shl l) + (i * count) / items).coerceIn(0, hsl.size) - if (synchronized(images) { images[index] } != null) { - continue - } - Log.i(TAG, "Generating preview for $index") - - val ts = hsl.allTsLinks[index] - try { - retriever.setDataSource(ts.url, hsl.headers) - if (!isActive) { - return@withContext - } - val img = retriever.image(0, params) - if (!isActive) { - return@withContext - } - if (img == null || img.width <= 1 || img.height <= 1) continue - synchronized(images) { - images[index] = img - loadedImages += 1 - } - } catch (t: Throwable) { - logError(t) - continue - } - } - } - - } - } - } -} - -private class Mp4PreviewGenerator(override var params: ImageParams) : IPreviewGenerator { - // lod = level of detail where the number indicates how many ones there is - // 2^(lod-1) = images - private var loadedLod = 0 - override var loadedImages = 0 - private var images = Array((1 shl MAX_LOD) - 1) { - null - } - - companion object { - private const val TAG = "PreviewImgMp4" - } - - override fun hasPreview(): Boolean { - synchronized(images) { - return loadedLod >= MIN_LOD - } - } - - override fun getPreviewImage(fraction: Float): Bitmap? { - synchronized(images) { - if (loadedLod < MIN_LOD) { - Log.i(TAG, "Requesting preview for $fraction but $loadedLod < $MIN_LOD") - return null - } - Log.i(TAG, "Requesting preview for $fraction") - - var bestIdx = 0 - var bestDiff = 0.5f.minus(fraction).absoluteValue - - // this should be done mathematically, but for now we just loop all images - for (l in 1..loadedLod + 1) { - val items = (1 shl (l - 1)) - for (i in 0 until items) { - val idx = items - 1 + i - if (idx > loadedImages) { - break - } - if (images[idx] == null) { - continue - } - val currentFraction = - (1.0f.div((1 shl l).toFloat()) + i * 1.0f.div(items.toFloat())) - val diff = currentFraction.minus(fraction).absoluteValue - if (diff < bestDiff) { - bestDiff = diff - bestIdx = idx - } - } - } - Log.i(TAG, "Best diff found at ${bestDiff * 100}% diff (${bestIdx})") - return images[bestIdx] - } - } - - // also check out https://github.com/wseemann/FFmpegMediaMetadataRetriever - private val retriever: MediaMetadataRetriever = MediaMetadataRetriever() - - private fun clear(keepCache: Boolean) { - if (keepCache) return - synchronized(images) { - loadedLod = 0 - loadedImages = 0 - // for (i in images.indices) { - // images[i]?.recycle() - // images[i] = null - //} - images.fill(null) - } - } - - private var currentJob: Job? = null - fun load(url: String, headers: Map) { - currentJob?.cancel() - currentJob = ioSafe { - Log.i(TAG, "Loading with url = $url headers = $headers") - clear(true) - retriever.setDataSource(url, headers) - start(this) - } - } - - fun load(keepCache: Boolean, context: Context, uri: Uri) { - currentJob?.cancel() - currentJob = ioSafe { - Log.i(TAG, "Loading with uri = $uri") - clear(keepCache) - retriever.setDataSource(context, uri) - start(this) - } - } - - override fun release() { - currentJob?.cancel() - clear(false) - } - - override var durationMs: Long = 0L - - @Throws - @WorkerThread - private fun start(scope: CoroutineScope) { - Log.i(TAG, "Started loading preview") - - val durationMs = - retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() - ?: throw IllegalArgumentException("Bad video duration") - this.durationMs = durationMs - val durationUs = (durationMs * 1000L).toFloat() - //val width = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt() ?: throw IllegalArgumentException("Bad video width") - //val height = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt() ?: throw IllegalArgumentException("Bad video height") - - // log2 # 10s durations in the video ~= how many segments we have - val maxLod = ceil(log2((durationMs / 10_000).toFloat())).toInt().coerceIn(MIN_LOD, MAX_LOD) - - for (l in 1..maxLod) { - val items = (1 shl (l - 1)) - for (i in 0 until items) { - val idx = items - 1 + i // as sum(prev) = cur-1 - // frame = 100 / 2^lod + i * 100 / 2^(lod-1) = duration % where lod is one indexed - val fraction = (1.0f.div((1 shl l).toFloat()) + i * 1.0f.div(items.toFloat())) - Log.i(TAG, "Generating preview for ${fraction * 100}%") - val frame = durationUs * fraction - val img = retriever.image(frame.toLong(), params) - if (!scope.isActive) return - if (img == null || img.width <= 1 || img.height <= 1) continue - synchronized(images) { - images[idx] = img - loadedImages = maxOf(loadedImages, idx) - } - } - - synchronized(images) { - loadedLod = maxOf(loadedLod, l) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt index 588afbb5..2ce53ea5 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/RepoLinkGenerator.kt @@ -1,22 +1,15 @@ package com.lagradost.cloudstream3.ui.player import android.util.Log -import androidx.media3.common.util.UnstableApi import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull -import com.lagradost.cloudstream3.APIHolder.unixTime import com.lagradost.cloudstream3.LoadResponse import com.lagradost.cloudstream3.ui.APIRepository import com.lagradost.cloudstream3.ui.result.ResultEpisode import com.lagradost.cloudstream3.utils.ExtractorLink +import com.lagradost.cloudstream3.utils.ExtractorUri import kotlin.math.max import kotlin.math.min -data class Cache( - val linkCache: MutableSet, - val subtitleCache: MutableSet, - var lastCachedTimestamp: Long = unixTime -) - class RepoLinkGenerator( private val episodes: List, private var currentIndex: Int = 0, @@ -24,12 +17,11 @@ class RepoLinkGenerator( ) : IGenerator { companion object { const val TAG = "RepoLink" - val cache: HashMap, Cache> = + val cache: HashMap, Pair, MutableSet>> = hashMapOf() } override val hasCache = true - override val canSkipLoading = true override fun hasNext(): Boolean { return currentIndex < episodes.size - 1 @@ -75,19 +67,18 @@ class RepoLinkGenerator( override suspend fun generateLinks( clearCache: Boolean, - type: LoadType, + isCasting: Boolean, callback: (Pair) -> Unit, subtitleCallback: (SubtitleData) -> Unit, - offset: Int + offset: Int, ): Boolean { - val allowedTypes = type.toSet() val index = currentIndex val current = episodes.getOrNull(index + offset) ?: return false - val (currentLinkCache, currentSubsCache, lastCachedTimestamp) = if (clearCache) { - Cache(mutableSetOf(), mutableSetOf(), unixTime) + val (currentLinkCache, currentSubsCache) = if (clearCache) { + Pair(mutableSetOf(), mutableSetOf()) } else { - cache[current.apiName to current.id] ?: Cache(mutableSetOf(), mutableSetOf(), unixTime) + cache[Pair(current.apiName, current.id)] ?: Pair(mutableSetOf(), mutableSetOf()) } //val currentLinkCache = if (clearCache) mutableSetOf() else linkCache[index].toMutableSet() @@ -97,15 +88,9 @@ class RepoLinkGenerator( val currentSubsUrls = mutableSetOf() // makes all subs urls unique val currentSubsNames = mutableSetOf() // makes all subs names unique - val invalidateCache = unixTime - lastCachedTimestamp > 60 * 20 // 20 minutes - if(invalidateCache){ - currentLinkCache.clear() - currentSubsCache.clear() - } - - currentLinkCache.filter { allowedTypes.contains(it.type) }.forEach { link -> + currentLinkCache.forEach { link -> currentLinks.add(link.url) - callback(link to null) + callback(Pair(link, null)) } currentSubsCache.forEach { sub -> @@ -123,10 +108,10 @@ class RepoLinkGenerator( val result = APIRepository( getApiFromNameNull(current.apiName) ?: throw Exception("This provider does not exist") ).loadLinks(current.data, - isCasting = LoadType.Chromecast == type, - subtitleCallback = { file -> + isCasting, + { file -> val correctFile = PlayerSubtitleHelper.getSubtitleData(file) - if (correctFile.url.isNotEmpty() && !currentSubsUrls.contains(correctFile.url)) { + if (!currentSubsUrls.contains(correctFile.url)) { currentSubsUrls.add(correctFile.url) // this part makes sure that all names are unique for UX @@ -147,21 +132,19 @@ class RepoLinkGenerator( } } }, - callback = { link -> + { link -> Log.d(TAG, "Loaded ExtractorLink: $link") - if (link.url.isNotEmpty() && !currentLinks.contains(link.url) && !currentLinkCache.contains(link)) { - currentLinks.add(link.url) - - if (allowedTypes.contains(link.type)) { + if (!currentLinks.contains(link.url)) { + if (!currentLinkCache.contains(link)) { + currentLinks.add(link.url) callback(Pair(link, null)) + currentLinkCache.add(link) + //linkCache[index] = currentLinkCache } - - currentLinkCache.add(link) - // linkCache[index] = currentLinkCache } } ) - cache[Pair(current.apiName, current.id)] = Cache(currentLinkCache, currentSubsCache, unixTime) + cache[Pair(current.apiName, current.id)] = Pair(currentLinkCache, currentSubsCache) return result } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/PriorityAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/PriorityAdapter.kt index ce457740..fb60ccce 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/PriorityAdapter.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/PriorityAdapter.kt @@ -4,7 +4,7 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.lagradost.cloudstream3.databinding.PlayerPrioritizeItemBinding -import com.lagradost.cloudstream3.utils.AppContextUtils +import com.lagradost.cloudstream3.utils.AppUtils data class SourcePriority( val data: T, @@ -13,10 +13,11 @@ data class SourcePriority( ) class PriorityAdapter(override val items: MutableList>) : - AppContextUtils.DiffAdapter>(items) { + AppUtils.DiffAdapter>(items) { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { return PriorityViewHolder( PlayerPrioritizeItemBinding.inflate(LayoutInflater.from(parent.context),parent,false), + //LayoutInflater.from(parent.context).inflate(R.layout.player_prioritize_item, parent, false) ) } @@ -30,6 +31,10 @@ class PriorityAdapter(override val items: MutableList>) : val binding: PlayerPrioritizeItemBinding, ) : RecyclerView.ViewHolder(binding.root) { fun bind(item: SourcePriority) { + /* val plusButton: ImageView = itemView.add_button + val subtractButton: ImageView = itemView.subtract_button + val priorityText: TextView = itemView.priority_text + val priorityNumber: TextView = itemView.priority_number*/ binding.priorityText.text = item.name fun updatePriority() { diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/ProfilesAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/ProfilesAdapter.kt index 45f6aa66..8153d7a1 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/ProfilesAdapter.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/ProfilesAdapter.kt @@ -13,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.databinding.PlayerQualityProfileItemBinding import com.lagradost.cloudstream3.ui.result.UiImage -import com.lagradost.cloudstream3.utils.AppContextUtils +import com.lagradost.cloudstream3.utils.AppUtils import com.lagradost.cloudstream3.utils.UIHelper.setImage class ProfilesAdapter( @@ -21,7 +21,7 @@ class ProfilesAdapter( val usedProfile: Int, val clickCallback: (oldIndex: Int?, newIndex: Int) -> Unit, ) : - AppContextUtils.DiffAdapter( + AppUtils.DiffAdapter( items, comparison = { first: QualityDataHelper.QualityProfile, second: QualityDataHelper.QualityProfile -> first.id == second.id @@ -29,6 +29,8 @@ class ProfilesAdapter( override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { return ProfilesViewHolder( PlayerQualityProfileItemBinding.inflate(LayoutInflater.from(parent.context),parent,false) + //LayoutInflater.from(parent.context) + // .inflate(R.layout.player_quality_profile_item, parent, false) ) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt index 3267efd7..96249db4 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityDataHelper.kt @@ -1,5 +1,6 @@ package com.lagradost.cloudstream3.ui.player.source_priority +import android.content.Context import androidx.annotation.StringRes import com.lagradost.cloudstream3.AcraApplication.Companion.getKey import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey @@ -103,7 +104,7 @@ object QualityDataHelper { * Must under all circumstances at least return one profile **/ fun getProfiles(): List { - val availableTypes = QualityProfileType.entries.toMutableList() + val availableTypes = QualityProfileType.values().toMutableList() val profiles = (1..PROFILE_COUNT).map { profileNumber -> // Get the real type val type = getQualityProfileType(profileNumber) @@ -139,12 +140,12 @@ object QualityDataHelper { } } - QualityProfileType.entries.forEach { + QualityProfileType.values().forEach { if (it.unique) insertType(profiles, it) } debugAssert({ - !QualityProfileType.entries.all { type -> + !QualityProfileType.values().all { type -> !type.unique || profiles.any { it.type == type } } }, { "All unique quality types do not exist" }) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt index 0537092c..e3629158 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt @@ -65,7 +65,7 @@ class QualityProfileDialog( setDefaultBtt.setOnClickListener { val currentProfile = getCurrentProfile() ?: return@setOnClickListener - val choices = QualityDataHelper.QualityProfileType.entries + val choices = QualityDataHelper.QualityProfileType.values() .filter { it != QualityDataHelper.QualityProfileType.None } val choiceNames = choices.map { txt(it.stringRes).asString(context) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt index bc6282af..1b59882e 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt @@ -47,7 +47,7 @@ class SourcePriorityDialog( ) qualitiesRecyclerView.adapter = PriorityAdapter( - Qualities.entries.mapNotNull { + Qualities.values().mapNotNull { SourcePriority( it, Qualities.getStringByIntFull(it.value).ifBlank { return@mapNotNull null }, diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt index 12adc040..89a09ae2 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt @@ -4,7 +4,6 @@ import android.app.Activity import android.content.Context import android.content.res.Configuration import android.os.Bundle -import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -17,6 +16,8 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.GridLayoutManager import com.google.android.material.bottomsheet.BottomSheetDialog +import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia +import com.lagradost.cloudstream3.APIHolder.filterSearchResultByFilmQuality import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull import com.lagradost.cloudstream3.CommonActivity.activity import com.lagradost.cloudstream3.HomePageList @@ -32,13 +33,7 @@ import com.lagradost.cloudstream3.ui.search.SearchAdapter import com.lagradost.cloudstream3.ui.search.SearchClickCallback import com.lagradost.cloudstream3.ui.search.SearchHelper import com.lagradost.cloudstream3.ui.search.SearchViewModel -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.PHONE -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia -import com.lagradost.cloudstream3.utils.AppContextUtils.filterSearchResultByFilmQuality -import com.lagradost.cloudstream3.utils.AppContextUtils.ownShow +import com.lagradost.cloudstream3.utils.AppUtils.ownShow import com.lagradost.cloudstream3.utils.UIHelper import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount @@ -176,7 +171,7 @@ class QuickSearchFragment : Fragment() { } } else { binding?.quickSearchMasterRecycler?.adapter = - ParentItemAdapter(fragment = this, id = "quickSearchMasterRecycler".hashCode(), { callback -> + ParentItemAdapter(mutableListOf(), { callback -> SearchHelper.handleSearchClickCallback(callback) //when (callback.action) { //SEARCH_ACTION_LOAD -> { @@ -219,16 +214,10 @@ class QuickSearchFragment : Fragment() { binding?.quickSearch?.findViewById(androidx.appcompat.R.id.search_close_btn) //val searchMagIcon = - // binding?.quickSearch?.findViewById(androidx.appcompat.R.id.search_mag_icon) + // binding.quickSearch.findViewById(androidx.appcompat.R.id.search_mag_icon) - // searchMagIcon?.scaleX = 0.65f - // searchMagIcon?.scaleY = 0.65f - - // Set the color for the search exit icon to the correct theme text color - val searchExitIconColor = TypedValue() - - activity?.theme?.resolveAttribute(android.R.attr.textColor, searchExitIconColor, true) - searchExitIcon?.setColorFilter(searchExitIconColor.data) + //searchMagIcon?.scaleX = 0.65f + //searchMagIcon?.scaleY = 0.65f binding?.quickSearch?.setOnQueryTextListener(object : SearchView.OnQueryTextListener { override fun onQueryTextSubmit(query: String): Boolean { @@ -276,17 +265,8 @@ class QuickSearchFragment : Fragment() { // UIHelper.showInputMethod(view.findFocus()) // } //} - if (isLayout(PHONE or EMULATOR)) { - binding?.quickSearchBack?.apply { - isVisible = true - setOnClickListener { - activity?.popCurrentPage() - } - } - } - - if (isLayout(TV)) { - binding?.quickSearch?.requestFocus() + binding?.quickSearchBack?.setOnClickListener { + activity?.popCurrentPage() } arguments?.getString(AUTOSEARCH_KEY)?.let { diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt index 0ca326dd..531cb5d2 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ActorAdaptor.kt @@ -12,10 +12,7 @@ import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.databinding.CastItemBinding import com.lagradost.cloudstream3.utils.UIHelper.setImage -class ActorAdaptor( - private var nextFocusUpId: Int? = null, - private val focusCallback: (View?) -> Unit = {} -) : RecyclerView.Adapter() { +class ActorAdaptor(private val focusCallback : (View?) -> Unit = {}) : RecyclerView.Adapter() { data class ActorMetaData( var isInverted: Boolean, val actor: ActorData, @@ -25,8 +22,7 @@ class ActorAdaptor( override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { return CardViewHolder( - CastItemBinding.inflate(LayoutInflater.from(parent.context), parent, false), - focusCallback + CastItemBinding.inflate(LayoutInflater.from(parent.context), parent, false), focusCallback ) } @@ -68,9 +64,10 @@ class ActorAdaptor( } } - private inner class CardViewHolder( + private class CardViewHolder + constructor( val binding: CastItemBinding, - private val focusCallback: (View?) -> Unit = {} + private val focusCallback : (View?) -> Unit = {} ) : RecyclerView.ViewHolder(binding.root) { @@ -81,18 +78,8 @@ class ActorAdaptor( Pair(actor.voiceActor?.image, actor.actor.image) } - // Fix tv focus escaping the recyclerview - if (position == 0) { - itemView.nextFocusLeftId = R.id.result_cast_items - } else if ((position - 1) == itemCount) { - itemView.nextFocusRightId = R.id.result_cast_items - } - nextFocusUpId?.let { - itemView.nextFocusUpId = it - } - itemView.setOnFocusChangeListener { v, hasFocus -> - if (hasFocus) { + if(hasFocus) { focusCallback(v) } } @@ -135,7 +122,7 @@ class ActorAdaptor( voiceActorImageHolder.isVisible = false voiceActorName.isVisible = false } else { - voiceActorName.text = actor.voiceActor?.name + voiceActorName.text = actor.voiceActor.name voiceActorImageHolder.isVisible = voiceActorImage.setImage(vaImage) } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt index d12521b3..6b63e623 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/EpisodeAdapter.kt @@ -9,26 +9,19 @@ import androidx.core.view.isVisible import androidx.preference.PreferenceManager import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import com.lagradost.cloudstream3.APIHolder.unixTimeMS import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.databinding.ResultEpisodeBinding import com.lagradost.cloudstream3.databinding.ResultEpisodeLargeBinding -import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.secondsToReadable import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_LONG_CLICK import com.lagradost.cloudstream3.ui.download.DownloadClickEvent -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.PHONE -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.AppContextUtils.html +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings +import com.lagradost.cloudstream3.utils.AppUtils.html import com.lagradost.cloudstream3.utils.UIHelper.setImage import com.lagradost.cloudstream3.utils.UIHelper.toPx import com.lagradost.cloudstream3.utils.VideoDownloadHelper -import java.text.DateFormat -import java.text.SimpleDateFormat -import java.util.Date -import java.util.Locale +import java.util.* const val ACTION_PLAY_EPISODE_IN_PLAYER = 1 const val ACTION_PLAY_EPISODE_IN_VLC_PLAYER = 2 @@ -56,10 +49,8 @@ const val ACTION_PLAY_EPISODE_IN_WEB_VIDEO = 16 const val ACTION_PLAY_EPISODE_IN_MPV = 17 const val ACTION_MARK_AS_WATCHED = 18 -const val ACTION_FCAST = 19 - -const val TV_EP_SIZE = 400 - +const val TV_EP_SIZE_LARGE = 400 +const val TV_EP_SIZE_SMALL = 300 data class EpisodeClickEvent(val action: Int, val data: ResultEpisode) class EpisodeAdapter( @@ -111,7 +102,7 @@ class EpisodeAdapter( override fun getItemViewType(position: Int): Int { val item = getItem(position) - return if (item.poster.isNullOrBlank() && item.description.isNullOrBlank()) 0 else 1 + return if (item.poster.isNullOrBlank()) 0 else 1 } @@ -169,7 +160,8 @@ class EpisodeAdapter( return cardList.size } - class EpisodeCardViewHolderLarge( + class EpisodeCardViewHolderLarge + constructor( val binding: ResultEpisodeLargeBinding, private val hasDownloadSupport: Boolean, private val clickCallback: (EpisodeClickEvent) -> Unit, @@ -180,27 +172,29 @@ class EpisodeAdapter( @SuppressLint("SetTextI18n") fun bind(card: ResultEpisode) { localCard = card + val setWidth = - if (isLayout(TV or EMULATOR)) TV_EP_SIZE.toPx else ViewGroup.LayoutParams.MATCH_PARENT + if (isTvSettings()) TV_EP_SIZE_LARGE.toPx else ViewGroup.LayoutParams.MATCH_PARENT binding.episodeLinHolder.layoutParams.width = setWidth binding.episodeHolderLarge.layoutParams.width = setWidth binding.episodeHolder.layoutParams.width = setWidth + val isTrueTv = isTrueTvSettings() binding.apply { downloadButton.isVisible = hasDownloadSupport downloadButton.setDefaultClickListener( VideoDownloadHelper.DownloadEpisodeCached( - name = card.name, - poster = card.poster, - episode = card.episode, - season = card.season, - id = card.id, - parentId = card.parentId, - rating = card.rating, - description = card.description, - cacheTime = System.currentTimeMillis(), + card.name, + card.poster, + card.episode, + card.season, + card.id, + card.parentId, + card.rating, + card.description, + System.currentTimeMillis(), ), null ) { when (it.action) { @@ -252,57 +246,12 @@ class EpisodeAdapter( episodeDescript.apply { text = card.description.html() isGone = text.isNullOrBlank() - - var isExpanded = false setOnClickListener { - if (isLayout(TV)) { - clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_DESCRIPTION, card)) - } else { - isExpanded = !isExpanded - maxLines = if (isExpanded) { - Integer.MAX_VALUE - } else 4 - } + clickCallback.invoke(EpisodeClickEvent(ACTION_SHOW_DESCRIPTION, card)) } } - if (card.airDate != null) { - val isUpcoming = unixTimeMS < card.airDate - - if (isUpcoming) { - episodePlayIcon.isVisible = false - episodeUpcomingIcon.isVisible = !episodePoster.isVisible - episodeDate.setText( - txt( - R.string.episode_upcoming_format, - secondsToReadable( - card.airDate.minus(unixTimeMS).div(1000).toInt(), - "" - ) - ) - ) - } else { - episodeUpcomingIcon.isVisible = false - - val formattedAirDate = SimpleDateFormat.getDateInstance( - DateFormat.LONG, - Locale.getDefault() - ).apply { - }.format(Date(card.airDate)) - - episodeDate.setText(txt(formattedAirDate)) - } - } else { - episodeDate.isVisible = false - } - - episodeRuntime.setText( - txt( - card.runTime?.times(60L)?.toInt()?.let { secondsToReadable(it, "") } - ) - ) - - if (isLayout(EMULATOR or PHONE)) { + if (!isTrueTv) { episodePoster.setOnClickListener { clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card)) } @@ -313,12 +262,11 @@ class EpisodeAdapter( } } } - itemView.setOnClickListener { clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card)) } - if (isLayout(TV)) { + if (isTrueTv) { itemView.isFocusable = true itemView.isFocusableInTouchMode = true //itemView.touchscreenBlocksFocus = false @@ -334,7 +282,8 @@ class EpisodeAdapter( } } - class EpisodeCardViewHolderSmall( + class EpisodeCardViewHolderSmall + constructor( val binding: ResultEpisodeBinding, private val hasDownloadSupport: Boolean, private val clickCallback: (EpisodeClickEvent) -> Unit, @@ -342,24 +291,26 @@ class EpisodeAdapter( ) : RecyclerView.ViewHolder(binding.root) { @SuppressLint("SetTextI18n") fun bind(card: ResultEpisode) { + val isTrueTv = isTrueTvSettings() + binding.episodeHolder.layoutParams.apply { width = - if (isLayout(TV or EMULATOR)) TV_EP_SIZE.toPx else ViewGroup.LayoutParams.MATCH_PARENT + if (isTvSettings()) TV_EP_SIZE_SMALL.toPx else ViewGroup.LayoutParams.MATCH_PARENT } binding.apply { downloadButton.isVisible = hasDownloadSupport downloadButton.setDefaultClickListener( VideoDownloadHelper.DownloadEpisodeCached( - name = card.name, - poster = card.poster, - episode = card.episode, - season = card.season, - id = card.id, - parentId = card.parentId, - rating = card.rating, - description = card.description, - cacheTime = System.currentTimeMillis(), + card.name, + card.poster, + card.episode, + card.season, + card.id, + card.parentId, + card.rating, + card.description, + System.currentTimeMillis(), ), null ) { when (it.action) { @@ -401,7 +352,7 @@ class EpisodeAdapter( clickCallback.invoke(EpisodeClickEvent(ACTION_CLICK_DEFAULT, card)) } - if (isLayout(TV)) { + if (isTrueTv) { itemView.isFocusable = true itemView.isFocusableInTouchMode = true //itemView.touchscreenBlocksFocus = false diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt index eecd6262..ca2934ef 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ImageAdapter.kt @@ -5,9 +5,20 @@ import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import com.lagradost.cloudstream3.databinding.ResultMiniImageBinding -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings +/* +class ImageAdapter(context: Context, val resource: Int) : ArrayAdapter(context, resource) { + override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { + val newConvertView = convertView ?: run { + val mInflater = context + .getSystemService(Activity.LAYOUT_INFLATER_SERVICE) as LayoutInflater + mInflater.inflate(resource, null) + } + getItem(position)?.let { (newConvertView as? ImageView?)?.setImageResource(it) } + return newConvertView + } +}*/ const val IMAGE_CLICK = 0 const val IMAGE_LONG_CLICK = 1 @@ -54,7 +65,8 @@ class ImageAdapter( diffResult.dispatchUpdatesTo(this) } - class ImageViewHolder(val binding: ResultMiniImageBinding) : + class ImageViewHolder + constructor(val binding: ResultMiniImageBinding) : RecyclerView.ViewHolder(binding.root) { fun bind( img: Int, @@ -71,7 +83,7 @@ class ImageAdapter( this.nextFocusUpId = nextFocusUp } if (clickCallback != null) { - if (isLayout(TV)) { + if (isTrueTvSettings()) { isClickable = true isLongClickable = true isFocusable = true 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 3eab0c71..7617bc11 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 @@ -3,12 +3,12 @@ package com.lagradost.cloudstream3.ui.result import android.os.Bundle import androidx.fragment.app.Fragment import androidx.preference.PreferenceManager +import com.lagradost.cloudstream3.APIHolder.getApiDubstatusSettings import com.lagradost.cloudstream3.DubStatus import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.SearchResponse import com.lagradost.cloudstream3.TvType import com.lagradost.cloudstream3.ui.result.EpisodeAdapter.Companion.getPlayerAction -import com.lagradost.cloudstream3.utils.AppContextUtils.getApiDubstatusSettings import com.lagradost.cloudstream3.utils.DataStoreHelper import com.lagradost.cloudstream3.utils.DataStoreHelper.getVideoWatchState import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos @@ -47,11 +47,7 @@ data class ResultEpisode( /** * Conveys if the episode itself is marked as watched **/ - val videoWatchState: VideoWatchState, - /** Sum of all previous season episode counts + episode */ - val totalEpisodeIndex: Int? = null, - val airDate: Long? = null, - val runTime: Int? = null, + val videoWatchState: VideoWatchState ) fun ResultEpisode.getRealPosition(): Long { @@ -86,9 +82,6 @@ fun buildResultEpisode( isFiller: Boolean? = null, tvType: TvType, parentId: Int, - totalEpisodeIndex: Int? = null, - airDate: Long? = null, - runTime: Int? = null, ): ResultEpisode { val posDur = getViewPos(id) val videoWatchState = getVideoWatchState(id) ?: VideoWatchState.None @@ -110,10 +103,7 @@ fun buildResultEpisode( isFiller, tvType, parentId, - videoWatchState, - totalEpisodeIndex, - airDate, - runTime, + videoWatchState ) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt index 97bc49ea..a932a57c 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt @@ -17,20 +17,21 @@ import android.view.animation.DecelerateInterpolator import android.widget.AbsListView import android.widget.ArrayAdapter import android.widget.Toast +import androidx.appcompat.app.AlertDialog import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.core.widget.NestedScrollView import androidx.core.widget.doOnTextChanged import androidx.lifecycle.ViewModelProvider import com.discord.panels.OverlappingPanelsLayout -import com.discord.panels.PanelState import com.discord.panels.PanelsChildGestureRegionObserver import com.google.android.gms.cast.framework.CastButtonFactory import com.google.android.gms.cast.framework.CastContext import com.google.android.gms.cast.framework.CastState import com.google.android.material.bottomsheet.BottomSheetDialog import com.lagradost.cloudstream3.APIHolder -import com.lagradost.cloudstream3.CommonActivity.showToast +import com.lagradost.cloudstream3.APIHolder.updateHasTrailers +import com.lagradost.cloudstream3.CommonActivity import com.lagradost.cloudstream3.DubStatus import com.lagradost.cloudstream3.LoadResponse import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent @@ -57,18 +58,16 @@ import com.lagradost.cloudstream3.ui.result.ResultFragment.getStoredData import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent import com.lagradost.cloudstream3.ui.search.SearchAdapter import com.lagradost.cloudstream3.ui.search.SearchHelper -import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull -import com.lagradost.cloudstream3.utils.AppContextUtils.isCastApiAvailable -import com.lagradost.cloudstream3.utils.AppContextUtils.loadCache -import com.lagradost.cloudstream3.utils.AppContextUtils.openBrowser -import com.lagradost.cloudstream3.utils.AppContextUtils.updateHasTrailers -import com.lagradost.cloudstream3.utils.BatteryOptimizationChecker.openBatteryOptimizationSettings +import com.lagradost.cloudstream3.utils.AppUtils.getNameFull +import com.lagradost.cloudstream3.utils.AppUtils.html +import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable +import com.lagradost.cloudstream3.utils.AppUtils.loadCache +import com.lagradost.cloudstream3.utils.AppUtils.openBrowser import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog import com.lagradost.cloudstream3.utils.UIHelper -import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard @@ -78,13 +77,13 @@ import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes import com.lagradost.cloudstream3.utils.UIHelper.setImage import com.lagradost.cloudstream3.utils.VideoDownloadHelper + open class ResultFragmentPhone : FullScreenPlayer() { - private val gestureRegionsListener = - object : PanelsChildGestureRegionObserver.GestureRegionsListener { - override fun onGestureRegionsUpdate(gestureRegions: List) { - binding?.resultOverlappingPanels?.setChildGestureRegions(gestureRegions) - } + private val gestureRegionsListener = object : PanelsChildGestureRegionObserver.GestureRegionsListener { + override fun onGestureRegionsUpdate(gestureRegions: List) { + binding?.resultOverlappingPanels?.setChildGestureRegions(gestureRegions) } + } protected lateinit var viewModel: ResultViewModel2 protected lateinit var syncModel: SyncViewModel @@ -119,14 +118,6 @@ open class ResultFragmentPhone : FullScreenPlayer() { return root } - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - PanelsChildGestureRegionObserver.Provider.get().apply { - resultBinding?.resultCastItems?.let { register(it) } - } - } - var currentTrailers: List = emptyList() var currentTrailerIndex = 0 @@ -139,8 +130,8 @@ open class ResultFragmentPhone : FullScreenPlayer() { return currentTrailerIndex + 1 < currentTrailers.size } - override fun playerError(exception: Throwable) { - if (player.getIsPlaying()) { // because we don't want random toasts in player + override fun playerError(exception: Exception) { + if (player.getIsPlaying()) { // because we dont want random toasts in player super.playerError(exception) } else { nextMirror() @@ -160,8 +151,7 @@ open class ResultFragmentPhone : FullScreenPlayer() { startPosition = 0L, subtitles = emptySet(), subtitle = null, - autoPlay = false, - preview = false + autoPlay = false ) true } ?: run { @@ -195,6 +185,8 @@ open class ResultFragmentPhone : FullScreenPlayer() { } binding?.resultFullscreenHolder?.isVisible = !isSuccess && isFullScreenPlayer } + + //player_view?.apply { //alpha = 0.0f //ObjectAnimator.ofFloat(player_view, "alpha", 1f).apply { @@ -208,7 +200,9 @@ open class ResultFragmentPhone : FullScreenPlayer() { // fillAfter = true //} //startAnimation(fadeIn) - //} + // } + + } private fun setTrailers(trailers: List?) { @@ -219,6 +213,9 @@ open class ResultFragmentPhone : FullScreenPlayer() { } override fun onDestroyView() { + + //somehow this still leaks and I dont know why???? + // todo look at https://github.com/discord/OverlappingPanels/blob/70b4a7cf43c6771873b1e091029d332896d41a1a/sample_app/src/main/java/com/discord/sampleapp/MainActivity.kt PanelsChildGestureRegionObserver.Provider.get().let { obs -> resultBinding?.resultCastItems?.let { obs.unregister(it) @@ -249,7 +246,6 @@ open class ResultFragmentPhone : FullScreenPlayer() { } var selectSeason: String? = null - var selectEpisodeRange: String? = null private fun setUrl(url: String?) { if (url == null) { @@ -335,18 +331,14 @@ open class ResultFragmentPhone : FullScreenPlayer() { syncModel.addFromUrl(storedData.url) val api = APIHolder.getApiFromNameNull(storedData.apiName) - // This may not be 100% reliable, and may delay for small period - // before resultCastItems will be scrollable again, but this does work - // most of the time. - binding?.resultOverlappingPanels?.registerEndPanelStateListeners( - object : OverlappingPanelsLayout.PanelStateListener { - override fun onPanelStateChange(panelState: PanelState) { - PanelsChildGestureRegionObserver.Provider.get().apply { - resultBinding?.resultCastItems?.let { register(it) } - } - } + PanelsChildGestureRegionObserver.Provider.get().apply { + resultBinding?.resultCastItems?.let { + register(it) } - ) + addGestureRegionsUpdateListener(gestureRegionsListener) + } + + // ===== ===== ===== @@ -437,44 +429,27 @@ open class ResultFragmentPhone : FullScreenPlayer() { } }) resultSubscribe.setOnClickListener { - viewModel.toggleSubscriptionStatus(context) { newStatus: Boolean? -> - if (newStatus == null) return@toggleSubscriptionStatus + val isSubscribed = + viewModel.toggleSubscriptionStatus() ?: return@setOnClickListener - val message = if (newStatus) { - // Kinda icky to have this here, but it works. - SubscriptionWorkManager.enqueuePeriodicWork(context) - R.string.subscription_new - } else { - R.string.subscription_deleted - } - - val name = (viewModel.page.value as? Resource.Success)?.value?.title - ?: txt(R.string.no_data).asStringNull(context) ?: "" - showToast(txt(message, name), Toast.LENGTH_SHORT) + val message = if (isSubscribed) { + // Kinda icky to have this here, but it works. + SubscriptionWorkManager.enqueuePeriodicWork(context) + R.string.subscription_new + } else { + R.string.subscription_deleted } - context?.let { openBatteryOptimizationSettings(it) } - } - resultFavorite.setOnClickListener { - viewModel.toggleFavoriteStatus(context) { newStatus: Boolean? -> - if (newStatus == null) return@toggleFavoriteStatus - val message = if (newStatus) { - R.string.favorite_added - } else { - R.string.favorite_removed - } - - val name = (viewModel.page.value as? Resource.Success)?.value?.title - ?: txt(R.string.no_data).asStringNull(context) ?: "" - showToast(txt(message, name), Toast.LENGTH_SHORT) - } + val name = (viewModel.page.value as? Resource.Success)?.value?.title + ?: txt(R.string.no_data).asStringNull(context) ?: "" + CommonActivity.showToast(txt(message, name), Toast.LENGTH_SHORT) } mediaRouteButton.apply { val chromecastSupport = api?.hasChromecastSupport == true alpha = if (chromecastSupport) 1f else 0.3f if (!chromecastSupport) { setOnClickListener { - showToast( + CommonActivity.showToast( R.string.no_chromecast_support_toast, Toast.LENGTH_LONG ) @@ -484,16 +459,8 @@ open class ResultFragmentPhone : FullScreenPlayer() { if (act.isCastApiAvailable()) { try { CastButtonFactory.setUpMediaRouteButton(act, this) - CastContext.getSharedInstance(act.applicationContext) { - it.run() - }.addOnCompleteListener { - isGone = if (it.isSuccessful) { - it.result.castState == CastState.NO_DEVICES_AVAILABLE - } else { - true - } - - } + val castContext = CastContext.getSharedInstance(act.applicationContext) + isGone = castContext.castState == CastState.NO_DEVICES_AVAILABLE // this shit leaks for some reason //castContext.addCastStateListener { state -> // media_route_button?.isGone = state == CastState.NO_DEVICES_AVAILABLE @@ -596,19 +563,6 @@ open class ResultFragmentPhone : FullScreenPlayer() { binding?.resultSubscribe?.setImageResource(drawable) } - observeNullable(viewModel.favoriteStatus) { isFavorite -> - binding?.resultFavorite?.isVisible = isFavorite != null - if (isFavorite == null) return@observeNullable - - val drawable = if (isFavorite) { - R.drawable.ic_baseline_favorite_24 - } else { - R.drawable.ic_baseline_favorite_border_24 - } - - binding?.resultFavorite?.setImageResource(drawable) - } - observe(viewModel.trailers) { trailers -> setTrailers(trailers.flatMap { it.mirros }) // I dont care about subtitles yet! } @@ -645,20 +599,18 @@ open class ResultFragmentPhone : FullScreenPlayer() { } downloadButton.setDefaultClickListener( VideoDownloadHelper.DownloadEpisodeCached( - name = ep.name, - poster = ep.poster, - episode = 0, - season = null, - id = ep.id, - parentId = ep.id, - rating = null, - description = null, - cacheTime = System.currentTimeMillis(), + ep.name, + ep.poster, + 0, + null, + ep.id, + ep.id, + null, + null, + System.currentTimeMillis(), ), null ) { click -> - context?.let { openBatteryOptimizationSettings(it) } - when (click.action) { DOWNLOAD_ACTION_DOWNLOAD -> { viewModel.handleAction( @@ -685,9 +637,6 @@ open class ResultFragmentPhone : FullScreenPlayer() { observe(viewModel.page) { data -> if (data == null) return@observe resultBinding?.apply { - PanelsChildGestureRegionObserver.Provider.get().apply { - register(resultCastItems) - } (data as? Resource.Success)?.value?.let { d -> resultVpn.setText(d.vpnText) resultInfo.setText(d.metaText) @@ -698,22 +647,20 @@ open class ResultFragmentPhone : FullScreenPlayer() { resultMetaYear.setText(d.yearText) resultMetaDuration.setText(d.durationText) resultMetaRating.setText(d.ratingText) - resultMetaStatus.setText(d.onGoingText) - resultMetaContentRating.setText(d.contentRatingText) resultCastText.setText(d.actorsText) resultNextAiring.setText(d.nextAiringEpisode) resultNextAiringTime.setText(d.nextAiringDate) resultPoster.setImage(d.posterImage) resultPosterBackground.setImage(d.posterBackgroundImage) - - var isExpanded = false - resultDescription.apply { - setTextHtml(d.plotText) - setOnClickListener { - isExpanded = !isExpanded - maxLines = if (isExpanded) { - Integer.MAX_VALUE - } else 10 + resultDescription.setTextHtml(d.plotText) + resultDescription.setOnClickListener { view -> + // todo bottom view? + view.context?.let { ctx -> + val builder: AlertDialog.Builder = + AlertDialog.Builder(ctx, R.style.AlertDialogCustom) + builder.setMessage(d.plotText.asString(ctx).html()) + .setTitle(d.plotHeaderText.asString(ctx)) + .show() } } @@ -725,11 +672,6 @@ open class ResultFragmentPhone : FullScreenPlayer() { resultCastItems.isGone = d.actors.isNullOrEmpty() (resultCastItems.adapter as? ActorAdaptor)?.updateList(d.actors ?: emptyList()) - if (d.contentRatingText == null) { - // If there is no rating to display, we don't want an empty gap - resultMetaContentRating.width = 0 - } - if (syncModel.addSyncs(d.syncData)) { syncModel.updateMetaAndUser() syncModel.updateSynced() @@ -774,11 +716,6 @@ open class ResultFragmentPhone : FullScreenPlayer() { resultLoadingError.isVisible = data is Resource.Failure resultErrorText.isVisible = data is Resource.Failure resultReloadConnectionOpenInBrowser.isVisible = data is Resource.Failure - - resultTitle.setOnLongClickListener { - clipboardHelper(txt(R.string.title), resultTitle.text) - true - } } } @@ -879,7 +816,7 @@ open class ResultFragmentPhone : FullScreenPlayer() { val d = status.value resultSyncRating.value = d.score?.toFloat() ?: 0.0f - resultSyncCheck.setItemChecked(d.status.internalId + 1, true) + resultSyncCheck.setItemChecked(d.status + 1, true) val watchedEpisodes = d.watchedEpisodes ?: 0 currentSyncProgress = watchedEpisodes @@ -913,6 +850,19 @@ open class ResultFragmentPhone : FullScreenPlayer() { observe(viewModel.recommendations) { recommendations -> setRecommendations(recommendations, null) } + observe(viewModel.episodeSynopsis) { description -> + // TODO bottom dialog + view.context?.let { ctx -> + val builder: AlertDialog.Builder = + AlertDialog.Builder(ctx, R.style.AlertDialogCustom) + builder.setMessage(description.html()) + .setTitle(R.string.synopsis) + .setOnDismissListener { + viewModel.releaseEpisodeSynopsis() + } + .show() + } + } context?.let { ctx -> val arrayAdapter = ArrayAdapter(ctx, R.layout.sort_bottom_single_choice) /* @@ -983,12 +933,12 @@ open class ResultFragmentPhone : FullScreenPlayer() { setOnClickListener { fab -> activity?.showBottomDialog( - WatchType.entries.map { fab.context.getString(it.stringRes) }.toList(), + WatchType.values().map { fab.context.getString(it.stringRes) }.toList(), watchType.ordinal, fab.context.getString(R.string.action_add_to_bookmarks), showApply = false, {}) { - viewModel.updateWatchStatus(WatchType.entries[it], context) + viewModel.updateWatchStatus(WatchType.values()[it]) } } } @@ -1047,8 +997,6 @@ open class ResultFragmentPhone : FullScreenPlayer() { observeNullable(viewModel.selectedRange) { range -> resultBinding?.apply { resultEpisodeSelect.setText(range) - - selectEpisodeRange = range?.asStringNull(resultEpisodeSelect.context) // If Season button is invisible then the bookmark button next focus is episode select if (resultEpisodeSelect.isVisible && !resultSeasonButton.isVisible && resultResumeParent.isVisible) { setFocusUpAndDown(resultResumeSeriesButton, resultEpisodeSelect) @@ -1068,7 +1016,7 @@ open class ResultFragmentPhone : FullScreenPlayer() { text?.asStringNull(ctx) ?: return@mapNotNull null ) }) { - viewModel.changeDubStatus(DubStatus.entries[itemId]) + viewModel.changeDubStatus(DubStatus.values()[itemId]) } } } @@ -1082,12 +1030,9 @@ open class ResultFragmentPhone : FullScreenPlayer() { r to (text?.asStringNull(ctx) ?: return@mapNotNull null) } - activity?.showDialog( - names.map { it.second }, - names.indexOfFirst { it.second == selectEpisodeRange }, - "", - false, - {}) { itemId -> + view.popupMenuNoIconsAndNoStringRes(names.mapIndexed { index, (_, name) -> + index to name + }) { viewModel.changeRange(names[itemId].first) } } @@ -1125,8 +1070,7 @@ open class ResultFragmentPhone : FullScreenPlayer() { override fun onPause() { super.onPause() - PanelsChildGestureRegionObserver.Provider.get() - .addGestureRegionsUpdateListener(gestureRegionsListener) + PanelsChildGestureRegionObserver.Provider.get().addGestureRegionsUpdateListener(gestureRegionsListener) } private fun setRecommendations(rec: List?, validApiName: String?) { @@ -1181,4 +1125,4 @@ open class ResultFragmentPhone : FullScreenPlayer() { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt index 1878f0b8..be3de52b 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt @@ -8,7 +8,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.animation.DecelerateInterpolator -import android.widget.Toast import androidx.appcompat.app.AlertDialog import androidx.core.view.isGone import androidx.core.view.isVisible @@ -17,7 +16,7 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.RecyclerView import com.google.android.material.bottomsheet.BottomSheetDialog -import com.lagradost.cloudstream3.CommonActivity +import com.lagradost.cloudstream3.APIHolder.updateHasTrailers import com.lagradost.cloudstream3.DubStatus import com.lagradost.cloudstream3.LoadResponse import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent @@ -27,25 +26,19 @@ import com.lagradost.cloudstream3.databinding.FragmentResultTvBinding import com.lagradost.cloudstream3.mvvm.Resource import com.lagradost.cloudstream3.mvvm.observe import com.lagradost.cloudstream3.mvvm.observeNullable -import com.lagradost.cloudstream3.services.SubscriptionWorkManager import com.lagradost.cloudstream3.ui.WatchType import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup import com.lagradost.cloudstream3.ui.player.ExtractorLinkGenerator import com.lagradost.cloudstream3.ui.player.GeneratorPlayer -import com.lagradost.cloudstream3.ui.player.NEXT_WATCH_EPISODE_PERCENTAGE -import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment import com.lagradost.cloudstream3.ui.result.ResultFragment.getStoredData import com.lagradost.cloudstream3.ui.result.ResultFragment.updateUIEvent import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_FOCUSED import com.lagradost.cloudstream3.ui.search.SearchAdapter import com.lagradost.cloudstream3.ui.search.SearchHelper -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.AppContextUtils.html -import com.lagradost.cloudstream3.utils.AppContextUtils.isRtl -import com.lagradost.cloudstream3.utils.AppContextUtils.loadCache -import com.lagradost.cloudstream3.utils.AppContextUtils.updateHasTrailers +import com.lagradost.cloudstream3.utils.AppUtils.getNameFull +import com.lagradost.cloudstream3.utils.AppUtils.html +import com.lagradost.cloudstream3.utils.AppUtils.isRtl +import com.lagradost.cloudstream3.utils.AppUtils.loadCache import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant import com.lagradost.cloudstream3.utils.UIHelper @@ -56,7 +49,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.navigate import com.lagradost.cloudstream3.utils.UIHelper.setImage class ResultFragmentTv : Fragment() { - private lateinit var viewModel: ResultViewModel2 + protected lateinit var viewModel: ResultViewModel2 private var binding: FragmentResultTvBinding? = null override fun onDestroyView() { @@ -121,20 +114,10 @@ class ResultFragmentTv : Fragment() { } } -// private fun hasNoFocus(): Boolean { -// val focus = activity?.currentFocus -// if (focus == null || !focus.isVisible) return true -// return focus == binding?.resultRoot -// } - - /** - * Force focus any play button. - * Note that this will steal any focus if the episode loading is too slow (unlikely). - */ - private fun focusPlayButton() { - binding?.resultPlayMovieButton?.requestFocus() - binding?.resultPlaySeriesButton?.requestFocus() - binding?.resultResumeSeriesButton?.requestFocus() + private fun hasNoFocus(): Boolean { + val focus = activity?.currentFocus + if (focus == null || !focus.isVisible) return true + return focus == binding?.resultRoot } private fun setRecommendations(rec: List?, validApiName: String?) { @@ -194,7 +177,7 @@ class ResultFragmentTv : Fragment() { isVisible = true } - this.animate().alpha(if (turnVisible) 0.97f else 0.0f).apply { + this.animate().alpha(if (turnVisible) 1.0f else 0.0f).apply { duration = 200 interpolator = DecelerateInterpolator() setListener(object : Animator.AnimatorListener { @@ -223,9 +206,11 @@ class ResultFragmentTv : Fragment() { episodesShadow.fade(show) episodeHolderTv.fade(show) if (episodesShadow.isRtl()) { - episodesShadowBackground.scaleX = -1f + episodesShadow.scaleX = -1.0f + episodesShadow.scaleY = -1.0f } else { - episodesShadowBackground.scaleX = 1f + episodesShadow.scaleX = 1.0f + episodesShadow.scaleY = 1.0f } } } @@ -249,15 +234,36 @@ class ResultFragmentTv : Fragment() { storedData.start ) // ===== ===== ===== - var comingSoon = false binding?.apply { //episodesShadow.rotationX = 180.0f//if(episodesShadow.isRtl()) 180.0f else 0.0f - // parallax on background - resultFinishLoading.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { view, _, scrollY, _, oldScrollY -> - backgroundPosterHolder.translationY = -scrollY.toFloat() * 0.8f - }) + val leftListener: View.OnFocusChangeListener = + View.OnFocusChangeListener { _, hasFocus -> + if (!hasFocus) return@OnFocusChangeListener + toggleEpisodes(false) + } + + val rightListener: View.OnFocusChangeListener = + View.OnFocusChangeListener { _, hasFocus -> + if (!hasFocus) return@OnFocusChangeListener + toggleEpisodes(true) + } + + resultPlayMovie.onFocusChangeListener = leftListener + resultPlaySeries.onFocusChangeListener = leftListener + resultResumeSeries.onFocusChangeListener = leftListener + resultPlayTrailer.onFocusChangeListener = leftListener + resultEpisodesShow.onFocusChangeListener = rightListener + resultDescription.onFocusChangeListener = leftListener + resultBookmarkButton.onFocusChangeListener = leftListener + resultEpisodesShow.setOnClickListener { + // toggle, to make it more touch accessable just in case someone thinks that a + // tv layout is better but is using a touch device + toggleEpisodes(!episodeHolderTv.isVisible) + } + + // resultEpisodes.onFocusChangeListener = leftListener redirectToPlay.setOnFocusChangeListener { _, hasFocus -> if (!hasFocus) return@setOnFocusChangeListener @@ -265,14 +271,11 @@ class ResultFragmentTv : Fragment() { binding?.apply { val views = listOf( - resultPlayMovieButton, - resultPlaySeriesButton, - resultResumeSeriesButton, - resultPlayTrailerButton, - resultBookmarkButton, - resultFavoriteButton, - resultSubscribeButton, - resultSearchButton + resultPlayMovie, + resultPlaySeries, + resultResumeSeries, + resultPlayTrailer, + resultBookmarkButton ) for (requestView in views) { if (!requestView.isVisible) continue @@ -281,16 +284,21 @@ class ResultFragmentTv : Fragment() { } } + // parallax on background + resultFinishLoading.setOnScrollChangeListener(NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY -> + backgroundPosterHolder.translationY = -scrollY.toFloat() * 0.8f + }) + redirectToEpisodes.setOnFocusChangeListener { _, hasFocus -> if (!hasFocus) return@setOnFocusChangeListener toggleEpisodes(true) binding?.apply { val views = listOf( - resultDubSelection, resultSeasonSelection, resultRangeSelection, + resultDubSelection, resultEpisodes, - resultPlayTrailerButton, + resultPlayTrailer, ) for (requestView in views) { if (!requestView.isShown) continue @@ -299,46 +307,6 @@ class ResultFragmentTv : Fragment() { } } - mapOf( - resultPlayMovieButton to resultPlayMovieText, - resultPlaySeriesButton to resultPlaySeriesText, - resultResumeSeriesButton to resultResumeSeriesText, - resultPlayTrailerButton to resultPlayTrailerText, - resultBookmarkButton to resultBookmarkText, - resultFavoriteButton to resultFavoriteText, - resultSubscribeButton to resultSubscribeText, - resultSearchButton to resultSearchText, - resultEpisodesShowButton to resultEpisodesShowText - ).forEach { (button , text) -> - - button.setOnFocusChangeListener { view, hasFocus -> - if (!hasFocus) { - text.isSelected = false - if (view.id == R.id.result_episodes_show_button) toggleEpisodes(false) - return@setOnFocusChangeListener - } - - text.isSelected = true - if (button.tag == context?.getString(R.string.tv_no_focus_tag)){ - resultFinishLoading.scrollTo(0,0) - } - when (button.id) { - R.id.result_episodes_show_button -> { - toggleEpisodes(true) - } - else -> { - toggleEpisodes(false) - } - } - } - } - - resultEpisodesShowButton.setOnClickListener { - // toggle, to make it more touch accessible just in case someone thinks that a - // tv layout is better but is using a touch device - toggleEpisodes(!episodeHolderTv.isVisible) - } - resultEpisodes.setLinearListLayout( isHorizontal = false, nextUp = FOCUS_SELF, @@ -380,6 +348,10 @@ class ResultFragmentTv : Fragment() { resultMetaSite.isFocusable = false + //resultReloadConnectionOpenInBrowser.setOnClickListener {view -> + // view.context?.openBrowser(storedData?.url ?: return@setOnClickListener, fallbackWebview = true) + //} + resultSeasonSelection.setAdapter() resultRangeSelection.setAdapter() resultDubSelection.setAdapter() @@ -418,6 +390,10 @@ class ResultFragmentTv : Fragment() { resultCastItems.layoutManager = object : LinearListLayout(view.context) { + override fun onInterceptFocusSearch(focused: View, direction: Int): View? { + return super.onInterceptFocusSearch(focused, direction) + } + override fun onRequestChildFocus( parent: RecyclerView, state: RecyclerView.State, @@ -437,31 +413,15 @@ class ResultFragmentTv : Fragment() { setHorizontal() } - val aboveCast = listOf( - binding?.resultEpisodesShow, - binding?.resultBookmark, - binding?.resultFavorite, - binding?.resultSubscribe, - ).firstOrNull { - it?.isVisible == true - } - resultCastItems.adapter = ActorAdaptor(aboveCast?.id) { + resultCastItems.adapter = ActorAdaptor { toggleEpisodes(false) } } observeNullable(viewModel.resumeWatching) { resume -> binding?.apply { - - if (resume == null) { - return@observeNullable - } - resultResumeSeries.isVisible = true - resultPlayMovie.isVisible = false - resultPlaySeries.isVisible = false - // show progress no matter if series or movie - resume.progress?.let { progress -> + resume?.progress?.let { progress -> resultResumeSeriesProgressText.setText(progress.progressLeft) resultResumeSeriesProgress.apply { isVisible = true @@ -473,20 +433,39 @@ class ResultFragmentTv : Fragment() { resultResumeProgressHolder.isVisible = false } - focusPlayButton() - // Stops last button right focus if it is a movie - if (resume.isMovie) - resultSearchButton.nextFocusRightId = R.id.result_search_Button + // if movie then hide both as movie button is + // always visible on movies, this is done in movie observe - resultResumeSeriesText.text = - when { - resume.isMovie -> context?.getString(R.string.resume) - resume.result.season != null -> - "${getString(R.string.season_short)}${resume.result.season}:${getString(R.string.episode_short)}${resume.result.episode}" - else -> "${getString(R.string.episode)} ${resume.result.episode}" - } + if (resume?.isMovie == true) { + resultPlaySeries.isVisible = false + resultResumeSeries.isVisible = false + return@observeNullable + } - resultResumeSeriesButton.setOnClickListener { + // if series then + // > resultPlaySeries is visible when null + // > resultResumeSeries is visible when not null + if (resume == null) { + resultPlaySeries.isVisible = true + resultResumeSeries.isVisible = false + return@observeNullable + } + + resultPlaySeries.isVisible = false + resultResumeSeries.isVisible = true + + if (hasNoFocus()) { + resultResumeSeries.requestFocus() + } + + resultResumeSeries.text = + if (resume.isMovie) context?.getString(R.string.play_movie_button) else context?.getNameFull( + null, // resume.result.name, we don't want episode title + resume.result.episode, + resume.result.season + ) + + resultResumeSeries.setOnClickListener { viewModel.handleAction( EpisodeClickEvent( storedData.playerAction, //?: ACTION_PLAY_EPISODE_IN_PLAYER, @@ -495,7 +474,7 @@ class ResultFragmentTv : Fragment() { ) } - resultResumeSeriesButton.setOnLongClickListener { + resultResumeSeries.setOnLongClickListener { viewModel.handleAction( EpisodeClickEvent(ACTION_SHOW_OPTIONS, resume.result) ) @@ -509,9 +488,9 @@ class ResultFragmentTv : Fragment() { context?.updateHasTrailers() if (!LoadResponse.isTrailersEnabled) return@observe val trailers = trailersLinks.flatMap { it.mirros } - binding?.apply { - resultPlayTrailer.isGone = trailers.isEmpty() - resultPlayTrailerButton.setOnClickListener { + binding?.resultPlayTrailer?.apply { + isGone = trailers.isEmpty() + setOnClickListener { if (trailers.isEmpty()) return@setOnClickListener activity.navigate( R.id.global_to_navigation_player, GeneratorPlayer.newInstance( @@ -526,147 +505,43 @@ class ResultFragmentTv : Fragment() { } observe(viewModel.watchStatus) { watchType -> - binding?.apply { - resultBookmarkText.setText(watchType.stringRes) - - resultBookmarkButton.apply { - - val drawable = if (watchType.stringRes == R.string.type_none) { - R.drawable.outline_bookmark_add_24 - } else { - R.drawable.ic_baseline_bookmark_24 + binding?.resultBookmarkButton?.apply { + setText(watchType.stringRes) + setOnClickListener { view -> + activity?.showBottomDialog( + WatchType.values().map { view.context.getString(it.stringRes) }.toList(), + watchType.ordinal, + view.context.getString(R.string.action_add_to_bookmarks), + showApply = false, + {}) { + viewModel.updateWatchStatus(WatchType.values()[it]) } - setIconResource(drawable) - - setOnClickListener { view -> - activity?.showBottomDialog( - WatchType.entries.map { view.context.getString(it.stringRes) }.toList(), - watchType.ordinal, - view.context.getString(R.string.action_add_to_bookmarks), - showApply = false, - {}) { - viewModel.updateWatchStatus(WatchType.entries[it], context) - } - } - } - } - } - - observeNullable(viewModel.favoriteStatus) { isFavorite -> - - binding?.resultFavorite?.isVisible = isFavorite != null - - binding?.resultFavoriteButton?.apply { - - if (isFavorite == null) return@observeNullable - - val drawable = if (isFavorite) { - R.drawable.ic_baseline_favorite_24 - } else { - R.drawable.ic_baseline_favorite_border_24 - } - - setIconResource(drawable) - - setOnClickListener { - viewModel.toggleFavoriteStatus(context) { newStatus: Boolean? -> - if (newStatus == null) return@toggleFavoriteStatus - - val message = if (newStatus) { - R.string.favorite_added - } else { - R.string.favorite_removed - } - - val name = (viewModel.page.value as? Resource.Success)?.value?.title - ?: txt(R.string.no_data).asStringNull(context) ?: "" - CommonActivity.showToast(txt(message, name), Toast.LENGTH_SHORT) - } - } - } - - binding?.resultFavoriteText?.apply { - val text = if (isFavorite == true) { - R.string.unfavorite - } else { - R.string.favorite - } - setText(text) - } - } - - observeNullable(viewModel.subscribeStatus) { isSubscribed -> - binding?.resultSubscribe?.isVisible = isSubscribed != null && isLayout(EMULATOR) - binding?.resultSubscribeButton?.apply { - - if (isSubscribed == null) return@observeNullable - - val drawable = if (isSubscribed) { - R.drawable.ic_baseline_notifications_active_24 - } else { - R.drawable.baseline_notifications_none_24 - } - - setIconResource(drawable) - - setOnClickListener { - viewModel.toggleSubscriptionStatus(context) { newStatus: Boolean? -> - if (newStatus == null) return@toggleSubscriptionStatus - - val message = if (newStatus) { - // Kinda icky to have this here, but it works. - SubscriptionWorkManager.enqueuePeriodicWork(context) - R.string.subscription_new - } else { - R.string.subscription_deleted - } - - val name = (viewModel.page.value as? Resource.Success)?.value?.title - ?: txt(R.string.no_data).asStringNull(context) ?: "" - CommonActivity.showToast(txt(message, name), Toast.LENGTH_SHORT) - } - } - - binding?.resultSubscribeText?.apply { - val text = if (isSubscribed) { - R.string.action_unsubscribe - } else { - R.string.action_subscribe - } - setText(text) } } } observeNullable(viewModel.movie) { data -> - if (data == null ) { - return@observeNullable - } - binding?.apply { + resultPlayMovie.isVisible = data is Resource.Success + seriesHolder.isVisible = data == null + resultEpisodesShow.isVisible = data == null - (data as? Resource.Success)?.value?.let { (_, ep) -> - - resultPlayMovieButton.setOnClickListener { + (data as? Resource.Success)?.value?.let { (text, ep) -> + resultPlayMovie.setText(text) + resultPlayMovie.setOnClickListener { viewModel.handleAction( EpisodeClickEvent(ACTION_CLICK_DEFAULT, ep) ) } - resultPlayMovieButton.setOnLongClickListener { + resultPlayMovie.setOnLongClickListener { viewModel.handleAction( EpisodeClickEvent(ACTION_SHOW_OPTIONS, ep) ) return@setOnLongClickListener true } - - resultPlayMovie.isVisible = !comingSoon && resultResumeSeries.isGone - if (comingSoon) - resultBookmarkButton.requestFocus() - else - resultPlayMovieButton.requestFocus() - - // Stops last button right focus - resultSearchButton.nextFocusRightId = R.id.result_search_Button + if (hasNoFocus()) { + resultPlayMovie.requestFocus() + } } } } @@ -749,72 +624,86 @@ class ResultFragmentTv : Fragment() { observe(viewModel.recommendations) { recommendations -> setRecommendations(recommendations, null) } - - if (isLayout(TV)) { - observe(viewModel.episodeSynopsis) { description -> - view.context?.let { ctx -> - val builder: AlertDialog.Builder = - AlertDialog.Builder(ctx, R.style.AlertDialogCustom) - builder.setMessage(description.html()) - .setTitle(R.string.synopsis) - .setOnDismissListener { - viewModel.releaseEpisodeSynopsis() - } - .show() - } + observe(viewModel.episodeSynopsis) { description -> + view.context?.let { ctx -> + val builder: AlertDialog.Builder = + AlertDialog.Builder(ctx, R.style.AlertDialogCustom) + builder.setMessage(description.html()) + .setTitle(R.string.synopsis) + .setOnDismissListener { + viewModel.releaseEpisodeSynopsis() + } + .show() } } - - // Used to request focus the first time the episodes are loaded. - var hasLoadedEpisodesOnce = false observeNullable(viewModel.episodes) { episodes -> - if (episodes == null) return@observeNullable - binding?.apply { - - if (comingSoon) - resultBookmarkButton.requestFocus() - + resultEpisodes.isVisible = episodes is Resource.Success // resultEpisodeLoading.isVisible = episodes is Resource.Loading if (episodes is Resource.Success) { + val first = episodes.value.firstOrNull() + if (first != null) { + resultPlaySeries.text = context?.getNameFull( + null, // resume.result.name, we don't want episode title + first.episode, + first.season + ) - val lastWatchedIndex = episodes.value.indexOfLast { ep -> - ep.getWatchProgress() >= NEXT_WATCH_EPISODE_PERCENTAGE.toFloat() / 100.0f || ep.videoWatchState == VideoWatchState.Watched - } - - val firstUnwatched = episodes.value.getOrElse(lastWatchedIndex + 1) { episodes.value.firstOrNull() } - - if (firstUnwatched != null) { - resultPlaySeriesText.text = - when { - firstUnwatched.season != null -> - "${getString(R.string.season_short)}${firstUnwatched.season}:${getString(R.string.episode_short)}${firstUnwatched.episode}" - else -> "${getString(R.string.episode)} ${firstUnwatched.episode}" - } - resultPlaySeriesButton.setOnClickListener { + resultPlaySeries.setOnClickListener { viewModel.handleAction( EpisodeClickEvent( ACTION_CLICK_DEFAULT, - firstUnwatched + first ) ) } - resultPlaySeriesButton.setOnLongClickListener { + resultPlaySeries.setOnLongClickListener { viewModel.handleAction( - EpisodeClickEvent(ACTION_SHOW_OPTIONS, firstUnwatched) + EpisodeClickEvent(ACTION_SHOW_OPTIONS, first) ) return@setOnLongClickListener true } - if (!hasLoadedEpisodesOnce) { - hasLoadedEpisodesOnce = true - resultPlaySeries.isVisible = resultResumeSeries.isGone && !comingSoon - resultEpisodesShow.isVisible = true && !comingSoon - resultPlaySeriesButton.requestFocus() - } } + /* + * Okay so what is this fuckery? + * Basically Android TV will crash if you request a new focus while + * the adapter gets updated. + * + * This means that if you load thumbnails and request a next focus at the same time + * the app will crash without any way to catch it! + * + * How to bypass this? + * This code basically steals the focus for 500ms and puts it in an inescapable view + * then lets out the focus by requesting focus to result_episodes + */ + + val hasEpisodes = + !(resultEpisodes.adapter as? EpisodeAdapter?)?.cardList.isNullOrEmpty() + /*val focus = activity?.currentFocus + + if (hasEpisodes) { + // Make it impossible to focus anywhere else! + temporaryNoFocus.isFocusable = true + temporaryNoFocus.requestFocus() + }*/ (resultEpisodes.adapter as? EpisodeAdapter)?.updateList(episodes.value) + + /* if (hasEpisodes) main { + + delay(500) + // This might make some people sad as it changes the focus when leaving an episode :( + if(focus?.requestFocus() == true) { + temporaryNoFocus.isFocusable = false + return@main + } + temporaryNoFocus.isFocusable = false + temporaryNoFocus.requestFocus() + } + + if (hasNoFocus()) + binding?.resultEpisodes?.requestFocus()*/ } } } @@ -834,31 +723,18 @@ class ResultFragmentTv : Fragment() { resultMetaYear.setText(d.yearText) resultMetaDuration.setText(d.durationText) resultMetaRating.setText(d.ratingText) - resultMetaStatus.setText(d.onGoingText) - resultMetaContentRating.setText(d.contentRatingText) resultCastText.setText(d.actorsText) resultNextAiring.setText(d.nextAiringEpisode) resultNextAiringTime.setText(d.nextAiringDate) resultPoster.setImage(d.posterImage) - - var isExpanded = false - resultDescription.apply { - setTextHtml(d.plotText) - setOnClickListener { - if (isLayout(EMULATOR)) { - isExpanded = !isExpanded - maxLines = if (isExpanded) { - Integer.MAX_VALUE - } else 10 - } else { - view.context?.let { ctx -> - val builder: AlertDialog.Builder = - AlertDialog.Builder(ctx, R.style.AlertDialogCustom) - builder.setMessage(d.plotText.asString(ctx).html()) - .setTitle(d.plotHeaderText.asString(ctx)) - .show() - } - } + resultDescription.setTextHtml(d.plotText) + resultDescription.setOnClickListener { view -> + view.context?.let { ctx -> + val builder: AlertDialog.Builder = + AlertDialog.Builder(ctx, R.style.AlertDialogCustom) + builder.setMessage(d.plotText.asString(ctx).html()) + .setTitle(d.plotHeaderText.asString(ctx)) + .show() } } @@ -871,31 +747,19 @@ class ResultFragmentTv : Fragment() { R.drawable.profile_bg_red, R.drawable.profile_bg_teal ).random() - //Change poster crop area to 20% from Top - backgroundPoster.cropYCenterOffsetPct = 0.20F - backgroundPoster.setImage( d.posterBackgroundImage ?: UiImage.Drawable(error), radius = 0, errorImageDrawable = error ) - comingSoon = d.comingSoon - resultTvComingSoon.isVisible = d.comingSoon + resultComingSoon.isVisible = d.comingSoon + resultDataHolder.isGone = d.comingSoon UIHelper.populateChips(resultTag, d.tags) resultCastItems.isGone = d.actors.isNullOrEmpty() (resultCastItems.adapter as? ActorAdaptor)?.updateList( d.actors ?: emptyList() ) - - if (d.contentRatingText == null) { - // If there is no rating to display, we don't want an empty gap - resultMetaContentRating.width = 0 - } - - resultSearchButton.setOnClickListener { - QuickSearchFragment.pushSearch(activity, d.title) - } } is Resource.Loading -> { diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt index 2ab60c2f..91e97dfc 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt @@ -3,23 +3,20 @@ package com.lagradost.cloudstream3.ui.result import android.animation.ValueAnimator import android.content.Context import android.content.res.Configuration +import android.graphics.Rect import android.os.Bundle import android.view.View import android.view.ViewGroup import android.widget.FrameLayout import androidx.core.view.isGone import androidx.core.view.isVisible -import com.lagradost.cloudstream3.CommonActivity.screenHeight -import com.lagradost.cloudstream3.CommonActivity.screenWidth -import com.lagradost.cloudstream3.LoadResponse import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.ui.player.CSPlayerEvent -import com.lagradost.cloudstream3.ui.player.PlayerEventSource import com.lagradost.cloudstream3.ui.player.SubtitleData -import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback -import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback +import com.lagradost.cloudstream3.utils.IOnBackPressed -open class ResultTrailerPlayer : ResultFragmentPhone() { + +open class ResultTrailerPlayer : ResultFragmentPhone(), IOnBackPressed { override var lockRotation = false override var isFullScreenPlayer = false @@ -29,13 +26,13 @@ open class ResultTrailerPlayer : ResultFragmentPhone() { const val TAG = "RESULT_TRAILER" } - private var playerWidthHeight: Pair? = null + var playerWidthHeight: Pair? = null override fun nextEpisode() {} override fun prevEpisode() {} - override fun playerPositionChanged(position: Long, duration : Long) {} + override fun playerPositionChanged(posDur: Pair) {} override fun nextMirror() {} @@ -102,8 +99,8 @@ open class ResultTrailerPlayer : ResultFragmentPhone() { } } - override fun playerDimensionsLoaded(width: Int, height : Int) { - playerWidthHeight = width to height + override fun playerDimensionsLoaded(widthHeight: Pair) { + playerWidthHeight = widthHeight fixPlayerSize() } @@ -112,7 +109,7 @@ open class ResultTrailerPlayer : ResultFragmentPhone() { override fun openOnlineSubPicker( context: Context, - loadResponse: LoadResponse?, + imdbId: Long?, dismissCallback: () -> Unit ) { } @@ -155,12 +152,6 @@ open class ResultTrailerPlayer : ResultFragmentPhone() { } fixPlayerSize() uiReset() - - if (isFullScreenPlayer) { - activity?.attachBackPressedCallback { - updateFullscreen(false) - } - } else detachBackPressedCallback() } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -173,9 +164,18 @@ open class ResultTrailerPlayer : ResultFragmentPhone() { playerBinding?.playerIntroPlay?.setOnClickListener { playerBinding?.playerIntroPlay?.isGone = true - player.handleEvent(CSPlayerEvent.Play, PlayerEventSource.UI) + player.handleEvent(CSPlayerEvent.Play) updateUIVisibility() fixPlayerSize() } } + + override fun onBackPressed(): Boolean { + return if (isFullScreenPlayer) { + updateFullscreen(false) + false + } else { + true + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt index 6443a923..82d9a8fe 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultViewModel2.kt @@ -5,11 +5,8 @@ import android.content.* import android.net.Uri import android.os.Build import android.os.Bundle -import android.text.format.Formatter.formatFileSize import android.util.Log import android.widget.Toast -import androidx.annotation.MainThread -import androidx.appcompat.app.AlertDialog import androidx.core.content.FileProvider import androidx.core.net.toUri import androidx.lifecycle.LiveData @@ -18,7 +15,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.lagradost.cloudstream3.* import com.lagradost.cloudstream3.APIHolder.apis -import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull +import com.lagradost.cloudstream3.APIHolder.getId import com.lagradost.cloudstream3.APIHolder.unixTime import com.lagradost.cloudstream3.APIHolder.unixTimeMS import com.lagradost.cloudstream3.AcraApplication.Companion.setKey @@ -29,78 +26,43 @@ import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer import com.lagradost.cloudstream3.LoadResponse.Companion.getAniListId import com.lagradost.cloudstream3.LoadResponse.Companion.getMalId import com.lagradost.cloudstream3.LoadResponse.Companion.isMovie -import com.lagradost.cloudstream3.LoadResponse.Companion.readIdFromString -import com.lagradost.cloudstream3.MainActivity.Companion.MPV -import com.lagradost.cloudstream3.MainActivity.Companion.MPV_COMPONENT -import com.lagradost.cloudstream3.MainActivity.Companion.MPV_PACKAGE -import com.lagradost.cloudstream3.MainActivity.Companion.VLC -import com.lagradost.cloudstream3.MainActivity.Companion.VLC_COMPONENT -import com.lagradost.cloudstream3.MainActivity.Companion.VLC_PACKAGE -import com.lagradost.cloudstream3.MainActivity.Companion.WEB_VIDEO -import com.lagradost.cloudstream3.MainActivity.Companion.WEB_VIDEO_CAST_PACKAGE import com.lagradost.cloudstream3.metaproviders.SyncRedirector import com.lagradost.cloudstream3.mvvm.* import com.lagradost.cloudstream3.syncproviders.AccountManager -import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.secondsToReadable import com.lagradost.cloudstream3.syncproviders.SyncAPI import com.lagradost.cloudstream3.syncproviders.providers.Kitsu -import com.lagradost.cloudstream3.syncproviders.providers.SimklApi import com.lagradost.cloudstream3.ui.APIRepository import com.lagradost.cloudstream3.ui.WatchType import com.lagradost.cloudstream3.ui.download.DOWNLOAD_NAVIGATE_TO import com.lagradost.cloudstream3.ui.player.GeneratorPlayer import com.lagradost.cloudstream3.ui.player.IGenerator -import com.lagradost.cloudstream3.ui.player.LoadType import com.lagradost.cloudstream3.ui.player.RepoLinkGenerator import com.lagradost.cloudstream3.ui.player.SubtitleData import com.lagradost.cloudstream3.ui.result.EpisodeAdapter.Companion.getPlayerAction import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment import com.lagradost.cloudstream3.utils.* -import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull -import com.lagradost.cloudstream3.utils.AppContextUtils.isAppInstalled -import com.lagradost.cloudstream3.utils.AppContextUtils.isConnectedToChromecast -import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus -import com.lagradost.cloudstream3.utils.AppContextUtils.sortSubs +import com.lagradost.cloudstream3.utils.AppUtils.getNameFull +import com.lagradost.cloudstream3.utils.AppUtils.isAppInstalled +import com.lagradost.cloudstream3.utils.AppUtils.isConnectedToChromecast import com.lagradost.cloudstream3.utils.CastHelper.startCast import com.lagradost.cloudstream3.utils.Coroutines.ioSafe import com.lagradost.cloudstream3.utils.Coroutines.ioWork import com.lagradost.cloudstream3.utils.Coroutines.ioWorkSafe import com.lagradost.cloudstream3.utils.Coroutines.main -import com.lagradost.cloudstream3.utils.DataStoreHelper.deleteBookmarkedData -import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllBookmarkedData -import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllFavorites -import com.lagradost.cloudstream3.utils.DataStoreHelper.getAllSubscriptions -import com.lagradost.cloudstream3.utils.DataStoreHelper.getBookmarkedData import com.lagradost.cloudstream3.utils.DataStoreHelper.getDub -import com.lagradost.cloudstream3.utils.DataStoreHelper.getFavoritesData -import com.lagradost.cloudstream3.utils.DataStoreHelper.getLastWatched import com.lagradost.cloudstream3.utils.DataStoreHelper.getResultEpisode import com.lagradost.cloudstream3.utils.DataStoreHelper.getResultSeason import com.lagradost.cloudstream3.utils.DataStoreHelper.getResultWatchState -import com.lagradost.cloudstream3.utils.DataStoreHelper.getSubscribedData -import com.lagradost.cloudstream3.utils.DataStoreHelper.getVideoWatchState import com.lagradost.cloudstream3.utils.DataStoreHelper.getViewPos -import com.lagradost.cloudstream3.utils.DataStoreHelper.removeFavoritesData -import com.lagradost.cloudstream3.utils.DataStoreHelper.removeSubscribedData -import com.lagradost.cloudstream3.utils.DataStoreHelper.setBookmarkedData import com.lagradost.cloudstream3.utils.DataStoreHelper.setDub -import com.lagradost.cloudstream3.utils.DataStoreHelper.setFavoritesData import com.lagradost.cloudstream3.utils.DataStoreHelper.setResultEpisode import com.lagradost.cloudstream3.utils.DataStoreHelper.setResultSeason -import com.lagradost.cloudstream3.utils.DataStoreHelper.setResultWatchState -import com.lagradost.cloudstream3.utils.DataStoreHelper.setSubscribedData -import com.lagradost.cloudstream3.utils.DataStoreHelper.setVideoWatchState -import com.lagradost.cloudstream3.utils.DataStoreHelper.updateSubscribedData -import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper import com.lagradost.cloudstream3.utils.UIHelper.navigate -import com.lagradost.cloudstream3.utils.fcast.FcastManager -import com.lagradost.cloudstream3.utils.fcast.FcastSession -import com.lagradost.cloudstream3.utils.fcast.Opcode -import com.lagradost.cloudstream3.utils.fcast.PlayMessage import kotlinx.coroutines.* import java.io.File import java.util.concurrent.TimeUnit + /** This starts at 1 */ data class EpisodeRange( // used to index data @@ -134,7 +96,6 @@ data class ResultData( val plotText: UiText, val apiName: UiText, val ratingText: UiText?, - val contentRatingText: UiText?, val vpnText: UiText?, val metaText: UiText?, val durationText: UiText?, @@ -148,18 +109,6 @@ data class ResultData( val plotHeaderText: UiText, ) -data class CheckDuplicateData( - val name: String, - val year: Int?, - val syncData: Map? -) - -enum class LibraryListType { - BOOKMARKS, - FAVORITES, - SUBSCRIPTIONS -} - fun txt(status: DubStatus?): UiText? { return txt( when (status) { @@ -211,11 +160,7 @@ fun LoadResponse.toResultData(repo: APIRepository): ResultData { else -> null }?.also { - nextAiringEpisode = when (airing.season) { - - null -> txt(R.string.next_episode_format, airing.episode) - else -> txt(R.string.next_season_episode_format, airing.season, airing.episode) - } + nextAiringEpisode = txt(R.string.next_episode_format, airing.episode) } } } @@ -264,16 +209,12 @@ fun LoadResponse.toResultData(repo: APIRepository): ResultData { TvType.Live -> R.string.live_singular TvType.Others -> R.string.other_singular TvType.NSFW -> R.string.nsfw_singular - TvType.Music -> R.string.music_singlar - TvType.AudioBook -> R.string.audio_book_singular - TvType.CustomMedia -> R.string.custom_media_singluar } ), yearText = txt(year?.toString()), apiName = txt(apiName), ratingText = rating?.div(1000f) ?.let { if (it <= 0.1f) null else txt(R.string.rating_format, it) }, - contentRatingText = txt(contentRating), vpnText = txt( when (repo.vpnStatus) { VPNStatus.None -> null @@ -284,7 +225,8 @@ fun LoadResponse.toResultData(repo: APIRepository): ResultData { metaText = if (repo.providerType == ProviderType.MetaProvider) txt(R.string.provider_info_meta) else null, durationText = if (dur == null || dur <= 0) null else txt( - secondsToReadable(dur * 60, "0 mins") + R.string.duration_format, + dur ), onGoingText = if (this is EpisodeResponse) { txt( @@ -302,23 +244,6 @@ fun LoadResponse.toResultData(repo: APIRepository): ResultData { ) } -data class ExtractorSubtitleLink( - val name: String, - override val url: String, - override val referer: String, - override val headers: Map = mapOf() -) : IDownloadableMinimum - -fun LoadResponse.getId(): Int { - // this fixes an issue with outdated api as getLoadResponseIdFromUrl might be fucked - return (if (this is ResultViewModel2.LoadResponseFromSearch) this.id else null) - ?: getLoadResponseIdFromUrl(url, apiName) -} - -private fun getLoadResponseIdFromUrl(url: String, apiName: String): Int { - return url.replace(getApiFromNameNull(apiName)?.mainUrl ?: "", "").replace("/", "") - .hashCode() -} data class LinkProgress( val linksLoaded: Int, @@ -499,9 +424,6 @@ class ResultViewModel2 : ViewModel() { private val _subscribeStatus: MutableLiveData = MutableLiveData(null) val subscribeStatus: LiveData = _subscribeStatus - private val _favoriteStatus: MutableLiveData = MutableLiveData(null) - val favoriteStatus: LiveData = _favoriteStatus - companion object { const val TAG = "RVM2" //private const val EPISODE_RANGE_SIZE = 20 @@ -512,6 +434,33 @@ class ResultViewModel2 : ViewModel() { return this?.firstOrNull { it.season == season } } + fun updateWatchStatus(currentResponse: LoadResponse, status: WatchType) { + val currentId = currentResponse.getId() + + val currentWatchType = getResultWatchState(currentId) + + DataStoreHelper.setResultWatchState(currentId, status.internalId) + val current = DataStoreHelper.getBookmarkedData(currentId) + val currentTime = System.currentTimeMillis() + DataStoreHelper.setBookmarkedData( + currentId, + DataStoreHelper.BookmarkedData( + currentId, + current?.bookmarkedTime ?: currentTime, + currentTime, + currentResponse.name, + currentResponse.url, + currentResponse.apiName, + currentResponse.type, + currentResponse.posterUrl, + currentResponse.year + ) + ) + if (currentWatchType != status) { + MainActivity.bookmarksUpdatedEvent(true) + } + } + private fun filterName(name: String?): String? { if (name == null) return null Regex("[eE]pisode [0-9]*(.*)").find(name)?.groupValues?.get(1)?.let { @@ -568,8 +517,7 @@ class ResultViewModel2 : ViewModel() { val episodeNumber = episodes[currentIndex].episode if (episodeNumber < currentMin) { currentMin = episodeNumber - } - if (episodeNumber > currentMax) { + } else if (episodeNumber > currentMax) { currentMax = episodeNumber } ++currentIndex @@ -665,9 +613,6 @@ class ResultViewModel2 : ViewModel() { TvType.Live -> "LiveStreams" TvType.NSFW -> "NSFW" TvType.Others -> "Others" - TvType.Music -> "Music" - TvType.AudioBook -> "AudioBooks" - TvType.CustomMedia -> "Media" } } @@ -723,13 +668,13 @@ class ResultViewModel2 : ViewModel() { DOWNLOAD_HEADER_CACHE, parentId.toString(), VideoDownloadHelper.DownloadHeaderCached( - apiName = apiName, - url = url, - type = currentType, - name = currentHeaderName, - poster = currentPoster, - id = parentId, - cacheTime = System.currentTimeMillis(), + apiName, + url, + currentType, + currentHeaderName, + currentPoster, + parentId, + System.currentTimeMillis(), ) ) @@ -740,15 +685,15 @@ class ResultViewModel2 : ViewModel() { ), // 3 deep folder for faster acess episode.id.toString(), VideoDownloadHelper.DownloadEpisodeCached( - name = episode.name, - poster = episode.poster, - episode = episode.episode, - season = episode.season, - id = episode.id, - parentId = parentId, - rating = episode.rating, - description = episode.description, - cacheTime = System.currentTimeMillis(), + episode.name, + episode.poster, + episode.episode, + episode.season, + episode.id, + parentId, + episode.rating, + episode.description, + System.currentTimeMillis(), ) ) @@ -800,7 +745,7 @@ class ResultViewModel2 : ViewModel() { val generator = RepoLinkGenerator(listOf(episode)) val currentLinks = mutableSetOf() val currentSubs = mutableSetOf() - generator.generateLinks(clearCache = false, LoadType.Chromecast, callback = { + generator.generateLinks(clearCache = false, isCasting = false, callback = { it.first?.let { link -> currentLinks.add(link) } @@ -868,81 +813,10 @@ class ResultViewModel2 : ViewModel() { private val _selectPopup: MutableLiveData = MutableLiveData(null) val selectPopup: LiveData = _selectPopup - fun updateWatchStatus( - status: WatchType, - context: Context?, - loadResponse: LoadResponse? = null, - statusChangedCallback: ((statusChanged: Boolean) -> Unit)? = null - ) { - val (response, currentId) = loadResponse?.let { load -> - (load to load.getId()) - } ?: ((currentResponse ?: return) to (currentId ?: return)) - val currentStatus = getResultWatchState(currentId) - - // If the current status is "NONE" and the new status is not "NONE", - // fetch the bookmarked data to check for duplicates, otherwise set this - // to an empty list, so that we don't show the duplicate warning dialog, - // but we still want to update the current bookmark and refresh the data anyway. - val bookmarkedData = if (currentStatus == WatchType.NONE && status != WatchType.NONE) { - getAllBookmarkedData() - } else emptyList() - - checkAndWarnDuplicates( - context, - LibraryListType.BOOKMARKS, - CheckDuplicateData( - name = response.name, - year = response.year, - syncData = response.syncData, - ), - bookmarkedData - ) { shouldContinue: Boolean, duplicateIds: List -> - if (!shouldContinue) return@checkAndWarnDuplicates - - if (duplicateIds.isNotEmpty()) { - duplicateIds.forEach { duplicateId -> - deleteBookmarkedData(duplicateId) - } - } - - setResultWatchState(currentId, status.internalId) - - // We don't need to store if WatchType.NONE. - // The key is removed in setResultWatchState, we don't want to - // re-add it again here if it was just removed. - if (status != WatchType.NONE) { - val current = getBookmarkedData(currentId) - - setBookmarkedData( - currentId, - DataStoreHelper.BookmarkedData( - current?.bookmarkedTime ?: unixTimeMS, - currentId, - unixTimeMS, - response.name, - response.url, - response.apiName, - response.type, - response.posterUrl, - response.year, - response.syncData, - plot = response.plot, - tags = response.tags, - rating = response.rating - ) - ) - } - - if (currentStatus != status) { - MainActivity.bookmarksUpdatedEvent(true) - MainActivity.reloadLibraryEvent(true) - } - - _watchStatus.postValue(status) - - statusChangedCallback?.invoke(true) - } + fun updateWatchStatus(status: WatchType) { + updateWatchStatus(currentResponse ?: return, status) + _watchStatus.postValue(status) } private fun startChromecast( @@ -951,280 +825,45 @@ class ResultViewModel2 : ViewModel() { isVisible: Boolean = true ) { if (activity == null) return - loadLinks(result, isVisible = isVisible, LoadType.Chromecast) { data -> + loadLinks(result, isVisible = isVisible, isCasting = true) { data -> startChromecast(activity, result, data.links, data.subs, 0) } } /** - * Toggles the subscription status of an item. - * - * @param context The context to use for operations. - * @param statusChangedCallback A callback that is invoked when the subscription status changes. - * It provides the new subscription status (true if subscribed, false if unsubscribed, null if action was canceled). - */ - fun toggleSubscriptionStatus( - context: Context?, - statusChangedCallback: ((newStatus: Boolean?) -> Unit)? = null - ) { - val isSubscribed = _subscribeStatus.value ?: return - val response = currentResponse ?: return - val currentId = currentId ?: return + * @return true if the new status is Subscribed, false if not. Null if not possible to subscribe. + **/ + fun toggleSubscriptionStatus(): Boolean? { + val isSubscribed = _subscribeStatus.value ?: return null + val response = currentResponse ?: return null + if (response !is EpisodeResponse) return null - // This might be a bit confusing, but even if the loadresponse is not a EpisodeResponse - // _subscribeStatus might be true. + val currentId = response.getId() if (isSubscribed) { - removeSubscribedData(currentId) - statusChangedCallback?.invoke(false) - _subscribeStatus.postValue(if (response is EpisodeResponse) false else null) - MainActivity.reloadLibraryEvent(true) + DataStoreHelper.removeSubscribedData(currentId) } else { - if (response !is EpisodeResponse) { - return - } - checkAndWarnDuplicates( - context, - LibraryListType.SUBSCRIPTIONS, - CheckDuplicateData( - name = response.name, - year = response.year, - syncData = response.syncData, - ), - getAllSubscriptions(), - ) { shouldContinue: Boolean, duplicateIds: List -> - if (!shouldContinue) { - statusChangedCallback?.invoke(null) - return@checkAndWarnDuplicates - } + val current = DataStoreHelper.getSubscribedData(currentId) - if (duplicateIds.isNotEmpty()) { - duplicateIds.forEach { duplicateId -> - removeSubscribedData(duplicateId) - } - } - - val current = getSubscribedData(currentId) - - setSubscribedData( + DataStoreHelper.setSubscribedData( + currentId, + DataStoreHelper.SubscribedData( currentId, - DataStoreHelper.SubscribedData( - current?.subscribedTime ?: unixTimeMS, - response.getLatestEpisodes(), - currentId, - unixTimeMS, - response.name, - response.url, - response.apiName, - response.type, - response.posterUrl, - response.year, - response.syncData, - plot = response.plot, - rating = response.rating, - tags = response.tags - ) + current?.bookmarkedTime ?: unixTimeMS, + unixTimeMS, + response.getLatestEpisodes(), + response.name, + response.url, + response.apiName, + response.type, + response.posterUrl, + response.year ) - - _subscribeStatus.postValue(true) - statusChangedCallback?.invoke(true) - MainActivity.reloadLibraryEvent(true) - } - } - } - - /** - * Toggles the favorite status of an item. - * - * @param context The context to use. - * @param statusChangedCallback A callback that is invoked when the favorite status changes. - * It provides the new favorite status (true if added to favorites, false if removed, null if action was canceled). - */ - fun toggleFavoriteStatus( - context: Context?, - statusChangedCallback: ((newStatus: Boolean?) -> Unit)? = null - ) { - val isFavorite = _favoriteStatus.value ?: return - val response = currentResponse ?: return - - val currentId = currentId ?: return - - if (isFavorite) { - removeFavoritesData(currentId) - statusChangedCallback?.invoke(false) - _favoriteStatus.postValue(false) - MainActivity.reloadLibraryEvent(true) - } else { - checkAndWarnDuplicates( - context, - LibraryListType.FAVORITES, - CheckDuplicateData( - name = response.name, - year = response.year, - syncData = response.syncData, - ), - getAllFavorites(), - ) { shouldContinue: Boolean, duplicateIds: List -> - if (!shouldContinue) { - statusChangedCallback?.invoke(null) - return@checkAndWarnDuplicates - } - - if (duplicateIds.isNotEmpty()) { - duplicateIds.forEach { duplicateId -> - removeFavoritesData(duplicateId) - } - } - - val current = getFavoritesData(currentId) - - setFavoritesData( - currentId, - DataStoreHelper.FavoritesData( - current?.favoritesTime ?: unixTimeMS, - currentId, - unixTimeMS, - response.name, - response.url, - response.apiName, - response.type, - response.posterUrl, - response.year, - response.syncData, - plot = response.plot, - rating = response.rating, - tags = response.tags - ) - ) - - _favoriteStatus.postValue(true) - statusChangedCallback?.invoke(true) - MainActivity.reloadLibraryEvent(true) - } - } - } - - @MainThread - private fun checkAndWarnDuplicates( - context: Context?, - listType: LibraryListType, - checkDuplicateData: CheckDuplicateData, - data: List, - checkDuplicatesCallback: (shouldContinue: Boolean, duplicateIds: List) -> Unit - ) { - val whitespaceRegex = "\\s+".toRegex() - fun normalizeString(input: String): String { - /** - * Trim the input string and replace consecutive spaces with a single space. - * This covers some edge-cases where the title does not match exactly across providers, - * and one provider has the title with an extra whitespace. This is minor enough that - * it should still match in this case. - */ - return input.trim().replace(whitespaceRegex, " ") - } - - val syncData = checkDuplicateData.syncData - - val imdbId = getImdbIdFromSyncData(syncData) - val tmdbId = getTMDbIdFromSyncData(syncData) - val malId = syncData?.get(AccountManager.malApi.idPrefix) - val aniListId = syncData?.get(AccountManager.aniListApi.idPrefix) - val normalizedName = normalizeString(checkDuplicateData.name) - val year = checkDuplicateData.year - - val duplicateEntries = data.filter { it: DataStoreHelper.LibrarySearchResponse -> - val librarySyncData = it.syncData - val yearCheck = year == it.year || year == null || it.year == null - - val checks = listOf( - { imdbId != null && getImdbIdFromSyncData(librarySyncData) == imdbId }, - { tmdbId != null && getTMDbIdFromSyncData(librarySyncData) == tmdbId }, - { malId != null && librarySyncData?.get(AccountManager.malApi.idPrefix) == malId }, - { aniListId != null && librarySyncData?.get(AccountManager.aniListApi.idPrefix) == aniListId }, - { normalizedName == normalizeString(it.name) && yearCheck } ) - - checks.any { it() } } - if (duplicateEntries.isEmpty() || context == null) { - checkDuplicatesCallback.invoke(true, emptyList()) - return - } - - val replaceMessage = if (duplicateEntries.size > 1) { - R.string.duplicate_replace_all - } else R.string.duplicate_replace - - val message = if (duplicateEntries.size == 1) { - val list = when (listType) { - LibraryListType.BOOKMARKS -> getResultWatchState( - duplicateEntries[0].id ?: 0 - ).stringRes - - LibraryListType.FAVORITES -> R.string.favorites_list_name - LibraryListType.SUBSCRIPTIONS -> R.string.subscription_list_name - } - - context.getString( - R.string.duplicate_message_single, - "${normalizeString(duplicateEntries[0].name)} (${context.getString(list)}) — ${duplicateEntries[0].apiName}" - ) - } else { - val bulletPoints = duplicateEntries.joinToString("\n") { - val list = when (listType) { - LibraryListType.BOOKMARKS -> getResultWatchState(it.id ?: 0).stringRes - LibraryListType.FAVORITES -> R.string.favorites_list_name - LibraryListType.SUBSCRIPTIONS -> R.string.subscription_list_name - } - - "• ${it.apiName}: ${normalizeString(it.name)} (${context.getString(list)})" - } - - context.getString(R.string.duplicate_message_multiple, bulletPoints) - } - - val builder: AlertDialog.Builder = AlertDialog.Builder(context) - - val dialogClickListener = - DialogInterface.OnClickListener { _, which -> - when (which) { - DialogInterface.BUTTON_POSITIVE -> { - checkDuplicatesCallback.invoke(true, emptyList()) - } - - DialogInterface.BUTTON_NEGATIVE -> { - checkDuplicatesCallback.invoke(false, emptyList()) - } - - DialogInterface.BUTTON_NEUTRAL -> { - checkDuplicatesCallback.invoke(true, duplicateEntries.map { it.id }) - } - } - } - - builder.setTitle(R.string.duplicate_title) - .setMessage(message) - .setPositiveButton(R.string.duplicate_add, dialogClickListener) - .setNegativeButton(R.string.duplicate_cancel, dialogClickListener) - .setNeutralButton(replaceMessage, dialogClickListener) - .show().setDefaultFocus() - } - - private fun getImdbIdFromSyncData(syncData: Map?): String? { - return normalSafeApiCall { - readIdFromString( - syncData?.get(AccountManager.simklApi.idPrefix) - )[SimklSyncServices.Imdb] - } - } - - private fun getTMDbIdFromSyncData(syncData: Map?): String? { - return normalSafeApiCall { - readIdFromString( - syncData?.get(AccountManager.simklApi.idPrefix) - )[SimklSyncServices.Tmdb] - } + _subscribeStatus.postValue(!isSubscribed) + return !isSubscribed } private fun startChromecast( @@ -1297,7 +936,7 @@ class ResultViewModel2 : ViewModel() { private fun loadLinks( result: ResultEpisode, isVisible: Boolean, - type: LoadType, + isCasting: Boolean, clearCache: Boolean = false, work: suspend (CoroutineScope.(LinkLoadingResult) -> Unit) ) { @@ -1306,7 +945,7 @@ class ResultViewModel2 : ViewModel() { val links = loadLinks( result, isVisible = isVisible, - type = type, + isCasting = isCasting, clearCache = clearCache ) if (!this.isActive) return@ioSafe @@ -1317,20 +956,14 @@ class ResultViewModel2 : ViewModel() { private var currentLoadLinkJob: Job? = null private fun acquireSingleLink( result: ResultEpisode, - type: LoadType, + isCasting: Boolean, text: UiText, callback: (Pair) -> Unit, ) { - loadLinks(result, isVisible = true, type) { links -> - // Could not find a better way to do this - val context = AcraApplication.context + loadLinks(result, isVisible = true, isCasting = isCasting) { links -> postPopup( text, - links.links.apmap { - val size = - it.getVideoSize()?.let { size -> " " + formatFileSize(context, size) } ?: "" - txt("${it.name} ${Qualities.getStringByInt(it.quality)}$size") - }) { + links.links.map { txt("${it.name} ${Qualities.getStringByInt(it.quality)}") }) { callback.invoke(links to (it ?: return@postPopup)) } } @@ -1338,10 +971,11 @@ class ResultViewModel2 : ViewModel() { private fun acquireSingleSubtitle( result: ResultEpisode, + isCasting: Boolean, text: UiText, callback: (Pair) -> Unit, ) { - loadLinks(result, isVisible = true, type = LoadType.Unknown) { links -> + loadLinks(result, isVisible = true, isCasting = isCasting) { links -> postPopup( text, links.subs.map { txt(it.name) }) @@ -1354,7 +988,7 @@ class ResultViewModel2 : ViewModel() { private suspend fun CoroutineScope.loadLinks( result: ResultEpisode, isVisible: Boolean, - type: LoadType, + isCasting: Boolean, clearCache: Boolean = false, ): LinkLoadingResult { val tempGenerator = RepoLinkGenerator(listOf(result)) @@ -1368,7 +1002,7 @@ class ResultViewModel2 : ViewModel() { } try { updatePage() - tempGenerator.generateLinks(clearCache, type, { (link, _) -> + tempGenerator.generateLinks(clearCache, isCasting, { (link, _) -> if (link != null) { links += link updatePage() @@ -1388,7 +1022,7 @@ class ResultViewModel2 : ViewModel() { private fun launchActivity( activity: Activity?, - resumeApp: MainActivity.Companion.ResultResume, + resumeApp: ResultResume, id: Int? = null, work: suspend (Intent.(Activity) -> Unit) ): Job? { @@ -1557,13 +1191,6 @@ class ResultViewModel2 : ViewModel() { ) ) } - - if (FcastManager.currentDevices.isNotEmpty()) { - options.add( - txt(R.string.player_settings_play_in_fcast) to ACTION_FCAST - ) - } - options.add(txt(R.string.episode_action_play_in_app) to ACTION_PLAY_EPISODE_IN_PLAYER) for (app in apps) { @@ -1591,7 +1218,7 @@ class ResultViewModel2 : ViewModel() { // Do not add mark as watched on movies if (!listOf(TvType.Movie, TvType.AnimeMovie).contains(click.data.tvType)) { val isWatched = - getVideoWatchState(click.data.id) == VideoWatchState.Watched + DataStoreHelper.getVideoWatchState(click.data.id) == VideoWatchState.Watched val watchedText = if (isWatched) R.string.action_remove_from_watched else R.string.action_mark_as_watched @@ -1645,6 +1272,7 @@ class ResultViewModel2 : ViewModel() { acquireSingleSubtitle( click.data, + false, txt(R.string.episode_action_download_subtitle) ) { (links, index) -> downloadSubtitle( @@ -1689,7 +1317,7 @@ class ResultViewModel2 : ViewModel() { val response = currentResponse ?: return acquireSingleLink( click.data, - LoadType.InAppDownload, + false, txt(R.string.episode_action_download_mirror) ) { (result, index) -> ioSafe { @@ -1719,62 +1347,25 @@ class ResultViewModel2 : ViewModel() { loadLinks( click.data, isVisible = false, - type = LoadType.InApp, + isCasting = false, clearCache = true ) } - showToast( - R.string.links_reloaded_toast, - Toast.LENGTH_SHORT - ) } ACTION_CHROME_CAST_MIRROR -> { acquireSingleLink( click.data, - LoadType.Chromecast, + isCasting = true, txt(R.string.episode_action_chromecast_mirror) ) { (result, index) -> startChromecast(activity, click.data, result.links, result.subs, index) } } - ACTION_FCAST -> { - val devices = FcastManager.currentDevices.toList() - postPopup( - txt(R.string.player_settings_select_cast_device), - devices.map { txt(it.name) }) { index -> - if (index == null) return@postPopup - val device = devices.getOrNull(index) - - acquireSingleLink( - click.data, - LoadType.Fcast, - txt(R.string.episode_action_cast_mirror) - ) { (result, index) -> - val host = device?.host ?: return@acquireSingleLink - val link = result.links.getOrNull(index) ?: return@acquireSingleLink - - FcastSession(host).use { session -> - session.sendMessage( - Opcode.Play, - PlayMessage( - link.type.getMimeType(), - link.url, - headers = mapOf( - "referer" to link.referer, - "user-agent" to USER_AGENT - ) + link.headers - ) - ) - } - } - } - } - ACTION_PLAY_EPISODE_IN_BROWSER -> acquireSingleLink( click.data, - LoadType.Browser, + isCasting = true, txt(R.string.episode_action_play_in_browser) ) { (result, index) -> try { @@ -1789,11 +1380,17 @@ class ResultViewModel2 : ViewModel() { ACTION_COPY_LINK -> { acquireSingleLink( click.data, - LoadType.ExternalApp, + isCasting = true, txt(R.string.episode_action_copy_link) ) { (result, index) -> + val act = activity ?: return@acquireSingleLink + val serviceClipboard = + (act.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager?) + ?: return@acquireSingleLink val link = result.links[index] - clipboardHelper(txt(link.name), link.url) + val clip = ClipData.newPlainText(link.name, link.url) + serviceClipboard.setPrimaryClip(clip) + showToast(R.string.copy_link_toast, Toast.LENGTH_SHORT) } } @@ -1802,7 +1399,7 @@ class ResultViewModel2 : ViewModel() { } ACTION_PLAY_EPISODE_IN_VLC_PLAYER -> { - loadLinks(click.data, isVisible = true, LoadType.ExternalApp) { links -> + loadLinks(click.data, isVisible = true, isCasting = true) { links -> if (links.links.isEmpty()) { showToast(R.string.no_links_found_toast, Toast.LENGTH_SHORT) return@loadLinks @@ -1818,7 +1415,7 @@ class ResultViewModel2 : ViewModel() { ACTION_PLAY_EPISODE_IN_WEB_VIDEO -> acquireSingleLink( click.data, - LoadType.Chromecast, + isCasting = true, txt( R.string.episode_action_play_in_format, txt(R.string.player_settings_play_in_web) @@ -1835,7 +1432,7 @@ class ResultViewModel2 : ViewModel() { ACTION_PLAY_EPISODE_IN_MPV -> acquireSingleLink( click.data, - LoadType.Chromecast, + isCasting = true, txt( R.string.episode_action_play_in_format, txt(R.string.player_settings_play_in_mpv) @@ -1853,38 +1450,31 @@ class ResultViewModel2 : ViewModel() { val data = currentResponse?.syncData?.toList() ?: emptyList() val list = HashMap().apply { putAll(data) } - generator?.also { - it.getAll() // I know kinda shit to iterate all, but it is 100% sure to work - ?.indexOfFirst { value -> value is ResultEpisode && value.id == click.data.id } - ?.let { index -> - if (index >= 0) - it.goto(index) - } - } - if (currentResponse?.type == TvType.CustomMedia) { - generator?.generateLinks( - clearCache = true, - LoadType.Unknown, - callback = {}, - subtitleCallback = {}) - } else { - activity?.navigate( - R.id.global_to_navigation_player, - GeneratorPlayer.newInstance( - generator ?: return, list - ) + + activity?.navigate( + R.id.global_to_navigation_player, + GeneratorPlayer.newInstance( + generator?.also { + it.getAll() // I know kinda shit to iterate all, but it is 100% sure to work + ?.indexOfFirst { value -> value is ResultEpisode && value.id == click.data.id } + ?.let { index -> + if (index >= 0) + it.goto(index) + } + + } ?: return, list ) - } + ) } ACTION_MARK_AS_WATCHED -> { val isWatched = - getVideoWatchState(click.data.id) == VideoWatchState.Watched + DataStoreHelper.getVideoWatchState(click.data.id) == VideoWatchState.Watched if (isWatched) { - setVideoWatchState(click.data.id, VideoWatchState.None) + DataStoreHelper.setVideoWatchState(click.data.id, VideoWatchState.None) } else { - setVideoWatchState(click.data.id, VideoWatchState.Watched) + DataStoreHelper.setVideoWatchState(click.data.id, VideoWatchState.Watched) } // Kinda dirty to reload all episodes :( @@ -1950,12 +1540,7 @@ class ResultViewModel2 : ViewModel() { this.name, this.japName ).filter { it.length > 2 } - .distinct().map { - // this actually would be nice if we improved a bit as 3rd season == season 3 == III ect - // right now it just removes the dubbed status - it.lowercase().replace(Regex("""\(?[ds]ub(bed)?\)?(\s|$)"""), "") - .trim() - }, + .distinct(), // the reason why we filter is due to not wanting smth like " " or "?" TrackerType.getTypes(this.type), this.year ) @@ -2049,7 +1634,6 @@ class ResultViewModel2 : ViewModel() { postSuccessful( value ?: return@launchSafe, - currentId ?: return@launchSafe, currentRepo ?: return@launchSafe, updateEpisodes ?: return@launchSafe, false @@ -2095,7 +1679,7 @@ class ResultViewModel2 : ViewModel() { list.subList(start, end).map { val posDur = getViewPos(it.id) val watchState = - getVideoWatchState(it.id) ?: VideoWatchState.None + DataStoreHelper.getVideoWatchState(it.id) ?: VideoWatchState.None it.copy( position = posDur?.position ?: 0, duration = posDur?.duration ?: 0, @@ -2154,22 +1738,13 @@ class ResultViewModel2 : ViewModel() { } private fun postSubscription(loadResponse: LoadResponse) { - val id = loadResponse.getId() - val data = getSubscribedData(id) if (loadResponse.isEpisodeBased()) { - updateSubscribedData(id, data, loadResponse as? EpisodeResponse) - _subscribeStatus.postValue(data != null) + val id = loadResponse.getId() + val data = DataStoreHelper.getSubscribedData(id) + DataStoreHelper.updateSubscribedData(id, data, loadResponse as? EpisodeResponse) + val isSubscribed = data != null + _subscribeStatus.postValue(isSubscribed) } - // lets say that we have subscribed, then we must be able to unsubscribe no matter what - else if (data != null) { - _subscribeStatus.postValue(true) - } else _subscribeStatus.postValue(null) - } - - private fun postFavorites(loadResponse: LoadResponse) { - val id = loadResponse.getId() - val isFavorite = getFavoritesData(id) != null - _favoriteStatus.postValue(isFavorite) } private fun postEpisodeRange(indexer: EpisodeIndexer?, range: EpisodeRange?) { @@ -2302,29 +1877,25 @@ class ResultViewModel2 : ViewModel() { private suspend fun postSuccessful( loadResponse: LoadResponse, - mainId: Int, apiRepository: APIRepository, updateEpisodes: Boolean, updateFillers: Boolean, ) { - currentId = mainId currentResponse = loadResponse postPage(loadResponse, apiRepository) postSubscription(loadResponse) - postFavorites(loadResponse) - _watchStatus.postValue(getResultWatchState(mainId)) - if (updateEpisodes) - postEpisodes(loadResponse, mainId, updateFillers) + postEpisodes(loadResponse, updateFillers) } - private suspend fun postEpisodes( - loadResponse: LoadResponse, - mainId: Int, - updateFillers: Boolean - ) { + private suspend fun postEpisodes(loadResponse: LoadResponse, updateFillers: Boolean) { _episodes.postValue(Resource.Loading()) + val mainId = loadResponse.getId() + currentId = mainId + + _watchStatus.postValue(getResultWatchState(mainId)) + if (updateFillers && loadResponse is AnimeLoadResponse) { updateFillers(loadResponse.name) } @@ -2341,15 +1912,6 @@ class ResultViewModel2 : ViewModel() { val id = mainId + episode + idIndex * 1_000_000 + (i.season?.times(10_000) ?: 0) - - val totalIndex = - i.season?.let { season -> - loadResponse.getTotalEpisodeIndex( - episode, - season - ) - } - if (!existingEpisodes.contains(id)) { existingEpisodes.add(id) val seasonData = loadResponse.seasonNames.getSeason(i.season) @@ -2369,10 +1931,7 @@ class ResultViewModel2 : ViewModel() { i.description, fillers.getOrDefault(episode, false), loadResponse.type, - mainId, - totalIndex, - airDate = i.date, - runTime = i.runTime, + mainId ) val season = eps.seasonIndex ?: 0 @@ -2401,14 +1960,6 @@ class ResultViewModel2 : ViewModel() { val seasonData = loadResponse.seasonNames.getSeason(episode.season) - val totalIndex = - episode.season?.let { season -> - loadResponse.getTotalEpisodeIndex( - episodeIndex, - season - ) - } - val ep = buildResultEpisode( loadResponse.name, @@ -2425,10 +1976,7 @@ class ResultViewModel2 : ViewModel() { episode.description, null, loadResponse.type, - mainId, - totalIndex, - airDate = episode.date, - runTime = episode.runTime, + mainId ) val season = ep.seasonIndex ?: 0 @@ -2459,8 +2007,7 @@ class ResultViewModel2 : ViewModel() { null, null, loadResponse.type, - mainId, - null, + mainId ) ) } @@ -2482,8 +2029,7 @@ class ResultViewModel2 : ViewModel() { null, null, loadResponse.type, - mainId, - null + mainId ) ) } @@ -2505,8 +2051,7 @@ class ResultViewModel2 : ViewModel() { null, null, loadResponse.type, - mainId, - null + mainId ) ) } @@ -2567,13 +2112,13 @@ class ResultViewModel2 : ViewModel() { postResume() } - private fun postResume() { + fun postResume() { _resumeWatching.postValue(resume()) } private fun resume(): ResumeWatchingStatus? { val correctId = currentId ?: return null - val resume = getLastWatched(correctId) + val resume = DataStoreHelper.getLastWatched(correctId) val resumeParentId = resume?.parentId if (resumeParentId != correctId) return null // is null or smth went wrong with getLastWatched val resumeId = resume.episodeId ?: return null// invalid episode id @@ -2588,13 +2133,7 @@ class ResultViewModel2 : ViewModel() { ResumeProgress( progress = (viewPos.position / 1000).toInt(), maxProgress = (viewPos.duration / 1000).toInt(), - txt( - R.string.resume_remaining, - secondsToReadable( - ((viewPos.duration - viewPos.position) / 1_000).toInt(), - "0 mins" - ) - ) + txt(R.string.resume_time_left, (viewPos.duration - viewPos.position) / (60_000)) ) } @@ -2634,7 +2173,7 @@ class ResultViewModel2 : ViewModel() { trailerData.extractorUrl, trailerData.referer ?: "", Qualities.Unknown.value, - type = INFER_TYPE + trailerData.extractorUrl.contains(".m3u8") ) ) to arrayListOf() } else { @@ -2701,67 +2240,6 @@ class ResultViewModel2 : ViewModel() { } } - data class LoadResponseFromSearch( - override var name: String, - override var url: String, - override var apiName: String, - override var type: TvType, - override var posterUrl: String?, - override var year: Int? = null, - override var plot: String? = null, - override var rating: Int? = null, - override var tags: List? = null, - override var duration: Int? = null, - override var trailers: MutableList = mutableListOf(), - override var recommendations: List? = null, - override var actors: List? = null, - override var comingSoon: Boolean = false, - override var syncData: MutableMap = mutableMapOf(), - override var posterHeaders: Map? = null, - override var backgroundPosterUrl: String? = null, - override var contentRating: String? = null, - val id: Int?, - ) : LoadResponse - - fun loadSmall(searchResponse: SearchResponse) = ioSafe { - val url = searchResponse.url - _page.postValue(Resource.Loading(url)) - _episodes.postValue(Resource.Loading()) - val api = - APIHolder.getApiFromNameNull(searchResponse.apiName) ?: APIHolder.getApiFromUrlNull( - searchResponse.url - ) ?: APIRepository.noneApi - val repo = APIRepository(api) - val response = LoadResponseFromSearch( - name = searchResponse.name, - url = searchResponse.url, - apiName = api.name, - type = searchResponse.type ?: TvType.Others, - posterUrl = searchResponse.posterUrl, - id = searchResponse.id - ).apply { - if (searchResponse is SyncAPI.LibraryItem) { - this.plot = searchResponse.plot - this.rating = searchResponse.personalRating?.times(100) ?: searchResponse.rating - this.tags = searchResponse.tags - } - if (searchResponse is DataStoreHelper.BookmarkedData) { - this.plot = searchResponse.plot - this.rating = searchResponse.rating - this.tags = searchResponse.tags - } - } - val mainId = response.getId() - - postSuccessful( - loadResponse = response, - mainId = mainId, - apiRepository = repo, - updateEpisodes = false, - updateFillers = false - ) - } - fun load( activity: Activity?, url: String, @@ -2834,20 +2312,19 @@ class ResultViewModel2 : ViewModel() { DOWNLOAD_HEADER_CACHE, mainId.toString(), VideoDownloadHelper.DownloadHeaderCached( - apiName = apiName, - url = validUrl, - type = loadResponse.type, - name = loadResponse.name, - poster = loadResponse.posterUrl, - id = mainId, - cacheTime = System.currentTimeMillis(), + apiName, + validUrl, + loadResponse.type, + loadResponse.name, + loadResponse.posterUrl, + mainId, + System.currentTimeMillis(), ) ) if (loadTrailers) loadTrailers(data.value) postSuccessful( data.value, - mainId, updateEpisodes = true, updateFillers = showFillers, apiRepository = repo @@ -2861,4 +2338,4 @@ class ResultViewModel2 : ViewModel() { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt index 8752e275..6fe45730 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SelectAdaptor.kt @@ -6,8 +6,7 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import com.google.android.material.button.MaterialButton import com.lagradost.cloudstream3.databinding.ResultSelectionBinding -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings typealias SelectData = Pair @@ -63,7 +62,8 @@ class SelectAdaptor(val callback: (Any) -> Unit) : RecyclerView.Adapter Unit) : RecyclerView.Adapter Unit ) { - if (isLayout(TV)) { + val isTrueTv = isTrueTvSettings() + if (isTrueTv) { item.isFocusable = true item.isFocusableInTouchMode = true } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt index 51d3f50c..a3e2ed87 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/SyncViewModel.kt @@ -10,9 +10,7 @@ import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi -import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.simklApi import com.lagradost.cloudstream3.syncproviders.SyncAPI -import com.lagradost.cloudstream3.ui.SyncWatchType import com.lagradost.cloudstream3.utils.Coroutines.ioSafe import com.lagradost.cloudstream3.utils.SyncUtil import java.util.* @@ -33,15 +31,15 @@ class SyncViewModel : ViewModel() { private val repos = SyncApis - private val _metaResponse: MutableLiveData?> = - MutableLiveData(null) + private val _metaResponse: MutableLiveData> = + MutableLiveData() - val metadata: LiveData?> = _metaResponse + val metadata: LiveData> get() = _metaResponse private val _userDataResponse: MutableLiveData?> = MutableLiveData(null) - val userData: LiveData?> = _userDataResponse + val userData: LiveData?> get() = _userDataResponse // prefix, id private val syncs = mutableMapOf() @@ -57,7 +55,7 @@ class SyncViewModel : ViewModel() { MutableLiveData(getMissing()) // pair of name idPrefix isSynced - val synced: LiveData> = _currentSynced + val synced: LiveData> get() = _currentSynced private fun getMissing(): List { return repos.map { @@ -171,7 +169,7 @@ class SyncViewModel : ViewModel() { if (which < -1 || which > 5) return // validate input val user = userData.value if (user is Resource.Success) { - user.value.status = SyncWatchType.fromInternalId(which) + user.value.status = which _userDataResponse.postValue(Resource.Success(user.value)) } } @@ -281,33 +279,7 @@ class SyncViewModel : ViewModel() { setEpisodesDelta(0) } - fun syncName(syncName: String) : String? { - // fix because of bad old data :pensive: - val realName = when(syncName) { - "MAL" -> malApi.idPrefix - "Simkl" -> simklApi.idPrefix - "AniList" -> aniListApi.idPrefix - else -> syncName - } - return repos.firstOrNull { it.idPrefix == realName }?.idPrefix - } - - fun setSync(syncName : String, syncId : String) { - syncs.clear() - syncs[syncName] = syncId - } - - fun clear() { - syncs.clear() - _metaResponse.postValue(null) - _currentSynced.postValue(getMissing()) - _userDataResponse.postValue(null) - } - fun updateMetaAndUser() { - _userDataResponse.postValue(Resource.Loading()) - _metaResponse.postValue(Resource.Loading()) - Log.i(TAG, "updateMetaAndUser") updateMetadata() updateUserData() diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt index 70919943..24d56897 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/UiText.kt @@ -1,7 +1,6 @@ package com.lagradost.cloudstream3.ui.result import android.content.Context -import android.graphics.Bitmap import android.util.Log import android.widget.ImageView import android.widget.TextView @@ -10,7 +9,7 @@ import androidx.annotation.StringRes import androidx.core.view.isGone import androidx.core.view.isVisible import com.lagradost.cloudstream3.mvvm.logError -import com.lagradost.cloudstream3.utils.AppContextUtils.html +import com.lagradost.cloudstream3.utils.AppUtils.html import com.lagradost.cloudstream3.utils.UIHelper.setImage sealed class UiText { @@ -20,13 +19,6 @@ sealed class UiText { data class DynamicString(val value: String) : UiText() { override fun toString(): String = value - - override fun equals(other: Any?): Boolean { - if (other !is DynamicString) return false - return this.value == other.value - } - - override fun hashCode(): Int = value.hashCode() } class StringResource( @@ -35,16 +27,6 @@ sealed class UiText { ) : UiText() { override fun toString(): String = "resId = $resId\nargs = ${args.toList().map { "(${it::class} = $it)" }}" - override fun equals(other: Any?): Boolean { - if (other !is StringResource) return false - return this.resId == other.resId && this.args == other.args - } - - override fun hashCode(): Int { - var result = resId - result = 31 * result + args.hashCode() - return result - } } fun asStringNull(context: Context?): String? { @@ -85,14 +67,12 @@ sealed class UiImage { ) : UiImage() data class Drawable(@DrawableRes val resId: Int) : UiImage() - data class Bitmap(val bitmap: android.graphics.Bitmap) : UiImage() } fun ImageView?.setImage(value: UiImage?, fadeIn: Boolean = true) { when (value) { is UiImage.Image -> setImageImage(value, fadeIn) is UiImage.Drawable -> setImageDrawable(value) - is UiImage.Bitmap -> setImageBitmap(value) null -> { this?.isVisible = false } @@ -110,12 +90,6 @@ fun ImageView?.setImageDrawable(value: UiImage.Drawable) { this.setImage(UiImage.Drawable(value.resId)) } -fun ImageView?.setImageBitmap(value: UiImage.Bitmap) { - if (this == null) return - this.isVisible = true - this.setImageBitmap(value.bitmap) -} - @JvmName("imgNull") fun img( url: String?, @@ -138,10 +112,6 @@ fun img(@DrawableRes drawable: Int): UiImage { return UiImage.Drawable(drawable) } -fun img(bitmap: Bitmap): UiImage { - return UiImage.Bitmap(bitmap) -} - fun txt(value: String): UiText { return UiText.DynamicString(value) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt index f318401c..b516348d 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchAdaptor.kt @@ -11,7 +11,7 @@ import com.lagradost.cloudstream3.SearchResponse import com.lagradost.cloudstream3.databinding.SearchResultGridBinding import com.lagradost.cloudstream3.databinding.SearchResultGridExpandedBinding import com.lagradost.cloudstream3.ui.AutofitRecyclerView -import com.lagradost.cloudstream3.utils.UIHelper.isBottomLayout +import com.lagradost.cloudstream3.utils.UIHelper.IsBottomLayout import com.lagradost.cloudstream3.utils.UIHelper.toPx import kotlin.math.roundToInt @@ -41,7 +41,7 @@ class SearchAdapter( val inflater = LayoutInflater.from(parent.context) val layout = - if (parent.context.isBottomLayout()) SearchResultGridExpandedBinding.inflate( + if (parent.context.IsBottomLayout()) SearchResultGridExpandedBinding.inflate( inflater, parent, false @@ -83,7 +83,8 @@ class SearchAdapter( diffResult.dispatchUpdatesTo(this) } - class CardViewHolder( + class CardViewHolder + constructor( val binding: ViewBinding, private val clickCallback: (SearchClickCallback) -> Unit, resView: AutofitRecyclerView diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt index ef10fcee..bdf82377 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt @@ -3,7 +3,6 @@ package com.lagradost.cloudstream3.ui.search import android.content.DialogInterface import android.content.res.Configuration import android.os.Bundle -import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -12,7 +11,6 @@ import android.widget.AbsListView import android.widget.ArrayAdapter import android.widget.ImageView import android.widget.ListView -import android.widget.TextView import androidx.appcompat.app.AlertDialog import androidx.appcompat.widget.SearchView import androidx.core.view.isVisible @@ -24,25 +22,23 @@ import androidx.recyclerview.widget.RecyclerView import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.button.MaterialButton +import com.lagradost.cloudstream3.* +import com.lagradost.cloudstream3.APIHolder.filterProviderByPreferredMedia +import com.lagradost.cloudstream3.APIHolder.filterSearchResultByFilmQuality import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull +import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings +import com.lagradost.cloudstream3.APIHolder.getApiSettings +import com.lagradost.cloudstream3.AcraApplication.Companion.getKey import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys -import com.lagradost.cloudstream3.AllLanguagesName -import com.lagradost.cloudstream3.AnimeSearchResponse -import com.lagradost.cloudstream3.HomePageList -import com.lagradost.cloudstream3.MainAPI -import com.lagradost.cloudstream3.MainActivity +import com.lagradost.cloudstream3.AcraApplication.Companion.setKey import com.lagradost.cloudstream3.MainActivity.Companion.afterPluginsLoadedEvent -import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.SearchResponse -import com.lagradost.cloudstream3.TvType import com.lagradost.cloudstream3.databinding.FragmentSearchBinding import com.lagradost.cloudstream3.databinding.HomeSelectMainpageBinding import com.lagradost.cloudstream3.mvvm.Resource import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.mvvm.observe import com.lagradost.cloudstream3.ui.APIRepository -import com.lagradost.cloudstream3.ui.BaseAdapter import com.lagradost.cloudstream3.ui.home.HomeFragment import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.currentSpan @@ -51,19 +47,14 @@ import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.updateChips import com.lagradost.cloudstream3.ui.home.ParentItemAdapter import com.lagradost.cloudstream3.ui.result.FOCUS_SELF import com.lagradost.cloudstream3.ui.result.setLinearListLayout -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia -import com.lagradost.cloudstream3.utils.AppContextUtils.filterSearchResultByFilmQuality -import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings -import com.lagradost.cloudstream3.utils.AppContextUtils.getApiSettings -import com.lagradost.cloudstream3.utils.AppContextUtils.ownHide -import com.lagradost.cloudstream3.utils.AppContextUtils.ownShow -import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings +import com.lagradost.cloudstream3.utils.AppUtils.ownHide +import com.lagradost.cloudstream3.utils.AppUtils.ownShow +import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus import com.lagradost.cloudstream3.utils.Coroutines.main -import com.lagradost.cloudstream3.utils.DataStoreHelper -import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount +import com.lagradost.cloudstream3.utils.DataStore.getKey +import com.lagradost.cloudstream3.utils.DataStore.setKey import com.lagradost.cloudstream3.utils.SubtitleHelper import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar @@ -71,6 +62,9 @@ import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard import java.util.concurrent.locks.ReentrantLock +const val SEARCH_PREF_TAGS = "search_pref_tags" +const val SEARCH_PREF_PROVIDERS = "search_pref_providers" + class SearchFragment : Fragment() { companion object { fun List.filterSearchResponse(): List { @@ -109,16 +103,13 @@ class SearchFragment : Fragment() { ) bottomSheetDialog?.ownShow() + val layout = if (isTvSettings()) R.layout.fragment_search_tv else R.layout.fragment_search - binding = try { - val layout = if (isLayout(TV or EMULATOR)) R.layout.fragment_search_tv else R.layout.fragment_search - val root = inflater.inflate(layout, container, false) - FragmentSearchBinding.bind(root) - } catch (t : Throwable) { - FragmentSearchBinding.inflate(inflater) - } + val root = inflater.inflate(layout, container, false) + // TODO TRYCATCH + binding = FragmentSearchBinding.bind(root) - return binding?.root + return root } private fun fixGrid() { @@ -162,8 +153,7 @@ class SearchFragment : Fragment() { **/ fun search(query: String?) { if (query == null) return - // don't resume state from prev search - (binding?.searchMasterRecycler?.adapter as? BaseAdapter<*,*>)?.clear() + context?.let { ctx -> val default = enumValues().sorted().filter { it != TvType.NSFW } .map { it.ordinal.toString() }.toSet() @@ -203,7 +193,7 @@ class SearchFragment : Fragment() { validAPIs.flatMap { api -> api.supportedTypes }.distinct() ) { list -> if (selectedSearchTypes.toSet() != list.toSet()) { - DataStoreHelper.searchPreferenceTags = list + setKey(SEARCH_PREF_TAGS, selectedSearchTypes) selectedSearchTypes.clear() selectedSearchTypes.addAll(list) search(binding?.mainSearch?.query?.toString()) @@ -229,7 +219,7 @@ class SearchFragment : Fragment() { SearchHelper.handleSearchClickCallback(callback) } - searchRoot.findViewById(R.id.search_src_text)?.tag = "tv_no_focus_tag" + searchAutofitResults.adapter = adapter searchLoadingBar.alpha = 0f } @@ -238,17 +228,17 @@ class SearchFragment : Fragment() { val searchExitIcon = binding?.mainSearch?.findViewById(androidx.appcompat.R.id.search_close_btn) // val searchMagIcon = - // binding?.mainSearch?.findViewById(androidx.appcompat.R.id.search_mag_icon) - // searchMagIcon.scaleX = 0.65f - // searchMagIcon.scaleY = 0.65f + // main_search.findViewById(androidx.appcompat.R.id.search_mag_icon) + //searchMagIcon.scaleX = 0.65f + //searchMagIcon.scaleY = 0.65f - // Set the color for the search exit icon to the correct theme text color - val searchExitIconColor = TypedValue() - - activity?.theme?.resolveAttribute(android.R.attr.textColor, searchExitIconColor, true) - searchExitIcon?.setColorFilter(searchExitIconColor.data) - - selectedApis = DataStoreHelper.searchPreferenceProviders.toMutableSet() + context?.let { ctx -> + val validAPIs = ctx.filterProviderByPreferredMedia() + selectedApis = ctx.getKey( + SEARCH_PREF_PROVIDERS, + defVal = validAPIs.map { it.name } + )!!.toMutableSet() + } binding?.searchFilter?.setOnClickListener { searchView -> searchView?.context?.let { ctx -> @@ -262,17 +252,14 @@ class SearchFragment : Fragment() { builder.behavior.state = BottomSheetBehavior.STATE_EXPANDED - val selectMainpageBinding: HomeSelectMainpageBinding = HomeSelectMainpageBinding.inflate( + val binding: HomeSelectMainpageBinding = HomeSelectMainpageBinding.inflate( builder.layoutInflater, null, false ) - builder.setContentView(selectMainpageBinding.root) + builder.setContentView(binding.root) builder.show() builder.let { dialog -> - val previousSelectedApis = selectedApis.toSet() - val previousSelectedSearchTypes = selectedSearchTypes.toSet() - val isMultiLang = ctx.getApiProviderLangSettings().let { set -> set.size > 1 || set.contains(AllLanguagesName) } @@ -299,7 +286,7 @@ class SearchFragment : Fragment() { } fun updateList(types: List) { - DataStoreHelper.searchPreferenceTags = types + setKey(SEARCH_PREF_TAGS, types.map { it.name }) arrayAdapter.clear() currentValidApis = validAPIs.filter { api -> @@ -324,23 +311,21 @@ class SearchFragment : Fragment() { arrayAdapter.notifyDataSetChanged() } + val selectedSearchTypes = getKey>(SEARCH_PREF_TAGS) + ?.mapNotNull { listName -> + TvType.values().firstOrNull { it.name == listName } + } + ?.toMutableList() + ?: mutableListOf(TvType.Movie, TvType.TvSeries) + bindChips( - selectMainpageBinding.tvtypesChipsScroll.tvtypesChips, + binding.tvtypesChipsScroll.tvtypesChips, selectedSearchTypes, - validAPIs.flatMap { api -> api.supportedTypes }.distinct() + TvType.values().toList() ) { list -> updateList(list) - - // refresh selected chips in main chips - if (selectedSearchTypes.toSet() != list.toSet()) { - selectedSearchTypes.clear() - selectedSearchTypes.addAll(list) - updateChips(binding?.tvtypesChipsScroll?.tvtypesChips, selectedSearchTypes) - - } } - cancelBtt?.setOnClickListener { dialog.dismissSafe() } @@ -357,13 +342,8 @@ class SearchFragment : Fragment() { } dialog.setOnDismissListener { - DataStoreHelper.searchPreferenceProviders = currentSelectedApis.toList() + context?.setKey(SEARCH_PREF_PROVIDERS, currentSelectedApis.toList()) selectedApis = currentSelectedApis - - // run search when dialog is close - if(previousSelectedApis != selectedApis.toSet() || previousSelectedSearchTypes != selectedSearchTypes.toSet()) { - search(binding?.mainSearch?.query?.toString()) - } } updateList(selectedSearchTypes.toList()) } @@ -373,9 +353,12 @@ class SearchFragment : Fragment() { val settingsManager = context?.let { PreferenceManager.getDefaultSharedPreferences(it) } val isAdvancedSearch = settingsManager?.getBoolean("advanced_search", true) ?: true - selectedSearchTypes = DataStoreHelper.searchPreferenceTags.toMutableList() + selectedSearchTypes = context?.getKey>(SEARCH_PREF_TAGS) + ?.mapNotNull { listName -> TvType.values().firstOrNull { it.name == listName } } + ?.toMutableList() + ?: mutableListOf(TvType.Movie, TvType.TvSeries) - if (isLayout(TV)) { + if (isTrueTvSettings()) { binding?.searchFilter?.isFocusable = true binding?.searchFilter?.isFocusableInTouchMode = true } @@ -415,7 +398,7 @@ class SearchFragment : Fragment() { DialogInterface.OnClickListener { _, which -> when (which) { DialogInterface.BUTTON_POSITIVE -> { - removeKeys("$currentAccount/$SEARCH_HISTORY_KEY") + removeKeys(SEARCH_HISTORY_KEY) searchViewModel.updateHistory() } DialogInterface.BUTTON_NEGATIVE -> { @@ -508,8 +491,8 @@ class SearchFragment : Fragment() { }*/ //main_search.onActionViewExpanded()*/ - val masterAdapter = - ParentItemAdapter(fragment = this, id = "masterAdapter".hashCode(), { callback -> + val masterAdapter: RecyclerView.Adapter = + ParentItemAdapter(mutableListOf(), { callback -> SearchHelper.handleSearchClickCallback(callback) }, { item -> bottomSheetDialog = activity?.loadHomepageList(item, dismissCallback = { @@ -527,7 +510,7 @@ class SearchFragment : Fragment() { binding?.mainSearch?.setQuery(searchItem.searchText, true) } SEARCH_HISTORY_REMOVE -> { - removeKey("$currentAccount/$SEARCH_HISTORY_KEY", searchItem.key) + removeKey(SEARCH_HISTORY_KEY, searchItem.key) searchViewModel.updateHistory() } else -> { @@ -576,4 +559,4 @@ class SearchFragment : Fragment() { .commit()*/ } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt index ef1b8719..3e33e01a 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHelper.kt @@ -1,5 +1,6 @@ package com.lagradost.cloudstream3.ui.search +import android.app.Activity import android.widget.Toast import com.lagradost.cloudstream3.CommonActivity.activity import com.lagradost.cloudstream3.CommonActivity.showToast @@ -9,9 +10,8 @@ import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_PLAY_FILE import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick import com.lagradost.cloudstream3.ui.download.DownloadClickEvent import com.lagradost.cloudstream3.ui.result.START_ACTION_LOAD_EP -import com.lagradost.cloudstream3.ui.settings.Globals.PHONE -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.AppContextUtils.loadSearchResult +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings +import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult import com.lagradost.cloudstream3.utils.DataStoreHelper import com.lagradost.cloudstream3.utils.VideoDownloadHelper @@ -25,7 +25,7 @@ object SearchHelper { SEARCH_ACTION_PLAY_FILE -> { if (card is DataStoreHelper.ResumeWatchingResult) { val id = card.id - if (id == null) { + if(id == null) { showToast(R.string.error_invalid_id, Toast.LENGTH_SHORT) } else { if (card.isFromDownload) { @@ -33,15 +33,15 @@ object SearchHelper { DownloadClickEvent( DOWNLOAD_ACTION_PLAY_FILE, VideoDownloadHelper.DownloadEpisodeCached( - name = card.name, - poster = card.posterUrl, - episode = card.episode ?: 0, - season = card.season, - id = id, - parentId = card.parentId ?: return, - rating = null, - description = null, - cacheTime = System.currentTimeMillis(), + card.name, + card.posterUrl, + card.episode ?: 0, + card.season, + id, + card.parentId ?: return, + null, + null, + System.currentTimeMillis() ) ) ) @@ -56,7 +56,7 @@ object SearchHelper { } } SEARCH_ACTION_SHOW_METADATA -> { - if(isLayout(PHONE)) { // we only want this on phone as UI is not done yet on tv + if(!isTvSettings()) { // we only want this on phone as UI is not done yet on tv (activity as? MainActivity?)?.apply { loadPopup(callback.card) } ?: kotlin.run { diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHistoryAdaptor.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHistoryAdaptor.kt index 4ef5fa69..0a2ecb81 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHistoryAdaptor.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchHistoryAdaptor.kt @@ -1,11 +1,16 @@ package com.lagradost.cloudstream3.ui.search import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import com.fasterxml.jackson.annotation.JsonProperty +import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.TvType +import com.lagradost.cloudstream3.databinding.AccountSingleBinding import com.lagradost.cloudstream3.databinding.SearchHistoryItemBinding data class SearchHistoryItem( @@ -58,7 +63,8 @@ class SearchHistoryAdaptor( diffResult.dispatchUpdatesTo(this) } - class CardViewHolder( + class CardViewHolder + constructor( val binding: SearchHistoryItemBinding, private val clickCallback: (SearchHistoryCallback) -> Unit, ) : diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt index 92575e58..e1b72b30 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchResultBuilder.kt @@ -1,6 +1,5 @@ package com.lagradost.cloudstream3.ui.search -import android.annotation.SuppressLint import android.content.Context import android.view.View import android.widget.ImageView @@ -18,9 +17,8 @@ import com.lagradost.cloudstream3.SearchQuality import com.lagradost.cloudstream3.SearchResponse import com.lagradost.cloudstream3.isMovieType import com.lagradost.cloudstream3.syncproviders.SyncAPI -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.AppContextUtils.getNameFull +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings +import com.lagradost.cloudstream3.utils.AppUtils.getNameFull import com.lagradost.cloudstream3.utils.DataStoreHelper import com.lagradost.cloudstream3.utils.DataStoreHelper.fixVisual import com.lagradost.cloudstream3.utils.SubtitleHelper @@ -38,12 +36,16 @@ object SearchResultBuilder { } } - @SuppressLint("StringFormatInvalid") + /** + * @param nextFocusBehavior True if first, False if last, Null if between. + * Used to prevent escaping the adapter horizontally (focus wise). + */ fun bind( clickCallback: (SearchClickCallback) -> Unit, card: SearchResponse, position: Int, itemView: View, + nextFocusBehavior: Boolean? = null, nextFocusUp: Int? = null, nextFocusDown: Int? = null, colorCallback : ((Palette) -> Unit)? = null @@ -162,7 +164,7 @@ object SearchResultBuilder { bg.isFocusable = false bg.isFocusableInTouchMode = false - if(!isLayout(TV)) { + if(!isTrueTvSettings()) { bg.setOnClickListener { click(it) } @@ -205,7 +207,7 @@ object SearchResultBuilder { */ - if (isLayout(TV)) { + if (isTrueTvSettings()) { // bg.isFocusable = true // bg.isFocusableInTouchMode = true // bg.touchscreenBlocksFocus = false diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt index 839b9d3f..320687f8 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchViewModel.kt @@ -14,7 +14,6 @@ import com.lagradost.cloudstream3.mvvm.Resource import com.lagradost.cloudstream3.mvvm.launchSafe import com.lagradost.cloudstream3.ui.APIRepository import com.lagradost.cloudstream3.utils.Coroutines.ioSafe -import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.launch @@ -65,7 +64,7 @@ class SearchViewModel : ViewModel() { fun updateHistory() = viewModelScope.launch { ioSafe { - val items = getKeys("$currentAccount/$SEARCH_HISTORY_KEY")?.mapNotNull { + val items = getKeys(SEARCH_HISTORY_KEY)?.mapNotNull { getKey(it) }?.sortedByDescending { it.searchedAt } ?: emptyList() _currentHistory.postValue(items) @@ -88,7 +87,7 @@ class SearchViewModel : ViewModel() { if (!isQuickSearch) { val key = query.hashCode().toString() setKey( - "$currentAccount/$SEARCH_HISTORY_KEY", + SEARCH_HISTORY_KEY, key, SearchHistoryItem( searchedAt = System.currentTimeMillis(), @@ -141,4 +140,4 @@ class SearchViewModel : ViewModel() { _searchResponse.postValue(Resource.Success(list)) } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SyncSearchViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SyncSearchViewModel.kt index 71077e91..9e03079f 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SyncSearchViewModel.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SyncSearchViewModel.kt @@ -3,9 +3,11 @@ package com.lagradost.cloudstream3.ui.search import com.lagradost.cloudstream3.SearchQuality import com.lagradost.cloudstream3.SearchResponse import com.lagradost.cloudstream3.TvType +import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.SyncApis -//TODO Relevance of this class since it's not used class SyncSearchViewModel { + private val repos = SyncApis + data class SyncSearchResultSearchResponse( override val name: String, override val url: String, diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/AccountAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/AccountAdapter.kt index d7bd69f1..1dc79dc0 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/AccountAdapter.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/AccountAdapter.kt @@ -1,6 +1,5 @@ package com.lagradost.cloudstream3.ui.settings -import android.annotation.SuppressLint import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -14,7 +13,7 @@ import com.lagradost.cloudstream3.utils.UIHelper.setImage class AccountClickCallback(val action: Int, val view: View, val card: AuthAPI.LoginInfo) class AccountAdapter( - private val cardList: List, + val cardList: List, private val clickCallback: (AccountClickCallback) -> Unit ) : RecyclerView.Adapter() { @@ -43,12 +42,12 @@ class AccountAdapter( return cardList[position].accountIndex.toLong() } - class CardViewHolder(val binding: AccountSingleBinding, private val clickCallback: (AccountClickCallback) -> Unit) : + class CardViewHolder + constructor(val binding: AccountSingleBinding, private val clickCallback: (AccountClickCallback) -> Unit) : RecyclerView.ViewHolder(binding.root) { // private val pfp: ImageView = itemView.findViewById(R.id.account_profile_picture)!! // private val accountName: TextView = itemView.findViewById(R.id.account_name)!! - @SuppressLint("StringFormatInvalid") fun bind(card: AuthAPI.LoginInfo) { // just in case name is null account index will show, should never happened binding.accountName.text = card.name ?: "%s %d".format( diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt deleted file mode 100644 index aa513d87..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt +++ /dev/null @@ -1,56 +0,0 @@ -package com.lagradost.cloudstream3.ui.settings - -import android.app.UiModeManager -import android.content.Context -import android.content.res.Configuration -import android.os.Build -import androidx.preference.PreferenceManager -import com.lagradost.cloudstream3.R - -object Globals { - var beneneCount = 0 - - const val PHONE : Int = 0b001 - const val TV : Int = 0b010 - const val EMULATOR : Int = 0b100 - private const val INVALID = -1 - private var layoutId = INVALID - - private fun Context.getLayoutInt(): Int { - val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) - return settingsManager.getInt(this.getString(R.string.app_layout_key), -1) - } - - private fun Context.isAutoTv(): Boolean { - val uiModeManager = getSystemService(Context.UI_MODE_SERVICE) as UiModeManager? - // AFT = Fire TV - val model = Build.MODEL.lowercase() - return uiModeManager?.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION || Build.MODEL.contains( - "AFT" - ) || model.contains("firestick") || model.contains("fire tv") || model.contains("chromecast") - } - - private fun Context.layoutIntCorrected(): Int { - return when(getLayoutInt()) { - -1 -> if (isAutoTv()) TV else PHONE - 0 -> PHONE - 1 -> TV - 2 -> EMULATOR - else -> PHONE - } - } - - fun Context.updateTv() { - layoutId = layoutIntCorrected() - } - - /** Returns true if the layout is any of the flags, - * so isLayout(TV or EMULATOR) is a valid statement for checking if the layout is in the emulator - * or tv. Auto will become the "TV" or the "PHONE" layout. - * - * Valid flags are: PHONE, TV, EMULATOR - * */ - fun isLayout(flags: Int) : Boolean { - return (layoutId and flags) != 0 - } -} diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt index 15f8735f..b3225d5c 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt @@ -1,10 +1,8 @@ package com.lagradost.cloudstream3.ui.settings -import android.graphics.Bitmap import android.os.Bundle -import android.os.CountDownTimer import android.view.View -import android.view.View.FOCUS_DOWN +import android.view.View.* import android.view.inputmethod.EditorInfo import android.widget.TextView import androidx.annotation.UiThread @@ -13,58 +11,32 @@ import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.fragment.app.FragmentActivity import androidx.preference.PreferenceFragmentCompat -import androidx.preference.PreferenceManager -import androidx.preference.SwitchPreferenceCompat import androidx.recyclerview.widget.RecyclerView import com.lagradost.cloudstream3.AcraApplication.Companion.openBrowser -import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent import com.lagradost.cloudstream3.CommonActivity.showToast import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.databinding.AccountManagmentBinding import com.lagradost.cloudstream3.databinding.AccountSwitchBinding import com.lagradost.cloudstream3.databinding.AddAccountInputBinding -import com.lagradost.cloudstream3.databinding.DeviceAuthBinding import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.syncproviders.AccountManager import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.malApi import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.openSubtitlesApi import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.simklApi -import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.subDlApi import com.lagradost.cloudstream3.syncproviders.AuthAPI import com.lagradost.cloudstream3.syncproviders.InAppAuthAPI import com.lagradost.cloudstream3.syncproviders.OAuth2API -import com.lagradost.cloudstream3.ui.result.img -import com.lagradost.cloudstream3.ui.result.setImage -import com.lagradost.cloudstream3.ui.result.setText -import com.lagradost.cloudstream3.ui.result.txt -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.PHONE -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref -import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom -import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar -import com.lagradost.cloudstream3.utils.AppContextUtils.html -import com.lagradost.cloudstream3.utils.BackupUtils -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.BiometricCallback -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.authCallback -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.biometricPrompt -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.deviceHasPasswordPinLock -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.isAuthEnabled -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.promptInfo -import com.lagradost.cloudstream3.utils.BiometricAuthenticator.startBiometricAuthentication import com.lagradost.cloudstream3.utils.Coroutines.ioSafe -import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogText -import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard import com.lagradost.cloudstream3.utils.UIHelper.setImage -import qrcode.QRCode -class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback { +class SettingsAccount : PreferenceFragmentCompat() { companion object { /** Used by nginx plugin too */ fun showLoginInfo( @@ -98,7 +70,7 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback { showAccountSwitch(activity, api) } - if (isLayout(TV or EMULATOR)) { + if (isTvSettings()) { binding.accountSwitchAccount.requestFocus() } } @@ -143,109 +115,7 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback { try { when (api) { is OAuth2API -> { - if (isLayout(PHONE) || !api.supportDeviceAuth) { - api.authenticate(activity) - } else if (api.supportDeviceAuth && activity != null) { - - val binding: DeviceAuthBinding = - DeviceAuthBinding.inflate(activity.layoutInflater, null, false) - - val builder = - AlertDialog.Builder(activity) - .setView(binding.root) - - builder.apply { - setNegativeButton(R.string.cancel) { _, _ -> } - setPositiveButton(R.string.auth_locally) { _, _ -> - api.authenticate(activity) - } - } - - val dialog = builder.create() - - ioSafe { - try { - val pinCodeData = api.getDevicePin() - if (pinCodeData == null) { - showToast(R.string.device_pin_error_message) - api.authenticate(activity) - return@ioSafe - } - - /*val logoBytes = ContextCompat.getDrawable( - activity, - R.drawable.cloud_2_solid - )?.toBitmapOrNull()?.let { bitmap -> - val csLogo = ByteArrayOutputStream() - bitmap.compress(Bitmap.CompressFormat.PNG, 100, csLogo) - csLogo.toByteArray() - }*/ - - val qrCodeImage = QRCode.ofRoundedSquares() - .withColor(activity.colorFromAttribute(R.attr.textColor)) - .withBackgroundColor(activity.colorFromAttribute(R.attr.primaryBlackBackground)) - //.withLogo(logoBytes, 200.toPx, 200.toPx) //For later if logo needed anytime - .build(pinCodeData.verificationUrl) - .render().nativeImage() as Bitmap - - activity.runOnUiThread { - dialog.show() - binding.apply { - devicePinCode.setText(txt(pinCodeData.userCode)) - deviceAuthMessage.setText( - txt( - R.string.device_pin_url_message, - pinCodeData.verificationUrl - ) - ) - deviceAuthQrcode.setImage( - img(qrCodeImage) - ) - } - - val expirationMillis = - pinCodeData.expiresIn.times(1000).toLong() - - object : CountDownTimer(expirationMillis, 1000) { - - override fun onTick(millisUntilFinished: Long) { - val secondsUntilFinished = - millisUntilFinished.div(1000).toInt() - - binding.deviceAuthValidationCounter.setText( - txt( - R.string.device_pin_counter_text, - secondsUntilFinished.div(60), - secondsUntilFinished.rem(60) - ) - ) - - ioSafe { - if (secondsUntilFinished.rem(pinCodeData.interval) == 0 && api.handleDeviceAuth(pinCodeData)) { - showToast( - txt( - R.string.authenticated_user, - api.name - ) - ) - dialog.dismissSafe(activity) - cancel() - } - } - } - - override fun onFinish() { - showToast(R.string.device_pin_expired_message) - dialog.dismissSafe(activity) - } - - }.start() - } - } catch (e: Exception) { - logError(e) - } - } - } + api.authenticate(activity) } is InAppAuthAPI -> { @@ -264,7 +134,7 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback { binding.loginUsernameInput to api.requiresUsername ) - if (isLayout(TV or EMULATOR)) { + if (isTvSettings()) { visibilityMap.forEach { (input, isVisible) -> input.isVisible = isVisible @@ -338,15 +208,23 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback { server = if (api.requiresServer) binding.loginServerInput.text?.toString() else null, ) ioSafe { - try { - showToast( - txt( - if (api.login(loginData)) R.string.authenticated_user else R.string.authenticated_user_fail, - api.name - ) - ) + val isSuccessful = try { + api.login(loginData) } catch (e: Exception) { logError(e) + false + } + activity.runOnUiThread { + try { + showToast( + activity.getString(if (isSuccessful) R.string.authenticated_user else R.string.authenticated_user_fail) + .format( + api.name + ) + ) + } catch (e: Exception) { + logError(e) // format might fail + } } } dialog.dismissSafe(activity) @@ -366,75 +244,28 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback { } } - private fun updateAuthPreference(enabled: Boolean) { - val biometricKey = getString(R.string.biometric_key) - - PreferenceManager.getDefaultSharedPreferences(context ?: return).edit() - .putBoolean(biometricKey, enabled).apply() - findPreference(biometricKey)?.isChecked = enabled - } - - override fun onAuthenticationError() { - updateAuthPreference(!isAuthEnabled(context ?: return)) - } - - override fun onAuthenticationSuccess() { - if (isAuthEnabled(context?: return)) { - updateAuthPreference(true) - BackupUtils.backup(activity) - activity?.showBottomDialogText( - getString(R.string.biometric_setting), - getString(R.string.biometric_warning).html() - ) { onDialogDismissedEvent } - } else { - updateAuthPreference(false) - } - } - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setUpToolbar(R.string.category_account) setPaddingBottom() - setToolBarScrollFlags() } override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { hideKeyboard() setPreferencesFromResource(R.xml.settings_account, rootKey) - //Hides the security category on TV as it's only Biometric for now - getPref(R.string.pref_category_security_key)?.hideOn(TV or EMULATOR) - - getPref(R.string.biometric_key)?.hideOn(TV or EMULATOR)?.setOnPreferenceClickListener { - val ctx = context ?: return@setOnPreferenceClickListener false - - if (deviceHasPasswordPinLock(ctx)) { - startBiometricAuthentication( - activity?: return@setOnPreferenceClickListener false, - R.string.biometric_authentication_title, - false - ) - promptInfo?.let { - authCallback = this - biometricPrompt?.authenticate(it) - } - } - - false - } - val syncApis = listOf( R.string.mal_key to malApi, R.string.anilist_key to aniListApi, R.string.simkl_key to simklApi, R.string.opensubtitles_key to openSubtitlesApi, - R.string.subdl_key to subDlApi, ) for ((key, api) in syncApis) { getPref(key)?.apply { - title = api.name + title = + getString(R.string.login_format).format(api.name, getString(R.string.account)) setOnPreferenceClickListener { val info = api.loginInfo() if (info != null) { diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt index 88335eea..e53fa91a 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt @@ -1,46 +1,39 @@ package com.lagradost.cloudstream3.ui.settings +import android.app.UiModeManager +import android.content.Context +import android.content.res.Configuration +import android.os.Build import android.os.Bundle -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ImageView import androidx.annotation.StringRes import androidx.core.view.children -import androidx.core.view.updateLayoutParams +import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import com.google.android.material.appbar.AppBarLayout +import androidx.preference.PreferenceManager import com.google.android.material.appbar.MaterialToolbar -import com.lagradost.cloudstream3.BuildConfig import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.databinding.MainSettingsBinding import com.lagradost.cloudstream3.mvvm.logError -import com.lagradost.cloudstream3.syncproviders.AccountManager import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.accountManagers import com.lagradost.cloudstream3.ui.home.HomeFragment -import com.lagradost.cloudstream3.ui.result.txt -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.PHONE -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.DataStoreHelper -import com.lagradost.cloudstream3.utils.UIHelper -import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper +import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar import com.lagradost.cloudstream3.utils.UIHelper.navigate import com.lagradost.cloudstream3.utils.UIHelper.setImage import com.lagradost.cloudstream3.utils.UIHelper.toPx import java.io.File -import java.text.DateFormat -import java.text.SimpleDateFormat -import java.util.Date -import java.util.Locale -import java.util.TimeZone class SettingsFragment : Fragment() { companion object { + var beneneCount = 0 + + private var isTv: Boolean = false + private var isTrueTv: Boolean = false fun PreferenceFragmentCompat?.getPref(id: Int): Preference? { if (this == null) return null @@ -53,70 +46,27 @@ class SettingsFragment : Fragment() { } } - /** - * Hide many Preferences on selected layouts. - **/ - fun PreferenceFragmentCompat?.hidePrefs(ids: List, layoutFlags: Int) { - if (this == null) return - - try { - ids.forEach { - getPref(it)?.isVisible = !isLayout(layoutFlags) - } - } catch (e: Exception) { - logError(e) - } - } - - /** - * Hide the Preference on selected layouts. - **/ - fun Preference?.hideOn(layoutFlags: Int): Preference? { - if (this == null) return null - this.isVisible = !isLayout(layoutFlags) - return this - } - /** * On TV you cannot properly scroll to the bottom of settings, this fixes that. * */ fun PreferenceFragmentCompat.setPaddingBottom() { - if (isLayout(TV or EMULATOR)) { + if (isTvSettings()) { listView?.setPadding(0, 0, 0, 100.toPx) } } - fun PreferenceFragmentCompat.setToolBarScrollFlags() { - if (isLayout(TV or EMULATOR)) { - val settingsAppbar = view?.findViewById(R.id.settings_toolbar) - settingsAppbar?.updateLayoutParams { - scrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL - } - } - } - fun Fragment?.setToolBarScrollFlags() { - if (isLayout(TV or EMULATOR)) { - val settingsAppbar = this?.view?.findViewById(R.id.settings_toolbar) - - settingsAppbar?.updateLayoutParams { - scrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL - } - } - } fun Fragment?.setUpToolbar(title: String) { if (this == null) return val settingsToolbar = view?.findViewById(R.id.settings_toolbar) ?: return settingsToolbar.apply { setTitle(title) - if (isLayout(PHONE or EMULATOR)) { - setNavigationIcon(R.drawable.ic_baseline_arrow_back_24) - setNavigationOnClickListener { - activity?.onBackPressedDispatcher?.onBackPressed() - } + setNavigationIcon(R.drawable.ic_baseline_arrow_back_24) + setNavigationOnClickListener { + activity?.onBackPressed() } } - UIHelper.fixPaddingStatusbar(settingsToolbar) + fixPaddingStatusbar(settingsToolbar) } fun Fragment?.setUpToolbar(@StringRes title: Int) { @@ -125,15 +75,13 @@ class SettingsFragment : Fragment() { settingsToolbar.apply { setTitle(title) - if (isLayout(PHONE or EMULATOR)) { - setNavigationIcon(R.drawable.ic_baseline_arrow_back_24) - children.firstOrNull { it is ImageView }?.tag = getString(R.string.tv_no_focus_tag) - setNavigationOnClickListener { - activity?.onBackPressedDispatcher?.onBackPressed() - } + setNavigationIcon(R.drawable.ic_baseline_arrow_back_24) + children.firstOrNull { it is ImageView }?.tag = getString(R.string.tv_no_focus_tag) + setNavigationOnClickListener { + activity?.onBackPressed() } } - UIHelper.fixPaddingStatusbar(settingsToolbar) + fixPaddingStatusbar(settingsToolbar) } fun getFolderSize(dir: File): Long { @@ -149,7 +97,55 @@ class SettingsFragment : Fragment() { return size } + + private fun Context.getLayoutInt(): Int { + val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) + return settingsManager.getInt(this.getString(R.string.app_layout_key), -1) + } + + private fun Context.isTvSettings(): Boolean { + var value = getLayoutInt() + if (value == -1) { + value = if (isAutoTv()) 1 else 0 + } + return value == 1 || value == 2 + } + + private fun Context.isTrueTvSettings(): Boolean { + var value = getLayoutInt() + if (value == -1) { + value = if (isAutoTv()) 1 else 0 + } + return value == 1 + } + + fun Context.updateTv() { + isTrueTv = isTrueTvSettings() + isTv = isTvSettings() + } + + fun isTrueTvSettings(): Boolean { + return isTrueTv + } + + fun isTvSettings(): Boolean { + return isTv + } + + fun Context.isEmulatorSettings(): Boolean { + return getLayoutInt() == 2 + } + + private fun Context.isAutoTv(): Boolean { + val uiModeManager = getSystemService(Context.UI_MODE_SERVICE) as UiModeManager? + // AFT = Fire TV + val model = Build.MODEL.lowercase() + return uiModeManager?.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION || Build.MODEL.contains( + "AFT" + ) || model.contains("firestick") || model.contains("fire tv") || model.contains("chromecast") + } } + override fun onDestroyView() { binding = null super.onDestroyView() @@ -164,6 +160,7 @@ class SettingsFragment : Fragment() { val localBinding = MainSettingsBinding.inflate(inflater, container, false) binding = localBinding return localBinding.root + //return inflater.inflate(R.layout.main_settings, container, false) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -171,82 +168,43 @@ class SettingsFragment : Fragment() { activity?.navigate(id, Bundle()) } - /** used to debug leaks - showToast(activity,"${VideoDownloadManager.downloadStatusEvent.size} : - ${VideoDownloadManager.downloadProgressEvent.size}") **/ + // used to debug leaks showToast(activity,"${VideoDownloadManager.downloadStatusEvent.size} : ${VideoDownloadManager.downloadProgressEvent.size}") - fun hasProfilePictureFromAccountManagers(accountManagers: List): Boolean { - for (syncApi in accountManagers) { - val login = syncApi.loginInfo() - val pic = login?.profilePicture ?: continue + val isTrueTv = isTrueTvSettings() - if (binding?.settingsProfilePic?.setImage( - pic, - errorImageDrawable = HomeFragment.errorProfilePic - ) == true - ) { - binding?.settingsProfileText?.text = login.name - return true // sync profile exists - } + for (syncApi in accountManagers) { + val login = syncApi.loginInfo() + val pic = login?.profilePicture ?: continue + if (binding?.settingsProfilePic?.setImage( + pic, + errorImageDrawable = HomeFragment.errorProfilePic + ) == true + ) { + binding?.settingsProfileText?.text = login.name + binding?.settingsProfile?.isVisible = true + break } - return false // not syncing } - - // display local account information if not syncing - if (!hasProfilePictureFromAccountManagers(accountManagers)) { - val activity = activity ?: return - val currentAccount = try { - DataStoreHelper.accounts.firstOrNull { - it.keyIndex == DataStoreHelper.selectedKeyIndex - } ?: activity.let { DataStoreHelper.getDefaultAccount(activity) } - - } catch (t: IllegalStateException) { - Log.e("AccountManager", "Activity not found", t) - null - } - - binding?.settingsProfilePic?.setImage(currentAccount?.image) - binding?.settingsProfileText?.text = currentAccount?.name - } - binding?.apply { listOf( - settingsGeneral to R.id.action_navigation_global_to_navigation_settings_general, - settingsPlayer to R.id.action_navigation_global_to_navigation_settings_player, - settingsCredits to R.id.action_navigation_global_to_navigation_settings_account, - settingsUi to R.id.action_navigation_global_to_navigation_settings_ui, - settingsProviders to R.id.action_navigation_global_to_navigation_settings_providers, - settingsUpdates to R.id.action_navigation_global_to_navigation_settings_updates, - settingsExtensions to R.id.action_navigation_global_to_navigation_settings_extensions, + settingsGeneral to R.id.action_navigation_settings_to_navigation_settings_general, + settingsPlayer to R.id.action_navigation_settings_to_navigation_settings_player, + settingsCredits to R.id.action_navigation_settings_to_navigation_settings_account, + settingsUi to R.id.action_navigation_settings_to_navigation_settings_ui, + settingsProviders to R.id.action_navigation_settings_to_navigation_settings_providers, + settingsUpdates to R.id.action_navigation_settings_to_navigation_settings_updates, + settingsExtensions to R.id.action_navigation_settings_to_navigation_settings_extensions, ).forEach { (view, navigationId) -> view.apply { setOnClickListener { navigate(navigationId) } - if (isLayout(TV)) { + if (isTrueTv) { isFocusable = true isFocusableInTouchMode = true } } } - - // Default focus on TV - if (isLayout(TV)) { - settingsGeneral.requestFocus() - } - } - - val appVersion = getString(R.string.app_version) - val commitInfo = getString(R.string.commit_hash) - val buildTimestamp = SimpleDateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG, - Locale.getDefault() - ).apply { timeZone = TimeZone.getTimeZone("UTC") - }.format(Date(BuildConfig.BUILD_DATE)).replace("UTC", "") - - binding?.buildDate?.text = buildTimestamp - binding?.appVersionInfo?.setOnLongClickListener { - clipboardHelper(txt(R.string.extension_version), "$appVersion $commitInfo $buildTimestamp") - true } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt index 7cb1a848..ae5f0aab 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt @@ -3,7 +3,6 @@ package com.lagradost.cloudstream3.ui.settings import android.content.Context import android.content.Intent import android.net.Uri -import android.os.Build import android.os.Bundle import android.view.View import android.widget.Toast @@ -27,16 +26,9 @@ import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.mvvm.normalSafeApiCall import com.lagradost.cloudstream3.network.initClient import com.lagradost.cloudstream3.ui.EasterEggMonke -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.beneneCount import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref -import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom -import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar -import com.lagradost.cloudstream3.utils.BatteryOptimizationChecker.isAppRestricted -import com.lagradost.cloudstream3.utils.BatteryOptimizationChecker.showBatteryOptimizationDialog import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog @@ -48,17 +40,12 @@ import com.lagradost.cloudstream3.utils.VideoDownloadManager import com.lagradost.cloudstream3.utils.VideoDownloadManager.getBasePath import com.lagradost.safefile.SafeFile -// Change local language settings in the app. fun getCurrentLocale(context: Context): String { val res = context.resources + // Change locale settings in the app. + // val dm = res.displayMetrics val conf = res.configuration - - return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - conf?.locales?.get(0)?.toString() ?: "en" - } else { - @Suppress("DEPRECATION") - conf?.locale?.toString() ?: "en" - } + return conf?.locale?.toString() ?: "en" } // idk, if you find a way of automating this it would be great @@ -67,12 +54,10 @@ fun getCurrentLocale(context: Context): String { // https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes leave blank for auto val appLanguages = arrayListOf( /* begin language list */ - Triple("", "Afrikaans", "af"), - Triple("", "عربي شامي", "ajp"), + Triple("", "ajp", "ajp"), Triple("", "አማርኛ", "am"), Triple("", "العربية", "ar"), - Triple("", "اللهجة النجدية", "ars"), - Triple("", "অসমীয়া", "as"), + Triple("", "ars", "ars"), Triple("", "български", "bg"), Triple("", "বাংলা", "bn"), Triple("\uD83C\uDDE7\uD83C\uDDF7", "português brasileiro", "bp"), @@ -95,14 +80,11 @@ val appLanguages = arrayListOf( Triple("", "日本語 (にほんご)", "ja"), Triple("", "ಕನ್ನಡ", "kn"), Triple("", "한국어", "ko"), - Triple("", "lietuvių kalba", "lt"), Triple("", "latviešu valoda", "lv"), Triple("", "македонски", "mk"), Triple("", "മലയാളം", "ml"), Triple("", "bahasa Melayu", "ms"), - Triple("", "Malti", "mt"), Triple("", "ဗမာစာ", "my"), - Triple("", "नेपाली", "ne"), Triple("", "Nederlands", "nl"), Triple("", "norsk nynorsk", "nn"), Triple("", "norsk bokmål", "no"), @@ -132,7 +114,6 @@ class SettingsGeneral : PreferenceFragmentCompat() { super.onViewCreated(view, savedInstanceState) setUpToolbar(R.string.category_general) setPaddingBottom() - setToolBarScrollFlags() } data class CustomSite( @@ -177,7 +158,7 @@ class SettingsGeneral : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { hideKeyboard() - setPreferencesFromResource(R.xml.settings_general, rootKey) + setPreferencesFromResource(R.xml.settins_general, rootKey) val settingsManager = PreferenceManager.getDefaultSharedPreferences(requireContext()) fun getCurrent(): MutableList { @@ -210,17 +191,6 @@ class SettingsGeneral : PreferenceFragmentCompat() { return@setOnPreferenceClickListener true } - getPref(R.string.battery_optimisation_key)?.hideOn(TV or EMULATOR)?.setOnPreferenceClickListener { - val ctx = context ?: return@setOnPreferenceClickListener false - - if (isAppRestricted(ctx)) { - showBatteryOptimizationDialog(ctx) - } else { - showToast(R.string.app_unrestricted_toast) - } - - true - } fun showAdd() { val providers = synchronized(allProviders) { allProviders.distinctBy { it.javaClass }.sortedBy { it.name } } @@ -397,30 +367,30 @@ class SettingsGeneral : PreferenceFragmentCompat() { } try { - beneneCount = + SettingsFragment.beneneCount = settingsManager.getInt(getString(R.string.benene_count), 0) getPref(R.string.benene_count)?.let { pref -> pref.summary = - if (beneneCount <= 0) getString(R.string.benene_count_text_none) else getString( + if (SettingsFragment.beneneCount <= 0) getString(R.string.benene_count_text_none) else getString( R.string.benene_count_text ).format( - beneneCount + SettingsFragment.beneneCount ) pref.setOnPreferenceClickListener { try { - beneneCount++ - if (beneneCount%20 == 0) { + SettingsFragment.beneneCount++ + if (SettingsFragment.beneneCount%20 == 0) { val intent = Intent(context, EasterEggMonke::class.java) startActivity(intent) } settingsManager.edit().putInt( getString(R.string.benene_count), - beneneCount + SettingsFragment.beneneCount ) .apply() it.summary = - getString(R.string.benene_count_text).format(beneneCount) + getString(R.string.benene_count_text).format(SettingsFragment.beneneCount) } catch (e: Exception) { logError(e) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt index 1753032a..e10a5a1a 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt @@ -7,15 +7,9 @@ import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceManager import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.mvvm.logError -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.PHONE -import com.lagradost.cloudstream3.ui.settings.Globals.TV import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getFolderSize import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref -import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn -import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hidePrefs import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom -import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar import com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment @@ -29,26 +23,12 @@ class SettingsPlayer : PreferenceFragmentCompat() { super.onViewCreated(view, savedInstanceState) setUpToolbar(R.string.category_player) setPaddingBottom() - setToolBarScrollFlags() } override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { hideKeyboard() setPreferencesFromResource(R.xml.settings_player, rootKey) val settingsManager = PreferenceManager.getDefaultSharedPreferences(requireContext()) - //Hide specific prefs on TV/EMULATOR - hidePrefs( - listOf( - R.string.pref_category_gestures_key, - R.string.rotate_video_key, - R.string.auto_rotate_video_key - ), - TV or EMULATOR - ) - - getPref(R.string.preview_seekbar_key)?.hideOn(TV) - getPref(R.string.pref_category_android_tv_key)?.hideOn(PHONE) - getPref(R.string.video_buffer_length_key)?.setOnPreferenceClickListener { val prefNames = resources.getStringArray(R.array.video_buffer_length_names) val prefValues = resources.getIntArray(R.array.video_buffer_length_values) @@ -87,6 +67,10 @@ class SettingsPlayer : PreferenceFragmentCompat() { return@setOnPreferenceClickListener true } + /*(getPref(R.string.double_tap_seek_time_key) as? SeekBarPreference?)?.let { + + }*/ + getPref(R.string.prefer_limit_title_rez_key)?.setOnPreferenceClickListener { val prefNames = resources.getStringArray(R.array.limit_title_rez_pref_names) val prefValues = resources.getIntArray(R.array.limit_title_rez_pref_values) @@ -105,10 +89,8 @@ class SettingsPlayer : PreferenceFragmentCompat() { return@setOnPreferenceClickListener true } - getPref(R.string.hide_player_control_names_key)?.hideOn(TV) - getPref(R.string.quality_pref_key)?.setOnPreferenceClickListener { - val prefValues = Qualities.entries.map { it.value }.reversed().toMutableList() + val prefValues = Qualities.values().map { it.value }.reversed().toMutableList() prefValues.remove(Qualities.Unknown.value) val prefNames = prefValues.map { Qualities.getStringByInt(it) } @@ -116,7 +98,7 @@ class SettingsPlayer : PreferenceFragmentCompat() { val currentQuality = settingsManager.getInt( getString(R.string.quality_pref_key), - Qualities.entries.last().value + Qualities.values().last().value ) activity?.showBottomDialog( @@ -132,7 +114,7 @@ class SettingsPlayer : PreferenceFragmentCompat() { } getPref(R.string.quality_pref_mobile_data_key)?.setOnPreferenceClickListener { - val prefValues = Qualities.entries.map { it.value }.reversed().toMutableList() + val prefValues = Qualities.values().map { it.value }.reversed().toMutableList() prefValues.remove(Qualities.Unknown.value) val prefNames = prefValues.map { Qualities.getStringByInt(it) } @@ -140,7 +122,7 @@ class SettingsPlayer : PreferenceFragmentCompat() { val currentQuality = settingsManager.getInt( getString(R.string.quality_pref_mobile_data_key), - Qualities.entries.last().value + Qualities.values().last().value ) activity?.showBottomDialog( @@ -243,5 +225,6 @@ class SettingsPlayer : PreferenceFragmentCompat() { return@setOnPreferenceClickListener true } } + } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt index cb7d25fd..0bef5e9a 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt @@ -7,24 +7,24 @@ import androidx.navigation.fragment.findNavController import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceManager import com.lagradost.cloudstream3.* +import com.lagradost.cloudstream3.APIHolder.getApiDubstatusSettings +import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings +import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey import com.lagradost.cloudstream3.ui.APIRepository import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom -import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar -import com.lagradost.cloudstream3.utils.AppContextUtils.getApiDubstatusSettings -import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings -import com.lagradost.cloudstream3.utils.DataStoreHelper +import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog import com.lagradost.cloudstream3.utils.SubtitleHelper import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard +import com.lagradost.cloudstream3.utils.UIHelper.navigate class SettingsProviders : PreferenceFragmentCompat() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setUpToolbar(R.string.category_providers) setPaddingBottom() - setToolBarScrollFlags() } override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { @@ -34,7 +34,7 @@ class SettingsProviders : PreferenceFragmentCompat() { getPref(R.string.display_sub_key)?.setOnPreferenceClickListener { activity?.getApiDubstatusSettings()?.let { current -> - val dublist = DubStatus.entries + val dublist = DubStatus.values() val names = dublist.map { it.name } val currentList = ArrayList() @@ -96,7 +96,7 @@ class SettingsProviders : PreferenceFragmentCompat() { this.getString(R.string.prefer_media_type_key), selectedList.map { it.toString() }.toMutableSet() ).apply() - DataStoreHelper.currentHomePage = null + removeKey(USER_SELECTED_HOMEPAGE_API) //(context ?: AcraApplication.context)?.let { ctx -> app.initClient(ctx) } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt index 8c3ad0ad..e2fd24ca 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt @@ -9,11 +9,10 @@ import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.SearchQuality import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.ui.search.SearchResultBuilder -import com.lagradost.cloudstream3.ui.settings.Globals.updateTv import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom -import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.updateTv import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog @@ -24,12 +23,11 @@ class SettingsUI : PreferenceFragmentCompat() { super.onViewCreated(view, savedInstanceState) setUpToolbar(R.string.category_ui) setPaddingBottom() - setToolBarScrollFlags() } override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { hideKeyboard() - setPreferencesFromResource(R.xml.settings_ui, rootKey) + setPreferencesFromResource(R.xml.settins_ui, rootKey) val settingsManager = PreferenceManager.getDefaultSharedPreferences(requireContext()) getPref(R.string.poster_ui_key)?.setOnPreferenceClickListener { @@ -88,9 +86,10 @@ class SettingsUI : PreferenceFragmentCompat() { getPref(R.string.app_theme_key)?.setOnPreferenceClickListener { val prefNames = resources.getStringArray(R.array.themes_names).toMutableList() val prefValues = resources.getStringArray(R.array.themes_names_values).toMutableList() - val removeIncompatible = { text: String -> + + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { // remove monet on android 11 and less val toRemove = prefValues - .mapIndexed { idx, s -> if (s.startsWith(text)) idx else null } + .mapIndexed { idx, s -> if (s.startsWith("Monet")) idx else null } .filterNotNull() var offset = 0 toRemove.forEach { idx -> @@ -99,12 +98,6 @@ class SettingsUI : PreferenceFragmentCompat() { offset += 1 } } - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { // remove monet on android 11 and less - removeIncompatible("Monet") - } - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { // Remove system on android 9 and less - removeIncompatible("System") - } val currentLayout = settingsManager.getString(getString(R.string.app_theme_key), prefValues.first()) @@ -128,8 +121,7 @@ class SettingsUI : PreferenceFragmentCompat() { } getPref(R.string.primary_color_key)?.setOnPreferenceClickListener { val prefNames = resources.getStringArray(R.array.themes_overlay_names).toMutableList() - val prefValues = - resources.getStringArray(R.array.themes_overlay_names_values).toMutableList() + val prefValues = resources.getStringArray(R.array.themes_overlay_names_values).toMutableList() if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { // remove monet on android 11 and less val toRemove = prefValues diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt index 260c6674..62e46c08 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt @@ -1,6 +1,10 @@ package com.lagradost.cloudstream3.ui.settings +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context import android.os.Bundle +import android.os.TransactionTooLargeException import android.view.View import android.widget.Toast import androidx.appcompat.app.AlertDialog @@ -15,19 +19,14 @@ import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.databinding.LogcatBinding import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.network.initClient -import com.lagradost.cloudstream3.services.BackupWorkManager -import com.lagradost.cloudstream3.ui.result.txt import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom -import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar -import com.lagradost.cloudstream3.utils.BackupUtils +import com.lagradost.cloudstream3.utils.BackupUtils.backup import com.lagradost.cloudstream3.utils.BackupUtils.restorePrompt import com.lagradost.cloudstream3.utils.Coroutines.ioSafe import com.lagradost.cloudstream3.utils.InAppUpdater.Companion.runAutoUpdate import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog -import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog -import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard import com.lagradost.cloudstream3.utils.VideoDownloadManager @@ -35,16 +34,12 @@ import okhttp3.internal.closeQuietly import java.io.BufferedReader import java.io.InputStreamReader import java.io.OutputStream -import java.lang.System.currentTimeMillis -import java.text.SimpleDateFormat -import java.util.* class SettingsUpdates : PreferenceFragmentCompat() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setUpToolbar(R.string.category_updates) setPaddingBottom() - setToolBarScrollFlags() } override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { @@ -53,30 +48,7 @@ class SettingsUpdates : PreferenceFragmentCompat() { //val settingsManager = PreferenceManager.getDefaultSharedPreferences(requireContext()) getPref(R.string.backup_key)?.setOnPreferenceClickListener { - BackupUtils.backup(activity) - return@setOnPreferenceClickListener true - } - - getPref(R.string.automatic_backup_key)?.setOnPreferenceClickListener { - val settingsManager = PreferenceManager.getDefaultSharedPreferences(requireContext()) - - val prefNames = resources.getStringArray(R.array.periodic_work_names) - val prefValues = resources.getIntArray(R.array.periodic_work_values) - val current = settingsManager.getInt(getString(R.string.automatic_backup_key), 0) - - activity?.showDialog( - prefNames.toList(), - prefValues.indexOf(current), - getString(R.string.backup_frequency), - true, - {}) { index -> - settingsManager.edit() - .putInt(getString(R.string.automatic_backup_key), prefValues[index]).apply() - BackupWorkManager.enqueuePeriodicWork( - context ?: AcraApplication.context, - prefValues[index].toLong() - ) - } + activity?.backup() return@setOnPreferenceClickListener true } @@ -93,7 +65,7 @@ class SettingsUpdates : PreferenceFragmentCompat() { val builder = AlertDialog.Builder(pref.context, R.style.AlertDialogCustom) - val binding = LogcatBinding.inflate(layoutInflater, null, false) + val binding = LogcatBinding.inflate(layoutInflater,null,false ) builder.setView(binding.root) val dialog = builder.create() @@ -118,22 +90,29 @@ class SettingsUpdates : PreferenceFragmentCompat() { binding.text1.text = text binding.copyBtt.setOnClickListener { - clipboardHelper(txt("Logcat"), text) - dialog.dismissSafe(activity) + // Can crash on too much text + try { + val serviceClipboard = + (activity?.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?) + ?: return@setOnClickListener + val clip = ClipData.newPlainText("logcat", text) + serviceClipboard.setPrimaryClip(clip) + dialog.dismissSafe(activity) + } catch (e: TransactionTooLargeException) { + showToast(R.string.clipboard_too_large) + } } - binding.clearBtt.setOnClickListener { Runtime.getRuntime().exec("logcat -c") dialog.dismissSafe(activity) } - binding.saveBtt.setOnClickListener { - val date = SimpleDateFormat("yyyy_MM_dd_HH_mm", Locale.getDefault()).format(Date(currentTimeMillis())) var fileStream: OutputStream? = null try { - fileStream = VideoDownloadManager.setupStream( + fileStream = + VideoDownloadManager.setupStream( it.context, - "logcat_${date}", + "logcat", null, "txt", false @@ -147,11 +126,9 @@ class SettingsUpdates : PreferenceFragmentCompat() { fileStream?.closeQuietly() } } - binding.closeBtt.setOnClickListener { dialog.dismissSafe(activity) } - return@setOnPreferenceClickListener true } @@ -169,10 +146,10 @@ class SettingsUpdates : PreferenceFragmentCompat() { prefValues.indexOf(currentInstaller), getString(R.string.apk_installer_settings), true, - {}) { num -> + {}) { try { settingsManager.edit() - .putInt(getString(R.string.apk_installer_key), prefValues[num]) + .putInt(getString(R.string.apk_installer_key), prefValues[it]) .apply() } catch (e: Exception) { logError(e) @@ -199,8 +176,7 @@ class SettingsUpdates : PreferenceFragmentCompat() { val settingsManager = PreferenceManager.getDefaultSharedPreferences(it.context) val prefNames = resources.getStringArray(R.array.auto_download_plugin) - val prefValues = - enumValues().sortedBy { x -> x.value }.map { x -> x.value } + val prefValues = enumValues().sortedBy { x -> x.value }.map { x -> x.value } val current = settingsManager.getInt(getString(R.string.auto_download_plugins_key), 0) @@ -209,9 +185,8 @@ class SettingsUpdates : PreferenceFragmentCompat() { prefValues.indexOf(current), getString(R.string.automatic_plugin_download_mode_title), true, - {}) { num -> - settingsManager.edit() - .putInt(getString(R.string.auto_download_plugins_key), prefValues[num]).apply() + {}) { + settingsManager.edit().putInt(getString(R.string.auto_download_plugins_key), prefValues[it]).apply() (context ?: AcraApplication.context)?.let { ctx -> app.initClient(ctx) } } return@setOnPreferenceClickListener true diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt index 1b487629..553e7675 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt @@ -29,12 +29,10 @@ import com.lagradost.cloudstream3.plugins.RepositoryManager import com.lagradost.cloudstream3.ui.result.FOCUS_SELF import com.lagradost.cloudstream3.ui.result.setLinearListLayout import com.lagradost.cloudstream3.ui.result.setText -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar -import com.lagradost.cloudstream3.utils.AppContextUtils.addRepositoryDialog -import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus +import com.lagradost.cloudstream3.utils.AppUtils.downloadAllPluginsDialog +import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus import com.lagradost.cloudstream3.utils.Coroutines.ioSafe import com.lagradost.cloudstream3.utils.Coroutines.main import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe @@ -87,7 +85,7 @@ class ExtensionsFragment : Fragment() { //context?.fixPaddingStatusbar(extensions_root) setUpToolbar(R.string.extensions) - setToolBarScrollFlags() + binding?.repoRecyclerView?.apply { setLinearListLayout( @@ -98,7 +96,7 @@ class ExtensionsFragment : Fragment() { nextLeft = R.id.nav_rail_view ) - if (!isLayout(TV)) + if (!isTrueTvSettings()) binding?.addRepoButton?.let { button -> button.post { setPadding( @@ -273,9 +271,9 @@ class ExtensionsFragment : Fragment() { if (plugins.isNullOrEmpty()) { showToast(R.string.no_plugins_found_error, Toast.LENGTH_LONG) } else { - this@ExtensionsFragment.activity?.addRepositoryDialog( - fixedName, + this@ExtensionsFragment.activity?.downloadAllPluginsDialog( url, + fixedName ) } } @@ -287,7 +285,7 @@ class ExtensionsFragment : Fragment() { } } - val isTv = isLayout(TV) + val isTv = isTrueTvSettings() binding?.apply { addRepoButton.isGone = isTv addRepoButtonImageviewHolder.isVisible = isTv diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt index d159539d..eb0082b8 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginAdapter.kt @@ -1,11 +1,9 @@ package com.lagradost.cloudstream3.ui.settings.extensions -import android.annotation.SuppressLint import android.text.format.Formatter.formatShortFileSize import android.util.Log import android.view.LayoutInflater import android.view.ViewGroup -import androidx.annotation.VisibleForTesting import androidx.appcompat.app.AppCompatActivity import androidx.core.view.isGone import androidx.core.view.isVisible @@ -14,27 +12,26 @@ import androidx.recyclerview.widget.RecyclerView import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity import com.lagradost.cloudstream3.PROVIDER_STATUS_DOWN import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.TvType import com.lagradost.cloudstream3.databinding.RepositoryItemBinding import com.lagradost.cloudstream3.plugins.PluginManager import com.lagradost.cloudstream3.plugins.VotingApi.getVotes import com.lagradost.cloudstream3.ui.result.setText import com.lagradost.cloudstream3.ui.result.txt -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.AppContextUtils.html +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings +import com.lagradost.cloudstream3.utils.AppUtils.html import com.lagradost.cloudstream3.utils.Coroutines.ioSafe import com.lagradost.cloudstream3.utils.Coroutines.main +import com.lagradost.cloudstream3.utils.GlideApp import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTwoLettersToLanguage import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso import com.lagradost.cloudstream3.utils.UIHelper.setImage import com.lagradost.cloudstream3.utils.UIHelper.toPx +import org.junit.Assert +import org.junit.Test import java.text.DecimalFormat import kotlin.math.floor import kotlin.math.log10 -import kotlin.math.pow -import org.junit.Test -import org.junit.Assert + data class PluginViewData( val plugin: Plugin, @@ -48,7 +45,7 @@ class PluginAdapter( private val plugins: MutableList = mutableListOf() override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { - val layout = if(isLayout(TV)) R.layout.repository_item_tv else R.layout.repository_item + val layout = if(isTrueTvSettings()) R.layout.repository_item_tv else R.layout.repository_item val inflated = LayoutInflater.from(parent.context).inflate(layout, parent, false) return PluginViewHolder( @@ -90,7 +87,7 @@ class PluginAdapter( override fun onViewRecycled(holder: RecyclerView.ViewHolder) { if (holder is PluginViewHolder) { holder.binding.entryIcon.let { pluginIcon -> - com.bumptech.glide.Glide.with(pluginIcon).clear(pluginIcon) + GlideApp.with(pluginIcon).clear(pluginIcon) } } super.onViewRecycled(holder) @@ -103,8 +100,6 @@ class PluginAdapter( return findClosestBase2(target, current * 2, max) } - // DO NOT MOVE, as running this test will result in ExceptionInInitializerError on prerelease due to static variables using Resources.getSystem() - // this test function is only to show how the function works @Test fun testFindClosestBase2() { Assert.assertEquals(16, findClosestBase2(0)) @@ -126,7 +121,10 @@ class PluginAdapter( val base = value / 3 return if (value >= 3 && base < suffix.size) { DecimalFormat("#0.00").format( - numValue / 10.0.pow((base * 3).toDouble()) + numValue / Math.pow( + 10.0, + (base * 3).toDouble() + ) ) + suffix[base] } else { DecimalFormat().format(numValue) @@ -137,7 +135,6 @@ class PluginAdapter( inner class PluginViewHolder(val binding: RepositoryItemBinding) : RecyclerView.ViewHolder(binding.root) { - @SuppressLint("SetTextI18n") fun bind( data: PluginViewData, ) { @@ -153,7 +150,7 @@ class PluginAdapter( R.drawable.ic_baseline_delete_outline_24 else R.drawable.netflix_download - binding.nsfwMarker.isVisible = metadata.tvTypes?.contains(TvType.NSFW.name) ?: false + binding.nsfwMarker.isVisible = metadata.tvTypes?.contains("NSFW") ?: false binding.actionButton.setImageResource(drawableInt) binding.actionButton.setOnClickListener { diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt index 4878049b..172ea659 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt @@ -8,8 +8,8 @@ import androidx.appcompat.widget.SearchView import androidx.core.view.isVisible import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels +import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings import com.lagradost.cloudstream3.AllLanguagesName -import com.lagradost.cloudstream3.BuildConfig import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.TvType import com.lagradost.cloudstream3.databinding.FragmentPluginsBinding @@ -17,13 +17,9 @@ import com.lagradost.cloudstream3.mvvm.observe import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips import com.lagradost.cloudstream3.ui.result.FOCUS_SELF import com.lagradost.cloudstream3.ui.result.setLinearListLayout -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar import com.lagradost.cloudstream3.ui.settings.appLanguages -import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog import com.lagradost.cloudstream3.utils.SubtitleHelper import com.lagradost.cloudstream3.utils.UIHelper.toPx @@ -71,15 +67,12 @@ class PluginsFragment : Fragment() { val name = arguments?.getString(PLUGINS_BUNDLE_NAME) val url = arguments?.getString(PLUGINS_BUNDLE_URL) val isLocal = arguments?.getBoolean(PLUGINS_BUNDLE_LOCAL) == true - // download all extensions button - val downloadAllButton = binding?.settingsToolbar?.menu?.findItem(R.id.download_all) if (url == null || name == null) { - activity?.onBackPressedDispatcher?.onBackPressed() + activity?.onBackPressed() return } - setToolBarScrollFlags() setUpToolbar(name) binding?.settingsToolbar?.apply { setOnMenuItemClickListener { menuItem -> @@ -124,7 +117,7 @@ class PluginsFragment : Fragment() { if (searchView?.isIconified == false) { searchView.isIconified = true } else { - activity?.onBackPressedDispatcher?.onBackPressed() + activity?.onBackPressed() } } searchView?.setOnQueryTextFocusChangeListener { _, hasFocus -> @@ -160,7 +153,7 @@ class PluginsFragment : Fragment() { pluginViewModel.handlePluginAction(activity, url, it, isLocal) } - if (isLayout(TV or EMULATOR)) { + if (isTvSettings()) { // Scrolling down does not reveal the whole RecyclerView on TV, add to bypass that. binding?.pluginRecyclerView?.setPadding(0, 0, 0, 200.toPx) } @@ -174,7 +167,7 @@ class PluginsFragment : Fragment() { if (isLocal) { // No download button and no categories on local - downloadAllButton?.isVisible = false + binding?.settingsToolbar?.menu?.findItem(R.id.download_all)?.isVisible = false binding?.settingsToolbar?.menu?.findItem(R.id.lang_filter)?.isVisible = false pluginViewModel.updatePluginListLocal() @@ -182,15 +175,11 @@ class PluginsFragment : Fragment() { } else { pluginViewModel.updatePluginList(context, url) binding?.tvtypesChipsScroll?.root?.isVisible = true - // not needed for users but may be useful for devs - downloadAllButton?.isVisible = BuildConfig.DEBUG - - bindChips( binding?.tvtypesChipsScroll?.tvtypesChips, emptyList(), - TvType.entries.toList(), + TvType.values().toList(), callback = { list -> pluginViewModel.tvTypes.clear() pluginViewModel.tvTypes.addAll(list.map { it.name }) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt index fd5422b2..471105be 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsViewModel.kt @@ -8,11 +8,9 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import androidx.preference.PreferenceManager import com.lagradost.cloudstream3.CommonActivity.showToast import com.lagradost.cloudstream3.PROVIDER_STATUS_DOWN import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.TvType import com.lagradost.cloudstream3.amap import com.lagradost.cloudstream3.mvvm.launchSafe import com.lagradost.cloudstream3.plugins.PluginManager @@ -98,7 +96,6 @@ class PluginsViewModel : ViewModel() { R.string.batch_download_nothing_to_download_format, txt(R.string.plugin) ) - else -> txt( R.string.batch_download_start_format, list.size, @@ -163,7 +160,7 @@ class PluginsViewModel : ViewModel() { PluginManager.downloadPlugin( activity, metadata.url, - metadata.internalName, + metadata.name, repo, isEnabled ) to message @@ -184,15 +181,8 @@ class PluginsViewModel : ViewModel() { } private suspend fun updatePluginListPrivate(context: Context, repositoryUrl: String) { - val isAdult = PreferenceManager.getDefaultSharedPreferences(context) - .getStringSet(context.getString(R.string.prefer_media_type_key), emptySet()) - ?.contains(TvType.NSFW.ordinal.toString()) == true - val plugins = getPlugins(repositoryUrl) - val list = plugins.filter { - // Show all non-nsfw plugins or all if nsfw is enabled - it.second.tvTypes?.contains(TvType.NSFW.name) != true || isAdult - }.map { plugin -> + val list = plugins.map { plugin -> PluginViewData(plugin, isDownloaded(context, plugin.second.internalName, plugin.first)) } @@ -207,7 +197,7 @@ class PluginsViewModel : ViewModel() { if (tvTypes.isEmpty()) return this return this.filter { (it.plugin.second.tvTypes?.any { type -> tvTypes.contains(type) } == true) || - (tvTypes.contains(TvType.Others.name) && (it.plugin.second.tvTypes + (tvTypes.contains("Others") && (it.plugin.second.tvTypes ?: emptyList()).isEmpty()) } } @@ -267,4 +257,4 @@ class PluginsViewModel : ViewModel() { false to downloadedPlugins.filterTvTypes().filterLang().sortByQuery(currentQuery) ) } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/RepoAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/RepoAdapter.kt index faf6d38b..602b45e4 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/RepoAdapter.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/RepoAdapter.kt @@ -9,10 +9,7 @@ import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.databinding.RepositoryItemBinding import com.lagradost.cloudstream3.databinding.RepositoryItemTvBinding import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIES -import com.lagradost.cloudstream3.ui.result.txt -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings class RepoAdapter( val isSetup: Boolean, @@ -24,7 +21,7 @@ class RepoAdapter( private val repositories: MutableList = mutableListOf() override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { - val layout = if (isLayout(TV)) RepositoryItemTvBinding.inflate( + val layout = if (isTrueTvSettings()) RepositoryItemTvBinding.inflate( LayoutInflater.from(parent.context), parent, false @@ -115,13 +112,6 @@ class RepoAdapter( repositoryItemRoot.setOnClickListener { clickCallback(repositoryData) } - - repositoryItemRoot.setOnLongClickListener { - val shareableRepoData = "${repositoryData.name} : \n ${repositoryData.url}" - clipboardHelper(txt(R.string.repo_copy_label), shareableRepoData) - true - } - mainText.text = repositoryData.name subText.text = repositoryData.url } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt index 7878afaa..59b1b856 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt @@ -11,9 +11,7 @@ import com.lagradost.cloudstream3.databinding.FragmentTestingBinding import com.lagradost.cloudstream3.mvvm.normalSafeApiCall import com.lagradost.cloudstream3.mvvm.observe import com.lagradost.cloudstream3.mvvm.observeNullable -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout -import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar @@ -29,7 +27,6 @@ class TestFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { setUpToolbar(R.string.category_provider_test) - setToolBarScrollFlags() super.onViewCreated(view, savedInstanceState) binding?.apply { @@ -63,7 +60,7 @@ class TestFragment : Fragment() { } } - if (isLayout(TV)) { + if (isTrueTvSettings()) { providerTest.playPauseButton?.isFocusableInTouchMode = true providerTest.playPauseButton?.requestFocus() } @@ -76,7 +73,7 @@ class TestFragment : Fragment() { fun focusRecyclerView() { // Hack to make it possible to focus the recyclerview. - if (isLayout(TV)) { + if (isTrueTvSettings()) { providerTestRecyclerView.requestFocus() providerTestAppbar.setExpanded(false, true) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt index bad58a0e..83480542 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestResultAdapter.kt @@ -2,31 +2,26 @@ package com.lagradost.cloudstream3.ui.settings.testing import android.app.AlertDialog import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import android.widget.Toast import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.lagradost.cloudstream3.CommonActivity.showToast import com.lagradost.cloudstream3.MainAPI import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.databinding.ProviderTestItemBinding import com.lagradost.cloudstream3.mvvm.getAllMessages import com.lagradost.cloudstream3.mvvm.getStackTracePretty -import com.lagradost.cloudstream3.plugins.PluginManager -import com.lagradost.cloudstream3.utils.AppContextUtils -import com.lagradost.cloudstream3.utils.Coroutines.ioSafe -import com.lagradost.cloudstream3.utils.Coroutines.runOnMainThread +import com.lagradost.cloudstream3.utils.AppUtils import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso import com.lagradost.cloudstream3.utils.TestingUtils -import java.io.File class TestResultAdapter(override val items: MutableList>) : - AppContextUtils.DiffAdapter>(items) { + AppUtils.DiffAdapter>(items) { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { return ProviderTestViewHolder( - ProviderTestItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + ProviderTestItemBinding.inflate(LayoutInflater.from(parent.context), parent,false) //LayoutInflater.from(parent.context) // .inflate(R.layout.provider_test_item, parent, false), ) @@ -41,8 +36,7 @@ class TestResultAdapter(override val items: MutableList } - - api.sourcePlugin?.let { path -> - val pluginFile = File(path) - // Cannot delete a deleted plugin - if (!pluginFile.exists()) return@let - - builder.setNegativeButton(R.string.delete_plugin) { _, _ -> - ioSafe { - val success = PluginManager.deletePlugin(pluginFile) - - runOnMainThread { - if (success) { - showToast(R.string.plugin_deleted, Toast.LENGTH_SHORT) - } else { - showToast(R.string.error, Toast.LENGTH_SHORT) - } - } - } - } - } - - builder.show() + .show() } } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestView.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestView.kt index eea495a2..26513f4a 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestView.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestView.kt @@ -13,7 +13,7 @@ import androidx.core.view.isVisible import androidx.core.widget.ContentLoadingProgressBar import com.google.android.material.button.MaterialButton import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.utils.AppContextUtils.animateProgressTo +import com.lagradost.cloudstream3.utils.AppUtils.animateProgressTo class TestView @JvmOverloads constructor( context: Context, diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt index 818f1fd7..4fd24afe 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt @@ -10,6 +10,7 @@ import com.lagradost.cloudstream3.utils.TestingUtils import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.cancel +import okhttp3.internal.toImmutableList class TestViewModel : ViewModel() { data class TestProgress( @@ -95,7 +96,7 @@ class TestViewModel : ViewModel() { providers.clear() updateProgress() - TestingUtils.getDeferredProviderTests(scope ?: return, apis) { api, result -> + TestingUtils.getDeferredProviderTests(scope ?: return, apis, ::println) { api, result -> addProvider(api, result) } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt index d8fa46e6..98803818 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt @@ -9,7 +9,6 @@ import android.widget.ArrayAdapter import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController import androidx.preference.PreferenceManager -import com.lagradost.cloudstream3.AcraApplication.Companion.setKey import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.databinding.FragmentSetupLayoutBinding import com.lagradost.cloudstream3.mvvm.normalSafeApiCall @@ -87,7 +86,6 @@ class SetupFragmentLayout : Fragment() { nextBtt.setOnClickListener { - setKey(HAS_DONE_SETUP_KEY, true) findNavController().navigate(R.id.navigation_home) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt index 49a93608..6916cafe 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt @@ -10,12 +10,13 @@ import androidx.core.util.forEach import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController import androidx.preference.PreferenceManager +import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.TvType import com.lagradost.cloudstream3.databinding.FragmentSetupMediaBinding import com.lagradost.cloudstream3.mvvm.normalSafeApiCall -import com.lagradost.cloudstream3.utils.DataStoreHelper import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar +import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API class SetupFragmentMedia : Fragment() { @@ -76,7 +77,7 @@ class SetupFragmentMedia : Fragment() { .apply() // Regenerate set homepage - DataStoreHelper.currentHomePage = null + removeKey(USER_SELECTED_HOMEPAGE_API) } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt index c12e9eb8..59dcc402 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt @@ -11,11 +11,11 @@ import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController import androidx.preference.PreferenceManager import com.lagradost.cloudstream3.APIHolder +import com.lagradost.cloudstream3.APIHolder.getApiProviderLangSettings import com.lagradost.cloudstream3.AllLanguagesName import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.databinding.FragmentSetupProviderLanguagesBinding import com.lagradost.cloudstream3.mvvm.normalSafeApiCall -import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings import com.lagradost.cloudstream3.utils.SubtitleHelper import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt index c76a218e..ffb593a0 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt @@ -13,13 +13,10 @@ import android.view.ViewGroup import android.widget.TextView import android.widget.Toast import androidx.fragment.app.Fragment -import androidx.media3.common.text.Cue import com.fasterxml.jackson.annotation.JsonProperty -import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_DEPRESSED -import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_DROP_SHADOW -import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_NONE -import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_OUTLINE -import com.google.android.gms.cast.TextTrackStyle.EDGE_TYPE_RAISED +import androidx.media3.common.text.Cue +import com.google.android.gms.cast.TextTrackStyle +import com.google.android.gms.cast.TextTrackStyle.* import com.jaredrummler.android.colorpicker.ColorPickerDialog import com.lagradost.cloudstream3.AcraApplication.Companion.getKey import com.lagradost.cloudstream3.CommonActivity.onColorSelectedEvent @@ -27,9 +24,7 @@ import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent import com.lagradost.cloudstream3.CommonActivity.showToast import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.databinding.ChromecastSubtitleSettingsBinding -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings import com.lagradost.cloudstream3.utils.DataStore.setKey import com.lagradost.cloudstream3.utils.Event import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog @@ -45,12 +40,12 @@ data class SaveChromeCaptionStyle( @JsonProperty("fontGenericFamily") var fontGenericFamily: Int? = null, @JsonProperty("backgroundColor") var backgroundColor: Int = 0x00FFFFFF, // transparent @JsonProperty("edgeColor") var edgeColor: Int = Color.BLACK, // BLACK - @JsonProperty("edgeType") var edgeType: Int = EDGE_TYPE_OUTLINE, + @JsonProperty("edgeType") var edgeType: Int = TextTrackStyle.EDGE_TYPE_OUTLINE, @JsonProperty("foregroundColor") var foregroundColor: Int = Color.WHITE, @JsonProperty("fontScale") var fontScale: Float = 1.05f, @JsonProperty("windowColor") var windowColor: Int = Color.TRANSPARENT, ) -@androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class) + class ChromecastSubtitlesFragment : Fragment() { companion object { val applyStyleEvent = Event() @@ -102,7 +97,7 @@ class ChromecastSubtitlesFragment : Fragment() { } private fun onColorSelected(stuff: Pair) { - setColor(stuff.first, stuff.second) + context?.setColor(stuff.first, stuff.second) if (hide) activity?.hideSystemUI() } @@ -125,7 +120,7 @@ class ChromecastSubtitlesFragment : Fragment() { return if (color == Color.TRANSPARENT) Color.BLACK else color } - private fun setColor(id: Int, color: Int?) { + private fun Context.setColor(id: Int, color: Int?) { val realColor = color ?: getDefColor(id) when (id) { 0 -> state.foregroundColor = realColor @@ -138,7 +133,7 @@ class ChromecastSubtitlesFragment : Fragment() { updateState() } - private fun updateState() { + private fun Context.updateState() { //subtitle_text?.setStyle(fromSaveToStyle(state)) } @@ -176,9 +171,9 @@ class ChromecastSubtitlesFragment : Fragment() { fixPaddingStatusbar(binding?.subsRoot) state = getCurrentSavedStyle() - updateState() + context?.updateState() - val isTvSettings = isLayout(TV or EMULATOR) + val isTvSettings = isTvSettings() fun View.setFocusableInTv() { this.isFocusableInTouchMode = isTvSettings @@ -198,7 +193,7 @@ class ChromecastSubtitlesFragment : Fragment() { } this.setOnLongClickListener { - setColor(id, null) + it.context.setColor(id, null) showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT) return@setOnLongClickListener true } @@ -250,13 +245,13 @@ class ChromecastSubtitlesFragment : Fragment() { dismissCallback ) { index -> state.edgeType = edgeTypes.map { it.first }[index] - updateState() + textView.context.updateState() } } binding?.subsEdgeType?.setOnLongClickListener { state.edgeType = defaultState.edgeType - updateState() + it.context.updateState() showToast(R.string.subs_default_reset_toast, Toast.LENGTH_SHORT) return@setOnLongClickListener true } @@ -326,12 +321,12 @@ class ChromecastSubtitlesFragment : Fragment() { dismissCallback ) { index -> state.fontFamily = fontTypes.map { it.first }[index] - updateState() + textView.context.updateState() } } - binding?.subsFont?.setOnLongClickListener { _ -> + binding?.subsFont?.setOnLongClickListener { textView -> state.fontFamily = defaultState.fontFamily - updateState() + textView.context.updateState() showToast(activity, R.string.subs_default_reset_toast, Toast.LENGTH_SHORT) return@setOnLongClickListener true } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt index 8821905e..f053023d 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt @@ -14,13 +14,11 @@ import android.view.ViewGroup import android.widget.TextView import android.widget.Toast import androidx.annotation.FontRes -import androidx.annotation.OptIn import androidx.core.content.res.ResourcesCompat import androidx.fragment.app.Fragment import androidx.preference.PreferenceManager import com.fasterxml.jackson.annotation.JsonProperty import androidx.media3.common.text.Cue -import androidx.media3.common.util.UnstableApi import androidx.media3.ui.CaptionStyleCompat import com.jaredrummler.android.colorpicker.ColorPickerDialog import com.lagradost.cloudstream3.AcraApplication.Companion.getKey @@ -30,8 +28,7 @@ import com.lagradost.cloudstream3.CommonActivity.onDialogDismissedEvent import com.lagradost.cloudstream3.CommonActivity.showToast import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.databinding.SubtitleSettingsBinding -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings import com.lagradost.cloudstream3.utils.DataStore.setKey import com.lagradost.cloudstream3.utils.Event import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog @@ -47,7 +44,7 @@ const val SUBTITLE_KEY = "subtitle_settings" const val SUBTITLE_AUTO_SELECT_KEY = "subs_auto_select" const val SUBTITLE_DOWNLOAD_KEY = "subs_auto_download" -data class SaveCaptionStyle @OptIn(UnstableApi::class) constructor( +data class SaveCaptionStyle( @JsonProperty("foregroundColor") var foregroundColor: Int, @JsonProperty("backgroundColor") var backgroundColor: Int, @JsonProperty("windowColor") var windowColor: Int, @@ -68,7 +65,6 @@ data class SaveCaptionStyle @OptIn(UnstableApi::class) constructor( const val DEF_SUBS_ELEVATION = 20 -@OptIn(androidx.media3.common.util.UnstableApi::class) class SubtitlesFragment : Fragment() { companion object { val applyStyleEvent = Event() @@ -168,7 +164,7 @@ class SubtitlesFragment : Fragment() { activity?.hideSystemUI() } - private fun onDialogDismissed(@Suppress("UNUSED_PARAMETER") id: Int) { + private fun onDialogDismissed(id: Int) { if (hide) activity?.hideSystemUI() } @@ -255,7 +251,7 @@ class SubtitlesFragment : Fragment() { state = getCurrentSavedStyle() context?.updateState() - val isTvTrueSettings = isLayout(TV) + val isTvTrueSettings = isTrueTvSettings() fun View.setFocusableInTv() { this.isFocusableInTouchMode = isTvTrueSettings diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt index f0c948a4..e9b69c5b 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AniSkip.kt @@ -83,7 +83,7 @@ object EpisodeSkip { startMs = start, endMs = end ) - }.let { list -> + }?.let { list -> out.addAll(list) } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt similarity index 78% rename from app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt rename to app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt index 8d65acf7..48917889 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/AppContextUtils.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/AppUtils.kt @@ -43,6 +43,7 @@ import androidx.recyclerview.widget.RecyclerView import androidx.tvprovider.media.tv.* import androidx.tvprovider.media.tv.WatchNextProgram.fromCursor import androidx.viewpager2.widget.ViewPager2 +import com.fasterxml.jackson.module.kotlin.readValue import com.google.android.gms.cast.framework.CastContext import com.google.android.gms.cast.framework.CastState import com.google.android.gms.common.ConnectionResult @@ -50,20 +51,19 @@ import com.google.android.gms.common.GoogleApiAvailability import com.google.android.gms.common.wrappers.Wrappers import com.google.android.material.bottomsheet.BottomSheetDialog import com.lagradost.cloudstream3.* -import com.lagradost.cloudstream3.APIHolder.apis import com.lagradost.cloudstream3.CommonActivity.activity import com.lagradost.cloudstream3.CommonActivity.showToast import com.lagradost.cloudstream3.MainActivity.Companion.afterRepositoryLoadedEvent import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.mvvm.normalSafeApiCall import com.lagradost.cloudstream3.plugins.RepositoryManager -import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.APP_STRING_RESUME_WATCHING +import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.appStringResumeWatching import com.lagradost.cloudstream3.syncproviders.providers.Kitsu import com.lagradost.cloudstream3.ui.WebviewFragment -import com.lagradost.cloudstream3.ui.player.SubtitleData import com.lagradost.cloudstream3.ui.result.ResultFragment -import com.lagradost.cloudstream3.ui.settings.Globals -import com.lagradost.cloudstream3.ui.settings.extensions.PluginsFragment +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings +import com.lagradost.cloudstream3.ui.settings.extensions.PluginsViewModel.Companion.downloadAll import com.lagradost.cloudstream3.ui.settings.extensions.RepositoryData import com.lagradost.cloudstream3.utils.Coroutines.ioSafe import com.lagradost.cloudstream3.utils.Coroutines.main @@ -78,8 +78,9 @@ import okhttp3.Cache import java.io.* import java.net.URL import java.net.URLDecoder +import kotlin.system.measureTimeMillis -object AppContextUtils { +object AppUtils { fun RecyclerView.setMaxViewPoolSize(maxViewTypeId: Int, maxPoolSize: Int) { for (i in 0..maxViewTypeId) recycledViewPool.setMaxRecycledViews(i, maxPoolSize) @@ -160,7 +161,7 @@ object AppContextUtils { .setTitle(title) .setPosterArtUri(Uri.parse(card.posterUrl)) .setIntentUri(Uri.parse(card.id?.let { - "$APP_STRING_RESUME_WATCHING://$it" + "$appStringResumeWatching://$it" } ?: card.url)) .setInternalProviderId(card.url) .setLastEngagementTimeUtcMillis( @@ -371,168 +372,6 @@ object AppContextUtils { } } - fun sortSubs(subs: Set): List { - return subs.sortedBy { it.name } - } - - fun Context.getApiSettings(): HashSet { - //val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) - - val hashSet = HashSet() - val activeLangs = getApiProviderLangSettings() - val hasUniversal = activeLangs.contains(AllLanguagesName) - hashSet.addAll(synchronized(apis) { apis.filter { hasUniversal || activeLangs.contains(it.lang) } } - .map { it.name }) - - /*val set = settingsManager.getStringSet( - this.getString(R.string.search_providers_list_key), - hashSet - )?.toHashSet() ?: hashSet - - val list = HashSet() - for (name in set) { - val api = getApiFromNameNull(name) ?: continue - if (activeLangs.contains(api.lang)) { - list.add(name) - } - }*/ - //if (list.isEmpty()) return hashSet - //return list - return hashSet - } - - fun Context.getApiDubstatusSettings(): HashSet { - val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) - val hashSet = HashSet() - hashSet.addAll(DubStatus.values()) - val list = settingsManager.getStringSet( - this.getString(R.string.display_sub_key), - hashSet.map { it.name }.toMutableSet() - ) ?: return hashSet - - val names = DubStatus.values().map { it.name }.toHashSet() - //if(realSet.isEmpty()) return hashSet - - return list.filter { names.contains(it) }.map { DubStatus.valueOf(it) }.toHashSet() - } - - fun Context.getApiProviderLangSettings(): HashSet { - val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) - val hashSet = hashSetOf(AllLanguagesName) // def is all languages -// hashSet.add("en") // def is only en - val list = settingsManager.getStringSet( - this.getString(R.string.provider_lang_key), - hashSet - ) - - if (list.isNullOrEmpty()) return hashSet - return list.toHashSet() - } - - fun Context.getApiTypeSettings(): HashSet { - val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) - val hashSet = HashSet() - hashSet.addAll(TvType.values()) - val list = settingsManager.getStringSet( - this.getString(R.string.search_types_list_key), - hashSet.map { it.name }.toMutableSet() - ) - - if (list.isNullOrEmpty()) return hashSet - - val names = TvType.values().map { it.name }.toHashSet() - val realSet = list.filter { names.contains(it) }.map { TvType.valueOf(it) }.toHashSet() - if (realSet.isEmpty()) return hashSet - - return realSet - } - - fun Context.updateHasTrailers() { - LoadResponse.isTrailersEnabled = getHasTrailers() - } - - private fun Context.getHasTrailers(): Boolean { - val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) - return settingsManager.getBoolean(this.getString(R.string.show_trailers_key), true) - } - - fun Context.filterProviderByPreferredMedia(hasHomePageIsRequired: Boolean = true): List { - // We are getting the weirdest crash ever done: - // java.lang.ClassCastException: com.lagradost.cloudstream3.TvType cannot be cast to com.lagradost.cloudstream3.TvType - // Trying fixing using classloader fuckery - val oldLoader = Thread.currentThread().contextClassLoader - Thread.currentThread().contextClassLoader = TvType::class.java.classLoader - - val default = TvType.values() - .sorted() - .filter { it != TvType.NSFW } - .map { it.ordinal } - - Thread.currentThread().contextClassLoader = oldLoader - - val defaultSet = default.map { it.toString() }.toSet() - val currentPrefMedia = try { - PreferenceManager.getDefaultSharedPreferences(this) - .getStringSet(this.getString(R.string.prefer_media_type_key), defaultSet) - ?.mapNotNull { it.toIntOrNull() ?: return@mapNotNull null } - } catch (e: Throwable) { - null - } ?: default - val langs = this.getApiProviderLangSettings() - val hasUniversal = langs.contains(AllLanguagesName) - val allApis = synchronized(apis) { - apis.filter { api -> (hasUniversal || langs.contains(api.lang)) && (api.hasMainPage || !hasHomePageIsRequired) } - } - return if (currentPrefMedia.isEmpty()) { - allApis - } else { - // Filter API depending on preferred media type - allApis.filter { api -> api.supportedTypes.any { currentPrefMedia.contains(it.ordinal) } } - } - } - - fun Context.filterSearchResultByFilmQuality(data: List): List { - // Filter results omitting entries with certain quality - if (data.isNotEmpty()) { - val filteredSearchQuality = PreferenceManager.getDefaultSharedPreferences(this) - ?.getStringSet(getString(R.string.pref_filter_search_quality_key), setOf()) - ?.mapNotNull { entry -> - entry.toIntOrNull() ?: return@mapNotNull null - } ?: listOf() - if (filteredSearchQuality.isNotEmpty()) { - return data.filter { item -> - val searchQualVal = item.quality?.ordinal ?: -1 - //Log.i("filterSearch", "QuickSearch item => ${item.toJson()}") - !filteredSearchQuality.contains(searchQualVal) - } - } - } - return data - } - - fun Context.filterHomePageListByFilmQuality(data: HomePageList): HomePageList { - // Filter results omitting entries with certain quality - if (data.list.isNotEmpty()) { - val filteredSearchQuality = PreferenceManager.getDefaultSharedPreferences(this) - ?.getStringSet(getString(R.string.pref_filter_search_quality_key), setOf()) - ?.mapNotNull { entry -> - entry.toIntOrNull() ?: return@mapNotNull null - } ?: listOf() - if (filteredSearchQuality.isNotEmpty()) { - return HomePageList( - name = data.name, - isHorizontalImages = data.isHorizontalImages, - list = data.list.filter { item -> - val searchQualVal = item.quality?.ordinal ?: -1 - //Log.i("filterSearch", "QuickSearch item => ${item.toJson()}") - !filteredSearchQuality.contains(searchQualVal) - } - ) - } - } - return data - } - fun Activity.loadRepository(url: String) { ioSafe { val repo = RepositoryManager.parseRepository(url) ?: return@ioSafe @@ -549,7 +388,7 @@ object AppContextUtils { ) } afterRepositoryLoadedEvent.invoke(true) - addRepositoryDialog(repo.name, url) + downloadAllPluginsDialog(url, repo.name) } } @@ -592,36 +431,25 @@ object AppContextUtils { } } - fun Activity.addRepositoryDialog( - repositoryName: String, - repositoryURL: String, - ) { - val repos = RepositoryManager.getRepositories() - - // navigate to newly added repository on pressing Open Repository - fun openAddedRepo() { - if (repos.isNotEmpty()) { - navigate( - R.id.global_to_navigation_settings_plugins, - PluginsFragment.newInstance( - repositoryName, - repositoryURL, - false, - ) - ) - } - } + fun Activity.downloadAllPluginsDialog(repositoryUrl: String, repositoryName: String) { runOnUiThread { - AlertDialog.Builder(this).apply { - setTitle(repositoryName) - setMessage(R.string.download_all_plugins_from_repo) - setPositiveButton(R.string.open_downloaded_repo) { _, _ -> - openAddedRepo() + val context = this + val builder: AlertDialog.Builder = AlertDialog.Builder(this) + builder.setTitle( + repositoryName + ) + builder.setMessage( + R.string.download_all_plugins_from_repo + ) + builder.apply { + setPositiveButton(R.string.download) { _, _ -> + downloadAll(context, repositoryUrl, null) } - setNegativeButton(R.string.dismiss, null) - show().setDefaultFocus() + + setNegativeButton(R.string.no) { _, _ -> } } + builder.show().setDefaultFocus() } } @@ -677,15 +505,9 @@ object AppContextUtils { } fun Context.isNetworkAvailable(): Boolean { - val connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager - return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - val network = connectivityManager.activeNetwork ?: return false - val networkCapabilities = connectivityManager.getNetworkCapabilities(network) ?: return false - networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) - } else { - @Suppress("DEPRECATION") - connectivityManager.activeNetworkInfo?.isConnected == true - } + val manager = this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + val activeNetworkInfo = manager.activeNetworkInfo + return activeNetworkInfo != null && activeNetworkInfo.isConnected || manager.allNetworkInfo?.any { it.isConnected } ?: false } fun splitQuery(url: URL): Map { @@ -700,6 +522,24 @@ object AppContextUtils { return queryPairs } + /** Any object as json string */ + fun Any.toJson(): String { + if (this is String) return this + return mapper.writeValueAsString(this) + } + + inline fun parseJson(value: String): T { + return mapper.readValue(value) + } + + inline fun tryParseJson(value: String?): T? { + return try { + parseJson(value ?: return null) + } catch (_: Exception) { + null + } + } + /**| S1:E2 Hello World * | Episode 2. Hello world * | Hello World @@ -743,7 +583,7 @@ object AppContextUtils { //private val viewModel: ResultViewModel by activityViewModels() private fun getResultsId(): Int { - return if (Globals.isLayout(Globals.TV or Globals.EMULATOR)) { + return if (isTrueTvSettings()) { R.id.global_to_navigation_results_tv } else { R.id.global_to_navigation_results_phone @@ -769,7 +609,7 @@ object AppContextUtils { val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) Kitsu.isEnabled = settingsManager.getBoolean(this.getString(R.string.show_kitsu_posters_key), true) - } catch (t: Throwable) { + }catch (t : Throwable) { logError(t) } @@ -867,7 +707,7 @@ object AppContextUtils { * Sets the focus to the negative button when in TV and Emulator layout. **/ fun AlertDialog.setDefaultFocus(buttonFocus: Int = DialogInterface.BUTTON_NEGATIVE) { - if (!Globals.isLayout(Globals.TV or Globals.EMULATOR)) return + if (!isTvSettings()) return this.getButton(buttonFocus).run { isFocusableInTouchMode = true requestFocus() @@ -1024,4 +864,4 @@ object AppContextUtils { } return currentAudioFocusRequest } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackPressedCallbackHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackPressedCallbackHelper.kt deleted file mode 100644 index 1326ab27..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackPressedCallbackHelper.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.lagradost.cloudstream3.utils - -import androidx.activity.ComponentActivity -import androidx.activity.OnBackPressedCallback - -object BackPressedCallbackHelper { - private var backPressedCallback: OnBackPressedCallback? = null - - fun ComponentActivity.attachBackPressedCallback(callback: () -> Unit) { - if (backPressedCallback == null) { - backPressedCallback = object : OnBackPressedCallback(true) { - override fun handleOnBackPressed() { - callback.invoke() - } - } - } - - backPressedCallback?.isEnabled = true - - onBackPressedDispatcher.addCallback( - this@attachBackPressedCallback, - backPressedCallback ?: return - ) - } - - fun detachBackPressedCallback() { - backPressedCallback?.isEnabled = false - backPressedCallback = null - } -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt index b25be59f..96593769 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt @@ -10,7 +10,6 @@ import androidx.annotation.WorkerThread import androidx.fragment.app.FragmentActivity import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.module.kotlin.readValue -import com.lagradost.cloudstream3.AcraApplication.Companion.getActivity import com.lagradost.cloudstream3.CommonActivity.showToast import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.mvvm.logError @@ -26,13 +25,13 @@ import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_T import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_UNIXTIME_KEY import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_USER_KEY import com.lagradost.cloudstream3.syncproviders.providers.OpenSubtitlesApi.Companion.OPEN_SUBTITLES_USER_KEY -import com.lagradost.cloudstream3.syncproviders.providers.SubDlApi.Companion.SUBDL_SUBTITLES_USER_KEY import com.lagradost.cloudstream3.ui.result.txt import com.lagradost.cloudstream3.utils.Coroutines.ioSafe import com.lagradost.cloudstream3.utils.Coroutines.main import com.lagradost.cloudstream3.utils.DataStore.getDefaultSharedPrefs import com.lagradost.cloudstream3.utils.DataStore.getSharedPrefs import com.lagradost.cloudstream3.utils.DataStore.mapper +import com.lagradost.cloudstream3.utils.DataStore.setKeyRaw import com.lagradost.cloudstream3.utils.UIHelper.checkWrite import com.lagradost.cloudstream3.utils.UIHelper.requestRW import com.lagradost.cloudstream3.utils.VideoDownloadManager.setupStream @@ -41,7 +40,7 @@ import java.io.OutputStream import java.io.PrintWriter import java.lang.System.currentTimeMillis import java.text.SimpleDateFormat -import java.util.Date +import java.util.* object BackupUtils { @@ -65,28 +64,24 @@ object BackupUtils { PLUGINS_KEY_LOCAL, OPEN_SUBTITLES_USER_KEY, - SUBDL_SUBTITLES_USER_KEY, - - "biometric_key", // can lock down users if backup is shared on a incompatible device "nginx_user", // Nginx user key - "download_path_key" // No access rights after restore data from backup ) - /** false if key should not be contained in backup */ + /** false if blacklisted key */ private fun String.isTransferable(): Boolean { - return !nonTransferableKeys.any { this.contains(it) } + return !nonTransferableKeys.contains(this) } private var restoreFileSelector: ActivityResultLauncher>? = null // Kinda hack, but I couldn't think of a better way data class BackupVars( - @JsonProperty("_Bool") val bool: Map?, - @JsonProperty("_Int") val int: Map?, - @JsonProperty("_String") val string: Map?, - @JsonProperty("_Float") val float: Map?, - @JsonProperty("_Long") val long: Map?, - @JsonProperty("_StringSet") val stringSet: Map?>?, + @JsonProperty("_Bool") val _Bool: Map?, + @JsonProperty("_Int") val _Int: Map?, + @JsonProperty("_String") val _String: Map?, + @JsonProperty("_Float") val _Float: Map?, + @JsonProperty("_Long") val _Long: Map?, + @JsonProperty("_StringSet") val _StringSet: Map?>?, ) data class BackupFile( @@ -95,11 +90,9 @@ object BackupUtils { ) @Suppress("UNCHECKED_CAST") - private fun getBackup(context: Context?): BackupFile? { - if (context == null) return null - - val allData = context.getSharedPrefs().all.filter { it.key.isTransferable() } - val allSettings = context.getDefaultSharedPrefs().all.filter { it.key.isTransferable() } + fun Context.getBackup(): BackupFile { + val allData = getSharedPrefs().all.filter { it.key.isTransferable() } + val allSettings = getDefaultSharedPrefs().all.filter { it.key.isTransferable() } val allDataSorted = BackupVars( allData.filter { it.value is Boolean } as? Map, @@ -126,50 +119,46 @@ object BackupUtils { } @WorkerThread - fun restore( - context: Context?, + fun Context.restore( backupFile: BackupFile, restoreSettings: Boolean, restoreDataStore: Boolean ) { - if (context == null) return if (restoreSettings) { - context.restoreMap(backupFile.settings.bool, true) - context.restoreMap(backupFile.settings.int, true) - context.restoreMap(backupFile.settings.string, true) - context.restoreMap(backupFile.settings.float, true) - context.restoreMap(backupFile.settings.long, true) - context.restoreMap(backupFile.settings.stringSet, true) + restoreMap(backupFile.settings._Bool, true) + restoreMap(backupFile.settings._Int, true) + restoreMap(backupFile.settings._String, true) + restoreMap(backupFile.settings._Float, true) + restoreMap(backupFile.settings._Long, true) + restoreMap(backupFile.settings._StringSet, true) } if (restoreDataStore) { - context.restoreMap(backupFile.datastore.bool) - context.restoreMap(backupFile.datastore.int) - context.restoreMap(backupFile.datastore.string) - context.restoreMap(backupFile.datastore.float) - context.restoreMap(backupFile.datastore.long) - context.restoreMap(backupFile.datastore.stringSet) + restoreMap(backupFile.datastore._Bool) + restoreMap(backupFile.datastore._Int) + restoreMap(backupFile.datastore._String) + restoreMap(backupFile.datastore._Float) + restoreMap(backupFile.datastore._Long) + restoreMap(backupFile.datastore._StringSet) } } @SuppressLint("SimpleDateFormat") - fun backup(context: Context?) = ioSafe { - if (context == null) return@ioSafe - + fun FragmentActivity.backup() = ioSafe { var fileStream: OutputStream? = null var printStream: PrintWriter? = null try { - if (!context.checkWrite()) { + if (!checkWrite()) { showToast(R.string.backup_failed, Toast.LENGTH_LONG) - context.getActivity()?.requestRW() + requestRW() return@ioSafe } val date = SimpleDateFormat("yyyy_MM_dd_HH_mm").format(Date(currentTimeMillis())) val ext = "txt" val displayName = "CS3_Backup_${date}" - val backupFile = getBackup(context) - val stream = setupStream(context, displayName, null, ext, false) + val backupFile = getBackup() + val stream = setupStream(this@backup, displayName, null, ext, false) fileStream = stream.openNew() printStream = PrintWriter(fileStream) @@ -209,8 +198,7 @@ object BackupUtils { val restoredValue = mapper.readValue(input) - restore( - activity, + activity.restore( restoredValue, restoreSettings = true, restoreDataStore = true @@ -256,12 +244,8 @@ object BackupUtils { map: Map?, isEditingAppSettings: Boolean = false ) { - val editor = DataStore.editor(this, isEditingAppSettings) - map?.forEach { - if (it.key.isTransferable()) { - editor.setKeyRaw(it.key, it.value) - } + map?.filter { it.key.isTransferable() }?.forEach { + setKeyRaw(it.key, it.value, isEditingAppSettings) } - editor.apply() } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BiometricAuthenticator.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BiometricAuthenticator.kt deleted file mode 100644 index 45acbab4..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/BiometricAuthenticator.kt +++ /dev/null @@ -1,172 +0,0 @@ -package com.lagradost.cloudstream3.utils - -import android.app.Activity -import android.app.KeyguardManager -import android.content.Context -import android.os.Build -import android.util.Log -import androidx.appcompat.app.AppCompatActivity -import androidx.biometric.BiometricManager -import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG -import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_WEAK -import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL -import androidx.biometric.BiometricPrompt -import androidx.core.content.ContextCompat -import androidx.core.content.ContextCompat.getString -import androidx.fragment.app.FragmentActivity -import androidx.preference.PreferenceManager -import com.lagradost.cloudstream3.CommonActivity.showToast -import com.lagradost.cloudstream3.R - -object BiometricAuthenticator { - - const val TAG = "cs3Auth" - private const val MAX_FAILED_ATTEMPTS = 3 - private var failedAttempts = 0 - private var biometricManager: BiometricManager? = null - var biometricPrompt: BiometricPrompt? = null - var promptInfo: BiometricPrompt.PromptInfo? = null - var authCallback: BiometricCallback? = null // listen to authentication success - - private fun initializeBiometrics(activity: Activity) { - val executor = ContextCompat.getMainExecutor(activity) - - biometricManager = BiometricManager.from(activity) - - biometricPrompt = BiometricPrompt( - activity as FragmentActivity, - executor, - object : BiometricPrompt.AuthenticationCallback() { - override fun onAuthenticationError(errorCode: Int, errString: CharSequence) { - super.onAuthenticationError(errorCode, errString) - showToast("$errString") - Log.e(TAG, "$errorCode") - authCallback?.onAuthenticationError() - //activity.finish() - } - - override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) { - super.onAuthenticationSucceeded(result) - failedAttempts = 0 - authCallback?.onAuthenticationSuccess() - } - - override fun onAuthenticationFailed() { - super.onAuthenticationFailed() - failedAttempts++ - if (failedAttempts >= MAX_FAILED_ATTEMPTS) { - failedAttempts = 0 - activity.finish() - } - } - }) - } - - @Suppress("DEPRECATION") - // authentication dialog prompt builder - private fun authenticationDialog( - activity: Activity, - title: Int, - setDeviceCred: Boolean, - ) { - val description = activity.getString(R.string.biometric_prompt_description) - - if (setDeviceCred) { - // For API level > 30, Newer API setAllowedAuthenticators is used - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - - val authFlag = DEVICE_CREDENTIAL or BIOMETRIC_WEAK or BIOMETRIC_STRONG - promptInfo = BiometricPrompt.PromptInfo.Builder() - .setTitle(activity.getString(title)) - .setDescription(description) - .setAllowedAuthenticators(authFlag) - .build() - } else { - // for apis < 30 - promptInfo = BiometricPrompt.PromptInfo.Builder() - .setTitle(activity.getString(title)) - .setDescription(description) - .setDeviceCredentialAllowed(true) - .build() - } - } else { - // fallback for A12+ when both fingerprint & Face unlock is absent but PIN is set - promptInfo = BiometricPrompt.PromptInfo.Builder() - .setTitle(activity.getString(title)) - .setDescription(description) - .setDeviceCredentialAllowed(true) - .build() - } - } - - private fun isBiometricHardWareAvailable(): Boolean { - // authentication occurs only when this is true and device is truly capable - var result = false - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - when (biometricManager?.canAuthenticate( - DEVICE_CREDENTIAL or BIOMETRIC_STRONG or BIOMETRIC_WEAK - )) { - BiometricManager.BIOMETRIC_SUCCESS -> result = true - BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE -> result = false - BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE -> result = false - BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED -> result = false - BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED -> result = true - BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED -> result = true - BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> result = false - } - } else { - @Suppress("DEPRECATION") - when (biometricManager?.canAuthenticate()) { - BiometricManager.BIOMETRIC_SUCCESS -> result = true - BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE -> result = false - BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE -> result = false - BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED -> result = false - BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED -> result = true - BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED -> result = true - BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> result = false - } - } - - return result - } - - // checks if device is secured i.e has at least some type of lock - fun deviceHasPasswordPinLock(context: Context?): Boolean { - val keyMgr = - context?.getSystemService(AppCompatActivity.KEYGUARD_SERVICE) as? KeyguardManager - return keyMgr?.isKeyguardSecure ?: false - } - - // function to start authentication in any fragment or activity - fun startBiometricAuthentication(activity: Activity, title: Int, setDeviceCred: Boolean) { - initializeBiometrics(activity) - authCallback = activity as? BiometricCallback - if (isBiometricHardWareAvailable()) { - authCallback = activity as? BiometricCallback - authenticationDialog(activity, title, setDeviceCred) - promptInfo?.let { biometricPrompt?.authenticate(it) } - } else { - if (deviceHasPasswordPinLock(activity)) { - authCallback = activity as? BiometricCallback - authenticationDialog(activity, R.string.password_pin_authentication_title, true) - promptInfo?.let { biometricPrompt?.authenticate(it) } - - } else { - showToast(R.string.biometric_unsupported) - } - } - } - - fun isAuthEnabled(ctx: Context):Boolean { - return ctx.let { - PreferenceManager.getDefaultSharedPreferences(ctx) - .getBoolean(getString(ctx, R.string.biometric_key), false) - } - } - - interface BiometricCallback { - fun onAuthenticationSuccess() - fun onAuthenticationError() - } -} diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt index d8373165..6b5e9ec2 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/CastHelper.kt @@ -55,11 +55,7 @@ object CastHelper { val builder = MediaInfo.Builder(link.url) .setStreamType(MediaInfo.STREAM_TYPE_BUFFERED) - .setContentType(when(link.type) { - ExtractorLinkType.M3U8 -> MimeTypes.APPLICATION_M3U8 - ExtractorLinkType.DASH -> MimeTypes.APPLICATION_MPD - else -> MimeTypes.VIDEO_MP4 - }) + .setContentType(if (link.isM3u8) MimeTypes.APPLICATION_M3U8 else MimeTypes.VIDEO_MP4) .setMetadata(movieMetadata) .setMediaTracks(tracks) data?.let { diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/Coroutines.kt similarity index 90% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt rename to app/src/main/java/com/lagradost/cloudstream3/utils/Coroutines.kt index f87ddc6a..c3b244c2 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/Coroutines.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/Coroutines.kt @@ -1,11 +1,12 @@ package com.lagradost.cloudstream3.utils +import android.os.Handler +import android.os.Looper import com.lagradost.cloudstream3.mvvm.launchSafe import com.lagradost.cloudstream3.mvvm.logError import kotlinx.coroutines.* import java.util.Collections.synchronizedList -expect fun runOnMainThreadNative(work: (() -> Unit)) object Coroutines { fun T.main(work: suspend ((T) -> Unit)): Job { val value = this @@ -49,7 +50,10 @@ object Coroutines { } fun runOnMainThread(work: (() -> Unit)) { - runOnMainThreadNative(work) + val mainHandler = Handler(Looper.getMainLooper()) + mainHandler.post { + work() + } } /** diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt index b5192aae..abcef753 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStore.kt @@ -5,7 +5,7 @@ import android.content.SharedPreferences import androidx.preference.PreferenceManager import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.json.JsonMapper -import com.fasterxml.jackson.module.kotlin.kotlinModule +import com.fasterxml.jackson.module.kotlin.KotlinModule import com.lagradost.cloudstream3.AcraApplication.Companion.getKeyClass import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey import com.lagradost.cloudstream3.AcraApplication.Companion.setKeyClass @@ -50,41 +50,8 @@ class PreferenceDelegate( } } -/** When inserting many keys use this function, this is because apply for every key is very expensive on memory */ -data class Editor( - val editor : SharedPreferences.Editor -) { - /** Always remember to call apply after */ - fun setKeyRaw(path: String, value: T) { - @Suppress("UNCHECKED_CAST") - if (isStringSet(value)) { - editor.putStringSet(path, value as Set) - } else { - when (value) { - is Boolean -> editor.putBoolean(path, value) - is Int -> editor.putInt(path, value) - is String -> editor.putString(path, value) - is Float -> editor.putFloat(path, value) - is Long -> editor.putLong(path, value) - } - } - } - - private fun isStringSet(value: Any?) : Boolean { - if (value is Set<*>) { - return value.filterIsInstance().size == value.size - } - return false - } - - fun apply() { - editor.apply() - System.gc() - } -} - object DataStore { - val mapper: JsonMapper = JsonMapper.builder().addModule(kotlinModule()) + val mapper: JsonMapper = JsonMapper.builder().addModule(KotlinModule()) .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build() private fun getPreferences(context: Context): SharedPreferences { @@ -99,10 +66,22 @@ object DataStore { return "${folder}/${path}" } - fun editor(context : Context, isEditingAppSettings: Boolean = false) : Editor { - val editor: SharedPreferences.Editor = - if (isEditingAppSettings) context.getDefaultSharedPrefs().edit() else context.getSharedPrefs().edit() - return Editor(editor) + fun Context.setKeyRaw(path: String, value: T, isEditingAppSettings: Boolean = false) { + try { + val editor: SharedPreferences.Editor = + if (isEditingAppSettings) getDefaultSharedPrefs().edit() else getSharedPrefs().edit() + when (value) { + is Boolean -> editor.putBoolean(path, value) + is Int -> editor.putInt(path, value) + is String -> editor.putString(path, value) + is Float -> editor.putFloat(path, value) + is Long -> editor.putLong(path, value) + (value as? Set != null) -> editor.putStringSet(path, value as Set) + } + editor.apply() + } catch (e: Exception) { + logError(e) + } } fun Context.getDefaultSharedPrefs(): SharedPreferences { diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt index 2fa5f6a3..2eb2ab01 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt @@ -1,42 +1,42 @@ package com.lagradost.cloudstream3.utils import android.content.Context +import android.content.DialogInterface +import android.text.Editable +import android.view.LayoutInflater +import androidx.appcompat.app.AlertDialog +import androidx.core.view.isGone +import androidx.core.widget.doOnTextChanged import com.fasterxml.jackson.annotation.JsonProperty +import com.google.android.material.bottomsheet.BottomSheetDialog +import com.lagradost.cloudstream3.* import com.lagradost.cloudstream3.APIHolder.unixTimeMS -import com.lagradost.cloudstream3.AcraApplication -import com.lagradost.cloudstream3.AcraApplication.Companion.context import com.lagradost.cloudstream3.AcraApplication.Companion.getKey import com.lagradost.cloudstream3.AcraApplication.Companion.getKeys import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys import com.lagradost.cloudstream3.AcraApplication.Companion.setKey import com.lagradost.cloudstream3.CommonActivity.showToast -import com.lagradost.cloudstream3.DubStatus -import com.lagradost.cloudstream3.EpisodeResponse -import com.lagradost.cloudstream3.MainActivity -import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.SearchQuality -import com.lagradost.cloudstream3.SearchResponse -import com.lagradost.cloudstream3.TvType +import com.lagradost.cloudstream3.databinding.WhoIsWatchingAccountEditBinding +import com.lagradost.cloudstream3.databinding.WhoIsWatchingBinding +import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.syncproviders.AccountManager import com.lagradost.cloudstream3.syncproviders.SyncAPI import com.lagradost.cloudstream3.ui.WatchType -import com.lagradost.cloudstream3.ui.library.ListSorting +import com.lagradost.cloudstream3.ui.WhoIsWatchingAdapter +import com.lagradost.cloudstream3.ui.result.FOCUS_SELF import com.lagradost.cloudstream3.ui.result.UiImage import com.lagradost.cloudstream3.ui.result.VideoWatchState -import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia -import java.util.Calendar -import java.util.Date -import java.util.GregorianCalendar -import kotlin.reflect.KClass -import kotlin.reflect.KProperty +import com.lagradost.cloudstream3.ui.result.setImage +import com.lagradost.cloudstream3.ui.result.setLinearListLayout +import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus +import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe const val VIDEO_POS_DUR = "video_pos_dur" const val VIDEO_WATCH_STATE = "video_watch_state" const val RESULT_WATCH_STATE = "result_watch_state" const val RESULT_WATCH_STATE_DATA = "result_watch_state_data" const val RESULT_SUBSCRIBED_STATE_DATA = "result_subscribed_state_data" -const val RESULT_FAVORITES_STATE_DATA = "result_favorites_state_data" const val RESULT_RESUME_WATCHING = "result_resume_watching_2" // changed due to id changes const val RESULT_RESUME_WATCHING_OLD = "result_resume_watching" const val RESULT_RESUME_WATCHING_HAS_MIGRATED = "result_resume_watching_migrated" @@ -44,31 +44,9 @@ const val RESULT_EPISODE = "result_episode" const val RESULT_SEASON = "result_season" const val RESULT_DUB = "result_dub" - -class UserPreferenceDelegate( - private val key: String, private val default: T //, private val klass: KClass -) { - private val klass: KClass = default::class - private val realKey get() = "${DataStoreHelper.currentAccount}/$key" - operator fun getValue(self: Any?, property: KProperty<*>) = - AcraApplication.getKeyClass(realKey, klass.java) ?: default - - operator fun setValue( - self: Any?, - property: KProperty<*>, - t: T? - ) { - if (t == null) { - removeKey(realKey) - } else { - AcraApplication.setKeyClass(realKey, t) - } - } -} - object DataStoreHelper { // be aware, don't change the index of these as Account uses the index for the art - val profileImages = arrayOf( + private val profileImages = arrayOf( R.drawable.profile_bg_dark_blue, R.drawable.profile_bg_blue, R.drawable.profile_bg_orange, @@ -78,49 +56,6 @@ object DataStoreHelper { R.drawable.profile_bg_teal ) - private var searchPreferenceProvidersStrings : List by UserPreferenceDelegate( - /** java moment right here, as listOf()::class.java != List(0) { "" }::class.java */ - "search_pref_providers", List(0) { "" } - ) - - private fun serializeTv(data : List) : List = data.map { it.name } - - private fun deserializeTv(data : List) : List { - return data.mapNotNull { listName -> - TvType.values().firstOrNull { it.name == listName } - } - } - - var searchPreferenceProviders : List - get() { - val ret = searchPreferenceProvidersStrings - return ret.ifEmpty { - context?.filterProviderByPreferredMedia()?.map { it.name } ?: emptyList() - } - } set(value) { - searchPreferenceProvidersStrings = value - } - - private var searchPreferenceTagsStrings : List by UserPreferenceDelegate("search_pref_tags", listOf(TvType.Movie, TvType.TvSeries).map { it.name }) - var searchPreferenceTags : List - get() = deserializeTv(searchPreferenceTagsStrings) - set(value) { - searchPreferenceTagsStrings = serializeTv(value) - } - - - private var homePreferenceStrings : List by UserPreferenceDelegate("home_pref_homepage", listOf(TvType.Movie, TvType.TvSeries).map { it.name }) - var homePreference : List - get() = deserializeTv(homePreferenceStrings) - set(value) { - homePreferenceStrings = serializeTv(value) - } - - var homeBookmarkedList : IntArray by UserPreferenceDelegate("home_bookmarked_last_list", IntArray(0)) - var playBackSpeed : Float by UserPreferenceDelegate("playback_speed", 1.0f) - var resizeMode : Int by UserPreferenceDelegate("resize_mode", 0) - var librarySortingMode : Int by UserPreferenceDelegate("library_sorting_mode", ListSorting.AlphabeticalA.ordinal) - data class Account( @JsonProperty("keyIndex") val keyIndex: Int, @@ -130,8 +65,6 @@ object DataStoreHelper { val customImage: String? = null, @JsonProperty("defaultImageIndex") val defaultImageIndex: Int, - @JsonProperty("lockPin") - val lockPin: String? = null, ) { val image: UiImage get() = customImage?.let { UiImage.Image(it) } ?: UiImage.Drawable( @@ -140,40 +73,103 @@ object DataStoreHelper { } const val TAG = "data_store_helper" - var accounts by PreferenceDelegate("$TAG/account", arrayOf()) + private var accounts by PreferenceDelegate("$TAG/account", arrayOf()) var selectedKeyIndex by PreferenceDelegate("$TAG/account_key_index", 0) val currentAccount: String get() = selectedKeyIndex.toString() - /** - * Get or set the current account homepage. - * Setting this does not automatically reload the homepage. - */ - var currentHomePage: String? - get() = getKey("$currentAccount/$USER_SELECTED_HOMEPAGE_API") - set(value) { - val key = "$currentAccount/$USER_SELECTED_HOMEPAGE_API" - if (value == null) { - removeKey(key) - } else { - setKey(key, value) + private fun setAccount(account: Account) { + selectedKeyIndex = account.keyIndex + showToast(account.name) + MainActivity.bookmarksUpdatedEvent(true) + } + + private fun editAccount(context: Context, account: Account, isNewAccount: Boolean) { + val binding = + WhoIsWatchingAccountEditBinding.inflate(LayoutInflater.from(context), null, false) + val builder = + AlertDialog.Builder(context, R.style.AlertDialogCustom) + .setView(binding.root) + + var currentEditAccount = account + val dialog = builder.show() + binding.accountName.text = Editable.Factory.getInstance()?.newEditable(account.name) + binding.accountName.doOnTextChanged { text, _, _, _ -> + currentEditAccount = currentEditAccount.copy(name = text?.toString() ?: "") + } + + binding.deleteBtt.isGone = isNewAccount + binding.deleteBtt.setOnClickListener { + val dialogClickListener = + DialogInterface.OnClickListener { _, which -> + when (which) { + DialogInterface.BUTTON_POSITIVE -> { + // remove all keys as well as the account, note that default wont get + // deleted from currentAccounts, as it is not part of "accounts", + // but the watch keys will + removeKeys(account.keyIndex.toString()) + val currentAccounts = accounts.toMutableList() + currentAccounts.removeIf { it.keyIndex == account.keyIndex } + accounts = currentAccounts.toTypedArray() + + // update UI + setAccount(getDefaultAccount(context)) + MainActivity.bookmarksUpdatedEvent(true) + dialog?.dismissSafe() + } + + DialogInterface.BUTTON_NEGATIVE -> {} + } + } + + try { + AlertDialog.Builder(context).setTitle(R.string.delete).setMessage( + context.getString(R.string.delete_message).format( + currentEditAccount.name + ) + ) + .setPositiveButton(R.string.delete, dialogClickListener) + .setNegativeButton(R.string.cancel, dialogClickListener) + .show().setDefaultFocus() + } catch (t: Throwable) { + logError(t) + // ye you somehow fucked up formatting did you? } } - fun setAccount(account: Account) { - val homepage = currentHomePage + binding.cancelBtt.setOnClickListener { + dialog?.dismissSafe() + } - selectedKeyIndex = account.keyIndex - showToast(context?.getString(R.string.logged_account, account.name) ?: account.name) - MainActivity.bookmarksUpdatedEvent(true) - MainActivity.reloadLibraryEvent(true) - val oldAccount = accounts.find { it.keyIndex == account.keyIndex } - if (oldAccount != null && currentHomePage != homepage) { - // This is not a new account, and the homepage has changed, reload it - MainActivity.reloadHomeEvent(true) + binding.profilePic.setImage(account.image) + binding.profilePic.setOnClickListener { + // rolls the image forwards once + currentEditAccount = + currentEditAccount.copy(defaultImageIndex = (currentEditAccount.defaultImageIndex + 1) % profileImages.size) + binding.profilePic.setImage(currentEditAccount.image) + } + + binding.applyBtt.setOnClickListener { + val currentAccounts = accounts.toMutableList() + + val overrideIndex = + currentAccounts.indexOfFirst { it.keyIndex == currentEditAccount.keyIndex } + + // if an account is found that has the same keyIndex then override that one, if not then append it + if (overrideIndex != -1) { + currentAccounts[overrideIndex] = currentEditAccount + } else { + currentAccounts.add(currentEditAccount) + } + + // set the new default account as well as add the key for the new account + setAccount(currentEditAccount) + accounts = currentAccounts.toTypedArray() + + dialog.dismissSafe() } } - fun getDefaultAccount(context: Context): Account { + private fun getDefaultAccount(context: Context): Account { return accounts.let { currentAccounts -> currentAccounts.getOrNull(currentAccounts.indexOfFirst { it.keyIndex == 0 }) ?: Account( keyIndex = 0, @@ -183,14 +179,69 @@ object DataStoreHelper { } } - fun getAccounts(context: Context): List { - return accounts.toMutableList().apply { + fun showWhoIsWatching(context: Context) { + val binding: WhoIsWatchingBinding = WhoIsWatchingBinding.inflate( + LayoutInflater.from(context) + ) + + val showAccount = accounts.toMutableList().apply { val item = getDefaultAccount(context) remove(item) add(0, item) } + + val builder = + BottomSheetDialog(context) + builder.setContentView(binding.root) + val accountName = context.getString(R.string.account) + + binding.profilesRecyclerview.setLinearListLayout( + isHorizontal = true, + nextUp = FOCUS_SELF, + nextDown = FOCUS_SELF, + nextLeft = FOCUS_SELF, + nextRight = FOCUS_SELF + ) + binding.profilesRecyclerview.adapter = WhoIsWatchingAdapter( + selectCallBack = { account -> + setAccount(account) + builder.dismissSafe() + }, + addAccountCallback = { + val currentAccounts = accounts + val remainingImages = + profileImages.toSet() - currentAccounts.filter { it.customImage == null } + .mapNotNull { profileImages.getOrNull(it.defaultImageIndex) }.toSet() + val image = + profileImages.indexOf(remainingImages.randomOrNull() ?: profileImages.random()) + val keyIndex = (currentAccounts.maxOfOrNull { it.keyIndex } ?: 0) + 1 + + // create a new dummy account + editAccount( + context, + Account( + keyIndex = keyIndex, + name = "$accountName $keyIndex", + customImage = null, + defaultImageIndex = image + ), isNewAccount = true + ) + builder.dismissSafe() + }, + editCallBack = { account -> + editAccount( + context, account, isNewAccount = false + ) + builder.dismissSafe() + } + ).apply { + submitList(showAccount) + } + + builder.show() } + data class PosDur( @JsonProperty("position") val position: Long, @JsonProperty("duration") val duration: Long @@ -205,46 +256,23 @@ object DataStoreHelper { return this } - fun Int.toYear() : Date = GregorianCalendar.getInstance().also { it.set(Calendar.YEAR, this) }.time - /** * Used to display notifications on new episodes and posters in library. **/ - abstract class LibrarySearchResponse( + data class SubscribedData( @JsonProperty("id") override var id: Int?, - @JsonProperty("latestUpdatedTime") open val latestUpdatedTime: Long, + @JsonProperty("subscribedTime") val bookmarkedTime: Long, + @JsonProperty("latestUpdatedTime") val latestUpdatedTime: Long, + @JsonProperty("lastSeenEpisodeCount") val lastSeenEpisodeCount: Map, @JsonProperty("name") override val name: String, @JsonProperty("url") override val url: String, @JsonProperty("apiName") override val apiName: String, - @JsonProperty("type") override var type: TvType?, + @JsonProperty("type") override var type: TvType? = null, @JsonProperty("posterUrl") override var posterUrl: String?, - @JsonProperty("year") open val year: Int?, - @JsonProperty("syncData") open val syncData: Map?, - @JsonProperty("quality") override var quality: SearchQuality?, - @JsonProperty("posterHeaders") override var posterHeaders: Map?, - @JsonProperty("plot") open val plot : String? = null, - @JsonProperty("rating") open val rating : Int? = null, - @JsonProperty("tags") open val tags : List? = null, - ) : SearchResponse - - data class SubscribedData( - @JsonProperty("subscribedTime") val subscribedTime: Long, - @JsonProperty("lastSeenEpisodeCount") val lastSeenEpisodeCount: Map, - override var id: Int?, - override val latestUpdatedTime: Long, - override val name: String, - override val url: String, - override val apiName: String, - override var type: TvType?, - override var posterUrl: String?, - override val year: Int?, - override val syncData: Map? = null, - override var quality: SearchQuality? = null, - override var posterHeaders: Map? = null, - override val plot: String? = null, - override val rating: Int? = null, - override val tags: List? = null, - ) : LibrarySearchResponse(id, latestUpdatedTime, name, url, apiName, type, posterUrl, year, syncData, quality, posterHeaders, plot,rating,tags) { + @JsonProperty("year") val year: Int?, + @JsonProperty("quality") override var quality: SearchQuality? = null, + @JsonProperty("posterHeaders") override var posterHeaders: Map? = null, + ) : SearchResponse { fun toLibraryItem(): SyncAPI.LibraryItem? { return SyncAPI.LibraryItem( name, @@ -254,28 +282,24 @@ object DataStoreHelper { null, null, latestUpdatedTime, - apiName, type, posterUrl, posterHeaders, quality, year?.toYear(), this.id, plot = this.plot, rating = this.rating, tags = this.tags + apiName, type, posterUrl, posterHeaders, quality, this.id ) } } data class BookmarkedData( + @JsonProperty("id") override var id: Int?, @JsonProperty("bookmarkedTime") val bookmarkedTime: Long, - override var id: Int?, - override val latestUpdatedTime: Long, - override val name: String, - override val url: String, - override val apiName: String, - override var type: TvType?, - override var posterUrl: String?, - override val year: Int?, - override val syncData: Map? = null, - override var quality: SearchQuality? = null, - override var posterHeaders: Map? = null, - override val plot: String? = null, - override val rating: Int? = null, - override val tags: List? = null, - ) : LibrarySearchResponse(id, latestUpdatedTime, name, url, apiName, type, posterUrl, year, syncData, quality, posterHeaders, plot) { + @JsonProperty("latestUpdatedTime") val latestUpdatedTime: Long, + @JsonProperty("name") override val name: String, + @JsonProperty("url") override val url: String, + @JsonProperty("apiName") override val apiName: String, + @JsonProperty("type") override var type: TvType? = null, + @JsonProperty("posterUrl") override var posterUrl: String?, + @JsonProperty("year") val year: Int?, + @JsonProperty("quality") override var quality: SearchQuality? = null, + @JsonProperty("posterHeaders") override var posterHeaders: Map? = null, + ) : SearchResponse { fun toLibraryItem(id: String): SyncAPI.LibraryItem { return SyncAPI.LibraryItem( name, @@ -285,38 +309,7 @@ object DataStoreHelper { null, null, latestUpdatedTime, - apiName, type, posterUrl, posterHeaders, quality, year?.toYear(), this.id, plot = this.plot, rating = this.rating, tags = this.tags - ) - } - } - - data class FavoritesData( - @JsonProperty("favoritesTime") val favoritesTime: Long, - override var id: Int?, - override val latestUpdatedTime: Long, - override val name: String, - override val url: String, - override val apiName: String, - override var type: TvType?, - override var posterUrl: String?, - override val year: Int?, - override val syncData: Map? = null, - override var quality: SearchQuality? = null, - override var posterHeaders: Map? = null, - override val plot: String? = null, - override val rating: Int? = null, - override val tags: List? = null, - ) : LibrarySearchResponse(id, latestUpdatedTime, name, url, apiName, type, posterUrl, year, syncData, quality, posterHeaders,plot) { - fun toLibraryItem(): SyncAPI.LibraryItem? { - return SyncAPI.LibraryItem( - name, - url, - id?.toString() ?: return null, - null, - null, - null, - latestUpdatedTime, - apiName, type, posterUrl, posterHeaders, quality, year?.toYear(), this.id, plot = this.plot, rating = this.rating, tags = this.tags + apiName, type, posterUrl, posterHeaders, quality, this.id ) } } @@ -353,9 +346,15 @@ object DataStoreHelper { removeKeys(folder) } - fun deleteBookmarkedData(id: Int?) { + fun deleteAllBookmarkedData() { + val folder1 = "$currentAccount/$RESULT_WATCH_STATE" + val folder2 = "$currentAccount/$RESULT_WATCH_STATE_DATA" + removeKeys(folder1) + removeKeys(folder2) + } + + fun deleteBookmarkedData(id : Int?) { if (id == null) return - AccountManager.localListApi.requireLibraryRefresh = true removeKey("$currentAccount/$RESULT_WATCH_STATE", id.toString()) removeKey("$currentAccount/$RESULT_WATCH_STATE_DATA", id.toString()) } @@ -453,12 +452,6 @@ object DataStoreHelper { return getKey("$currentAccount/$RESULT_WATCH_STATE_DATA", id.toString()) } - fun getAllBookmarkedData(): List { - return getKeys("$currentAccount/$RESULT_WATCH_STATE_DATA")?.mapNotNull { - getKey(it) - } ?: emptyList() - } - fun getAllSubscriptions(): List { return getKeys("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA")?.mapNotNull { getKey(it) @@ -494,29 +487,6 @@ object DataStoreHelper { return getKey("$currentAccount/$RESULT_SUBSCRIBED_STATE_DATA", id.toString()) } - fun getAllFavorites(): List { - return getKeys("$currentAccount/$RESULT_FAVORITES_STATE_DATA")?.mapNotNull { - getKey(it) - } ?: emptyList() - } - - fun removeFavoritesData(id: Int?) { - if (id == null) return - AccountManager.localListApi.requireLibraryRefresh = true - removeKey("$currentAccount/$RESULT_FAVORITES_STATE_DATA", id.toString()) - } - - fun setFavoritesData(id: Int?, data: FavoritesData) { - if (id == null) return - setKey("$currentAccount/$RESULT_FAVORITES_STATE_DATA", id.toString(), data) - AccountManager.localListApi.requireLibraryRefresh = true - } - - fun getFavoritesData(id: Int?): FavoritesData? { - if (id == null) return null - return getKey("$currentAccount/$RESULT_FAVORITES_STATE_DATA", id.toString()) - } - fun setViewPos(id: Int?, pos: Long, dur: Long) { if (id == null) return if (dur < 30_000) return // too short diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt index c92da214..421e4420 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/DownloadFileWorkManager.kt @@ -7,6 +7,7 @@ import androidx.work.ForegroundInfo import androidx.work.WorkerParameters import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey import com.lagradost.cloudstream3.mvvm.logError +import com.lagradost.cloudstream3.utils.Coroutines.ioSafe import com.lagradost.cloudstream3.utils.Coroutines.main import com.lagradost.cloudstream3.utils.DataStore.getKey import com.lagradost.cloudstream3.utils.VideoDownloadManager.WORK_KEY_INFO diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/Event.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/Event.kt index a0dfe734..57a5f8e4 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/Event.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/Event.kt @@ -3,24 +3,18 @@ package com.lagradost.cloudstream3.utils class Event { private val observers = mutableSetOf<(T) -> Unit>() - val size: Int get() = observers.size + val size : Int get() = observers.size operator fun plusAssign(observer: (T) -> Unit) { - synchronized(observers) { - observers.add(observer) - } + observers.add(observer) } operator fun minusAssign(observer: (T) -> Unit) { - synchronized(observers) { - observers.remove(observer) - } + observers.remove(observer) } operator fun invoke(value: T) { - synchronized(observers) { - for (observer in observers) - observer(value) - } + for (observer in observers) + observer(value) } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt new file mode 100644 index 00000000..83c61542 --- /dev/null +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/ExtractorApi.kt @@ -0,0 +1,556 @@ +package com.lagradost.cloudstream3.utils + +import android.net.Uri +import com.lagradost.cloudstream3.* +import com.lagradost.cloudstream3.mvvm.logError +import com.lagradost.cloudstream3.extractors.* +import kotlinx.coroutines.delay +import org.jsoup.Jsoup +import kotlin.collections.MutableList + +/** + * For use in the ConcatenatingMediaSource. + * If features are missing (headers), please report and we can add it. + * @param durationUs use Long.toUs() for easier input + * */ +data class PlayListItem( + val url: String, + val durationUs: Long, +) + +/** + * Converts Seconds to MicroSeconds, multiplication by 1_000_000 + * */ +fun Long.toUs(): Long { + return this * 1_000_000 +} + +/** + * If your site has an unorthodox m3u8-like system where there are multiple smaller videos concatenated + * use this. + * */ +data class ExtractorLinkPlayList( + override val source: String, + override val name: String, + val playlist: List, + override val referer: String, + override val quality: Int, + override val isM3u8: Boolean = false, + override val headers: Map = mapOf(), + /** Used for getExtractorVerifierJob() */ + override val extractorData: String? = null, +) : ExtractorLink( + source, + name, + // Blank as un-used + "", + referer, + quality, + isM3u8, + headers, + extractorData +) + + +open class ExtractorLink constructor( + open val source: String, + open val name: String, + override val url: String, + override val referer: String, + open val quality: Int, + open val isM3u8: Boolean = false, + override val headers: Map = mapOf(), + /** Used for getExtractorVerifierJob() */ + open val extractorData: String? = null, + open val isDash: Boolean = false, +) : VideoDownloadManager.IDownloadableMinimum { + /** + * Old constructor without isDash, allows for backwards compatibility with extensions. + * Should be removed after all extensions have updated their cloudstream.jar + **/ + constructor( + source: String, + name: String, + url: String, + referer: String, + quality: Int, + isM3u8: Boolean = false, + headers: Map = mapOf(), + /** Used for getExtractorVerifierJob() */ + extractorData: String? = null + ) : this(source, name, url, referer, quality, isM3u8, headers, extractorData, false) + + override fun toString(): String { + return "ExtractorLink(name=$name, url=$url, referer=$referer, isM3u8=$isM3u8)" + } +} + +data class ExtractorUri( + val uri: Uri, + val name: String, + + val basePath: String? = null, + val relativePath: String? = null, + val displayName: String? = null, + + val id: Int? = null, + val parentId: Int? = null, + val episode: Int? = null, + val season: Int? = null, + val headerName: String? = null, + val tvType: TvType? = null, +) + +data class ExtractorSubtitleLink( + val name: String, + override val url: String, + override val referer: String, + override val headers: Map = mapOf() +) : VideoDownloadManager.IDownloadableMinimum + +/** + * Removes https:// and www. + * To match urls regardless of schema, perhaps Uri() can be used? + */ +val schemaStripRegex = Regex("""^(https:|)//(www\.|)""") + +enum class Qualities(var value: Int, val defaultPriority: Int) { + Unknown(400, 4), + P144(144, 0), // 144p + P240(240, 2), // 240p + P360(360, 3), // 360p + P480(480, 4), // 480p + P720(720, 5), // 720p + P1080(1080, 6), // 1080p + P1440(1440, 7), // 1440p + P2160(2160, 8); // 4k or 2160p + + companion object { + fun getStringByInt(qual: Int?): String { + return when (qual) { + 0 -> "Auto" + Unknown.value -> "" + P2160.value -> "4K" + null -> "" + else -> "${qual}p" + } + } + fun getStringByIntFull(quality: Int): String { + return when (quality) { + 0 -> "Auto" + Unknown.value -> "Unknown" + P2160.value -> "4K" + else -> "${quality}p" + } + } + } +} + +fun getQualityFromName(qualityName: String?): Int { + if (qualityName == null) + return Qualities.Unknown.value + + val match = qualityName.lowercase().replace("p", "").trim() + return when (match) { + "4k" -> Qualities.P2160 + else -> null + }?.value ?: match.toIntOrNull() ?: Qualities.Unknown.value +} + +private val packedRegex = Regex("""eval\(function\(p,a,c,k,e,.*\)\)""") +fun getPacked(string: String): String? { + return packedRegex.find(string)?.value +} + +fun getAndUnpack(string: String): String { + val packedText = getPacked(string) + return JsUnpacker(packedText).unpack() ?: string +} + +suspend fun unshortenLinkSafe(url: String): String { + return try { + if (ShortLink.isShortLink(url)) + ShortLink.unshorten(url) + else url + } catch (e: Exception) { + logError(e) + url + } +} + +suspend fun loadExtractor( + url: String, + subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit +): Boolean { + return loadExtractor( + url = url, + referer = null, + subtitleCallback = subtitleCallback, + callback = callback + ) +} + +/** + * Tries to load the appropriate extractor based on link, returns true if any extractor is loaded. + * */ +suspend fun loadExtractor( + url: String, + referer: String? = null, + subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit +): Boolean { + val currentUrl = unshortenLinkSafe(url) + val compareUrl = currentUrl.lowercase().replace(schemaStripRegex, "") + for (extractor in extractorApis) { + if (compareUrl.startsWith(extractor.mainUrl.replace(schemaStripRegex, ""))) { + extractor.getSafeUrl(currentUrl, referer, subtitleCallback, callback) + return true + } + } + + return false +} + +val extractorApis: MutableList = arrayListOf( + //AllProvider(), + WcoStream(), + Vidstreamz(), + Vizcloud(), + Vizcloud2(), + VizcloudOnline(), + VizcloudXyz(), + VizcloudLive(), + VizcloudInfo(), + MwvnVizcloudInfo(), + VizcloudDigital(), + VizcloudCloud(), + VizcloudSite(), + VideoVard(), + VideovardSX(), + Mp4Upload(), + StreamTape(), + StreamTapeNet(), + ShaveTape(), + + //mixdrop extractors + MixDropBz(), + MixDropCh(), + MixDropTo(), + + MixDrop(), + + Mcloud(), + XStreamCdn(), + + StreamSB(), + Sblona(), + Vidgomunimesb(), + StreamSB1(), + StreamSB2(), + StreamSB3(), + StreamSB4(), + StreamSB5(), + StreamSB6(), + StreamSB7(), + StreamSB8(), + StreamSB9(), + StreamSB10(), + StreamSB11(), + SBfull(), + // Streamhub(), cause Streamhub2() works + Streamhub2(), + Ssbstream(), + Sbthe(), + Vidgomunime(), + Sbflix(), + Streamsss(), + Sbspeed(), + Sbsonic(), + Sbface(), + Sbrapid(), + Lvturbo(), + + Fastream(), + + FEmbed(), + FeHD(), + Fplayer(), + DBfilm(), + Luxubu(), + LayarKaca(), + Rasacintaku(), + FEnet(), + Kotakajair(), + Cdnplayer(), + // WatchSB(), 'cause StreamSB.kt works + Uqload(), + Uqload1(), + Uqload2(), + Evoload(), + Evoload1(), + UpstreamExtractor(), + + Tomatomatela(), + TomatomatelalClub(), + Cinestart(), + OkRu(), + OkRuHttps(), + Okrulink(), + Sendvid(), + + // dood extractors + DoodCxExtractor(), + DoodPmExtractor(), + DoodToExtractor(), + DoodSoExtractor(), + DoodLaExtractor(), + Dooood(), + DoodWsExtractor(), + DoodShExtractor(), + DoodWatchExtractor(), + DoodWfExtractor(), + DoodYtExtractor(), + + AsianLoad(), + + // GenericM3U8(), + Jawcloud(), + Zplayer(), + ZplayerV2(), + Upstream(), + + Maxstream(), + Tantifilm(), + Userload(), + Supervideo(), + GuardareStream(), + CineGrabber(), + Vanfem(), + + // StreamSB.kt works + // SBPlay(), + // SBPlay1(), + // SBPlay2(), + + PlayerVoxzer(), + + BullStream(), + GMPlayer(), + + Blogger(), + Solidfiles(), + YourUpload(), + + Hxfile(), + KotakAnimeid(), + Neonime8n(), + Neonime7n(), + Yufiles(), + Aico(), + + JWPlayer(), + Meownime(), + DesuArcg(), + DesuOdchan(), + DesuOdvip(), + DesuDrive(), + + Chillx(), + Moviesapi(), + Watchx(), + Bestx(), + Keephealth(), + Sbnet(), + Sbasian(), + Sblongvu(), + Fembed9hd(), + StreamM4u(), + Krakenfiles(), + Gofile(), + Vicloud(), + Uservideo(), + Userscloud(), + + Movhide(), + StreamhideCom(), + StreamhideTo(), + Pixeldrain(), + Wibufile(), + FileMoonIn(), + Moviesm4u(), + Filesim(), + Ahvsh(), + Guccihide(), + FileMoon(), + FileMoonSx(), + Vido(), + Linkbox(), + Acefile(), + SpeedoStream(), + SpeedoStream1(), + Zorofile(), + Embedgram(), + Mvidoo(), + Streamplay(), + Vidmoly(), + Vidmolyme(), + Voe(), + Tubeless(), + Moviehab(), + MoviehabNet(), + Jeniusplay(), + StreamoUpload(), + + Gdriveplayerapi(), + Gdriveplayerapp(), + Gdriveplayerfun(), + Gdriveplayerio(), + Gdriveplayerme(), + Gdriveplayerbiz(), + Gdriveplayerorg(), + Gdriveplayerus(), + Gdriveplayerco(), + Gdriveplayer(), + DatabaseGdrive(), + DatabaseGdrive2(), + + YoutubeExtractor(), + YoutubeShortLinkExtractor(), + YoutubeMobileExtractor(), + YoutubeNoCookieExtractor(), + Streamlare(), + VidSrcExtractor(), + VidSrcExtractor2(), + PlayLtXyz(), + AStreamHub(), + + Cda(), + Dailymotion(), + ByteShare(), + Ztreamhub(), + Rabbitstream(), + Dokicloud(), + Megacloud(), +) + + +fun getExtractorApiFromName(name: String): ExtractorApi { + for (api in extractorApis) { + if (api.name == name) return api + } + return extractorApis[0] +} + +fun requireReferer(name: String): Boolean { + return getExtractorApiFromName(name).requiresReferer +} + +fun httpsify(url: String): String { + return if (url.startsWith("//")) "https:$url" else url +} + +suspend fun getPostForm(requestUrl: String, html: String): String? { + val document = Jsoup.parse(html) + val inputs = document.select("Form > input") + if (inputs.size < 4) return null + var op: String? = null + var id: String? = null + var mode: String? = null + var hash: String? = null + + for (input in inputs) { + val value = input.attr("value") ?: continue + when (input.attr("name")) { + "op" -> op = value + "id" -> id = value + "mode" -> mode = value + "hash" -> hash = value + else -> Unit + } + } + if (op == null || id == null || mode == null || hash == null) { + return null + } + delay(5000) // ye this is needed, wont work with 0 delay + + return app.post( + requestUrl, + headers = mapOf( + "content-type" to "application/x-www-form-urlencoded", + "referer" to requestUrl, + "user-agent" to USER_AGENT, + "accept" to "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" + ), + data = mapOf("op" to op, "id" to id, "mode" to mode, "hash" to hash) + ).text +} + +fun ExtractorApi.fixUrl(url: String): String { + if (url.startsWith("http") || + // Do not fix JSON objects when passed as urls. + url.startsWith("{\"") + ) { + return url + } + if (url.isEmpty()) { + return "" + } + + val startsWithNoHttp = url.startsWith("//") + if (startsWithNoHttp) { + return "https:$url" + } else { + if (url.startsWith('/')) { + return mainUrl + url + } + return "$mainUrl/$url" + } +} + +abstract class ExtractorApi { + abstract val name: String + abstract val mainUrl: String + abstract val requiresReferer: Boolean + + /** Determines which plugin a given extractor is from */ + var sourcePlugin: String? = null + + //suspend fun getSafeUrl(url: String, referer: String? = null): List? { + // return suspendSafeApiCall { getUrl(url, referer) } + //} + + // this is the new extractorapi, override to add subtitles and stuff + open suspend fun getUrl( + url: String, + referer: String? = null, + subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit + ) { + getUrl(url, referer)?.forEach(callback) + } + + suspend fun getSafeUrl( + url: String, + referer: String? = null, + subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit + ) { + try { + getUrl(url, referer, subtitleCallback, callback) + } catch (e: Exception) { + logError(e) + } + } + + /** + * Will throw errors, use getSafeUrl if you don't want to handle the exception yourself + */ + open suspend fun getUrl(url: String, referer: String? = null): List? { + return emptyList() + } + + open fun getExtractorUrl(id: String): String { + return id + } +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/GlideApp.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/GlideApp.kt index 38d3fe9e..4b0ee890 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/GlideApp.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/GlideApp.kt @@ -8,7 +8,6 @@ import com.bumptech.glide.Registry import com.bumptech.glide.annotation.GlideModule import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader import com.bumptech.glide.load.engine.DiskCacheStrategy -import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory import com.bumptech.glide.load.model.GlideUrl import com.bumptech.glide.module.AppGlideModule import com.bumptech.glide.request.RequestOptions @@ -28,10 +27,6 @@ class GlideModule : AppGlideModule() { RequestOptions() .diskCacheStrategy(DiskCacheStrategy.ALL) .signature(ObjectKey(System.currentTimeMillis().toShort())) - }.setDiskCache { - // Possible to make this a setting in the future. - val memoryCacheSizeBytes: Long = 1024 * 1024 * 100 // 100mb - InternalCacheDiskCacheFactory(context, memoryCacheSizeBytes).build() } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/IOnBackPressed.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/IOnBackPressed.kt new file mode 100644 index 00000000..b4922945 --- /dev/null +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/IOnBackPressed.kt @@ -0,0 +1,5 @@ +package com.lagradost.cloudstream3.utils + +interface IOnBackPressed { + fun onBackPressed(): Boolean +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt index 59f534ff..b2c4aa5c 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt @@ -23,8 +23,7 @@ import okio.buffer import okio.sink import java.io.File import android.text.TextUtils -import com.lagradost.cloudstream3.MainActivity.Companion.deleteFileOnExit -import com.lagradost.cloudstream3.utils.AppContextUtils.setDefaultFocus +import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus import java.io.BufferedReader import java.io.IOException import java.io.InputStreamReader @@ -32,26 +31,26 @@ import java.io.InputStreamReader class InAppUpdater { companion object { - private const val GITHUB_USER_NAME = "recloudstream" - private const val GITHUB_REPO = "cloudstream" + const val GITHUB_USER_NAME = "recloudstream" + const val GITHUB_REPO = "cloudstream" - private const val LOG_TAG = "InAppUpdater" + const val LOG_TAG = "InAppUpdater" // === IN APP UPDATER === data class GithubAsset( @JsonProperty("name") val name: String, @JsonProperty("size") val size: Int, // Size bytes - @JsonProperty("browser_download_url") val browserDownloadUrl: String, // download link - @JsonProperty("content_type") val contentType: String, // application/vnd.android.package-archive + @JsonProperty("browser_download_url") val browser_download_url: String, // download link + @JsonProperty("content_type") val content_type: String, // application/vnd.android.package-archive ) data class GithubRelease( - @JsonProperty("tag_name") val tagName: String, // Version code + @JsonProperty("tag_name") val tag_name: String, // Version code @JsonProperty("body") val body: String, // Desc @JsonProperty("assets") val assets: List, - @JsonProperty("target_commitish") val targetCommitish: String, // branch + @JsonProperty("target_commitish") val target_commitish: String, // branch @JsonProperty("prerelease") val prerelease: Boolean, - @JsonProperty("node_id") val nodeId: String //Node Id + @JsonProperty("node_id") val node_id: String //Node Id ) data class GithubObject( @@ -61,7 +60,7 @@ class InAppUpdater { ) data class GithubTag( - @JsonProperty("object") val githubObject: GithubObject, + @JsonProperty("object") val github_object: GithubObject, ) data class Update( @@ -110,19 +109,18 @@ class InAppUpdater { releases.sortedWith(compareBy { versionRegex.find(it.name)?.groupValues?.get(2) }).toList().lastOrNull()*/ - val foundList = + val found = response.filter { rel -> !rel.prerelease }.sortedWith(compareBy { release -> - release.assets.firstOrNull { it.contentType == "application/vnd.android.package-archive" }?.name?.let { it1 -> + release.assets.filter { it.content_type == "application/vnd.android.package-archive" } + .getOrNull(0)?.name?.let { it1 -> versionRegex.find( it1 - )?.groupValues?.let { - it[3].toInt() * 100_000_000 + it[4].toInt() * 10_000 + it[5].toInt() - } + )?.groupValues?.get(2) } - }).toList() - val found = foundList.lastOrNull() + }).toList().lastOrNull() + val foundAsset = found?.assets?.getOrNull(0) val currentVersion = packageName?.let { packageManager.getPackageInfo( @@ -134,7 +132,7 @@ class InAppUpdater { foundAsset?.name?.let { assetName -> val foundVersion = versionRegex.find(assetName) val shouldUpdate = - if (foundAsset.browserDownloadUrl != "" && foundVersion != null) currentVersion?.versionName?.let { versionName -> + if (foundAsset.browser_download_url != "" && foundVersion != null) currentVersion?.versionName?.let { versionName -> versionRegexLocal.find(versionName)?.groupValues?.let { it[3].toInt() * 100_000_000 + it[4].toInt() * 10_000 + it[5].toInt() } @@ -146,10 +144,10 @@ class InAppUpdater { return if (foundVersion != null) { Update( shouldUpdate, - foundAsset.browserDownloadUrl, + foundAsset.browser_download_url, foundVersion.groupValues[2], found.body, - found.nodeId + found.node_id ) } else { Update(false, null, null, null, null) @@ -168,33 +166,33 @@ class InAppUpdater { val found = response.lastOrNull { rel -> - rel.prerelease || rel.tagName == "pre-release" + rel.prerelease || rel.tag_name == "pre-release" } val foundAsset = found?.assets?.filter { it -> - it.contentType == "application/vnd.android.package-archive" + it.content_type == "application/vnd.android.package-archive" }?.getOrNull(0) val tagResponse = parseJson(app.get(tagUrl, headers = headers).text) - Log.d(LOG_TAG, "Fetched GitHub tag: ${tagResponse.githubObject.sha.take(7)}") + Log.d(LOG_TAG, "Fetched GitHub tag: ${tagResponse.github_object.sha.take(7)}") val shouldUpdate = (getString(R.string.commit_hash) .trim { c -> c.isWhitespace() } .take(7) != - tagResponse.githubObject.sha + tagResponse.github_object.sha .trim { c -> c.isWhitespace() } .take(7)) return if (foundAsset != null) { Update( shouldUpdate, - foundAsset.browserDownloadUrl, - tagResponse.githubObject.sha.take(10), + foundAsset.browser_download_url, + tagResponse.github_object.sha, found.body, - found.nodeId + found.node_id ) } else { Update(false, null, null, null, null) @@ -214,7 +212,7 @@ class InAppUpdater { this.cacheDir.listFiles()?.filter { it.name.startsWith(appUpdateName) && it.extension == appUpdateSuffix }?.forEach { - deleteFileOnExit(it) + it.deleteOnExit() } val downloadedFile = File.createTempFile(appUpdateName, ".$appUpdateSuffix") @@ -294,13 +292,7 @@ class InAppUpdater { update.updateVersion ) ) - - val logRegex = Regex("\\[(.*?)\\]\\((.*?)\\)") - val sanitizedChangelog = update.changelog?.replace(logRegex) { matchResult -> - matchResult.groupValues[1] - } // Sanitized because it looks cluttered - - builder.setMessage(sanitizedChangelog) + builder.setMessage("${update.changelog}") val context = this builder.apply { diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsHunter.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/JsHunter.kt similarity index 100% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsHunter.kt rename to app/src/main/java/com/lagradost/cloudstream3/utils/JsHunter.kt diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsUnpacker.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/JsUnpacker.kt similarity index 99% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsUnpacker.kt rename to app/src/main/java/com/lagradost/cloudstream3/utils/JsUnpacker.kt index d9f0b382..153dbd3e 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/JsUnpacker.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/JsUnpacker.kt @@ -50,7 +50,7 @@ class JsUnpacker(packedJS: String?) { throw Exception("Unknown p.a.c.k.e.r. encoding") } val unbase = Unbase(radix) - p = Pattern.compile("""\b[a-zA-Z0-9_]+\b""") + p = Pattern.compile("\\b\\w+\\b") m = p.matcher(payload) val decoded = StringBuilder(payload) var replaceOffset = 0 diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/M3u8Helper.kt similarity index 86% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt rename to app/src/main/java/com/lagradost/cloudstream3/utils/M3u8Helper.kt index 298f1601..11dfa441 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/M3u8Helper.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/M3u8Helper.kt @@ -71,7 +71,7 @@ object M3u8Helper2 { private val QUALITY_REGEX = Regex("""#EXT-X-STREAM-INF:(?:(?:.*?(?:RESOLUTION=\d+x(\d+)).*?\s+(.*))|(?:.*?\s+(.*)))""") private val TS_EXTENSION_REGEX = - Regex("""#EXTINF:(([0-9]*[.])?[0-9]+|).*\n(.+?\n)""") // fuck it we ball, who cares about the type anyways + Regex("""#EXTINF:.*\n(.+?\n)""") // fuck it we ball, who cares about the type anyways //Regex("""(.*\.(ts|jpg|html).*)""") //.jpg here 'case vizcloud uses .jpg instead of .ts private fun absoluteExtensionDetermination(url: String): String? { @@ -115,22 +115,13 @@ object M3u8Helper2 { private fun selectBest(qualities: List): M3u8Helper.M3u8Stream? { val result = qualities.sortedBy { - it.quality ?: Qualities.Unknown.value //if (it.quality != null && it.quality <= 1080) else 0 - }/*.filter { + if (it.quality != null && it.quality <= 1080) it.quality else 0 + }.filter { listOf("m3u", "m3u8").contains(absoluteExtensionDetermination(it.streamUrl)) - }*/ + } return result.lastOrNull() } - private fun selectWorst(qualities: List): M3u8Helper.M3u8Stream? { - val result = qualities.sortedBy { - it.quality ?: Qualities.Unknown.value //if (it.quality != null && it.quality <= 1080) else 0 - }/*.filter { - listOf("m3u", "m3u8").contains(absoluteExtensionDetermination(it.streamUrl)) - }*/ - return result.firstOrNull() - } - private fun getParentLink(uri: String): String { val split = uri.split("/").toMutableList() split.removeLast() @@ -182,20 +173,14 @@ object M3u8Helper2 { return list } - data class TsLink( - val url : String, - val time : Double?, - ) - data class LazyHlsDownloadData( private val encryptionData: ByteArray, private val encryptionIv: ByteArray, - val isEncrypted: Boolean, - val allTsLinks: List, - val relativeUrl: String, - val headers: Map, + private val isEncrypted: Boolean, + private val allTsLinks: List, + private val relativeUrl: String, + private val headers: Map, ) { - val size get() = allTsLinks.size suspend fun resolveLinkWhileSafe( @@ -243,9 +228,9 @@ object M3u8Helper2 { @Throws suspend fun resolveLink(index: Int): ByteArray { if (index < 0 || index >= size) throw IllegalArgumentException("index must be in the bounds of the ts") - val ts = allTsLinks[index] + val url = allTsLinks[index] - val tsResponse = app.get(ts.url, headers = headers, verify = false) + val tsResponse = app.get(url, headers = headers, verify = false) val tsData = tsResponse.body.bytes() if (tsData.isEmpty()) throw ErrorLoadingException("no data") @@ -259,16 +244,15 @@ object M3u8Helper2 { @Throws suspend fun hslLazy( - qualities: List, selectBest : Boolean = true + qualities: List ): LazyHlsDownloadData { if (qualities.isEmpty()) throw IllegalArgumentException("qualities must be non empty") - val selected = if(selectBest) { selectBest(qualities) } else { selectWorst(qualities) } ?: qualities.first() + val selected = selectBest(qualities) ?: qualities.first() val headers = selected.headers val streams = qualities.map { m3u8Generation(it, false) }.flatten() // this selects the best quality of the qualities offered, // due to the recursive nature of m3u8, we only go 2 depth - val innerStreams = streams.ifEmpty { listOf(selected) } - val secondSelection = if(selectBest) { selectBest(innerStreams) } else { selectWorst(innerStreams) } + val secondSelection = selectBest(streams.ifEmpty { listOf(selected) }) ?: throw IllegalArgumentException("qualities has no streams") val m3u8Response = @@ -301,14 +285,12 @@ object M3u8Helper2 { } val relativeUrl = getParentLink(secondSelection.streamUrl) val allTsList = TS_EXTENSION_REGEX.findAll(m3u8Response + "\n").map { ts -> - val time = ts.groupValues[1] - val value = ts.groupValues[3] - val url = if (isNotCompleteUrl(value)) { + val value = ts.groupValues[1] + if (isNotCompleteUrl(value)) { "$relativeUrl/${value}" } else { value } - TsLink(url = url, time = time.toDoubleOrNull()) }.toList() if (allTsList.isEmpty()) throw IllegalArgumentException("ts must be non empty") diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt index 4b3f02f1..bc81a5b9 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstaller.kt @@ -11,6 +11,7 @@ import android.os.Build import android.widget.Toast import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.mvvm.logError +import com.lagradost.cloudstream3.mvvm.normalSafeApiCall import com.lagradost.cloudstream3.utils.Coroutines.main import java.io.InputStream @@ -56,7 +57,7 @@ class ApkInstaller(private val service: PackageInstallerService) { PackageInstaller.STATUS_FAILURE )) { PackageInstaller.STATUS_PENDING_USER_ACTION -> { - val userAction = intent.getSafeParcelableExtra(Intent.EXTRA_INTENT) + val userAction = intent.getParcelableExtra(Intent.EXTRA_INTENT) userAction?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) context.startActivity(userAction) } @@ -145,5 +146,3 @@ class ApkInstaller(private val service: PackageInstallerService) { } } -@Suppress("DEPRECATION") -inline fun Intent.getSafeParcelableExtra(key: String): T? = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) getParcelableExtra(key) else getParcelableExtra(key, T::class.java) diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt index 57b98dc2..dcb1e047 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/PackageInstallerService.kt @@ -1,21 +1,20 @@ package com.lagradost.cloudstream3.utils +import android.app.NotificationChannel import android.app.NotificationManager import android.app.PendingIntent import android.app.Service import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC import android.os.Build import android.os.IBinder import android.util.Log import androidx.core.app.NotificationCompat import com.lagradost.cloudstream3.MainActivity -import com.lagradost.cloudstream3.MainActivity.Companion.deleteFileOnExit import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.app -import com.lagradost.cloudstream3.utils.AppContextUtils.createNotificationChannel +import com.lagradost.cloudstream3.utils.AppUtils.createNotificationChannel import com.lagradost.cloudstream3.utils.Coroutines.ioSafe import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute import kotlinx.coroutines.delay @@ -55,11 +54,7 @@ class PackageInstallerService : Service() { UPDATE_CHANNEL_NAME, UPDATE_CHANNEL_DESCRIPTION ) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - startForeground(UPDATE_NOTIFICATION_ID, baseNotification.build(), FOREGROUND_SERVICE_TYPE_DATA_SYNC) - } else{ - startForeground(UPDATE_NOTIFICATION_ID, baseNotification.build()) - } + startForeground(UPDATE_NOTIFICATION_ID, baseNotification.build()) } private val updateLock = Mutex() @@ -76,7 +71,7 @@ class PackageInstallerService : Service() { this@PackageInstallerService.cacheDir.listFiles()?.filter { it.name.startsWith(appUpdateName) && it.extension == appUpdateSuffix }?.forEach { - deleteFileOnExit(it) + it.deleteOnExit() } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PercentageCropImageView.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PercentageCropImageView.kt deleted file mode 100644 index 1e572fb7..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/PercentageCropImageView.kt +++ /dev/null @@ -1,94 +0,0 @@ -package com.lagradost.cloudstream3.utils -//Reference: https://stackoverflow.com/a/29055283 -import android.content.Context -import android.graphics.Matrix -import android.graphics.drawable.Drawable -import android.util.AttributeSet - -class PercentageCropImageView : androidx.appcompat.widget.AppCompatImageView { - private var mCropYCenterOffsetPct: Float? = null - private var mCropXCenterOffsetPct: Float? = null - constructor(context: Context?) : super(context!!) - constructor(context: Context?, attrs: AttributeSet?) : super(context!!, attrs) - constructor( - context: Context?, attrs: AttributeSet?, - defStyle: Int - ) : super(context!!, attrs, defStyle) - - var cropYCenterOffsetPct: Float - get() = mCropYCenterOffsetPct!! - set(cropYCenterOffsetPct) { - require(cropYCenterOffsetPct <= 1.0) { "Value too large: Must be <= 1.0" } - mCropYCenterOffsetPct = cropYCenterOffsetPct - } - var cropXCenterOffsetPct: Float - get() = mCropXCenterOffsetPct!! - set(cropXCenterOffsetPct) { - require(cropXCenterOffsetPct <= 1.0) { "Value too large: Must be <= 1.0" } - mCropXCenterOffsetPct = cropXCenterOffsetPct - } - - private fun myConfigureBounds() { - if (this.scaleType == ScaleType.MATRIX) { - - val d = this.drawable - if (d != null) { - val dWidth = d.intrinsicWidth - val dHeight = d.intrinsicHeight - val m = Matrix() - val vWidth = width - this.paddingLeft - this.paddingRight - val vHeight = height - this.paddingTop - this.paddingBottom - val scale: Float - var dx = 0f - var dy = 0f - if (dWidth * vHeight > vWidth * dHeight) { - val cropXCenterOffsetPct = - if (mCropXCenterOffsetPct != null) mCropXCenterOffsetPct!!.toFloat() else 0.5f - scale = vHeight.toFloat() / dHeight.toFloat() - dx = (vWidth - dWidth * scale) * cropXCenterOffsetPct - } else { - val cropYCenterOffsetPct = - if (mCropYCenterOffsetPct != null) mCropYCenterOffsetPct!!.toFloat() else 0f - scale = vWidth.toFloat() / dWidth.toFloat() - dy = (vHeight - dHeight * scale) * cropYCenterOffsetPct - } - m.setScale(scale, scale) - m.postTranslate((dx + 0.5f).toInt().toFloat(), (dy + 0.5f).toInt().toFloat()) - this.imageMatrix = m - } - } - } - - // These 3 methods call configureBounds in ImageView.java class, which - // adjusts the matrix in a call to center_crop (android's built-in - // scaling and centering crop method). We also want to trigger - // in the same place, but using our own matrix, which is then set - // directly at line 588 of ImageView.java and then copied over - // as the draw matrix at line 942 of ImageView.java - override fun setFrame(l: Int, t: Int, r: Int, b: Int): Boolean { - val changed = super.setFrame(l, t, r, b) - myConfigureBounds() - return changed - } - - override fun setImageDrawable(d: Drawable?) { - super.setImageDrawable(d) - myConfigureBounds() - } - - override fun setImageResource(resId: Int) { - super.setImageResource(resId) - myConfigureBounds() - } - // In case you can change the ScaleType in code you have to call redraw() - //fullsizeImageView.setScaleType(ScaleType.FIT_CENTER); - //fullsizeImageView.redraw(); - fun redraw() { - val d = this.drawable - if (d != null) { - // Force toggle to recalculate our bounds - setImageDrawable(null) - setImageDrawable(d) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/PowerManagerAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/PowerManagerAPI.kt deleted file mode 100644 index 0d3da8e7..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/PowerManagerAPI.kt +++ /dev/null @@ -1,86 +0,0 @@ -package com.lagradost.cloudstream3.utils - -import android.content.ActivityNotFoundException -import android.content.Context -import android.content.Intent -import android.net.Uri -import android.os.Build -import android.os.Bundle -import android.os.PowerManager -import android.provider.Settings -import android.util.Log -import androidx.appcompat.app.AlertDialog -import androidx.preference.PreferenceManager -import com.lagradost.cloudstream3.BuildConfig -import com.lagradost.cloudstream3.CommonActivity.showToast -import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.ui.settings.Globals.PHONE -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout - -private const val PACKAGE_NAME = BuildConfig.APPLICATION_ID -private const val TAG = "PowerManagerAPI" - -object BatteryOptimizationChecker { - - fun isAppRestricted(context: Context?): Boolean { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && context != null) { - val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager - return !powerManager.isIgnoringBatteryOptimizations(context.packageName) - } - - return false // below Marshmallow, it's always unrestricted when app is in background - } - - fun openBatteryOptimizationSettings(context: Context) { - if (shouldShowBatteryOptimizationDialog(context)) { - showBatteryOptimizationDialog(context) - } - } - - fun showBatteryOptimizationDialog(context: Context) { - val settingsManager = PreferenceManager.getDefaultSharedPreferences(context) - - try { - context.let { - AlertDialog.Builder(it) - .setTitle(R.string.battery_dialog_title) - .setIcon(R.drawable.ic_battery) - .setMessage(R.string.battery_dialog_message) - .setPositiveButton(R.string.ok) { _, _ -> - intentOpenAppInfo(it) - } - .setNegativeButton(R.string.cancel) { _, _ -> - settingsManager.edit() - .putBoolean(context.getString(R.string.battery_optimisation_key), false) - .apply() - } - .show() - } - } catch (t: Throwable) { - Log.e(TAG, "Error showing battery optimization dialog", t) - } - } - - private fun shouldShowBatteryOptimizationDialog(context: Context): Boolean { - val isRestricted = isAppRestricted(context) - val isOptimizedNotShown = PreferenceManager.getDefaultSharedPreferences(context) - .getBoolean(context.getString(R.string.battery_optimisation_key), true) - return isRestricted && isOptimizedNotShown && isLayout(PHONE) - } - - private fun intentOpenAppInfo(context: Context) { - val intent = Intent() - try { - intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS) - .setData(Uri.fromParts("package", PACKAGE_NAME, null)) - context.startActivity(intent, Bundle()) - } catch (t: Throwable) { - Log.e(TAG, "Unable to invoke any intent", t) - if (t is ActivityNotFoundException) { - showToast("Exception: Activity Not Found") - } else { - showToast(R.string.app_info_intent_error) - } - } - } -} diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt index 70edf80c..8285b8ab 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SingleSelectionHelper.kt @@ -2,12 +2,14 @@ package com.lagradost.cloudstream3.utils import android.app.Activity import android.app.Dialog -import android.text.Spanned import android.view.LayoutInflater import android.view.View import android.widget.AbsListView import android.widget.ArrayAdapter +import android.widget.EditText +import android.widget.ImageView import android.widget.LinearLayout +import android.widget.ListView import android.widget.TextView import androidx.appcompat.app.AlertDialog import androidx.core.view.isGone @@ -17,13 +19,8 @@ import androidx.core.view.marginRight import androidx.core.view.marginTop import com.google.android.material.bottomsheet.BottomSheetDialog import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.databinding.BottomInputDialogBinding import com.lagradost.cloudstream3.databinding.BottomSelectionDialogBinding -import com.lagradost.cloudstream3.databinding.BottomTextDialogBinding -import com.lagradost.cloudstream3.databinding.OptionsPopupTvBinding -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.TV -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes import com.lagradost.cloudstream3.utils.UIHelper.setImage @@ -56,15 +53,15 @@ object SingleSelectionHelper { ) { if (this == null) return - if (isLayout(TV or EMULATOR)) { - val binding = OptionsPopupTvBinding.inflate(layoutInflater) - val dialog = AlertDialog.Builder(this, R.style.AlertDialogCustom) - .setView(binding.root) - .create() + if (isTvSettings()) { + val builder = + AlertDialog.Builder(this, R.style.AlertDialogCustom) + .setView(R.layout.options_popup_tv) + val dialog = builder.create() dialog.show() - binding.listview1.let { listView -> + dialog.findViewById(R.id.listview1)?.let { listView -> listView.choiceMode = AbsListView.CHOICE_MODE_SINGLE listView.adapter = ArrayAdapter(this, R.layout.sort_bottom_single_choice_color).apply { @@ -77,7 +74,7 @@ object SingleSelectionHelper { } } - binding.imageView.apply { + dialog.findViewById(R.id.imageView)?.apply { isGone = poster.isNullOrEmpty() setImage(poster) } @@ -108,12 +105,12 @@ object SingleSelectionHelper { if (this == null) return val realShowApply = showApply || isMultiSelect - val listView = binding.listview1 - val textView = binding.text1 - val applyButton = binding.applyBtt - val cancelButton = binding.cancelBtt + val listView = binding.listview1//.findViewById(R.id.listview1)!! + val textView = binding.text1//.findViewById(R.id.text1)!! + val applyButton = binding.applyBtt//.findViewById(R.id.apply_btt) + val cancelButton = binding.cancelBtt//findViewById(R.id.cancel_btt) val applyHolder = - binding.applyBttHolder + binding.applyBttHolder//.findViewById(R.id.apply_btt_holder) applyHolder.isVisible = realShowApply if (!realShowApply) { @@ -176,8 +173,8 @@ object SingleSelectionHelper { } } + private fun Activity?.showInputDialog( - binding: BottomInputDialogBinding, dialog: Dialog, value: String, name: String, @@ -187,11 +184,11 @@ object SingleSelectionHelper { ) { if (this == null) return - val inputView = binding.nginxTextInput - val textView = binding.text1 - val applyButton = binding.applyBtt - val cancelButton = binding.cancelBtt - val applyHolder = binding.applyBttHolder + val inputView = dialog.findViewById(R.id.nginx_text_input)!! + val textView = dialog.findViewById(R.id.text1)!! + val applyButton = dialog.findViewById(R.id.apply_btt)!! + val cancelButton = dialog.findViewById(R.id.cancel_btt)!! + val applyHolder = dialog.findViewById(R.id.apply_btt_holder)!! applyHolder.isVisible = true textView.text = name @@ -353,17 +350,11 @@ object SingleSelectionHelper { dismissCallback: () -> Unit, callback: (String) -> Unit, ) { - val builder = BottomSheetDialog(this) - - val binding: BottomInputDialogBinding = BottomInputDialogBinding.inflate( - LayoutInflater.from(this) - ) - - builder.setContentView(binding.root) + val builder = BottomSheetDialog(this) // probably the stuff at the bottom + builder.setContentView(R.layout.bottom_input_dialog) // input layout builder.show() showInputDialog( - binding, builder, value, name, @@ -372,24 +363,4 @@ object SingleSelectionHelper { dismissCallback ) } - - fun Activity.showBottomDialogText( - title: String, - text: Spanned, - dismissCallback: () -> Unit - ) { - val binding = BottomTextDialogBinding.inflate(layoutInflater) - val dialog = BottomSheetDialog(this) - - dialog.setContentView(binding.root) - - binding.dialogTitle.text = title - binding.dialogText.text = text - - dialog.setOnDismissListener { - dismissCallback.invoke() - } - - dialog.show() - } } diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SnackbarHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SnackbarHelper.kt deleted file mode 100644 index e6a77795..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/SnackbarHelper.kt +++ /dev/null @@ -1,84 +0,0 @@ -package com.lagradost.cloudstream3.utils - -import android.app.Activity -import android.view.View -import androidx.annotation.MainThread -import androidx.annotation.StringRes -import com.google.android.material.snackbar.Snackbar -import com.lagradost.api.Log -import com.lagradost.cloudstream3.R -import com.lagradost.cloudstream3.mvvm.logError -import com.lagradost.cloudstream3.ui.result.UiText -import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute - -object SnackbarHelper { - - private const val TAG = "COMPACT" - private var currentSnackbar: Snackbar? = null - - @MainThread - fun showSnackbar( - act: Activity?, - message: UiText, - duration: Int = Snackbar.LENGTH_SHORT, - actionText: UiText? = null, - actionCallback: (() -> Unit)? = null - ) { - if (act == null) return - showSnackbar(act, message.asString(act), duration, - actionText?.asString(act), actionCallback) - } - - @MainThread - fun showSnackbar( - act: Activity?, - @StringRes message: Int, - duration: Int = Snackbar.LENGTH_SHORT, - @StringRes actionText: Int? = null, - actionCallback: (() -> Unit)? = null - ) { - if (act == null) return - showSnackbar(act, act.getString(message), duration, - actionText?.let { act.getString(it) }, actionCallback) - } - - @MainThread - fun showSnackbar( - act: Activity?, - message: String?, - duration: Int = Snackbar.LENGTH_SHORT, - actionText: String? = null, - actionCallback: (() -> Unit)? = null - ) { - if (act == null || message == null) { - Log.w(TAG, "Invalid showSnackbar: act = $act, message = $message") - return - } - Log.i(TAG, "showSnackbar: $message") - - try { - currentSnackbar?.dismiss() - } catch (e: Exception) { - logError(e) - } - - try { - val parentView = act.findViewById(android.R.id.content) - val snackbar = Snackbar.make(parentView, message, duration) - - actionCallback?.let { - snackbar.setAction(actionText) { actionCallback.invoke() } - } - - snackbar.show() - currentSnackbar = snackbar - - snackbar.setBackgroundTint(act.colorFromAttribute(R.attr.primaryBlackBackground)) - snackbar.setTextColor(act.colorFromAttribute(R.attr.textColor)) - snackbar.setActionTextColor(act.colorFromAttribute(R.attr.colorPrimary)) - - } catch (e: Exception) { - logError(e) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleHelper.kt index 09f5e0f1..33f1b6ff 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleHelper.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleHelper.kt @@ -153,11 +153,9 @@ object SubtitleHelper { private val flags = mapOf( "af" to "ZA", "agq" to "CM", - "ajp" to "SY", "ak" to "GH", "am" to "ET", "ar" to "AE", - "ars" to "SA", "as" to "IN", "asa" to "TZ", "az" to "AZ", @@ -517,4 +515,4 @@ object SubtitleHelper { Language639("Zhuang", "Saɯ cueŋƅ, Saw cuengh", "za", "zha", "zha", "zha", ""), Language639("Zulu", "isiZulu", "zu", "zul", "zul", "zul", ""), ) -} +} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleUtils.kt deleted file mode 100644 index 93a53395..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/SubtitleUtils.kt +++ /dev/null @@ -1,56 +0,0 @@ -package com.lagradost.cloudstream3.utils - -import android.content.Context -import com.lagradost.api.Log -import com.lagradost.cloudstream3.utils.VideoDownloadManager.getFolder -import com.lagradost.safefile.SafeFile - -object SubtitleUtils { - - // Only these files are allowed, so no videos as subtitles - private val allowedExtensions = listOf( - ".vtt", ".srt", ".txt", ".ass", - ".ttml", ".sbv", ".dfxp" - ) - - fun deleteMatchingSubtitles(context: Context, info: VideoDownloadManager.DownloadedFileInfo) { - val relative = info.relativePath - val display = info.displayName - val cleanDisplay = cleanDisplayName(display) - - getFolder(context, relative, info.basePath)?.forEach { (name, uri) -> - if (isMatchingSubtitle(name, display, cleanDisplay)) { - val subtitleFile = SafeFile.fromUri(context, uri) - if (subtitleFile == null || !subtitleFile.delete()) { - Log.e("SubtitleDeletion", "Failed to delete subtitle file: ${subtitleFile?.name()}") - } - } - } - } - - /** - * @param name the file name of the subtitle - * @param display the file name of the video - * @param cleanDisplay the cleanDisplayName of the video file name - */ - fun isMatchingSubtitle( - name: String, - display: String, - cleanDisplay: String - ): Boolean { - // Check if the file has a valid subtitle extension - val hasValidExtension = allowedExtensions.any { name.contains(it, ignoreCase = true) } - - // We can't have the exact same file as a subtitle - val isNotDisplayName = !name.equals(display, ignoreCase = true) - - // Check if the file name starts with a cleaned version of the display name - val startsWithCleanDisplay = cleanDisplayName(name).startsWith(cleanDisplay, ignoreCase = true) - - return hasValidExtension && isNotDisplayName && startsWithCleanDisplay - } - - fun cleanDisplayName(name: String): String { - return name.substringBeforeLast('.').trim() - } -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt index 351e77c8..71d3a1ef 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/SyncUtil.kt @@ -73,8 +73,8 @@ object SyncUtil { val response = app.get(url, cacheTime = 1, cacheUnit = TimeUnit.DAYS).text val mapped = parseJson(response) - val overrideMal = mapped?.malId ?: mapped?.mal?.id ?: mapped?.anilist?.malId - val overrideAnilist = mapped?.aniId ?: mapped?.anilist?.id + val overrideMal = mapped?.malId ?: mapped?.Mal?.id ?: mapped?.Anilist?.malId + val overrideAnilist = mapped?.aniId ?: mapped?.Anilist?.id if (overrideMal != null) { return overrideMal.toString() to overrideAnilist?.toString() @@ -135,8 +135,8 @@ object SyncUtil { @JsonProperty("createdAt") val createdAt: String?, @JsonProperty("updatedAt") val updatedAt: String?, @JsonProperty("deletedAt") val deletedAt: String?, - @JsonProperty("Mal") val mal: Mal?, - @JsonProperty("Anilist") val anilist: Anilist?, + @JsonProperty("Mal") val Mal: Mal?, + @JsonProperty("Anilist") val Anilist: Anilist?, @JsonProperty("malUrl") val malUrl: String? ) diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt index 049f92fb..dd973538 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/TestingUtils.kt @@ -4,7 +4,6 @@ import com.lagradost.cloudstream3.* import com.lagradost.cloudstream3.mvvm.logError import kotlinx.coroutines.* import org.junit.Assert -import kotlin.random.Random object TestingUtils { open class TestResult(val success: Boolean) { @@ -14,55 +13,16 @@ object TestingUtils { } } - class Logger { - enum class LogLevel { - Normal, - Warning, - Error; - } + class TestResultSearch(val results: List) : TestResult(true) + class TestResultLoad(val extractorData: String) : TestResult(true) - data class Message(val level: LogLevel, val message: String) { - override fun toString(): String { - val level = when (this.level) { - LogLevel.Normal -> "" - LogLevel.Warning -> "Warning: " - LogLevel.Error -> "Error: " - } - return "$level$message" - } - } - - private val messageLog = mutableListOf() - - fun getRawLog(): List = messageLog - - fun log(message: String) { - messageLog.add(Message(LogLevel.Normal, message)) - } - - fun warn(message: String) { - messageLog.add(Message(LogLevel.Warning, message)) - } - - fun error(message: String) { - messageLog.add(Message(LogLevel.Error, message)) - } - } - - class TestResultList(val results: List) : TestResult(true) - class TestResultLoad(val extractorData: String, val shouldLoadLinks: Boolean) : TestResult(true) - - class TestResultProvider( - success: Boolean, - val log: List, - val exception: Throwable? - ) : + class TestResultProvider(success: Boolean, val log: String, val exception: Throwable?) : TestResult(success) @Throws(AssertionError::class, CancellationException::class) suspend fun testHomepage( api: MainAPI, - logger: Logger + logger: (String) -> Unit ): TestResult { if (api.hasMainPage) { try { @@ -71,33 +31,22 @@ object TestingUtils { api.getMainPage(1, MainPageRequest(f.name, f.data, f.horizontalImages)) when { homepage == null -> { - logger.error("Provider ${api.name} did not correctly load homepage!") + logger.invoke("Homepage provider ${api.name} did not correctly load homepage!") } - homepage.items.isEmpty() -> { - logger.warn("Provider ${api.name} does not contain any homepage rows!") + logger.invoke("Homepage provider ${api.name} does not contain any items!") } - homepage.items.any { it.list.isEmpty() } -> { - logger.warn("Provider ${api.name} does not have any items in a homepage row!") + logger.invoke("Homepage provider ${api.name} does not have any items on result!") } } - val homePageList = homepage?.items?.flatMap { it.list } ?: emptyList() - return TestResultList(homePageList) } catch (e: Throwable) { - when (e) { - is NotImplementedError -> { - Assert.fail("Provider marked as hasMainPage, while in reality is has not been implemented") - } - - is CancellationException -> { - throw e - } - - else -> { - e.message?.let { logger.warn("Exception thrown when loading homepage: \"$it\"") } - } + if (e is NotImplementedError) { + Assert.fail("Provider marked as hasMainPage, while in reality is has not been implemented") + } else if (e is CancellationException) { + throw e } + logError(e) } } return TestResult.Pass @@ -105,13 +54,11 @@ object TestingUtils { @Throws(AssertionError::class, CancellationException::class) private suspend fun testSearch( - api: MainAPI, - testQueries: List, - logger: Logger, + api: MainAPI ): TestResult { - val searchResults = testQueries.firstNotNullOfOrNull { query -> + val searchQueries = listOf("over", "iron", "guy") + val searchResults = searchQueries.firstNotNullOfOrNull { query -> try { - logger.log("Searching for: $query") api.search(query).takeIf { !it.isNullOrEmpty() } } catch (e: Throwable) { if (e is NotImplementedError) { @@ -125,11 +72,12 @@ object TestingUtils { } return if (searchResults.isNullOrEmpty()) { - Assert.fail("Api ${api.name} did not return any search responses") + Assert.fail("Api ${api.name} did not return any valid search responses") TestResult.Fail // Should not be reached } else { - TestResultList(searchResults) + TestResultSearch(searchResults) } + } @@ -137,27 +85,31 @@ object TestingUtils { private suspend fun testLoad( api: MainAPI, result: SearchResponse, - logger: Logger + logger: (String) -> Unit ): TestResult { try { - if (result.apiName != api.name) { - logger.warn("Wrong apiName on SearchResponse: ${api.name} != ${result.apiName}") - } + Assert.assertEquals( + "Invalid apiName on SearchResponse on ${api.name}", + result.apiName, + api.name + ) val loadResponse = api.load(result.url) if (loadResponse == null) { - logger.error("Returned null loadResponse on ${result.url} on ${api.name}") + logger.invoke("Returned null loadResponse on ${result.url} on ${api.name}") return TestResult.Fail } - if (loadResponse.apiName != api.name) { - logger.warn("Wrong apiName on LoadResponse: ${api.name} != ${loadResponse.apiName}") - } - - if (!api.supportedTypes.contains(loadResponse.type)) { - logger.warn("Api ${api.name} on load does not contain any of the supportedTypes: ${loadResponse.type}") - } + Assert.assertEquals( + "Invalid apiName on LoadResponse on ${api.name}", + loadResponse.apiName, + result.apiName + ) + Assert.assertTrue( + "Api ${api.name} on load does not contain any of the supportedTypes: ${loadResponse.type}", + api.supportedTypes.contains(loadResponse.type) + ) val url = when (loadResponse) { is AnimeLoadResponse -> { @@ -165,43 +117,39 @@ object TestingUtils { loadResponse.episodes.keys.isEmpty() || loadResponse.episodes.keys.any { loadResponse.episodes[it].isNullOrEmpty() } if (gotNoEpisodes) { - logger.error("Api ${api.name} got no episodes on ${loadResponse.url}") + logger.invoke("Api ${api.name} got no episodes on ${loadResponse.url}") return TestResult.Fail } (loadResponse.episodes[loadResponse.episodes.keys.firstOrNull()])?.firstOrNull()?.data } - is MovieLoadResponse -> { val gotNoEpisodes = loadResponse.dataUrl.isBlank() if (gotNoEpisodes) { - logger.error("Api ${api.name} got no movie on ${loadResponse.url}") + logger.invoke("Api ${api.name} got no movie on ${loadResponse.url}") return TestResult.Fail } loadResponse.dataUrl } - is TvSeriesLoadResponse -> { val gotNoEpisodes = loadResponse.episodes.isEmpty() if (gotNoEpisodes) { - logger.error("Api ${api.name} got no episodes on ${loadResponse.url}") + logger.invoke("Api ${api.name} got no episodes on ${loadResponse.url}") return TestResult.Fail } loadResponse.episodes.firstOrNull()?.data } - is LiveStreamLoadResponse -> { loadResponse.dataUrl } - else -> { - logger.error("Unknown load response: ${loadResponse.javaClass.name}") + logger.invoke("Unknown load response: ${loadResponse.javaClass.name}") return TestResult.Fail } } ?: return TestResult.Fail - return TestResultLoad(url, loadResponse.type != TvType.CustomMedia) + return TestResultLoad(url) // val loadTest = testLoadResponse(api, load, logger) // if (loadTest is TestResultLoad) { @@ -226,7 +174,7 @@ object TestingUtils { private suspend fun testLinkLoading( api: MainAPI, url: String?, - logger: Logger + logger: (String) -> Unit ): TestResult { Assert.assertNotNull("Api ${api.name} has invalid url on episode", url) if (url == null) return TestResult.Fail // Should never trigger @@ -234,7 +182,7 @@ object TestingUtils { var linksLoaded = 0 try { val success = api.loadLinks(url, false, {}) { link -> - logger.log("Video loaded: ${link.name}") + logger.invoke("Video loaded: ${link.name}") Assert.assertTrue( "Api ${api.name} returns link with invalid url ${link.url}", link.url.length > 4 @@ -242,7 +190,7 @@ object TestingUtils { linksLoaded++ } if (success) { - logger.log("Links loaded: $linksLoaded") + logger.invoke("Links loaded: $linksLoaded") return TestResult(linksLoaded > 0) } else { Assert.fail("Api ${api.name} returns false on loadLinks() with $linksLoaded links loaded") @@ -252,9 +200,8 @@ object TestingUtils { is NotImplementedError -> { Assert.fail("Provider has not implemented loadLinks()") } - else -> { - logger.error("Failed link loading on ${api.name} using data: $url") + logger.invoke("Failed link loading on ${api.name} using data: $url") throw e } } @@ -265,57 +212,53 @@ object TestingUtils { fun getDeferredProviderTests( scope: CoroutineScope, providers: Array, + logger: (String) -> Unit, callback: (MainAPI, TestResultProvider) -> Unit ) { providers.forEach { api -> scope.launch { - val logger = Logger() + var log = "" + fun addToLog(string: String) { + log += string + "\n" + logger.invoke(string) + } + fun getLog(): String { + return log.removeSuffix("\n") + } val result = try { - logger.log("Trying ${api.name}") + addToLog("Trying ${api.name}") // Test Homepage - val homepage = testHomepage(api, logger) - Assert.assertTrue("Homepage failed to load", homepage.success) - val homePageList = (homepage as? TestResultList)?.results ?: emptyList() + val homepage = testHomepage(api, logger).success + Assert.assertTrue("Homepage failed to load", homepage) // Test Search Results - val searchQueries = - // Use the random 3 home page results as queries since they are guaranteed to exist - (homePageList.shuffled(Random).take(3).map { it.name.split(" ").first() } + - // If home page is sparse then use generic search queries - listOf("over", "iron", "guy")).take(3) - - val searchResults = testSearch(api, searchQueries, logger) + val searchResults = testSearch(api) Assert.assertTrue("Failed to get search results", searchResults.success) - searchResults as TestResultList + searchResults as TestResultSearch // Test Load and LoadLinks // Only try the first 3 search results to prevent spamming val success = searchResults.results.take(3).any { searchResponse -> - logger.log("Testing search result: ${searchResponse.url}") - val loadResponse = testLoad(api, searchResponse, logger) + addToLog("Testing search result: ${searchResponse.url}") + val loadResponse = testLoad(api, searchResponse, ::addToLog) if (loadResponse !is TestResultLoad) { false } else { - if (loadResponse.shouldLoadLinks) { - testLinkLoading(api, loadResponse.extractorData, logger).success - } else { - logger.log("Skipping link loading test") - true - } + testLinkLoading(api, loadResponse.extractorData, ::addToLog).success } } if (success) { - logger.log("Success ${api.name}") - TestResultProvider(true, logger.getRawLog(), null) + logger.invoke("Success ${api.name}") + TestResultProvider(true, getLog(), null) } else { - logger.error("Link loading failed") - TestResultProvider(false, logger.getRawLog(), null) + logger.invoke("Error ${api.name}") + TestResultProvider(false, getLog(), null) } } catch (e: Throwable) { - TestResultProvider(false, logger.getRawLog(), e) + TestResultProvider(false, getLog(), e) } callback.invoke(api, result) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt index ad1b6502..038a2f11 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt @@ -5,8 +5,6 @@ import android.annotation.SuppressLint import android.app.Activity import android.app.AppOpsManager import android.app.Dialog -import android.content.ClipData -import android.content.ClipboardManager import android.content.Context import android.content.pm.PackageManager import android.content.res.Configuration @@ -16,17 +14,12 @@ import android.graphics.Color import android.graphics.drawable.Drawable import android.os.Build import android.os.Bundle -import android.os.Handler -import android.os.Looper -import android.os.TransactionTooLargeException -import android.util.Log import android.view.* import android.view.ViewGroup.MarginLayoutParams import android.view.inputmethod.InputMethodManager import android.widget.ImageView import android.widget.ListAdapter import android.widget.ListView -import android.widget.Toast.LENGTH_LONG import androidx.annotation.AttrRes import androidx.annotation.ColorInt import androidx.annotation.DrawableRes @@ -37,7 +30,6 @@ import androidx.appcompat.view.menu.MenuBuilder import androidx.appcompat.widget.PopupMenu import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat -import androidx.core.content.getSystemService import androidx.core.graphics.alpha import androidx.core.graphics.blue import androidx.core.graphics.drawable.toBitmapOrNull @@ -47,7 +39,6 @@ import androidx.core.view.marginBottom import androidx.core.view.marginLeft import androidx.core.view.marginRight import androidx.core.view.marginTop -import androidx.core.view.updateLayoutParams import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.navigation.fragment.NavHostFragment @@ -61,31 +52,26 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.RequestOptions.bitmapTransform import com.bumptech.glide.request.target.Target -import com.google.android.material.appbar.AppBarLayout import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipDrawable import com.google.android.material.chip.ChipGroup -import com.lagradost.cloudstream3.AcraApplication.Companion.context import com.lagradost.cloudstream3.CommonActivity.activity -import com.lagradost.cloudstream3.CommonActivity.showToast import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.ui.result.UiImage -import com.lagradost.cloudstream3.ui.result.UiText -import com.lagradost.cloudstream3.ui.result.txt -import com.lagradost.cloudstream3.ui.settings.Globals -import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR -import com.lagradost.cloudstream3.ui.settings.Globals.isLayout +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isEmulatorSettings +import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings import jp.wasabeef.glide.transformations.BlurTransformation import kotlin.math.roundToInt + object UIHelper { val Int.toPx: Int get() = (this * Resources.getSystem().displayMetrics.density).toInt() val Float.toPx: Float get() = (this * Resources.getSystem().displayMetrics.density) val Int.toDp: Int get() = (this / Resources.getSystem().displayMetrics.density).toInt() val Float.toDp: Float get() = (this / Resources.getSystem().displayMetrics.density) - fun Context.checkWrite(): Boolean { + fun Activity.checkWrite(): Boolean { return (ContextCompat.checkSelfPermission( this, Manifest.permission.WRITE_EXTERNAL_STORAGE @@ -100,9 +86,8 @@ object UIHelper { if (view == null) return view.removeAllViews() val context = view.context ?: return - val maxTags = tags.take(10) // Limited because they are too much - maxTags.forEach { tag -> + tags.forEach { tag -> val chip = Chip(context) val chipDrawable = ChipDrawable.createFromAttributes( context, @@ -133,35 +118,6 @@ object UIHelper { ) } - fun clipboardHelper(label: UiText, text: CharSequence) { - val ctx = context ?: return - try { - ctx.let { - val clip = ClipData.newPlainText(label.asString(ctx), text) - val labelSuffix = txt(R.string.toast_copied).asString(ctx) - ctx.getSystemService()?.setPrimaryClip(clip) - - if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) { - showToast("${label.asString(ctx)} $labelSuffix") - } - } - } catch (t: Throwable) { - Log.e("ClipboardService", "$t") - when (t) { - is SecurityException -> { - showToast(R.string.clipboard_permission_error) - } - - is TransactionTooLargeException -> { - showToast(R.string.clipboard_too_large) - } - - else -> { - showToast(R.string.clipboard_unknown_error, LENGTH_LONG) - } - } - } - } /** * Sets ListView height dynamically based on the height of the items. @@ -212,14 +168,6 @@ object UIHelper { } } - fun View?.setAppBarNoScrollFlagsOnTV() { - if (isLayout(Globals.TV or EMULATOR)) { - this?.updateLayoutParams { - scrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL - } - } - } - fun Activity.hideKeyboard() { window?.decorView?.clearFocus() this.findViewById(android.R.id.content)?.rootView?.let { @@ -230,8 +178,9 @@ object UIHelper { fun Activity?.navigate(@IdRes navigation: Int, arguments: Bundle? = null) { try { if (this is FragmentActivity) { - val navHostFragment = supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment? - navHostFragment?.navController?.navigate(navigation, arguments) + (supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment?)?.navController?.navigate( + navigation, arguments + ) } } catch (t: Throwable) { logError(t) @@ -351,7 +300,7 @@ object UIHelper { } ?: return false return try { - var builder = com.bumptech.glide.Glide.with(this) + var builder = GlideApp.with(this) .load(glideImage) .skipMemoryCache(true) .diskCacheStrategy(DiskCacheStrategy.ALL).let { req -> @@ -366,15 +315,15 @@ object UIHelper { if (colorCallback != null) { builder = builder.listener(object : RequestListener { - + @SuppressLint("CheckResult") override fun onResourceReady( - resource: Drawable, - model: Any, + resource: Drawable?, + model: Any?, target: Target?, - dataSource: DataSource, + dataSource: DataSource?, isFirstResource: Boolean ): Boolean { - resource.toBitmapOrNull() + resource?.toBitmapOrNull() ?.let { bitmap -> createPaletteAsync( identifier, @@ -385,10 +334,11 @@ object UIHelper { return false } + @SuppressLint("CheckResult") override fun onLoadFailed( e: GlideException?, model: Any?, - target: Target, + target: Target?, isFirstResource: Boolean ): Boolean { return false @@ -417,7 +367,7 @@ object UIHelper { ) { if (this == null || url.isNullOrBlank()) return try { - val res = com.bumptech.glide.Glide.with(this) + val res = GlideApp.with(this) .load(GlideUrl(url) { headers ?: emptyMap() }) .apply(bitmapTransform(BlurTransformation(radius, sample))) .transition( @@ -451,53 +401,84 @@ object UIHelper { // Enables regular immersive mode. // For "lean back" mode, remove SYSTEM_UI_FLAG_IMMERSIVE. // Or for "sticky immersive," replace it with SYSTEM_UI_FLAG_IMMERSIVE_STICKY - /** BUGGED AF **/ - /*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - - WindowCompat.setDecorFitsSystemWindows(window, false) - WindowInsetsControllerCompat(window, View(this)).let { controller -> - controller.hide(WindowInsetsCompat.Type.systemBars()) - controller.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE - } - }*/ - - @Suppress("DEPRECATION") - window.decorView.systemUiVisibility = ( - View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY - // Set the content to appear under the system bars so that the - // content doesn't resize when the system bars hide and show. - or View.SYSTEM_UI_FLAG_LAYOUT_STABLE - or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - // Hide the nav bar and status bar - or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - or View.SYSTEM_UI_FLAG_FULLSCREEN - ) - //} + window.decorView.systemUiVisibility = ( + View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY + // Set the content to appear under the system bars so that the + // content doesn't resize when the system bars hide and show. + or View.SYSTEM_UI_FLAG_LAYOUT_STABLE + or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + // Hide the nav bar and status bar + or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_FULLSCREEN + // or View.SYSTEM_UI_FLAG_LOW_PROFILE + ) + // window.addFlags(View.KEEP_SCREEN_ON) } fun FragmentActivity.popCurrentPage() { - // Post the back press action to the main thread handler to ensure it executes - // after any currently pending UI updates or fragment transactions. - Handler(Looper.getMainLooper()).post { - // Check if the FragmentManager state is saved. If it is, we cannot perform - // fragment transactions safely because the state may be inconsistent. - if (!supportFragmentManager.isStateSaved) { - // If the state is not saved, it's safe to perform the back press action. - this.onBackPressedDispatcher.onBackPressed() + this.onBackPressed() + /*val currentFragment = supportFragmentManager.fragments.lastOrNull { + it.isVisible + } ?: return + + supportFragmentManager.beginTransaction() + .setCustomAnimations( + R.anim.enter_anim, + R.anim.exit_anim, + R.anim.pop_enter, + R.anim.pop_exit + ) + .remove(currentFragment) + .commitAllowingStateLoss()*/ + } + /* + fun FragmentActivity.popCurrentPage(isInPlayer: Boolean, isInExpandedView: Boolean, isInResults: Boolean) { + val currentFragment = supportFragmentManager.fragments.lastOrNull { + it.isVisible + } + ?: //this.onBackPressed() + return + +/* + if (tvActivity == null) { + requestedOrientation = if (settingsManager?.getBoolean("force_landscape", false) == true) { + ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE } else { - // If the state is saved, retry the back press action after a slight delay. - // This gives the FragmentManager time to complete any ongoing state-saving - // operations or transactions, ensuring that we do not encounter an IllegalStateException. - Handler(Looper.getMainLooper()).postDelayed({ - this.onBackPressedDispatcher.onBackPressed() - }, 100) + ActivityInfo.SCREEN_ORIENTATION_PORTRAIT + } + }*/ + + // No fucked animations leaving the player :) + when { + isInPlayer -> { + supportFragmentManager.beginTransaction() + //.setCustomAnimations(R.anim.enter, R.anim.exit, R.anim.pop_enter, R.anim.pop_exit) + .remove(currentFragment) + .commitAllowingStateLoss() + } + isInExpandedView && !isInResults -> { + supportFragmentManager.beginTransaction() + .setCustomAnimations( + R.anim.enter_anim,//R.anim.enter_from_right, + R.anim.exit_anim,//R.anim.exit_to_right, + R.anim.pop_enter, + R.anim.pop_exit + ) + .remove(currentFragment) + .commitAllowingStateLoss() + } + else -> { + supportFragmentManager.beginTransaction() + .setCustomAnimations(R.anim.enter_anim, R.anim.exit_anim, R.anim.pop_enter, R.anim.pop_exit) + .remove(currentFragment) + .commitAllowingStateLoss() } } - } + }*/ fun Context.getStatusBarHeight(): Int { - if (isLayout(Globals.TV or EMULATOR)) { + if (isTvSettings()) { return 0 } @@ -553,7 +534,7 @@ object UIHelper { return result } - fun Context?.isBottomLayout(): Boolean { + fun Context?.IsBottomLayout(): Boolean { if (this == null) return true val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) return settingsManager.getBoolean(getString(R.string.bottom_title_key), true) @@ -561,26 +542,13 @@ object UIHelper { fun Activity.changeStatusBarState(hide: Boolean): Int { return if (hide) { - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - window.insetsController?.hide(WindowInsets.Type.statusBars()) - - } else { - @Suppress("DEPRECATION") - window.setFlags( - WindowManager.LayoutParams.FLAG_FULLSCREEN, - WindowManager.LayoutParams.FLAG_FULLSCREEN - ) - } + window?.setFlags( + WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN + ) 0 } else { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - window.insetsController?.show(WindowInsets.Type.statusBars()) - - } else { - window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN) - } - + window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN) this.getStatusBarHeight() } } @@ -588,18 +556,13 @@ object UIHelper { // Shows the system bars by removing all the flags // except for the ones that make the content appear under the system bars. fun Activity.showSystemUI() { + window.decorView.systemUiVisibility = - /*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN) - WindowCompat.setDecorFitsSystemWindows(window, true) - WindowInsetsControllerCompat(window, View(this)).show(WindowInsetsCompat.Type.systemBars()) + changeStatusBarState(isEmulatorSettings()) - } else {*/ /** WINDOW COMPAT IS BUGGY DUE TO FU*KED UP PLAYER AND TRAILERS **/ - window.decorView.systemUiVisibility = - (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN) - //} - - changeStatusBarState(isLayout(EMULATOR)) + // window.clearFlags(View.KEEP_SCREEN_ON) } fun Context.shouldShowPIPMode(isInPlayer: Boolean): Boolean { diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/UnshortenUrl.kt similarity index 96% rename from library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt rename to app/src/main/java/com/lagradost/cloudstream3/utils/UnshortenUrl.kt index b13e88e5..46b232f6 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/UnshortenUrl.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UnshortenUrl.kt @@ -1,5 +1,6 @@ package com.lagradost.cloudstream3.utils +import android.util.Base64 import com.lagradost.cloudstream3.app import com.lagradost.cloudstream3.base64Decode import com.lagradost.nicehttp.NiceResponse @@ -90,12 +91,13 @@ object ShortLink { } val encodedbytearray = encodedUri.map { it.code.toByte() }.toByteArray() var decodedUri = - base64Decode(encodedbytearray.toString()).dropLast(16) + Base64.decode(encodedbytearray, Base64.DEFAULT).decodeToString().dropLast(16) .drop(16) if (Regex("""go\.php\?u=""").find(decodedUri) != null) { decodedUri = - base64Decode(decodedUri.replace(Regex("""(.*?)u="""), "")) + Base64.decode(decodedUri.replace(Regex("""(.*?)u="""), ""), Base64.DEFAULT) + .decodeToString() } return decodedUri diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadHelper.kt index 30f66f83..d1614bc1 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadHelper.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadHelper.kt @@ -3,21 +3,17 @@ package com.lagradost.cloudstream3.utils import com.fasterxml.jackson.annotation.JsonProperty import com.lagradost.cloudstream3.TvType object VideoDownloadHelper { - abstract class DownloadCached( - @JsonProperty("id") open val id: Int, - ) - data class DownloadEpisodeCached( @JsonProperty("name") val name: String?, @JsonProperty("poster") val poster: String?, @JsonProperty("episode") val episode: Int, @JsonProperty("season") val season: Int?, + @JsonProperty("id") val id: Int, @JsonProperty("parentId") val parentId: Int, @JsonProperty("rating") val rating: Int?, @JsonProperty("description") val description: String?, @JsonProperty("cacheTime") val cacheTime: Long, - override val id: Int, - ): DownloadCached(id) + ) data class DownloadHeaderCached( @JsonProperty("apiName") val apiName: String, @@ -25,9 +21,9 @@ object VideoDownloadHelper { @JsonProperty("type") val type: TvType, @JsonProperty("name") val name: String, @JsonProperty("poster") val poster: String?, + @JsonProperty("id") val id: Int, @JsonProperty("cacheTime") val cacheTime: Long, - override val id: Int, - ): DownloadCached(id) + ) data class ResumeWatching( @JsonProperty("parentId") val parentId: Int, diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt index 2190e03f..6425ba66 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/VideoDownloadManager.kt @@ -17,27 +17,23 @@ import androidx.work.Data import androidx.work.ExistingWorkPolicy import androidx.work.OneTimeWorkRequest import androidx.work.WorkManager -import com.bumptech.glide.Glide import com.bumptech.glide.load.model.GlideUrl import com.fasterxml.jackson.annotation.JsonProperty -import com.lagradost.api.Log import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey import com.lagradost.cloudstream3.AcraApplication.Companion.setKey import com.lagradost.cloudstream3.BuildConfig -import com.lagradost.cloudstream3.IDownloadableMinimum import com.lagradost.cloudstream3.MainActivity import com.lagradost.cloudstream3.R import com.lagradost.cloudstream3.TvType import com.lagradost.cloudstream3.app -import com.lagradost.cloudstream3.mvvm.launchSafe import com.lagradost.cloudstream3.mvvm.logError +import com.lagradost.cloudstream3.mvvm.normalSafeApiCall import com.lagradost.cloudstream3.services.VideoDownloadService import com.lagradost.cloudstream3.utils.Coroutines.ioSafe import com.lagradost.cloudstream3.utils.Coroutines.main import com.lagradost.cloudstream3.utils.DataStore.getKey import com.lagradost.cloudstream3.utils.DataStore.removeKey -import com.lagradost.cloudstream3.utils.SubtitleUtils.deleteMatchingSubtitles import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute import com.lagradost.safefile.MediaFileContentType import com.lagradost.safefile.SafeFile @@ -45,8 +41,6 @@ import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job -import kotlinx.coroutines.async -import kotlinx.coroutines.awaitAll import kotlinx.coroutines.cancel import kotlinx.coroutines.delay import kotlinx.coroutines.isActive @@ -59,7 +53,7 @@ import java.io.Closeable import java.io.File import java.io.IOException import java.io.OutputStream -import java.lang.IllegalArgumentException +import java.net.URL import java.util.* const val DOWNLOAD_CHANNEL_ID = "cloudstream3.general" @@ -113,6 +107,16 @@ object VideoDownloadManager { Stop, } + interface IDownloadableMinimum { + val url: String + val referer: String + val headers: Map + } + + fun IDownloadableMinimum.getId(): Int { + return url.hashCode() + } + data class DownloadEpisodeMetadata( @JsonProperty("id") val id: Int, @JsonProperty("mainName") val mainName: String, @@ -183,7 +187,7 @@ object VideoDownloadManager { private val DOWNLOAD_BAD_CONFIG = DownloadStatus(retrySame = false, tryNext = false, success = false) - const val KEY_RESUME_PACKAGES = "download_resume" + private const val KEY_RESUME_PACKAGES = "download_resume" const val KEY_DOWNLOAD_INFO = "download_info" private const val KEY_RESUME_QUEUE_PACKAGES = "download_q_resume" @@ -230,10 +234,10 @@ object VideoDownloadManager { return cachedBitmaps[url] } - val bitmap = Glide.with(this) + val bitmap = GlideApp.with(this) .asBitmap() .load(GlideUrl(url) { headers ?: emptyMap() }) - .submit(720, 720) + .into(720, 720) .get() if (bitmap != null) { @@ -298,7 +302,6 @@ object VideoDownloadManager { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE) } else { - //fixme Specify a better flag PendingIntent.getActivity(context, 0, intent, 0) } builder.setContentIntent(pendingIntent) @@ -481,10 +484,10 @@ object VideoDownloadManager { } } - private const val RESERVED_CHARS = "|\\?*<\":>+[]/\'" + private const val reservedChars = "|\\?*<\":>+[]/\'" fun sanitizeFilename(name: String, removeSpaces: Boolean = false): String { var tempName = name - for (c in RESERVED_CHARS) { + for (c in reservedChars) { tempName = tempName.replace(c, ' ') } if (removeSpaces) tempName = tempName.replace(" ", "") @@ -502,7 +505,7 @@ object VideoDownloadManager { ): List>? { val base = basePathToFile(context, basePath) val folder = base?.gotoDirectory(relativePath, false) ?: return null - //if (folder.isDirectory() != false) return null + if (folder.isDirectory() != false) return null return folder.listFiles() ?.mapNotNull { (it.name() ?: "") to (it.uri() ?: return@mapNotNull null) } @@ -552,8 +555,7 @@ object VideoDownloadManager { tryResume: Boolean, ): StreamData { return setupStream( - context.getBasePath().first ?: getDefaultDir(context) - ?: throw IOException("Bad config"), + context.getBasePath().first ?: getDefaultDir(context) ?: throw IOException("Bad config"), name, folder, extension, @@ -949,10 +951,7 @@ object VideoDownloadManager { /** how many bytes every connection should be, by default it is 10 MiB */ chuckSize: Long = (1 shl 20) * 10, /** maximum bytes in the buffer that responds */ - bufferSize: Int = DEFAULT_BUFFER_SIZE, - /** how many bytes bytes it should require to use the parallel downloader instead, - * if we download a very small file we don't want it parallel */ - maximumSmallSize: Long = chuckSize * 2 + bufferSize: Int = DEFAULT_BUFFER_SIZE ): LazyStreamDownloadData { // we don't want to make a separate connection for every 1kb require(chuckSize > 1000) @@ -964,7 +963,7 @@ object VideoDownloadManager { var downloadLength: Long? = null var totalLength: Long? = null - val ranges = if (contentLength == null || contentLength < maximumSmallSize) { + val ranges = if (contentLength == null) { // is the equivalent of [startByte..EOF] as we don't know the size we can only do one // connection LongArray(1) { startByte } @@ -1025,7 +1024,6 @@ object VideoDownloadManager { } } - /** download a file that consist of a single stream of data*/ suspend fun downloadThing( context: Context, link: IDownloadableMinimum, @@ -1035,12 +1033,10 @@ object VideoDownloadManager { tryResume: Boolean, parentId: Int?, createNotificationCallback: (CreateNotificationMetadata) -> Unit, - parallelConnections: Int = 3, - /** how many bytes a valid file must be in bytes, - * this should be different for subtitles and video */ - minimumSize: Long = 100 + parallelConnections: Int = 3 ): DownloadStatus = withContext(Dispatchers.IO) { - if (parallelConnections < 1) { + // we cant download torrents with this implementation, aria2c might be used in the future + if (link.url.startsWith("magnet") || link.url.endsWith(".torrent") || parallelConnections < 1) { return@withContext DOWNLOAD_INVALID_INPUT } @@ -1084,13 +1080,6 @@ object VideoDownloadManager { ) ) - if (items.totalLength != null && items.totalLength < minimumSize) { - fileStream.closeQuietly() - metadata.onDelete() - stream.delete() - return@withContext DOWNLOAD_INVALID_INPUT - } - metadata.totalBytes = items.totalLength metadata.type = DownloadType.IsDownloading metadata.setDownloadFileInfoTemplate( @@ -1240,16 +1229,6 @@ object VideoDownloadManager { return@withContext DOWNLOAD_STOPPED } - // in case the head request lies about content-size, - // then we don't want shit output - if (metadata.bytesDownloaded < minimumSize) { - // we need to close before delete - fileStream.closeQuietly() - metadata.onDelete() - stream.delete() - return@withContext DOWNLOAD_INVALID_INPUT - } - metadata.type = DownloadType.IsDone return@withContext DOWNLOAD_SUCCESS } catch (e: IOException) { @@ -1301,7 +1280,6 @@ object VideoDownloadManager { val displayName = getDisplayName(name, extension) val stream = setupStream(baseFile, name, folder, extension, startAt > 0) - if (!stream.resume) startAt = 0 fileStream = stream.open() @@ -1328,7 +1306,6 @@ object VideoDownloadManager { ) + if (link.referer.isNotBlank()) mapOf("referer" to link.referer) else emptyMap() ) ) - val items = M3u8Helper2.hslLazy(listOf(m3u8)) metadata.hlsTotal = items.size @@ -1426,7 +1403,7 @@ object VideoDownloadManager { try { // may cause java.lang.IllegalStateException: Mutex is not locked because of cancelling fileMutex.unlock() - } catch (t: Throwable) { + } catch (t : Throwable) { logError(t) } } @@ -1552,11 +1529,6 @@ object VideoDownloadManager { notificationCallback: (Int, Notification) -> Unit, tryResume: Boolean = false, ): DownloadStatus { - // no support for these file formats - if (link.type == ExtractorLinkType.MAGNET || link.type == ExtractorLinkType.TORRENT || link.type == ExtractorLinkType.DASH) { - return DOWNLOAD_INVALID_INPUT - } - val name = getFileName(context, ep) // Make sure this is cancelled when download is done or cancelled. @@ -1585,44 +1557,35 @@ object VideoDownloadManager { } try { - when (link.type) { - ExtractorLinkType.M3U8 -> { - val startIndex = if (tryResume) { - context.getKey( - KEY_DOWNLOAD_INFO, - ep.id.toString(), - null - )?.extraInfo?.toIntOrNull() - } else null + if (link.isM3u8 || normalSafeApiCall { URL(link.url).path.endsWith(".m3u8") } == true) { + val startIndex = if (tryResume) { + context.getKey( + KEY_DOWNLOAD_INFO, + ep.id.toString(), + null + )?.extraInfo?.toIntOrNull() + } else null - return downloadHLS( - context, - link, - name, - folder ?: "", - ep.id, - startIndex, - callback, parallelConnections = maxConcurrentConnections - ) - } - - ExtractorLinkType.VIDEO -> { - return downloadThing( - context, - link, - name, - folder ?: "", - "mp4", - tryResume, - ep.id, - callback, - parallelConnections = maxConcurrentConnections, - /** We require at least 10 MB video files */ - minimumSize = (1 shl 20) * 10 - ) - } - - else -> throw IllegalArgumentException("unsuported download type") + return downloadHLS( + context, + link, + name, + folder ?: "", + ep.id, + startIndex, + callback, parallelConnections = maxConcurrentConnections + ) + } else { + return downloadThing( + context, + link, + name, + folder ?: "", + "mp4", + tryResume, + ep.id, + callback, parallelConnections = maxConcurrentConnections + ) } } catch (t: Throwable) { return DOWNLOAD_FAILED @@ -1705,7 +1668,7 @@ object VideoDownloadManager { } */ fun getDownloadFileInfoAndUpdateSettings(context: Context, id: Int): DownloadedFileInfoResult? = - getDownloadFileInfo(context, id) + getDownloadFileInfo(context, id, removeKeys = true) private fun DownloadedFileInfo.toFile(context: Context): SafeFile? { return basePathToFile(context, this.basePath)?.gotoDirectory(relativePath) @@ -1715,6 +1678,7 @@ object VideoDownloadManager { private fun getDownloadFileInfo( context: Context, id: Int, + removeKeys: Boolean = false ): DownloadedFileInfoResult? { try { val info = @@ -1738,37 +1702,7 @@ object VideoDownloadManager { } } - fun deleteFilesAndUpdateSettings( - context: Context, - ids: Set, - scope: CoroutineScope, - onComplete: (Set) -> Unit = {} - ) { - scope.launchSafe(Dispatchers.IO) { - val deleteJobs = ids.map { id -> - async { - id to deleteFileAndUpdateSettings(context, id) - } - } - val results = deleteJobs.awaitAll() - - val (successfulResults, failedResults) = results.partition { it.second } - val successfulIds = successfulResults.map { it.first }.toSet() - - if (failedResults.isNotEmpty()) { - failedResults.forEach { (id, _) -> - // TODO show a toast if some failed? - Log.e("FileDeletion", "Failed to delete file with ID: $id") - } - } else { - Log.i("FileDeletion", "All files deleted successfully") - } - - onComplete.invoke(successfulIds) - } - } - - private fun deleteFileAndUpdateSettings(context: Context, id: Int): Boolean { + fun deleteFileAndUpdateSettings(context: Context, id: Int): Boolean { val success = deleteFile(context, id) if (success) context.removeKey(KEY_DOWNLOAD_INFO, id.toString()) return success @@ -1794,17 +1728,11 @@ object VideoDownloadManager { private fun deleteFile(context: Context, id: Int): Boolean { val info = context.getKey(KEY_DOWNLOAD_INFO, id.toString()) ?: return false - val file = info.toFile(context) - downloadEvent.invoke(id to DownloadActionType.Stop) downloadProgressEvent.invoke(Triple(id, 0, 0)) downloadStatusEvent.invoke(id to DownloadType.IsStopped) downloadDeleteEvent.invoke(id) - - val isFileDeleted = file?.delete() == true || file?.exists() == false - if (isFileDeleted) deleteMatchingSubtitles(context, info) - - return isFileDeleted + return info.toFile(context)?.delete() ?: false } fun getDownloadResumePackage(context: Context, id: Int): DownloadResumePackage? { @@ -1926,4 +1854,4 @@ object VideoDownloadManager { @JsonProperty("ep") val ep: DownloadEpisodeMetadata, @JsonProperty("links") val links: List ) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/fcast/FcastManager.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/fcast/FcastManager.kt deleted file mode 100644 index e7c36a87..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/fcast/FcastManager.kt +++ /dev/null @@ -1,140 +0,0 @@ -package com.lagradost.cloudstream3.utils.fcast - -import android.content.Context -import android.net.nsd.NsdManager -import android.net.nsd.NsdManager.ResolveListener -import android.net.nsd.NsdServiceInfo -import android.os.Build -import android.util.Log -import com.lagradost.cloudstream3.utils.Coroutines.ioSafe - -class FcastManager { - private var nsdManager: NsdManager? = null - - // Used for receiver - private val registrationListenerTcp = DefaultRegistrationListener() - private fun getDeviceName(): String { - return "${Build.MANUFACTURER}-${Build.MODEL}" - } - - /** - * Start the fcast service - * @param registerReceiver If true will register the app as a compatible fcast receiver for discovery in other app - */ - fun init(context: Context, registerReceiver: Boolean) = ioSafe { - nsdManager = context.getSystemService(Context.NSD_SERVICE) as NsdManager - val serviceType = "_fcast._tcp" - - if (registerReceiver) { - val serviceName = "$APP_PREFIX-${getDeviceName()}" - - val serviceInfo = NsdServiceInfo().apply { - this.serviceName = serviceName - this.serviceType = serviceType - this.port = TCP_PORT - } - - nsdManager?.registerService( - serviceInfo, - NsdManager.PROTOCOL_DNS_SD, - registrationListenerTcp - ) - } - - nsdManager?.discoverServices( - serviceType, - NsdManager.PROTOCOL_DNS_SD, - DefaultDiscoveryListener() - ) - } - - fun stop() { - nsdManager?.unregisterService(registrationListenerTcp) - } - - inner class DefaultDiscoveryListener : NsdManager.DiscoveryListener { - val tag = "DiscoveryListener" - override fun onStartDiscoveryFailed(serviceType: String?, errorCode: Int) { - Log.d(tag, "Discovery failed: $serviceType, error code: $errorCode") - } - - override fun onStopDiscoveryFailed(serviceType: String?, errorCode: Int) { - Log.d(tag, "Stop discovery failed: $serviceType, error code: $errorCode") - } - - override fun onDiscoveryStarted(serviceType: String?) { - Log.d(tag, "Discovery started: $serviceType") - } - - override fun onDiscoveryStopped(serviceType: String?) { - Log.d(tag, "Discovery stopped: $serviceType") - } - - override fun onServiceFound(serviceInfo: NsdServiceInfo?) { - if (serviceInfo == null) return - nsdManager?.resolveService(serviceInfo, object : ResolveListener { - override fun onResolveFailed(serviceInfo: NsdServiceInfo?, errorCode: Int) { - } - - override fun onServiceResolved(serviceInfo: NsdServiceInfo?) { - if (serviceInfo == null) return - - synchronized(_currentDevices) { - _currentDevices.add(PublicDeviceInfo(serviceInfo)) - } - - Log.d( - tag, - "Service found: ${serviceInfo.serviceName}, Net: ${serviceInfo.host.hostAddress}" - ) - } - }) - } - - override fun onServiceLost(serviceInfo: NsdServiceInfo?) { - if (serviceInfo == null) return - - // May remove duplicates, but net and port is null here, preventing device specific identification - synchronized(_currentDevices) { - _currentDevices.removeAll { - it.rawName == serviceInfo.serviceName - } - } - - Log.d(tag, "Service lost: ${serviceInfo.serviceName}") - } - } - - companion object { - const val APP_PREFIX = "CloudStream" - private val _currentDevices: MutableList = mutableListOf() - val currentDevices: List = _currentDevices - - class DefaultRegistrationListener : NsdManager.RegistrationListener { - val tag = "DiscoveryService" - override fun onServiceRegistered(serviceInfo: NsdServiceInfo) { - Log.d(tag, "Service registered: ${serviceInfo.serviceName}") - } - - override fun onRegistrationFailed(serviceInfo: NsdServiceInfo, errorCode: Int) { - Log.e(tag, "Service registration failed: errorCode=$errorCode") - } - - override fun onServiceUnregistered(serviceInfo: NsdServiceInfo) { - Log.d(tag, "Service unregistered: ${serviceInfo.serviceName}") - } - - override fun onUnregistrationFailed(serviceInfo: NsdServiceInfo, errorCode: Int) { - Log.e(tag, "Service unregistration failed: errorCode=$errorCode") - } - } - - const val TCP_PORT = 46899 - } -} - -class PublicDeviceInfo(serviceInfo: NsdServiceInfo) { - val rawName: String = serviceInfo.serviceName - val host: String? = serviceInfo.host.hostAddress - val name = rawName.replace("-", " ") + host?.let { " $it" } -} diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/fcast/FcastSession.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/fcast/FcastSession.kt deleted file mode 100644 index 1f33bca4..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/fcast/FcastSession.kt +++ /dev/null @@ -1,60 +0,0 @@ -package com.lagradost.cloudstream3.utils.fcast - -import android.util.Log -import androidx.annotation.WorkerThread -import com.lagradost.cloudstream3.utils.AppUtils.toJson -import com.lagradost.cloudstream3.utils.Coroutines.ioSafe -import com.lagradost.safefile.closeQuietly -import java.io.DataOutputStream -import java.net.Socket -import kotlin.jvm.Throws - -class FcastSession(private val hostAddress: String): AutoCloseable { - val tag = "FcastSession" - - private var socket: Socket? = null - @Throws - @WorkerThread - fun open(): Socket { - val socket = Socket(hostAddress, FcastManager.TCP_PORT) - this.socket = socket - return socket - } - - override fun close() { - socket?.closeQuietly() - socket = null - } - - @Throws - private fun acquireSocket(): Socket { - return socket ?: open() - } - - fun ping() { - sendMessage(Opcode.Ping, null) - } - - fun sendMessage(opcode: Opcode, message: T) { - ioSafe { - val socket = acquireSocket() - val outputStream = DataOutputStream(socket.getOutputStream()) - - val json = message?.toJson() - val content = json?.toByteArray() ?: ByteArray(0) - - // Little endian starting from 1 - // https://gitlab.com/futo-org/fcast/-/wikis/Protocol-version-1 - val size = content.size + 1 - - val sizeArray = ByteArray(4) { num -> - (size shr 8 * num and 0xff).toByte() - } - - Log.d(tag, "Sending message with size: $size, opcode: $opcode") - outputStream.write(sizeArray) - outputStream.write(ByteArray(1) { opcode.value }) - outputStream.write(content) - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/fcast/Packets.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/fcast/Packets.kt deleted file mode 100644 index 61c00d6e..00000000 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/fcast/Packets.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.lagradost.cloudstream3.utils.fcast - -// See https://gitlab.com/futo-org/fcast/-/wikis/Protocol-version-1 -enum class Opcode(val value: Byte) { - None(0), - Play(1), - Pause(2), - Resume(3), - Stop(4), - Seek(5), - PlaybackUpdate(6), - VolumeUpdate(7), - SetVolume(8), - PlaybackError(9), - SetSpeed(10), - Version(11), - Ping(12), - Pong(13); -} - - -data class PlayMessage( - val container: String, - val url: String? = null, - val content: String? = null, - val time: Double? = null, - val speed: Double? = null, - val headers: Map? = null -) - -data class SeekMessage( - val time: Double -) - -data class PlaybackUpdateMessage( - val generationTime: Long, - val time: Double, - val duration: Double, - val state: Int, - val speed: Double -) - -data class VolumeUpdateMessage( - val generationTime: Long, - val volume: Double -) - -data class PlaybackErrorMessage( - val message: String -) - -data class SetSpeedMessage( - val speed: Double -) - -data class SetVolumeMessage( - val volume: Double -) - -data class VersionMessage( - val version: Long -) diff --git a/app/src/main/java/com/lagradost/cloudstream3/widget/FlowLayout.kt b/app/src/main/java/com/lagradost/cloudstream3/widget/FlowLayout.kt index 2aea0b8d..d4725d53 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/widget/FlowLayout.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/widget/FlowLayout.kt @@ -19,7 +19,7 @@ class FlowLayout : ViewGroup { @SuppressLint("CustomViewStyleable") internal constructor(c: Context, attrs: AttributeSet?) : super(c, attrs) { val t = c.obtainStyledAttributes(attrs, R.styleable.FlowLayout_Layout) - itemSpacing = t.getDimensionPixelSize(R.styleable.FlowLayout_Layout_itemSpacing, 0) + itemSpacing = t.getDimensionPixelSize(R.styleable.FlowLayout_Layout_itemSpacing, 0); t.recycle() } diff --git a/app/src/main/res/drawable/cloud_2_solid.xml b/app/src/main/res/drawable/cloud_2_solid.xml deleted file mode 100644 index 3810b4bf..00000000 --- a/app/src/main/res/drawable/cloud_2_solid.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/episodes_shadow.xml b/app/src/main/res/drawable/episodes_shadow.xml index a77cbf25..b4cdd382 100644 --- a/app/src/main/res/drawable/episodes_shadow.xml +++ b/app/src/main/res/drawable/episodes_shadow.xml @@ -1,8 +1,6 @@ + android:startColor="@color/transparent" + android:endColor="?attr/primaryBlackBackground"/> \ No newline at end of file diff --git a/app/src/main/res/drawable/example_qr.png b/app/src/main/res/drawable/example_qr.png deleted file mode 100644 index 764cb966..00000000 Binary files a/app/src/main/res/drawable/example_qr.png and /dev/null differ diff --git a/app/src/main/res/drawable/hourglass_24.xml b/app/src/main/res/drawable/hourglass_24.xml deleted file mode 100644 index 7bd1ebbd..00000000 --- a/app/src/main/res/drawable/hourglass_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_edit_24.xml b/app/src/main/res/drawable/ic_baseline_edit_24.xml deleted file mode 100644 index dba3e567..00000000 --- a/app/src/main/res/drawable/ic_baseline_edit_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_baseline_equalizer_24.xml b/app/src/main/res/drawable/ic_baseline_equalizer_24.xml deleted file mode 100644 index cd20ad15..00000000 --- a/app/src/main/res/drawable/ic_baseline_equalizer_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_film_roll_24.xml b/app/src/main/res/drawable/ic_baseline_film_roll_24.xml deleted file mode 100644 index 941d936f..00000000 --- a/app/src/main/res/drawable/ic_baseline_film_roll_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_baseline_open_in_new_24.xml b/app/src/main/res/drawable/ic_baseline_open_in_new_24.xml deleted file mode 100644 index 2651015c..00000000 --- a/app/src/main/res/drawable/ic_baseline_open_in_new_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_replay_24.xml b/app/src/main/res/drawable/ic_baseline_replay_24.xml deleted file mode 100644 index e247aa92..00000000 --- a/app/src/main/res/drawable/ic_baseline_replay_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_restart_24.xml b/app/src/main/res/drawable/ic_baseline_restart_24.xml deleted file mode 100644 index aed3a562..00000000 --- a/app/src/main/res/drawable/ic_baseline_restart_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_resume_arrow.xml b/app/src/main/res/drawable/ic_baseline_resume_arrow.xml deleted file mode 100644 index 0326fbd4..00000000 --- a/app/src/main/res/drawable/ic_baseline_resume_arrow.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_resume_arrow2.xml b/app/src/main/res/drawable/ic_baseline_resume_arrow2.xml deleted file mode 100644 index fc533a0e..00000000 --- a/app/src/main/res/drawable/ic_baseline_resume_arrow2.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_baseline_skip_next_24_big.xml b/app/src/main/res/drawable/ic_baseline_skip_next_24_big.xml deleted file mode 100644 index a8c43bbd..00000000 --- a/app/src/main/res/drawable/ic_baseline_skip_next_24_big.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_skip_next_rounded_24.xml b/app/src/main/res/drawable/ic_baseline_skip_next_rounded_24.xml deleted file mode 100644 index 452c4dd9..00000000 --- a/app/src/main/res/drawable/ic_baseline_skip_next_rounded_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_battery.xml b/app/src/main/res/drawable/ic_battery.xml deleted file mode 100644 index 24d0a77f..00000000 --- a/app/src/main/res/drawable/ic_battery.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_fingerprint.xml b/app/src/main/res/drawable/ic_fingerprint.xml deleted file mode 100644 index 5c96e5a5..00000000 --- a/app/src/main/res/drawable/ic_fingerprint.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_network_stream.xml b/app/src/main/res/drawable/ic_network_stream.xml deleted file mode 100644 index 8e21fd25..00000000 --- a/app/src/main/res/drawable/ic_network_stream.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/library_icon.xml b/app/src/main/res/drawable/library_icon.xml deleted file mode 100644 index f62dceac..00000000 --- a/app/src/main/res/drawable/library_icon.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/outline.xml b/app/src/main/res/drawable/outline.xml index 7b436c7d..30077a98 100644 --- a/app/src/main/res/drawable/outline.xml +++ b/app/src/main/res/drawable/outline.xml @@ -2,9 +2,11 @@ - +--> + \ No newline at end of file diff --git a/app/src/main/res/drawable/outline_bookmark_add_24.xml b/app/src/main/res/drawable/outline_bookmark_add_24.xml deleted file mode 100644 index a4e18af3..00000000 --- a/app/src/main/res/drawable/outline_bookmark_add_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/outline_drawable.xml b/app/src/main/res/drawable/outline_drawable.xml index 16eba83c..8eec2d0b 100644 --- a/app/src/main/res/drawable/outline_drawable.xml +++ b/app/src/main/res/drawable/outline_drawable.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/outline_drawable_less.xml b/app/src/main/res/drawable/outline_drawable_less.xml index aa3a8d0d..db74a092 100644 --- a/app/src/main/res/drawable/outline_drawable_less.xml +++ b/app/src/main/res/drawable/outline_drawable_less.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/player_button_tv_attr.xml b/app/src/main/res/drawable/player_button_tv_attr.xml index ed83887d..4c90a64e 100644 --- a/app/src/main/res/drawable/player_button_tv_attr.xml +++ b/app/src/main/res/drawable/player_button_tv_attr.xml @@ -3,13 +3,13 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/player_button_tv_attr_no_bg.xml b/app/src/main/res/drawable/player_button_tv_attr_no_bg.xml index 0dd8c256..b9b927da 100644 --- a/app/src/main/res/drawable/player_button_tv_attr_no_bg.xml +++ b/app/src/main/res/drawable/player_button_tv_attr_no_bg.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/preview_seekbar_24.xml b/app/src/main/res/drawable/preview_seekbar_24.xml deleted file mode 100644 index 657f6247..00000000 --- a/app/src/main/res/drawable/preview_seekbar_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/rounded_outline.xml b/app/src/main/res/drawable/rounded_outline.xml deleted file mode 100644 index b85ace8e..00000000 --- a/app/src/main/res/drawable/rounded_outline.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/screen_rotation.xml b/app/src/main/res/drawable/screen_rotation.xml deleted file mode 100644 index da0ac0fd..00000000 --- a/app/src/main/res/drawable/screen_rotation.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/subdl_logo_big.xml b/app/src/main/res/drawable/subdl_logo_big.xml deleted file mode 100644 index a6cbb311..00000000 --- a/app/src/main/res/drawable/subdl_logo_big.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/video_frame.xml b/app/src/main/res/drawable/video_frame.xml deleted file mode 100644 index 19fcf26d..00000000 --- a/app/src/main/res/drawable/video_frame.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/account_list_item_edit.xml b/app/src/main/res/layout/account_list_item_edit.xml deleted file mode 100644 index 0adade19..00000000 --- a/app/src/main/res/layout/account_list_item_edit.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/account_managment.xml b/app/src/main/res/layout/account_managment.xml index e7afb382..389a3406 100644 --- a/app/src/main/res/layout/account_managment.xml +++ b/app/src/main/res/layout/account_managment.xml @@ -62,16 +62,14 @@ + android:id="@+id/account_switch_account" + android:text="@string/switch_account" + style="@style/SettingsItem" /> + android:id="@+id/account_logout" + android:text="@string/logout" + style="@style/SettingsItem"> diff --git a/app/src/main/res/layout/account_select_linear.xml b/app/src/main/res/layout/account_select_linear.xml deleted file mode 100644 index b78c0d44..00000000 --- a/app/src/main/res/layout/account_select_linear.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/account_single.xml b/app/src/main/res/layout/account_single.xml index c4f7fa39..cbfb9f18 100644 --- a/app/src/main/res/layout/account_single.xml +++ b/app/src/main/res/layout/account_single.xml @@ -1,11 +1,10 @@ + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:foreground="?android:attr/selectableItemBackgroundBorderless" + android:orientation="horizontal" + android:layout_height="wrap_content" + android:layout_width="match_parent"> + android:id="@+id/account_profile_picture" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:ignore="ContentDescription" /> + android:foreground="@null" + android:id="@+id/account_name" + tools:text="Account 1" + style="@style/SettingsItem" /> diff --git a/app/src/main/res/layout/account_switch.xml b/app/src/main/res/layout/account_switch.xml index 5153f0e3..659ad840 100644 --- a/app/src/main/res/layout/account_switch.xml +++ b/app/src/main/res/layout/account_switch.xml @@ -7,20 +7,18 @@ android:layout_height="match_parent"> + android:id="@+id/account_list" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + android:background="?attr/primaryBlackBackground" + tools:listitem="@layout/account_single" + android:layout_width="match_parent" + android:layout_rowWeight="1" + android:layout_height="wrap_content" /> + android:id="@+id/account_add" + android:text="@string/add_account" + style="@style/SettingsItem"> diff --git a/app/src/main/res/layout/activity_account_select.xml b/app/src/main/res/layout/activity_account_select.xml deleted file mode 100644 index bd6007dc..00000000 --- a/app/src/main/res/layout/activity_account_select.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/add_remove_sites.xml b/app/src/main/res/layout/add_remove_sites.xml index 653f607f..9ef6ad6a 100644 --- a/app/src/main/res/layout/add_remove_sites.xml +++ b/app/src/main/res/layout/add_remove_sites.xml @@ -1,21 +1,19 @@ + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + android:id="@+id/add_site" + android:text="@string/add_site_pref" + style="@style/SettingsItem"> + android:id="@+id/remove_site" + android:text="@string/remove_site_pref" + style="@style/SettingsItem" /> \ No newline at end of file diff --git a/app/src/main/res/layout/add_repo_input.xml b/app/src/main/res/layout/add_repo_input.xml index cb4224d1..6f6b4d5b 100644 --- a/app/src/main/res/layout/add_repo_input.xml +++ b/app/src/main/res/layout/add_repo_input.xml @@ -72,7 +72,7 @@ android:inputType="text" android:nextFocusLeft="@id/apply_btt" android:nextFocusRight="@id/cancel_btt" - android:nextFocusDown="@id/repo_url_input" + android:nextFocusDown="@id/site_url_input" android:requiresFadingEdge="vertical" android:textColorHint="?attr/grayTextColor" tools:ignore="LabelFor" /> @@ -85,8 +85,9 @@ android:inputType="textUri" android:nextFocusLeft="@id/apply_btt" android:nextFocusRight="@id/cancel_btt" - android:nextFocusUp="@id/repo_name_input" - android:nextFocusDown="@id/apply_btt" + + android:nextFocusUp="@id/site_name_input" + android:nextFocusDown="@id/site_lang_input" android:requiresFadingEdge="vertical" android:textColorHint="?attr/grayTextColor" tools:ignore="LabelFor" /> diff --git a/app/src/main/res/layout/bottom_resultview_preview.xml b/app/src/main/res/layout/bottom_resultview_preview.xml index 3372fe7b..ce41cb65 100644 --- a/app/src/main/res/layout/bottom_resultview_preview.xml +++ b/app/src/main/res/layout/bottom_resultview_preview.xml @@ -41,50 +41,17 @@ android:layout_marginStart="10dp" android:orientation="vertical"> - + + android:textStyle="bold" + tools:text="The Perfect Run"> - - - - - + - - - - - - + android:background="?android:attr/selectableItemBackground" + android:gravity="start|center_vertical" + android:padding="12dp" + android:text="@string/home_more_info" + android:textColor="?attr/textColor" + app:drawableRightCompat="@drawable/ic_baseline_arrow_forward_24" + app:drawableTint="?attr/white" /> - - - - - - - diff --git a/app/src/main/res/layout/cast_item.xml b/app/src/main/res/layout/cast_item.xml index 99a9750b..54df59a8 100644 --- a/app/src/main/res/layout/cast_item.xml +++ b/app/src/main/res/layout/cast_item.xml @@ -9,7 +9,7 @@ android:layout_margin="5dp" android:foreground="@drawable/outline_drawable" app:cardBackgroundColor="@color/transparent" - android:focusable="true" + app:cardCornerRadius="@dimen/rounded_image_radius" app:cardElevation="0dp"> @@ -34,6 +34,7 @@ android:id="@+id/actor_image" android:layout_width="match_parent" + android:layout_height="match_parent" android:contentDescription="@string/episode_poster_img_des" android:scaleType="centerCrop" diff --git a/app/src/main/res/layout/device_auth.xml b/app/src/main/res/layout/device_auth.xml deleted file mode 100644 index 38ff1325..00000000 --- a/app/src/main/res/layout/device_auth.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_online_subtitles.xml b/app/src/main/res/layout/dialog_online_subtitles.xml index e0eac5e0..7803e261 100644 --- a/app/src/main/res/layout/dialog_online_subtitles.xml +++ b/app/src/main/res/layout/dialog_online_subtitles.xml @@ -40,7 +40,7 @@ android:layout_width="match_parent" android:layout_height="30dp" android:layout_gravity="center_vertical" - android:layout_marginEnd="40dp"> + android:layout_marginEnd="30dp"> @@ -107,8 +106,7 @@ android:layout_margin="10dp" android:background="?selectableItemBackgroundBorderless" android:contentDescription="@string/change_providers_img_des" - android:focusable="true" - android:nextFocusLeft="@id/year_btt" + android:nextFocusLeft="@id/main_search" android:nextFocusRight="@id/main_search" android:nextFocusUp="@id/nav_rail_view" android:nextFocusDown="@id/search_autofit_results" diff --git a/app/src/main/res/layout/download_child_episode.xml b/app/src/main/res/layout/download_child_episode.xml index e53e63d3..fd845ee8 100644 --- a/app/src/main/res/layout/download_child_episode.xml +++ b/app/src/main/res/layout/download_child_episode.xml @@ -2,12 +2,13 @@ @@ -73,26 +77,14 @@ tools:text="128MB / 237MB" /> + - - \ No newline at end of file diff --git a/app/src/main/res/layout/download_header_episode.xml b/app/src/main/res/layout/download_header_episode.xml index 385fb2e0..226c1632 100644 --- a/app/src/main/res/layout/download_header_episode.xml +++ b/app/src/main/res/layout/download_header_episode.xml @@ -9,22 +9,9 @@ android:layout_marginTop="10dp" android:layout_marginEnd="10dp" android:foreground="@drawable/outline_drawable" - android:focusable="true" - android:nextFocusRight="@id/download_button" app:cardBackgroundColor="?attr/boxItemBackground" app:cardCornerRadius="@dimen/rounded_image_radius"> - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_child_downloads.xml b/app/src/main/res/layout/fragment_child_downloads.xml index 64ed1d70..9afaea0b 100644 --- a/app/src/main/res/layout/fragment_child_downloads.xml +++ b/app/src/main/res/layout/fragment_child_downloads.xml @@ -7,69 +7,13 @@ android:layout_height="match_parent" android:background="?attr/primaryGrayBackground" android:orientation="vertical" - tools:context=".ui.download.DownloadChildFragment"> + tools:context=".ui.download.DownloadFragment"> - - - - -