diff --git a/.github/locales.py b/.github/locales.py
index 6127d9d80..a74d72588 100644
--- a/.github/locales.py
+++ b/.github/locales.py
@@ -1,13 +1,14 @@
import re
import glob
import requests
+import os
import lxml.etree as ET # builtin library doesn't preserve comments
SETTINGS_PATH = "app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt"
START_MARKER = "/* begin language list */"
END_MARKER = "/* end language list */"
-XML_NAME = "app/src/main/res/values-b+"
+XML_NAME = "app/src/main/res/values-"
ISO_MAP_URL = "https://raw.githubusercontent.com/haliaeetus/iso-639/master/data/iso_639-1.min.json"
INDENT = " "*4
@@ -20,29 +21,29 @@ rest, after_src = rest.split(END_MARKER)
# Load already added langs
languages = {}
-for lang in re.finditer(r'Pair\("(.*)", "(.*)"\)', rest):
- name, iso = lang.groups()
- languages[iso] = name
+for lang in re.finditer(r'Triple\("(.*)", "(.*)", "(.*)"\)', rest):
+ flag, name, iso = lang.groups()
+ languages[iso] = (flag, name)
# Add not yet added langs
for folder in glob.glob(f"{XML_NAME}*"):
- iso = folder[len(XML_NAME):].replace("+", "-")
+ iso = folder[len(XML_NAME):]
if iso not in languages.keys():
- entry = iso_map.get(iso.lower(), {'nativeName':iso}) # fallback to iso code if not found
- languages[iso] = entry['nativeName'].split(',')[0] # first name if there are multiple
+ entry = iso_map.get(iso.lower(),{'nativeName':iso})
+ languages[iso] = ("", entry['nativeName'].split(',')[0])
-# Create pairs
-pairs = []
-for iso in sorted(languages, key=lambda iso: languages[iso].lower()): # sort by language name
- name = languages[iso]
- pairs.append(f'{INDENT}Pair("{name}", "{iso}"),')
+# Create triples
+triples = []
+for iso in sorted(languages.keys()):
+ flag, name = languages[iso]
+ triples.append(f'{INDENT}Triple("{flag}", "{name}", "{iso}"),')
# Update settings file
open(SETTINGS_PATH, "w+",encoding='utf-8').write(
before_src +
START_MARKER +
"\n" +
- "\n".join(pairs) +
+ "\n".join(triples) +
"\n" +
END_MARKER +
after_src
@@ -61,5 +62,8 @@ for file in glob.glob(f"{XML_NAME}*/strings.xml"):
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 30bedcc1b..e84bb08b0 100644
--- a/.github/workflows/build_to_archive.yml
+++ b/.github/workflows/build_to_archive.yml
@@ -1,93 +1,78 @@
-name: Archive build
-
-on:
- push:
- branches: [ master ]
- paths-ignore:
- - '*.md'
- - '*.json'
- - '**/wcokey.txt'
- workflow_dispatch:
-
-permissions:
- contents: read
-
-concurrency:
- group: "Archive-build"
- cancel-in-progress: true
-
-jobs:
- build:
- runs-on: ubuntu-latest
- steps:
- - name: Generate access token
- id: generate_token
- uses: tibdex/github-app-token@v2
- 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
- with:
- app_id: ${{ secrets.GH_APP_ID }}
- private_key: ${{ secrets.GH_APP_KEY }}
- repository: "recloudstream/cloudstream-archive"
-
- - uses: actions/checkout@v6
-
- - name: Set up JDK 17
- uses: actions/setup-java@v5
- with:
- distribution: temurin
- java-version: 17
-
- - name: Grant execute permission for gradlew
- run: chmod +x gradlew
-
- - name: Fetch keystore
- id: fetch_keystore
- run: |
- TMP_KEYSTORE_FILE_PATH="${RUNNER_TEMP}"/keystore
- mkdir -p "${TMP_KEYSTORE_FILE_PATH}"
- curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "${TMP_KEYSTORE_FILE_PATH}/prerelease_keystore.keystore" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore.jks"
- curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "keystore_password.txt" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore_password.txt"
- KEY_PWD="$(cat keystore_password.txt)"
- echo "::add-mask::${KEY_PWD}"
- echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
-
- - name: Setup Gradle
- uses: gradle/actions/setup-gradle@v5
- with:
- cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-
- - name: Run Gradle
- run: ./gradlew assemblePrereleaseRelease
- env:
- SIGNING_KEY_ALIAS: "key0"
- SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
- SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
- SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
- SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
- TRAKT_CLIENT_ID: ${{ secrets.TRAKT_CLIENT_ID }}
- MDL_API_KEY: ${{ secrets.MDL_API_KEY }}
-
- - uses: actions/checkout@v6
- with:
- repository: "recloudstream/cloudstream-archive"
- token: ${{ steps.generate_archive_token.outputs.token }}
- path: "archive"
-
- - name: Move build
- run: cp app/build/outputs/apk/prerelease/release/*.apk "archive/$(git rev-parse --short HEAD).apk"
-
- - name: Push archive
- run: |
- cd $GITHUB_WORKSPACE/archive
- git config --local user.email "actions@github.com"
- git config --local user.name "GitHub Actions"
- git add .
- git commit --amend -m "Build $GITHUB_SHA" || exit 0 # do not error if nothing to commit
- git push --force
+name: Archive build
+
+on:
+ push:
+ branches: [ master ]
+ paths-ignore:
+ - '*.md'
+ - '*.json'
+ - '**/wcokey.txt'
+ workflow_dispatch:
+
+concurrency:
+ group: "Archive-build"
+ cancel-in-progress: true
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Generate access token
+ id: generate_token
+ uses: tibdex/github-app-token@v2
+ 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
+ with:
+ app_id: ${{ secrets.GH_APP_ID }}
+ private_key: ${{ secrets.GH_APP_KEY }}
+ repository: "recloudstream/cloudstream-archive"
+ - uses: actions/checkout@v4
+ - name: Set up JDK 17
+ uses: actions/setup-java@v4
+ with:
+ java-version: '17'
+ distribution: 'adopt'
+ - name: Grant execute permission for gradlew
+ run: chmod +x gradlew
+ - name: Fetch keystore
+ id: fetch_keystore
+ run: |
+ TMP_KEYSTORE_FILE_PATH="${RUNNER_TEMP}"/keystore
+ mkdir -p "${TMP_KEYSTORE_FILE_PATH}"
+ curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "${TMP_KEYSTORE_FILE_PATH}/prerelease_keystore.keystore" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore.jks"
+ curl -H "Authorization: token ${{ steps.generate_token.outputs.token }}" -o "keystore_password.txt" "https://raw.githubusercontent.com/recloudstream/secrets/master/keystore_password.txt"
+ KEY_PWD="$(cat keystore_password.txt)"
+ echo "::add-mask::${KEY_PWD}"
+ echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
+ - name: Run Gradle
+ run: |
+ ./gradlew assemblePrerelease
+ env:
+ SIGNING_KEY_ALIAS: "key0"
+ SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
+ 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
+ with:
+ repository: "recloudstream/cloudstream-archive"
+ token: ${{ steps.generate_archive_token.outputs.token }}
+ path: "archive"
+
+ - name: Move build
+ run: |
+ cp app/build/outputs/apk/prerelease/release/*.apk "archive/$(git rev-parse --short HEAD).apk"
+
+ - name: Push archive
+ run: |
+ cd $GITHUB_WORKSPACE/archive
+ git config --local user.email "actions@github.com"
+ git config --local user.name "GitHub Actions"
+ git add .
+ git commit --amend -m "Build $GITHUB_SHA" || exit 0 # do not error if nothing to commit
+ git push --force
\ No newline at end of file
diff --git a/.github/workflows/generate_dokka.yml b/.github/workflows/generate_dokka.yml
index d67b8a519..ec50743ae 100644
--- a/.github/workflows/generate_dokka.yml
+++ b/.github/workflows/generate_dokka.yml
@@ -1,18 +1,19 @@
name: Dokka
+# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#concurrency
+concurrency:
+ group: "dokka"
+ cancel-in-progress: true
+
on:
push:
- branches: [ master ]
+ branches:
+ # choose your default branch
+ - master
+ - main
paths-ignore:
- '*.md'
-permissions:
- contents: read
-
-concurrency:
- group: "dokka"
- cancel-in-progress: true
-
jobs:
build:
runs-on: ubuntu-latest
@@ -24,44 +25,41 @@ jobs:
app_id: ${{ secrets.GH_APP_ID }}
private_key: ${{ secrets.GH_APP_KEY }}
repository: "recloudstream/dokka"
-
- name: Checkout
- uses: actions/checkout@v6
+ uses: actions/checkout@master
with:
path: "src"
- name: Checkout dokka
- uses: actions/checkout@v6
+ uses: actions/checkout@master
with:
repository: "recloudstream/dokka"
path: "dokka"
token: ${{ steps.generate_token.outputs.token }}
-
+
- name: Clean old builds
run: |
cd $GITHUB_WORKSPACE/dokka/
- rm -rf "./app"
- rm -rf "./library"
+ rm -rf "./-cloudstream"
- - name: Set up JDK 17
- uses: actions/setup-java@v5
+ - name: Setup JDK 17
+ uses: actions/setup-java@v4
with:
- distribution: temurin
java-version: 17
+ distribution: 'adopt'
- - name: Setup Gradle
- uses: gradle/actions/setup-gradle@v5
- with:
- cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+ - name: Setup Android SDK
+ uses: android-actions/setup-android@v3
- name: Generate Dokka
run: |
cd $GITHUB_WORKSPACE/src/
chmod +x gradlew
- ./gradlew docs:dokkaGeneratePublicationHtml
+ ./gradlew docs:dokkaHtml
- name: Copy Dokka
- run: cp -r $GITHUB_WORKSPACE/src/docs/build/dokka/html/* $GITHUB_WORKSPACE/dokka/
+ run: |
+ cp -r $GITHUB_WORKSPACE/src/docs/build/dokka/html/* $GITHUB_WORKSPACE/dokka/
- name: Push builds
run: |
diff --git a/.github/workflows/issue_action.yml b/.github/workflows/issue_action.yml
new file mode 100644
index 000000000..88ab3656c
--- /dev/null
+++ b/.github/workflows/issue_action.yml
@@ -0,0 +1,88 @@
+name: Issue automatic actions
+
+on:
+ issues:
+ types: [opened]
+
+jobs:
+ issue-moderator:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Generate access token
+ id: generate_token
+ uses: tibdex/github-app-token@v2
+ with:
+ app_id: ${{ secrets.GH_APP_ID }}
+ private_key: ${{ secrets.GH_APP_KEY }}
+ - name: Similarity analysis
+ id: similarity
+ uses: actions-cool/issues-similarity-analysis@v1
+ with:
+ token: ${{ steps.generate_token.outputs.token }}
+ filter-threshold: 0.60
+ title-excludes: ''
+ comment-title: |
+ ### Your issue looks similar to these issues:
+ Please close if duplicate.
+ comment-body: '${index}. ${similarity} #${number}'
+ - name: Label if possible duplicate
+ if: steps.similarity.outputs.similar-issues-found =='true'
+ uses: actions/github-script@v7
+ with:
+ github-token: ${{ steps.generate_token.outputs.token }}
+ script: |
+ github.rest.issues.addLabels({
+ issue_number: context.issue.number,
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ labels: ["possible duplicate"]
+ })
+ - uses: actions/checkout@v4
+ - name: Automatically close issues that dont follow the issue template
+ uses: lucasbento/auto-close-issues@v1.0.2
+ with:
+ github-token: ${{ steps.generate_token.outputs.token }}
+ issue-close-message: |
+ @${issue.user.login}: hello! :wave:
+ This issue is being automatically closed because it does not follow the issue template."
+ closed-issues-label: "invalid"
+ - name: Check if issue mentions a provider
+ id: provider_check
+ env:
+ GH_TEXT: "${{ github.event.issue.title }} ${{ github.event.issue.body }}"
+ run: |
+ wget --output-document check_issue.py "https://raw.githubusercontent.com/recloudstream/.github/master/.github/check_issue.py"
+ pip3 install httpx
+ RES="$(python3 ./check_issue.py)"
+ echo "name=${RES}" >> $GITHUB_OUTPUT
+ - name: Comment if issue mentions a provider
+ if: steps.provider_check.outputs.name != 'none'
+ uses: actions-cool/issues-helper@v3
+ with:
+ actions: 'create-comment'
+ token: ${{ steps.generate_token.outputs.token }}
+ body: |
+ Hello ${{ github.event.issue.user.login }}.
+ Please do not report any provider bugs here. This repository does not contain any providers. Please find the appropriate repository and report your issue there or join the [discord](https://discord.gg/5Hus6fM).
+
+ 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
+ with:
+ github-token: ${{ steps.generate_token.outputs.token }}
+ script: |
+ github.rest.issues.addLabels({
+ issue_number: context.issue.number,
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ labels: ["possible provider issue"]
+ })
+ - name: Add eyes reaction to all issues
+ uses: actions-cool/emoji-helper@v1.0.0
+ with:
+ type: 'issue'
+ token: ${{ steps.generate_token.outputs.token }}
+ emoji: 'eyes'
+
+
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index b5b17ba6a..f35cd58c5 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -8,13 +8,10 @@ on:
- '*.json'
- '**/wcokey.txt'
-concurrency:
+concurrency:
group: "pre-release"
cancel-in-progress: true
-permissions:
- contents: write
-
jobs:
build:
runs-on: ubuntu-latest
@@ -26,18 +23,14 @@ jobs:
app_id: ${{ secrets.GH_APP_ID }}
private_key: ${{ secrets.GH_APP_KEY }}
repository: "recloudstream/secrets"
-
- - uses: actions/checkout@v6
-
+ - uses: actions/checkout@v4
- name: Set up JDK 17
- uses: actions/setup-java@v5
+ uses: actions/setup-java@v4
with:
- distribution: temurin
- java-version: 17
-
+ java-version: '17'
+ distribution: 'adopt'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
-
- name: Fetch keystore
id: fetch_keystore
run: |
@@ -48,25 +41,18 @@ jobs:
KEY_PWD="$(cat keystore_password.txt)"
echo "::add-mask::${KEY_PWD}"
echo "key_pwd=$KEY_PWD" >> $GITHUB_OUTPUT
-
- - name: Setup Gradle
- uses: gradle/actions/setup-gradle@v5
- with:
- cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-
- name: Run Gradle
- run: ./gradlew assemblePrereleaseRelease androidSourcesJar makeJar
+ run: |
+ ./gradlew assemblePrerelease build androidSourcesJar
+ ./gradlew makeJar # for classes.jar, has to be done after assemblePrerelease
env:
SIGNING_KEY_ALIAS: "key0"
SIGNING_KEY_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
SIGNING_STORE_PASSWORD: ${{ steps.fetch_keystore.outputs.key_pwd }}
SIMKL_CLIENT_ID: ${{ secrets.SIMKL_CLIENT_ID }}
SIMKL_CLIENT_SECRET: ${{ secrets.SIMKL_CLIENT_SECRET }}
- TRAKT_CLIENT_ID: ${{ secrets.TRAKT_CLIENT_ID }}
- MDL_API_KEY: ${{ secrets.MDL_API_KEY }}
-
- name: Create pre-release
- uses: marvinpinto/action-automatic-releases@latest
+ uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "pre-release"
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 8f5c62866..7f6dd4123 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -2,35 +2,22 @@ name: Artifact Build
on: [pull_request]
-permissions:
- contents: read
-
jobs:
build:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v6
-
+ - uses: actions/checkout@v4
- name: Set up JDK 17
- uses: actions/setup-java@v5
+ uses: actions/setup-java@v4
with:
- distribution: temurin
- java-version: 17
-
+ java-version: '17'
+ distribution: 'adopt'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
-
- - name: Setup Gradle
- uses: gradle/actions/setup-gradle@v5
- with:
- cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
- cache-read-only: false
-
- name: Run Gradle
- run: ./gradlew assemblePrereleaseDebug lint check
-
+ run: ./gradlew assemblePrereleaseDebug
- name: Upload Artifact
- uses: actions/upload-artifact@v7
+ uses: actions/upload-artifact@v4
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 0a538d5d4..ce140e559 100644
--- a/.github/workflows/update_locales.yml
+++ b/.github/workflows/update_locales.yml
@@ -1,19 +1,17 @@
name: Fix locale issues
on:
+ workflow_dispatch:
push:
- branches: [ master ]
paths:
- '**.xml'
- workflow_dispatch:
+ branches:
+ - master
-concurrency:
+concurrency:
group: "locale"
cancel-in-progress: true
-permissions:
- contents: read
-
jobs:
create:
runs-on: ubuntu-latest
@@ -25,17 +23,15 @@ jobs:
app_id: ${{ secrets.GH_APP_ID }}
private_key: ${{ secrets.GH_APP_KEY }}
repository: "recloudstream/cloudstream"
-
- - uses: actions/checkout@v6
+ - uses: actions/checkout@v4
with:
token: ${{ steps.generate_token.outputs.token }}
-
- name: Install dependencies
- run: pip3 install lxml requests
-
+ run: |
+ pip3 install lxml
- name: Edit files
- run: python3 .github/locales.py
-
+ run: |
+ python3 .github/locales.py
- name: Commit to the repo
run: |
git config --local user.email "111277985+recloudstream[bot]@users.noreply.github.com"
diff --git a/.gitignore b/.gitignore
index 5fc9f0870..2ac6c9695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+*.iml
+.gradle
/local.properties
/.idea/caches
/.idea/misc.xml
@@ -9,220 +11,6 @@
.DS_Store
/build
/captures
-.cxx
-.kotlin/*
-
-# Created by https://www.toptal.com/developers/gitignore/api/kotlin,java,android,androidstudio,visualstudiocode
-# Edit at https://www.toptal.com/developers/gitignore?templates=kotlin,java,android,androidstudio,visualstudiocode
-
-### Android ###
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Log/OS Files
-*.log
-
-# Android Studio generated files and folders
-captures/
-.externalNativeBuild/
-.cxx/
-*.apk
-output.json
-
-# IntelliJ
-*.iml
-.idea/
-misc.xml
-deploymentTargetDropDown.xml
-render.experimental.xml
-
-# Keystore files
-*.jks
-*.keystore
-
-# Google Services (e.g. APIs or Firebase)
-google-services.json
-
-# Android Profiling
-*.hprof
-
-### Android Patch ###
-gen-external-apklibs
-
-# Replacement of .externalNativeBuild directories introduced
-# with Android Studio 3.5.
-
-### Java ###
-# Compiled class file
-*.class
-
-# Log file
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-replay_pid*
-
-### Kotlin ###
-# Compiled class file
-
-# Log file
-
-# BlueJ files
-
-# Mobile Tools for Java (J2ME)
-
-# Package Files #
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-
-### VisualStudioCode ###
-.vscode/*
-
-# Local History for Visual Studio Code
-.history/
-
-# Built Visual Studio Code Extensions
-*.vsix
-
-### VisualStudioCode Patch ###
-# Ignore all local history of files
-.history
-.ionide
-
-### AndroidStudio ###
-# Covers files to be ignored for android development using Android Studio.
-
-# Built application files
-*.ap_
-*.aab
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-
-# Generated files
-bin/
-gen/
-out/
-
-# Gradle files
-.gradle
-
-# Signing files
-.signing/
-
-# Local configuration file (sdk path, etc)
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-
-# Android Studio
-/*/build/
-/*/local.properties
-/*/out
-/*/*/build
-/*/*/production
-.navigation/
-*.ipr
-*~
-*.swp
-
-# Keystore files
-
-# Google Services (e.g. APIs or Firebase)
-# google-services.json
-
-# Android Patch
-
-# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
-
-# NDK
-obj/
-
-# IntelliJ IDEA
-*.iws
-/out/
-
-# User-specific configurations
-.idea/caches/
-.idea/libraries/
-.idea/shelf/
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/.name
-.idea/compiler.xml
-.idea/copyright/profiles_settings.xml
-.idea/encodings.xml
-.idea/misc.xml
-.idea/modules.xml
-.idea/scopes/scope_settings.xml
-.idea/dictionaries
-.idea/vcs.xml
-.idea/jsLibraryMappings.xml
-.idea/datasources.xml
-.idea/dataSources.ids
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
-.idea/assetWizardSettings.xml
-.idea/gradle.xml
-.idea/jarRepositories.xml
-.idea/navEditor.xml
-
-# Legacy Eclipse project files
-.classpath
-.project
-.cproject
-.settings/
-
-# Mobile Tools for Java (J2ME)
-
-# Package Files #
-
-# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
-
-## Plugin-specific files:
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Mongo Explorer plugin
-.idea/mongoSettings.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-### AndroidStudio Patch ###
-
-!/gradle/wrapper/gradle-wrapper.jar
-
-# End of https://www.toptal.com/developers/gitignore/api/kotlin,java,android,androidstudio,visualstudiocode
+.cxx
+local.properties
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 000000000..1eb497a93
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+CloudStream
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 000000000..7643783a8
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xmlns:android
+
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+
+ ^$
+
+
+
+
+
+
+
+
+ style
+
+ ^$
+
+
+
+
+
+
+
+
+ .*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+
+ http://schemas.android.com/apk/res/android
+
+
+ ANDROID_ATTRIBUTE_ORDER
+
+
+
+
+
+
+ .*
+
+ .*
+
+
+ BY_NAME
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 000000000..79ee123c2
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 000000000..b589d56e9
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/discord.xml b/.idea/discord.xml
new file mode 100644
index 000000000..d8e956166
--- /dev/null
+++ b/.idea/discord.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 000000000..db202a929
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 000000000..333d49373
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/studiobot.xml b/.idea/studiobot.xml
new file mode 100644
index 000000000..9298202cb
--- /dev/null
+++ b/.idea/studiobot.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000..35eb1ddfb
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..7282979ad
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+ "githubPullRequests.ignoredPullRequestBranches": [
+ "master"
+ ],
+ "java.configuration.updateBuildConfiguration": "interactive"
+}
\ No newline at end of file
diff --git a/AI-POLICY.md b/AI-POLICY.md
deleted file mode 100644
index 5409393fb..000000000
--- a/AI-POLICY.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# AI Policy
-
-AI is a great tool. However, we want you to follow these rules regarding usage of AI in order to ensure the quality of both code and discussions.
-
-1. Always state any AI usage in pull requests and issues.
-
-2. Always test code before making a pull request. We do not want to test your AI generated code.
-
-3. Listen to humans over computers. Contributors to CloudStream know this codebase better than an AI.
-
-4. You should be able to explain and fix any code you submit. We do in-depth reviews and will reject low effort contributions.
diff --git a/README.md b/README.md
index c2492c5d8..8949304e9 100644
--- a/README.md
+++ b/README.md
@@ -1,46 +1,11 @@
# CloudStream
-**⚠️ Warning: By default, this app doesn't provide any video sources; you have to install extensions to add functionality to the app.**
+**⚠️ Warning: By default this app doesn't provide any video sources, you have to install extensions in order to add functionality to the app.**
+
[](https://discord.gg/5Hus6fM)
-
-## Table of Contents:
-+ [About Us:](#about_us)
-+ [Installation Steps:](#install_rules)
-+ [Contributing:](#contributing)
-+ [Issues:](#issues)
- + [Bugs Reports:](#bug_report)
- + [Enhancement:](#enhancment)
-+ [Extension Development:](#extensions)
-+ [Language Support:](#languages)
-+ [Further Sources](#contact_and_sources)
-
-
-
-
-## About us:
-
-**CloudStream is a media center that prioritizes and emphasizes complete freedom and flexibility for users and developers.**
-
-CloudStream is an extension-based multimedia player with tracking support. There are extensions to view videos from:
-
-+ [Librevox (audio-books)](https://librivox.org/)
-+ [Youtube](https://www.youtube.com/)
-+ [Twitch](https://www.twitch.tv/)
-+ [iptv-org (A collection of publicly available IPTV (Internet Protocol television) channels from all over the world.)](https://github.com/iptv-org/iptv)
-+ [nginx](https://nginx.org/)
-+ And more...
-
-
-**Please don't create illegal extensions or use any that host any copyrighted media.** For more details about our stance on the DMCA and EUCD, you can read about it on our organization: [reCloudStream](https://github.com/recloudstream)
-
-#### Important Copyright Note:
-
-Our documentation is unmaintained and open to contributions; therefore, apps and sources, extensions in recommended sources, and recommended apps are not officially moderated or endorsed by CloudStream; if you or another copyright owner identify an extension that breaches your copyright, please let us know.
-
-
-#### Features:
+### Features:
+ **AdFree**, No ads whatsoever
+ No tracking/analytics
+ Bookmarks
@@ -48,64 +13,7 @@ Our documentation is unmaintained and open to contributions; therefore, apps and
+ Chromecast
+ Extension system for personal customization
-
-
-
-## Installation:
-
-Our documentation provides the steps to install and configure CloudStream for your streaming needs.
-
-[Getting Started With CloudStream:](https://recloudstream.github.io/csdocs/)
-
-
-
-## Contributing:
-We **happily** accept any contributions to our project. To find out where you can start contributing towards the project, please look [at our issues tab](/cloudstream/issues)
-
-
-
-
-
-### Issues:
-While we **actively** accept issues and pull requests, we do require you fill out an [template](https://github.com/recloudstream/cloudstream/issues/new/choose) for issues. These include the following:
-
-
-
-- [Bug Report Template: ](https://github.com/recloudstream/cloudstream/issues/new?assignees=&labels=bug&projects=&template=application-bug.yml)
- - For bug reports, we want as much info as possible, including your downloaded version of CloudeStream, device and updated version (if possible, current API),
- expected behavior of the program, and the actual behavior that the program did, most importantly we require clear, reproducible steps of the bug. If your bug can't be reproduced, it is unlikely we'll work on your issue.
-
-
-
-- [Feature Request Template: ](https://github.com/recloudstream/cloudstream/issues/new?assignees=&labels=enhancement&projects=&template=feature-request.yml)
- - Before adding a feature request, please check to see if a feature request already has been requested.
-
-
-### Extensions:
-
-**Further details on creating extensions for CloudStream are found in our documentation.**
-
-[Guide: For Extension Developers](https://recloudstream.github.io/csdocs/devs/gettingstarted/)
-
-
-
-## Further Sources:
-
-As well as providing clear install steps, our [website](https://dweb.link/ipns/cloudstream.on.fleek.co/) includes a wide variety of other tools, such as:
-- [Troubleshooting](https://recloudstream.github.io/csdocs/troubleshooting/)
-- [Further CloudStream Repositories](https://recloudstream.github.io/csdocs/repositories/)
-- Set-Up for other devices, such as:
- - [Android TV](https://recloudstream.github.io/csdocs/other-devices/tv/)
- - [Windows](https://recloudstream.github.io/csdocs/other-devices/windows/)
- - [Linux](https://recloudstream.github.io/csdocs/other-devices/linux/)
-- And more...
-
-
-
### Supported languages:
-
-Even if you can't contribute to the code or documentation, we always look for those who can contribute to translation and language support. Your contribution is exceptionally appreciated; you can check our translation from the figure below.
-
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
new file mode 100644
index 000000000..7f7fd14c1
--- /dev/null
+++ b/app/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Set this to the minimum version your project supports.
+cmake_minimum_required(VERSION 3.18)
+project(CrashHandler)
+find_library(log-lib log)
+add_library(native-lib SHARED src/main/cpp/native-lib.cpp)
+target_link_libraries(native-lib ${log-lib})
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 02c1f99e8..48a28e89b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,96 +1,48 @@
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
-import org.jetbrains.dokka.gradle.engine.parameters.KotlinPlatform
-import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
-import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
+import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import java.io.ByteArrayOutputStream
plugins {
- alias(libs.plugins.android.application)
- alias(libs.plugins.dokka)
- alias(libs.plugins.kotlin.serialization)
+ id("com.android.application")
+ id("com.google.devtools.ksp")
+ id("kotlin-android")
+ id("org.jetbrains.dokka")
}
-val javaTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
+val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
+val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first()
-abstract class GenerateGitHashTask : DefaultTask() {
-
- @get:InputFile
- @get:PathSensitive(PathSensitivity.RELATIVE)
- abstract val headFile: RegularFileProperty
-
- @get:InputDirectory
- @get:PathSensitive(PathSensitivity.RELATIVE)
- abstract val headsDir: DirectoryProperty
-
- @get:OutputDirectory
- abstract val outputDir: DirectoryProperty
-
- @TaskAction
- fun generate() {
- val head = headFile.get().asFile
-
- val hash = try {
- if (head.exists()) {
- // Read the commit hash from .git/HEAD
- val headContent = head.readText().trim()
- if (headContent.startsWith("ref:")) {
- val refPath = headContent.substring(5) // e.g., refs/heads/main
- val commitFile = File(head.parentFile, refPath)
- if (commitFile.exists()) commitFile.readText().trim() else ""
- } else headContent // If it's a detached HEAD (commit hash directly)
- } else "" // If .git/HEAD doesn't exist
- } catch (_: Throwable) {
- "" // Just set to an empty string if any exception occurs
- }.take(7) // Get the short commit hash
-
- val outFile = outputDir.file("git-hash.txt").get().asFile
- outFile.parentFile.mkdirs()
- outFile.writeText(hash)
- }
-}
-
-val generateGitHash = tasks.register("generateGitHash") {
- val gitDir = layout.projectDirectory.dir("../.git")
-
- headFile.set(gitDir.file("HEAD"))
- headsDir.set(gitDir.dir("refs/heads"))
-
- outputDir.set(layout.buildDirectory.dir("generated/git"))
+fun String.execute() = ByteArrayOutputStream().use { baot ->
+ if (project.exec {
+ workingDir = projectDir
+ commandLine = this@execute.split(Regex("\\s"))
+ standardOutput = baot
+ }.exitValue == 0)
+ String(baot.toByteArray()).trim()
+ else null
}
android {
- @Suppress("UnstableApiUsage")
testOptions {
unitTests.isReturnDefaultValues = true
}
- // Looks like google likes to add metadata only they can read https://gitlab.com/IzzyOnDroid/repo/-/work_items/491
- dependenciesInfo {
- // Disables dependency metadata when building APKs.
- includeInApk = false
- // Disables dependency metadata when building Android App Bundles.
- includeInBundle = false
+ viewBinding {
+ enable = true
}
- androidComponents {
- onVariants { variant ->
- variant.sources.assets?.addGeneratedSourceDirectory(
- generateGitHash,
- GenerateGitHashTask::outputDir
- )
+ /* disable this for now
+ externalNativeBuild {
+ cmake {
+ path("CMakeLists.txt")
}
- }
+ }*/
signingConfigs {
- // We just use SIGNING_KEY_ALIAS here since it won't change
- // so won't kill the configuration cache.
- if (System.getenv("SIGNING_KEY_ALIAS") != null) {
+ if (prereleaseStoreFile != null) {
create("prerelease") {
- val tmpFilePath = System.getProperty("user.home") + "/work/_temp/keystore/"
- val prereleaseStoreFile: File? = File(tmpFilePath).listFiles()?.first()
-
- storeFile = prereleaseStoreFile?.let { file(it) }
+ storeFile = file(prereleaseStoreFile)
storePassword = System.getenv("SIGNING_STORE_PASSWORD")
keyAlias = System.getenv("SIGNING_KEY_ALIAS")
keyPassword = System.getenv("SIGNING_KEY_PASSWORD")
@@ -98,19 +50,23 @@ android {
}
}
- compileSdk = libs.versions.compileSdk.get().toInt()
+ compileSdk = 34
+ buildToolsVersion = "34.0.0"
defaultConfig {
applicationId = "com.lagradost.cloudstream3"
- minSdk = libs.versions.minSdk.get().toInt()
- targetSdk = libs.versions.targetSdk.get().toInt()
- versionCode = libs.versions.versionCode.get().toInt()
- versionName = libs.versions.versionName.get()
+ 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"
- manifestPlaceholders["target_sdk_version"] = libs.versions.targetSdk.get()
+ resValue("string", "app_version", "${defaultConfig.versionName}${versionNameSuffix ?: ""}")
+ resValue("string", "commit_hash", "git rev-parse --short HEAD".execute() ?: "")
+ resValue("bool", "is_prerelease", "false")
// Reads local.properties
- val localProperties = gradleLocalProperties(rootDir, project.providers)
+ val localProperties = gradleLocalProperties(rootDir)
buildConfigField(
"long",
@@ -128,6 +84,11 @@ android {
"\"" + (System.getenv("SIMKL_CLIENT_SECRET") ?: localProperties["simkl.secret"]) + "\""
)
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+ ksp {
+ arg("room.schemaLocation", "$projectDir/schemas")
+ arg("exportSchema", "true")
+ }
}
buildTypes {
@@ -154,9 +115,12 @@ android {
productFlavors {
create("stable") {
dimension = "state"
+ resValue("bool", "is_prerelease", "false")
}
create("prerelease") {
dimension = "state"
+ resValue("bool", "is_prerelease", "true")
+ buildConfigField("boolean", "BETA", "true")
applicationIdSuffix = ".prerelease"
if (signingConfigs.names.contains("prerelease")) {
signingConfig = signingConfigs.getByName("prerelease")
@@ -170,33 +134,17 @@ android {
compileOptions {
isCoreLibraryDesugaringEnabled = true
- sourceCompatibility = JavaVersion.toVersion(javaTarget.target)
- targetCompatibility = JavaVersion.toVersion(javaTarget.target)
- }
-
- java {
- // Use Java 17 toolchain even if a higher JDK runs the build.
- // We still use Java 8 for now which higher JDKs have deprecated.
- toolchain {
- languageVersion.set(JavaLanguageVersion.of(libs.versions.jdkToolchain.get()))
- }
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
}
lint {
+ abortOnError = false
checkReleaseBuilds = false
}
buildFeatures {
buildConfig = true
- viewBinding = true
- }
-
- packaging {
- jniLibs {
- // Enables legacy JNI packaging to reduce APK size (similar to builds before minSdk 23).
- // Note: This may increase app startup time slightly.
- useLegacyPackaging = true
- }
}
namespace = "com.lagradost.cloudstream3"
@@ -204,89 +152,105 @@ android {
dependencies {
// Testing
- testImplementation(libs.junit)
- testImplementation(libs.json)
- androidTestImplementation(libs.core)
- androidTestImplementation(libs.espresso.core)
- androidTestImplementation(libs.ext.junit)
- androidTestImplementation(libs.instancio.core)
- androidTestImplementation(libs.junit.ktx)
- androidTestImplementation(libs.kotlin.test)
+ 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")
// Android Core & Lifecycle
- implementation(libs.core.ktx)
- implementation(libs.activity.ktx)
- implementation(libs.annotation)
- implementation(libs.appcompat)
- implementation(libs.fragment.ktx)
- implementation(libs.bundles.lifecycle)
- implementation(libs.bundles.navigation)
- implementation(libs.kotlinx.collections.immutable)
- implementation(libs.kotlinx.serialization.json) // JSON Parser
+ 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")
// Design & UI
- implementation(libs.preference.ktx)
- implementation(libs.material)
- implementation(libs.constraintlayout)
+ 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")
+ implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+ implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
- // Coil Image Loading
- implementation(libs.bundles.coil)
+ // 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")
+
+ // 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(libs.bundles.media3)
- implementation(libs.video)
-
- // FFmpeg Decoding
- implementation(libs.bundles.nextlib)
-
- // Anime-db for filler
- implementation(libs.anime.db)
+ implementation("androidx.media3:media3-ui:1.4.1")
+ implementation("androidx.media3:media3-cast:1.4.1")
+ implementation("androidx.media3:media3-common:1.4.1")
+ implementation("androidx.media3:media3-session:1.4.1")
+ implementation("androidx.media3:media3-exoplayer:1.4.1")
+ implementation("com.google.android.mediahome:video:1.0.0")
+ implementation("androidx.media3:media3-exoplayer-hls:1.4.1")
+ implementation("androidx.media3:media3-exoplayer-dash:1.4.1")
+ implementation("androidx.media3:media3-datasource-okhttp:1.4.1")
// PlayBack
- implementation(libs.colorpicker) // Subtitle Color Picker
- implementation(libs.newpipeextractor) // For Trailers
- implementation(libs.juniversalchardet) // Subtitle Decoding
+ 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:v0.24.2") /* 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
+
+ // Crash Reports (AcraApplication.kt)
+ implementation("ch.acra:acra-core:5.11.3")
+ implementation("ch.acra:acra-toast:5.11.3")
// UI Stuff
- implementation(libs.shimmer) // Shimmering Effect (Loading Skeleton)
- implementation(libs.palette.ktx) // Palette for Images -> Colors
- implementation(libs.tvprovider)
- implementation(libs.overlappingpanels) // Gestures
- implementation(libs.biometric) // Fingerprint Authentication
- implementation(libs.previewseekbar.media3) // SeekBar Preview
- implementation(libs.qrcode.kotlin) // QR Code for PIN Auth on TV
+ 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(libs.jsoup) // HTML Parser
- implementation(libs.rhino) // Run JavaScript
- implementation(libs.safefile) // To Prevent the URI File Fu*kery
- coreLibraryDesugaring(libs.desugar.jdk.libs.nio) // NIO Flavor Needed for NewPipeExtractor
- implementation(libs.conscrypt.android) // To Fix SSL Fu*kery on Android 9
- implementation(libs.jackson.module.kotlin) // JSON Parser
- implementation(libs.zipline)
-
- // Deprecated; will be removed once extensions have time to migrate from using it
- implementation("me.xdrop:fuzzywuzzy:1.4.0")
-
- // Torrent Support
- implementation(libs.torrentserver)
+ 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. */
// Downloading & Networking
- implementation(libs.work.runtime.ktx)
- implementation(libs.nicehttp) // HTTP Lib
+ 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
- implementation(project(":library"))
+ 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)
+ }
+ }
+
+ this.extra.set("isDebug", isDebug)
+ })
}
tasks.register("androidSourcesJar") {
archiveClassifier.set("sources")
- from(android.sourceSets.getByName("main").java.directories) // Full Sources
+ from(android.sourceSets.getByName("main").java.srcDirs) // Full Sources
}
tasks.register("copyJar") {
- dependsOn("build", ":library:jvmJar")
from(
- "build/intermediates/compile_app_classes_jar/prereleaseDebug/bundlePrereleaseDebugClassesToCompileJar",
+ "build/intermediates/compile_app_classes_jar/prereleaseDebug",
"../library/build/libs"
)
into("build/app-classes")
@@ -305,39 +269,12 @@ tasks.register("makeJar") {
zipTree("build/app-classes/library-jvm.jar")
)
destinationDirectory.set(layout.buildDirectory)
- archiveBaseName = "classes"
+ archivesName = "classes"
}
-tasks.withType {
- compilerOptions {
- jvmTarget.set(javaTarget)
- jvmDefault.set(JvmDefaultMode.ENABLE)
- freeCompilerArgs.add("-Xannotation-default-target=param-property")
- optIn.addAll(
- "com.lagradost.cloudstream3.InternalAPI",
- "com.lagradost.cloudstream3.Prerelease",
- "kotlin.uuid.ExperimentalUuidApi",
- )
+tasks.withType {
+ kotlinOptions {
+ jvmTarget = "1.8"
+ freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
}
-}
-
-dokka {
- moduleName = "App"
- dokkaSourceSets {
- configureEach {
- suppress = name != "prereleaseDebug"
- analysisPlatform = KotlinPlatform.JVM
- displayName = "JVM"
- documentedVisibilities(
- VisibilityModifier.Public,
- VisibilityModifier.Protected
- )
-
- sourceLink {
- localDirectory = file("..")
- remoteUrl("https://github.com/recloudstream/cloudstream/tree/master")
- remoteLineSuffix = "#L"
- }
- }
- }
-}
+}
\ No newline at end of file
diff --git a/app/lint.xml b/app/lint.xml
deleted file mode 100644
index b2f5e8f2b..000000000
--- a/app/lint.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
index 4c5cdea5b..c7f02baff 100644
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/lagradost/cloudstream3/ExampleInstrumentedTest.kt
@@ -7,7 +7,6 @@ import android.view.LayoutInflater
import androidx.test.core.app.ActivityScenario
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.viewbinding.ViewBinding
-import com.lagradost.cloudstream3.databinding.BottomResultviewPreviewBinding
import com.lagradost.cloudstream3.databinding.FragmentHomeBinding
import com.lagradost.cloudstream3.databinding.FragmentHomeTvBinding
import com.lagradost.cloudstream3.databinding.FragmentLibraryBinding
@@ -89,8 +88,6 @@ class ExampleInstrumentedTest {
// testAllLayouts(activity,R.layout.activity_main, R.layout.activity_main_tv)
//testAllLayouts(activity, R.layout.activity_main_tv)
- testAllLayouts(activity, R.layout.bottom_resultview_preview,R.layout.bottom_resultview_preview_tv)
-
testAllLayouts(activity, R.layout.fragment_player,R.layout.fragment_player_tv)
testAllLayouts(activity, R.layout.fragment_player,R.layout.fragment_player_tv)
@@ -136,14 +133,14 @@ class ExampleInstrumentedTest {
@Test
@Throws(AssertionError::class)
fun providerCorrectData() {
- val langTagsIETF = SubtitleHelper.languages.map { it.IETF_tag }
- Assert.assertFalse("IETFTagNames does not contain any languages", langTagsIETF.isNullOrEmpty())
+ val isoNames = SubtitleHelper.languages.map { it.ISO_639_1 }
+ Assert.assertFalse("ISO does not contain any languages", isoNames.isNullOrEmpty())
for (api in getAllProviders()) {
Assert.assertTrue("Api does not contain a mainUrl", api.mainUrl != "NONE")
Assert.assertTrue("Api does not contain a name", api.name != "NONE")
Assert.assertTrue(
"Api ${api.name} does not contain a valid language code",
- langTagsIETF.contains(api.lang)
+ isoNames.contains(api.lang)
)
Assert.assertTrue(
"Api ${api.name} does not contain any supported types",
diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt
deleted file mode 100644
index 80c7b49b0..000000000
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/SerializationClassTester.kt
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.lagradost.cloudstream3
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import dalvik.system.DexFile
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.InternalSerializationApi
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.serializer
-import kotlinx.serialization.serializerOrNull
-import org.instancio.Instancio
-import org.junit.Test
-import org.junit.runner.RunWith
-import kotlin.reflect.KClass
-import kotlin.reflect.jvm.jvmName
-import kotlin.test.assertEquals
-import kotlin.test.assertNotNull
-
-@RunWith(AndroidJUnit4::class)
-class SerializationClassTester {
- // Same as app, or using app reference
- val jacksonMapper = mapper
- val kotlinxMapper = json
-
- @Test
- fun isIdenticalSerialization() {
- val serializableClasses = findSerializableClasses("com.lagradost")
- println("Number of serializable classes: ${serializableClasses.size}")
-
- serializableClasses.forEach { kClass ->
- val instance = Instancio.create(kClass.java)
-
- val jacksonJson = jacksonMapper.writeValueAsString(instance)
- val kotlinxJson = serializeWithKotlinx(kClass, instance)
-
- assertEquals(
- jacksonJson,
- kotlinxJson,
- """
- Serialization mismatch for:
- ${kClass.qualifiedName}
-
- Jackson:
- $jacksonJson
-
- Kotlinx:
- $kotlinxJson
-
- """.trimIndent()
- )
- println("Identical serialization for: ${kClass.jvmName}")
- }
- }
-
- @OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class)
- @Test
- fun isIdenticalDeserialization() {
- val serializableClasses = findSerializableClasses("com.lagradost")
- println("Number of serializable classes: ${serializableClasses.size}")
-
- serializableClasses.forEach { kClass ->
- val instance = Instancio.create(kClass.java)
- // Convert to JSON to get example JSON object
- // We prefer jackson here because the app may have many jackson JSON strings in local storage
- val originalJson = jacksonMapper.writeValueAsString(instance)
-
- // Create an object from the JSON using kotlinx
- val serializer =
- kClass.serializerOrNull() ?: kotlinxMapper.serializersModule.getContextual(kClass)
- assertNotNull(serializer, "The class: ${kClass.jvmName} must be serializable!")
- val kotlinxDecoded = kotlinxMapper.decodeFromString(serializer, originalJson)
-
- // Create an object from the JSON using jackson
- val mapperDecoded = jacksonMapper.readValue(originalJson, kClass.java)
-
-
- // Deep inspect both object using the mapper toJson function.
- // This deep equality check can be performed using other methods, but this just works.
- val jacksonJson = mapperDecoded.toJson()
- val kotlinxJson = kotlinxDecoded.toJson()
-
- assertEquals(
- jacksonJson,
- kotlinxJson,
- """
- Serialization mismatch for:
- ${kClass.qualifiedName}
-
- Jackson:
- $jacksonJson
-
- Kotlinx:
- $kotlinxJson
-
- """.trimIndent()
- )
- println("Identical deserialization for: ${kClass.jvmName}")
- }
- }
-
- // DEX files are the best solution to read all our classes dynamically.
- // classgraph could be used instead, but it only gives results on the JVM, not Android.
- @Suppress("DEPRECATION")
- private fun findSerializableClasses(packageName: String): List> {
- val context = InstrumentationRegistry
- .getInstrumentation()
- .targetContext
-
- val dexFile = DexFile(context.packageCodePath)
- return dexFile.entries()
- .toList()
- .filter { it.startsWith(packageName) }
- .mapNotNull {
- runCatching { Class.forName(it).kotlin }.getOrNull()
- }.filter { kClass ->
- // Not possible to use .hasAnnotation() on newer Android versions.
- kClass.java.annotations.any {
- it is Serializable
- }
- }
- }
-
- @OptIn(InternalSerializationApi::class)
- @Suppress("UNCHECKED_CAST")
- private fun serializeWithKotlinx(
- kClass: KClass<*>,
- value: Any
- ): String {
- val serializer = kClass.serializer() as KSerializer
- return kotlinxMapper.encodeToString(serializer, value)
- }
-}
diff --git a/app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/SerializerTest.kt b/app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/SerializerTest.kt
deleted file mode 100644
index 15ad532f8..000000000
--- a/app/src/androidTest/java/com/lagradost/cloudstream3/utils/serializers/SerializerTest.kt
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.lagradost.cloudstream3.utils.serializers
-
-import android.net.Uri
-import com.lagradost.cloudstream3.utils.AppUtils.parseJson
-import com.lagradost.cloudstream3.utils.AppUtils.toJson
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.KeepGeneratedSerializer
-import kotlinx.serialization.Serializable
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Test
-
-@OptIn(ExperimentalSerializationApi::class)
-@KeepGeneratedSerializer
-@Serializable(with = NonEmptyData.Serializer::class)
-data class NonEmptyData(
- val title: String = "",
- val tags: List = emptyList(),
- val meta: Map = emptyMap(),
- val name: String = "hello",
-) {
- object Serializer : NonEmptySerializer(NonEmptyData.generatedSerializer())
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@KeepGeneratedSerializer
-@Serializable(with = WriteOnlyData.Serializer::class)
-data class WriteOnlyData(
- val fieldA: String = "",
- val fieldB: String = "",
-) {
- object Serializer : WriteOnlySerializer(
- WriteOnlyData.generatedSerializer(),
- setOf("fieldB"),
- )
-}
-
-@OptIn(ExperimentalSerializationApi::class)
-@KeepGeneratedSerializer
-@Serializable(with = MultiWriteOnly.Serializer::class)
-data class MultiWriteOnly(
- val fieldA: String = "",
- val fieldB: String = "",
- val fieldC: String = "",
-) {
- object Serializer : WriteOnlySerializer(
- MultiWriteOnly.generatedSerializer(),
- setOf("fieldB", "fieldC"),
- )
-}
-
-@Serializable
-data class UriData(
- @Serializable(with = UriSerializer::class)
- val uri: Uri = Uri.EMPTY,
-)
-
-class SerializerTest {
-
- @Test
- fun nonEmptySerializerOmitsEmptyStrings() {
- val data = NonEmptyData(title = "", name = "hello")
- val result = data.toJson()
- assertFalse(result.contains("title"))
- assertTrue(result.contains("name"))
- }
-
- @Test
- fun nonEmptySerializerOmitsEmptyLists() {
- val data = NonEmptyData(tags = emptyList(), name = "hello")
- val result = data.toJson()
- assertFalse(result.contains("tags"))
- }
-
- @Test
- fun nonEmptySerializerOmitsEmptyMaps() {
- val data = NonEmptyData(meta = emptyMap(), name = "hello")
- val result = data.toJson()
- assertFalse(result.contains("meta"))
- }
-
- @Test
- fun nonEmptySerializerKeepsNonEmptyFields() {
- val data = NonEmptyData(title = "hello", tags = listOf("a"), meta = mapOf("k" to "v"))
- val result = data.toJson()
- assertTrue(result.contains("title"))
- assertTrue(result.contains("tags"))
- assertTrue(result.contains("meta"))
- }
-
- @Test
- fun nonEmptySerializerDoesNotAffectDeserialization() {
- val input = """{"title":"hello","tags":["a"],"meta":{"k":"v"},"name":"world"}"""
- val result = parseJson(input)
- assertEquals("hello", result.title)
- assertEquals(listOf("a"), result.tags)
- assertEquals(mapOf("k" to "v"), result.meta)
- assertEquals("world", result.name)
- }
-
- @Test
- fun writeOnlySerializerOmitsFieldOnSerialize() {
- val data = WriteOnlyData(fieldA = "hello", fieldB = "secret")
- val result = data.toJson()
- assertTrue(result.contains("fieldA"))
- assertFalse(result.contains("fieldB"))
- }
-
- @Test
- fun writeOnlySerializerDeserializesNormally() {
- val input = """{"fieldA":"hello","fieldB":"secret"}"""
- val result = parseJson(input)
- assertEquals("hello", result.fieldA)
- assertEquals("secret", result.fieldB)
- }
-
- @Test
- fun writeOnlySerializerDeserializesMissingAsDefault() {
- val input = """{"fieldA":"hello"}"""
- val result = parseJson(input)
- assertEquals("hello", result.fieldA)
- assertEquals("", result.fieldB)
- }
-
- @Test
- fun writeOnlySerializerHandlesMultipleKeys() {
- val data = MultiWriteOnly(fieldA = "hello", fieldB = "secret1", fieldC = "secret2")
- val result = data.toJson()
- assertTrue(result.contains("fieldA"))
- assertFalse(result.contains("fieldB"))
- assertFalse(result.contains("fieldC"))
- }
-
- @Test
- fun uriSerializerSerializesUriToString() {
- val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
- val result = data.toJson()
- assertTrue(result.contains("https://example.com/path?query=1"))
- }
-
- @Test
- fun uriSerializerDeserializesStringToUri() {
- val input = """{"uri":"https://example.com/path?query=1"}"""
- val result = parseJson(input)
- assertEquals(Uri.parse("https://example.com/path?query=1"), result.uri)
- }
-
- @Test
- fun uriSerializerRoundtripsCorrectly() {
- val data = UriData(uri = Uri.parse("https://example.com/path?query=1"))
- val encoded = data.toJson()
- val decoded = parseJson(encoded)
- assertEquals(data.uri, decoded.uri)
- }
-}
diff --git a/app/src/debug/res/drawable-v24/ic_banner_background.xml b/app/src/debug/res/drawable-v24/ic_banner_background.xml
index caed023d5..7b05b7111 100644
--- a/app/src/debug/res/drawable-v24/ic_banner_background.xml
+++ b/app/src/debug/res/drawable-v24/ic_banner_background.xml
@@ -25,8 +25,9 @@
android:endY="245.72"
android:endX="292.58"
android:type="linear">
-