diff --git a/.github/workflow-resources/PKGBUILD.binary b/.github/scripts/PKGBUILD.binary
similarity index 64%
rename from .github/workflow-resources/PKGBUILD.binary
rename to .github/scripts/PKGBUILD.binary
index 00fee47..c9cc76e 100644
--- a/.github/workflow-resources/PKGBUILD.binary
+++ b/.github/scripts/PKGBUILD.binary
@@ -1,7 +1,7 @@
# Maintainer: ByteDream
pkgname=crunchy-cli-bin
pkgdesc="Command-line downloader for Crunchyroll"
-arch=('x86_64' 'aarch64')
+arch=('x86_64')
url="https://github.com/crunchy-labs/crunchy-cli"
license=('MIT')
@@ -9,23 +9,14 @@ pkgver=$CI_PKG_VERSION
pkgrel=1
depends=('ffmpeg')
-provides=('crunchy-cli')
-conflicts=('crunchy-cli')
-source_x86_64=(
+source=(
"crunchy-cli::https://github.com/crunchy-labs/crunchy-cli/releases/download/v${pkgver}/crunchy-cli-v${pkgver}-linux-x86_64"
"manpages.zip::https://github.com/crunchy-labs/crunchy-cli/releases/download/v${pkgver}/crunchy-cli-v${pkgver}-manpages.zip"
"completions.zip::https://github.com/crunchy-labs/crunchy-cli/releases/download/v${pkgver}/crunchy-cli-v${pkgver}-completions.zip"
"LICENSE::https://raw.githubusercontent.com/crunchy-labs/crunchy-cli/v${pkgver}/LICENSE"
)
-source_aarch64=(
- "crunchy-cli::https://github.com/crunchy-labs/crunchy-cli/releases/download/v${pkgver}/crunchy-cli-v${pkgver}-linux-aarch64"
- "manpages.zip::https://github.com/crunchy-labs/crunchy-cli/releases/download/v${pkgver}/crunchy-cli-v${pkgver}-manpages.zip"
- "completions.zip::https://github.com/crunchy-labs/crunchy-cli/releases/download/v${pkgver}/crunchy-cli-v${pkgver}-completions.zip"
- "LICENSE::https://raw.githubusercontent.com/crunchy-labs/crunchy-cli/v${pkgver}/LICENSE"
-)
noextract=("manpages.zip" "completions.zip")
-sha256sums_x86_64=('$CI_AMD_BINARY_SHA_SUM' '$CI_MANPAGES_SHA_SUM' '$CI_COMPLETIONS_SHA_SUM' '$CI_LICENSE_SHA_SUM')
-sha256sums_aarch64=('$CI_ARM_BINARY_SHA_SUM' '$CI_MANPAGES_SHA_SUM' '$CI_COMPLETIONS_SHA_SUM' '$CI_LICENSE_SHA_SUM')
+sha256sums=('$CI_SHA_SUM' '$CI_MANPAGES_SHA_SUM' '$CI_COMPLETIONS_SHA_SUM' '$CI_LICENSE_SHA_SUM')
package() {
cd "$srcdir"
@@ -41,7 +32,7 @@ package() {
install -Dm755 crunchy-cli $pkgdir/usr/bin/crunchy-cli
install -Dm644 manpages/* -t $pkgdir/usr/share/man/man1
- install -Dm644 completions/crunchy-cli.bash $pkgdir/usr/share/bash-completion/completions/crunchy-cli
+ install -Dm644 completions/crunchy-cli.bash $pkgdir/usr/share/bash-completions/completions/crunchy-cli
install -Dm644 completions/_crunchy-cli $pkgdir/usr/share/zsh/site-functions/_crunchy-cli
install -Dm644 completions/crunchy-cli.fish $pkgdir/usr/share/fish/vendor_completions.d/crunchy-cli.fish
install -Dm644 LICENSE $pkgdir/usr/share/licenses/crunchy-cli/LICENSE
diff --git a/.github/workflow-resources/PKGBUILD.source b/.github/scripts/PKGBUILD.source
similarity index 65%
rename from .github/workflow-resources/PKGBUILD.source
rename to .github/scripts/PKGBUILD.source
index 4b14f5b..737a699 100644
--- a/.github/workflow-resources/PKGBUILD.source
+++ b/.github/scripts/PKGBUILD.source
@@ -12,34 +12,22 @@ depends=('ffmpeg' 'openssl')
makedepends=('cargo')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/crunchy-labs/crunchy-cli/archive/refs/tags/v${pkgver}.tar.gz")
sha256sums=('$CI_SHA_SUM')
-# lto causes linking errors when executed by this buildscript. besides, lto is already done by cargo itself (which doesn't cause linking errors)
-options=(!lto)
-
-prepare() {
- cd "$srcdir/${pkgname}-$pkgver"
-
- export RUSTUP_TOOLCHAIN=stable
- export CARGO_HOME="$srcdir/cargo-home"
-
- cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
-}
build() {
cd "$srcdir/${pkgname}-$pkgver"
- export RUSTUP_TOOLCHAIN=stable
export CARGO_HOME="$srcdir/cargo-home"
+ export RUSTUP_TOOLCHAIN=stable
- export CRUNCHY_CLI_GIT_HASH=$CI_GIT_HASH
- cargo build --frozen --release
+ cargo build --release --no-default-features --features openssl
}
package() {
cd "$srcdir/${pkgname}-$pkgver"
install -Dm755 target/release/crunchy-cli $pkgdir/usr/bin/crunchy-cli
- install -Dm644 target/release/manpages/* -t $pkgdir/usr/share/man/man1
- install -Dm644 target/release/completions/crunchy-cli.bash $pkgdir/usr/share/bash-completion/completions/crunchy-cli
+ install -Dm644 target/release/manpages/* $pkgdir/usr/share/man/man1
+ install -Dm644 target/release/completions/crunchy-cli.bash $pkgdir/usr/share/bash-completions/completions/crunchy-cli
install -Dm644 target/release/completions/_crunchy-cli $pkgdir/usr/share/zsh/site-functions/_crunchy-cli
install -Dm644 target/release/completions/crunchy-cli.fish $pkgdir/usr/share/fish/vendor_completions.d/crunchy-cli.fish
install -Dm644 LICENSE $pkgdir/usr/share/licenses/crunchy-cli/LICENSE
diff --git a/.github/workflows/build.yml b/.github/workflows/ci.yml
similarity index 53%
rename from .github/workflows/build.yml
rename to .github/workflows/ci.yml
index 9248ca5..3cdfd77 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/ci.yml
@@ -1,9 +1,9 @@
-name: build
+name: ci
on:
push:
branches:
- - '*'
+ - master
pull_request:
workflow_dispatch:
@@ -19,10 +19,10 @@ jobs:
toolchain: aarch64-unknown-linux-musl
steps:
- name: Checkout
- uses: actions/checkout@v4
+ uses: actions/checkout@v3
- name: Cargo cache
- uses: actions/cache@v4
+ uses: actions/cache@v3
with:
path: |
~/.cargo/bin/
@@ -30,62 +30,43 @@ jobs:
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
- key: ${{ matrix.toolchain }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
- - name: Setup Rust
- uses: dtolnay/rust-toolchain@stable
- with:
- toolchain: stable
+ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Install cross
- run: cargo install --force cross
+ run: cargo install cross
- name: Build
- run: cross build --locked --release --no-default-features --features openssl-tls-static --target ${{ matrix.toolchain }}
+ run: cross build --release --all-features --target ${{ matrix.toolchain }}
- name: Upload binary artifact
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v3
with:
name: crunchy-cli-linux-${{ matrix.arch }}
path: ./target/${{ matrix.toolchain }}/release/crunchy-cli
if-no-files-found: error
- name: Upload manpages artifact
- if: ${{ matrix.arch == 'x86_64' }} # only upload the manpages once
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v3
with:
name: manpages
path: ./target/${{ matrix.toolchain }}/release/manpages
if-no-files-found: error
- name: Upload completions artifact
- if: ${{ matrix.arch == 'x86_64' }} # only upload the completions once
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v3
with:
name: completions
path: ./target/${{ matrix.toolchain }}/release/completions
if-no-files-found: error
build-mac:
- runs-on: ${{ matrix.os }}
- strategy:
- matrix:
- # macos-13 uses x86_64, macos-14 aarch64
- # see https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
- include:
- - os: macos-13
- arch: x86_64
- toolchain: x86_64-apple-darwin
- - os: macos-14
- arch: aarch64
- toolchain: aarch64-apple-darwin
+ runs-on: macos-latest
steps:
- name: Checkout
- uses: actions/checkout@v4
+ uses: actions/checkout@v3
- name: Cargo cache
- if: ${{ matrix.os != 'macos-13' }} # when using cache, the 'Setup Rust' step fails for macos 13
- uses: actions/cache@v4
+ uses: actions/cache@v3
with:
path: |
~/.cargo/bin/
@@ -93,31 +74,32 @@ jobs:
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
- key: x86_64-apple-darwin-cargo-${{ hashFiles('**/Cargo.lock') }}
+ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- - name: Setup Rust
+ - name: Install toolchain
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
+ target: x86_64-apple-darwin
- name: Build
- run: cargo build --locked --release --target ${{ matrix.toolchain }}
+ run: cargo build --release --all-features --target x86_64-apple-darwin
- name: Upload binary artifact
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v3
with:
- name: crunchy-cli-darwin-${{ matrix.arch }}
- path: ./target/${{ matrix.toolchain }}/release/crunchy-cli
+ name: crunchy-cli-darwin-x86_64
+ path: ./target/x86_64-apple-darwin/release/crunchy-cli
if-no-files-found: error
build-windows:
runs-on: windows-latest
steps:
- name: Checkout
- uses: actions/checkout@v4
+ uses: actions/checkout@v3
- name: Cargo cache
- uses: actions/cache@v4
+ uses: actions/cache@v3
with:
path: |
~/.cargo/bin/
@@ -125,20 +107,19 @@ jobs:
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
- key: x86_64-pc-windows-gnu-cargo-${{ hashFiles('**/Cargo.lock') }}
+ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Install system dependencies
uses: msys2/setup-msys2@v2
with:
- update: true
install: mingw-w64-x86_64-rust base-devel
- name: Build
shell: msys2 {0}
- run: cargo build --locked --release --target x86_64-pc-windows-gnu
+ run: cargo build --release --all-features --target x86_64-pc-windows-gnu
- name: Upload binary artifact
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v3
with:
name: crunchy-cli-windows-x86_64
path: ./target/x86_64-pc-windows-gnu/release/crunchy-cli.exe
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
deleted file mode 100644
index 2d6eaf0..0000000
--- a/.github/workflows/lint.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-name: lint
-
-on:
- push:
- branches:
- - '*'
- pull_request:
-
-jobs:
- fmt:
- runs-on: ubuntu-latest
- steps:
- - name: Checkout
- uses: actions/checkout@v4
-
- - name: Cargo cache
- uses: actions/cache@v4
- with:
- path: |
- ~/.cargo/bin/
- ~/.cargo/registry/index/
- ~/.cargo/registry/cache/
- ~/.cargo/git/db/
- target/
- key: x86_64-unknown-linux-gnu-cargo-${{ hashFiles('**/Cargo.lock') }}
-
- - name: Setup Rust
- uses: dtolnay/rust-toolchain@stable
- with:
- toolchain: stable
-
- - name: Check fmt
- run: cargo fmt --check
-
- lint:
- runs-on: ubuntu-latest
- steps:
- - name: Checkout
- uses: actions/checkout@v4
-
- - name: Cargo cache
- uses: actions/cache@v4
- with:
- path: |
- ~/.cargo/bin/
- ~/.cargo/registry/index/
- ~/.cargo/registry/cache/
- ~/.cargo/git/db/
- target/
- key: x86_64-unknown-linux-gnu-cargo-${{ hashFiles('**/Cargo.lock') }}
-
- - name: Setup Rust
- uses: dtolnay/rust-toolchain@stable
- with:
- toolchain: stable
-
- - name: Lint
- run: cargo clippy -- -D warnings
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8f178ce..37f4379 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v4
+ uses: actions/checkout@v3
- name: Get version
run: echo "RELEASE_VERSION=$(echo ${{ github.ref_name }} | cut -c 2-)" >> $GITHUB_ENV
@@ -20,35 +20,30 @@ jobs:
curl -LO https://github.com/crunchy-labs/crunchy-cli/archive/refs/tags/${{ github.ref_name }}.tar.gz
echo "CRUNCHY_CLI_SHA256=$(sha256sum ${{ github.ref_name }}.tar.gz | cut -f 1 -d ' ')" >> $GITHUB_ENV
- - name: Get release commit hash
- run: echo "CRUNCHY_CLI_GIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-
- name: Generate crunchy-cli PKGBUILD
env:
CI_PKG_VERSION: ${{ env.RELEASE_VERSION }}
CI_SHA_SUM: ${{ env.CRUNCHY_CLI_SHA256 }}
- CI_GIT_HASH: ${{ env.CRUNCHY_CLI_GIT_HASH }}
- run: envsubst '$CI_PKG_VERSION,$CI_SHA_SUM,$CI_GIT_HASH' < .github/workflow-resources/PKGBUILD.source > PKGBUILD
+ run: envsubst '$CI_PKG_VERSION,$CI_SHA_SUM' < .github/scripts/PKGBUILD.source > PKGBUILD
- name: Publish crunchy-cli to AUR
- uses: KSXGitHub/github-actions-deploy-aur@v2.7.0
+ uses: KSXGitHub/github-actions-deploy-aur@2.7.0
with:
pkgname: crunchy-cli
pkgbuild: ./PKGBUILD
commit_username: release-action
commit_email: ${{ secrets.AUR_EMAIL }}
ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
- commit_message: Update to version ${{ env.RELEASE_VERSION }}
+ commit_message: Update to version {{ env.RELEASE_VERSION }}
+ test: true
- name: Generate crunchy-cli-bin sha sums
run: |
- curl -LO https://github.com/crunchy-labs/crunchy-cli/releases/download/${{ github.ref_name }}/crunchy-cli-${{ github.ref_name }}-linux-x86_64
- curl -LO https://github.com/crunchy-labs/crunchy-cli/releases/download/${{ github.ref_name }}/crunchy-cli-${{ github.ref_name }}-linux-aarch64
+ curl -LO https://github.com/crunchy-labs/crunchy-cli/releases/download/${{ github.ref_name }}/crunchy-cli-${{ github.ref_name }}-x86_64-linux
curl -LO https://github.com/crunchy-labs/crunchy-cli/releases/download/${{ github.ref_name }}/crunchy-cli-${{ github.ref_name }}-completions.zip
curl -LO https://github.com/crunchy-labs/crunchy-cli/releases/download/${{ github.ref_name }}/crunchy-cli-${{ github.ref_name }}-manpages.zip
curl -LO https://raw.githubusercontent.com/crunchy-labs/crunchy-cli/${{ github.ref_name }}/LICENSE
- echo "CRUNCHY_CLI_BIN_x86_64_SHA256=$(sha256sum crunchy-cli-${{ github.ref_name }}-linux-x86_64 | cut -f 1 -d ' ')" >> $GITHUB_ENV
- echo "CRUNCHY_CLI_BIN_aarch64_SHA256=$(sha256sum crunchy-cli-${{ github.ref_name }}-linux-aarch64 | cut -f 1 -d ' ')" >> $GITHUB_ENV
+ echo "CRUNCHY_CLI_BIN_SHA256=$(sha256sum crunchy-cli-${{ github.ref_name }}-x86_64-linux | cut -f 1 -d ' ')" >> $GITHUB_ENV
echo "CRUNCHY_CLI_BIN_COMPLETIONS_SHA256=$(sha256sum crunchy-cli-${{ github.ref_name }}-completions.zip | cut -f 1 -d ' ')" >> $GITHUB_ENV
echo "CRUNCHY_CLI_BIN_MANPAGES_SHA256=$(sha256sum crunchy-cli-${{ github.ref_name }}-manpages.zip | cut -f 1 -d ' ')" >> $GITHUB_ENV
echo "CRUNCHY_CLI_BIN_LICENSE_SHA256=$(sha256sum LICENSE | cut -f 1 -d ' ')" >> $GITHUB_ENV
@@ -56,19 +51,19 @@ jobs:
- name: Generate crunchy-cli-bin PKGBUILD
env:
CI_PKG_VERSION: ${{ env.RELEASE_VERSION }}
- CI_AMD_BINARY_SHA_SUM: ${{ env.CRUNCHY_CLI_BIN_x86_64_SHA256 }}
- CI_ARM_BINARY_SHA_SUM: ${{ env.CRUNCHY_CLI_BIN_aarch64_SHA256 }}
+ CI_SHA_SUM: ${{ env.CRUNCHY_CLI_BIN_SHA256 }}
CI_MANPAGES_SHA_SUM: ${{ env.CRUNCHY_CLI_BIN_MANPAGES_SHA256 }}
CI_COMPLETIONS_SHA_SUM: ${{ env.CRUNCHY_CLI_BIN_COMPLETIONS_SHA256 }}
CI_LICENSE_SHA_SUM: ${{ env.CRUNCHY_CLI_BIN_LICENSE_SHA256 }}
- run: envsubst '$CI_PKG_VERSION,$CI_AMD_BINARY_SHA_SUM,$CI_ARM_BINARY_SHA_SUM,$CI_COMPLETIONS_SHA_SUM,$CI_MANPAGES_SHA_SUM,$CI_LICENSE_SHA_SUM' < .github/workflow-resources/PKGBUILD.binary > PKGBUILD
+ run: envsubst '$CI_PKG_VERSION,$CI_SHA_SUM,$CI_COMPLETIONS_SHA_SUM,$CI_MANPAGES_SHA_SUM' < .github/scripts/PKGBUILD.binary > PKGBUILD
- name: Publish crunchy-cli-bin to AUR
- uses: KSXGitHub/github-actions-deploy-aur@v2.7.0
+ uses: KSXGitHub/github-actions-deploy-aur@2.7.0
with:
pkgname: crunchy-cli-bin
pkgbuild: ./PKGBUILD
commit_username: release-action
commit_email: ${{ secrets.AUR_EMAIL }}
ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
- commit_message: Update to version ${{ env.RELEASE_VERSION }}
+ commit_message: Update to version {{ env.RELEASE_VERSION }}
+ test: true
diff --git a/Cargo.lock b/Cargo.lock
index d01a80c..e56716b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.21.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
dependencies = [
"gimli",
]
@@ -18,10 +18,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
-name = "aho-corasick"
-version = "1.1.3"
+name = "aes"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
dependencies = [
"memchr",
]
@@ -43,99 +54,81 @@ dependencies = [
[[package]]
name = "anstream"
-version = "0.6.14"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
- "is_terminal_polyfill",
+ "is-terminal",
"utf8parse",
]
[[package]]
name = "anstyle"
-version = "1.0.7"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
[[package]]
name = "anstyle-parse"
-version = "0.2.4"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
-version = "1.0.3"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "anstyle-wincon"
-version = "3.0.3"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
dependencies = [
"anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "anyhow"
-version = "1.0.86"
+version = "1.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
-
-[[package]]
-name = "async-speed-limit"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d287ccbfb44ae20287d2f9c72ad9e560d50810883870697db5b320c541f183"
-dependencies = [
- "futures-core",
- "futures-io",
- "futures-timer",
- "pin-project-lite",
-]
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
[[package]]
name = "async-trait"
-version = "0.1.80"
+version = "0.1.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
[[package]]
name = "autocfg"
-version = "1.3.0"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "backtrace"
-version = "0.3.71"
+version = "0.3.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
dependencies = [
"addr2line",
"cc",
@@ -148,15 +141,9 @@ dependencies = [
[[package]]
name = "base64"
-version = "0.21.7"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
[[package]]
name = "base64-serde"
@@ -164,7 +151,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba368df5de76a5bea49aaf0cf1b39ccfbbef176924d1ba5db3e4135216cbe3c7"
dependencies = [
- "base64 0.21.7",
+ "base64",
"serde",
]
@@ -176,27 +163,45 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.5.0"
+version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array",
+]
[[package]]
name = "bumpalo"
-version = "3.16.0"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
[[package]]
name = "bytes"
-version = "1.6.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+
+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
[[package]]
name = "cc"
-version = "1.0.98"
+version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
[[package]]
name = "cfg-if"
@@ -204,42 +209,48 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-[[package]]
-name = "cfg_aliases"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
-
[[package]]
name = "chrono"
-version = "0.4.38"
+version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
dependencies = [
"android-tzdata",
"iana-time-zone",
"js-sys",
"num-traits",
"serde",
+ "time 0.1.45",
"wasm-bindgen",
- "windows-targets 0.52.5",
+ "winapi",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
]
[[package]]
name = "clap"
-version = "4.5.4"
+version = "4.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "5b0827b011f6f8ab38590295339817b0d26f344aa4932c3ced71b45b0c54b4a9"
dependencies = [
"clap_builder",
"clap_derive",
+ "once_cell",
]
[[package]]
name = "clap_builder"
-version = "4.5.2"
+version = "4.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "9441b403be87be858db6a23edb493e7f694761acdc3343d5a0fcaafd304cbc9e"
dependencies = [
"anstream",
"anstyle",
@@ -249,18 +260,18 @@ dependencies = [
[[package]]
name = "clap_complete"
-version = "4.5.2"
+version = "4.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e"
+checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce"
dependencies = [
"clap",
]
[[package]]
name = "clap_derive"
-version = "4.5.4"
+version = "4.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
dependencies = [
"heck",
"proc-macro2",
@@ -270,15 +281,15 @@ dependencies = [
[[package]]
name = "clap_lex"
-version = "0.7.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
[[package]]
name = "clap_mangen"
-version = "0.2.20"
+version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1dd95b5ebb5c1c54581dd6346f3ed6a79a3eef95dd372fc2ac13d535535300e"
+checksum = "8f2e32b579dae093c2424a8b7e2bea09c89da01e1ce5065eb2f0a6f1cc15cc1f"
dependencies = [
"clap",
"roff",
@@ -286,56 +297,56 @@ dependencies = [
[[package]]
name = "colorchoice"
-version = "1.0.1"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "console"
-version = "0.15.8"
+version = "0.15.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
+checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
dependencies = [
"encode_unicode",
"lazy_static",
"libc",
"unicode-width",
- "windows-sys 0.52.0",
+ "windows-sys 0.45.0",
]
[[package]]
name = "cookie"
-version = "0.17.0"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24"
+checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
dependencies = [
"percent-encoding",
- "time",
+ "time 0.3.23",
"version_check",
]
[[package]]
name = "cookie_store"
-version = "0.20.0"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6"
+checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa"
dependencies = [
"cookie",
- "idna 0.3.0",
+ "idna 0.2.3",
"log",
"publicsuffix",
"serde",
"serde_derive",
"serde_json",
- "time",
+ "time 0.3.23",
"url",
]
[[package]]
name = "core-foundation"
-version = "0.9.4"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
dependencies = [
"core-foundation-sys",
"libc",
@@ -343,29 +354,37 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+dependencies = [
+ "libc",
+]
[[package]]
name = "crunchy-cli"
-version = "3.6.7"
+version = "3.0.0"
dependencies = [
"chrono",
"clap",
"clap_complete",
"clap_mangen",
"crunchy-cli-core",
- "native-tls",
"tokio",
]
[[package]]
name = "crunchy-cli-core"
-version = "3.6.7"
+version = "3.0.0"
dependencies = [
"anyhow",
- "async-speed-limit",
+ "async-trait",
"chrono",
"clap",
"crunchyroll-rs",
@@ -374,43 +393,39 @@ dependencies = [
"dialoguer",
"dirs",
"fs2",
- "futures-util",
- "http",
"indicatif",
"lazy_static",
"log",
- "nix",
+ "native-tls 0.2.11 (git+https://github.com/crunchy-labs/rust-not-so-native-tls.git?rev=570100d)",
"num_cpus",
"regex",
"reqwest",
- "rsubs-lib",
- "rustls-native-certs",
- "rusty-chromaprint",
+ "sanitize-filename",
"serde",
"serde_json",
"serde_plain",
"shlex",
"sys-locale",
"tempfile",
- "time",
"tokio",
- "tokio-util",
- "tower-service",
]
[[package]]
name = "crunchyroll-rs"
-version = "0.11.4"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6e38c223aecf65c9c9bec50764beea5dc70b6c97cd7f767bf6860f2fc8e0a07"
+checksum = "a0b33d2464e990dec5d3e6265cc892a88ab89971cfd177b7d7c7d0e9f8cde817"
dependencies = [
+ "aes",
"async-trait",
+ "cbc",
"chrono",
"crunchyroll-rs-internal",
"dash-mpd",
"futures-util",
- "jsonwebtoken",
+ "http",
"lazy_static",
+ "m3u8-rs",
"regex",
"reqwest",
"rustls",
@@ -419,16 +434,14 @@ dependencies = [
"serde_urlencoded",
"smart-default",
"tokio",
- "tower-service",
- "uuid",
- "webpki-roots",
+ "webpki-roots 0.25.0",
]
[[package]]
name = "crunchyroll-rs-internal"
-version = "0.11.4"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "144a38040a21aaa456741a9f6749354527bb68ad3bb14210e0bbc40fbd95186c"
+checksum = "cab3e4af975066a3dc3dd0bb50b1a29c4a3cdee5365e8b6559d21aa15d9ace6a"
dependencies = [
"darling",
"quote",
@@ -436,20 +449,30 @@ dependencies = [
]
[[package]]
-name = "ctrlc"
-version = "3.4.4"
+name = "crypto-common"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "ctrlc"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e"
dependencies = [
"nix",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "darling"
-version = "0.20.9"
+version = "0.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
dependencies = [
"darling_core",
"darling_macro",
@@ -457,9 +480,9 @@ dependencies = [
[[package]]
name = "darling_core"
-version = "0.20.9"
+version = "0.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
dependencies = [
"fnv",
"ident_case",
@@ -471,9 +494,9 @@ dependencies = [
[[package]]
name = "darling_macro"
-version = "0.20.9"
+version = "0.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
dependencies = [
"darling_core",
"quote",
@@ -482,39 +505,26 @@ dependencies = [
[[package]]
name = "dash-mpd"
-version = "0.16.3"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4618a5e165bf47b084963611bcf1d568c681f52d8a237e8862a0cd8c546ba255"
+checksum = "58b55cd4a2bd4b541906e88adbd2242bda9a697517f638c844fa47fb56fe2f17"
dependencies = [
- "base64 0.22.1",
+ "base64",
"base64-serde",
- "bytes",
"chrono",
"fs-err",
"iso8601",
- "lazy_static",
+ "log",
"num-traits",
"quick-xml",
"regex",
"serde",
- "serde_path_to_error",
"serde_with",
"thiserror",
- "tracing",
- "url",
+ "tokio",
"xattr",
]
-[[package]]
-name = "deranged"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
- "serde",
-]
-
[[package]]
name = "derive_setters"
version = "0.1.6"
@@ -529,13 +539,12 @@ dependencies = [
[[package]]
name = "dialoguer"
-version = "0.11.0"
+version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de"
+checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87"
dependencies = [
"console",
"shell-words",
- "thiserror",
]
[[package]]
@@ -561,9 +570,9 @@ dependencies = [
[[package]]
name = "either"
-version = "1.12.0"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]]
name = "encode_unicode"
@@ -573,34 +582,39 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
[[package]]
name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
dependencies = [
"cfg-if",
]
[[package]]
-name = "equivalent"
-version = "1.0.1"
+name = "errno"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "windows-sys 0.48.0",
+]
[[package]]
-name = "errno"
-version = "0.3.9"
+name = "errno-dragonfly"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
dependencies = [
+ "cc",
"libc",
- "windows-sys 0.52.0",
]
[[package]]
name = "fastrand"
-version = "2.1.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
[[package]]
name = "fnv"
@@ -625,21 +639,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
dependencies = [
"percent-encoding",
]
[[package]]
name = "fs-err"
-version = "2.11.0"
+version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41"
-dependencies = [
- "autocfg",
-]
+checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541"
[[package]]
name = "fs2"
@@ -653,30 +664,24 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.30"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
]
[[package]]
name = "futures-core"
-version = "0.3.30"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
-
-[[package]]
-name = "futures-io"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-macro"
-version = "0.3.30"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
@@ -685,71 +690,70 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.30"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
[[package]]
name = "futures-task"
-version = "0.3.30"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-
-[[package]]
-name = "futures-timer"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-util"
-version = "0.3.30"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures-core",
- "futures-io",
"futures-macro",
- "futures-sink",
"futures-task",
- "memchr",
"pin-project-lite",
"pin-utils",
"slab",
]
[[package]]
-name = "getrandom"
-version = "0.2.15"
+name = "generic-array"
+version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
dependencies = [
"cfg-if",
- "js-sys",
"libc",
- "wasi",
- "wasm-bindgen",
+ "wasi 0.11.0+wasi-snapshot-preview1",
]
[[package]]
name = "gimli"
-version = "0.28.1"
+version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
[[package]]
name = "h2"
-version = "0.4.5"
+version = "0.3.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
dependencies = [
- "atomic-waker",
"bytes",
"fnv",
"futures-core",
"futures-sink",
+ "futures-util",
"http",
- "indexmap 2.2.6",
+ "indexmap",
"slab",
"tokio",
"tokio-util",
@@ -762,23 +766,17 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
[[package]]
name = "heck"
-version = "0.5.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
-version = "0.3.9"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
[[package]]
name = "hex"
@@ -788,9 +786,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "http"
-version = "1.1.0"
+version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
dependencies = [
"bytes",
"fnv",
@@ -799,24 +797,12 @@ dependencies = [
[[package]]
name = "http-body"
-version = "1.0.0"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
dependencies = [
"bytes",
"http",
-]
-
-[[package]]
-name = "http-body-util"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
-dependencies = [
- "bytes",
- "futures-core",
- "http",
- "http-body",
"pin-project-lite",
]
@@ -827,90 +813,74 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
[[package]]
-name = "hyper"
-version = "1.3.1"
+name = "httpdate"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+
+[[package]]
+name = "hyper"
+version = "0.14.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
dependencies = [
"bytes",
"futures-channel",
+ "futures-core",
"futures-util",
"h2",
"http",
"http-body",
"httparse",
+ "httpdate",
"itoa",
"pin-project-lite",
- "smallvec",
+ "socket2",
"tokio",
+ "tower-service",
+ "tracing",
"want",
]
[[package]]
name = "hyper-rustls"
-version = "0.26.0"
+version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
+checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
dependencies = [
"futures-util",
"http",
"hyper",
- "hyper-util",
"rustls",
- "rustls-pki-types",
"tokio",
"tokio-rustls",
- "tower-service",
]
[[package]]
name = "hyper-tls"
-version = "0.6.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
dependencies = [
"bytes",
- "http-body-util",
"hyper",
- "hyper-util",
- "native-tls",
+ "native-tls 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio",
"tokio-native-tls",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower",
- "tower-service",
- "tracing",
]
[[package]]
name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "windows-core",
+ "windows",
]
[[package]]
@@ -928,6 +898,17 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+[[package]]
+name = "idna"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+dependencies = [
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
[[package]]
name = "idna"
version = "0.3.0"
@@ -940,9 +921,9 @@ dependencies = [
[[package]]
name = "idna"
-version = "0.5.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
dependencies = [
"unicode-bidi",
"unicode-normalization",
@@ -955,26 +936,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
- "hashbrown 0.12.3",
- "serde",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown",
"serde",
]
[[package]]
name = "indicatif"
-version = "0.17.8"
+version = "0.17.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
+checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057"
dependencies = [
"console",
"instant",
@@ -984,25 +954,40 @@ dependencies = [
]
[[package]]
-name = "instant"
-version = "0.1.13"
+name = "inout"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
dependencies = [
"cfg-if",
]
[[package]]
name = "ipnet"
-version = "2.9.0"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.0"
+name = "is-terminal"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+dependencies = [
+ "hermit-abi",
+ "rustix",
+ "windows-sys 0.48.0",
+]
[[package]]
name = "iso8601"
@@ -1015,32 +1000,19 @@ dependencies = [
[[package]]
name = "itoa"
-version = "1.0.11"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
[[package]]
name = "js-sys"
-version = "0.3.69"
+version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
dependencies = [
"wasm-bindgen",
]
-[[package]]
-name = "jsonwebtoken"
-version = "9.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f"
-dependencies = [
- "base64 0.21.7",
- "js-sys",
- "ring",
- "serde",
- "serde_json",
-]
-
[[package]]
name = "lazy_static"
version = "1.4.0"
@@ -1049,37 +1021,43 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.155"
+version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.5.0",
- "libc",
-]
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
[[package]]
name = "log"
-version = "0.4.21"
+version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+
+[[package]]
+name = "m3u8-rs"
+version = "5.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d39af8845edca961e3286dcbafeb9e6407d3df6a616ef086847162d46f438d75"
+dependencies = [
+ "chrono",
+ "nom",
+]
+
+[[package]]
+name = "matches"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
[[package]]
name = "memchr"
-version = "2.7.2"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "mime"
@@ -1087,16 +1065,6 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-[[package]]
-name = "mime_guess"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-dependencies = [
- "mime",
- "unicase",
-]
-
[[package]]
name = "minimal-lexical"
version = "0.2.1"
@@ -1105,29 +1073,31 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.7.3"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [
"adler",
]
[[package]]
name = "mio"
-version = "0.8.11"
+version = "0.8.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
dependencies = [
"libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
"windows-sys 0.48.0",
]
[[package]]
name = "native-tls"
-version = "0.2.12"
-source = "git+https://github.com/crunchy-labs/rust-not-so-native-tls.git?rev=c7ac566#c7ac566559d441bbc3e5e5bd04fb7162c38d88b0"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
dependencies = [
+ "lazy_static",
"libc",
"log",
"openssl",
@@ -1140,15 +1110,26 @@ dependencies = [
]
[[package]]
-name = "nix"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+name = "native-tls"
+version = "0.2.11"
+source = "git+https://github.com/crunchy-labs/rust-not-so-native-tls.git?rev=570100d#570100d3391bd9aab7a390cfef0d1a28e8efe200"
dependencies = [
- "bitflags 2.5.0",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+]
+
+[[package]]
+name = "nix"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
+dependencies = [
+ "bitflags 1.3.2",
"cfg-if",
- "cfg_aliases",
"libc",
+ "static_assertions",
]
[[package]]
@@ -1161,35 +1142,11 @@ dependencies = [
"minimal-lexical",
]
-[[package]]
-name = "num-complex"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
[[package]]
name = "num-traits"
-version = "0.2.19"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
dependencies = [
"autocfg",
]
@@ -1212,26 +1169,26 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
[[package]]
name = "object"
-version = "0.32.2"
+version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "openssl"
-version = "0.10.64"
+version = "0.10.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 1.3.2",
"cfg-if",
"foreign-types",
"libc",
@@ -1259,18 +1216,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-src"
-version = "300.3.0+3.3.0"
+version = "111.26.0+1.1.1u"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eba8804a1c5765b18c4b3f907e6897ebabeedebc9830e1a0046c4a4cf44663e1"
+checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37"
dependencies = [
"cc",
]
[[package]]
name = "openssl-sys"
-version = "0.9.102"
+version = "0.9.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
+checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
dependencies = [
"cc",
"libc",
@@ -1287,35 +1244,15 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
[[package]]
name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
[[package]]
name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
[[package]]
name = "pin-utils"
@@ -1325,36 +1262,21 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.30"
+version = "0.3.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
[[package]]
name = "portable-atomic"
-version = "1.6.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
-
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
-[[package]]
-name = "primal-check"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0"
-dependencies = [
- "num-integer",
-]
+checksum = "edc55135a600d700580e406b4de0d59cb9ad25e344a3a091a97ded2622ec4ec6"
[[package]]
name = "proc-macro2"
-version = "1.0.83"
+version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
dependencies = [
"unicode-ident",
]
@@ -1377,9 +1299,9 @@ dependencies = [
[[package]]
name = "quick-xml"
-version = "0.31.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51"
dependencies = [
"memchr",
"serde",
@@ -1387,38 +1309,47 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.36"
+version = "1.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0"
dependencies = [
"proc-macro2",
]
[[package]]
-name = "realfft"
-version = "3.3.0"
+name = "redox_syscall"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953d9f7e5cdd80963547b456251296efc2626ed4e3cbf36c869d9564e0220571"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
- "rustfft",
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
]
[[package]]
name = "redox_users"
-version = "0.4.5"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
"getrandom",
- "libredox",
+ "redox_syscall 0.2.16",
"thiserror",
]
[[package]]
name = "regex"
-version = "1.10.4"
+version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
dependencies = [
"aho-corasick",
"memchr",
@@ -1428,9 +1359,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.6"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
dependencies = [
"aho-corasick",
"memchr",
@@ -1439,17 +1370,17 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.3"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
[[package]]
name = "reqwest"
-version = "0.12.4"
+version = "0.11.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
+checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
dependencies = [
- "base64 0.22.1",
+ "base64",
"bytes",
"cookie",
"cookie_store",
@@ -1459,56 +1390,48 @@ dependencies = [
"h2",
"http",
"http-body",
- "http-body-util",
"hyper",
"hyper-rustls",
"hyper-tls",
- "hyper-util",
"ipnet",
"js-sys",
"log",
"mime",
- "mime_guess",
- "native-tls",
+ "native-tls 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"once_cell",
"percent-encoding",
"pin-project-lite",
"rustls",
"rustls-pemfile",
- "rustls-pki-types",
"serde",
"serde_json",
"serde_urlencoded",
- "sync_wrapper",
- "system-configuration",
"tokio",
"tokio-native-tls",
"tokio-rustls",
"tokio-socks",
- "tokio-util",
"tower-service",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
- "wasm-streams",
"web-sys",
- "webpki-roots",
+ "webpki-roots 0.22.6",
"winreg",
]
[[package]]
name = "ring"
-version = "0.17.8"
+version = "0.16.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
dependencies = [
"cc",
- "cfg-if",
- "getrandom",
"libc",
+ "once_cell",
"spin",
"untrusted",
- "windows-sys 0.52.0",
+ "web-sys",
+ "winapi",
]
[[package]]
@@ -1517,149 +1440,98 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316"
-[[package]]
-name = "rsubs-lib"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9f50e3fbcbf1f0bd109954e2dd813d1715c7b4a92a7bf159a85dea49e9d863"
-dependencies = [
- "regex",
- "serde",
- "time",
-]
-
-[[package]]
-name = "rubato"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6dd52e80cfc21894deadf554a5673002938ae4625f7a283e536f9cf7c17b0d5"
-dependencies = [
- "num-complex",
- "num-integer",
- "num-traits",
- "realfft",
-]
-
[[package]]
name = "rustc-demangle"
-version = "0.1.24"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
-[[package]]
-name = "rustfft"
-version = "6.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86"
-dependencies = [
- "num-complex",
- "num-integer",
- "num-traits",
- "primal-check",
- "strength_reduce",
- "transpose",
- "version_check",
-]
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
[[package]]
name = "rustix"
-version = "0.38.34"
+version = "0.38.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.3.3",
"errno",
"libc",
"linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "rustls"
-version = "0.22.4"
+version = "0.21.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
+checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36"
dependencies = [
"log",
"ring",
- "rustls-pki-types",
"rustls-webpki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile",
- "rustls-pki-types",
- "schannel",
- "security-framework",
+ "sct",
]
[[package]]
name = "rustls-pemfile"
-version = "2.1.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
dependencies = [
- "base64 0.22.1",
- "rustls-pki-types",
+ "base64",
]
-[[package]]
-name = "rustls-pki-types"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
-
[[package]]
name = "rustls-webpki"
-version = "0.102.4"
+version = "0.101.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
+checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e"
dependencies = [
"ring",
- "rustls-pki-types",
"untrusted",
]
[[package]]
-name = "rusty-chromaprint"
-version = "0.2.0"
+name = "ryu"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1755646867c36ecb391776deaa0b557a76d3badf20c142de7282630c34b20440"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "sanitize-filename"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603"
dependencies = [
- "rubato",
- "rustfft",
+ "lazy_static",
+ "regex",
]
[[package]]
-name = "ryu"
-version = "1.0.18"
+name = "schannel"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+dependencies = [
+ "windows-sys 0.48.0",
+]
[[package]]
-name = "schannel"
-version = "0.1.23"
+name = "sct"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
dependencies = [
- "windows-sys 0.52.0",
+ "ring",
+ "untrusted",
]
[[package]]
name = "security-framework"
-version = "2.11.0"
+version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
+checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 1.3.2",
"core-foundation",
"core-foundation-sys",
"libc",
@@ -1668,9 +1540,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.11.0"
+version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
+checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"
dependencies = [
"core-foundation-sys",
"libc",
@@ -1678,18 +1550,18 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.202"
+version = "1.0.174"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
+checksum = "3b88756493a5bd5e5395d53baa70b194b05764ab85b59e43e4b8f4e1192fa9b1"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.202"
+version = "1.0.174"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
+checksum = "6e5c3a298c7f978e53536f95a63bdc4c4a64550582f31a0359a9afda6aede62e"
dependencies = [
"proc-macro2",
"quote",
@@ -1698,30 +1570,20 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.117"
+version = "1.0.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"
dependencies = [
"itoa",
"ryu",
"serde",
]
-[[package]]
-name = "serde_path_to_error"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
-dependencies = [
- "itoa",
- "serde",
-]
-
[[package]]
name = "serde_plain"
-version = "1.0.2"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50"
+checksum = "d6018081315db179d0ce57b1fe4b62a12a0028c9cf9bbef868c9cf477b3c34ae"
dependencies = [
"serde",
]
@@ -1740,27 +1602,25 @@ dependencies = [
[[package]]
name = "serde_with"
-version = "3.8.1"
+version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
+checksum = "21e47d95bc83ed33b2ecf84f4187ad1ab9685d18ff28db000c99deac8ce180e3"
dependencies = [
- "base64 0.22.1",
+ "base64",
"chrono",
"hex",
- "indexmap 1.9.3",
- "indexmap 2.2.6",
+ "indexmap",
"serde",
- "serde_derive",
"serde_json",
"serde_with_macros",
- "time",
+ "time 0.3.23",
]
[[package]]
name = "serde_with_macros"
-version = "3.8.1"
+version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
+checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65"
dependencies = [
"darling",
"proc-macro2",
@@ -1776,25 +1636,19 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
[[package]]
name = "shlex"
-version = "1.3.0"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
[[package]]
name = "slab"
-version = "0.4.9"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
dependencies = [
"autocfg",
]
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
[[package]]
name = "smart-default"
version = "0.7.1"
@@ -1808,111 +1662,80 @@ dependencies = [
[[package]]
name = "socket2"
-version = "0.5.7"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
dependencies = [
"libc",
- "windows-sys 0.52.0",
+ "winapi",
]
[[package]]
name = "spin"
-version = "0.9.8"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
-name = "strength_reduce"
-version = "0.2.4"
+name = "static_assertions"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "strsim"
-version = "0.11.1"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "subtle"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "syn"
-version = "2.0.65"
+version = "2.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106"
+checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
[[package]]
name = "sys-locale"
-version = "0.3.1"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0"
+checksum = "ea0b9eefabb91675082b41eb94c3ecd91af7656caee3fb4961a07c0ec8c7ca6f"
dependencies = [
"libc",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
+ "windows-sys 0.45.0",
]
[[package]]
name = "tempfile"
-version = "3.10.1"
+version = "3.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
dependencies = [
"cfg-if",
"fastrand",
+ "redox_syscall 0.3.5",
"rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "thiserror"
-version = "1.0.61"
+version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
dependencies = [
"proc-macro2",
"quote",
@@ -1921,14 +1744,22 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.36"
+version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
+dependencies = [
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi",
+]
+
+[[package]]
+name = "time"
+version = "0.3.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
dependencies = [
- "deranged",
"itoa",
- "num-conv",
- "powerfmt",
"serde",
"time-core",
"time-macros",
@@ -1936,17 +1767,16 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.2"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
-version = "0.2.18"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
dependencies = [
- "num-conv",
"time-core",
]
@@ -1967,10 +1797,11 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.38.0"
+version = "1.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
dependencies = [
+ "autocfg",
"backtrace",
"bytes",
"libc",
@@ -1984,9 +1815,9 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "2.3.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
@@ -1999,18 +1830,17 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
dependencies = [
- "native-tls",
+ "native-tls 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio",
]
[[package]]
name = "tokio-rustls"
-version = "0.25.0"
+version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
dependencies = [
"rustls",
- "rustls-pki-types",
"tokio",
]
@@ -2028,39 +1858,18 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.11"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
dependencies = [
"bytes",
"futures-core",
"futures-sink",
"pin-project-lite",
"tokio",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
"tracing",
]
-[[package]]
-name = "tower-layer"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
-
[[package]]
name = "tower-service"
version = "0.3.2"
@@ -2069,102 +1878,77 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]]
name = "tracing"
-version = "0.1.40"
+version = "0.1.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
dependencies = [
- "log",
+ "cfg-if",
"pin-project-lite",
- "tracing-attributes",
"tracing-core",
]
-[[package]]
-name = "tracing-attributes"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "tracing-core"
-version = "0.1.32"
+version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
dependencies = [
"once_cell",
]
-[[package]]
-name = "transpose"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e"
-dependencies = [
- "num-integer",
- "strength_reduce",
-]
-
[[package]]
name = "try-lock"
-version = "0.2.5"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]]
-name = "unicase"
-version = "2.7.0"
+name = "typenum"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
[[package]]
name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
[[package]]
name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
[[package]]
name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-width"
-version = "0.1.12"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "untrusted"
-version = "0.9.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
[[package]]
name = "url"
-version = "2.5.0"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
dependencies = [
"form_urlencoded",
- "idna 0.5.0",
+ "idna 0.4.0",
"percent-encoding",
]
@@ -2174,15 +1958,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-[[package]]
-name = "uuid"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
-dependencies = [
- "getrandom",
-]
-
[[package]]
name = "vcpkg"
version = "0.2.15"
@@ -2204,6 +1979,12 @@ dependencies = [
"try-lock",
]
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
@@ -2212,9 +1993,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -2222,9 +2003,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
dependencies = [
"bumpalo",
"log",
@@ -2237,9 +2018,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
dependencies = [
"cfg-if",
"js-sys",
@@ -2249,9 +2030,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2259,9 +2040,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
@@ -2272,42 +2053,45 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
-[[package]]
-name = "wasm-streams"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
-dependencies = [
- "futures-util",
- "js-sys",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
[[package]]
name = "web-sys"
-version = "0.3.69"
+version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
dependencies = [
"js-sys",
"wasm-bindgen",
]
+[[package]]
+name = "webpki"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
[[package]]
name = "webpki-roots"
-version = "0.26.1"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
dependencies = [
- "rustls-pki-types",
+ "webpki",
]
+[[package]]
+name = "webpki-roots"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a4ac452058d835c2b7ff6d74f0ad9f40e172bb1ce661b1444f397eeb1d19e6d"
+
[[package]]
name = "winapi"
version = "0.3.9"
@@ -2331,12 +2115,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
-name = "windows-core"
-version = "0.52.0"
+name = "windows"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.48.1",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
]
[[package]]
@@ -2345,162 +2138,137 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.48.1",
]
[[package]]
name = "windows-targets"
-version = "0.48.5"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
]
[[package]]
name = "windows-targets"
-version = "0.52.5"
+version = "0.48.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
- "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
]
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.48.5"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.48.5"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
-version = "0.48.5"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
-version = "0.48.5"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.48.5"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.48.5"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.48.5"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]]
name = "winreg"
-version = "0.52.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
+ "winapi",
]
[[package]]
name = "xattr"
-version = "1.3.1"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
+checksum = "ea263437ca03c1522846a4ddafbca2542d0ad5ed9b784909d4b27b76f62bc34a"
dependencies = [
"libc",
- "linux-raw-sys",
- "rustix",
]
-
-[[package]]
-name = "zeroize"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
diff --git a/Cargo.toml b/Cargo.toml
index c1e28bb..d1c1868 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,41 +1,29 @@
[package]
name = "crunchy-cli"
authors = ["Crunchy Labs Maintainers"]
-version = "3.6.7"
+version = "3.0.0"
edition = "2021"
license = "MIT"
[features]
-default = ["native-tls"]
+default = ["openssl-static"]
-rustls-tls = ["crunchy-cli-core/rustls-tls"]
-native-tls = ["crunchy-cli-core/native-tls"]
-openssl-tls = ["dep:native-tls-crate", "native-tls-crate/openssl", "crunchy-cli-core/openssl-tls"]
-openssl-tls-static = ["dep:native-tls-crate", "native-tls-crate/openssl", "crunchy-cli-core/openssl-tls-static"]
+openssl = ["crunchy-cli-core/openssl"]
+openssl-static = ["crunchy-cli-core/openssl-static"]
[dependencies]
-tokio = { version = "1.38", features = ["macros", "rt-multi-thread", "time"], default-features = false }
-
-native-tls-crate = { package = "native-tls", version = "0.2.12", optional = true }
+tokio = { version = "1.29", features = ["macros", "rt-multi-thread", "time"], default-features = false }
crunchy-cli-core = { path = "./crunchy-cli-core" }
[build-dependencies]
chrono = "0.4"
-clap = { version = "4.5", features = ["string"] }
-clap_complete = "4.5"
+clap = { version = "4.3", features = ["string"] }
+clap_complete = "4.3"
clap_mangen = "0.2"
crunchy-cli-core = { path = "./crunchy-cli-core" }
-[workspace]
-members = ["crunchy-cli-core"]
-
-[patch.crates-io]
-# fork of the `native-tls` crate which can use openssl as backend on every platform. this is done as `reqwest` only
-# supports `rustls` and `native-tls` as tls backend
-native-tls = { git = "https://github.com/crunchy-labs/rust-not-so-native-tls.git", rev = "c7ac566" }
-
[profile.release]
strip = true
opt-level = "z"
diff --git a/README.md b/README.md
index 1ae2645..a8ec76e 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
-# This project has been sunset as Crunchyroll moved to a DRM-only system. See [#362](https://github.com/crunchy-labs/crunchy-cli/issues/362).
-
# crunchy-cli
-👇 A Command-line downloader for [Crunchyroll](https://www.crunchyroll.com).
+👇 A Command-line downloader for Crunchyroll [Crunchyroll](https://www.crunchyroll.com).
@@ -20,8 +18,8 @@
-
- 
+
+ 
@@ -55,7 +53,6 @@ Check out the [releases](https://github.com/crunchy-labs/crunchy-cli/releases) t
If you're using Arch or an Arch based Linux distribution you are able to install our [AUR](https://aur.archlinux.org/) package.
You need an [AUR helper](https://wiki.archlinux.org/title/AUR_helpers) like [yay](https://github.com/Jguer/yay) to install it.
-
```shell
# this package builds crunchy-cli manually (recommended)
$ yay -S crunchy-cli
@@ -63,29 +60,9 @@ Check out the [releases](https://github.com/crunchy-labs/crunchy-cli/releases) t
$ yay -S crunchy-cli-bin
```
-- [Scoop](https://scoop.sh/)
-
- For Windows users, we support the [scoop](https://scoop.sh/#/) command-line installer.
-
- ```shell
- $ scoop bucket add extras
- $ scoop install extras/crunchy-cli
- ```
-
-- [Homebrew](https://brew.sh/)
-
- For macOS/linux users, we support the [brew](https://brew.sh/#/) command-line installer. Packages are compiled by the [homebrew project](https://formulae.brew.sh/formula/crunchy-cli), and will also install the `openssl@3` and `ffmpeg` dependencies.
-
- ```shell
- $ brew install crunchy-cli
- ```
-
- Supported archs: `x86_64_linux`, `arm64_monterey`, `sonoma`, `ventura`
-
- [Nix](https://nixos.org/)
This requires [nix](https://nixos.org) and you'll probably need `--extra-experimental-features "nix-command flakes"`, depending on your configurations.
-
```shell
$ nix github:crunchy-labs/crunchy-cli
```
@@ -94,7 +71,6 @@ Check out the [releases](https://github.com/crunchy-labs/crunchy-cli/releases) t
Since we do not support every platform and architecture you may have to build the project yourself.
This requires [git](https://git-scm.com/) and [Cargo](https://doc.rust-lang.org/cargo).
-
```shell
$ git clone https://github.com/crunchy-labs/crunchy-cli
$ cd crunchy-cli
@@ -108,122 +84,96 @@ $ cargo install --force --path .
> All shown commands are examples 🧑🏼🍳
-### Global Flags
-
crunchy-cli requires you to log in.
Though you can use a non-premium account, you will not have access to premium content without a subscription.
-You can authenticate with your credentials (email:password) or by using a refresh token.
+You can authenticate with your credentials (user:password) or by using a refresh token.
-- Credentials
+- Credentials
```shell
- $ crunchy-cli --credentials "email:password"
+ $ crunchy-cli --credentials "user:password"
```
+- Refresh Token
-- Stay Anonymous
+ To obtain a refresh token, you have to log in at [crunchyroll.com](https://www.crunchyroll.com/) and extract the `etp_rt` cookie.
+ The easiest way to get it is via a browser extension which lets you export your cookies, like [Cookie-Editor](https://cookie-editor.cgagnier.ca/) ([Firefox](https://addons.mozilla.org/en-US/firefox/addon/cookie-editor/) / [Chrome](https://chrome.google.com/webstore/detail/cookie-editor/hlkenndednhfkekhgcdicdfddnkalmdm)).
+ When installed, look for the `etp_rt` entry and extract its value.
+ ```shell
+ $ crunchy-cli --etp-rt "4ebf1690-53a4-491a-a2ac-488309120f5d"
+ ```
+- Stay Anonymous
Login without an account (you won't be able to access premium content):
-
- ```shell
- $ crunchy-cli --anonymous
+ ```shell
+ $ crunchy-cli --anonymous
```
### Global settings
You can set specific settings which will be
-- Verbose output
+- Verbose output
If you want to include debug information in the output, use the `-v` / `--verbose` flag to show it.
-
```shell
- $ crunchy-cli -v
+ $ crunchy-cli -v
```
+ This flag can't be used with `-q` / `--quiet`.
- This flag can't be used in combination with `-q` / `--quiet`.
-
-- Quiet output
+- Quiet output
If you want to hide all output, use the `-q` / `--quiet` flag to do so.
This is especially useful if you want to pipe the output video to an external program (like a video player).
-
```shell
- $ crunchy-cli -q
+ $ crunchy-cli -q
```
- This flag can't be used in combination with `-v` / `--verbose`.
-
-- Language
+- Language
By default, the resulting metadata like title or description are shown in your system language (if Crunchyroll supports it, else in English).
If you want to show the results in another language, use the `--lang` flag to set it.
-
```shell
- $ crunchy-cli --lang de-DE
+ $ crunchy-cli --lang de-DE
```
-- Experimental fixes
+- Experimental fixes
Crunchyroll constantly changes and breaks its services or just delivers incorrect answers.
The `--experimental-fixes` flag tries to fix some of those issues.
As the *experimental* in `--experimental-fixes` states, these fixes may or may not break other functionality.
-
```shell
- $ crunchy-cli --experimental-fixes
+ $ crunchy-cli --experimental-fixes
```
-
For an overview which parts this flag affects, see the [documentation](https://docs.rs/crunchyroll-rs/latest/crunchyroll_rs/crunchyroll/struct.CrunchyrollBuilder.html) of the underlying Crunchyroll library, all functions beginning with `stabilization_` are applied.
-- Proxy
+- Proxy
The `--proxy` flag supports https and socks5 proxies to route all your traffic through.
This may be helpful to bypass the geo-restrictions Crunchyroll has on certain series.
- You are also able to set in which part of the cli a proxy should be used.
- Instead of a normal url you can also use: `:` (only proxies api requests), `:` (only proxies download traffic), `:` (proxies api requests through the first url and download traffic through the second url).
-
```shell
- $ crunchy-cli --proxy socks5://127.0.0.1:8080
+ $ crunchy-cli --proxy socks5://127.0.0.1:8080
```
-
Make sure that proxy can either forward TLS requests, which is needed to bypass the (cloudflare) bot protection, or that it is configured so that the proxy can bypass the protection itself.
-- User Agent
-
- There might be cases where a custom user agent is necessary, e.g. to bypass the cloudflare bot protection (#104).
- In such cases, the `--user-agent` flag can be used to set a custom user agent.
-
- ```shell
- $ crunchy-cli --user-agent "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)"
- ```
-
- Default is the user agent, defined in the underlying [library](https://github.com/crunchy-labs/crunchyroll-rs).
-
-- Speed limit
-
- If you want to limit how fast requests/downloads should be, you can use the `--speed-limit` flag. Allowed units are `B` (bytes), `KB` (kilobytes) and `MB` (megabytes).
-
- ```shell
- $ crunchy-cli --speed-limit 10MB
- ```
-
### Login
The `login` command can store your session, so you don't have to authenticate every time you execute a command.
```shell
# save the refresh token which gets generated when login with credentials.
-# your email and password won't be stored at any time on disk
-$ crunchy-cli login --credentials "email:password"
+# your username/email and password won't be stored at any time on disk
+$ crunchy-cli login --credentials "user:password"
+# save etp-rt cookie
+$ crunchy-cli login --etp-rt "4ebf1690-53a4-491a-a2ac-488309120f5d"
```
-With the session stored, you do not need to pass `--credentials` / `--anonymous` anymore when you want to execute a command.
+With the session stored, you do not need to pass `--credentials` / `--etp-rt` / `--anonymous` anymore when you want to execute a command.
### Download
The `download` command lets you download episodes with a specific audio language and optional subtitles.
**Supported urls**
-
- Single episode (with [episode filtering](#episode-filtering))
```shell
$ crunchy-cli download https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
@@ -234,155 +184,77 @@ The `download` command lets you download episodes with a specific audio language
```
**Options**
-
-- Audio language
+- Audio language
Set the audio language with the `-a` / `--audio` flag.
This only works if the url points to a series since episode urls are language specific.
-
```shell
$ crunchy-cli download -a de-DE https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
```
-
Default is your system locale. If not supported by Crunchyroll, `en-US` (American English) is the default.
-- Subtitle language
+- Subtitle language
Besides the audio, you can specify the subtitle language by using the `-s` / `--subtitle` flag.
- In formats that support it (.mp4, .mov and .mkv ), subtitles are stored as soft-subs. All other formats are hardsubbed: the subtitles will be burned into the video track (cf. [hardsub](https://www.urbandictionary.com/define.php?term=hardsub)) and thus can not be turned off.
-
+ The subtitles will be burned into the video track (cf. [hardsub](https://www.urbandictionary.com/define.php?term=hardsub)) and thus can not be turned off.
```shell
$ crunchy-cli download -s de-DE https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
```
-
Default is none.
-- Output template
+- Output template
Define an output template by using the `-o` / `--output` flag.
-
```shell
$ crunchy-cli download -o "ditf.mp4" https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
```
-
Default is `{title}.mp4`. See the [Template Options section](#output-template-options) below for more options.
-- Output template for special episodes
-
- Define an output template which only gets used when the episode is a special (episode number is 0 or has non-zero decimal places) by using the `--output-special` flag.
-
- ```shell
- $ crunchy-cli download --output-specials "Special EP - {title}" https://www.crunchyroll.com/watch/GY8D975JY/veldoras-journal
- ```
-
- Default is the template, set by the `-o` / `--output` flag. See the [Template Options section](#output-template-options) below for more options.
-
-- Universal output
-
- The output template options can be forced to get sanitized via the `--universal-output` flag to be valid across all supported operating systems (Windows has a lot of characters which aren't allowed in filenames...).
-
- ```shell
- $ crunchy-cli download --universal-output -o https://www.crunchyroll.com/watch/G7PU4XD48/tales-veldoras-journal-2
- ```
-
-- Resolution
+- Resolution
The resolution for videos can be set via the `-r` / `--resolution` flag.
-
```shell
$ crunchy-cli download -r worst https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
```
-
Default is `best`.
-- Language tagging
-
- You can force the usage of a specific language tagging in the output file with the `--language-tagging` flag.
- This might be useful as some video players doesn't recognize the language tagging Crunchyroll uses internally.
-
- ```shell
- $ crunchy-cli download --language-tagging ietf https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
- ```
-
-- FFmpeg Preset
+- FFmpeg Preset
You can specify specific built-in presets with the `--ffmpeg-preset` flag to convert videos to a specific coding while downloading.
Multiple predefined presets how videos should be encoded (h264, h265, av1, ...) are available, you can see them with `crunchy-cli download --help`.
If you need more specific ffmpeg customizations you could either convert the output file manually or use ffmpeg output arguments as value for this flag.
-
```shell
- $ crunchy-cli download --ffmpeg-preset av1-lossless https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
+ $ crunchy-cli downlaod --ffmpeg-preset av1-lossless https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
```
-- FFmpeg threads
-
- If you want to manually set how many threads FFmpeg should use, you can use the `--ffmpeg-threads` flag. This does not work with every codec/preset and is skipped entirely when specifying custom ffmpeg output arguments instead of a preset for `--ffmpeg-preset`.
-
- ```shell
- $ crunchy-cli download --ffmpeg-threads 4 https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
- ```
-
-- Skip existing
+- Skip existing
If you re-download a series but want to skip episodes you've already downloaded, the `--skip-existing` flag skips the already existing/downloaded files.
-
```shell
$ crunchy-cli download --skip-existing https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
```
-- Skip specials
-
- If you doesn't want to download special episodes, use the `--skip-specials` flag to skip the download of them.
-
- ```shell
- $ crunchy-cli download --skip-specials https://www.crunchyroll.com/series/GYZJ43JMR/that-time-i-got-reincarnated-as-a-slime[S2]
- ```
-
-- Include chapters
-
- Crunchyroll sometimes provide information about skippable events like the intro or credits.
- These information can be stored as chapters in the resulting video file via the `--include-chapters` flag.
-
- ```shell
- $ crunchy-cli download --include-chapters https://www.crunchyroll.com/watch/G0DUND0K2/the-journeys-end
- ```
-
-- Yes
+- Yes
Sometimes different seasons have the same season number (e.g. Sword Art Online Alicization and Alicization War of Underworld are both marked as season 3), in such cases an interactive prompt is shown which needs user further user input to decide which season to download.
The `--yes` flag suppresses this interactive prompt and just downloads all seasons.
-
```shell
$ crunchy-cli download --yes https://www.crunchyroll.com/series/GR49G9VP6/sword-art-online
```
-
If you've passed the `-q` / `--quiet` [global flag](#global-settings), this flag is automatically set.
-- Force hardsub
+- Force hardsub
If you want to burn-in the subtitles, even if the output format/container supports soft-subs (e.g. `.mp4`), use the `--force-hardsub` flag to do so.
-
```shell
$ crunchy-cli download --force-hardsub -s en-US https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
```
-- Threads
-
- To increase the download speed, video segments are downloaded simultaneously by creating multiple threads.
- If you want to manually specify how many threads to use when downloading, do this with the `-t` / `--threads` flag.
-
- ```shell
- $ crunchy-cli download -t 1 https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
- ```
-
- The default thread count is the count of cpu threads your pc has.
-
### Archive
The `archive` command lets you download episodes with multiple audios and subtitles and merges it into a `.mkv` file.
**Supported urls**
-
- Single episode (with [episode filtering](#episode-filtering))
```shell
$ crunchy-cli archive https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
@@ -393,225 +265,88 @@ The `archive` command lets you download episodes with multiple audios and subtit
```
**Options**
-
-- Audio languages
+- Audio languages
Set the audio language with the `-a` / `--audio` flag. Can be used multiple times.
-
```shell
$ crunchy-cli archive -a ja-JP -a de-DE https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
```
-
Default is your system locale (if not supported by Crunchyroll, `en-US` (American English) and `ja-JP` (Japanese) are used).
-- Subtitle languages
+- Subtitle languages
Besides the audio, you can specify the subtitle language by using the `-s` / `--subtitle` flag.
-
```shell
$ crunchy-cli archive -s de-DE https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
```
-
Default is `all` subtitles.
-- Output template
+- Output template
Define an output template by using the `-o` / `--output` flag.
- _crunchy-cli_ exclusively uses the [`.mkv`](https://en.wikipedia.org/wiki/Matroska) container format, because of its ability to store multiple audio, video and subtitle tracks at once.
-
+ crunchy-cli uses the [`.mkv`](https://en.wikipedia.org/wiki/Matroska) container format, because of it's ability to store multiple audio, video and subtitle tracks at once.
```shell
$ crunchy-cli archive -o "{title}.mkv" https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
```
-
Default is `{title}.mkv`. See the [Template Options section](#output-template-options) below for more options.
-- Output template for special episodes
-
- Define an output template which only gets used when the episode is a special (episode number is 0 or has non-zero decimal places) by using the `--output-special` flag.
- _crunchy-cli_ exclusively uses the [`.mkv`](https://en.wikipedia.org/wiki/Matroska) container format, because of its ability to store multiple audio, video and subtitle tracks at once.
-
- ```shell
- $ crunchy-cli archive --output-specials "Special EP - {title}" https://www.crunchyroll.com/watch/GY8D975JY/veldoras-journal
- ```
-
- Default is the template, set by the `-o` / `--output` flag. See the [Template Options section](#output-template-options) below for more options.
-
-- Universal output
-
- The output template options can be forced to get sanitized via the `--universal-output` flag to be valid across all supported operating systems (Windows has a lot of characters which aren't allowed in filenames...).
-
- ```shell
- $ crunchy-cli archive --universal-output -o https://www.crunchyroll.com/watch/G7PU4XD48/tales-veldoras-journal-2
- ```
-
-- Resolution
+- Resolution
The resolution for videos can be set via the `-r` / `--resolution` flag.
-
```shell
$ crunchy-cli archive -r worst https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
```
-
Default is `best`.
-- Merge behavior
+- Merge behavior
- Due to censorship or additional intros, some episodes have multiple lengths for different languages.
+ Due to censorship, some episodes have multiple lengths for different languages.
In the best case, when multiple audio & subtitle tracks are used, there is only one *video* track and all other languages can be stored as audio-only.
But, as said, this is not always the case.
With the `-m` / `--merge` flag you can define the behaviour when an episodes' video tracks differ in length.
- Valid options are `audio` - store one video and all other languages as audio only; `video` - store the video + audio for every language; `auto` - detect if videos differ in length: if so, behave like `video` - otherwise like `audio`; `sync` - detect if videos differ in length: if so, it tries to find the offset of matching audio parts and removes the offset from the beginning, otherwise it behaves like `audio`.
+ Valid options are `audio` - store one video and all other languages as audio only; `video` - store the video + audio for every language; `auto` - detect if videos differ in length: if so, behave like `video` - otherwise like `audio`.
Subtitles will always match the primary audio and video.
-
```shell
$ crunchy-cli archive -m audio https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
```
-
Default is `auto`.
-- Merge time tolerance
-
- Sometimes two video tracks are downloaded with `--merge` set to `auto` even if they only differ some milliseconds in length which shouldn't be noticeable to the viewer.
- To prevent this, you can specify a range in milliseconds with the `--merge-time-tolerance` flag that only downloads one video if the length difference is in the given range.
-
- ```shell
- $ crunchy-cli archive -m auto --merge-time-tolerance 100 https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
- ```
-
- Default are `200` milliseconds.
-
-- Merge sync tolerance
-
- Sometimes two video tracks are downloaded with `--merge` set to `sync` because the audio fingerprinting fails to identify matching audio parts (e.g. opening).
- To prevent this, you can use the `--merge-sync-tolerance` flag to specify the difference by which two fingerprints are considered equal.
-
- ```shell
- $ crunchy-cli archive -m sync --merge-sync-tolerance 3 https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
- ```
-
- Default is `6`.
-
-- Merge sync precision
-
- If you use `--merge` set to `sync` and the syncing seems to be not accurate enough or takes to long, you can use the `--sync-precision` flag to specify the amount of offset determination runs from which the final offset is calculated.
-
- ```shell
- $ crunchy-cli archive -m sync --merge-sync-precision 3 https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
- ```
-
- Default is `4`.
-
-- Language tagging
-
- You can force the usage of a specific language tagging in the output file with the `--language-tagging` flag.
- This might be useful as some video players doesn't recognize the language tagging Crunchyroll uses internally.
-
- ```shell
- $ crunchy-cli archive --language-tagging ietf https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
- ```
-
-- FFmpeg Preset
+- FFmpeg Preset
You can specify specific built-in presets with the `--ffmpeg-preset` flag to convert videos to a specific coding while downloading.
Multiple predefined presets how videos should be encoded (h264, h265, av1, ...) are available, you can see them with `crunchy-cli archive --help`.
If you need more specific ffmpeg customizations you could either convert the output file manually or use ffmpeg output arguments as value for this flag.
-
```shell
$ crunchy-cli archive --ffmpeg-preset av1-lossless https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
```
-- FFmpeg threads
-
- If you want to manually set how many threads FFmpeg should use, you can use the `--ffmpeg-threads` flag. This does not work with every codec/preset and is skipped entirely when specifying custom ffmpeg output arguments instead of a preset for `--ffmpeg-preset`.
-
- ```shell
- $ crunchy-cli archive --ffmpeg-threads 4 https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
- ```
-
-- Default subtitle
+- Default subtitle
`--default-subtitle` Set which subtitle language is to be flagged as **default** and **forced**.
-
```shell
$ crunchy-cli archive --default-subtitle en-US https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
```
-
Default is none.
-- Include fonts
-
- You can include the fonts required by subtitles directly into the output file with the `--include-fonts` flag. This will use the embedded font for subtitles instead of the system font when playing the video in a video player which supports it.
-
- ```shell
- $ crunchy-cli archive --include-fonts https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
- ```
-
-- Include chapters
-
- Crunchyroll sometimes provide information about skippable events like the intro or credits.
- These information can be stored as chapters in the resulting video file via the `--include-chapters` flag.
- This flag only works if `--merge` is set to `audio` because chapters cannot be mapped to a specific video steam.
-
- ```shell
- $ crunchy-cli archive --include-chapters https://www.crunchyroll.com/watch/G0DUND0K2/the-journeys-end
- ```
-
-- Skip existing
+- Skip existing
If you re-download a series but want to skip episodes you've already downloaded, the `--skip-existing` flag skips the already existing/downloaded files.
-
```shell
$ crunchy-cli archive --skip-existing https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
```
-- Skip existing method
-
- By default, already existing files are determined by their name and the download of the corresponding episode is skipped.
- But sometimes Crunchyroll adds dubs or subs to an already existing episode and these changes aren't recognized and `--skip-existing` just skips it.
- This behavior can be changed by the `--skip-existing-method` flag. Valid options are `audio` and `subtitle` (if the file already exists but the audio/subtitle are less from what should be downloaded, the episode gets downloaded and the file overwritten).
-
- ```shell
- $ crunchy-cli archive --skip-existing-method audio --skip-existing-method video https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
- ```
-
-- Skip specials
-
- If you doesn't want to download special episodes, use the `--skip-specials` flag to skip the download of them.
-
- ```shell
- $ crunchy-cli archive --skip-specials https://www.crunchyroll.com/series/GYZJ43JMR/that-time-i-got-reincarnated-as-a-slime[S2]
- ```
-
-- Yes
+- Yes
Sometimes different seasons have the same season number (e.g. Sword Art Online Alicization and Alicization War of Underworld are both marked as season 3), in such cases an interactive prompt is shown which needs user further user input to decide which season to download.
The `--yes` flag suppresses this interactive prompt and just downloads all seasons.
-
```shell
$ crunchy-cli archive --yes https://www.crunchyroll.com/series/GR49G9VP6/sword-art-online
```
-
If you've passed the `-q` / `--quiet` [global flag](#global-settings), this flag is automatically set.
-- Threads
-
- To increase the download speed, video segments are downloaded simultaneously by creating multiple threads.
- If you want to manually specify how many threads to use when downloading, do this with the `-t` / `--threads` flag.
-
- ```shell
- $ crunchy-cli archive -t 1 https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
- ```
-
- The default thread count is the count of cpu threads your pc has.
-
### Search
-The `search` command is a powerful tool to query the Crunchyroll library.
-It behaves like the regular search on the website but is able to further process the results and return everything it can find, from the series title down to the raw stream url.
-_Using this command with the `--anonymous` flag or a non-premium account may return incomplete results._
-
**Supported urls/input**
-
- Single episode (with [episode filtering](#episode-filtering))
```shell
$ crunchy-cli search https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
@@ -626,23 +361,19 @@ _Using this command with the `--anonymous` flag or a non-premium account may ret
```
**Options**
-
-- Audio
+- Audio
Set the audio language to search via the `--audio` flag. Can be used multiple times.
-
```shell
$ crunchy-cli search --audio en-US https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
```
-
Default is your system locale.
-- Result limit
+- Result limit
If your input is a search term instead of an url, you have multiple options to control which results to process.
The `--search-top-results-limit` flag sets the limit of top search results to process.
`--search-series-limit` sets the limit of only series, `--search-movie-listing-limit` of only movie listings, `--search-episode-limit` of only episodes and `--search-music-limit` of only concerts and music videos.
-
```shell
$ crunchy-cli search --search-top-results-limit 10 "darling in the franxx"
# only return series which have 'darling' in it. do not return top results which might also be non-series items
@@ -650,7 +381,6 @@ _Using this command with the `--anonymous` flag or a non-premium account may ret
# this returns 2 top results, 3 movie listings, 5 episodes and 1 music item as result
$ crunchy-cli search --search-top-results-limit 2 --search-movie-listing-limit 3 --search-episode-limit 5 --search-music-limit 1 "test"
```
-
Default is `5` for `--search-top-results-limit`, `0` for all others.
- Output template
@@ -661,11 +391,9 @@ _Using this command with the `--anonymous` flag or a non-premium account may ret
The required pattern for this begins with `{{`, then the keyword, and closes with `}}` (e.g. `{{episode.title}}`).
For example, if you want to get the title of an episode, you can use `Title: {{episode.title}}` and `{{episode.title}}` will be replaced with the episode title.
You can see all supported keywords with `crunchy-cli search --help`.
-
```shell
$ crunchy-cli search -o "{{series.title}}" https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
```
-
Default is `S{{season.number}}E{{episode.number}} - {{episode.title}}`.
---
@@ -674,26 +402,19 @@ _Using this command with the `--anonymous` flag or a non-premium account may ret
You can use various template options to change how the filename is processed. The following tags are available:
-- `{title}` → Title of the video
-- `{series_name}` → Name of the series
-- `{season_name}` → Name of the season
-- `{audio}` → Audio language of the video
-- `{width}` → Width of the video
-- `{height}` → Height of the video
-- `{season_number}` → Number of the season
-- `{episode_number}` → Number of the episode
-- `{relative_episode_number}` → Number of the episode relative to its season
-- `{sequence_number}` → Like `{episode_number}` but without possible non-number characters
-- `{relative_sequence_number}` → Like `{relative_episode_number}` but with support for episode 0's and .5's
-- `{release_year}` → Release year of the video
-- `{release_month}` → Release month of the video
-- `{release_day} ` → Release day of the video
-- `{series_id}` → ID of the series
-- `{season_id}` → ID of the season
-- `{episode_id}` → ID of the episode
+- `{title}` → Title of the video
+- `{series_name}` → Name of the series
+- `{season_name}` → Name of the season
+- `{audio}` → Audio language of the video
+- `{resolution}` → Resolution of the video
+- `{season_number}` → Number of the season
+- `{episode_number}` → Number of the episode
+- `{relative_episode_number}` → Number of the episode relative to its season
+- `{series_id}` → ID of the series
+- `{season_id}` → ID of the season
+- `{episode_id}` → ID of the episode
Example:
-
```shell
$ crunchy-cli archive -o "[S{season_number}E{episode_number}] {title}.mkv" https://www.crunchyroll.com/series/G8DHV7W21/dragon-ball
# Output file: '[S01E01] Secret of the Dragon Ball.mkv'
@@ -707,7 +428,6 @@ A filter pattern may consist of either a season, an episode, or a combination of
When used in combination, seasons `S` must be defined before episodes `E`.
There are many possible patterns, for example:
-
- `...[E5]` - Download the fifth episode.
- `...[S1]` - Download the whole first season.
- `...[-S2]` - Download the first two seasons.
@@ -717,7 +437,6 @@ There are many possible patterns, for example:
- `...[S1-S3,S4E2-S4E6]` - Download season one to three, then episodes two to six from season four.
In practice, it would look like this:
-
```
https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx[E1-E5]
```
diff --git a/build.rs b/build.rs
index 313cb6d..7056c67 100644
--- a/build.rs
+++ b/build.rs
@@ -3,22 +3,6 @@ use clap_complete::shells;
use std::path::{Path, PathBuf};
fn main() -> std::io::Result<()> {
- let rustls_tls = cfg!(feature = "rustls-tls");
- let native_tls = cfg!(feature = "native-tls");
- let openssl_tls = cfg!(any(feature = "openssl-tls", feature = "openssl-tls-static"));
-
- if rustls_tls as u8 + native_tls as u8 + openssl_tls as u8 > 1 {
- let active_tls_backend = if openssl_tls {
- "openssl"
- } else if native_tls {
- "native tls"
- } else {
- "rustls"
- };
-
- println!("cargo:warning=Multiple tls backends are activated (through the '*-tls' features). Consider to activate only one as it is not possible to change the backend during runtime. The active backend for this build will be '{}'.", active_tls_backend)
- }
-
// note that we're using an anti-pattern here / violate the rust conventions. build script are
// not supposed to write outside of 'OUT_DIR'. to have the generated files in the build "root"
// (the same directory where the output binary lives) is much simpler than in 'OUT_DIR' since
diff --git a/crunchy-cli-core/Cargo.lock b/crunchy-cli-core/Cargo.lock
new file mode 100644
index 0000000..b26b645
--- /dev/null
+++ b/crunchy-cli-core/Cargo.lock
@@ -0,0 +1,2274 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aes"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anstream"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
+
+[[package]]
+name = "async-trait"
+version = "0.1.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "backtrace"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
+
+[[package]]
+name = "base64-serde"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba368df5de76a5bea49aaf0cf1b39ccfbbef176924d1ba5db3e4135216cbe3c7"
+dependencies = [
+ "base64",
+ "serde",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+
+[[package]]
+name = "bytes"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+
+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "serde",
+ "time 0.1.45",
+ "wasm-bindgen",
+ "winapi",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
+[[package]]
+name = "clap"
+version = "4.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+ "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
+[[package]]
+name = "console"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+dependencies = [
+ "encode_unicode",
+ "lazy_static",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "cookie"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
+dependencies = [
+ "percent-encoding",
+ "time 0.3.25",
+ "version_check",
+]
+
+[[package]]
+name = "cookie_store"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa"
+dependencies = [
+ "cookie",
+ "idna 0.2.3",
+ "log",
+ "publicsuffix",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "time 0.3.25",
+ "url",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crunchy-cli-core"
+version = "3.0.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "chrono",
+ "clap",
+ "crunchyroll-rs",
+ "ctrlc",
+ "derive_setters",
+ "dialoguer",
+ "dirs",
+ "fs2",
+ "indicatif",
+ "lazy_static",
+ "log",
+ "native-tls 0.2.11 (git+https://github.com/crunchy-labs/rust-not-so-native-tls.git?rev=570100d)",
+ "num_cpus",
+ "regex",
+ "reqwest",
+ "sanitize-filename",
+ "serde",
+ "serde_json",
+ "serde_plain",
+ "shlex",
+ "sys-locale",
+ "tempfile",
+ "tokio",
+]
+
+[[package]]
+name = "crunchyroll-rs"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0b33d2464e990dec5d3e6265cc892a88ab89971cfd177b7d7c7d0e9f8cde817"
+dependencies = [
+ "aes",
+ "async-trait",
+ "cbc",
+ "chrono",
+ "crunchyroll-rs-internal",
+ "dash-mpd",
+ "futures-util",
+ "http",
+ "lazy_static",
+ "m3u8-rs",
+ "regex",
+ "reqwest",
+ "rustls",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "smart-default",
+ "tokio",
+ "webpki-roots 0.25.1",
+]
+
+[[package]]
+name = "crunchyroll-rs-internal"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cab3e4af975066a3dc3dd0bb50b1a29c4a3cdee5365e8b6559d21aa15d9ace6a"
+dependencies = [
+ "darling",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "ctrlc"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e"
+dependencies = [
+ "nix",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "dash-mpd"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58b55cd4a2bd4b541906e88adbd2242bda9a697517f638c844fa47fb56fe2f17"
+dependencies = [
+ "base64",
+ "base64-serde",
+ "chrono",
+ "fs-err",
+ "iso8601",
+ "log",
+ "num-traits",
+ "quick-xml",
+ "regex",
+ "serde",
+ "serde_with",
+ "thiserror",
+ "tokio",
+ "xattr",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "derive_setters"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "dialoguer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87"
+dependencies = [
+ "console",
+ "shell-words",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "fs-err"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541"
+
+[[package]]
+name = "fs2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+
+[[package]]
+name = "futures-task"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+
+[[package]]
+name = "futures-util"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+dependencies = [
+ "futures-core",
+ "futures-macro",
+ "futures-task",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "gimli"
+version = "0.27.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+
+[[package]]
+name = "h2"
+version = "0.3.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap 1.9.3",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "http"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+
+[[package]]
+name = "hyper"
+version = "0.14.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "rustls",
+ "tokio",
+ "tokio-rustls",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes",
+ "hyper",
+ "native-tls 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio",
+ "tokio-native-tls",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+dependencies = [
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "idna"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "idna"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.0",
+ "serde",
+]
+
+[[package]]
+name = "indicatif"
+version = "0.17.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730"
+dependencies = [
+ "console",
+ "instant",
+ "number_prefix",
+ "portable-atomic",
+ "unicode-width",
+]
+
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+dependencies = [
+ "hermit-abi",
+ "rustix",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "iso8601"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924e5d73ea28f59011fec52a0d12185d496a9b075d360657aed2a5707f701153"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+
+[[package]]
+name = "js-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.147"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+
+[[package]]
+name = "log"
+version = "0.4.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+
+[[package]]
+name = "m3u8-rs"
+version = "5.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d39af8845edca961e3286dcbafeb9e6407d3df6a616ef086847162d46f438d75"
+dependencies = [
+ "chrono",
+ "nom",
+]
+
+[[package]]
+name = "matches"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
+
+[[package]]
+name = "memchr"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+dependencies = [
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.11"
+source = "git+https://github.com/crunchy-labs/rust-not-so-native-tls.git?rev=570100d#570100d3391bd9aab7a390cfef0d1a28e8efe200"
+dependencies = [
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+]
+
+[[package]]
+name = "nix"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc",
+ "static_assertions",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
+[[package]]
+name = "object"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "openssl"
+version = "0.10.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e"
+dependencies = [
+ "bitflags 1.3.2",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-src"
+version = "111.27.0+1.1.1v"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac"
+dependencies = [
+ "cc",
+ "libc",
+ "openssl-src",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c516611246607d0c04186886dbb3a754368ef82c79e9827a802c6d836dd111c"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+
+[[package]]
+name = "portable-atomic"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "psl-types"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac"
+
+[[package]]
+name = "publicsuffix"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457"
+dependencies = [
+ "idna 0.3.0",
+ "psl-types",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom",
+ "redox_syscall 0.2.16",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
+
+[[package]]
+name = "reqwest"
+version = "0.11.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
+dependencies = [
+ "base64",
+ "bytes",
+ "cookie",
+ "cookie_store",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-rustls",
+ "hyper-tls",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+ "tokio-native-tls",
+ "tokio-rustls",
+ "tokio-socks",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "webpki-roots 0.22.6",
+ "winreg",
+]
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin",
+ "untrusted",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustix"
+version = "0.38.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399"
+dependencies = [
+ "bitflags 2.3.3",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rustls"
+version = "0.21.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-webpki",
+ "sct",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
+dependencies = [
+ "base64",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "sanitize-filename"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ed72fbaf78e6f2d41744923916966c4fbe3d7c74e3037a8ee482f1115572603"
+dependencies = [
+ "lazy_static",
+ "regex",
+]
+
+[[package]]
+name = "schannel"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "sct"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_plain"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6018081315db179d0ce57b1fe4b62a12a0028c9cf9bbef868c9cf477b3c34ae"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1402f54f9a3b9e2efe71c1cea24e648acce55887983553eeb858cf3115acfd49"
+dependencies = [
+ "base64",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.0.0",
+ "serde",
+ "serde_json",
+ "serde_with_macros",
+ "time 0.3.25",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9197f1ad0e3c173a0222d3c4404fb04c3afe87e962bcb327af73e8301fa203c7"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "shell-words"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
+
+[[package]]
+name = "shlex"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+
+[[package]]
+name = "slab"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smart-default"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "socket2"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
+version = "2.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sys-locale"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea0b9eefabb91675082b41eb94c3ecd91af7656caee3fb4961a07c0ec8c7ca6f"
+dependencies = [
+ "libc",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "redox_syscall 0.3.5",
+ "rustix",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "time"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
+dependencies = [
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi",
+]
+
+[[package]]
+name = "time"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea"
+dependencies = [
+ "deranged",
+ "itoa",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+
+[[package]]
+name = "time-macros"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd"
+dependencies = [
+ "time-core",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
+dependencies = [
+ "autocfg",
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "pin-project-lite",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-socks"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0"
+dependencies = [
+ "either",
+ "futures-util",
+ "thiserror",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "tracing"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+dependencies = [
+ "cfg-if",
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+
+[[package]]
+name = "typenum"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "url"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
+dependencies = [
+ "form_urlencoded",
+ "idna 0.4.0",
+ "percent-encoding",
+]
+
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+
+[[package]]
+name = "web-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
+dependencies = [
+ "webpki",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9c6eda1c830a36f361e7721c87fd79ea84293b54f8c48c959f85ec636f0f196"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.1",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.1",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winreg"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "xattr"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
+dependencies = [
+ "libc",
+]
diff --git a/crunchy-cli-core/Cargo.toml b/crunchy-cli-core/Cargo.toml
index 399053f..c9ebb25 100644
--- a/crunchy-cli-core/Cargo.toml
+++ b/crunchy-cli-core/Cargo.toml
@@ -1,51 +1,43 @@
[package]
name = "crunchy-cli-core"
authors = ["Crunchy Labs Maintainers"]
-version = "3.6.7"
+version = "3.0.0"
edition = "2021"
license = "MIT"
[features]
-rustls-tls = ["reqwest/rustls-tls"]
-native-tls = ["reqwest/native-tls", "reqwest/native-tls-alpn"]
-openssl-tls = ["reqwest/native-tls", "reqwest/native-tls-alpn", "dep:rustls-native-certs"]
-openssl-tls-static = ["reqwest/native-tls", "reqwest/native-tls-alpn", "reqwest/native-tls-vendored", "dep:rustls-native-certs"]
+openssl = ["dep:native-tls", "reqwest/native-tls-alpn"]
+openssl-static = ["dep:native-tls", "native-tls?/vendored", "reqwest/native-tls-alpn", "reqwest/native-tls-vendored"]
[dependencies]
anyhow = "1.0"
-async-speed-limit = "0.4"
-clap = { version = "4.5", features = ["derive", "string"] }
+async-trait = "0.1"
+clap = { version = "4.3", features = ["derive", "string"] }
chrono = "0.4"
-crunchyroll-rs = { version = "0.11.4", features = ["experimental-stabilizations", "tower"] }
+crunchyroll-rs = { version = "0.5.1", features = ["dash-stream"] }
ctrlc = "3.4"
-dialoguer = { version = "0.11", default-features = false }
+dialoguer = { version = "0.10", default-features = false }
dirs = "5.0"
derive_setters = "0.1"
-futures-util = { version = "0.3", features = ["io"] }
fs2 = "0.4"
-http = "1.1"
indicatif = "0.17"
lazy_static = "1.4"
log = { version = "0.4", features = ["std"] }
num_cpus = "1.16"
-regex = "1.10"
-reqwest = { version = "0.12", features = ["socks", "stream"] }
-rsubs-lib = "~0.3.2"
-rusty-chromaprint = "0.2"
+regex = "1.9"
+reqwest = { version = "0.11", default-features = false, features = ["socks"] }
+sanitize-filename = "0.5"
serde = "1.0"
serde_json = "1.0"
serde_plain = "1.0"
-shlex = "1.3"
+shlex = "1.1"
+tempfile = "3.7"
+tokio = { version = "1.29", features = ["macros", "rt-multi-thread", "time"] }
sys-locale = "0.3"
-tempfile = "3.10"
-time = "0.3"
-tokio = { version = "1.38", features = ["io-util", "macros", "net", "rt-multi-thread", "time"] }
-tokio-util = "0.7"
-tower-service = "0.3"
-rustls-native-certs = { version = "0.7", optional = true }
-[target.'cfg(not(target_os = "windows"))'.dependencies]
-nix = { version = "0.28", features = ["fs"] }
+# fork of the `native-tls` crate which uses openssl as backend on every platform. this is done as `reqwest` only supports
+# `rustls` and `native-tls` as tls backend
+native-tls = { git = "https://github.com/crunchy-labs/rust-not-so-native-tls.git", rev = "570100d", features = ["alpn"], optional = true }
[build-dependencies]
chrono = "0.4"
diff --git a/crunchy-cli-core/build.rs b/crunchy-cli-core/build.rs
index b36ec8e..f7d5974 100644
--- a/crunchy-cli-core/build.rs
+++ b/crunchy-cli-core/build.rs
@@ -1,8 +1,7 @@
fn main() -> std::io::Result<()> {
println!(
"cargo:rustc-env=GIT_HASH={}",
- std::env::var("CRUNCHY_CLI_GIT_HASH")
- .or::(Ok(get_short_commit_hash()?.unwrap_or_default()))?
+ get_short_commit_hash()?.unwrap_or_default()
);
println!(
"cargo:rustc-env=BUILD_DATE={}",
diff --git a/crunchy-cli-core/src/archive/command.rs b/crunchy-cli-core/src/archive/command.rs
index 0d1b3a4..10133f2 100644
--- a/crunchy-cli-core/src/archive/command.rs
+++ b/crunchy-cli-core/src/archive/command.rs
@@ -1,28 +1,23 @@
+use crate::archive::filter::ArchiveFilter;
use crate::utils::context::Context;
-use crate::utils::download::{
- DownloadBuilder, DownloadFormat, DownloadFormatMetadata, MergeBehavior,
-};
+use crate::utils::download::{DownloadBuilder, DownloadFormat, MergeBehavior};
use crate::utils::ffmpeg::FFmpegPreset;
-use crate::utils::filter::{Filter, FilterMediaScope};
+use crate::utils::filter::Filter;
use crate::utils::format::{Format, SingleFormat};
-use crate::utils::locale::{all_locale_in_locales, resolve_locales, LanguageTagging};
+use crate::utils::locale::all_locale_in_locales;
use crate::utils::log::progress;
use crate::utils::os::{free_file, has_ffmpeg, is_special_file};
use crate::utils::parse::parse_url;
-use crate::utils::video::stream_data_from_stream;
+use crate::utils::video::variant_data_from_stream;
use crate::Execute;
use anyhow::bail;
use anyhow::Result;
use chrono::Duration;
use crunchyroll_rs::media::{Resolution, Subtitle};
use crunchyroll_rs::Locale;
-use log::{debug, warn};
-use regex::Regex;
-use std::fmt::{Display, Formatter};
-use std::iter::zip;
-use std::ops::Sub;
-use std::path::{Path, PathBuf};
-use std::process::{Command, Stdio};
+use log::debug;
+use std::collections::HashMap;
+use std::path::PathBuf;
#[derive(Clone, Debug, clap::Parser)]
#[clap(about = "Archive a video")]
@@ -31,55 +26,35 @@ pub struct Archive {
#[arg(help = format!("Audio languages. Can be used multiple times. \
Available languages are: {}", Locale::all().into_iter().map(|l| l.to_string()).collect::>().join(", ")))]
#[arg(long_help = format!("Audio languages. Can be used multiple times. \
- Available languages are:\n {}\nIETF tagged language codes for the shown available locales can be used too", Locale::all().into_iter().map(|l| format!("{:<6} → {}", l.to_string(), l.to_human_readable())).collect::>().join("\n ")))]
+ Available languages are:\n {}", Locale::all().into_iter().map(|l| format!("{:<6} → {}", l.to_string(), l.to_human_readable())).collect::>().join("\n ")))]
#[arg(short, long, default_values_t = vec![Locale::ja_JP, crate::utils::locale::system_locale()])]
pub(crate) audio: Vec,
- #[arg(skip)]
- output_audio_locales: Vec,
#[arg(help = format!("Subtitle languages. Can be used multiple times. \
Available languages are: {}", Locale::all().into_iter().map(|l| l.to_string()).collect::>().join(", ")))]
#[arg(long_help = format!("Subtitle languages. Can be used multiple times. \
- Available languages are: {}\nIETF tagged language codes for the shown available locales can be used too", Locale::all().into_iter().map(|l| l.to_string()).collect::>().join(", ")))]
+ Available languages are: {}", Locale::all().into_iter().map(|l| l.to_string()).collect::>().join(", ")))]
#[arg(short, long, default_values_t = Locale::all())]
pub(crate) subtitle: Vec,
- #[arg(skip)]
- output_subtitle_locales: Vec,
#[arg(help = "Name of the output file")]
- #[arg(long_help = "Name of the output file. \
+ #[arg(long_help = "Name of the output file.\
If you use one of the following pattern they will get replaced:\n \
- {title} → Title of the video\n \
- {series_name} → Name of the series\n \
- {season_name} → Name of the season\n \
- {audio} → Audio language of the video\n \
- {width} → Width of the video\n \
- {height} → Height of the video\n \
- {season_number} → Number of the season\n \
- {episode_number} → Number of the episode\n \
- {relative_episode_number} → Number of the episode relative to its season\n \
- {sequence_number} → Like '{episode_number}' but without possible non-number characters\n \
- {relative_sequence_number} → Like '{relative_episode_number}' but with support for episode 0's and .5's\n \
- {release_year} → Release year of the video\n \
- {release_month} → Release month of the video\n \
- {release_day} → Release day of the video\n \
- {series_id} → ID of the series\n \
- {season_id} → ID of the season\n \
- {episode_id} → ID of the episode")]
+ {title} → Title of the video\n \
+ {series_name} → Name of the series\n \
+ {season_name} → Name of the season\n \
+ {audio} → Audio language of the video\n \
+ {resolution} → Resolution of the video\n \
+ {season_number} → Number of the season\n \
+ {episode_number} → Number of the episode\n \
+ {relative_episode_number} → Number of the episode relative to its season\n \
+ {series_id} → ID of the series\n \
+ {season_id} → ID of the season\n \
+ {episode_id} → ID of the episode")]
#[arg(short, long, default_value = "{title}.mkv")]
pub(crate) output: String,
- #[arg(help = "Name of the output file if the episode is a special")]
- #[arg(long_help = "Name of the output file if the episode is a special. \
- If not set, the '-o'/'--output' flag will be used as name template")]
- #[arg(long)]
- pub(crate) output_specials: Option,
-
- #[arg(help = "Sanitize the output file for use with all operating systems. \
- This option only affects template options and not static characters.")]
- #[arg(long, default_value_t = false)]
- pub(crate) universal_output: bool,
#[arg(help = "Video resolution")]
- #[arg(long_help = "The video resolution. \
+ #[arg(long_help = "The video resolution.\
Can either be specified via the pixels (e.g. 1920x1080), the abbreviation for pixels (e.g. 1080p) or 'common-use' words (e.g. best). \
Specifying the exact pixels is not recommended, use one of the other options instead. \
Crunchyroll let you choose the quality with pixel abbreviation on their clients, so you might be already familiar with the available options. \
@@ -89,43 +64,16 @@ pub struct Archive {
pub(crate) resolution: Resolution,
#[arg(
- help = "Sets the behavior of the stream merging. Valid behaviors are 'auto', 'sync', 'audio' and 'video'"
+ help = "Sets the behavior of the stream merging. Valid behaviors are 'auto', 'audio' and 'video'"
)]
#[arg(
long_help = "Because of local restrictions (or other reasons) some episodes with different languages does not have the same length (e.g. when some scenes were cut out). \
With this flag you can set the behavior when handling multiple language.
- Valid options are 'audio' (stores one video and all other languages as audio only), 'video' (stores the video + audio for every language), 'auto' (detects if videos differ in length: if so, behave like 'video' else like 'audio') and 'sync' (detects if videos differ in length: if so, tries to find the offset of matching audio parts and removes it from the beginning, otherwise it behaves like 'audio')"
+ Valid options are 'audio' (stores one video and all other languages as audio only), 'video' (stores the video + audio for every language) and 'auto' (detects if videos differ in length: if so, behave like 'video' else like 'audio')"
)]
#[arg(short, long, default_value = "auto")]
#[arg(value_parser = MergeBehavior::parse)]
pub(crate) merge: MergeBehavior,
- #[arg(
- help = "If the merge behavior is 'auto' or 'sync', consider videos to be of equal lengths if the difference in length is smaller than the specified milliseconds"
- )]
- #[arg(long, default_value_t = 200)]
- pub(crate) merge_time_tolerance: u32,
- #[arg(
- help = "If the merge behavior is 'sync', specify the difference by which two fingerprints are considered equal, higher values can help when the algorithm fails"
- )]
- #[arg(long, default_value_t = 6)]
- pub(crate) merge_sync_tolerance: u32,
- #[arg(
- help = "If the merge behavior is 'sync', specify the amount of offset determination runs from which the final offset is calculated, higher values will increase the time required but lead to more precise offsets"
- )]
- #[arg(long, default_value_t = 4)]
- pub(crate) merge_sync_precision: u32,
-
- #[arg(
- help = "Specified which language tagging the audio and subtitle tracks and language specific format options should have. \
- Valid options are: 'default' (how Crunchyroll uses it internally), 'ietf' (according to the IETF standard)"
- )]
- #[arg(
- long_help = "Specified which language tagging the audio and subtitle tracks and language specific format options should have. \
- Valid options are: 'default' (how Crunchyroll uses it internally), 'ietf' (according to the IETF standard; you might run in issues as there are multiple locales which resolve to the same IETF language code, e.g. 'es-LA' and 'es-ES' are both resolving to 'es')"
- )]
- #[arg(long)]
- #[arg(value_parser = LanguageTagging::parse)]
- pub(crate) language_tagging: Option,
#[arg(help = format!("Presets for converting the video to a specific coding format. \
Available presets: \n {}", FFmpegPreset::available_matches_human_readable().join("\n ")))]
@@ -135,71 +83,26 @@ pub struct Archive {
#[arg(long)]
#[arg(value_parser = FFmpegPreset::parse)]
pub(crate) ffmpeg_preset: Option,
- #[arg(
- help = "The number of threads used by ffmpeg to generate the output file. Does not work with every codec/preset"
- )]
- #[arg(
- long_help = "The number of threads used by ffmpeg to generate the output file. \
- Does not work with every codec/preset and is skipped entirely when specifying custom ffmpeg output arguments instead of a preset for `--ffmpeg-preset`. \
- By default, ffmpeg chooses the thread count which works best for the output codec"
- )]
- #[arg(long)]
- pub(crate) ffmpeg_threads: Option,
#[arg(
help = "Set which subtitle language should be set as default / auto shown when starting a video"
)]
#[arg(long)]
pub(crate) default_subtitle: Option,
- #[arg(help = "Include fonts in the downloaded file")]
- #[arg(long)]
- pub(crate) include_fonts: bool,
- #[arg(
- help = "Includes chapters (e.g. intro, credits, ...). Only works if `--merge` is set to 'audio'"
- )]
- #[arg(
- long_help = "Includes chapters (e.g. intro, credits, ...). . Only works if `--merge` is set to 'audio'. \
- Because chapters are essentially only special timeframes in episodes like the intro, most of the video timeline isn't covered by a chapter.
- These \"gaps\" are filled with an 'Episode' chapter because many video players are ignore those gaps and just assume that a chapter ends when the next chapter start is reached, even if a specific end-time is set.
- Also chapters aren't always available, so in this case, just a big 'Episode' chapter from start to end will be created"
- )]
- #[arg(long, default_value_t = false)]
- pub(crate) include_chapters: bool,
- #[arg(help = "Omit closed caption subtitles in the downloaded file")]
- #[arg(long, default_value_t = false)]
- pub(crate) no_closed_caption: bool,
-
- #[arg(help = "Skip files which are already existing by their name")]
+ #[arg(help = "Skip files which are already existing")]
#[arg(long, default_value_t = false)]
pub(crate) skip_existing: bool,
- #[arg(
- help = "Only works in combination with `--skip-existing`. Sets the method how already existing files should be skipped. Valid methods are 'audio' and 'subtitle'"
- )]
- #[arg(long_help = "Only works in combination with `--skip-existing`. \
- By default, already existing files are determined by their name and the download of the corresponding episode is skipped. \
- With this flag you can modify this behavior. \
- Valid options are 'audio' and 'subtitle' (if the file already exists but the audio/subtitle are less from what should be downloaded, the episode gets downloaded and the file overwritten).")]
- #[arg(long, default_values_t = SkipExistingMethod::default())]
- #[arg(value_parser = SkipExistingMethod::parse)]
- pub(crate) skip_existing_method: Vec,
- #[arg(help = "Skip special episodes")]
- #[arg(long, default_value_t = false)]
- pub(crate) skip_specials: bool,
#[arg(help = "Skip any interactive input")]
#[arg(short, long, default_value_t = false)]
pub(crate) yes: bool,
- #[arg(help = "The number of threads used to download")]
- #[arg(short, long, default_value_t = num_cpus::get())]
- pub(crate) threads: usize,
-
#[arg(help = "Crunchyroll series url(s)")]
- #[arg(required = true)]
pub(crate) urls: Vec,
}
+#[async_trait::async_trait(?Send)]
impl Execute for Archive {
fn pre_check(&mut self) -> Result<()> {
if !has_ffmpeg() {
@@ -213,61 +116,15 @@ impl Execute for Archive {
&& self.output != "-"
{
bail!("File extension is not '.mkv'. Currently only matroska / '.mkv' files are supported")
- } else if let Some(special_output) = &self.output_specials {
- if PathBuf::from(special_output)
- .extension()
- .unwrap_or_default()
- .to_string_lossy()
- != "mkv"
- && !is_special_file(special_output)
- && special_output != "-"
- {
- bail!("File extension for special episodes is not '.mkv'. Currently only matroska / '.mkv' files are supported")
- }
- }
-
- if self.include_chapters
- && !matches!(self.merge, MergeBehavior::Sync)
- && !matches!(self.merge, MergeBehavior::Audio)
- {
- bail!("`--include-chapters` can only be used if `--merge` is set to 'audio' or 'sync'")
- }
-
- if !self.skip_existing_method.is_empty() && !self.skip_existing {
- warn!("`--skip-existing-method` has no effect if `--skip-existing` is not set")
}
self.audio = all_locale_in_locales(self.audio.clone());
self.subtitle = all_locale_in_locales(self.subtitle.clone());
- if let Some(language_tagging) = &self.language_tagging {
- self.audio = resolve_locales(&self.audio);
- self.subtitle = resolve_locales(&self.subtitle);
- self.output_audio_locales = language_tagging.convert_locales(&self.audio);
- self.output_subtitle_locales = language_tagging.convert_locales(&self.subtitle);
- } else {
- self.output_audio_locales = self
- .audio
- .clone()
- .into_iter()
- .map(|l| l.to_string())
- .collect();
- self.output_subtitle_locales = self
- .subtitle
- .clone()
- .into_iter()
- .map(|l| l.to_string())
- .collect();
- }
-
Ok(())
}
async fn execute(self, ctx: Context) -> Result<()> {
- if !ctx.crunchy.premium().await {
- warn!("You may not be able to download all requested videos when logging in anonymously or using a non-premium account")
- }
-
let mut parsed_urls = vec![];
for (i, url) in self.urls.clone().into_iter().enumerate() {
@@ -283,55 +140,9 @@ impl Execute for Archive {
for (i, (media_collection, url_filter)) in parsed_urls.into_iter().enumerate() {
let progress_handler = progress!("Fetching series details");
- let single_format_collection = Filter::new(
- url_filter,
- self.audio.clone(),
- self.subtitle.clone(),
- |scope, locales| {
- let audios = locales.into_iter().map(|l| l.to_string()).collect::>().join(", ");
- match scope {
- FilterMediaScope::Series(series) => warn!("Series {} is not available with {} audio", series.title, audios),
- FilterMediaScope::Season(season) => warn!("Season {} is not available with {} audio", season.season_number, audios),
- FilterMediaScope::Episode(episodes) => {
- if episodes.len() == 1 {
- warn!("Episode {} is not available with {} audio", episodes[0].sequence_number, audios)
- } else if episodes.len() == 2 {
- warn!("Season {} is only available with {} audio from episode {} to {}", episodes[0].season_number, audios, episodes[0].sequence_number, episodes[1].sequence_number)
- } else {
- unimplemented!()
- }
- }
- }
- Ok(true)
- },
- |scope, locales| {
- let subtitles = locales.into_iter().map(|l| l.to_string()).collect::>().join(", ");
- match scope {
- FilterMediaScope::Series(series) => warn!("Series {} is not available with {} subtitles", series.title, subtitles),
- FilterMediaScope::Season(season) => warn!("Season {} is not available with {} subtitles", season.season_number, subtitles),
- FilterMediaScope::Episode(episodes) => {
- if episodes.len() == 1 {
- warn!("Episode {} of season {} is not available with {} subtitles", episodes[0].sequence_number, episodes[0].season_title, subtitles)
- } else if episodes.len() == 2 {
- warn!("Season {} of season {} is only available with {} subtitles from episode {} to {}", episodes[0].season_number, episodes[0].season_title, subtitles, episodes[0].sequence_number, episodes[1].sequence_number)
- } else {
- unimplemented!()
- }
- }
- }
- Ok(true)
- },
- |season| {
- warn!("Skipping premium episodes in season {season}");
- Ok(())
- },
- Format::has_relative_fmt(&self.output),
- !self.yes,
- self.skip_specials,
- ctx.crunchy.premium().await,
- )
- .visit(media_collection)
- .await?;
+ let single_format_collection = ArchiveFilter::new(url_filter, self.clone(), !self.yes)
+ .visit(media_collection)
+ .await?;
if single_format_collection.is_empty() {
progress_handler.stop(format!("Skipping url {} (no matching videos found)", i + 1));
@@ -341,31 +152,12 @@ impl Execute for Archive {
single_format_collection.full_visual_output();
- let download_builder =
- DownloadBuilder::new(ctx.client.clone(), ctx.rate_limiter.clone())
- .default_subtitle(self.default_subtitle.clone())
- .download_fonts(self.include_fonts)
- .ffmpeg_preset(self.ffmpeg_preset.clone().unwrap_or_default())
- .ffmpeg_threads(self.ffmpeg_threads)
- .output_format(Some("matroska".to_string()))
- .audio_sort(Some(self.audio.clone()))
- .subtitle_sort(Some(self.subtitle.clone()))
- .no_closed_caption(self.no_closed_caption)
- .merge_sync_tolerance(match self.merge {
- MergeBehavior::Sync => Some(self.merge_sync_tolerance),
- _ => None,
- })
- .merge_sync_precision(match self.merge {
- MergeBehavior::Sync => Some(self.merge_sync_precision),
- _ => None,
- })
- .threads(self.threads)
- .audio_locale_output_map(
- zip(self.audio.clone(), self.output_audio_locales.clone()).collect(),
- )
- .subtitle_locale_output_map(
- zip(self.subtitle.clone(), self.output_subtitle_locales.clone()).collect(),
- );
+ let download_builder = DownloadBuilder::new()
+ .default_subtitle(self.default_subtitle.clone())
+ .ffmpeg_preset(self.ffmpeg_preset.clone().unwrap_or_default())
+ .output_format(Some("matroska".to_string()))
+ .audio_sort(Some(self.audio.clone()))
+ .subtitle_sort(Some(self.subtitle.clone()));
for single_formats in single_format_collection.into_iter() {
let (download_formats, mut format) = get_format(&self, &single_formats).await?;
@@ -375,79 +167,15 @@ impl Execute for Archive {
downloader.add_format(download_format)
}
- let formatted_path = if format.is_special() {
- format.format_path(
- self.output_specials
- .as_ref()
- .map_or((&self.output).into(), |so| so.into()),
- self.universal_output,
- self.language_tagging.as_ref(),
- )
- } else {
- format.format_path(
- (&self.output).into(),
- self.universal_output,
- self.language_tagging.as_ref(),
- )
- };
- let (mut path, changed) = free_file(formatted_path.clone());
+ let formatted_path = format.format_path((&self.output).into(), true);
+ let (path, changed) = free_file(formatted_path.clone());
if changed && self.skip_existing {
- let mut skip = true;
-
- if !self.skip_existing_method.is_empty() {
- if let Some((audio_locales, subtitle_locales)) =
- get_video_streams(&formatted_path)?
- {
- let method_audio = self
- .skip_existing_method
- .contains(&SkipExistingMethod::Audio);
- let method_subtitle = self
- .skip_existing_method
- .contains(&SkipExistingMethod::Subtitle);
-
- let audio_differ = if method_audio {
- format
- .locales
- .iter()
- .any(|(a, _)| !audio_locales.contains(a))
- } else {
- false
- };
- let subtitle_differ = if method_subtitle {
- format
- .locales
- .clone()
- .into_iter()
- .flat_map(|(a, mut s)| {
- // remove the closed caption if the flag is given to omit
- // closed captions
- if self.no_closed_caption && a != Locale::ja_JP {
- s.retain(|l| l != &a)
- }
- s
- })
- .any(|l| !subtitle_locales.contains(&l))
- } else {
- false
- };
-
- if (method_audio && audio_differ)
- || (method_subtitle && subtitle_differ)
- {
- skip = false;
- path.clone_from(&formatted_path)
- }
- }
- }
-
- if skip {
- debug!(
- "Skipping already existing file '{}'",
- formatted_path.to_string_lossy()
- );
- continue;
- }
+ debug!(
+ "Skipping already existing file '{}'",
+ formatted_path.to_string_lossy()
+ );
+ continue;
}
format.locales.sort_by(|(a, _), (b, _)| {
@@ -467,7 +195,7 @@ impl Execute for Archive {
format.visual_output(&path);
- downloader.download(&path).await?
+ downloader.download(&ctx, &path).await?
}
}
@@ -475,36 +203,6 @@ impl Execute for Archive {
}
}
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub(crate) enum SkipExistingMethod {
- Audio,
- Subtitle,
-}
-
-impl Display for SkipExistingMethod {
- fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
- let value = match self {
- SkipExistingMethod::Audio => "audio",
- SkipExistingMethod::Subtitle => "subtitle",
- };
- write!(f, "{}", value)
- }
-}
-
-impl SkipExistingMethod {
- fn parse(s: &str) -> Result {
- match s.to_lowercase().as_str() {
- "audio" => Ok(Self::Audio),
- "subtitle" => Ok(Self::Subtitle),
- _ => Err(format!("invalid skip existing method '{}'", s)),
- }
- }
-
- fn default<'a>() -> &'a [Self] {
- &[]
- }
-}
-
async fn get_format(
archive: &Archive,
single_formats: &Vec,
@@ -514,9 +212,7 @@ async fn get_format(
for single_format in single_formats {
let stream = single_format.stream().await?;
- let Some((video, audio, _)) =
- stream_data_from_stream(&stream, &archive.resolution, None).await?
- else {
+ let Some((video, audio)) = variant_data_from_stream(&stream, &archive.resolution).await? else {
if single_format.is_episode() {
bail!(
"Resolution ({}) is not available for episode {} ({}) of {} season {}",
@@ -539,29 +235,24 @@ async fn get_format(
let subtitles: Vec<(Subtitle, bool)> = archive
.subtitle
.iter()
- .flat_map(|s| {
- let mut subtitles = vec![];
- if let Some(caption) = stream.captions.get(s) {
- subtitles.push((caption.clone(), true))
- }
- if let Some(subtitle) = stream.subtitles.get(s) {
- // the subtitle is probably cc if the audio is not japanese or only one subtitle
- // exists for this stream
- let cc = single_format.audio != Locale::ja_JP && stream.subtitles.len() == 1;
- // only include the subtitles if no cc subtitle is already present or if it's
- // not cc
- if subtitles.is_empty() || !cc {
- subtitles.push((subtitle.clone(), cc))
- }
- }
- subtitles
+ .filter_map(|s| {
+ stream
+ .subtitles
+ .get(s)
+ .cloned()
+ // the subtitle is probably not cc if the audio is japanese or more than one
+ // subtitle exists for this stream
+ .map(|l| {
+ (
+ l,
+ single_format.audio == Locale::ja_JP || stream.subtitles.len() > 1,
+ )
+ })
})
.collect();
format_pairs.push((single_format, video.clone(), audio, subtitles.clone()));
- single_format_to_format_pairs.push((single_format.clone(), video, subtitles));
-
- stream.invalidate().await?
+ single_format_to_format_pairs.push((single_format.clone(), video, subtitles))
}
let mut download_formats = vec![];
@@ -573,14 +264,13 @@ async fn get_format(
video: (video, single_format.audio.clone()),
audios: vec![(audio, single_format.audio.clone())],
subtitles,
- metadata: DownloadFormatMetadata { skip_events: None },
})
}
}
MergeBehavior::Audio => download_formats.push(DownloadFormat {
video: (
- format_pairs.first().unwrap().1.clone(),
- format_pairs.first().unwrap().0.audio.clone(),
+ (*format_pairs.first().unwrap()).1.clone(),
+ (*format_pairs.first().unwrap()).0.audio.clone(),
),
audios: format_pairs
.iter()
@@ -592,62 +282,28 @@ async fn get_format(
.iter()
.flat_map(|(_, _, _, subtitles)| subtitles.clone())
.collect(),
- metadata: DownloadFormatMetadata {
- skip_events: if archive.include_chapters {
- format_pairs.first().unwrap().0.skip_events().await?
- } else {
- None
- },
- },
}),
- MergeBehavior::Auto | MergeBehavior::Sync => {
- let mut d_formats: Vec<(Duration, DownloadFormat)> = vec![];
+ MergeBehavior::Auto => {
+ let mut d_formats: HashMap = HashMap::new();
for (single_format, video, audio, subtitles) in format_pairs {
- let closest_format = d_formats.iter_mut().min_by(|(x, _), (y, _)| {
- x.sub(single_format.duration)
- .abs()
- .cmp(&y.sub(single_format.duration).abs())
- });
-
- match closest_format {
- Some(closest_format)
- if closest_format
- .0
- .sub(single_format.duration)
- .abs()
- .num_milliseconds()
- < archive.merge_time_tolerance.into() =>
- {
- // If less than `audio_error` apart, use same audio.
- closest_format
- .1
- .audios
- .push((audio, single_format.audio.clone()));
- closest_format.1.subtitles.extend(subtitles);
- }
- _ => {
- d_formats.push((
- single_format.duration,
- DownloadFormat {
- video: (video, single_format.audio.clone()),
- audios: vec![(audio, single_format.audio.clone())],
- subtitles,
- metadata: DownloadFormatMetadata {
- skip_events: if archive.include_chapters {
- single_format.skip_events().await?
- } else {
- None
- },
- },
- },
- ));
- }
- };
+ if let Some(d_format) = d_formats.get_mut(&single_format.duration) {
+ d_format.audios.push((audio, single_format.audio.clone()));
+ d_format.subtitles.extend(subtitles)
+ } else {
+ d_formats.insert(
+ single_format.duration,
+ DownloadFormat {
+ video: (video, single_format.audio.clone()),
+ audios: vec![(audio, single_format.audio.clone())],
+ subtitles,
+ },
+ );
+ }
}
- for (_, d_format) in d_formats.into_iter() {
- download_formats.push(d_format);
+ for d_format in d_formats.into_values() {
+ download_formats.push(d_format)
}
}
}
@@ -657,36 +313,3 @@ async fn get_format(
Format::from_single_formats(single_format_to_format_pairs),
))
}
-
-fn get_video_streams(path: &Path) -> Result, Vec)>> {
- let video_streams =
- Regex::new(r"(?m)Stream\s#\d+:\d+\((?P.+)\):\s(?P(Audio|Subtitle))")
- .unwrap();
-
- let ffmpeg = Command::new("ffmpeg")
- .stdout(Stdio::null())
- .stderr(Stdio::piped())
- .arg("-hide_banner")
- .args(["-i", &path.to_string_lossy()])
- .output()?;
- let ffmpeg_output = String::from_utf8(ffmpeg.stderr)?;
-
- let mut audio = vec![];
- let mut subtitle = vec![];
- for cap in video_streams.captures_iter(&ffmpeg_output) {
- let locale = cap.name("language").unwrap().as_str();
- let type_ = cap.name("type").unwrap().as_str();
-
- match type_ {
- "Audio" => audio.push(Locale::from(locale.to_string())),
- "Subtitle" => subtitle.push(Locale::from(locale.to_string())),
- _ => unreachable!(),
- }
- }
-
- if audio.is_empty() && subtitle.is_empty() {
- Ok(None)
- } else {
- Ok(Some((audio, subtitle)))
- }
-}
diff --git a/crunchy-cli-core/src/archive/filter.rs b/crunchy-cli-core/src/archive/filter.rs
new file mode 100644
index 0000000..38fed32
--- /dev/null
+++ b/crunchy-cli-core/src/archive/filter.rs
@@ -0,0 +1,414 @@
+use crate::archive::command::Archive;
+use crate::utils::filter::{real_dedup_vec, Filter};
+use crate::utils::format::{Format, SingleFormat, SingleFormatCollection};
+use crate::utils::interactive_select::{check_for_duplicated_seasons, get_duplicated_seasons};
+use crate::utils::parse::UrlFilter;
+use anyhow::Result;
+use crunchyroll_rs::{Concert, Episode, Locale, Movie, MovieListing, MusicVideo, Season, Series};
+use log::{info, warn};
+use std::collections::{BTreeMap, HashMap};
+
+enum Visited {
+ Series,
+ Season,
+ None,
+}
+
+pub(crate) struct ArchiveFilter {
+ url_filter: UrlFilter,
+ archive: Archive,
+ interactive_input: bool,
+ season_episode_count: HashMap>,
+ season_subtitles_missing: Vec,
+ season_sorting: Vec,
+ visited: Visited,
+}
+
+impl ArchiveFilter {
+ pub(crate) fn new(url_filter: UrlFilter, archive: Archive, interactive_input: bool) -> Self {
+ Self {
+ url_filter,
+ archive,
+ interactive_input,
+ season_episode_count: HashMap::new(),
+ season_subtitles_missing: vec![],
+ season_sorting: vec![],
+ visited: Visited::None,
+ }
+ }
+}
+
+#[async_trait::async_trait]
+impl Filter for ArchiveFilter {
+ type T = Vec;
+ type Output = SingleFormatCollection;
+
+ async fn visit_series(&mut self, series: Series) -> Result> {
+ // `series.audio_locales` isn't always populated b/c of crunchyrolls api. so check if the
+ // audio is matching only if the field is populated
+ if !series.audio_locales.is_empty() {
+ let missing_audio = missing_locales(&series.audio_locales, &self.archive.audio);
+ if !missing_audio.is_empty() {
+ warn!(
+ "Series {} is not available with {} audio",
+ series.title,
+ missing_audio
+ .into_iter()
+ .map(|l| l.to_string())
+ .collect::>()
+ .join(", ")
+ )
+ }
+ let missing_subtitle =
+ missing_locales(&series.subtitle_locales, &self.archive.subtitle);
+ if !missing_subtitle.is_empty() {
+ warn!(
+ "Series {} is not available with {} subtitles",
+ series.title,
+ missing_subtitle
+ .into_iter()
+ .map(|l| l.to_string())
+ .collect::>()
+ .join(", ")
+ )
+ }
+ self.visited = Visited::Series
+ }
+
+ let mut seasons = series.seasons().await?;
+ let mut remove_ids = vec![];
+ for season in seasons.iter_mut() {
+ if !self.url_filter.is_season_valid(season.season_number)
+ || (!season
+ .audio_locales
+ .iter()
+ .any(|l| self.archive.audio.contains(l))
+ && !season
+ .available_versions()
+ .await?
+ .iter()
+ .any(|l| self.archive.audio.contains(l)))
+ {
+ remove_ids.push(season.id.clone());
+ }
+ }
+
+ seasons.retain(|s| !remove_ids.contains(&s.id));
+
+ let duplicated_seasons = get_duplicated_seasons(&seasons);
+ if duplicated_seasons.len() > 0 {
+ if self.interactive_input {
+ check_for_duplicated_seasons(&mut seasons);
+ } else {
+ info!(
+ "Found duplicated seasons: {}",
+ duplicated_seasons
+ .iter()
+ .map(|d| d.to_string())
+ .collect::>()
+ .join(", ")
+ )
+ }
+ }
+
+ Ok(seasons)
+ }
+
+ async fn visit_season(&mut self, mut season: Season) -> Result> {
+ if !self.url_filter.is_season_valid(season.season_number) {
+ return Ok(vec![]);
+ }
+
+ let mut seasons = season.version(self.archive.audio.clone()).await?;
+ if self
+ .archive
+ .audio
+ .iter()
+ .any(|l| season.audio_locales.contains(l))
+ {
+ seasons.insert(0, season.clone());
+ }
+
+ if !matches!(self.visited, Visited::Series) {
+ let mut audio_locales: Vec = seasons
+ .iter()
+ .map(|s| s.audio_locales.clone())
+ .flatten()
+ .collect();
+ real_dedup_vec(&mut audio_locales);
+ let missing_audio = missing_locales(&audio_locales, &self.archive.audio);
+ if !missing_audio.is_empty() {
+ warn!(
+ "Season {} is not available with {} audio",
+ season.season_number,
+ missing_audio
+ .into_iter()
+ .map(|l| l.to_string())
+ .collect::>()
+ .join(", ")
+ )
+ }
+
+ let subtitle_locales: Vec = seasons
+ .iter()
+ .map(|s| s.subtitle_locales.clone())
+ .flatten()
+ .collect();
+ let missing_subtitle = missing_locales(&subtitle_locales, &self.archive.subtitle);
+ if !missing_subtitle.is_empty() {
+ warn!(
+ "Season {} is not available with {} subtitles",
+ season.season_number,
+ missing_subtitle
+ .into_iter()
+ .map(|l| l.to_string())
+ .collect::>()
+ .join(", ")
+ )
+ }
+ self.visited = Visited::Season
+ }
+
+ let mut episodes = vec![];
+ for season in seasons {
+ self.season_sorting.push(season.id.clone());
+ let season_locale = if season.audio_locales.len() < 2 {
+ Some(
+ season
+ .audio_locales
+ .get(0)
+ .cloned()
+ .unwrap_or(Locale::ja_JP),
+ )
+ } else {
+ None
+ };
+ let mut eps = season.episodes().await?;
+ let before_len = eps.len();
+
+ for mut ep in eps.clone() {
+ if let Some(l) = &season_locale {
+ if &ep.audio_locale == l {
+ continue;
+ }
+ eps.remove(eps.iter().position(|p| p.id == ep.id).unwrap());
+ } else {
+ let mut requested_locales = self.archive.audio.clone();
+ if let Some(idx) = requested_locales.iter().position(|p| p == &ep.audio_locale)
+ {
+ requested_locales.remove(idx);
+ } else {
+ eps.remove(eps.iter().position(|p| p.id == ep.id).unwrap());
+ }
+ eps.extend(ep.version(self.archive.audio.clone()).await?);
+ }
+ }
+ if eps.len() < before_len {
+ if eps.len() == 0 {
+ if matches!(self.visited, Visited::Series) {
+ warn!(
+ "Season {} is not available with {} audio",
+ season.season_number,
+ season_locale.unwrap_or(Locale::ja_JP)
+ )
+ }
+ } else {
+ let last_episode = eps.last().unwrap();
+ warn!(
+ "Season {} is only available with {} audio until episode {} ({})",
+ season.season_number,
+ season_locale.unwrap_or(Locale::ja_JP),
+ last_episode.episode_number,
+ last_episode.title
+ )
+ }
+ }
+ episodes.extend(eps)
+ }
+
+ if Format::has_relative_episodes_fmt(&self.archive.output) {
+ for episode in episodes.iter() {
+ self.season_episode_count
+ .entry(episode.season_number)
+ .or_insert(vec![])
+ .push(episode.id.clone())
+ }
+ }
+
+ Ok(episodes)
+ }
+
+ async fn visit_episode(&mut self, mut episode: Episode) -> Result> {
+ if !self
+ .url_filter
+ .is_episode_valid(episode.episode_number, episode.season_number)
+ {
+ return Ok(None);
+ }
+
+ let mut episodes = vec![];
+ if !matches!(self.visited, Visited::Series) && !matches!(self.visited, Visited::Season) {
+ if self.archive.audio.contains(&episode.audio_locale) {
+ episodes.push((episode.clone(), episode.subtitle_locales.clone()))
+ }
+ episodes.extend(
+ episode
+ .version(self.archive.audio.clone())
+ .await?
+ .into_iter()
+ .map(|e| (e.clone(), e.subtitle_locales.clone())),
+ );
+ let audio_locales: Vec = episodes
+ .iter()
+ .map(|(e, _)| e.audio_locale.clone())
+ .collect();
+ let missing_audio = missing_locales(&audio_locales, &self.archive.audio);
+ if !missing_audio.is_empty() {
+ warn!(
+ "Episode {} is not available with {} audio",
+ episode.episode_number,
+ missing_audio
+ .into_iter()
+ .map(|l| l.to_string())
+ .collect::>()
+ .join(", ")
+ )
+ }
+
+ let mut subtitle_locales: Vec =
+ episodes.iter().map(|(_, s)| s.clone()).flatten().collect();
+ real_dedup_vec(&mut subtitle_locales);
+ let missing_subtitles = missing_locales(&subtitle_locales, &self.archive.subtitle);
+ if !missing_subtitles.is_empty()
+ && !self
+ .season_subtitles_missing
+ .contains(&episode.season_number)
+ {
+ warn!(
+ "Episode {} is not available with {} subtitles",
+ episode.episode_number,
+ missing_subtitles
+ .into_iter()
+ .map(|l| l.to_string())
+ .collect::>()
+ .join(", ")
+ );
+ self.season_subtitles_missing.push(episode.season_number)
+ }
+ } else {
+ episodes.push((episode.clone(), episode.subtitle_locales.clone()))
+ }
+
+ let relative_episode_number = if Format::has_relative_episodes_fmt(&self.archive.output) {
+ if self
+ .season_episode_count
+ .get(&episode.season_number)
+ .is_none()
+ {
+ let season_episodes = episode.season().await?.episodes().await?;
+ self.season_episode_count.insert(
+ episode.season_number,
+ season_episodes.into_iter().map(|e| e.id).collect(),
+ );
+ }
+ let relative_episode_number = self
+ .season_episode_count
+ .get(&episode.season_number)
+ .unwrap()
+ .iter()
+ .position(|id| id == &episode.id)
+ .map(|index| index + 1);
+ if relative_episode_number.is_none() {
+ warn!(
+ "Failed to get relative episode number for episode {} ({}) of {} season {}",
+ episode.episode_number,
+ episode.title,
+ episode.series_title,
+ episode.season_number,
+ )
+ }
+ relative_episode_number
+ } else {
+ None
+ };
+
+ Ok(Some(
+ episodes
+ .into_iter()
+ .map(|(e, s)| {
+ SingleFormat::new_from_episode(e, s, relative_episode_number.map(|n| n as u32))
+ })
+ .collect(),
+ ))
+ }
+
+ async fn visit_movie_listing(&mut self, movie_listing: MovieListing) -> Result> {
+ Ok(movie_listing.movies().await?)
+ }
+
+ async fn visit_movie(&mut self, movie: Movie) -> Result> {
+ Ok(Some(vec![SingleFormat::new_from_movie(movie, vec![])]))
+ }
+
+ async fn visit_music_video(&mut self, music_video: MusicVideo) -> Result> {
+ Ok(Some(vec![SingleFormat::new_from_music_video(music_video)]))
+ }
+
+ async fn visit_concert(&mut self, concert: Concert) -> Result> {
+ Ok(Some(vec![SingleFormat::new_from_concert(concert)]))
+ }
+
+ async fn finish(self, input: Vec) -> Result {
+ let flatten_input: Self::T = input.into_iter().flatten().collect();
+
+ let mut single_format_collection = SingleFormatCollection::new();
+
+ let mut pre_sorted: BTreeMap = BTreeMap::new();
+ for data in flatten_input {
+ pre_sorted
+ .entry(data.identifier.clone())
+ .or_insert(vec![])
+ .push(data)
+ }
+
+ let mut sorted: Vec<(String, Self::T)> = pre_sorted.into_iter().collect();
+ sorted.sort_by(|(_, a), (_, b)| {
+ self.season_sorting
+ .iter()
+ .position(|p| p == &a.first().unwrap().season_id)
+ .unwrap()
+ .cmp(
+ &self
+ .season_sorting
+ .iter()
+ .position(|p| p == &b.first().unwrap().season_id)
+ .unwrap(),
+ )
+ });
+
+ for (_, mut data) in sorted {
+ data.sort_by(|a, b| {
+ self.archive
+ .audio
+ .iter()
+ .position(|p| p == &a.audio)
+ .unwrap_or(usize::MAX)
+ .cmp(
+ &self
+ .archive
+ .audio
+ .iter()
+ .position(|p| p == &b.audio)
+ .unwrap_or(usize::MAX),
+ )
+ });
+ single_format_collection.add_single_formats(data)
+ }
+
+ Ok(single_format_collection)
+ }
+}
+
+fn missing_locales<'a>(available: &Vec, searched: &'a Vec) -> Vec<&'a Locale> {
+ searched.iter().filter(|p| !available.contains(p)).collect()
+}
diff --git a/crunchy-cli-core/src/archive/mod.rs b/crunchy-cli-core/src/archive/mod.rs
index 670d0c2..c3544a4 100644
--- a/crunchy-cli-core/src/archive/mod.rs
+++ b/crunchy-cli-core/src/archive/mod.rs
@@ -1,3 +1,4 @@
mod command;
+mod filter;
pub use command::Archive;
diff --git a/crunchy-cli-core/src/download/command.rs b/crunchy-cli-core/src/download/command.rs
index 8e3794f..1ce731d 100644
--- a/crunchy-cli-core/src/download/command.rs
+++ b/crunchy-cli-core/src/download/command.rs
@@ -1,20 +1,19 @@
+use crate::download::filter::DownloadFilter;
use crate::utils::context::Context;
-use crate::utils::download::{DownloadBuilder, DownloadFormat, DownloadFormatMetadata};
-use crate::utils::ffmpeg::{FFmpegPreset, SOFTSUB_CONTAINERS};
-use crate::utils::filter::{Filter, FilterMediaScope};
+use crate::utils::download::{DownloadBuilder, DownloadFormat};
+use crate::utils::ffmpeg::FFmpegPreset;
+use crate::utils::filter::Filter;
use crate::utils::format::{Format, SingleFormat};
-use crate::utils::locale::{resolve_locales, LanguageTagging};
use crate::utils::log::progress;
use crate::utils::os::{free_file, has_ffmpeg, is_special_file};
use crate::utils::parse::parse_url;
-use crate::utils::video::stream_data_from_stream;
+use crate::utils::video::variant_data_from_stream;
use crate::Execute;
use anyhow::bail;
use anyhow::Result;
use crunchyroll_rs::media::Resolution;
use crunchyroll_rs::Locale;
-use log::{debug, error, warn};
-use std::collections::HashMap;
+use log::{debug, warn};
use std::path::Path;
#[derive(Clone, Debug, clap::Parser)]
@@ -24,54 +23,34 @@ pub struct Download {
#[arg(help = format!("Audio language. Can only be used if the provided url(s) point to a series. \
Available languages are: {}", Locale::all().into_iter().map(|l| l.to_string()).collect::>().join(", ")))]
#[arg(long_help = format!("Audio language. Can only be used if the provided url(s) point to a series. \
- Available languages are:\n {}\nIETF tagged language codes for the shown available locales can be used too", Locale::all().into_iter().map(|l| format!("{:<6} → {}", l.to_string(), l.to_human_readable())).collect::>().join("\n ")))]
+ Available languages are:\n {}", Locale::all().into_iter().map(|l| format!("{:<6} → {}", l.to_string(), l.to_human_readable())).collect::>().join("\n ")))]
#[arg(short, long, default_value_t = crate::utils::locale::system_locale())]
pub(crate) audio: Locale,
- #[arg(skip)]
- output_audio_locale: String,
#[arg(help = format!("Subtitle language. Available languages are: {}", Locale::all().into_iter().map(|l| l.to_string()).collect::>().join(", ")))]
#[arg(long_help = format!("Subtitle language. If set, the subtitle will be burned into the video and cannot be disabled. \
- Available languages are: {}\nIETF tagged language codes for the shown available locales can be used too", Locale::all().into_iter().map(|l| l.to_string()).collect::>().join(", ")))]
+ Available languages are: {}", Locale::all().into_iter().map(|l| l.to_string()).collect::>().join(", ")))]
#[arg(short, long)]
pub(crate) subtitle: Option,
- #[arg(skip)]
- output_subtitle_locale: String,
#[arg(help = "Name of the output file")]
- #[arg(long_help = "Name of the output file. \
+ #[arg(long_help = "Name of the output file.\
If you use one of the following pattern they will get replaced:\n \
- {title} → Title of the video\n \
- {series_name} → Name of the series\n \
- {season_name} → Name of the season\n \
- {audio} → Audio language of the video\n \
- {width} → Width of the video\n \
- {height} → Height of the video\n \
- {season_number} → Number of the season\n \
- {episode_number} → Number of the episode\n \
- {relative_episode_number} → Number of the episode relative to its season\n \
- {sequence_number} → Like '{episode_number}' but without possible non-number characters\n \
- {relative_sequence_number} → Like '{relative_episode_number}' but with support for episode 0's and .5's\n \
- {release_year} → Release year of the video\n \
- {release_month} → Release month of the video\n \
- {release_day} → Release day of the video\n \
- {series_id} → ID of the series\n \
- {season_id} → ID of the season\n \
- {episode_id} → ID of the episode")]
+ {title} → Title of the video\n \
+ {series_name} → Name of the series\n \
+ {season_name} → Name of the season\n \
+ {audio} → Audio language of the video\n \
+ {resolution} → Resolution of the video\n \
+ {season_number} → Number of the season\n \
+ {episode_number} → Number of the episode\n \
+ {relative_episode_number} → Number of the episode relative to its season\n \
+ {series_id} → ID of the series\n \
+ {season_id} → ID of the season\n \
+ {episode_id} → ID of the episode")]
#[arg(short, long, default_value = "{title}.mp4")]
pub(crate) output: String,
- #[arg(help = "Name of the output file if the episode is a special")]
- #[arg(long_help = "Name of the output file if the episode is a special. \
- If not set, the '-o'/'--output' flag will be used as name template")]
- #[arg(long)]
- pub(crate) output_specials: Option,
-
- #[arg(help = "Sanitize the output file for use with all operating systems. \
- This option only affects template options and not static characters.")]
- #[arg(long, default_value_t = false)]
- pub(crate) universal_output: bool,
#[arg(help = "Video resolution")]
- #[arg(long_help = "The video resolution. \
+ #[arg(long_help = "The video resolution.\
Can either be specified via the pixels (e.g. 1920x1080), the abbreviation for pixels (e.g. 1080p) or 'common-use' words (e.g. best). \
Specifying the exact pixels is not recommended, use one of the other options instead. \
Crunchyroll let you choose the quality with pixel abbreviation on their clients, so you might be already familiar with the available options. \
@@ -80,18 +59,6 @@ pub struct Download {
#[arg(value_parser = crate::utils::clap::clap_parse_resolution)]
pub(crate) resolution: Resolution,
- #[arg(
- long,
- help = "Specified which language tagging the audio and subtitle tracks and language specific format options should have. \
- Valid options are: 'default' (how Crunchyroll uses it internally), 'ietf' (according to the IETF standard)"
- )]
- #[arg(
- long_help = "Specified which language tagging the audio and subtitle tracks and language specific format options should have. \
- Valid options are: 'default' (how Crunchyroll uses it internally), 'ietf' (according to the IETF standard; you might run in issues as there are multiple locales which resolve to the same IETF language code, e.g. 'es-LA' and 'es-ES' are both resolving to 'es')"
- )]
- #[arg(value_parser = LanguageTagging::parse)]
- pub(crate) language_tagging: Option,
-
#[arg(help = format!("Presets for converting the video to a specific coding format. \
Available presets: \n {}", FFmpegPreset::available_matches_human_readable().join("\n ")))]
#[arg(long_help = format!("Presets for converting the video to a specific coding format. \
@@ -100,31 +67,10 @@ pub struct Download {
#[arg(long)]
#[arg(value_parser = FFmpegPreset::parse)]
pub(crate) ffmpeg_preset: Option,
- #[arg(
- help = "The number of threads used by ffmpeg to generate the output file. Does not work with every codec/preset"
- )]
- #[arg(
- long_help = "The number of threads used by ffmpeg to generate the output file. \
- Does not work with every codec/preset and is skipped entirely when specifying custom ffmpeg output arguments instead of a preset for `--ffmpeg-preset`. \
- By default, ffmpeg chooses the thread count which works best for the output codec"
- )]
- #[arg(long)]
- pub(crate) ffmpeg_threads: Option,
- #[arg(help = "Skip files which are already existing by their name")]
+ #[arg(help = "Skip files which are already existing")]
#[arg(long, default_value_t = false)]
pub(crate) skip_existing: bool,
- #[arg(help = "Skip special episodes")]
- #[arg(long, default_value_t = false)]
- pub(crate) skip_specials: bool,
-
- #[arg(help = "Includes chapters (e.g. intro, credits, ...)")]
- #[arg(long_help = "Includes chapters (e.g. intro, credits, ...). \
- Because chapters are essentially only special timeframes in episodes like the intro, most of the video timeline isn't covered by a chapter.
- These \"gaps\" are filled with an 'Episode' chapter because many video players are ignore those gaps and just assume that a chapter ends when the next chapter start is reached, even if a specific end-time is set.
- Also chapters aren't always available, so in this case, just a big 'Episode' chapter from start to end will be created")]
- #[arg(long, default_value_t = false)]
- pub(crate) include_chapters: bool,
#[arg(help = "Skip any interactive input")]
#[arg(short, long, default_value_t = false)]
@@ -134,15 +80,11 @@ pub struct Download {
#[arg(long, default_value_t = false)]
pub(crate) force_hardsub: bool,
- #[arg(help = "The number of threads used to download")]
- #[arg(short, long, default_value_t = num_cpus::get())]
- pub(crate) threads: usize,
-
#[arg(help = "Url(s) to Crunchyroll episodes or series")]
- #[arg(required = true)]
pub(crate) urls: Vec,
}
+#[async_trait::async_trait(?Send)]
impl Execute for Download {
fn pre_check(&mut self) -> Result<()> {
if !has_ffmpeg() {
@@ -167,75 +109,12 @@ impl Execute for Download {
}
}
- if let Some(special_output) = &self.output_specials {
- if Path::new(special_output)
- .extension()
- .unwrap_or_default()
- .is_empty()
- && !is_special_file(special_output)
- && special_output != "-"
- {
- bail!("No file extension found. Please specify a file extension (via `--output-specials`) for the output file")
- }
- if let Some(ext) = Path::new(special_output).extension() {
- if self.force_hardsub {
- warn!("Hardsubs are forced for special episodes. Adding subtitles may take a while")
- } else if !["mkv", "mov", "mp4"].contains(&ext.to_string_lossy().as_ref()) {
- warn!("Detected a container which does not support softsubs. Adding subtitles for special episodes may take a while")
- }
- }
- }
-
- if let Some(language_tagging) = &self.language_tagging {
- self.audio = resolve_locales(&[self.audio.clone()]).remove(0);
- self.subtitle = self
- .subtitle
- .as_ref()
- .map(|s| resolve_locales(&[s.clone()]).remove(0));
- self.output_audio_locale = language_tagging.for_locale(&self.audio);
- self.output_subtitle_locale = self
- .subtitle
- .as_ref()
- .map(|s| language_tagging.for_locale(s))
- .unwrap_or_default()
- } else {
- self.output_audio_locale = self.audio.to_string();
- self.output_subtitle_locale = self
- .subtitle
- .as_ref()
- .map(|s| s.to_string())
- .unwrap_or_default();
- }
-
Ok(())
}
async fn execute(self, ctx: Context) -> Result<()> {
- if !ctx.crunchy.premium().await {
- warn!("You may not be able to download all requested videos when logging in anonymously or using a non-premium account")
- }
-
let mut parsed_urls = vec![];
- let output_supports_softsubs = SOFTSUB_CONTAINERS.contains(
- &Path::new(&self.output)
- .extension()
- .unwrap_or_default()
- .to_string_lossy()
- .as_ref(),
- );
- let special_output_supports_softsubs = if let Some(so) = &self.output_specials {
- SOFTSUB_CONTAINERS.contains(
- &Path::new(so)
- .extension()
- .unwrap_or_default()
- .to_string_lossy()
- .as_ref(),
- )
- } else {
- output_supports_softsubs
- };
-
for (i, url) in self.urls.clone().into_iter().enumerate() {
let progress_handler = progress!("Parsing url {}", i + 1);
match parse_url(&ctx.crunchy, url.clone(), true).await {
@@ -249,59 +128,9 @@ impl Execute for Download {
for (i, (media_collection, url_filter)) in parsed_urls.into_iter().enumerate() {
let progress_handler = progress!("Fetching series details");
- let single_format_collection = Filter::new(
- url_filter,
- vec![self.audio.clone()],
- self.subtitle.as_ref().map_or(vec![], |s| vec![s.clone()]),
- |scope, locales| {
- match scope {
- FilterMediaScope::Series(series) => bail!("Series {} is not available with {} audio", series.title, locales[0]),
- FilterMediaScope::Season(season) => {
- error!("Season {} is not available with {} audio", season.season_number, locales[0]);
- Ok(false)
- }
- FilterMediaScope::Episode(episodes) => {
- if episodes.len() == 1 {
- warn!("Episode {} of season {} is not available with {} audio", episodes[0].sequence_number, episodes[0].season_title, locales[0])
- } else if episodes.len() == 2 {
- warn!("Season {} is only available with {} audio from episode {} to {}", episodes[0].season_number, locales[0], episodes[0].sequence_number, episodes[1].sequence_number)
- } else {
- unimplemented!()
- }
- Ok(false)
- }
- }
- },
- |scope, locales| {
- match scope {
- FilterMediaScope::Series(series) => bail!("Series {} is not available with {} subtitles", series.title, locales[0]),
- FilterMediaScope::Season(season) => {
- warn!("Season {} is not available with {} subtitles", season.season_number, locales[0]);
- Ok(false)
- },
- FilterMediaScope::Episode(episodes) => {
- if episodes.len() == 1 {
- warn!("Episode {} of season {} is not available with {} subtitles", episodes[0].sequence_number, episodes[0].season_title, locales[0])
- } else if episodes.len() == 2 {
- warn!("Season {} is only available with {} subtitles from episode {} to {}", episodes[0].season_number, locales[0], episodes[0].sequence_number, episodes[1].sequence_number)
- } else {
- unimplemented!()
- }
- Ok(false)
- }
- }
- },
- |season| {
- warn!("Skipping premium episodes in season {season}");
- Ok(())
- },
- Format::has_relative_fmt(&self.output),
- !self.yes,
- self.skip_specials,
- ctx.crunchy.premium().await,
- )
- .visit(media_collection)
- .await?;
+ let single_format_collection = DownloadFilter::new(url_filter, self.clone(), !self.yes)
+ .visit(media_collection)
+ .await?;
if single_format_collection.is_empty() {
progress_handler.stop(format!("Skipping url {} (no matching videos found)", i + 1));
@@ -311,63 +140,25 @@ impl Execute for Download {
single_format_collection.full_visual_output();
- let download_builder =
- DownloadBuilder::new(ctx.client.clone(), ctx.rate_limiter.clone())
- .default_subtitle(self.subtitle.clone())
- .force_hardsub(self.force_hardsub)
- .output_format(if is_special_file(&self.output) || self.output == "-" {
- Some("mpegts".to_string())
- } else {
- None
- })
- .ffmpeg_preset(self.ffmpeg_preset.clone().unwrap_or_default())
- .ffmpeg_threads(self.ffmpeg_threads)
- .threads(self.threads)
- .audio_locale_output_map(HashMap::from([(
- self.audio.clone(),
- self.output_audio_locale.clone(),
- )]))
- .subtitle_locale_output_map(
- self.subtitle.as_ref().map_or(HashMap::new(), |s| {
- HashMap::from([(s.clone(), self.output_subtitle_locale.clone())])
- }),
- );
+ let download_builder = DownloadBuilder::new()
+ .default_subtitle(self.subtitle.clone())
+ .force_hardsub(self.force_hardsub)
+ .output_format(if is_special_file(&self.output) || self.output == "-" {
+ Some("mpegts".to_string())
+ } else {
+ None
+ });
for mut single_formats in single_format_collection.into_iter() {
// the vec contains always only one item
let single_format = single_formats.remove(0);
- let (download_format, format) = get_format(
- &self,
- &single_format,
- if self.force_hardsub {
- true
- } else if single_format.is_special() {
- !special_output_supports_softsubs
- } else {
- !output_supports_softsubs
- },
- )
- .await?;
+ let (download_format, format) = get_format(&self, &single_format).await?;
let mut downloader = download_builder.clone().build();
downloader.add_format(download_format);
- let formatted_path = if format.is_special() {
- format.format_path(
- self.output_specials
- .as_ref()
- .map_or((&self.output).into(), |so| so.into()),
- self.universal_output,
- self.language_tagging.as_ref(),
- )
- } else {
- format.format_path(
- (&self.output).into(),
- self.universal_output,
- self.language_tagging.as_ref(),
- )
- };
+ let formatted_path = format.format_path((&self.output).into(), true);
let (path, changed) = free_file(formatted_path.clone());
if changed && self.skip_existing {
@@ -380,7 +171,7 @@ impl Execute for Download {
format.visual_output(&path);
- downloader.download(&path).await?
+ downloader.download(&ctx, &path).await?
}
}
@@ -391,20 +182,9 @@ impl Execute for Download {
async fn get_format(
download: &Download,
single_format: &SingleFormat,
- try_peer_hardsubs: bool,
) -> Result<(DownloadFormat, Format)> {
let stream = single_format.stream().await?;
- let Some((video, audio, contains_hardsub)) = stream_data_from_stream(
- &stream,
- &download.resolution,
- if try_peer_hardsubs {
- download.subtitle.clone()
- } else {
- None
- },
- )
- .await?
- else {
+ let Some((video, audio)) = variant_data_from_stream(&stream, &download.resolution).await? else {
if single_format.is_episode() {
bail!(
"Resolution ({}) is not available for episode {} ({}) of {} season {}",
@@ -424,23 +204,8 @@ async fn get_format(
}
};
- let subtitle = if contains_hardsub {
- None
- } else if let Some(subtitle_locale) = &download.subtitle {
- if download.audio == Locale::ja_JP {
- stream
- .subtitles
- .get(subtitle_locale)
- // use closed captions as fallback if no actual subtitles are found
- .or_else(|| stream.captions.get(subtitle_locale))
- .cloned()
- } else {
- stream
- .captions
- .get(subtitle_locale)
- .or_else(|| stream.subtitles.get(subtitle_locale))
- .cloned()
- }
+ let subtitle = if let Some(subtitle_locale) = &download.subtitle {
+ stream.subtitles.get(subtitle_locale).map(|s| s.clone())
} else {
None
};
@@ -451,33 +216,20 @@ async fn get_format(
subtitles: subtitle.clone().map_or(vec![], |s| {
vec![(
s,
- single_format.audio != Locale::ja_JP && stream.subtitles.len() == 1,
+ single_format.audio == Locale::ja_JP || stream.subtitles.len() > 1,
)]
}),
- metadata: DownloadFormatMetadata {
- skip_events: if download.include_chapters {
- single_format.skip_events().await?
- } else {
- None
- },
- },
};
- let mut format = Format::from_single_formats(vec![(
+ let format = Format::from_single_formats(vec![(
single_format.clone(),
video,
subtitle.map_or(vec![], |s| {
vec![(
s,
- single_format.audio != Locale::ja_JP && stream.subtitles.len() == 1,
+ single_format.audio == Locale::ja_JP || stream.subtitles.len() > 1,
)]
}),
)]);
- if contains_hardsub {
- let (_, subs) = format.locales.get_mut(0).unwrap();
- subs.push(download.subtitle.clone().unwrap())
- }
-
- stream.invalidate().await?;
Ok((download_format, format))
}
diff --git a/crunchy-cli-core/src/download/filter.rs b/crunchy-cli-core/src/download/filter.rs
new file mode 100644
index 0000000..31c0db6
--- /dev/null
+++ b/crunchy-cli-core/src/download/filter.rs
@@ -0,0 +1,265 @@
+use crate::download::Download;
+use crate::utils::filter::Filter;
+use crate::utils::format::{Format, SingleFormat, SingleFormatCollection};
+use crate::utils::interactive_select::{check_for_duplicated_seasons, get_duplicated_seasons};
+use crate::utils::parse::UrlFilter;
+use anyhow::{bail, Result};
+use crunchyroll_rs::{Concert, Episode, Movie, MovieListing, MusicVideo, Season, Series};
+use log::{error, info, warn};
+use std::collections::HashMap;
+
+pub(crate) struct DownloadFilter {
+ url_filter: UrlFilter,
+ download: Download,
+ interactive_input: bool,
+ season_episode_count: HashMap>,
+ season_subtitles_missing: Vec,
+ season_visited: bool,
+}
+
+impl DownloadFilter {
+ pub(crate) fn new(url_filter: UrlFilter, download: Download, interactive_input: bool) -> Self {
+ Self {
+ url_filter,
+ download,
+ interactive_input,
+ season_episode_count: HashMap::new(),
+ season_subtitles_missing: vec![],
+ season_visited: false,
+ }
+ }
+}
+
+#[async_trait::async_trait]
+impl Filter for DownloadFilter {
+ type T = SingleFormat;
+ type Output = SingleFormatCollection;
+
+ async fn visit_series(&mut self, series: Series) -> Result> {
+ // `series.audio_locales` isn't always populated b/c of crunchyrolls api. so check if the
+ // audio is matching only if the field is populated
+ if !series.audio_locales.is_empty() {
+ if !series.audio_locales.contains(&self.download.audio) {
+ error!(
+ "Series {} is not available with {} audio",
+ series.title, self.download.audio
+ );
+ return Ok(vec![]);
+ }
+ }
+
+ let mut seasons = vec![];
+ for mut season in series.seasons().await? {
+ if !self.url_filter.is_season_valid(season.season_number) {
+ continue;
+ }
+
+ if !season
+ .audio_locales
+ .iter()
+ .any(|l| l == &self.download.audio)
+ {
+ if season
+ .available_versions()
+ .await?
+ .iter()
+ .any(|l| l == &self.download.audio)
+ {
+ season = season
+ .version(vec![self.download.audio.clone()])
+ .await?
+ .remove(0)
+ } else {
+ error!(
+ "Season {} - '{}' is not available with {} audio",
+ season.season_number,
+ season.title,
+ self.download.audio.clone(),
+ );
+ continue;
+ }
+ }
+
+ seasons.push(season)
+ }
+
+ let duplicated_seasons = get_duplicated_seasons(&seasons);
+ if duplicated_seasons.len() > 0 {
+ if self.interactive_input {
+ check_for_duplicated_seasons(&mut seasons);
+ } else {
+ info!(
+ "Found duplicated seasons: {}",
+ duplicated_seasons
+ .iter()
+ .map(|d| d.to_string())
+ .collect::>()
+ .join(", ")
+ )
+ }
+ }
+
+ Ok(seasons)
+ }
+
+ async fn visit_season(&mut self, season: Season) -> Result> {
+ self.season_visited = true;
+
+ let mut episodes = season.episodes().await?;
+
+ if Format::has_relative_episodes_fmt(&self.download.output) {
+ for episode in episodes.iter() {
+ self.season_episode_count
+ .entry(episode.season_number)
+ .or_insert(vec![])
+ .push(episode.id.clone())
+ }
+ }
+
+ episodes.retain(|e| {
+ self.url_filter
+ .is_episode_valid(e.episode_number, season.season_number)
+ });
+
+ Ok(episodes)
+ }
+
+ async fn visit_episode(&mut self, mut episode: Episode) -> Result> {
+ if !self
+ .url_filter
+ .is_episode_valid(episode.episode_number, episode.season_number)
+ {
+ return Ok(None);
+ }
+
+ // check if the audio locale is correct.
+ // should only be incorrect if the console input was a episode url. otherwise
+ // `DownloadFilter::visit_season` returns the correct episodes with matching audio
+ if episode.audio_locale != self.download.audio {
+ // check if any other version (same episode, other language) of this episode is available
+ // with the requested audio. if not, return an error
+ if !episode
+ .available_versions()
+ .await?
+ .contains(&self.download.audio)
+ {
+ let error_message = format!(
+ "Episode {} ({}) of {} season {} is not available with {} audio",
+ episode.episode_number,
+ episode.title,
+ episode.series_title,
+ episode.season_number,
+ self.download.audio
+ );
+ // sometimes a series randomly has episode in an other language. if this is the case,
+ // only error if the input url was a episode url
+ if self.season_visited {
+ warn!("{}", error_message);
+ return Ok(None);
+ } else {
+ bail!("{}", error_message)
+ }
+ }
+ // overwrite the current episode with the other version episode
+ episode = episode
+ .version(vec![self.download.audio.clone()])
+ .await?
+ .remove(0)
+ }
+
+ // check if the subtitles are supported
+ if let Some(subtitle_locale) = &self.download.subtitle {
+ if !episode.subtitle_locales.contains(subtitle_locale) {
+ // if the episode doesn't have the requested subtitles, print a error. to print this
+ // error only once per season, it's checked if an error got printed before by looking
+ // up if the season id is present in `self.season_subtitles_missing`. if not, print
+ // the error and add the season id to `self.season_subtitles_missing`. if it is
+ // present, skip the error printing
+ if !self
+ .season_subtitles_missing
+ .contains(&episode.season_number)
+ {
+ self.season_subtitles_missing.push(episode.season_number);
+ error!(
+ "{} season {} is not available with {} subtitles",
+ episode.series_title, episode.season_number, subtitle_locale
+ );
+ }
+ return Ok(None);
+ }
+ }
+
+ // get the relative episode number. only done if the output string has the pattern to include
+ // the relative episode number as this requires some extra fetching
+ let relative_episode_number = if Format::has_relative_episodes_fmt(&self.download.output) {
+ if self
+ .season_episode_count
+ .get(&episode.season_number)
+ .is_none()
+ {
+ let season_episodes = episode.season().await?.episodes().await?;
+ self.season_episode_count.insert(
+ episode.season_number,
+ season_episodes.into_iter().map(|e| e.id).collect(),
+ );
+ }
+ let relative_episode_number = self
+ .season_episode_count
+ .get(&episode.season_number)
+ .unwrap()
+ .iter()
+ .position(|id| id == &episode.id)
+ .map(|index| index + 1);
+ if relative_episode_number.is_none() {
+ warn!(
+ "Failed to get relative episode number for episode {} ({}) of {} season {}",
+ episode.episode_number,
+ episode.title,
+ episode.series_title,
+ episode.season_number,
+ )
+ }
+ relative_episode_number
+ } else {
+ None
+ };
+
+ Ok(Some(SingleFormat::new_from_episode(
+ episode.clone(),
+ self.download.subtitle.clone().map_or(vec![], |s| {
+ if episode.subtitle_locales.contains(&s) {
+ vec![s]
+ } else {
+ vec![]
+ }
+ }),
+ relative_episode_number.map(|n| n as u32),
+ )))
+ }
+
+ async fn visit_movie_listing(&mut self, movie_listing: MovieListing) -> Result> {
+ Ok(movie_listing.movies().await?)
+ }
+
+ async fn visit_movie(&mut self, movie: Movie) -> Result> {
+ Ok(Some(SingleFormat::new_from_movie(movie, vec![])))
+ }
+
+ async fn visit_music_video(&mut self, music_video: MusicVideo) -> Result> {
+ Ok(Some(SingleFormat::new_from_music_video(music_video)))
+ }
+
+ async fn visit_concert(&mut self, concert: Concert) -> Result> {
+ Ok(Some(SingleFormat::new_from_concert(concert)))
+ }
+
+ async fn finish(self, input: Vec) -> Result {
+ let mut single_format_collection = SingleFormatCollection::new();
+
+ for data in input {
+ single_format_collection.add_single_formats(vec![data])
+ }
+
+ Ok(single_format_collection)
+ }
+}
diff --git a/crunchy-cli-core/src/download/mod.rs b/crunchy-cli-core/src/download/mod.rs
index 47ca304..696872e 100644
--- a/crunchy-cli-core/src/download/mod.rs
+++ b/crunchy-cli-core/src/download/mod.rs
@@ -1,3 +1,4 @@
mod command;
+mod filter;
pub use command::Download;
diff --git a/crunchy-cli-core/src/lib.rs b/crunchy-cli-core/src/lib.rs
index 1c180e8..9132204 100644
--- a/crunchy-cli-core/src/lib.rs
+++ b/crunchy-cli-core/src/lib.rs
@@ -5,10 +5,10 @@ use anyhow::bail;
use anyhow::Result;
use clap::{Parser, Subcommand};
use crunchyroll_rs::crunchyroll::CrunchyrollBuilder;
-use crunchyroll_rs::error::Error;
+use crunchyroll_rs::error::CrunchyrollError;
use crunchyroll_rs::{Crunchyroll, Locale};
use log::{debug, error, warn, LevelFilter};
-use reqwest::{Client, Proxy};
+use reqwest::Proxy;
use std::{env, fs};
mod archive;
@@ -17,18 +17,18 @@ mod login;
mod search;
mod utils;
-use crate::utils::rate_limit::RateLimiterService;
pub use archive::Archive;
use dialoguer::console::Term;
pub use download::Download;
pub use login::Login;
pub use search::Search;
+#[async_trait::async_trait(?Send)]
trait Execute {
fn pre_check(&mut self) -> Result<()> {
Ok(())
}
- async fn execute(self, ctx: Context) -> Result<()>;
+ async fn execute(mut self, ctx: Context) -> Result<()>;
}
#[derive(Debug, Parser)]
@@ -36,24 +36,21 @@ trait Execute {
#[clap(name = "crunchy-cli")]
pub struct Cli {
#[clap(flatten)]
- verbosity: Verbosity,
+ verbosity: Option,
#[arg(
help = "Overwrite the language in which results are returned. Default is your system language"
)]
- #[arg(global = true, long)]
+ #[arg(long)]
lang: Option,
- #[arg(
- help = "Enable experimental fixes which may resolve some unexpected errors. Generally not recommended as this flag may crash the program completely"
- )]
+ #[arg(help = "Enable experimental fixes which may resolve some unexpected errors")]
#[arg(
long_help = "Enable experimental fixes which may resolve some unexpected errors. \
- It is not recommended to use this this flag regularly, it might cause unexpected errors which may crash the program completely. \
If everything works as intended this option isn't needed, but sometimes Crunchyroll mislabels \
the audio of a series/season or episode or returns a wrong season number. This is when using this option might help to solve the issue"
)]
- #[arg(global = true, long, default_value_t = false)]
+ #[arg(long, default_value_t = false)]
experimental_fixes: bool,
#[clap(flatten)]
@@ -61,23 +58,10 @@ pub struct Cli {
#[arg(help = "Use a proxy to route all traffic through")]
#[arg(long_help = "Use a proxy to route all traffic through. \
- Make sure that the proxy can either forward TLS requests, which is needed to bypass the (cloudflare) bot protection, or that it is configured so that the proxy can bypass the protection itself. \
- Besides specifying a simple url, you also can partially control where a proxy should be used: ':' only proxies api requests, ':' only proxies download traffic, ':' proxies api requests through the first url and download traffic through the second url")]
- #[arg(global = true, long, value_parser = crate::utils::clap::clap_parse_proxies)]
- proxy: Option<(Option, Option)>,
-
- #[arg(help = "Use custom user agent")]
- #[arg(global = true, long)]
- user_agent: Option,
-
- #[arg(
- help = "Maximal speed to download/request (may be a bit off here and there). Must be in format of [B|KB|MB]"
- )]
- #[arg(
- long_help = "Maximal speed to download/request (may be a bit off here and there). Must be in format of [B|KB|MB] (e.g. 500KB or 10MB)"
- )]
- #[arg(global = true, long, value_parser = crate::utils::clap::clap_parse_speed_limit)]
- speed_limit: Option,
+ Make sure that the proxy can either forward TLS requests, which is needed to bypass the (cloudflare) bot protection, or that it is configured so that the proxy can bypass the protection itself")]
+ #[clap(long)]
+ #[arg(value_parser = crate::utils::clap::clap_parse_proxy)]
+ proxy: Option,
#[clap(subcommand)]
command: Command,
@@ -89,7 +73,7 @@ fn version() -> String {
let build_date = env!("BUILD_DATE");
if git_commit_hash.is_empty() {
- package_version.to_string()
+ format!("{}", package_version)
} else {
format!("{} ({} {})", package_version, git_commit_hash, build_date)
}
@@ -106,27 +90,27 @@ enum Command {
#[derive(Debug, Parser)]
struct Verbosity {
#[arg(help = "Verbose output")]
- #[arg(global = true, short, long)]
+ #[arg(short, long)]
verbose: bool,
#[arg(help = "Quiet output. Does not print anything unless it's a error")]
#[arg(
long_help = "Quiet output. Does not print anything unless it's a error. Can be helpful if you pipe the output to stdout"
)]
- #[arg(global = true, short, long)]
+ #[arg(short, long)]
quiet: bool,
}
-pub async fn main(args: &[String]) {
- let mut cli: Cli = Cli::parse_from(args);
+pub async fn cli_entrypoint() {
+ let mut cli: Cli = Cli::parse();
- if cli.verbosity.verbose || cli.verbosity.quiet {
- if cli.verbosity.verbose && cli.verbosity.quiet {
+ if let Some(verbosity) = &cli.verbosity {
+ if verbosity.verbose as u8 + verbosity.quiet as u8 > 1 {
eprintln!("Output cannot be verbose ('-v') and quiet ('-q') at the same time");
std::process::exit(1)
- } else if cli.verbosity.verbose {
+ } else if verbosity.verbose {
CliLogger::init(LevelFilter::Debug).unwrap()
- } else if cli.verbosity.quiet {
+ } else if verbosity.quiet {
CliLogger::init(LevelFilter::Error).unwrap()
}
} else {
@@ -138,14 +122,14 @@ pub async fn main(args: &[String]) {
match &mut cli.command {
Command::Archive(archive) => {
// prevent interactive select to be shown when output should be quiet
- if cli.verbosity.quiet {
+ if cli.verbosity.is_some() && cli.verbosity.as_ref().unwrap().quiet {
archive.yes = true;
}
pre_check_executor(archive).await
}
Command::Download(download) => {
// prevent interactive select to be shown when output should be quiet
- if cli.verbosity.quiet {
+ if cli.verbosity.is_some() && cli.verbosity.as_ref().unwrap().quiet {
download.yes = true;
}
pre_check_executor(download).await
@@ -174,7 +158,7 @@ pub async fn main(args: &[String]) {
ctrlc::set_handler(move || {
debug!("Ctrl-c detected");
- if let Ok(dir) = fs::read_dir(env::temp_dir()) {
+ if let Ok(dir) = fs::read_dir(&env::temp_dir()) {
for file in dir.flatten() {
if file
.path()
@@ -184,29 +168,16 @@ pub async fn main(args: &[String]) {
.unwrap_or_default()
.starts_with(".crunchy-cli_")
{
- if file.file_type().map_or(true, |ft| ft.is_file()) {
- let result = fs::remove_file(file.path());
- debug!(
- "Ctrl-c removed temporary file {} {}",
- file.path().to_string_lossy(),
- if result.is_ok() {
- "successfully"
- } else {
- "not successfully"
- }
- )
- } else {
- let result = fs::remove_dir_all(file.path());
- debug!(
- "Ctrl-c removed temporary directory {} {}",
- file.path().to_string_lossy(),
- if result.is_ok() {
- "successfully"
- } else {
- "not successfully"
- }
- )
- }
+ let result = fs::remove_file(file.path());
+ debug!(
+ "Ctrl-c removed temporary file {} {}",
+ file.path().to_string_lossy(),
+ if result.is_ok() {
+ "successfully"
+ } else {
+ "not successfully"
+ }
+ )
}
}
}
@@ -234,15 +205,20 @@ async fn pre_check_executor(executor: &mut impl Execute) {
}
async fn execute_executor(executor: impl Execute, ctx: Context) {
- if let Err(mut err) = executor.execute(ctx).await {
- if let Some(crunchy_error) = err.downcast_mut::() {
- if let Error::Block { message, .. } = crunchy_error {
- *message = "Triggered Cloudflare bot protection. Try again later or use a VPN or proxy to spoof your location".to_string()
- }
+ if let Err(err) = executor.execute(ctx).await {
+ error!("a unexpected error occurred: {}", err);
- error!("An error occurred: {}", crunchy_error)
- } else {
- error!("An error occurred: {}", err)
+ if let Some(crunchy_error) = err.downcast_ref::() {
+ let message = match crunchy_error {
+ CrunchyrollError::Internal(i) => &i.message,
+ CrunchyrollError::Request(r) => &r.message,
+ CrunchyrollError::Decode(d) => &d.message,
+ CrunchyrollError::Authentication(a) => &a.message,
+ CrunchyrollError::Input(i) => &i.message,
+ };
+ if message.contains("content.get_video_streams_v2.cms_service_error") {
+ error!("You've probably hit a rate limit. Try again later, generally after 10-20 minutes the rate limit is over and you can continue to use the cli")
+ }
}
std::process::exit(1)
@@ -250,37 +226,11 @@ async fn execute_executor(executor: impl Execute, ctx: Context) {
}
async fn create_ctx(cli: &mut Cli) -> Result {
- let crunchy_client = reqwest_client(
- cli.proxy.as_ref().and_then(|p| p.0.clone()),
- cli.user_agent.clone(),
- );
- let internal_client = reqwest_client(
- cli.proxy.as_ref().and_then(|p| p.1.clone()),
- cli.user_agent.clone(),
- );
-
- let crunchy = crunchyroll_session(
- cli,
- crunchy_client.clone(),
- cli.speed_limit
- .map(|l| RateLimiterService::new(l, crunchy_client)),
- )
- .await?;
-
- Ok(Context {
- crunchy,
- client: internal_client.clone(),
- rate_limiter: cli
- .speed_limit
- .map(|l| RateLimiterService::new(l, internal_client)),
- })
+ let crunchy = crunchyroll_session(cli).await?;
+ Ok(Context { crunchy })
}
-async fn crunchyroll_session(
- cli: &mut Cli,
- client: Client,
- rate_limiter: Option,
-) -> Result {
+async fn crunchyroll_session(cli: &mut Cli) -> Result {
let supported_langs = vec![
Locale::ar_ME,
Locale::de_DE,
@@ -299,7 +249,7 @@ async fn crunchyroll_session(
"Via `--lang` specified language is not supported. Supported languages: {}",
supported_langs
.iter()
- .map(|l| format!("`{}` ({})", l, l.to_human_readable()))
+ .map(|l| format!("`{}` ({})", l.to_string(), l.to_human_readable()))
.collect::>()
.join(", ")
)
@@ -314,60 +264,87 @@ async fn crunchyroll_session(
lang
};
+ let proxy = cli.proxy.clone();
let mut builder = Crunchyroll::builder()
.locale(locale)
- .client(client.clone())
+ .client({
+ let builder = if let Some(p) = &proxy {
+ CrunchyrollBuilder::predefined_client_builder().proxy(p.clone())
+ } else {
+ CrunchyrollBuilder::predefined_client_builder()
+ };
+ #[cfg(any(feature = "openssl", feature = "openssl-static"))]
+ let client = builder.use_native_tls().build().unwrap();
+ #[cfg(not(any(feature = "openssl", feature = "openssl-static")))]
+ let client = builder.build().unwrap();
+
+ client
+ })
.stabilization_locales(cli.experimental_fixes)
.stabilization_season_number(cli.experimental_fixes);
if let Command::Download(download) = &cli.command {
builder = builder.preferred_audio_locale(download.audio.clone())
}
- if let Some(rate_limiter) = rate_limiter {
- builder = builder.middleware(rate_limiter)
+ if let Some(p) = &cli.proxy {
+ builder = builder.client(
+ CrunchyrollBuilder::predefined_client_builder()
+ .proxy(p.clone())
+ .build()
+ .unwrap(),
+ )
}
- let root_login_methods_count =
- cli.login_method.credentials.is_some() as u8 + cli.login_method.anonymous as u8;
+ let root_login_methods_count = cli.login_method.credentials.is_some() as u8
+ + cli.login_method.etp_rt.is_some() as u8
+ + cli.login_method.anonymous as u8;
+ let mut login_login_methods_count = 0;
+ if let Command::Login(login) = &cli.command {
+ login_login_methods_count += login.login_method.credentials.is_some() as u8
+ + login.login_method.etp_rt.is_some() as u8
+ + login.login_method.anonymous as u8
+ }
let progress_handler = progress!("Logging in");
- if root_login_methods_count == 0 {
+ if root_login_methods_count + login_login_methods_count == 0 {
if let Some(login_file_path) = login::session_file_path() {
if login_file_path.exists() {
let session = fs::read_to_string(login_file_path)?;
if let Some((token_type, token)) = session.split_once(':') {
match token_type {
"refresh_token" => {
- return match builder.login_with_refresh_token(token).await {
- Ok(crunchy) => Ok(crunchy),
- Err(e) => {
- if let Error::Request { message, .. } = &e {
- if message.starts_with("invalid_grant") {
- bail!("The stored login is expired, please login again")
- }
- }
- Err(e.into())
- }
- }
+ return Ok(builder.login_with_refresh_token(token).await?)
}
- "etp_rt" => bail!("The stored login method (etp-rt) isn't supported anymore. Please login again using your credentials"),
+ "etp_rt" => return Ok(builder.login_with_etp_rt(token).await?),
_ => (),
}
}
bail!("Could not read stored session ('{}')", session)
}
}
- bail!("Please use a login method ('--credentials' or '--anonymous')")
- } else if root_login_methods_count > 1 {
- bail!("Please use only one login method ('--credentials' or '--anonymous')")
+ bail!("Please use a login method ('--credentials', '--etp-rt' or '--anonymous')")
+ } else if root_login_methods_count + login_login_methods_count > 1 {
+ bail!("Please use only one login method ('--credentials', '--etp-rt' or '--anonymous')")
}
- let crunchy = if let Some(credentials) = &cli.login_method.credentials {
- if let Some((email, password)) = credentials.split_once(':') {
- builder.login_with_credentials(email, password).await?
+ let login_method = if login_login_methods_count > 0 {
+ if let Command::Login(login) = &cli.command {
+ login.login_method.clone()
} else {
- bail!("Invalid credentials format. Please provide your credentials as email:password")
+ unreachable!()
}
- } else if cli.login_method.anonymous {
+ } else {
+ cli.login_method.clone()
+ };
+
+ let crunchy = if let Some(credentials) = &login_method.credentials {
+ if let Some((user, password)) = credentials.split_once(':') {
+ builder.login_with_credentials(user, password).await?
+ } else {
+ bail!("Invalid credentials format. Please provide your credentials as user:password")
+ }
+ } else if let Some(etp_rt) = &login_method.etp_rt {
+ builder.login_with_etp_rt(etp_rt).await?
+ } else if login_method.anonymous {
builder.login_anonymously().await?
} else {
bail!("should never happen")
@@ -377,29 +354,3 @@ async fn crunchyroll_session(
Ok(crunchy)
}
-
-fn reqwest_client(proxy: Option, user_agent: Option) -> Client {
- let mut builder = CrunchyrollBuilder::predefined_client_builder();
- if let Some(p) = proxy {
- builder = builder.proxy(p)
- }
- if let Some(ua) = user_agent {
- builder = builder.user_agent(ua)
- }
-
- #[cfg(any(feature = "openssl-tls", feature = "openssl-tls-static"))]
- let client = {
- let mut builder = builder.use_native_tls().tls_built_in_root_certs(false);
-
- for certificate in rustls_native_certs::load_native_certs().unwrap() {
- builder =
- builder.add_root_certificate(reqwest::Certificate::from_der(&certificate).unwrap())
- }
-
- builder.build().unwrap()
- };
- #[cfg(not(any(feature = "openssl-tls", feature = "openssl-tls-static")))]
- let client = builder.build().unwrap();
-
- client
-}
diff --git a/crunchy-cli-core/src/login/command.rs b/crunchy-cli-core/src/login/command.rs
index 4da1898..f5099d7 100644
--- a/crunchy-cli-core/src/login/command.rs
+++ b/crunchy-cli-core/src/login/command.rs
@@ -11,11 +11,14 @@ use std::path::PathBuf;
#[derive(Debug, clap::Parser)]
#[clap(about = "Save your login credentials persistent on disk")]
pub struct Login {
+ #[clap(flatten)]
+ pub login_method: LoginMethod,
#[arg(help = "Remove your stored credentials (instead of saving them)")]
#[arg(long)]
pub remove: bool,
}
+#[async_trait::async_trait(?Send)]
impl Execute for Login {
async fn execute(self, ctx: Context) -> Result<()> {
if let Some(login_file_path) = session_file_path() {
@@ -25,7 +28,9 @@ impl Execute for Login {
SessionToken::RefreshToken(refresh_token) => {
fs::write(login_file_path, format!("refresh_token:{}", refresh_token))?
}
- SessionToken::EtpRt(_) => bail!("Login with etp_rt isn't supported anymore. Please use your credentials to login"),
+ SessionToken::EtpRt(etp_rt) => {
+ fs::write(login_file_path, format!("etp_rt:{}", etp_rt))?
+ }
SessionToken::Anonymous => bail!("Anonymous login cannot be saved"),
}
@@ -41,12 +46,18 @@ impl Execute for Login {
#[derive(Clone, Debug, Parser)]
pub struct LoginMethod {
#[arg(
- help = "Login with credentials (email and password). Must be provided as email:password"
+ help = "Login with credentials (username or email and password). Must be provided as user:password"
)]
- #[arg(global = true, long)]
+ #[arg(long)]
pub credentials: Option,
+ #[arg(help = "Login with the etp-rt cookie")]
+ #[arg(
+ long_help = "Login with the etp-rt cookie. This can be obtained when you login on crunchyroll.com and extract it from there"
+ )]
+ #[arg(long)]
+ pub etp_rt: Option,
#[arg(help = "Login anonymously / without an account")]
- #[arg(global = true, long, default_value_t = false)]
+ #[arg(long, default_value_t = false)]
pub anonymous: bool,
}
diff --git a/crunchy-cli-core/src/search/command.rs b/crunchy-cli-core/src/search/command.rs
index 8032bed..0159c05 100644
--- a/crunchy-cli-core/src/search/command.rs
+++ b/crunchy-cli-core/src/search/command.rs
@@ -7,8 +7,6 @@ use anyhow::{bail, Result};
use crunchyroll_rs::common::StreamExt;
use crunchyroll_rs::search::QueryResults;
use crunchyroll_rs::{Episode, Locale, MediaCollection, MovieListing, MusicVideo, Series};
-use log::warn;
-use std::sync::Arc;
#[derive(Debug, clap::Parser)]
#[clap(about = "Search in videos")]
@@ -88,16 +86,11 @@ pub struct Search {
/// concert.premium_only → If the concert is only available with Crunchyroll premium
///
/// stream.locale → Stream locale/language
- /// stream.dash_url → Stream url in DASH format. You need to set the `Authorization` header to `Bearer ` when requesting this url
- /// stream.is_drm → If `stream.dash_url` is DRM encrypted
+ /// stream.dash_url → Stream url in DASH format
+ /// stream.hls_url → Stream url in HLS format
///
/// subtitle.locale → Subtitle locale/language
/// subtitle.url → Url to the subtitle
- ///
- /// account.token → Access token to make request to restricted endpoints. This token is only valid for a max. of 5 minutes
- /// account.id → Internal ID of the user account
- /// account.profile_name → Profile name of the account
- /// account.email → Email address of the account
#[arg(short, long, verbatim_doc_comment)]
#[arg(default_value = "S{{season.number}}E{{episode.number}} - {{episode.title}}")]
output: String,
@@ -105,16 +98,9 @@ pub struct Search {
input: String,
}
+#[async_trait::async_trait(?Send)]
impl Execute for Search {
async fn execute(self, ctx: Context) -> Result<()> {
- if !ctx.crunchy.premium().await {
- warn!("Using `search` anonymously or with a non-premium account may return incomplete results")
- }
-
- if self.output.contains("{{stream.is_drm}}") {
- warn!("The `{{{{stream.is_drm}}}}` option is deprecated as it isn't reliable anymore and will be removed soon")
- }
-
let input = if crunchyroll_rs::parse::parse_url(&self.input).is_some() {
match parse_url(&ctx.crunchy, self.input.clone(), true).await {
Ok(ok) => vec![ok],
@@ -153,14 +139,13 @@ impl Execute for Search {
output
};
- let crunchy_arc = Arc::new(ctx.crunchy);
for (media_collection, url_filter) in input {
let filter_options = FilterOptions {
audio: self.audio.clone(),
url_filter,
};
- let format = Format::new(self.output.clone(), filter_options, crunchy_arc.clone())?;
+ let format = Format::new(self.output.clone(), filter_options)?;
println!("{}", format.parse(media_collection).await?);
}
diff --git a/crunchy-cli-core/src/search/filter.rs b/crunchy-cli-core/src/search/filter.rs
index 3bb6d9f..0b31823 100644
--- a/crunchy-cli-core/src/search/filter.rs
+++ b/crunchy-cli-core/src/search/filter.rs
@@ -21,10 +21,10 @@ impl FilterOptions {
pub fn filter_episodes(&self, mut episodes: Vec) -> Vec {
episodes.retain(|e| {
- self.check_audio_language(&[e.audio_locale.clone()])
+ self.check_audio_language(&vec![e.audio_locale.clone()])
&& self
.url_filter
- .is_episode_valid(e.sequence_number, e.season_number)
+ .is_episode_valid(e.episode_number, e.season_number)
});
episodes
}
@@ -38,7 +38,7 @@ impl FilterOptions {
)
}
- fn check_audio_language(&self, audio: &[Locale]) -> bool {
+ fn check_audio_language(&self, audio: &Vec) -> bool {
if !self.audio.is_empty() {
return self.audio.iter().any(|a| audio.contains(a));
}
diff --git a/crunchy-cli-core/src/search/format.rs b/crunchy-cli-core/src/search/format.rs
index cf3c5bc..3574597 100644
--- a/crunchy-cli-core/src/search/format.rs
+++ b/crunchy-cli-core/src/search/format.rs
@@ -2,15 +2,13 @@ use crate::search::filter::FilterOptions;
use anyhow::{bail, Result};
use crunchyroll_rs::media::{Stream, Subtitle};
use crunchyroll_rs::{
- Concert, Crunchyroll, Episode, Locale, MediaCollection, Movie, MovieListing, MusicVideo,
- Season, Series,
+ Concert, Episode, Locale, MediaCollection, Movie, MovieListing, MusicVideo, Season, Series,
};
use regex::Regex;
use serde::Serialize;
use serde_json::{Map, Value};
use std::collections::HashMap;
use std::ops::Range;
-use std::sync::Arc;
#[derive(Default, Serialize)]
struct FormatSeries {
@@ -72,7 +70,7 @@ impl From<&Episode> for FormatEpisode {
title: value.title.clone(),
description: value.description.clone(),
locale: value.audio_locale.clone(),
- number: value.episode_number.unwrap_or_default(),
+ number: value.episode_number,
sequence_number: value.sequence_number,
duration: value.duration.num_milliseconds(),
air_date: value.episode_air_date.timestamp(),
@@ -165,15 +163,25 @@ impl From<&Concert> for FormatConcert {
struct FormatStream {
pub locale: Locale,
pub dash_url: String,
- pub is_drm: bool,
+ pub hls_url: String,
}
impl From<&Stream> for FormatStream {
fn from(value: &Stream) -> Self {
+ let (dash_url, hls_url) = value.variants.get(&Locale::Custom("".to_string())).map_or(
+ ("".to_string(), "".to_string()),
+ |v| {
+ (
+ v.adaptive_dash.clone().unwrap_or_default().url,
+ v.adaptive_hls.clone().unwrap_or_default().url,
+ )
+ },
+ );
+
Self {
locale: value.audio_locale.clone(),
- dash_url: value.url.clone(),
- is_drm: false,
+ dash_url,
+ hls_url,
}
}
}
@@ -193,27 +201,6 @@ impl From<&Subtitle> for FormatSubtitle {
}
}
-#[derive(Default, Serialize)]
-struct FormatAccount {
- pub token: String,
- pub id: String,
- pub profile_name: String,
- pub email: String,
-}
-
-impl FormatAccount {
- pub async fn async_from(value: &Crunchyroll) -> Result {
- let account = value.account().await?;
-
- Ok(Self {
- token: value.access_token().await,
- id: account.account_id,
- profile_name: account.profile_name,
- email: account.email,
- })
- }
-}
-
#[derive(Clone, Debug, Eq, PartialEq, Hash)]
enum Scope {
Series,
@@ -225,7 +212,6 @@ enum Scope {
Concert,
Stream,
Subtitle,
- Account,
}
macro_rules! must_match_if_true {
@@ -241,20 +227,23 @@ macro_rules! must_match_if_true {
};
}
+macro_rules! self_and_versions {
+ ($var:expr => $audio:expr) => {{
+ let mut items = vec![$var.clone()];
+ items.extend($var.clone().version($audio).await?);
+ items
+ }};
+}
+
pub struct Format {
pattern: Vec<(Range, Scope, String)>,
pattern_count: HashMap,
input: String,
filter_options: FilterOptions,
- crunchyroll: Arc,
}
impl Format {
- pub fn new(
- input: String,
- filter_options: FilterOptions,
- crunchyroll: Arc,
- ) -> Result {
+ pub fn new(input: String, filter_options: FilterOptions) -> Result {
let scope_regex = Regex::new(r"(?m)\{\{\s*(?P\w+)\.(?P\w+)\s*}}").unwrap();
let mut pattern = vec![];
let mut pattern_count = HashMap::new();
@@ -281,7 +270,6 @@ impl Format {
Scope::Concert => FormatConcert
Scope::Stream => FormatStream
Scope::Subtitle => FormatSubtitle
- Scope::Account => FormatAccount
);
for capture in scope_regex.captures_iter(&input) {
@@ -299,7 +287,6 @@ impl Format {
"concert" => Scope::Concert,
"stream" => Scope::Stream,
"subtitle" => Scope::Subtitle,
- "account" => Scope::Account,
_ => bail!("'{}.{}' is not a valid keyword", scope, field),
};
@@ -325,7 +312,6 @@ impl Format {
pattern_count,
input,
filter_options,
- crunchyroll,
})
}
@@ -340,7 +326,6 @@ impl Format {
Scope::Episode,
Scope::Stream,
Scope::Subtitle,
- Scope::Account,
])?;
self.parse_series(media_collection).await
@@ -351,28 +336,17 @@ impl Format {
Scope::Movie,
Scope::Stream,
Scope::Subtitle,
- Scope::Account,
])?;
self.parse_movie_listing(media_collection).await
}
MediaCollection::MusicVideo(_) => {
- self.check_scopes(vec![
- Scope::MusicVideo,
- Scope::Stream,
- Scope::Subtitle,
- Scope::Account,
- ])?;
+ self.check_scopes(vec![Scope::MusicVideo, Scope::Stream, Scope::Subtitle])?;
self.parse_music_video(media_collection).await
}
MediaCollection::Concert(_) => {
- self.check_scopes(vec![
- Scope::Concert,
- Scope::Stream,
- Scope::Subtitle,
- Scope::Account,
- ])?;
+ self.check_scopes(vec![Scope::Concert, Scope::Stream, Scope::Subtitle])?;
self.parse_concert(media_collection).await
}
@@ -385,9 +359,7 @@ impl Format {
let episode_empty = self.check_pattern_count_empty(Scope::Episode);
let stream_empty = self.check_pattern_count_empty(Scope::Stream)
&& self.check_pattern_count_empty(Scope::Subtitle);
- let account_empty = self.check_pattern_count_empty(Scope::Account);
- #[allow(clippy::type_complexity)]
let mut tree: Vec<(Season, Vec<(Episode, Vec)>)> = vec![];
let series = if !series_empty {
@@ -413,15 +385,7 @@ impl Format {
};
let mut seasons = vec![];
for season in tmp_seasons {
- seasons.push(season.clone());
- for version in season.versions {
- if season.id == version.id {
- continue;
- }
- if self.filter_options.audio.contains(&version.audio_locale) {
- seasons.push(version.season().await?)
- }
- }
+ seasons.extend(self_and_versions!(season => self.filter_options.audio.clone()))
}
tree.extend(
self.filter_options
@@ -435,15 +399,7 @@ impl Format {
if !episode_empty || !stream_empty {
match &media_collection {
MediaCollection::Episode(episode) => {
- let mut episodes = vec![episode.clone()];
- for version in &episode.versions {
- if episode.id == version.id {
- continue;
- }
- if self.filter_options.audio.contains(&version.audio_locale) {
- episodes.push(version.episode().await?)
- }
- }
+ let episodes = self_and_versions!(episode => self.filter_options.audio.clone());
tree.push((
Season::default(),
episodes
@@ -472,9 +428,7 @@ impl Format {
if !stream_empty {
for (_, episodes) in tree.iter_mut() {
for (episode, streams) in episodes {
- let stream = episode.stream_maybe_without_drm().await?;
- stream.clone().invalidate().await?;
- streams.push(stream)
+ streams.push(episode.stream().await?)
}
}
} else {
@@ -486,11 +440,6 @@ impl Format {
}
let mut output = vec![];
- let account_map = if !account_empty {
- self.serializable_to_json_map(FormatAccount::async_from(&self.crunchyroll).await?)
- } else {
- Map::default()
- };
let series_map = self.serializable_to_json_map(FormatSeries::from(&series));
for (season, episodes) in tree {
let season_map = self.serializable_to_json_map(FormatSeason::from(&season));
@@ -502,7 +451,6 @@ impl Format {
output.push(
self.replace_all(
HashMap::from([
- (Scope::Account, &account_map),
(Scope::Series, &series_map),
(Scope::Season, &season_map),
(Scope::Episode, &episode_map),
@@ -549,7 +497,7 @@ impl Format {
}
if !stream_empty {
for (movie, streams) in tree.iter_mut() {
- streams.push(movie.stream_maybe_without_drm().await?)
+ streams.push(movie.stream().await?)
}
} else {
for (_, streams) in tree.iter_mut() {
@@ -587,7 +535,7 @@ impl Format {
let stream_empty = self.check_pattern_count_empty(Scope::Stream);
let music_video = must_match_if_true!(!music_video_empty => media_collection|MediaCollection::MusicVideo(music_video) => music_video.clone()).unwrap_or_default();
- let stream = must_match_if_true!(!stream_empty => media_collection|MediaCollection::MusicVideo(music_video) => music_video.stream_maybe_without_drm().await?).unwrap_or_default();
+ let stream = must_match_if_true!(!stream_empty => media_collection|MediaCollection::MusicVideo(music_video) => music_video.stream().await?).unwrap_or_default();
let music_video_map = self.serializable_to_json_map(FormatMusicVideo::from(&music_video));
let stream_map = self.serializable_to_json_map(FormatStream::from(&stream));
@@ -609,7 +557,7 @@ impl Format {
let stream_empty = self.check_pattern_count_empty(Scope::Stream);
let concert = must_match_if_true!(!concert_empty => media_collection|MediaCollection::Concert(concert) => concert.clone()).unwrap_or_default();
- let stream = must_match_if_true!(!stream_empty => media_collection|MediaCollection::Concert(concert) => concert.stream_maybe_without_drm().await?).unwrap_or_default();
+ let stream = must_match_if_true!(!stream_empty => media_collection|MediaCollection::Concert(concert) => concert.stream().await?).unwrap_or_default();
let concert_map = self.serializable_to_json_map(FormatConcert::from(&concert));
let stream_map = self.serializable_to_json_map(FormatStream::from(&stream));
diff --git a/crunchy-cli-core/src/utils/clap.rs b/crunchy-cli-core/src/utils/clap.rs
index 35de71f..c3088d8 100644
--- a/crunchy-cli-core/src/utils/clap.rs
+++ b/crunchy-cli-core/src/utils/clap.rs
@@ -1,61 +1,11 @@
use crate::utils::parse::parse_resolution;
use crunchyroll_rs::media::Resolution;
-use regex::Regex;
use reqwest::Proxy;
pub fn clap_parse_resolution(s: &str) -> Result {
parse_resolution(s.to_string()).map_err(|e| e.to_string())
}
-pub fn clap_parse_proxies(s: &str) -> Result<(Option, Option), String> {
- let double_proxy_regex =
- Regex::new(r"^(?P(https?|socks5h?)://.+):(?P(https?|socks5h?)://.+)$")
- .unwrap();
-
- if let Some(capture) = double_proxy_regex.captures(s) {
- // checks if the input is formatted like 'https://example.com:socks5://examples.com' and
- // splits the string into 2 separate proxies at the middle colon
-
- let first = capture.name("first").unwrap().as_str();
- let second = capture.name("second").unwrap().as_str();
- Ok((
- Some(Proxy::all(first).map_err(|e| format!("first proxy: {e}"))?),
- Some(Proxy::all(second).map_err(|e| format!("second proxy: {e}"))?),
- ))
- } else if s.starts_with(':') {
- // checks if the input is formatted like ':https://example.com' and returns a proxy on the
- // second tuple position
- Ok((
- None,
- Some(Proxy::all(s.trim_start_matches(':')).map_err(|e| e.to_string())?),
- ))
- } else if s.ends_with(':') {
- // checks if the input is formatted like 'https://example.com:' and returns a proxy on the
- // first tuple position
- Ok((
- Some(Proxy::all(s.trim_end_matches(':')).map_err(|e| e.to_string())?),
- None,
- ))
- } else {
- // returns the same proxy for both tuple positions
- let proxy = Proxy::all(s).map_err(|e| e.to_string())?;
- Ok((Some(proxy.clone()), Some(proxy)))
- }
-}
-
-pub fn clap_parse_speed_limit(s: &str) -> Result {
- let quota = s.to_lowercase();
-
- let bytes = if let Ok(b) = quota.parse() {
- b
- } else if let Ok(b) = quota.trim_end_matches('b').parse::() {
- b
- } else if let Ok(kb) = quota.trim_end_matches("kb").parse::() {
- kb * 1024
- } else if let Ok(mb) = quota.trim_end_matches("mb").parse::() {
- mb * 1024 * 1024
- } else {
- return Err("Invalid speed limit".to_string());
- };
- Ok(bytes)
+pub fn clap_parse_proxy(s: &str) -> Result {
+ Proxy::all(s).map_err(|e| e.to_string())
}
diff --git a/crunchy-cli-core/src/utils/context.rs b/crunchy-cli-core/src/utils/context.rs
index 693174d..f8df024 100644
--- a/crunchy-cli-core/src/utils/context.rs
+++ b/crunchy-cli-core/src/utils/context.rs
@@ -1,9 +1,5 @@
-use crate::utils::rate_limit::RateLimiterService;
use crunchyroll_rs::Crunchyroll;
-use reqwest::Client;
pub struct Context {
pub crunchy: Crunchyroll,
- pub client: Client,
- pub rate_limiter: Option,
}
diff --git a/crunchy-cli-core/src/utils/download.rs b/crunchy-cli-core/src/utils/download.rs
index 2e8f321..4531c69 100644
--- a/crunchy-cli-core/src/utils/download.rs
+++ b/crunchy-cli-core/src/utils/download.rs
@@ -1,45 +1,32 @@
+use crate::utils::context::Context;
use crate::utils::ffmpeg::FFmpegPreset;
-use crate::utils::filter::real_dedup_vec;
-use crate::utils::fmt::format_time_delta;
use crate::utils::log::progress;
-use crate::utils::os::{cache_dir, is_special_file, temp_directory, temp_named_pipe, tempfile};
-use crate::utils::rate_limit::RateLimiterService;
-use crate::utils::sync::{sync_audios, SyncAudio};
+use crate::utils::os::{is_special_file, temp_directory, tempfile};
use anyhow::{bail, Result};
-use chrono::{NaiveTime, TimeDelta};
-use crunchyroll_rs::media::{SkipEvents, SkipEventsEvent, StreamData, StreamSegment, Subtitle};
+use chrono::NaiveTime;
+use crunchyroll_rs::media::{Subtitle, VariantData, VariantSegment};
use crunchyroll_rs::Locale;
-use indicatif::{ProgressBar, ProgressDrawTarget, ProgressFinish, ProgressStyle};
+use indicatif::{ProgressBar, ProgressFinish, ProgressStyle};
use log::{debug, warn, LevelFilter};
use regex::Regex;
-use reqwest::Client;
-use rsubs_lib::{SSA, VTT};
use std::borrow::Borrow;
+use std::borrow::BorrowMut;
use std::cmp::Ordering;
-use std::collections::{BTreeMap, HashMap};
+use std::collections::BTreeMap;
+use std::env;
use std::io::Write;
-use std::ops::Add;
use std::path::{Path, PathBuf};
use std::process::{Command, Stdio};
-use std::sync::Arc;
+use std::sync::{mpsc, Arc, Mutex};
use std::time::Duration;
-use std::{env, fs};
use tempfile::TempPath;
-use time::Time;
-use tokio::io::{AsyncBufReadExt, AsyncReadExt, BufReader};
-use tokio::select;
-use tokio::sync::mpsc::unbounded_channel;
-use tokio::sync::Mutex;
use tokio::task::JoinSet;
-use tokio_util::sync::CancellationToken;
-use tower_service::Service;
#[derive(Clone, Debug)]
pub enum MergeBehavior {
Video,
Audio,
Auto,
- Sync,
}
impl MergeBehavior {
@@ -48,7 +35,6 @@ impl MergeBehavior {
"video" => MergeBehavior::Video,
"audio" => MergeBehavior::Audio,
"auto" => MergeBehavior::Auto,
- "sync" => MergeBehavior::Sync,
_ => return Err(format!("'{}' is not a valid merge behavior", s)),
})
}
@@ -56,50 +42,28 @@ impl MergeBehavior {
#[derive(Clone, derive_setters::Setters)]
pub struct DownloadBuilder {
- client: Client,
- rate_limiter: Option,
ffmpeg_preset: FFmpegPreset,
default_subtitle: Option,
output_format: Option,
audio_sort: Option>,
subtitle_sort: Option>,
force_hardsub: bool,
- download_fonts: bool,
- no_closed_caption: bool,
- merge_sync_tolerance: Option,
- merge_sync_precision: Option,
- threads: usize,
- ffmpeg_threads: Option,
- audio_locale_output_map: HashMap,
- subtitle_locale_output_map: HashMap,
}
impl DownloadBuilder {
- pub fn new(client: Client, rate_limiter: Option) -> DownloadBuilder {
+ pub fn new() -> DownloadBuilder {
Self {
- client,
- rate_limiter,
ffmpeg_preset: FFmpegPreset::default(),
default_subtitle: None,
output_format: None,
audio_sort: None,
subtitle_sort: None,
force_hardsub: false,
- download_fonts: false,
- no_closed_caption: false,
- merge_sync_tolerance: None,
- merge_sync_precision: None,
- threads: num_cpus::get(),
- ffmpeg_threads: None,
- audio_locale_output_map: HashMap::new(),
- subtitle_locale_output_map: HashMap::new(),
}
}
pub fn build(self) -> Downloader {
Downloader {
- client: self.client,
- rate_limiter: self.rate_limiter,
ffmpeg_preset: self.ffmpeg_preset,
default_subtitle: self.default_subtitle,
output_format: self.output_format,
@@ -107,59 +71,25 @@ impl DownloadBuilder {
subtitle_sort: self.subtitle_sort,
force_hardsub: self.force_hardsub,
- download_fonts: self.download_fonts,
- no_closed_caption: self.no_closed_caption,
-
- merge_sync_tolerance: self.merge_sync_tolerance,
- merge_sync_precision: self.merge_sync_precision,
-
- download_threads: self.threads,
- ffmpeg_threads: self.ffmpeg_threads,
formats: vec![],
-
- audio_locale_output_map: self.audio_locale_output_map,
- subtitle_locale_output_map: self.subtitle_locale_output_map,
}
}
}
-struct FFmpegVideoMeta {
+struct FFmpegMeta {
path: TempPath,
- length: TimeDelta,
- start_time: Option,
-}
-
-struct FFmpegAudioMeta {
- path: TempPath,
- locale: Locale,
- start_time: Option,
- video_idx: usize,
-}
-
-struct FFmpegSubtitleMeta {
- path: TempPath,
- locale: Locale,
- cc: bool,
- start_time: Option,
- video_idx: usize,
+ language: Locale,
+ title: String,
}
pub struct DownloadFormat {
- pub video: (StreamData, Locale),
- pub audios: Vec<(StreamData, Locale)>,
+ pub video: (VariantData, Locale),
+ pub audios: Vec<(VariantData, Locale)>,
pub subtitles: Vec<(Subtitle, bool)>,
- pub metadata: DownloadFormatMetadata,
-}
-
-pub struct DownloadFormatMetadata {
- pub skip_events: Option,
}
pub struct Downloader {
- client: Client,
- rate_limiter: Option,
-
ffmpeg_preset: FFmpegPreset,
default_subtitle: Option,
output_format: Option,
@@ -167,19 +97,8 @@ pub struct Downloader {
subtitle_sort: Option>,
force_hardsub: bool,
- download_fonts: bool,
- no_closed_caption: bool,
-
- merge_sync_tolerance: Option,
- merge_sync_precision: Option,
-
- download_threads: usize,
- ffmpeg_threads: Option,
formats: Vec,
-
- audio_locale_output_map: HashMap,
- subtitle_locale_output_map: HashMap,
}
impl Downloader {
@@ -187,7 +106,7 @@ impl Downloader {
self.formats.push(format);
}
- pub async fn download(mut self, dst: &Path) -> Result<()> {
+ pub async fn download(mut self, ctx: &Context, dst: &Path) -> Result<()> {
// `.unwrap_or_default()` here unless https://doc.rust-lang.org/stable/std/path/fn.absolute.html
// gets stabilized as the function might throw error on weird file paths
let required = self.check_free_space(dst).await.unwrap_or_default();
@@ -234,13 +153,13 @@ impl Downloader {
if let Some(subtitle_sort) = &self.subtitle_sort {
format
.subtitles
- .sort_by(|(a_subtitle, a_cc), (b_subtitle, b_cc)| {
+ .sort_by(|(a_subtitle, a_not_cc), (b_subtitle, b_not_cc)| {
let ordering = subtitle_sort
.iter()
.position(|l| l == &a_subtitle.locale)
.cmp(&subtitle_sort.iter().position(|l| l == &b_subtitle.locale));
if matches!(ordering, Ordering::Equal) {
- a_cc.cmp(b_cc).reverse()
+ a_not_cc.cmp(b_not_cc).reverse()
} else {
ordering
}
@@ -248,378 +167,144 @@ impl Downloader {
}
}
- let mut video_offset = None;
- let mut audio_offsets = HashMap::new();
- let mut subtitle_offsets = HashMap::new();
- let mut raw_audios = vec![];
let mut videos = vec![];
let mut audios = vec![];
let mut subtitles = vec![];
- let mut fonts = vec![];
- let mut chapters = None;
- let mut max_len = TimeDelta::min_value();
- let mut max_frames = 0;
- let fmt_space = self
- .formats
- .iter()
- .flat_map(|f| {
- f.audios
- .iter()
- .map(|(_, locale)| format!("Downloading {} audio", locale).len())
- })
- .max()
- .unwrap();
- // downloads all audios
for (i, format) in self.formats.iter().enumerate() {
- for (stream_data, locale) in &format.audios {
- let path = self
+ let fmt_space = format
+ .audios
+ .iter()
+ .map(|(_, locale)| format!("Downloading {} audio", locale).len())
+ .max()
+ .unwrap();
+
+ let video_path = self
+ .download_video(
+ ctx,
+ &format.video.0,
+ format!("{:<1$}", format!("Downloading video #{}", i + 1), fmt_space),
+ )
+ .await?;
+ for (variant_data, locale) in format.audios.iter() {
+ let audio_path = self
.download_audio(
- stream_data,
+ ctx,
+ variant_data,
format!("{:<1$}", format!("Downloading {} audio", locale), fmt_space),
)
.await?;
- raw_audios.push(SyncAudio {
- format_id: i,
- path,
- locale: locale.clone(),
- sample_rate: stream_data.sampling_rate().unwrap(),
- video_idx: i,
+ audios.push(FFmpegMeta {
+ path: audio_path,
+ language: locale.clone(),
+ title: if i == 0 {
+ locale.to_human_readable()
+ } else {
+ format!("{} [Video: #{}]", locale.to_human_readable(), i + 1)
+ },
})
}
- }
+ if !format.subtitles.is_empty() {
+ let progress_spinner = if log::max_level() == LevelFilter::Info {
+ let progress_spinner = ProgressBar::new_spinner()
+ .with_style(
+ ProgressStyle::with_template(
+ format!(
+ ":: {:<1$} {{msg}} {{spinner}}",
+ "Downloading subtitles", fmt_space
+ )
+ .as_str(),
+ )
+ .unwrap()
+ .tick_strings(&["—", "\\", "|", "/", ""]),
+ )
+ .with_finish(ProgressFinish::Abandon);
+ progress_spinner.enable_steady_tick(Duration::from_millis(100));
+ Some(progress_spinner)
+ } else {
+ None
+ };
- if self.formats.len() > 1 && self.merge_sync_tolerance.is_some() {
- let _progress_handler =
- progress!("Syncing video start times (this might take some time)");
- let mut offsets = sync_audios(
- &raw_audios,
- self.merge_sync_tolerance.unwrap(),
- self.merge_sync_precision.unwrap(),
- )?;
- drop(_progress_handler);
+ let len = get_video_length(&video_path)?;
+ for (subtitle, not_cc) in format.subtitles.iter() {
+ if let Some(pb) = &progress_spinner {
+ let mut progress_message = pb.message();
+ if !progress_message.is_empty() {
+ progress_message += ", "
+ }
+ progress_message += &subtitle.locale.to_string();
+ if !not_cc {
+ progress_message += " (CC)";
+ }
+ if i != 0 {
+ progress_message += &format!(" [Video: #{}]", i + 1);
+ }
+ pb.set_message(progress_message)
+ }
- let mut offset_pre_checked = false;
- if let Some(tmp_offsets) = &offsets {
- let formats_with_offset: Vec = self
- .formats
- .iter()
- .enumerate()
- .map(|(i, f)| {
- len_from_segments(&f.video.0.segments())
- - tmp_offsets.get(&i).copied().unwrap_or_default()
+ let mut subtitle_title = subtitle.locale.to_human_readable();
+ if !not_cc {
+ subtitle_title += " (CC)"
+ }
+ if i != 0 {
+ subtitle_title += &format!(" [Video: #{}]", i + 1)
+ }
+
+ let subtitle_path = self.download_subtitle(subtitle.clone(), len).await?;
+ debug!(
+ "Downloaded {} subtitles{}{}",
+ subtitle.locale,
+ (!not_cc).then_some(" (cc)").unwrap_or_default(),
+ (i != 0)
+ .then_some(format!(" for video {}", i))
+ .unwrap_or_default()
+ );
+ subtitles.push(FFmpegMeta {
+ path: subtitle_path,
+ language: subtitle.locale.clone(),
+ title: subtitle_title,
})
- .collect();
- let min = formats_with_offset.iter().min().unwrap();
- let max = formats_with_offset.iter().max().unwrap();
-
- if max.num_seconds() - min.num_seconds() > 15 {
- warn!("Found difference of >15 seconds after sync, so the application was skipped");
- offsets = None;
- offset_pre_checked = true
- }
- }
-
- if let Some(offsets) = offsets {
- let mut root_format_idx = 0;
- let mut root_format_offset = u64::MAX;
-
- for (i, format) in self.formats.iter().enumerate() {
- let offset = offsets.get(&i).copied().unwrap_or_default();
- let format_offset = offset.num_milliseconds() as u64;
- if format_offset < root_format_offset {
- root_format_idx = i;
- root_format_offset = format_offset;
- }
-
- for _ in &format.audios {
- if let Some(offset) = &offsets.get(&i) {
- audio_offsets.insert(i, **offset);
- }
- }
- for _ in &format.subtitles {
- if let Some(offset) = &offsets.get(&i) {
- subtitle_offsets.insert(i, **offset);
- }
- }
- }
-
- let mut root_format = self.formats.remove(root_format_idx);
-
- let mut audio_prepend = vec![];
- let mut subtitle_prepend = vec![];
- let mut audio_append = vec![];
- let mut subtitle_append = vec![];
- for (i, format) in self.formats.into_iter().enumerate() {
- if i < root_format_idx {
- audio_prepend.extend(format.audios);
- subtitle_prepend.extend(format.subtitles);
- } else {
- audio_append.extend(format.audios);
- subtitle_append.extend(format.subtitles);
- }
- }
- root_format.audios.splice(0..0, audio_prepend);
- root_format.subtitles.splice(0..0, subtitle_prepend);
- root_format.audios.extend(audio_append);
- root_format.subtitles.extend(subtitle_append);
-
- self.formats = vec![root_format];
- video_offset = offsets.get(&root_format_idx).copied();
- for raw_audio in raw_audios.iter_mut() {
- raw_audio.video_idx = root_format_idx;
- }
- } else {
- for format in &mut self.formats {
- format.metadata.skip_events = None
- }
- if !offset_pre_checked {
- warn!("Couldn't find reliable sync positions")
- }
- }
- }
-
- // add audio metadata
- for raw_audio in raw_audios {
- audios.push(FFmpegAudioMeta {
- path: raw_audio.path,
- locale: raw_audio.locale,
- start_time: audio_offsets.get(&raw_audio.format_id).copied(),
- video_idx: raw_audio.video_idx,
- })
- }
-
- // downloads all videos
- for (i, format) in self.formats.iter().enumerate() {
- let path = self
- .download_video(
- &format.video.0,
- format!("{:<1$}", format!("Downloading video #{}", i + 1), fmt_space),
- None,
- )
- .await?;
-
- let (len, fps) = get_video_stats(&path)?;
- if max_len < len {
- max_len = len
- }
- let frames = ((len.num_milliseconds() as f64
- - video_offset.unwrap_or_default().num_milliseconds() as f64)
- / 1000.0
- * fps) as u64;
- if max_frames < frames {
- max_frames = frames
- }
-
- videos.push(FFmpegVideoMeta {
- path,
- length: len,
- start_time: video_offset,
- })
- }
-
- for (i, format) in self.formats.iter().enumerate() {
- if format.subtitles.is_empty() {
- continue;
- }
-
- let progress_spinner = if log::max_level() == LevelFilter::Info {
- let progress_spinner = ProgressBar::new_spinner()
- .with_style(
- ProgressStyle::with_template(
- format!(
- ":: {:<1$} {{msg}} {{spinner}}",
- "Downloading subtitles", fmt_space
- )
- .as_str(),
- )
- .unwrap()
- .tick_strings(&["—", "\\", "|", "/", ""]),
- )
- .with_finish(ProgressFinish::Abandon);
- progress_spinner.enable_steady_tick(Duration::from_millis(100));
- Some(progress_spinner)
- } else {
- None
- };
-
- for (j, (subtitle, cc)) in format.subtitles.iter().enumerate() {
- if *cc && self.no_closed_caption {
- continue;
- }
-
- if let Some(pb) = &progress_spinner {
- let mut progress_message = pb.message();
- if !progress_message.is_empty() {
- progress_message += ", "
- }
- progress_message += &subtitle.locale.to_string();
- if *cc {
- progress_message += " (CC)";
- }
- if i.min(videos.len() - 1) != 0 {
- progress_message += &format!(" [Video: #{}]", i + 1);
- }
- pb.set_message(progress_message)
- }
-
- let path = self
- .download_subtitle(subtitle.clone(), videos[i.min(videos.len() - 1)].length)
- .await?;
- debug!(
- "Downloaded {} subtitles{}",
- subtitle.locale,
- cc.then_some(" (cc)").unwrap_or_default(),
- );
- subtitles.push(FFmpegSubtitleMeta {
- path,
- locale: subtitle.locale.clone(),
- cc: *cc,
- start_time: subtitle_offsets.get(&j).cloned(),
- video_idx: i,
- })
- }
- }
-
- for format in self.formats.iter() {
- if let Some(skip_events) = &format.metadata.skip_events {
- let (file, path) = tempfile(".chapter")?.into_parts();
- chapters = Some((
- (file, path),
- [
- skip_events.recap.as_ref().map(|e| ("Recap", e)),
- skip_events.intro.as_ref().map(|e| ("Intro", e)),
- skip_events.credits.as_ref().map(|e| ("Credits", e)),
- skip_events.preview.as_ref().map(|e| ("Preview", e)),
- ]
- .into_iter()
- .flatten()
- .collect::>(),
- ));
- }
- }
-
- if self.download_fonts
- && !self.force_hardsub
- && dst.extension().unwrap_or_default().to_str().unwrap() == "mkv"
- {
- let mut font_names = vec![];
- for subtitle in subtitles.iter() {
- font_names.extend(get_subtitle_stats(&subtitle.path)?)
- }
- real_dedup_vec(&mut font_names);
-
- let progress_spinner = if log::max_level() == LevelFilter::Info {
- let progress_spinner = ProgressBar::new_spinner()
- .with_style(
- ProgressStyle::with_template(
- format!(
- ":: {:<1$} {{msg}} {{spinner}}",
- "Downloading fonts", fmt_space
- )
- .as_str(),
- )
- .unwrap()
- .tick_strings(&["—", "\\", "|", "/", ""]),
- )
- .with_finish(ProgressFinish::Abandon);
- progress_spinner.enable_steady_tick(Duration::from_millis(100));
- Some(progress_spinner)
- } else {
- None
- };
- for font_name in font_names {
- if let Some(pb) = &progress_spinner {
- let mut progress_message = pb.message();
- if !progress_message.is_empty() {
- progress_message += ", "
- }
- progress_message += &font_name;
- pb.set_message(progress_message)
- }
- if let Some((font, cached)) = self.download_font(&font_name).await? {
- if cached {
- if let Some(pb) = &progress_spinner {
- let mut progress_message = pb.message();
- progress_message += " (cached)";
- pb.set_message(progress_message)
- }
- debug!("Downloaded font {} (cached)", font_name);
- } else {
- debug!("Downloaded font {}", font_name);
- }
-
- fonts.push(font)
}
}
+ videos.push(FFmpegMeta {
+ path: video_path,
+ language: format.video.1.clone(),
+ title: if self.formats.len() == 1 {
+ "Default".to_string()
+ } else {
+ format!("#{}", i + 1)
+ },
+ });
}
let mut input = vec![];
let mut maps = vec![];
- let mut attachments = vec![];
let mut metadata = vec![];
for (i, meta) in videos.iter().enumerate() {
- if let Some(start_time) = meta.start_time {
- input.extend(["-itsoffset".to_string(), format_time_delta(&start_time)])
- }
input.extend(["-i".to_string(), meta.path.to_string_lossy().to_string()]);
maps.extend(["-map".to_string(), i.to_string()]);
metadata.extend([
format!("-metadata:s:v:{}", i),
- format!(
- "title={}",
- if videos.len() == 1 {
- "Default".to_string()
- } else {
- format!("#{}", i + 1)
- }
- ),
+ format!("title={}", meta.title),
]);
// the empty language metadata is created to avoid that metadata from the original track
// is copied
- metadata.extend([format!("-metadata:s:v:{}", i), "language=".to_string()])
+ metadata.extend([format!("-metadata:s:v:{}", i), format!("language=")])
}
for (i, meta) in audios.iter().enumerate() {
- if let Some(start_time) = meta.start_time {
- input.extend(["-itsoffset".to_string(), format_time_delta(&start_time)])
- }
input.extend(["-i".to_string(), meta.path.to_string_lossy().to_string()]);
maps.extend(["-map".to_string(), (i + videos.len()).to_string()]);
metadata.extend([
format!("-metadata:s:a:{}", i),
- format!(
- "language={}",
- self.audio_locale_output_map
- .get(&meta.locale)
- .unwrap_or(&meta.locale.to_string())
- ),
+ format!("language={}", meta.language),
]);
metadata.extend([
format!("-metadata:s:a:{}", i),
- format!(
- "title={}",
- if videos.len() == 1 {
- meta.locale.to_human_readable()
- } else {
- format!(
- "{} [Video: #{}]",
- meta.locale.to_human_readable(),
- meta.video_idx + 1
- )
- }
- ),
+ format!("title={}", meta.title),
]);
}
- for (i, font) in fonts.iter().enumerate() {
- attachments.extend(["-attach".to_string(), font.to_string_lossy().to_string()]);
- metadata.extend([
- format!("-metadata:s:t:{}", i),
- "mimetype=font/woff2".to_string(),
- ])
- }
-
// this formats are supporting embedding subtitles into the video container instead of
// burning it into the video stream directly
let container_supports_softsubs = !self.force_hardsub
@@ -628,9 +313,6 @@ impl Downloader {
if container_supports_softsubs {
for (i, meta) in subtitles.iter().enumerate() {
- if let Some(start_time) = meta.start_time {
- input.extend(["-itsoffset".to_string(), format_time_delta(&start_time)])
- }
input.extend(["-i".to_string(), meta.path.to_string_lossy().to_string()]);
maps.extend([
"-map".to_string(),
@@ -638,67 +320,29 @@ impl Downloader {
]);
metadata.extend([
format!("-metadata:s:s:{}", i),
- format!(
- "language={}",
- self.subtitle_locale_output_map
- .get(&meta.locale)
- .unwrap_or(&meta.locale.to_string())
- ),
+ format!("language={}", meta.language),
]);
metadata.extend([
format!("-metadata:s:s:{}", i),
- format!("title={}", {
- let mut title = meta.locale.to_human_readable();
- if meta.cc {
- title += " (CC)"
- }
- if videos.len() > 1 {
- title += &format!(" [Video: #{}]", meta.video_idx + 1)
- }
- title
- }),
+ format!("title={}", meta.title),
]);
}
}
- if let Some(((file, path), chapters)) = chapters.as_mut() {
- write_ffmpeg_chapters(file, max_len, chapters)?;
- input.extend(["-i".to_string(), path.to_string_lossy().to_string()]);
- maps.extend([
- "-map_metadata".to_string(),
- (videos.len()
- + audios.len()
- + container_supports_softsubs
- .then_some(subtitles.len())
- .unwrap_or_default())
- .to_string(),
- ])
- }
-
- let preset_custom = matches!(self.ffmpeg_preset, FFmpegPreset::Custom(_));
let (input_presets, mut output_presets) = self.ffmpeg_preset.into_input_output_args();
- let fifo = temp_named_pipe()?;
- let mut command_args = vec![
- "-y".to_string(),
- "-hide_banner".to_string(),
- "-vstats_file".to_string(),
- fifo.path().to_string_lossy().to_string(),
- ];
+ let mut command_args = vec!["-y".to_string(), "-hide_banner".to_string()];
command_args.extend(input_presets);
command_args.extend(input);
command_args.extend(maps);
- command_args.extend(attachments);
command_args.extend(metadata);
- if !preset_custom {
- if let Some(ffmpeg_threads) = self.ffmpeg_threads {
- command_args.extend(vec!["-threads".to_string(), ffmpeg_threads.to_string()])
- }
- }
// set default subtitle
if let Some(default_subtitle) = self.default_subtitle {
- if let Some(position) = subtitles.iter().position(|m| m.locale == default_subtitle) {
+ if let Some(position) = subtitles
+ .iter()
+ .position(|m| m.language == default_subtitle)
+ {
if container_supports_softsubs {
match dst.extension().unwrap_or_default().to_str().unwrap() {
"mov" | "mp4" => output_presets.extend([
@@ -722,33 +366,14 @@ impl Downloader {
output_presets.remove(i - remove_count);
remove_count += 1;
}
- last.clone_from(s);
+ last = s.clone();
}
output_presets.extend([
"-vf".to_string(),
format!(
- "ass='{}'",
- // ffmpeg doesn't removes all ':' and '\' from the filename when using
- // the ass filter. well, on windows these characters are used in
- // absolute paths, so they have to be correctly escaped here
- if cfg!(windows) {
- subtitles
- .get(position)
- .unwrap()
- .path
- .to_str()
- .unwrap()
- .replace('\\', "\\\\")
- .replace(':', "\\:")
- } else {
- subtitles
- .get(position)
- .unwrap()
- .path
- .to_string_lossy()
- .to_string()
- }
+ "ass={}",
+ subtitles.get(position).unwrap().path.to_str().unwrap()
),
])
}
@@ -757,51 +382,33 @@ impl Downloader {
if container_supports_softsubs {
if let Some(position) = subtitles
.iter()
- .position(|meta| meta.locale == default_subtitle)
+ .position(|meta| meta.language == default_subtitle)
{
command_args.extend([
format!("-disposition:s:s:{}", position),
- "default".to_string(),
+ "forced".to_string(),
])
}
}
}
- // set the 'forced' flag to CC subtitles
- for (i, subtitle) in subtitles.iter().enumerate() {
- if !subtitle.cc {
- continue;
- }
-
- command_args.extend([format!("-disposition:s:s:{}", i), "forced".to_string()])
- }
-
command_args.extend(output_presets);
if let Some(output_format) = self.output_format {
command_args.extend(["-f".to_string(), output_format]);
}
-
- // prepend './' to the path on linux since ffmpeg may interpret the path incorrectly if it's just the filename.
- // see https://github.com/crunchy-labs/crunchy-cli/issues/303 for example
- if !cfg!(windows)
- && dst
- .parent()
- .map_or(true, |p| p.to_string_lossy().is_empty())
- {
- command_args.push(Path::new("./").join(dst).to_string_lossy().to_string());
- } else {
- command_args.push(dst.to_string_lossy().to_string())
- }
+ command_args.push(dst.to_str().unwrap().to_string());
debug!("ffmpeg {}", command_args.join(" "));
// create parent directory if it does not exist
if let Some(parent) = dst.parent() {
if !parent.exists() {
- fs::create_dir_all(parent)?
+ std::fs::create_dir_all(parent)?
}
}
+ let progress_handler = progress!("Generating output file");
+
let ffmpeg = Command::new("ffmpeg")
// pass ffmpeg stdout to real stdout only if output file is stdout
.stdout(if dst.to_str().unwrap() == "-" {
@@ -811,43 +418,34 @@ impl Downloader {
})
.stderr(Stdio::piped())
.args(command_args)
- .spawn()?;
- let ffmpeg_progress_cancel = CancellationToken::new();
- let ffmpeg_progress_cancellation_token = ffmpeg_progress_cancel.clone();
- let ffmpeg_progress = tokio::spawn(async move {
- ffmpeg_progress(
- max_frames,
- fifo,
- format!("{:<1$}", "Generating output file", fmt_space + 1),
- ffmpeg_progress_cancellation_token,
- )
- .await
- });
-
- let result = ffmpeg.wait_with_output()?;
- if !result.status.success() {
- ffmpeg_progress.abort();
- bail!("{}", String::from_utf8_lossy(result.stderr.as_slice()))
+ .output()?;
+ if !ffmpeg.status.success() {
+ bail!("{}", String::from_utf8_lossy(ffmpeg.stderr.as_slice()))
}
- ffmpeg_progress_cancel.cancel();
- ffmpeg_progress.await?
+
+ progress_handler.stop("Output file generated");
+
+ Ok(())
}
async fn check_free_space(
&self,
dst: &Path,
) -> Result<(Option<(PathBuf, u64)>, Option<(PathBuf, u64)>)> {
- let mut all_stream_data = vec![];
+ let mut all_variant_data = vec![];
for format in &self.formats {
- all_stream_data.push(&format.video.0);
- all_stream_data.extend(format.audios.iter().map(|(a, _)| a))
+ all_variant_data.push(&format.video.0);
+ all_variant_data.extend(format.audios.iter().map(|(a, _)| a))
}
let mut estimated_required_space: u64 = 0;
- for stream_data in all_stream_data {
- let segments = stream_data.segments();
+ for variant_data in all_variant_data {
+ // nearly no overhead should be generated with this call(s) as we're using dash as
+ // stream provider and generating the dash segments does not need any fetching of
+ // additional (http) resources as hls segments would
+ let segments = variant_data.segments().await?;
// sum the length of all streams up
- estimated_required_space += estimate_stream_data_file_size(stream_data, &segments);
+ estimated_required_space += estimate_variant_file_size(variant_data, &segments);
}
let tmp_stat = fs2::statvfs(temp_directory()).unwrap();
@@ -895,25 +493,28 @@ impl Downloader {
async fn download_video(
&self,
- stream_data: &StreamData,
+ ctx: &Context,
+ variant_data: &VariantData,
message: String,
- max_segments: Option,
) -> Result {
let tempfile = tempfile(".mp4")?;
let (mut file, path) = tempfile.into_parts();
- self.download_segments(&mut file, message, stream_data, max_segments)
- .await?;
+ download_segments(ctx, &mut file, message, variant_data).await?;
Ok(path)
}
- async fn download_audio(&self, stream_data: &StreamData, message: String) -> Result {
+ async fn download_audio(
+ &self,
+ ctx: &Context,
+ variant_data: &VariantData,
+ message: String,
+ ) -> Result {
let tempfile = tempfile(".m4a")?;
let (mut file, path) = tempfile.into_parts();
- self.download_segments(&mut file, message, stream_data, None)
- .await?;
+ download_segments(ctx, &mut file, message, variant_data).await?;
Ok(path)
}
@@ -921,265 +522,214 @@ impl Downloader {
async fn download_subtitle(
&self,
subtitle: Subtitle,
- max_length: TimeDelta,
+ max_length: NaiveTime,
) -> Result {
- let buf = subtitle.data().await?;
- let mut ass = match subtitle.format.as_str() {
- "ass" => SSA::parse(String::from_utf8_lossy(&buf))?,
- "vtt" => VTT::parse(String::from_utf8_lossy(&buf))?.to_ssa(),
- _ => bail!("unknown subtitle format: {}", subtitle.format),
- };
- // subtitles aren't always correct sorted and video players may have issues with that. to
- // prevent issues, the subtitles are sorted
- // (https://github.com/crunchy-labs/crunchy-cli/issues/208)
- ass.events.sort_by(|a, b| a.start.cmp(&b.start));
- // it might be the case that the start and/or end time are greater than the actual video
- // length. this might also result in issues with video players, thus the times are stripped
- // to be at most as long as `max_length`
- // (https://github.com/crunchy-labs/crunchy-cli/issues/32)
- for i in (0..ass.events.len()).rev() {
- let max_len = Time::from_hms(0, 0, 0)
- .unwrap()
- .add(Duration::from_millis(max_length.num_milliseconds() as u64));
-
- if ass.events[i].start > max_len {
- if ass.events[i].end > max_len {
- ass.events[i].start = max_len
- }
- ass.events[i].end = max_len
- } else {
- break;
- }
- }
-
- // without this additional info, subtitle look very messy in some video player
- // (https://github.com/crunchy-labs/crunchy-cli/issues/66)
- ass.info
- .additional_fields
- .insert("ScaledBorderAndShadow".to_string(), "yes".to_string());
-
let tempfile = tempfile(".ass")?;
- let path = tempfile.into_temp_path();
+ let (mut file, path) = tempfile.into_parts();
- fs::write(&path, ass.to_string())?;
+ let mut buf = vec![];
+ subtitle.write_to(&mut buf).await?;
+ fix_subtitles(&mut buf, max_length);
+
+ file.write_all(buf.as_slice())?;
Ok(path)
}
+}
- async fn download_font(&self, name: &str) -> Result> {
- let Some((_, font_file)) = FONTS.iter().find(|(f, _)| f == &name) else {
- return Ok(None);
- };
+pub async fn download_segments(
+ ctx: &Context,
+ writer: &mut impl Write,
+ message: String,
+ variant_data: &VariantData,
+) -> Result<()> {
+ let segments = variant_data.segments().await?;
+ let total_segments = segments.len();
- let cache_dir = cache_dir("fonts")?;
- let file = cache_dir.join(font_file);
- if file.exists() {
- return Ok(Some((file, true)));
- }
+ let client = Arc::new(ctx.crunchy.client());
+ let count = Arc::new(Mutex::new(0));
- // the speed limiter does not apply to this
- let font = self
- .client
- .get(format!(
- "https://static.crunchyroll.com/vilos-v2/web/vilos/assets/libass-fonts/{}",
- font_file
- ))
- .send()
- .await?
- .bytes()
- .await?;
- fs::write(&file, font)?;
+ let progress = if log::max_level() == LevelFilter::Info {
+ let estimated_file_size = estimate_variant_file_size(variant_data, &segments);
- Ok(Some((file, false)))
+ let progress = ProgressBar::new(estimated_file_size)
+ .with_style(
+ ProgressStyle::with_template(
+ ":: {msg} {bytes:>10} {bytes_per_sec:>12} [{wide_bar}] {percent:>3}%",
+ )
+ .unwrap()
+ .progress_chars("##-"),
+ )
+ .with_message(message)
+ .with_finish(ProgressFinish::Abandon);
+ Some(progress)
+ } else {
+ None
+ };
+
+ let cpus = num_cpus::get();
+ let mut segs: Vec> = Vec::with_capacity(cpus);
+ for _ in 0..cpus {
+ segs.push(vec![])
+ }
+ for (i, segment) in segments.clone().into_iter().enumerate() {
+ segs[i - ((i / cpus) * cpus)].push(segment);
}
- async fn download_segments(
- &self,
- writer: &mut impl Write,
- message: String,
- stream_data: &StreamData,
- max_segments: Option,
- ) -> Result<()> {
- let mut segments = stream_data.segments();
- if let Some(max_segments) = max_segments {
- segments = segments
- .drain(0..max_segments.min(segments.len() - 1))
- .collect();
- }
- let total_segments = segments.len();
+ let (sender, receiver) = mpsc::channel();
- let count = Arc::new(Mutex::new(0));
+ let mut join_set: JoinSet> = JoinSet::new();
+ for num in 0..cpus {
+ let thread_client = client.clone();
+ let thread_sender = sender.clone();
+ let thread_segments = segs.remove(0);
+ let thread_count = count.clone();
+ join_set.spawn(async move {
+ let after_download_sender = thread_sender.clone();
- let progress = if log::max_level() == LevelFilter::Info {
- let estimated_file_size = estimate_stream_data_file_size(stream_data, &segments);
+ // the download process is encapsulated in its own function. this is done to easily
+ // catch errors which get returned with `...?` and `bail!(...)` and that the thread
+ // itself can report that an error has occurred
+ let download = || async move {
+ for (i, segment) in thread_segments.into_iter().enumerate() {
+ let mut retry_count = 0;
+ let mut buf = loop {
+ let request = thread_client
+ .get(&segment.url)
+ .timeout(Duration::from_secs(60))
+ .send();
- let progress = ProgressBar::new(estimated_file_size)
- .with_style(
- ProgressStyle::with_template(
- ":: {msg} {bytes:>10} {bytes_per_sec:>12} [{wide_bar}] {percent:>3}%",
- )
- .unwrap()
- .progress_chars("##-"),
- )
- .with_message(message)
- .with_finish(ProgressFinish::Abandon);
- Some(progress)
- } else {
- None
- };
-
- let cpus = self.download_threads.min(segments.len());
- let mut segs: Vec> = Vec::with_capacity(cpus);
- for _ in 0..cpus {
- segs.push(vec![])
- }
- for (i, segment) in segments.clone().into_iter().enumerate() {
- segs[i - ((i / cpus) * cpus)].push(segment);
- }
-
- let (sender, mut receiver) = unbounded_channel();
-
- let mut join_set: JoinSet> = JoinSet::new();
- for num in 0..cpus {
- let thread_sender = sender.clone();
- let thread_segments = segs.remove(0);
- let thread_client = self.client.clone();
- let mut thread_rate_limiter = self.rate_limiter.clone();
- let thread_count = count.clone();
- join_set.spawn(async move {
- let after_download_sender = thread_sender.clone();
-
- // the download process is encapsulated in its own function. this is done to easily
- // catch errors which get returned with `...?` and `bail!(...)` and that the thread
- // itself can report that an error has occurred
- let download = || async move {
- for (i, segment) in thread_segments.into_iter().enumerate() {
- let mut retry_count = 0;
- let buf = loop {
- let request = thread_client
- .get(&segment.url)
- .timeout(Duration::from_secs(60));
- let response = if let Some(rate_limiter) = &mut thread_rate_limiter {
- rate_limiter.call(request.build()?).await.map_err(anyhow::Error::new)
- } else {
- request.send().await.map_err(anyhow::Error::new)
- };
-
- let err = match response {
- Ok(r) => match r.bytes().await {
- Ok(b) => break b.to_vec(),
- Err(e) => anyhow::Error::new(e)
+ let response = match request.await {
+ Ok(r) => r,
+ Err(e) => {
+ if retry_count == 5 {
+ bail!("Max retry count reached ({}), multiple errors occurred while receiving segment {}: {}", retry_count, num + (i * cpus), e)
}
- Err(e) => e,
- };
-
- if retry_count == 5 {
- bail!("Max retry count reached ({}), multiple errors occurred while receiving segment {}: {}", retry_count, num + (i * cpus), err)
+ debug!("Failed to download segment {} ({}). Retrying, {} out of 5 retries left", num + (i * cpus), e, 5 - retry_count);
+ continue
}
- debug!("Failed to download segment {} ({}). Retrying, {} out of 5 retries left", num + (i * cpus), err, 5 - retry_count);
-
- retry_count += 1;
};
- let mut c = thread_count.lock().await;
- debug!(
- "Downloaded segment [{}/{} {:.2}%] {}",
- num + (i * cpus) + 1,
- total_segments,
- ((*c + 1) as f64 / total_segments as f64) * 100f64,
- segment.url
- );
+ match response.bytes().await {
+ Ok(b) => break b.to_vec(),
+ Err(e) => {
+ if e.is_body() {
+ if retry_count == 5 {
+ bail!("Max retry count reached ({}), multiple errors occurred while receiving segment {}: {}", retry_count, num + (i * cpus), e)
+ }
+ debug!("Failed to download segment {} ({}). Retrying, {} out of 5 retries left", num + (i * cpus), e, 5 - retry_count)
+ } else {
+ bail!("{}", e)
+ }
+ }
+ }
- thread_sender.send((num as i32 + (i * cpus) as i32, buf))?;
+ retry_count += 1;
+ };
- *c += 1;
- }
- Ok(())
- };
+ buf = VariantSegment::decrypt(buf.borrow_mut(), segment.key)?.to_vec();
+ let mut c = thread_count.lock().unwrap();
+ debug!(
+ "Downloaded and decrypted segment [{}/{} {:.2}%] {}",
+ num + (i * cpus) + 1,
+ total_segments,
+ ((*c + 1) as f64 / total_segments as f64) * 100f64,
+ segment.url
+ );
- let result = download().await;
- if result.is_err() {
- after_download_sender.send((-1, vec![]))?;
+ thread_sender.send((num as i32 + (i * cpus) as i32, buf))?;
+
+ *c += 1;
}
+ Ok(())
+ };
- result
- });
- }
- // drop the sender already here so it does not outlive all download threads which are the only
- // real consumers of it
- drop(sender);
- // this is the main loop which writes the data. it uses a BTreeMap as a buffer as the write
- // happens synchronized. the download consist of multiple segments. the map keys are representing
- // the segment number and the values the corresponding bytes
- let mut data_pos = 0;
- let mut buf: BTreeMap> = BTreeMap::new();
- while let Some((pos, bytes)) = receiver.recv().await {
- // if the position is lower than 0, an error occurred in the sending download thread
- if pos < 0 {
- break;
+ let result = download().await;
+ if result.is_err() {
+ after_download_sender.send((-1 as i32, vec![]))?;
}
- if let Some(p) = &progress {
- let progress_len = p.length().unwrap();
- let estimated_segment_len = (stream_data.bandwidth / 8)
- * segments.get(pos as usize).unwrap().length.as_secs();
- let bytes_len = bytes.len() as u64;
+ result
+ });
+ }
+ // drop the sender already here so it does not outlive all download threads which are the only
+ // real consumers of it
+ drop(sender);
- p.set_length(progress_len - estimated_segment_len + bytes_len);
- p.inc(bytes_len)
- }
-
- // check if the currently sent bytes are the next in the buffer. if so, write them directly
- // to the target without first adding them to the buffer.
- // if not, add them to the buffer
- if data_pos == pos {
- writer.write_all(bytes.borrow())?;
- data_pos += 1;
- } else {
- buf.insert(pos, bytes);
- }
- // check if the buffer contains the next segment(s)
- while let Some(b) = buf.remove(&data_pos) {
- writer.write_all(b.borrow())?;
- data_pos += 1;
- }
+ // this is the main loop which writes the data. it uses a BTreeMap as a buffer as the write
+ // happens synchronized. the download consist of multiple segments. the map keys are representing
+ // the segment number and the values the corresponding bytes
+ let mut data_pos = 0;
+ let mut buf: BTreeMap> = BTreeMap::new();
+ for (pos, bytes) in receiver.iter() {
+ // if the position is lower than 0, an error occurred in the sending download thread
+ if pos < 0 {
+ break;
}
- // if any error has occurred while downloading it gets returned here
- while let Some(joined) = join_set.join_next().await {
- joined??
+ if let Some(p) = &progress {
+ let progress_len = p.length().unwrap();
+ let estimated_segment_len =
+ (variant_data.bandwidth / 8) * segments.get(pos as usize).unwrap().length.as_secs();
+ let bytes_len = bytes.len() as u64;
+
+ p.set_length(progress_len - estimated_segment_len + bytes_len);
+ p.inc(bytes_len)
}
- // write the remaining buffer, if existent
+ // check if the currently sent bytes are the next in the buffer. if so, write them directly
+ // to the target without first adding them to the buffer.
+ // if not, add them to the buffer
+ if data_pos == pos {
+ writer.write_all(bytes.borrow())?;
+ data_pos += 1;
+ } else {
+ buf.insert(pos, bytes);
+ }
+ // check if the buffer contains the next segment(s)
while let Some(b) = buf.remove(&data_pos) {
writer.write_all(b.borrow())?;
data_pos += 1;
}
-
- if !buf.is_empty() {
- bail!(
- "Download buffer is not empty. Remaining segments: {}",
- buf.into_keys()
- .map(|k| k.to_string())
- .collect::>()
- .join(", ")
- )
- }
-
- Ok(())
}
+
+ // if any error has occurred while downloading it gets returned here
+ while let Some(joined) = join_set.join_next().await {
+ joined??
+ }
+
+ // write the remaining buffer, if existent
+ while let Some(b) = buf.remove(&data_pos) {
+ writer.write_all(b.borrow())?;
+ data_pos += 1;
+ }
+
+ if !buf.is_empty() {
+ bail!(
+ "Download buffer is not empty. Remaining segments: {}",
+ buf.into_keys()
+ .map(|k| k.to_string())
+ .collect::>()
+ .join(", ")
+ )
+ }
+
+ Ok(())
}
-fn estimate_stream_data_file_size(stream_data: &StreamData, segments: &[StreamSegment]) -> u64 {
- (stream_data.bandwidth / 8) * segments.iter().map(|s| s.length.as_secs()).sum::()
+fn estimate_variant_file_size(variant_data: &VariantData, segments: &Vec) -> u64 {
+ (variant_data.bandwidth / 8) * segments.iter().map(|s| s.length.as_secs()).sum::()
}
-/// Get the length and fps of a video.
-fn get_video_stats(path: &Path) -> Result<(TimeDelta, f64)> {
+/// Get the length of a video. This is required because sometimes subtitles have an unnecessary entry
+/// long after the actual video ends with artificially extends the video length on some video players.
+/// To prevent this, the video length must be hard set. See
+/// [crunchy-labs/crunchy-cli#32](https://github.com/crunchy-labs/crunchy-cli/issues/32) for more
+/// information.
+pub fn get_video_length(path: &Path) -> Result {
let video_length = Regex::new(r"Duration:\s(?P