not add start time when syncing (#442)

* not add start time when syncing

* use itsoffset for all syncing related time shifts

.github/workflow-resources/PKGBUILD.source

@@ -12,14 +12,26 @@ 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 CARGO_HOME="$srcdir/cargo-home"
   export RUSTUP_TOOLCHAIN=stable
+  export CARGO_HOME="$srcdir/cargo-home"
 
-  cargo build --release
+  export CRUNCHY_CLI_GIT_HASH=$CI_GIT_HASH
+  cargo build --frozen --release
 }
 
 package() {

.github/workflows/build.yml

@@ -1,9 +1,9 @@
-name: ci
+name: build
 
 on:
   push:
     branches:
-      - master
+      - '*'
   pull_request:
   workflow_dispatch:
 
@@ -19,10 +19,10 @@ jobs:
             toolchain: aarch64-unknown-linux-musl
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Cargo cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/bin/
@@ -32,41 +32,60 @@ jobs:
             target/
           key: ${{ matrix.toolchain }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: stable
+
       - name: Install cross
         run: cargo install --force cross
 
       - name: Build
-        run: cross build --release --no-default-features --features openssl-tls-static --target ${{ matrix.toolchain }}
+        run: cross build --locked --release --no-default-features --features openssl-tls-static --target ${{ matrix.toolchain }}
 
       - name: Upload binary artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: crunchy-cli-linux-${{ matrix.arch }}
           path: ./target/${{ matrix.toolchain }}/release/crunchy-cli
           if-no-files-found: error
 
       - name: Upload manpages artifact
-        uses: actions/upload-artifact@v3
+        if: ${{ matrix.arch == 'x86_64' }} # only upload the manpages once
+        uses: actions/upload-artifact@v4
         with:
           name: manpages
           path: ./target/${{ matrix.toolchain }}/release/manpages
           if-no-files-found: error
 
       - name: Upload completions artifact
-        uses: actions/upload-artifact@v3
+        if: ${{ matrix.arch == 'x86_64' }} # only upload the completions once
+        uses: actions/upload-artifact@v4
         with:
           name: completions
           path: ./target/${{ matrix.toolchain }}/release/completions
           if-no-files-found: error
 
   build-mac:
-    runs-on: macos-latest
+    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
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Cargo cache
-        uses: actions/cache@v3
+        if: ${{ matrix.os != 'macos-13' }} # when using cache, the 'Setup Rust' step fails for macos 13
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/bin/
@@ -76,24 +95,29 @@ jobs:
             target/
           key: x86_64-apple-darwin-cargo-${{ hashFiles('**/Cargo.lock') }}
 
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: stable
+
       - name: Build
-        run: cargo build --release --target x86_64-apple-darwin
+        run: cargo build --locked --release --target ${{ matrix.toolchain }}
 
       - name: Upload binary artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: crunchy-cli-darwin-x86_64
+          name: crunchy-cli-darwin-${{ matrix.arch }}
-          path: ./target/x86_64-apple-darwin/release/crunchy-cli
+          path: ./target/${{ matrix.toolchain }}/release/crunchy-cli
           if-no-files-found: error
 
   build-windows:
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Cargo cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/bin/
@@ -106,14 +130,15 @@ jobs:
       - 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 --release --target x86_64-pc-windows-gnu
+        run: cargo build --locked --release --target x86_64-pc-windows-gnu
 
       - name: Upload binary artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: crunchy-cli-windows-x86_64
           path: ./target/x86_64-pc-windows-gnu/release/crunchy-cli.exe

.github/workflows/lint.yml

@@ -0,0 +1,58 @@
+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

.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Get version
         run: echo "RELEASE_VERSION=$(echo ${{ github.ref_name }} | cut -c 2-)" >> $GITHUB_ENV
@@ -20,11 +20,15 @@ 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 }}
-        run: envsubst '$CI_PKG_VERSION,$CI_SHA_SUM' < .github/scripts/PKGBUILD.source > PKGBUILD
+          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
 
       - name: Publish crunchy-cli to AUR
         uses: KSXGitHub/github-actions-deploy-aur@v2.7.0
@@ -57,7 +61,7 @@ jobs:
           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/scripts/PKGBUILD.binary > PKGBUILD
+        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
 
       - name: Publish crunchy-cli-bin to AUR
         uses: KSXGitHub/github-actions-deploy-aur@v2.7.0

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "crunchy-cli"
 authors = ["Crunchy Labs Maintainers"]
-version = "3.1.1"
+version = "3.6.7"
 edition = "2021"
 license = "MIT"
 
@@ -13,21 +13,17 @@ 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"]
 
-# deprecated
-openssl = ["openssl-tls"]
-openssl-static = ["openssl-tls-static"]
-
 [dependencies]
-tokio = { version = "1.34", features = ["macros", "rt-multi-thread", "time"], default-features = false }
+tokio = { version = "1.38", features = ["macros", "rt-multi-thread", "time"], default-features = false }
 
-native-tls-crate = { package = "native-tls", version = "0.2.11", optional = true }
+native-tls-crate = { package = "native-tls", version = "0.2.12", optional = true }
 
 crunchy-cli-core = { path = "./crunchy-cli-core" }
 
 [build-dependencies]
 chrono = "0.4"
-clap = { version = "4.4", features = ["string"] }
+clap = { version = "4.5", features = ["string"] }
-clap_complete = "4.4"
+clap_complete = "4.5"
 clap_mangen = "0.2"
 
 crunchy-cli-core = { path = "./crunchy-cli-core" }
@@ -38,7 +34,7 @@ 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 = "fdba246" }
+native-tls = { git = "https://github.com/crunchy-labs/rust-not-so-native-tls.git", rev = "c7ac566" }
 
 [profile.release]
 strip = true

README.md

@@ -1,3 +1,5 @@
+# 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).
@@ -18,8 +20,8 @@
   <a href="https://discord.gg/PXGPGpQxgk">
     <img src="https://img.shields.io/discord/994882878125121596?label=discord&style=flat-square" alt="Discord">
   </a>
-  <a href="https://github.com/crunchy-labs/crunchy-cli/actions/workflows/ci.yml">
+  <a href="https://github.com/crunchy-labs/crunchy-cli/actions/workflows/build.yml">
-    <img src="https://img.shields.io/github/actions/workflow/status/crunchy-labs/crunchy-cli/ci.yml?branch=master&style=flat-square" alt="CI">
+    <img src="https://img.shields.io/github/actions/workflow/status/crunchy-labs/crunchy-cli/build.yml?branch=master&style=flat-square" alt="Build">
   </a>
 </p>
 
@@ -110,25 +112,15 @@ $ cargo install --force --path .
 
 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 (user:password) or by using a refresh token.
+You can authenticate with your credentials (email:password) or by using a refresh token.
 
-- Credentials
+- <span id="global-credentials">Credentials</span>
 
   ```shell
-  $ crunchy-cli --credentials "user:password" <command>
+  $ crunchy-cli --credentials "email:password" <command>
   ```
 
-- Refresh Token
+- <span id="global-anonymous">Stay Anonymous</span>
-
-  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" <command>
-  ```
-
-- Stay Anonymous
 
   Login without an account (you won't be able to access premium content):
 
@@ -140,7 +132,7 @@ You can authenticate with your credentials (user:password) or by using a refresh
 
 You can set specific settings which will be
 
-- Verbose output
+- <span id="global-verbose">Verbose output</span>
 
   If you want to include debug information in the output, use the `-v` / `--verbose` flag to show it.
 
@@ -148,9 +140,9 @@ You can set specific settings which will be
   $ crunchy-cli -v <command>
   ```
 
-  This flag can't be used with `-q` / `--quiet`.
+  This flag can't be used in combination with `-q` / `--quiet`.
 
-- Quiet output
+- <span id="global-quiet">Quiet output</span>
 
   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).
@@ -159,7 +151,9 @@ You can set specific settings which will be
   $ crunchy-cli -q <command>
   ```
 
-- Language
+  This flag can't be used in combination with `-v` / `--verbose`.
+
+- <span id="global-lang">Language</span>
 
   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.
@@ -168,7 +162,7 @@ You can set specific settings which will be
   $ crunchy-cli --lang de-DE <command>
   ```
 
-- Experimental fixes
+- <span id="global-experimental-fixes">Experimental fixes</span>
 
   Crunchyroll constantly changes and breaks its services or just delivers incorrect answers.
   The `--experimental-fixes` flag tries to fix some of those issues.
@@ -180,10 +174,12 @@ You can set specific settings which will be
 
   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
+- <span id="global-proxy">Proxy</span>
 
   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: `<url>:` (only proxies api requests), `:<url>` (only proxies download traffic), `<url>:<url>` (proxies api requests through the first url and download traffic through the second url).
 
   ```shell
   $ crunchy-cli --proxy socks5://127.0.0.1:8080 <command>
@@ -191,7 +187,7 @@ You can set specific settings which will be
 
   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
+- <span id="global-user-agent">User Agent</span>
 
   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.
@@ -202,19 +198,25 @@ You can set specific settings which will be
   
   Default is the user agent, defined in the underlying [library](https://github.com/crunchy-labs/crunchyroll-rs).
 
+- <span id="global-speed-limit">Speed limit</span>
+
+  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 username/email and password won't be stored at any time on disk
+# your email and password won't be stored at any time on disk
-$ crunchy-cli login --credentials "user:password"
+$ crunchy-cli login --credentials "email: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` / `--etp-rt` / `--anonymous` anymore when you want to execute a command.
+With the session stored, you do not need to pass `--credentials` / `--anonymous` anymore when you want to execute a command.
 
 ### Download
 
@@ -233,7 +235,7 @@ The `download` command lets you download episodes with a specific audio language
 
 **Options**
 
-- Audio language
+- <span id="download-audio">Audio language</span>
 
   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.
@@ -244,7 +246,7 @@ The `download` command lets you download episodes with a specific audio language
 
   Default is your system locale. If not supported by Crunchyroll, `en-US` (American English) is the default.
 
-- Subtitle language
+- <span id="download-subtitle">Subtitle language</span>
 
   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.
@@ -255,7 +257,7 @@ The `download` command lets you download episodes with a specific audio language
 
   Default is none.
 
-- Output template
+- <span id="download-output">Output template</span>
 
   Define an output template by using the `-o` / `--output` flag.
 
@@ -265,17 +267,25 @@ The `download` command lets you download episodes with a specific audio language
 
   Default is `{title}.mp4`. See the [Template Options section](#output-template-options) below for more options.
 
-- Output template for special episodes
+- <span id="download-output-specials">Output template for special episodes</span>
 
   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 -o "Special EP: {title}" https://www.crunchyroll.com/watch/GY8D975JY/veldoras-journal
+  $ 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.
 
-- Resolution
+- <span id="download-universal-output">Universal output</span>
+
+  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
+  ```
+
+- <span id="download-resolution">Resolution</span>
 
   The resolution for videos can be set via the `-r` / `--resolution` flag.
 
@@ -285,17 +295,34 @@ The `download` command lets you download episodes with a specific audio language
 
   Default is `best`.
 
-- FFmpeg Preset
+- <span id="download-language-tagging">Language tagging</span>
+
+  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
+  ```
+
+- <span id="download-ffmpeg-preset">FFmpeg Preset</span>
 
   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 downlaod --ffmpeg-preset av1-lossless https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
+  $ crunchy-cli download --ffmpeg-preset av1-lossless https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
   ```
 
-- Skip existing
+- <span id="download-ffmpeg-threads">FFmpeg threads</span>
+
+  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
+  ```
+
+- <span id="download-skip-existing">Skip existing</span>
 
   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.
 
@@ -303,7 +330,7 @@ The `download` command lets you download episodes with a specific audio language
   $ crunchy-cli download --skip-existing https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
   ```
 
-- Skip specials
+- <span id="download-skip-specials">Skip specials</span>
 
   If you doesn't want to download special episodes, use the `--skip-specials` flag to skip the download of them.
 
@@ -311,7 +338,16 @@ The `download` command lets you download episodes with a specific audio language
   $ crunchy-cli download --skip-specials https://www.crunchyroll.com/series/GYZJ43JMR/that-time-i-got-reincarnated-as-a-slime[S2]
   ```
 
-- Yes
+- <span id="download-include-chapters">Include chapters</span>
+
+  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
+  ```
+
+- <span id="download-yes">Yes</span>
 
   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.
@@ -322,7 +358,7 @@ The `download` command lets you download episodes with a specific audio language
 
   If you've passed the `-q` / `--quiet` [global flag](#global-settings), this flag is automatically set.
 
-- Force hardsub
+- <span id="download-force-hardsub">Force hardsub</span>
 
   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.
 
@@ -330,7 +366,7 @@ The `download` command lets you download episodes with a specific audio language
   $ crunchy-cli download --force-hardsub -s en-US https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
   ```
 
-- Threads
+- <span id="download-threads">Threads</span>
 
   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.
@@ -358,7 +394,7 @@ The `archive` command lets you download episodes with multiple audios and subtit
 
 **Options**
 
-- Audio languages
+- <span id="archive-audio">Audio languages</span>
 
   Set the audio language with the `-a` / `--audio` flag. Can be used multiple times.
 
@@ -368,7 +404,7 @@ The `archive` command lets you download episodes with multiple audios and subtit
 
   Default is your system locale (if not supported by Crunchyroll, `en-US` (American English) and `ja-JP` (Japanese) are used).
 
-- Subtitle languages
+- <span id="archive-subtitle">Subtitle languages</span>
 
   Besides the audio, you can specify the subtitle language by using the `-s` / `--subtitle` flag.
 
@@ -378,7 +414,7 @@ The `archive` command lets you download episodes with multiple audios and subtit
 
   Default is `all` subtitles.
 
-- Output template
+- <span id="archive-output">Output template</span>
 
   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.
@@ -389,18 +425,26 @@ The `archive` command lets you download episodes with multiple audios and subtit
 
   Default is `{title}.mkv`. See the [Template Options section](#output-template-options) below for more options.
 
-- Output template for special episodes
+- <span id="archive-output-specials">Output template for special episodes</span>
 
   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 -o "Special EP: {title}" https://www.crunchyroll.com/watch/GY8D975JY/veldoras-journal
+  $ 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.
 
-- Resolution
+- <span id="archive-universal-output">Universal output</span>
+
+  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
+  ```
+
+- <span id="archive-resolution">Resolution</span>
 
   The resolution for videos can be set via the `-r` / `--resolution` flag.
 
@@ -410,13 +454,13 @@ The `archive` command lets you download episodes with multiple audios and subtit
 
   Default is `best`.
 
-- Merge behavior
+- <span id="archive-merge">Merge behavior</span>
 
-  Due to censorship, some episodes have multiple lengths for different languages.
+  Due to censorship or additional intros, 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`.
+  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`.
   Subtitles will always match the primary audio and video.
 
   ```shell
@@ -425,7 +469,48 @@ The `archive` command lets you download episodes with multiple audios and subtit
 
   Default is `auto`.
 
-- FFmpeg Preset
+- <span id="archive-merge-time-tolerance">Merge time tolerance</span>
+
+  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.
+
+- <span id="archive-merge-sync-tolerance">Merge sync tolerance</span>
+
+  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`.
+
+- <span id="archive-merge-sync-precision">Merge sync precision</span>
+
+  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`.
+
+- <span id="archive-language-tagging">Language tagging</span>
+
+  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
+  ```
+
+- <span id="archive-ffmpeg-preset">FFmpeg Preset</span>
 
   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`.
@@ -435,7 +520,15 @@ The `archive` command lets you download episodes with multiple audios and subtit
   $ crunchy-cli archive --ffmpeg-preset av1-lossless https://www.crunchyroll.com/watch/GRDQPM1ZY/alone-and-lonesome
   ```
 
-- Default subtitle
+- <span id="archive-ffmpeg-threads">FFmpeg threads</span>
+
+  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
+  ```
+
+- <span id="archive-default-subtitle">Default subtitle</span>
 
   `--default-subtitle` Set which subtitle language is to be flagged as **default** and **forced**.
 
@@ -445,7 +538,25 @@ The `archive` command lets you download episodes with multiple audios and subtit
 
   Default is none.
 
-- Skip existing
+- <span id="archive-include-fonts">Include fonts</span>
+
+  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
+  ```
+
+- <span id="archive-include-chapters">Include chapters</span>
+
+  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
+  ```
+
+- <span id="archive-skip-existing">Skip existing</span>
 
   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.
 
@@ -453,7 +564,17 @@ The `archive` command lets you download episodes with multiple audios and subtit
   $ crunchy-cli archive --skip-existing https://www.crunchyroll.com/series/GY8VEQ95Y/darling-in-the-franxx
   ```
 
-- Skip specials
+- <span id="archive-skip-existing-method">Skip existing method</span>
+
+  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
+  ```
+
+- <span id="archive-skip-specials">Skip specials</span>
 
   If you doesn't want to download special episodes, use the `--skip-specials` flag to skip the download of them.
 
@@ -461,7 +582,7 @@ The `archive` command lets you download episodes with multiple audios and subtit
   $ crunchy-cli archive --skip-specials https://www.crunchyroll.com/series/GYZJ43JMR/that-time-i-got-reincarnated-as-a-slime[S2]
   ```
 
-- Yes
+- <span id="archive-yes">Yes</span>
 
   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.
@@ -472,7 +593,7 @@ The `archive` command lets you download episodes with multiple audios and subtit
 
   If you've passed the `-q` / `--quiet` [global flag](#global-settings), this flag is automatically set.
 
-- Threads
+- <span id="archive-threads">Threads</span>
 
   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.
@@ -485,6 +606,10 @@ The `archive` command lets you download episodes with multiple audios and subtit
 
 ### 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))
@@ -502,7 +627,7 @@ The `archive` command lets you download episodes with multiple audios and subtit
 
 **Options**
 
-- Audio
+- <span id="search-audio">Audio</span>
 
   Set the audio language to search via the `--audio` flag. Can be used multiple times.
 
@@ -512,7 +637,7 @@ The `archive` command lets you download episodes with multiple audios and subtit
 
   Default is your system locale.
 
-- Result limit
+- <span id="search-result-limit">Result limit</span>
 
   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.
@@ -553,12 +678,16 @@ You can use various template options to change how the filename is processed. Th
 - `{series_name}`              → Name of the series
 - `{season_name}`              → Name of the season
 - `{audio}`                    → Audio language of the video
-- `{resolution}`               → Resolution 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

build.rs

@@ -19,13 +19,6 @@ fn main() -> std::io::Result<()> {
         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)
     }
 
-    if cfg!(feature = "openssl") {
-        println!("cargo:warning=The 'openssl' feature is deprecated and will be removed in a future version. Use the 'openssl-tls' feature instead.")
-    }
-    if cfg!(feature = "openssl-static") {
-        println!("cargo:warning=The 'openssl-static' feature is deprecated and will be removed in a future version. Use the 'openssl-tls-static' feature instead.")
-    }
-
     // 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

crunchy-cli-core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "crunchy-cli-core"
 authors = ["Crunchy Labs Maintainers"]
-version = "3.1.1"
+version = "3.6.7"
 edition = "2021"
 license = "MIT"
 
@@ -13,29 +13,39 @@ openssl-tls-static = ["reqwest/native-tls", "reqwest/native-tls-alpn", "reqwest/
 
 [dependencies]
 anyhow = "1.0"
-async-trait = "0.1"
+async-speed-limit = "0.4"
-clap = { version = "4.4", features = ["derive", "string"] }
+clap = { version = "4.5", features = ["derive", "string"] }
 chrono = "0.4"
-crunchyroll-rs = { version = "0.7.0", features = ["dash-stream"] }
+crunchyroll-rs = { version = "0.11.4", features = ["experimental-stabilizations", "tower"] }
 ctrlc = "3.4"
 dialoguer = { version = "0.11", 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.11", default-features = false, features = ["socks"] }
+reqwest = { version = "0.12", features = ["socks", "stream"] }
+rsubs-lib = "~0.3.2"
+rusty-chromaprint = "0.2"
 serde = "1.0"
 serde_json = "1.0"
 serde_plain = "1.0"
-shlex = "1.2"
+shlex = "1.3"
 sys-locale = "0.3"
-tempfile = "3.8"
+tempfile = "3.10"
-tokio = { version = "1.34", features = ["macros", "rt-multi-thread", "time"] }
+time = "0.3"
-rustls-native-certs = { version = "0.6", optional = true }
+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"] }
 
 [build-dependencies]
 chrono = "0.4"

crunchy-cli-core/build.rs

@@ -1,7 +1,8 @@
 fn main() -> std::io::Result<()> {
     println!(
         "cargo:rustc-env=GIT_HASH={}",
-        get_short_commit_hash()?.unwrap_or_default()
+        std::env::var("CRUNCHY_CLI_GIT_HASH")
+            .or::<std::io::Error>(Ok(get_short_commit_hash()?.unwrap_or_default()))?
     );
     println!(
         "cargo:rustc-env=BUILD_DATE={}",

crunchy-cli-core/src/archive/command.rs

@@ -1,23 +1,28 @@
-use crate::archive::filter::ArchiveFilter;
 use crate::utils::context::Context;
-use crate::utils::download::{DownloadBuilder, DownloadFormat, MergeBehavior};
+use crate::utils::download::{
+    DownloadBuilder, DownloadFormat, DownloadFormatMetadata, MergeBehavior,
+};
 use crate::utils::ffmpeg::FFmpegPreset;
-use crate::utils::filter::Filter;
+use crate::utils::filter::{Filter, FilterMediaScope};
 use crate::utils::format::{Format, SingleFormat};
-use crate::utils::locale::all_locale_in_locales;
+use crate::utils::locale::{all_locale_in_locales, 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::variant_data_from_stream;
+use crate::utils::video::stream_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;
+use log::{debug, warn};
-use std::collections::HashMap;
+use regex::Regex;
-use std::path::PathBuf;
+use std::fmt::{Display, Formatter};
+use std::iter::zip;
+use std::ops::Sub;
+use std::path::{Path, PathBuf};
+use std::process::{Command, Stdio};
 
 #[derive(Clone, Debug, clap::Parser)]
 #[clap(about = "Archive a video")]
@@ -26,15 +31,19 @@ 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::<Vec<String>>().join(", ")))]
     #[arg(long_help = format!("Audio languages. Can be used multiple times. \
-    Available languages are:\n  {}", Locale::all().into_iter().map(|l| format!("{:<6} → {}", l.to_string(), l.to_human_readable())).collect::<Vec<String>>().join("\n  ")))]
+    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::<Vec<String>>().join("\n  ")))]
     #[arg(short, long, default_values_t = vec![Locale::ja_JP, crate::utils::locale::system_locale()])]
     pub(crate) audio: Vec<Locale>,
+    #[arg(skip)]
+    output_audio_locales: Vec<String>,
     #[arg(help = format!("Subtitle languages. Can be used multiple times. \
     Available languages are: {}", Locale::all().into_iter().map(|l| l.to_string()).collect::<Vec<String>>().join(", ")))]
     #[arg(long_help = format!("Subtitle languages. Can be used multiple times. \
-    Available languages are: {}", Locale::all().into_iter().map(|l| l.to_string()).collect::<Vec<String>>().join(", ")))]
+    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::<Vec<String>>().join(", ")))]
     #[arg(short, long, default_values_t = Locale::all())]
     pub(crate) subtitle: Vec<Locale>,
+    #[arg(skip)]
+    output_subtitle_locales: Vec<String>,
 
     #[arg(help = "Name of the output file")]
     #[arg(long_help = "Name of the output file. \
@@ -43,12 +52,16 @@ pub struct Archive {
       {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  \
+      {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")]
@@ -60,6 +73,11 @@ pub struct Archive {
     #[arg(long)]
     pub(crate) output_specials: Option<String>,
 
+    #[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. \
     Can either be specified via the pixels (e.g. 1920x1080), the abbreviation for pixels (e.g. 1080p) or 'common-use' words (e.g. best). \
@@ -71,16 +89,43 @@ pub struct Archive {
     pub(crate) resolution: Resolution,
 
     #[arg(
-        help = "Sets the behavior of the stream merging. Valid behaviors are 'auto', 'audio' and 'video'"
+        help = "Sets the behavior of the stream merging. Valid behaviors are 'auto', 'sync', '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) and 'auto' (detects if videos differ in length: if so, behave like 'video' else like 'audio')"
+    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')"
     )]
     #[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<LanguageTagging>,
 
     #[arg(help = format!("Presets for converting the video to a specific coding format. \
     Available presets: \n  {}", FFmpegPreset::available_matches_human_readable().join("\n  ")))]
@@ -90,16 +135,54 @@ pub struct Archive {
     #[arg(long)]
     #[arg(value_parser = FFmpegPreset::parse)]
     pub(crate) ffmpeg_preset: Option<FFmpegPreset>,
+    #[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<usize>,
 
     #[arg(
         help = "Set which subtitle language should be set as default / auto shown when starting a video"
     )]
     #[arg(long)]
     pub(crate) default_subtitle: Option<Locale>,
+    #[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 = "Skip files which are already existing")]
+    #[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(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<SkipExistingMethod>,
     #[arg(help = "Skip special episodes")]
     #[arg(long, default_value_t = false)]
     pub(crate) skip_specials: bool,
@@ -117,7 +200,6 @@ pub struct Archive {
     pub(crate) urls: Vec<String>,
 }
 
-#[async_trait::async_trait(?Send)]
 impl Execute for Archive {
     fn pre_check(&mut self) -> Result<()> {
         if !has_ffmpeg() {
@@ -144,13 +226,48 @@ impl Execute for Archive {
             }
         }
 
+        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() {
@@ -166,8 +283,53 @@ 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 =
+            let single_format_collection = Filter::new(
-                ArchiveFilter::new(url_filter, self.clone(), !self.yes, self.skip_specials)
+                url_filter,
+                self.audio.clone(),
+                self.subtitle.clone(),
+                |scope, locales| {
+                    let audios = locales.into_iter().map(|l| l.to_string()).collect::<Vec<String>>().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::<Vec<String>>().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?;
 
@@ -179,13 +341,31 @@ impl Execute for Archive {
 
             single_format_collection.full_visual_output();
 
-            let download_builder = DownloadBuilder::new()
+            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()))
-                .threads(self.threads);
+                    .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(),
+                    );
 
             for single_formats in single_format_collection.into_iter() {
                 let (download_formats, mut format) = get_format(&self, &single_formats).await?;
@@ -200,19 +380,75 @@ impl Execute for Archive {
                         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())
+                    format.format_path(
+                        (&self.output).into(),
+                        self.universal_output,
+                        self.language_tagging.as_ref(),
+                    )
                 };
-                let (path, changed) = free_file(formatted_path.clone());
+                let (mut 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;
                     }
+                }
 
                 format.locales.sort_by(|(a, _), (b, _)| {
                     self.audio
@@ -231,7 +467,7 @@ impl Execute for Archive {
 
                 format.visual_output(&path);
 
-                downloader.download(&ctx, &path).await?
+                downloader.download(&path).await?
             }
         }
 
@@ -239,6 +475,36 @@ 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<Self, String> {
+        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<SingleFormat>,
@@ -249,7 +515,7 @@ async fn get_format(
     for single_format in single_formats {
         let stream = single_format.stream().await?;
         let Some((video, audio, _)) =
-            variant_data_from_stream(&stream, &archive.resolution, None).await?
+            stream_data_from_stream(&stream, &archive.resolution, None).await?
         else {
             if single_format.is_episode() {
                 bail!(
@@ -273,24 +539,29 @@ async fn get_format(
         let subtitles: Vec<(Subtitle, bool)> = archive
             .subtitle
             .iter()
-            .filter_map(|s| {
+            .flat_map(|s| {
-                stream
+                let mut subtitles = vec![];
-                    .subtitles
+                if let Some(caption) = stream.captions.get(s) {
-                    .get(s)
+                    subtitles.push((caption.clone(), true))
-                    .cloned()
+                }
-                    // the subtitle is probably not cc if the audio is japanese or more than one
+                if let Some(subtitle) = stream.subtitles.get(s) {
-                    // subtitle exists for this stream
+                    // the subtitle is probably cc if the audio is not japanese or only one subtitle
-                    .map(|l| {
+                    // exists for this stream
-                        (
+                    let cc = single_format.audio != Locale::ja_JP && stream.subtitles.len() == 1;
-                            l,
+                    // only include the subtitles if no cc subtitle is already present or if it's
-                            single_format.audio == Locale::ja_JP || stream.subtitles.len() > 1,
+                    // not cc
-                        )
+                    if subtitles.is_empty() || !cc {
-                    })
+                        subtitles.push((subtitle.clone(), cc))
+                    }
+                }
+                subtitles
             })
             .collect();
 
         format_pairs.push((single_format, video.clone(), audio, subtitles.clone()));
-        single_format_to_format_pairs.push((single_format.clone(), video, subtitles))
+        single_format_to_format_pairs.push((single_format.clone(), video, subtitles));
+
+        stream.invalidate().await?
     }
 
     let mut download_formats = vec![];
@@ -302,6 +573,7 @@ async fn get_format(
                     video: (video, single_format.audio.clone()),
                     audios: vec![(audio, single_format.audio.clone())],
                     subtitles,
+                    metadata: DownloadFormatMetadata { skip_events: None },
                 })
             }
         }
@@ -320,28 +592,62 @@ 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::Auto | MergeBehavior::Sync => {
-            let mut d_formats: HashMap<Duration, DownloadFormat> = HashMap::new();
+            let mut d_formats: Vec<(Duration, DownloadFormat)> = vec![];
 
             for (single_format, video, audio, subtitles) in format_pairs {
-                if let Some(d_format) = d_formats.get_mut(&single_format.duration) {
+                let closest_format = d_formats.iter_mut().min_by(|(x, _), (y, _)| {
-                    d_format.audios.push((audio, single_format.audio.clone()));
+                    x.sub(single_format.duration)
-                    d_format.subtitles.extend(subtitles)
+                        .abs()
-                } else {
+                        .cmp(&y.sub(single_format.duration).abs())
-                    d_formats.insert(
+                });
+
+                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
                                     },
-                    );
+                                },
+                            },
+                        ));
                     }
+                };
             }
 
-            for d_format in d_formats.into_values() {
+            for (_, d_format) in d_formats.into_iter() {
-                download_formats.push(d_format)
+                download_formats.push(d_format);
             }
         }
     }
@@ -351,3 +657,36 @@ async fn get_format(
         Format::from_single_formats(single_format_to_format_pairs),
     ))
 }
+
+fn get_video_streams(path: &Path) -> Result<Option<(Vec<Locale>, Vec<Locale>)>> {
+    let video_streams =
+        Regex::new(r"(?m)Stream\s#\d+:\d+\((?P<language>.+)\):\s(?P<type>(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)))
+    }
+}

crunchy-cli-core/src/archive/filter.rs

@@ -1,438 +0,0 @@
-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::{fract, 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,
-    skip_special: bool,
-    season_episodes: HashMap<String, Vec<Episode>>,
-    season_subtitles_missing: Vec<u32>,
-    season_sorting: Vec<String>,
-    visited: Visited,
-}
-
-impl ArchiveFilter {
-    pub(crate) fn new(
-        url_filter: UrlFilter,
-        archive: Archive,
-        interactive_input: bool,
-        skip_special: bool,
-    ) -> Self {
-        Self {
-            url_filter,
-            archive,
-            interactive_input,
-            skip_special,
-            season_episodes: HashMap::new(),
-            season_subtitles_missing: vec![],
-            season_sorting: vec![],
-            visited: Visited::None,
-        }
-    }
-}
-
-#[async_trait::async_trait]
-impl Filter for ArchiveFilter {
-    type T = Vec<SingleFormat>;
-    type Output = SingleFormatCollection;
-
-    async fn visit_series(&mut self, series: Series) -> Result<Vec<Season>> {
-        // `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::<Vec<String>>()
-                        .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::<Vec<String>>()
-                        .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.is_empty() {
-            if self.interactive_input {
-                check_for_duplicated_seasons(&mut seasons);
-            } else {
-                info!(
-                    "Found duplicated seasons: {}",
-                    duplicated_seasons
-                        .iter()
-                        .map(|d| d.to_string())
-                        .collect::<Vec<String>>()
-                        .join(", ")
-                )
-            }
-        }
-
-        Ok(seasons)
-    }
-
-    async fn visit_season(&mut self, mut season: Season) -> Result<Vec<Episode>> {
-        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<Locale> = seasons
-                .iter()
-                .flat_map(|s| s.audio_locales.clone())
-                .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::<Vec<String>>()
-                        .join(", ")
-                )
-            }
-
-            let subtitle_locales: Vec<Locale> = seasons
-                .iter()
-                .flat_map(|s| s.subtitle_locales.clone())
-                .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::<Vec<String>>()
-                        .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.is_empty() {
-                    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.sequence_number,
-                        last_episode.title
-                    )
-                }
-            }
-            episodes.extend(eps)
-        }
-
-        if Format::has_relative_fmt(&self.archive.output) {
-            for episode in episodes.iter() {
-                self.season_episodes
-                    .entry(episode.season_id.clone())
-                    .or_default()
-                    .push(episode.clone())
-            }
-        }
-
-        Ok(episodes)
-    }
-
-    async fn visit_episode(&mut self, mut episode: Episode) -> Result<Option<Self::T>> {
-        if !self
-            .url_filter
-            .is_episode_valid(episode.sequence_number, episode.season_number)
-        {
-            return Ok(None);
-        }
-
-        // skip the episode if it's a special
-        if self.skip_special
-            && (episode.sequence_number == 0.0 || episode.sequence_number.fract() != 0.0)
-        {
-            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<Locale> = 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.sequence_number,
-                    missing_audio
-                        .into_iter()
-                        .map(|l| l.to_string())
-                        .collect::<Vec<String>>()
-                        .join(", ")
-                )
-            }
-
-            let mut subtitle_locales: Vec<Locale> =
-                episodes.iter().flat_map(|(_, s)| s.clone()).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.sequence_number,
-                    missing_subtitles
-                        .into_iter()
-                        .map(|l| l.to_string())
-                        .collect::<Vec<String>>()
-                        .join(", ")
-                );
-                self.season_subtitles_missing.push(episode.season_number)
-            }
-        } else {
-            episodes.push((episode.clone(), episode.subtitle_locales.clone()))
-        }
-
-        let mut relative_episode_number = None;
-        let mut relative_sequence_number = 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
-        if Format::has_relative_fmt(&self.archive.output) {
-            let season_eps = match self.season_episodes.get(&episode.season_id) {
-                Some(eps) => eps,
-                None => {
-                    self.season_episodes.insert(
-                        episode.season_id.clone(),
-                        episode.season().await?.episodes().await?,
-                    );
-                    self.season_episodes.get(&episode.season_id).unwrap()
-                }
-            };
-            let mut non_integer_sequence_number_count = 0;
-            for (i, ep) in season_eps.iter().enumerate() {
-                if ep.sequence_number.fract() != 0.0 || ep.sequence_number == 0.0 {
-                    non_integer_sequence_number_count += 1;
-                }
-                if ep.id == episode.id {
-                    relative_episode_number = Some(i + 1);
-                    relative_sequence_number = Some(
-                        (i + 1 - non_integer_sequence_number_count) as f32
-                            + fract(ep.sequence_number),
-                    );
-                    break;
-                }
-            }
-            if relative_episode_number.is_none() || relative_sequence_number.is_none() {
-                warn!(
-                    "Failed to get relative episode number for episode {} ({}) of {} season {}",
-                    episode.sequence_number,
-                    episode.title,
-                    episode.series_title,
-                    episode.season_number,
-                )
-            }
-        }
-
-        Ok(Some(
-            episodes
-                .into_iter()
-                .map(|(e, s)| {
-                    SingleFormat::new_from_episode(
-                        e,
-                        s,
-                        relative_episode_number.map(|n| n as u32),
-                        relative_sequence_number,
-                    )
-                })
-                .collect(),
-        ))
-    }
-
-    async fn visit_movie_listing(&mut self, movie_listing: MovieListing) -> Result<Vec<Movie>> {
-        Ok(movie_listing.movies().await?)
-    }
-
-    async fn visit_movie(&mut self, movie: Movie) -> Result<Option<Self::T>> {
-        Ok(Some(vec![SingleFormat::new_from_movie(movie, vec![])]))
-    }
-
-    async fn visit_music_video(&mut self, music_video: MusicVideo) -> Result<Option<Self::T>> {
-        Ok(Some(vec![SingleFormat::new_from_music_video(music_video)]))
-    }
-
-    async fn visit_concert(&mut self, concert: Concert) -> Result<Option<Self::T>> {
-        Ok(Some(vec![SingleFormat::new_from_concert(concert)]))
-    }
-
-    async fn finish(self, input: Vec<Self::T>) -> Result<Self::Output> {
-        let flatten_input: Self::T = input.into_iter().flatten().collect();
-
-        let mut single_format_collection = SingleFormatCollection::new();
-
-        let mut pre_sorted: BTreeMap<String, Self::T> = 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: &[Locale], searched: &'a [Locale]) -> Vec<&'a Locale> {
-    searched.iter().filter(|p| !available.contains(p)).collect()
-}

crunchy-cli-core/src/archive/mod.rs

@@ -1,4 +1,3 @@
 mod command;
-mod filter;
 
 pub use command::Archive;

crunchy-cli-core/src/download/command.rs

@@ -1,19 +1,20 @@
-use crate::download::filter::DownloadFilter;
 use crate::utils::context::Context;
-use crate::utils::download::{DownloadBuilder, DownloadFormat};
+use crate::utils::download::{DownloadBuilder, DownloadFormat, DownloadFormatMetadata};
 use crate::utils::ffmpeg::{FFmpegPreset, SOFTSUB_CONTAINERS};
-use crate::utils::filter::Filter;
+use crate::utils::filter::{Filter, FilterMediaScope};
 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::variant_data_from_stream;
+use crate::utils::video::stream_data_from_stream;
 use crate::Execute;
 use anyhow::bail;
 use anyhow::Result;
 use crunchyroll_rs::media::Resolution;
 use crunchyroll_rs::Locale;
-use log::{debug, warn};
+use log::{debug, error, warn};
+use std::collections::HashMap;
 use std::path::Path;
 
 #[derive(Clone, Debug, clap::Parser)]
@@ -23,14 +24,18 @@ 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::<Vec<String>>().join(", ")))]
     #[arg(long_help = format!("Audio language. Can only be used if the provided url(s) point to a series. \
-    Available languages are:\n  {}", Locale::all().into_iter().map(|l| format!("{:<6} → {}", l.to_string(), l.to_human_readable())).collect::<Vec<String>>().join("\n  ")))]
+    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::<Vec<String>>().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::<Vec<String>>().join(", ")))]
     #[arg(long_help = format!("Subtitle language. If set, the subtitle will be burned into the video and cannot be disabled. \
-    Available languages are: {}", Locale::all().into_iter().map(|l| l.to_string()).collect::<Vec<String>>().join(", ")))]
+    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::<Vec<String>>().join(", ")))]
     #[arg(short, long)]
     pub(crate) subtitle: Option<Locale>,
+    #[arg(skip)]
+    output_subtitle_locale: String,
 
     #[arg(help = "Name of the output file")]
     #[arg(long_help = "Name of the output file. \
@@ -39,12 +44,16 @@ pub struct Download {
       {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  \
+      {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")]
@@ -56,6 +65,11 @@ pub struct Download {
     #[arg(long)]
     pub(crate) output_specials: Option<String>,
 
+    #[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. \
     Can either be specified via the pixels (e.g. 1920x1080), the abbreviation for pixels (e.g. 1080p) or 'common-use' words (e.g. best). \
@@ -66,6 +80,18 @@ 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<LanguageTagging>,
+
     #[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. \
@@ -74,14 +100,32 @@ pub struct Download {
     #[arg(long)]
     #[arg(value_parser = FFmpegPreset::parse)]
     pub(crate) ffmpeg_preset: Option<FFmpegPreset>,
+    #[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<usize>,
 
-    #[arg(help = "Skip files which are already existing")]
+    #[arg(help = "Skip files which are already existing by their name")]
     #[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)]
     pub(crate) yes: bool,
@@ -99,7 +143,6 @@ pub struct Download {
     pub(crate) urls: Vec<String>,
 }
 
-#[async_trait::async_trait(?Send)]
 impl Execute for Download {
     fn pre_check(&mut self) -> Result<()> {
         if !has_ffmpeg() {
@@ -143,10 +186,35 @@ impl Execute for Download {
             }
         }
 
+        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(
@@ -181,8 +249,57 @@ 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 =
+            let single_format_collection = Filter::new(
-                DownloadFilter::new(url_filter, self.clone(), !self.yes, self.skip_specials)
+                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?;
 
@@ -194,7 +311,8 @@ impl Execute for Download {
 
             single_format_collection.full_visual_output();
 
-            let download_builder = DownloadBuilder::new()
+            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 == "-" {
@@ -203,7 +321,17 @@ impl Execute for Download {
                         None
                     })
                     .ffmpeg_preset(self.ffmpeg_preset.clone().unwrap_or_default())
-                .threads(self.threads);
+                    .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())])
+                        }),
+                    );
 
             for mut single_formats in single_format_collection.into_iter() {
                 // the vec contains always only one item
@@ -230,9 +358,15 @@ impl Execute for Download {
                         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())
+                    format.format_path(
+                        (&self.output).into(),
+                        self.universal_output,
+                        self.language_tagging.as_ref(),
+                    )
                 };
                 let (path, changed) = free_file(formatted_path.clone());
 
@@ -246,7 +380,7 @@ impl Execute for Download {
 
                 format.visual_output(&path);
 
-                downloader.download(&ctx, &path).await?
+                downloader.download(&path).await?
             }
         }
 
@@ -260,7 +394,7 @@ async fn get_format(
     try_peer_hardsubs: bool,
 ) -> Result<(DownloadFormat, Format)> {
     let stream = single_format.stream().await?;
-    let Some((video, audio, contains_hardsub)) = variant_data_from_stream(
+    let Some((video, audio, contains_hardsub)) = stream_data_from_stream(
         &stream,
         &download.resolution,
         if try_peer_hardsubs {
@@ -293,7 +427,20 @@ async fn get_format(
     let subtitle = if contains_hardsub {
         None
     } else if let Some(subtitle_locale) = &download.subtitle {
-        stream.subtitles.get(subtitle_locale).cloned()
+        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()
+        }
     } else {
         None
     };
@@ -304,9 +451,16 @@ 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![(
         single_format.clone(),
@@ -314,7 +468,7 @@ async fn get_format(
         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,
             )]
         }),
     )]);
@@ -323,5 +477,7 @@ async fn get_format(
         subs.push(download.subtitle.clone().unwrap())
     }
 
+    stream.invalidate().await?;
+
     Ok((download_format, format))
 }

crunchy-cli-core/src/download/filter.rs

@@ -1,284 +0,0 @@
-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::{fract, 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,
-    skip_special: bool,
-    season_episodes: HashMap<u32, Vec<Episode>>,
-    season_subtitles_missing: Vec<u32>,
-    season_visited: bool,
-}
-
-impl DownloadFilter {
-    pub(crate) fn new(
-        url_filter: UrlFilter,
-        download: Download,
-        interactive_input: bool,
-        skip_special: bool,
-    ) -> Self {
-        Self {
-            url_filter,
-            download,
-            interactive_input,
-            skip_special,
-            season_episodes: 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<Vec<Season>> {
-        // `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() && !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.is_empty() {
-            if self.interactive_input {
-                check_for_duplicated_seasons(&mut seasons);
-            } else {
-                info!(
-                    "Found duplicated seasons: {}",
-                    duplicated_seasons
-                        .iter()
-                        .map(|d| d.to_string())
-                        .collect::<Vec<String>>()
-                        .join(", ")
-                )
-            }
-        }
-
-        Ok(seasons)
-    }
-
-    async fn visit_season(&mut self, season: Season) -> Result<Vec<Episode>> {
-        self.season_visited = true;
-
-        let mut episodes = season.episodes().await?;
-
-        if Format::has_relative_fmt(&self.download.output) {
-            for episode in episodes.iter() {
-                self.season_episodes
-                    .entry(episode.season_number)
-                    .or_default()
-                    .push(episode.clone())
-            }
-        }
-
-        episodes.retain(|e| {
-            self.url_filter
-                .is_episode_valid(e.sequence_number, season.season_number)
-        });
-
-        Ok(episodes)
-    }
-
-    async fn visit_episode(&mut self, mut episode: Episode) -> Result<Option<Self::T>> {
-        if !self
-            .url_filter
-            .is_episode_valid(episode.sequence_number, episode.season_number)
-        {
-            return Ok(None);
-        }
-
-        // skip the episode if it's a special
-        if self.skip_special
-            && (episode.sequence_number == 0.0 || episode.sequence_number.fract() != 0.0)
-        {
-            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.sequence_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);
-            }
-        }
-
-        let mut relative_episode_number = None;
-        let mut relative_sequence_number = 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
-        if Format::has_relative_fmt(&self.download.output) {
-            let season_eps = match self.season_episodes.get(&episode.season_number) {
-                Some(eps) => eps,
-                None => {
-                    self.season_episodes.insert(
-                        episode.season_number,
-                        episode.season().await?.episodes().await?,
-                    );
-                    self.season_episodes.get(&episode.season_number).unwrap()
-                }
-            };
-            let mut non_integer_sequence_number_count = 0;
-            for (i, ep) in season_eps.iter().enumerate() {
-                if ep.sequence_number.fract() != 0.0 || ep.sequence_number == 0.0 {
-                    non_integer_sequence_number_count += 1;
-                }
-                if ep.id == episode.id {
-                    relative_episode_number = Some(i + 1);
-                    relative_sequence_number = Some(
-                        (i + 1 - non_integer_sequence_number_count) as f32
-                            + fract(ep.sequence_number),
-                    );
-                    break;
-                }
-            }
-            if relative_episode_number.is_none() || relative_sequence_number.is_none() {
-                warn!(
-                    "Failed to get relative episode number for episode {} ({}) of {} season {}",
-                    episode.sequence_number,
-                    episode.title,
-                    episode.series_title,
-                    episode.season_number,
-                )
-            }
-        }
-
-        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),
-            relative_sequence_number,
-        )))
-    }
-
-    async fn visit_movie_listing(&mut self, movie_listing: MovieListing) -> Result<Vec<Movie>> {
-        Ok(movie_listing.movies().await?)
-    }
-
-    async fn visit_movie(&mut self, movie: Movie) -> Result<Option<Self::T>> {
-        Ok(Some(SingleFormat::new_from_movie(movie, vec![])))
-    }
-
-    async fn visit_music_video(&mut self, music_video: MusicVideo) -> Result<Option<Self::T>> {
-        Ok(Some(SingleFormat::new_from_music_video(music_video)))
-    }
-
-    async fn visit_concert(&mut self, concert: Concert) -> Result<Option<Self::T>> {
-        Ok(Some(SingleFormat::new_from_concert(concert)))
-    }
-
-    async fn finish(self, input: Vec<Self::T>) -> Result<Self::Output> {
-        let mut single_format_collection = SingleFormatCollection::new();
-
-        for data in input {
-            single_format_collection.add_single_formats(vec![data])
-        }
-
-        Ok(single_format_collection)
-    }
-}

crunchy-cli-core/src/download/mod.rs

@@ -1,4 +1,3 @@
 mod command;
-mod filter;
 
 pub use command::Download;

crunchy-cli-core/src/lib.rs

@@ -8,7 +8,7 @@ use crunchyroll_rs::crunchyroll::CrunchyrollBuilder;
 use crunchyroll_rs::error::Error;
 use crunchyroll_rs::{Crunchyroll, Locale};
 use log::{debug, error, warn, LevelFilter};
-use reqwest::Proxy;
+use reqwest::{Client, 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(mut self, ctx: Context) -> Result<()>;
+    async fn execute(self, ctx: Context) -> Result<()>;
 }
 
 #[derive(Debug, Parser)]
@@ -36,21 +36,24 @@ trait Execute {
 #[clap(name = "crunchy-cli")]
 pub struct Cli {
     #[clap(flatten)]
-    verbosity: Option<Verbosity>,
+    verbosity: Verbosity,
 
     #[arg(
         help = "Overwrite the language in which results are returned. Default is your system language"
     )]
-    #[arg(long)]
+    #[arg(global = true, long)]
     lang: Option<Locale>,
 
-    #[arg(help = "Enable experimental fixes which may resolve some unexpected errors")]
+    #[arg(
+        help = "Enable experimental fixes which may resolve some unexpected errors. Generally not recommended as this flag may crash the program completely"
+    )]
     #[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(long, default_value_t = false)]
+    #[arg(global = true, long, default_value_t = false)]
     experimental_fixes: bool,
 
     #[clap(flatten)]
@@ -58,15 +61,24 @@ 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")]
+            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)]
+            Besides specifying a simple url, you also can partially control where a proxy should be used: '<url>:' only proxies api requests, ':<url>' only proxies download traffic, '<url>:<url>' proxies api requests through the first url and download traffic through the second url")]
-    #[arg(value_parser = crate::utils::clap::clap_parse_proxy)]
+    #[arg(global = true, long, value_parser = crate::utils::clap::clap_parse_proxies)]
-    proxy: Option<Proxy>,
+    proxy: Option<(Option<Proxy>, Option<Proxy>)>,
 
     #[arg(help = "Use custom user agent")]
-    #[clap(long)]
+    #[arg(global = true, long)]
     user_agent: Option<String>,
 
+    #[arg(
+        help = "Maximal speed to download/request (may be a bit off here and there). Must be in format of <number>[B|KB|MB]"
+    )]
+    #[arg(
+        long_help = "Maximal speed to download/request (may be a bit off here and there). Must be in format of <number>[B|KB|MB] (e.g. 500KB or 10MB)"
+    )]
+    #[arg(global = true, long, value_parser = crate::utils::clap::clap_parse_speed_limit)]
+    speed_limit: Option<u32>,
+
     #[clap(subcommand)]
     command: Command,
 }
@@ -94,27 +106,27 @@ enum Command {
 #[derive(Debug, Parser)]
 struct Verbosity {
     #[arg(help = "Verbose output")]
-    #[arg(short, long)]
+    #[arg(global = true, 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(short, long)]
+    #[arg(global = true, short, long)]
     quiet: bool,
 }
 
-pub async fn cli_entrypoint() {
+pub async fn main(args: &[String]) {
-    let mut cli: Cli = Cli::parse();
+    let mut cli: Cli = Cli::parse_from(args);
 
-    if let Some(verbosity) = &cli.verbosity {
+    if cli.verbosity.verbose || cli.verbosity.quiet {
-        if verbosity.verbose as u8 + verbosity.quiet as u8 > 1 {
+        if cli.verbosity.verbose && cli.verbosity.quiet {
             eprintln!("Output cannot be verbose ('-v') and quiet ('-q') at the same time");
             std::process::exit(1)
-        } else if verbosity.verbose {
+        } else if cli.verbosity.verbose {
             CliLogger::init(LevelFilter::Debug).unwrap()
-        } else if verbosity.quiet {
+        } else if cli.verbosity.quiet {
             CliLogger::init(LevelFilter::Error).unwrap()
         }
     } else {
@@ -126,14 +138,14 @@ pub async fn cli_entrypoint() {
     match &mut cli.command {
         Command::Archive(archive) => {
             // prevent interactive select to be shown when output should be quiet
-            if cli.verbosity.is_some() && cli.verbosity.as_ref().unwrap().quiet {
+            if cli.verbosity.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.is_some() && cli.verbosity.as_ref().unwrap().quiet {
+            if cli.verbosity.quiet {
                 download.yes = true;
             }
             pre_check_executor(download).await
@@ -162,7 +174,7 @@ pub async fn cli_entrypoint() {
 
     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()
@@ -172,6 +184,7 @@ pub async fn cli_entrypoint() {
                     .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 {} {}",
@@ -182,6 +195,18 @@ pub async fn cli_entrypoint() {
                                 "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"
+                            }
+                        )
+                    }
                 }
             }
         }
@@ -213,8 +238,6 @@ async fn execute_executor(executor: impl Execute, ctx: Context) {
         if let Some(crunchy_error) = err.downcast_mut::<Error>() {
             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()
-            } else if let Error::Request { message, .. } = crunchy_error {
-                *message = "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".to_string()
             }
 
             error!("An error occurred: {}", crunchy_error)
@@ -227,11 +250,37 @@ async fn execute_executor(executor: impl Execute, ctx: Context) {
 }
 
 async fn create_ctx(cli: &mut Cli) -> Result<Context> {
-    let crunchy = crunchyroll_session(cli).await?;
+    let crunchy_client = reqwest_client(
-    Ok(Context { crunchy })
+        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)),
+    })
 }
 
-async fn crunchyroll_session(cli: &mut Cli) -> Result<Crunchyroll> {
+async fn crunchyroll_session(
+    cli: &mut Cli,
+    client: Client,
+    rate_limiter: Option<RateLimiterService>,
+) -> Result<Crunchyroll> {
     let supported_langs = vec![
         Locale::ar_ME,
         Locale::de_DE,
@@ -267,89 +316,58 @@ async fn crunchyroll_session(cli: &mut Cli) -> Result<Crunchyroll> {
 
     let mut builder = Crunchyroll::builder()
         .locale(locale)
-        .client({
+        .client(client.clone())
-            let mut builder = CrunchyrollBuilder::predefined_client_builder();
-            if let Some(p) = &cli.proxy {
-                builder = builder.proxy(p.clone())
-            }
-            if let Some(ua) = &cli.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.0.as_slice()).unwrap(),
-                    )
-                }
-
-                builder.build().unwrap()
-            };
-            #[cfg(not(any(feature = "openssl-tls", feature = "openssl-tls-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 {
-    let root_login_methods_count = cli.login_method.credentials.is_some() as u8
+        builder = builder.middleware(rate_limiter)
-        + 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 root_login_methods_count =
+        cli.login_method.credentials.is_some() as u8 + cli.login_method.anonymous as u8;
+
     let progress_handler = progress!("Logging in");
-    if root_login_methods_count + login_login_methods_count == 0 {
+    if root_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 Ok(builder.login_with_refresh_token(token).await?)
+                            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")
                                         }
-                        "etp_rt" => return Ok(builder.login_with_etp_rt(token).await?),
+                                    }
+                                    Err(e.into())
+                                }
+                            }
+                        }
+                        "etp_rt" => bail!("The stored login method (etp-rt) isn't supported anymore. Please login again using your credentials"),
                         _ => (),
                     }
                 }
                 bail!("Could not read stored session ('{}')", session)
             }
         }
-        bail!("Please use a login method ('--credentials', '--etp-rt' or '--anonymous')")
+        bail!("Please use a login method ('--credentials' or '--anonymous')")
-    } else if root_login_methods_count + login_login_methods_count > 1 {
+    } else if root_login_methods_count > 1 {
-        bail!("Please use only one login method ('--credentials', '--etp-rt' or '--anonymous')")
+        bail!("Please use only one login method ('--credentials' or '--anonymous')")
     }
 
-    let login_method = if login_login_methods_count > 0 {
+    let crunchy = if let Some(credentials) = &cli.login_method.credentials {
-        if let Command::Login(login) = &cli.command {
+        if let Some((email, password)) = credentials.split_once(':') {
-            login.login_method.clone()
+            builder.login_with_credentials(email, password).await?
         } else {
-            unreachable!()
+            bail!("Invalid credentials format. Please provide your credentials as email:password")
         }
-    } else {
+    } else if cli.login_method.anonymous {
-        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")
@@ -359,3 +377,29 @@ async fn crunchyroll_session(cli: &mut Cli) -> Result<Crunchyroll> {
 
     Ok(crunchy)
 }
+
+fn reqwest_client(proxy: Option<Proxy>, user_agent: Option<String>) -> 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
+}

crunchy-cli-core/src/login/command.rs

@@ -11,14 +11,11 @@ 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() {
@@ -28,9 +25,7 @@ impl Execute for Login {
                 SessionToken::RefreshToken(refresh_token) => {
                     fs::write(login_file_path, format!("refresh_token:{}", refresh_token))?
                 }
-                SessionToken::EtpRt(etp_rt) => {
+                SessionToken::EtpRt(_) => bail!("Login with etp_rt isn't supported anymore. Please use your credentials to login"),
-                    fs::write(login_file_path, format!("etp_rt:{}", etp_rt))?
-                }
                 SessionToken::Anonymous => bail!("Anonymous login cannot be saved"),
             }
 
@@ -46,18 +41,12 @@ impl Execute for Login {
 #[derive(Clone, Debug, Parser)]
 pub struct LoginMethod {
     #[arg(
-        help = "Login with credentials (username or email and password). Must be provided as user:password"
+        help = "Login with credentials (email and password). Must be provided as email:password"
     )]
-    #[arg(long)]
+    #[arg(global = true, long)]
     pub credentials: Option<String>,
-    #[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<String>,
     #[arg(help = "Login anonymously / without an account")]
-    #[arg(long, default_value_t = false)]
+    #[arg(global = true, long, default_value_t = false)]
     pub anonymous: bool,
 }
 

crunchy-cli-core/src/search/command.rs

@@ -7,6 +7,8 @@ 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")]
@@ -86,13 +88,16 @@ 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
+    ///     stream.dash_url           → Stream url in DASH format. You need to set the `Authorization` header to `Bearer <account.token>` when requesting this url
-    ///     stream.drm_dash_url       → Stream url in DRM protected DASH format
+    ///     stream.is_drm             → If `stream.dash_url` is DRM encrypted
-    ///     stream.hls_url            → Stream url in HLS format
-    ///     stream.drm_hls_url        → Stream url in DRM protected 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,
@@ -100,9 +105,16 @@ 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],
@@ -141,13 +153,14 @@ 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)?;
+            let format = Format::new(self.output.clone(), filter_options, crunchy_arc.clone())?;
             println!("{}", format.parse(media_collection).await?);
         }
 

crunchy-cli-core/src/search/format.rs

@@ -2,13 +2,15 @@ use crate::search::filter::FilterOptions;
 use anyhow::{bail, Result};
 use crunchyroll_rs::media::{Stream, Subtitle};
 use crunchyroll_rs::{
-    Concert, Episode, Locale, MediaCollection, Movie, MovieListing, MusicVideo, Season, Series,
+    Concert, Crunchyroll, 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 {
@@ -163,37 +165,15 @@ impl From<&Concert> for FormatConcert {
 struct FormatStream {
     pub locale: Locale,
     pub dash_url: String,
-    pub drm_dash_url: String,
+    pub is_drm: bool,
-    pub hls_url: String,
-    pub drm_hls_url: String,
 }
 
 impl From<&Stream> for FormatStream {
     fn from(value: &Stream) -> Self {
-        let (dash_url, drm_dash_url, hls_url, drm_hls_url) =
-            value.variants.get(&Locale::Custom("".to_string())).map_or(
-                (
-                    "".to_string(),
-                    "".to_string(),
-                    "".to_string(),
-                    "".to_string(),
-                ),
-                |v| {
-                    (
-                        v.adaptive_dash.clone().unwrap_or_default().url,
-                        v.drm_adaptive_dash.clone().unwrap_or_default().url,
-                        v.adaptive_hls.clone().unwrap_or_default().url,
-                        v.drm_adaptive_hls.clone().unwrap_or_default().url,
-                    )
-                },
-            );
-
         Self {
             locale: value.audio_locale.clone(),
-            dash_url,
+            dash_url: value.url.clone(),
-            drm_dash_url,
+            is_drm: false,
-            hls_url,
-            drm_hls_url,
         }
     }
 }
@@ -213,6 +193,27 @@ 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<Self> {
+        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,
@@ -224,6 +225,7 @@ enum Scope {
     Concert,
     Stream,
     Subtitle,
+    Account,
 }
 
 macro_rules! must_match_if_true {
@@ -239,23 +241,20 @@ 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<usize>, Scope, String)>,
     pattern_count: HashMap<Scope, u32>,
     input: String,
     filter_options: FilterOptions,
+    crunchyroll: Arc<Crunchyroll>,
 }
 
 impl Format {
-    pub fn new(input: String, filter_options: FilterOptions) -> Result<Self> {
+    pub fn new(
+        input: String,
+        filter_options: FilterOptions,
+        crunchyroll: Arc<Crunchyroll>,
+    ) -> Result<Self> {
         let scope_regex = Regex::new(r"(?m)\{\{\s*(?P<scope>\w+)\.(?P<field>\w+)\s*}}").unwrap();
         let mut pattern = vec![];
         let mut pattern_count = HashMap::new();
@@ -282,6 +281,7 @@ impl Format {
             Scope::Concert => FormatConcert
             Scope::Stream => FormatStream
             Scope::Subtitle => FormatSubtitle
+            Scope::Account => FormatAccount
         );
 
         for capture in scope_regex.captures_iter(&input) {
@@ -299,6 +299,7 @@ impl Format {
                 "concert" => Scope::Concert,
                 "stream" => Scope::Stream,
                 "subtitle" => Scope::Subtitle,
+                "account" => Scope::Account,
                 _ => bail!("'{}.{}' is not a valid keyword", scope, field),
             };
 
@@ -324,6 +325,7 @@ impl Format {
             pattern_count,
             input,
             filter_options,
+            crunchyroll,
         })
     }
 
@@ -338,6 +340,7 @@ impl Format {
                     Scope::Episode,
                     Scope::Stream,
                     Scope::Subtitle,
+                    Scope::Account,
                 ])?;
 
                 self.parse_series(media_collection).await
@@ -348,17 +351,28 @@ 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])?;
+                self.check_scopes(vec![
+                    Scope::MusicVideo,
+                    Scope::Stream,
+                    Scope::Subtitle,
+                    Scope::Account,
+                ])?;
 
                 self.parse_music_video(media_collection).await
             }
             MediaCollection::Concert(_) => {
-                self.check_scopes(vec![Scope::Concert, Scope::Stream, Scope::Subtitle])?;
+                self.check_scopes(vec![
+                    Scope::Concert,
+                    Scope::Stream,
+                    Scope::Subtitle,
+                    Scope::Account,
+                ])?;
 
                 self.parse_concert(media_collection).await
             }
@@ -371,6 +385,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<Stream>)>)> = vec![];
@@ -398,7 +413,15 @@ impl Format {
             };
             let mut seasons = vec![];
             for season in tmp_seasons {
-                seasons.extend(self_and_versions!(season => self.filter_options.audio.clone()))
+                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?)
+                    }
+                }
             }
             tree.extend(
                 self.filter_options
@@ -412,7 +435,15 @@ impl Format {
         if !episode_empty || !stream_empty {
             match &media_collection {
                 MediaCollection::Episode(episode) => {
-                    let episodes = self_and_versions!(episode => self.filter_options.audio.clone());
+                    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?)
+                        }
+                    }
                     tree.push((
                         Season::default(),
                         episodes
@@ -441,7 +472,9 @@ impl Format {
         if !stream_empty {
             for (_, episodes) in tree.iter_mut() {
                 for (episode, streams) in episodes {
-                    streams.push(episode.stream().await?)
+                    let stream = episode.stream_maybe_without_drm().await?;
+                    stream.clone().invalidate().await?;
+                    streams.push(stream)
                 }
             }
         } else {
@@ -453,6 +486,11 @@ 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));
@@ -464,6 +502,7 @@ 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),
@@ -510,7 +549,7 @@ impl Format {
         }
         if !stream_empty {
             for (movie, streams) in tree.iter_mut() {
-                streams.push(movie.stream().await?)
+                streams.push(movie.stream_maybe_without_drm().await?)
             }
         } else {
             for (_, streams) in tree.iter_mut() {
@@ -548,7 +587,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().await?).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 music_video_map = self.serializable_to_json_map(FormatMusicVideo::from(&music_video));
         let stream_map = self.serializable_to_json_map(FormatStream::from(&stream));
@@ -570,7 +609,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().await?).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 concert_map = self.serializable_to_json_map(FormatConcert::from(&concert));
         let stream_map = self.serializable_to_json_map(FormatStream::from(&stream));

crunchy-cli-core/src/utils/clap.rs

@@ -1,11 +1,61 @@
 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<Resolution, String> {
     parse_resolution(s.to_string()).map_err(|e| e.to_string())
 }
 
-pub fn clap_parse_proxy(s: &str) -> Result<Proxy, String> {
+pub fn clap_parse_proxies(s: &str) -> Result<(Option<Proxy>, Option<Proxy>), String> {
-    Proxy::all(s).map_err(|e| e.to_string())
+    let double_proxy_regex =
+        Regex::new(r"^(?P<first>(https?|socks5h?)://.+):(?P<second>(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<u32, String> {
+    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::<u32>() {
+        b
+    } else if let Ok(kb) = quota.trim_end_matches("kb").parse::<u32>() {
+        kb * 1024
+    } else if let Ok(mb) = quota.trim_end_matches("mb").parse::<u32>() {
+        mb * 1024 * 1024
+    } else {
+        return Err("Invalid speed limit".to_string());
+    };
+    Ok(bytes)
 }

crunchy-cli-core/src/utils/context.rs

@@ -1,5 +1,9 @@
+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<RateLimiterService>,
 }

crunchy-cli-core/src/utils/ffmpeg.rs

@@ -1,5 +1,7 @@
 use lazy_static::lazy_static;
 use regex::Regex;
+use std::fmt;
+use std::fmt::Formatter;
 use std::str::FromStr;
 
 pub const SOFTSUB_CONTAINERS: [&str; 3] = ["mkv", "mov", "mp4"];
@@ -33,11 +35,11 @@ macro_rules! ffmpeg_enum {
             }
         }
 
-        impl ToString for $name {
+        impl fmt::Display for $name {
-            fn to_string(&self) -> String {
+            fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
                 match self {
                     $(
-                        &$name::$field => stringify!($field).to_string().to_lowercase()
+                        &$name::$field => write!(f, "{}", stringify!($field).to_string().to_lowercase())
                     ),*
                 }
             }
@@ -69,6 +71,7 @@ ffmpeg_enum! {
 ffmpeg_enum! {
     enum FFmpegHwAccel {
         Nvidia,
+        Amd,
         Apple
     }
 }
@@ -101,7 +104,11 @@ impl FFmpegPreset {
                 FFmpegHwAccel::all(),
                 FFmpegQuality::all(),
             ),
-            (FFmpegCodec::Av1, vec![], FFmpegQuality::all()),
+            (
+                FFmpegCodec::Av1,
+                vec![FFmpegHwAccel::Amd],
+                FFmpegQuality::all(),
+            ),
         ];
 
         let mut return_values = vec![];
@@ -130,23 +137,16 @@ impl FFmpegPreset {
         for (codec, hwaccel, quality) in FFmpegPreset::available_matches() {
             let mut description_details = vec![];
             if let Some(h) = &hwaccel {
-                description_details.push(format!("{} hardware acceleration", h.to_string()))
+                description_details.push(format!("{h} hardware acceleration"))
             }
             if let Some(q) = &quality {
-                description_details.push(format!("{} video quality/compression", q.to_string()))
+                description_details.push(format!("{q} video quality/compression"))
             }
 
             let description = if description_details.is_empty() {
-                format!(
+                format!("{codec} encoded with default video quality/compression",)
-                    "{} encoded with default video quality/compression",
-                    codec.to_string()
-                )
             } else if description_details.len() == 1 {
-                format!(
+                format!("{} encoded with {}", codec, description_details[0])
-                    "{} encoded with {}",
-                    codec.to_string(),
-                    description_details[0]
-                )
             } else {
                 let first = description_details.remove(0);
                 let last = description_details.remove(description_details.len() - 1);
@@ -156,13 +156,7 @@ impl FFmpegPreset {
                     "".to_string()
                 };
 
-                format!(
+                format!("{codec} encoded with {first}{mid} and {last}",)
-                    "{} encoded with {}{} and {}",
-                    codec.to_string(),
-                    first,
-                    mid,
-                    last
-                )
             };
 
             return_values.push(format!(
@@ -196,11 +190,7 @@ impl FFmpegPreset {
                 .find(|p| p.to_string() == token.to_lowercase())
             {
                 if let Some(cc) = codec {
-                    return Err(format!(
+                    return Err(format!("cannot use multiple codecs (found {cc} and {c})",));
-                        "cannot use multiple codecs (found {} and {})",
-                        cc.to_string(),
-                        c.to_string()
-                    ));
                 }
                 codec = Some(c)
             } else if let Some(h) = FFmpegHwAccel::all()
@@ -209,9 +199,7 @@ impl FFmpegPreset {
             {
                 if let Some(hh) = hwaccel {
                     return Err(format!(
-                        "cannot use multiple hardware accelerations (found {} and {})",
+                        "cannot use multiple hardware accelerations (found {hh} and {h})",
-                        hh.to_string(),
-                        h.to_string()
                     ));
                 }
                 hwaccel = Some(h)
@@ -221,15 +209,13 @@ impl FFmpegPreset {
             {
                 if let Some(qq) = quality {
                     return Err(format!(
-                        "cannot use multiple ffmpeg preset qualities (found {} and {})",
+                        "cannot use multiple ffmpeg preset qualities (found {qq} and {q})",
-                        qq.to_string(),
-                        q.to_string()
                     ));
                 }
                 quality = Some(q)
             } else {
                 return Err(format!(
-                    "'{}' is not a valid ffmpeg preset (unknown token '{}'",
+                    "'{}' is not a valid ffmpeg preset (unknown token '{}')",
                     s, token
                 ));
             }
@@ -285,13 +271,15 @@ impl FFmpegPreset {
                                     crf_quality();
                                     output.extend(["-c:v", "h264_nvenc", "-c:a", "copy"])
                                 }
+                                FFmpegHwAccel::Amd => {
+                                    crf_quality();
+                                    output.extend(["-c:v", "h264_amf", "-c:a", "copy"])
+                                }
                                 FFmpegHwAccel::Apple => {
-                                    // Apple's Video Toolbox encoders ignore `-crf`,
+                                    // Apple's Video Toolbox encoders ignore `-crf`, use `-q:v`
-                                    // use `-q:v` instead. It's on a scale of 1-100,
+                                    // instead. It's on a scale of 1-100, 100 being lossless. Just
-                                    // 100 being lossless. Just did some math
+                                    // did some math ((-a/51+1)*99+1 where `a` is the old crf value)
-                                    // ((-a/51+1)*99+1 where `a` is the old crf value)
+                                    // so these settings very likely need some more tweaking
-                                    // so these settings very likely need some more
-                                    // tweeking.
                                     match quality {
                                         FFmpegQuality::Lossless => output.extend(["-q:v", "65"]),
                                         FFmpegQuality::Normal => (),
@@ -334,8 +322,12 @@ impl FFmpegPreset {
                                         "hvc1",
                                     ])
                                 }
+                                FFmpegHwAccel::Amd => {
+                                    crf_quality();
+                                    output.extend(["-c:v", "hevc_amf", "-c:a", "copy"])
+                                }
                                 FFmpegHwAccel::Apple => {
-                                    // See the comment that starts on line 287.
+                                    // See the comment for apple h264 hwaccel
                                     match quality {
                                         FFmpegQuality::Lossless => output.extend(["-q:v", "61"]),
                                         FFmpegQuality::Normal => (),
@@ -358,12 +350,17 @@ impl FFmpegPreset {
                         }
                     }
                     FFmpegCodec::Av1 => {
-                        output.extend(["-c:v", "libsvtav1", "-c:a", "copy"]);
+                        let mut crf_quality = || match quality {
-
-                        match quality {
                             FFmpegQuality::Lossless => output.extend(["-crf", "22"]),
                             FFmpegQuality::Normal => (),
                             FFmpegQuality::Low => output.extend(["-crf", "35"]),
+                        };
+
+                        crf_quality();
+                        if let Some(FFmpegHwAccel::Amd) = hwaccel_opt {
+                            output.extend(["-c:v", "av1_amf", "-c:a", "copy"]);
+                        } else {
+                            output.extend(["-c:v", "libsvtav1", "-c:a", "copy"]);
                         }
                     }
                 }

crunchy-cli-core/src/utils/filter.rs

@@ -1,27 +1,407 @@
+use crate::utils::format::{SingleFormat, SingleFormatCollection};
+use crate::utils::interactive_select::{check_for_duplicated_seasons, get_duplicated_seasons};
+use crate::utils::parse::{fract, UrlFilter};
 use anyhow::Result;
 use crunchyroll_rs::{
-    Concert, Episode, MediaCollection, Movie, MovieListing, MusicVideo, Season, Series,
+    Concert, Episode, Locale, MediaCollection, Movie, MovieListing, MusicVideo, Season, Series,
 };
+use log::{info, warn};
+use std::collections::{BTreeMap, HashMap};
+use std::ops::Not;
 
-// Check when https://github.com/dtolnay/async-trait/issues/224 is resolved and update async-trait
+pub(crate) enum FilterMediaScope<'a> {
-// to the new fixed version (as this causes some issues)
+    Series(&'a Series),
-#[async_trait::async_trait]
+    Season(&'a Season),
-pub trait Filter {
+    /// Always contains 1 or 2 episodes.
-    type T: Send + Sized;
+    /// - 1: The episode's audio is completely missing
-    type Output: Send + Sized;
+    /// - 2: The requested audio is only available from first entry to last entry
+    Episode(Vec<&'a Episode>),
+}
 
-    async fn visit_series(&mut self, series: Series) -> Result<Vec<Season>>;
+pub(crate) struct Filter {
-    async fn visit_season(&mut self, season: Season) -> Result<Vec<Episode>>;
+    url_filter: UrlFilter,
-    async fn visit_episode(&mut self, episode: Episode) -> Result<Option<Self::T>>;
-    async fn visit_movie_listing(&mut self, movie_listing: MovieListing) -> Result<Vec<Movie>>;
-    async fn visit_movie(&mut self, movie: Movie) -> Result<Option<Self::T>>;
-    async fn visit_music_video(&mut self, music_video: MusicVideo) -> Result<Option<Self::T>>;
-    async fn visit_concert(&mut self, concert: Concert) -> Result<Option<Self::T>>;
 
-    async fn visit(mut self, media_collection: MediaCollection) -> Result<Self::Output>
+    skip_specials: bool,
-    where
+    interactive_input: bool,
-        Self: Send + Sized,
+
+    relative_episode_number: bool,
+
+    audio_locales: Vec<Locale>,
+    subtitle_locales: Vec<Locale>,
+
+    audios_missing: fn(FilterMediaScope, Vec<&Locale>) -> Result<bool>,
+    subtitles_missing: fn(FilterMediaScope, Vec<&Locale>) -> Result<bool>,
+    no_premium: fn(u32) -> Result<()>,
+
+    is_premium: bool,
+
+    series_visited: bool,
+    season_episodes: HashMap<String, Vec<Episode>>,
+    season_with_premium: Option<Vec<u32>>,
+    season_sorting: Vec<String>,
+}
+
+impl Filter {
+    #[allow(clippy::too_many_arguments)]
+    pub(crate) fn new(
+        url_filter: UrlFilter,
+        audio_locales: Vec<Locale>,
+        subtitle_locales: Vec<Locale>,
+        audios_missing: fn(FilterMediaScope, Vec<&Locale>) -> Result<bool>,
+        subtitles_missing: fn(FilterMediaScope, Vec<&Locale>) -> Result<bool>,
+        no_premium: fn(u32) -> Result<()>,
+        relative_episode_number: bool,
+        interactive_input: bool,
+        skip_specials: bool,
+        is_premium: bool,
+    ) -> Self {
+        Self {
+            url_filter,
+            audio_locales,
+            subtitle_locales,
+            relative_episode_number,
+            interactive_input,
+            audios_missing,
+            subtitles_missing,
+            no_premium,
+            is_premium,
+            series_visited: false,
+            season_episodes: HashMap::new(),
+            skip_specials,
+            season_with_premium: is_premium.not().then_some(vec![]),
+            season_sorting: vec![],
+        }
+    }
+
+    async fn visit_series(&mut self, series: Series) -> Result<Vec<Season>> {
+        // the audio locales field isn't always populated
+        if !series.audio_locales.is_empty() {
+            let missing_audios = missing_locales(&series.audio_locales, &self.audio_locales);
+            if !missing_audios.is_empty()
+                && !(self.audios_missing)(FilterMediaScope::Series(&series), missing_audios)?
             {
+                return Ok(vec![]);
+            }
+            let missing_subtitles =
+                missing_locales(&series.subtitle_locales, &self.subtitle_locales);
+            if !missing_subtitles.is_empty()
+                && !(self.subtitles_missing)(FilterMediaScope::Series(&series), missing_subtitles)?
+            {
+                return Ok(vec![]);
+            }
+        }
+
+        let mut seasons = vec![];
+        for season in series.seasons().await? {
+            if !self.url_filter.is_season_valid(season.season_number) {
+                continue;
+            }
+            let missing_audios = missing_locales(
+                &season
+                    .versions
+                    .iter()
+                    .map(|l| l.audio_locale.clone())
+                    .collect::<Vec<Locale>>(),
+                &self.audio_locales,
+            );
+            if !missing_audios.is_empty()
+                && !(self.audios_missing)(FilterMediaScope::Season(&season), missing_audios)?
+            {
+                return Ok(vec![]);
+            }
+            seasons.push(season)
+        }
+
+        let duplicated_seasons = get_duplicated_seasons(&seasons);
+        if !duplicated_seasons.is_empty() {
+            if self.interactive_input {
+                check_for_duplicated_seasons(&mut seasons)
+            } else {
+                info!(
+                    "Found duplicated seasons: {}",
+                    duplicated_seasons
+                        .iter()
+                        .map(|d| d.to_string())
+                        .collect::<Vec<String>>()
+                        .join(", ")
+                )
+            }
+        }
+
+        self.series_visited = true;
+
+        Ok(seasons)
+    }
+
+    async fn visit_season(&mut self, season: Season) -> Result<Vec<Episode>> {
+        if !self.url_filter.is_season_valid(season.season_number) {
+            return Ok(vec![]);
+        }
+
+        let mut seasons = vec![];
+        if self
+            .audio_locales
+            .iter()
+            .any(|l| season.audio_locales.contains(l))
+        {
+            seasons.push(season.clone())
+        }
+        for version in season.versions {
+            if season.id == version.id {
+                continue;
+            }
+            if self.audio_locales.contains(&version.audio_locale) {
+                seasons.push(version.season().await?)
+            }
+        }
+
+        let mut episodes = vec![];
+        for season in seasons {
+            self.season_sorting.push(season.id.clone());
+            let mut eps = season.episodes().await?;
+
+            // removes any episode that does not have the audio locale of the season. yes, this is
+            // the case sometimes
+            if season.audio_locales.len() < 2 {
+                let season_locale = season
+                    .audio_locales
+                    .first()
+                    .cloned()
+                    .unwrap_or(Locale::ja_JP);
+                eps.retain(|e| e.audio_locale == season_locale)
+            }
+
+            #[allow(clippy::if_same_then_else)]
+            if eps.len() < season.number_of_episodes as usize {
+                if eps.is_empty()
+                    && !(self.audios_missing)(
+                        FilterMediaScope::Season(&season),
+                        season.audio_locales.iter().collect(),
+                    )?
+                {
+                    return Ok(vec![]);
+                } else if !eps.is_empty()
+                    && !(self.audios_missing)(
+                        FilterMediaScope::Episode(vec![eps.first().unwrap(), eps.last().unwrap()]),
+                        vec![&eps.first().unwrap().audio_locale],
+                    )?
+                {
+                    return Ok(vec![]);
+                }
+            }
+
+            episodes.extend(eps)
+        }
+
+        if self.relative_episode_number {
+            for episode in &episodes {
+                self.season_episodes
+                    .entry(episode.season_id.clone())
+                    .or_default()
+                    .push(episode.clone())
+            }
+        }
+
+        Ok(episodes)
+    }
+
+    async fn visit_episode(&mut self, episode: Episode) -> Result<Vec<SingleFormat>> {
+        if !self
+            .url_filter
+            .is_episode_valid(episode.sequence_number, episode.season_number)
+        {
+            return Ok(vec![]);
+        }
+
+        // skip the episode if it's a special
+        if self.skip_specials
+            && (episode.sequence_number == 0.0 || episode.sequence_number.fract() != 0.0)
+        {
+            return Ok(vec![]);
+        }
+
+        let mut episodes = vec![];
+        if !self.series_visited {
+            if self.audio_locales.contains(&episode.audio_locale) {
+                episodes.push(episode.clone())
+            }
+            for version in &episode.versions {
+                // `episode` is also a version of itself. the if block above already adds the
+                // episode if it matches the requested audio, so it doesn't need to be requested
+                // here again
+                if version.id == episode.id {
+                    continue;
+                }
+                if self.audio_locales.contains(&version.audio_locale) {
+                    episodes.push(version.episode().await?)
+                }
+            }
+
+            let audio_locales: Vec<Locale> =
+                episodes.iter().map(|e| e.audio_locale.clone()).collect();
+            let missing_audios = missing_locales(&audio_locales, &self.audio_locales);
+            if !missing_audios.is_empty()
+                && !(self.audios_missing)(
+                    FilterMediaScope::Episode(vec![&episode]),
+                    missing_audios,
+                )?
+            {
+                return Ok(vec![]);
+            }
+
+            let mut subtitle_locales: Vec<Locale> = episodes
+                .iter()
+                .flat_map(|e| e.subtitle_locales.clone())
+                .collect();
+            subtitle_locales.sort();
+            subtitle_locales.dedup();
+            let missing_subtitles = missing_locales(&subtitle_locales, &self.subtitle_locales);
+            if !missing_subtitles.is_empty()
+                && !(self.subtitles_missing)(
+                    FilterMediaScope::Episode(vec![&episode]),
+                    missing_subtitles,
+                )?
+            {
+                return Ok(vec![]);
+            }
+        } else {
+            episodes.push(episode.clone())
+        }
+
+        if let Some(seasons_with_premium) = &mut self.season_with_premium {
+            let episodes_len_before = episodes.len();
+            episodes.retain(|e| !e.is_premium_only && !self.is_premium);
+            if episodes_len_before < episodes.len()
+                && !seasons_with_premium.contains(&episode.season_number)
+            {
+                (self.no_premium)(episode.season_number)?;
+                seasons_with_premium.push(episode.season_number)
+            }
+
+            if episodes.is_empty() {
+                return Ok(vec![]);
+            }
+        }
+
+        let mut relative_episode_number = None;
+        let mut relative_sequence_number = None;
+        if self.relative_episode_number {
+            let season_eps = match self.season_episodes.get(&episode.season_id) {
+                Some(eps) => eps,
+                None => {
+                    self.season_episodes.insert(
+                        episode.season_id.clone(),
+                        episode.season().await?.episodes().await?,
+                    );
+                    self.season_episodes.get(&episode.season_id).unwrap()
+                }
+            };
+            let mut non_integer_sequence_number_count = 0;
+            for (i, ep) in season_eps.iter().enumerate() {
+                if ep.sequence_number != 0.0 || ep.sequence_number.fract() == 0.0 {
+                    non_integer_sequence_number_count += 1
+                }
+                if ep.id == episode.id {
+                    relative_episode_number = Some(i + 1);
+                    relative_sequence_number = Some(
+                        (i + 1 - non_integer_sequence_number_count) as f32
+                            + fract(ep.sequence_number),
+                    );
+                    break;
+                }
+            }
+            if relative_episode_number.is_none() || relative_sequence_number.is_none() {
+                warn!(
+                    "Failed to get relative episode number for episode {} ({}) of {} season {}",
+                    episode.sequence_number,
+                    episode.title,
+                    episode.series_title,
+                    episode.season_number,
+                )
+            }
+        }
+
+        Ok(episodes
+            .into_iter()
+            .map(|e| {
+                SingleFormat::new_from_episode(
+                    e.clone(),
+                    e.subtitle_locales,
+                    relative_episode_number.map(|n| n as u32),
+                    relative_sequence_number,
+                )
+            })
+            .collect())
+    }
+
+    async fn visit_movie_listing(&mut self, movie_listing: MovieListing) -> Result<Vec<Movie>> {
+        Ok(movie_listing.movies().await?)
+    }
+
+    async fn visit_movie(&mut self, movie: Movie) -> Result<Vec<SingleFormat>> {
+        Ok(vec![SingleFormat::new_from_movie(movie, vec![])])
+    }
+
+    async fn visit_music_video(&mut self, music_video: MusicVideo) -> Result<Vec<SingleFormat>> {
+        Ok(vec![SingleFormat::new_from_music_video(music_video)])
+    }
+
+    async fn visit_concert(&mut self, concert: Concert) -> Result<Vec<SingleFormat>> {
+        Ok(vec![SingleFormat::new_from_concert(concert)])
+    }
+
+    async fn finish(self, input: Vec<Vec<SingleFormat>>) -> Result<SingleFormatCollection> {
+        let flatten_input: Vec<SingleFormat> = input.into_iter().flatten().collect();
+
+        let mut single_format_collection = SingleFormatCollection::new();
+
+        let mut pre_sorted: BTreeMap<String, Vec<SingleFormat>> = BTreeMap::new();
+        for data in flatten_input {
+            pre_sorted
+                .entry(data.identifier.clone())
+                .or_default()
+                .push(data)
+        }
+
+        let mut sorted: Vec<(String, Vec<SingleFormat>)> = 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.audio_locales
+                    .iter()
+                    .position(|p| p == &a.audio)
+                    .unwrap_or(usize::MAX)
+                    .cmp(
+                        &self
+                            .audio_locales
+                            .iter()
+                            .position(|p| p == &b.audio)
+                            .unwrap_or(usize::MAX),
+                    )
+            });
+            single_format_collection.add_single_formats(data)
+        }
+
+        Ok(single_format_collection)
+    }
+
+    pub(crate) async fn visit(
+        mut self,
+        media_collection: MediaCollection,
+    ) -> Result<SingleFormatCollection> {
         let mut items = vec![media_collection];
         let mut result = vec![];
 
@@ -45,9 +425,7 @@ pub trait Filter {
                             .collect::<Vec<MediaCollection>>(),
                     ),
                     MediaCollection::Episode(episode) => {
-                        if let Some(t) = self.visit_episode(episode).await? {
+                        result.push(self.visit_episode(episode).await?)
-                            result.push(t)
-                        }
                     }
                     MediaCollection::MovieListing(movie_listing) => new_items.extend(
                         self.visit_movie_listing(movie_listing)
@@ -56,20 +434,12 @@ pub trait Filter {
                             .map(|m| m.into())
                             .collect::<Vec<MediaCollection>>(),
                     ),
-                    MediaCollection::Movie(movie) => {
+                    MediaCollection::Movie(movie) => result.push(self.visit_movie(movie).await?),
-                        if let Some(t) = self.visit_movie(movie).await? {
-                            result.push(t)
-                        }
-                    }
                     MediaCollection::MusicVideo(music_video) => {
-                        if let Some(t) = self.visit_music_video(music_video).await? {
+                        result.push(self.visit_music_video(music_video).await?)
-                            result.push(t)
-                        }
                     }
                     MediaCollection::Concert(concert) => {
-                        if let Some(t) = self.visit_concert(concert).await? {
+                        result.push(self.visit_concert(concert).await?)
-                            result.push(t)
-                        }
                     }
                 }
             }
@@ -79,8 +449,10 @@ pub trait Filter {
 
         self.finish(result).await
     }
+}
 
-    async fn finish(self, input: Vec<Self::T>) -> Result<Self::Output>;
+fn missing_locales<'a>(available: &[Locale], searched: &'a [Locale]) -> Vec<&'a Locale> {
+    searched.iter().filter(|p| !available.contains(p)).collect()
 }
 
 /// Remove all duplicates from a [`Vec`].

crunchy-cli-core/src/utils/fmt.rs

@@ -0,0 +1,19 @@
+use chrono::TimeDelta;
+
+pub fn format_time_delta(time_delta: &TimeDelta) -> String {
+    let negative = *time_delta < TimeDelta::zero();
+    let time_delta = time_delta.abs();
+    let hours = time_delta.num_hours();
+    let minutes = time_delta.num_minutes() - time_delta.num_hours() * 60;
+    let seconds = time_delta.num_seconds() - time_delta.num_minutes() * 60;
+    let milliseconds = time_delta.num_milliseconds() - time_delta.num_seconds() * 1000;
+
+    format!(
+        "{}{}:{:0>2}:{:0>2}.{:0>3}",
+        if negative { "-" } else { "" },
+        hours,
+        minutes,
+        seconds,
+        milliseconds
+    )
+}

crunchy-cli-core/src/utils/format.rs

@@ -1,15 +1,18 @@
 use crate::utils::filter::real_dedup_vec;
+use crate::utils::locale::LanguageTagging;
 use crate::utils::log::tab_info;
 use crate::utils::os::{is_special_file, sanitize};
-use anyhow::Result;
+use anyhow::{bail, Result};
-use chrono::Duration;
+use chrono::{Datelike, Duration};
-use crunchyroll_rs::media::{Resolution, Stream, Subtitle, VariantData};
+use crunchyroll_rs::media::{SkipEvents, Stream, StreamData, Subtitle};
 use crunchyroll_rs::{Concert, Episode, Locale, MediaCollection, Movie, MusicVideo};
 use log::{debug, info};
 use std::cmp::Ordering;
 use std::collections::BTreeMap;
+use std::env;
 use std::path::{Path, PathBuf};
 
+#[allow(dead_code)]
 #[derive(Clone)]
 pub struct SingleFormat {
     pub identifier: String,
@@ -17,6 +20,10 @@ pub struct SingleFormat {
     pub title: String,
     pub description: String,
 
+    pub release_year: u64,
+    pub release_month: u64,
+    pub release_day: u64,
+
     pub audio: Locale,
     pub subtitles: Vec<Locale>,
 
@@ -60,6 +67,9 @@ impl SingleFormat {
             },
             title: episode.title.clone(),
             description: episode.description.clone(),
+            release_year: episode.episode_air_date.year() as u64,
+            release_month: episode.episode_air_date.month() as u64,
+            release_day: episode.episode_air_date.day() as u64,
             audio: episode.audio_locale.clone(),
             subtitles,
             series_id: episode.series_id.clone(),
@@ -86,6 +96,9 @@ impl SingleFormat {
             identifier: movie.id.clone(),
             title: movie.title.clone(),
             description: movie.description.clone(),
+            release_year: movie.free_available_date.year() as u64,
+            release_month: movie.free_available_date.month() as u64,
+            release_day: movie.free_available_date.day() as u64,
             audio: Locale::ja_JP,
             subtitles,
             series_id: movie.movie_listing_id.clone(),
@@ -108,6 +121,9 @@ impl SingleFormat {
             identifier: music_video.id.clone(),
             title: music_video.title.clone(),
             description: music_video.description.clone(),
+            release_year: music_video.original_release.year() as u64,
+            release_month: music_video.original_release.month() as u64,
+            release_day: music_video.original_release.day() as u64,
             audio: Locale::ja_JP,
             subtitles: vec![],
             series_id: music_video.id.clone(),
@@ -130,6 +146,9 @@ impl SingleFormat {
             identifier: concert.id.clone(),
             title: concert.title.clone(),
             description: concert.description.clone(),
+            release_year: concert.original_release.year() as u64,
+            release_month: concert.original_release.month() as u64,
+            release_day: concert.original_release.day() as u64,
             audio: Locale::ja_JP,
             subtitles: vec![],
             series_id: concert.id.clone(),
@@ -149,13 +168,27 @@ impl SingleFormat {
 
     pub async fn stream(&self) -> Result<Stream> {
         let stream = match &self.source {
-            MediaCollection::Episode(e) => e.stream().await?,
+            MediaCollection::Episode(e) => e.stream_maybe_without_drm().await,
-            MediaCollection::Movie(m) => m.stream().await?,
+            MediaCollection::Movie(m) => m.stream_maybe_without_drm().await,
-            MediaCollection::MusicVideo(mv) => mv.stream().await?,
+            MediaCollection::MusicVideo(mv) => mv.stream_maybe_without_drm().await,
-            MediaCollection::Concert(c) => c.stream().await?,
+            MediaCollection::Concert(c) => c.stream_maybe_without_drm().await,
             _ => unreachable!(),
         };
-        Ok(stream)
+
+        if let Err(crunchyroll_rs::error::Error::Request { message, .. }) = &stream {
+            if message.starts_with("TOO_MANY_ACTIVE_STREAMS") {
+                bail!("Too many active/parallel streams. Please close at least one stream you're watching and try again")
+            }
+        };
+        Ok(stream?)
+    }
+
+    pub async fn skip_events(&self) -> Result<Option<SkipEvents>> {
+        match &self.source {
+            MediaCollection::Episode(e) => Ok(Some(e.skip_events().await?)),
+            MediaCollection::Movie(m) => Ok(Some(m.skip_events().await?)),
+            _ => Ok(None),
+        }
     }
 
     pub fn source_type(&self) -> String {
@@ -199,7 +232,7 @@ impl Eq for SingleFormatCollectionEpisodeKey {}
 
 struct SingleFormatCollectionSeasonKey((u32, String));
 
-#[allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
+#[allow(clippy::non_canonical_partial_ord_impl)]
 impl PartialOrd for SingleFormatCollectionSeasonKey {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         let mut cmp = self.0 .0.partial_cmp(&other.0 .0);
@@ -305,9 +338,7 @@ impl Iterator for SingleFormatCollectionIterator {
     type Item = Vec<SingleFormat>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        let Some((_, episodes)) = self.0 .0.iter_mut().next() else {
+        let (_, episodes) = self.0 .0.iter_mut().next()?;
-            return None;
-        };
 
         let value = episodes.pop_first().unwrap().1;
         if episodes.is_empty() {
@@ -317,6 +348,7 @@ impl Iterator for SingleFormatCollectionIterator {
     }
 }
 
+#[allow(dead_code)]
 #[derive(Clone)]
 pub struct Format {
     pub title: String,
@@ -324,9 +356,14 @@ pub struct Format {
 
     pub locales: Vec<(Locale, Vec<Locale>)>,
 
-    pub resolution: Resolution,
+    pub width: u64,
+    pub height: u64,
     pub fps: f64,
 
+    pub release_year: u64,
+    pub release_month: u64,
+    pub release_day: u64,
+
     pub series_id: String,
     pub series_name: String,
 
@@ -344,7 +381,7 @@ pub struct Format {
 impl Format {
     #[allow(clippy::type_complexity)]
     pub fn from_single_formats(
-        mut single_formats: Vec<(SingleFormat, VariantData, Vec<(Subtitle, bool)>)>,
+        mut single_formats: Vec<(SingleFormat, StreamData, Vec<(Subtitle, bool)>)>,
     ) -> Self {
         let locales: Vec<(Locale, Vec<Locale>)> = single_formats
             .iter()
@@ -364,8 +401,12 @@ impl Format {
             title: first_format.title,
             description: first_format.description,
             locales,
-            resolution: first_stream.resolution,
+            width: first_stream.resolution().unwrap().width,
-            fps: first_stream.fps,
+            height: first_stream.resolution().unwrap().height,
+            fps: first_stream.fps().unwrap(),
+            release_year: first_format.release_year,
+            release_month: first_format.release_month,
+            release_day: first_format.release_day,
             series_id: first_format.series_id,
             series_name: first_format.series_name,
             season_id: first_format.season_id,
@@ -380,34 +421,60 @@ impl Format {
     }
 
     /// Formats the given string if it has specific pattern in it. It also sanitizes the filename.
-    pub fn format_path(&self, path: PathBuf) -> PathBuf {
+    pub fn format_path(
-        let mut path = sanitize(path.to_string_lossy(), false);
+        &self,
-        path = path
+        path: PathBuf,
-            .replace("{title}", &sanitize(&self.title, true))
+        universal: bool,
+        language_tagging: Option<&LanguageTagging>,
+    ) -> PathBuf {
+        let path = path
+            .to_string_lossy()
+            .to_string()
+            .replace("{title}", &sanitize(&self.title, true, universal))
             .replace(
                 "{audio}",
                 &sanitize(
                     self.locales
                         .iter()
-                        .map(|(a, _)| a.to_string())
+                        .map(|(a, _)| language_tagging.map_or(a.to_string(), |t| t.for_locale(a)))
                         .collect::<Vec<String>>()
-                        .join("|"),
+                        .join(
+                            &env::var("CRUNCHY_CLI_FORMAT_DELIMITER")
+                                .map_or("_".to_string(), |e| e),
+                        ),
                     true,
+                    universal,
                 ),
             )
-            .replace("{resolution}", &sanitize(self.resolution.to_string(), true))
+            .replace(
-            .replace("{series_id}", &sanitize(&self.series_id, true))
+                "{width}",
-            .replace("{series_name}", &sanitize(&self.series_name, true))
+                &sanitize(self.width.to_string(), true, universal),
-            .replace("{season_id}", &sanitize(&self.season_id, true))
+            )
-            .replace("{season_name}", &sanitize(&self.season_title, true))
+            .replace(
+                "{height}",
+                &sanitize(self.height.to_string(), true, universal),
+            )
+            .replace("{series_id}", &sanitize(&self.series_id, true, universal))
+            .replace(
+                "{series_name}",
+                &sanitize(&self.series_name, true, universal),
+            )
+            .replace("{season_id}", &sanitize(&self.season_id, true, universal))
+            .replace(
+                "{season_name}",
+                &sanitize(&self.season_title, true, universal),
+            )
             .replace(
                 "{season_number}",
-                &format!("{:0>2}", sanitize(self.season_number.to_string(), true)),
+                &format!(
+                    "{:0>2}",
+                    sanitize(self.season_number.to_string(), true, universal)
+                ),
             )
-            .replace("{episode_id}", &sanitize(&self.episode_id, true))
+            .replace("{episode_id}", &sanitize(&self.episode_id, true, universal))
             .replace(
                 "{episode_number}",
-                &format!("{:0>2}", sanitize(&self.episode_number, true)),
+                &format!("{:0>2}", sanitize(&self.episode_number, true, universal)),
             )
             .replace(
                 "{relative_episode_number}",
@@ -416,12 +483,16 @@ impl Format {
                     sanitize(
                         self.relative_episode_number.unwrap_or_default().to_string(),
                         true,
+                        universal,
                     )
                 ),
             )
             .replace(
                 "{sequence_number}",
-                &format!("{:0>2}", sanitize(self.sequence_number.to_string(), true)),
+                &format!(
+                    "{:0>2}",
+                    sanitize(self.sequence_number.to_string(), true, universal)
+                ),
             )
             .replace(
                 "{relative_sequence_number}",
@@ -432,11 +503,56 @@ impl Format {
                             .unwrap_or_default()
                             .to_string(),
                         true,
+                        universal,
                     )
                 ),
+            )
+            .replace(
+                "{release_year}",
+                &sanitize(self.release_year.to_string(), true, universal),
+            )
+            .replace(
+                "{release_month}",
+                &format!(
+                    "{:0>2}",
+                    sanitize(self.release_month.to_string(), true, universal)
+                ),
+            )
+            .replace(
+                "{release_day}",
+                &format!(
+                    "{:0>2}",
+                    sanitize(self.release_day.to_string(), true, universal)
+                ),
             );
 
-        PathBuf::from(path)
+        let mut path = PathBuf::from(path);
+
+        // make sure that every path section has a maximum of 255 characters
+        if path.file_name().unwrap_or_default().to_string_lossy().len() > 255 {
+            let name = path
+                .file_stem()
+                .unwrap_or_default()
+                .to_string_lossy()
+                .to_string();
+            let ext = path
+                .extension()
+                .unwrap_or_default()
+                .to_string_lossy()
+                .to_string();
+            if ext != name {
+                path.set_file_name(format!("{}.{}", &name[..(255 - ext.len() - 1)], ext))
+            }
+        }
+        path.iter()
+            .map(|s| {
+                if s.len() > 255 {
+                    s.to_string_lossy()[..255].to_string()
+                } else {
+                    s.to_string_lossy().to_string()
+                }
+            })
+            .collect()
     }
 
     pub fn visual_output(&self, dst: &Path) {
@@ -472,7 +588,7 @@ impl Format {
                 .collect::<Vec<String>>()
                 .join(", ")
         );
-        tab_info!("Resolution: {}", self.resolution);
+        tab_info!("Resolution: {}x{}", self.height, self.width);
         tab_info!("FPS: {:.2}", self.fps)
     }
 

crunchy-cli-core/src/utils/locale.rs

@@ -1,4 +1,124 @@
 use crunchyroll_rs::Locale;
+use log::warn;
+
+#[derive(Clone, Debug)]
+#[allow(clippy::upper_case_acronyms)]
+pub enum LanguageTagging {
+    Default,
+    IETF,
+}
+
+impl LanguageTagging {
+    pub fn parse(s: &str) -> Result<Self, String> {
+        Ok(match s.to_lowercase().as_str() {
+            "default" => Self::Default,
+            "ietf" => Self::IETF,
+            _ => return Err(format!("'{}' is not a valid language tagging", s)),
+        })
+    }
+
+    pub fn convert_locales(&self, locales: &[Locale]) -> Vec<String> {
+        let ietf_language_codes = ietf_language_codes();
+        let mut converted = vec![];
+
+        match &self {
+            LanguageTagging::Default => {
+                for locale in locales {
+                    let Some((_, available)) =
+                        ietf_language_codes.iter().find(|(_, l)| l.contains(locale))
+                    else {
+                        // if no matching IETF language code was found, just pass it as it is
+                        converted.push(locale.to_string());
+                        continue;
+                    };
+                    converted.push(available.first().unwrap().to_string())
+                }
+            }
+            LanguageTagging::IETF => {
+                for locale in locales {
+                    let Some((tag, _)) =
+                        ietf_language_codes.iter().find(|(_, l)| l.contains(locale))
+                    else {
+                        // if no matching IETF language code was found, just pass it as it is
+                        converted.push(locale.to_string());
+                        continue;
+                    };
+                    converted.push(tag.to_string())
+                }
+            }
+        }
+
+        converted
+    }
+
+    pub fn for_locale(&self, locale: &Locale) -> String {
+        match &self {
+            LanguageTagging::Default => ietf_language_codes()
+                .iter()
+                .find(|(_, l)| l.contains(locale))
+                .map_or(locale.to_string(), |(_, l)| l[0].to_string()),
+            LanguageTagging::IETF => ietf_language_codes()
+                .iter()
+                .find(|(_, l)| l.contains(locale))
+                .map_or(locale.to_string(), |(tag, _)| tag.to_string()),
+        }
+    }
+}
+
+pub fn resolve_locales(locales: &[Locale]) -> Vec<Locale> {
+    let ietf_language_codes = ietf_language_codes();
+    let all_locales = Locale::all();
+
+    let mut resolved = vec![];
+    for locale in locales {
+        if all_locales.contains(locale) {
+            resolved.push(locale.clone())
+        } else if let Some((_, resolved_locales)) = ietf_language_codes
+            .iter()
+            .find(|(tag, _)| tag == &locale.to_string().as_str())
+        {
+            let (first, alternatives) = resolved_locales.split_first().unwrap();
+
+            resolved.push(first.clone());
+            // ignoring `Locale::en_IN` because I think the majority of users which want english
+            // audio / subs want the "actual" english version and not the hindi accent dub
+            if !alternatives.is_empty() && resolved_locales.first().unwrap() != &Locale::en_IN {
+                warn!("Resolving locale '{}' to '{}', but there are some alternatives: {}. If you an alternative instead, please write it completely out instead of '{}'", locale, first, alternatives.iter().map(|l| format!("'{l}'")).collect::<Vec<String>>().join(", "), locale)
+            }
+        } else {
+            resolved.push(locale.clone());
+            warn!("Unknown locale '{}'", locale)
+        }
+    }
+
+    resolved
+}
+
+fn ietf_language_codes<'a>() -> Vec<(&'a str, Vec<Locale>)> {
+    vec![
+        ("ar", vec![Locale::ar_ME, Locale::ar_SA]),
+        ("ca", vec![Locale::ca_ES]),
+        ("de", vec![Locale::de_DE]),
+        ("en", vec![Locale::en_US, Locale::hi_IN]),
+        ("es", vec![Locale::es_ES, Locale::es_419, Locale::es_LA]),
+        ("fr", vec![Locale::fr_FR]),
+        ("hi", vec![Locale::hi_IN]),
+        ("id", vec![Locale::id_ID]),
+        ("it", vec![Locale::it_IT]),
+        ("ja", vec![Locale::ja_JP]),
+        ("ko", vec![Locale::ko_KR]),
+        ("ms", vec![Locale::ms_MY]),
+        ("pl", vec![Locale::pl_PL]),
+        ("pt", vec![Locale::pt_PT, Locale::pt_BR]),
+        ("ru", vec![Locale::ru_RU]),
+        ("ta", vec![Locale::ta_IN]),
+        ("te", vec![Locale::te_IN]),
+        ("th", vec![Locale::th_TH]),
+        ("tr", vec![Locale::tr_TR]),
+        ("vi", vec![Locale::vi_VN]),
+        ("zh", vec![Locale::zh_CN, Locale::zh_HK, Locale::zh_TW]),
+    ]
+}
 
 /// Return the locale of the system.
 pub fn system_locale() -> Locale {

crunchy-cli-core/src/utils/mod.rs

@@ -3,10 +3,13 @@ pub mod context;
 pub mod download;
 pub mod ffmpeg;
 pub mod filter;
+pub mod fmt;
 pub mod format;
 pub mod interactive_select;
 pub mod locale;
 pub mod log;
 pub mod os;
 pub mod parse;
+pub mod rate_limit;
+pub mod sync;
 pub mod video;

crunchy-cli-core/src/utils/os.rs

@@ -3,9 +3,12 @@ use regex::{Regex, RegexBuilder};
 use std::borrow::Cow;
 use std::io::ErrorKind;
 use std::path::{Path, PathBuf};
+use std::pin::Pin;
 use std::process::{Command, Stdio};
-use std::{env, io};
+use std::task::{Context, Poll};
-use tempfile::{Builder, NamedTempFile};
+use std::{env, fs, io};
+use tempfile::{Builder, NamedTempFile, TempPath};
+use tokio::io::{AsyncRead, ReadBuf};
 
 pub fn has_ffmpeg() -> bool {
     if let Err(e) = Command::new("ffmpeg").stderr(Stdio::null()).spawn() {
@@ -28,7 +31,7 @@ pub fn temp_directory() -> PathBuf {
 }
 
 /// Any tempfile should be created with this function. The prefix and directory of every file
-/// created with this method stays the same which is helpful to query all existing tempfiles and
+/// created with this function stays the same which is helpful to query all existing tempfiles and
 /// e.g. remove them in a case of ctrl-c. Having one function also good to prevent mistakes like
 /// setting the wrong prefix if done manually.
 pub fn tempfile<S: AsRef<str>>(suffix: S) -> io::Result<NamedTempFile> {
@@ -43,6 +46,98 @@ pub fn tempfile<S: AsRef<str>>(suffix: S) -> io::Result<NamedTempFile> {
     Ok(tempfile)
 }
 
+pub fn cache_dir<S: AsRef<str>>(name: S) -> io::Result<PathBuf> {
+    let cache_dir = temp_directory().join(format!(".crunchy-cli_{}_cache", name.as_ref()));
+    fs::create_dir_all(&cache_dir)?;
+    Ok(cache_dir)
+}
+
+pub struct TempNamedPipe {
+    path: TempPath,
+
+    #[cfg(not(target_os = "windows"))]
+    reader: tokio::net::unix::pipe::Receiver,
+    #[cfg(target_os = "windows")]
+    file: tokio::fs::File,
+}
+
+impl TempNamedPipe {
+    pub fn path(&self) -> &Path {
+        &self.path
+    }
+}
+
+impl AsyncRead for TempNamedPipe {
+    fn poll_read(
+        mut self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> Poll<io::Result<()>> {
+        #[cfg(not(target_os = "windows"))]
+        return Pin::new(&mut self.reader).poll_read(cx, buf);
+        // very very dirty implementation of a 'tail' like behavior
+        #[cfg(target_os = "windows")]
+        {
+            let mut tmp_bytes = vec![0; buf.remaining()];
+            let mut tmp_buf = ReadBuf::new(tmp_bytes.as_mut_slice());
+
+            loop {
+                return match Pin::new(&mut self.file).poll_read(cx, &mut tmp_buf) {
+                    Poll::Ready(r) => {
+                        if r.is_ok() {
+                            if !tmp_buf.filled().is_empty() {
+                                buf.put_slice(tmp_buf.filled())
+                            } else {
+                                // sleep to not loop insanely fast and consume unnecessary system resources
+                                std::thread::sleep(std::time::Duration::from_millis(50));
+                                continue;
+                            }
+                        }
+                        Poll::Ready(r)
+                    }
+                    Poll::Pending => Poll::Pending,
+                };
+            }
+        }
+    }
+}
+
+impl Drop for TempNamedPipe {
+    fn drop(&mut self) {
+        #[cfg(not(target_os = "windows"))]
+        let _ = nix::unistd::unlink(self.path.to_string_lossy().to_string().as_str());
+    }
+}
+
+pub fn temp_named_pipe() -> io::Result<TempNamedPipe> {
+    let tmp = tempfile("")?;
+
+    #[cfg(not(target_os = "windows"))]
+    {
+        let path = tmp.into_temp_path();
+        let _ = fs::remove_file(&path);
+
+        nix::unistd::mkfifo(
+            path.to_string_lossy().to_string().as_str(),
+            nix::sys::stat::Mode::S_IRWXU,
+        )?;
+
+        Ok(TempNamedPipe {
+            reader: tokio::net::unix::pipe::OpenOptions::new().open_receiver(&path)?,
+            path,
+        })
+    }
+    #[cfg(target_os = "windows")]
+    {
+        let (file, path) = tmp.into_parts();
+
+        Ok(TempNamedPipe {
+            file: tokio::fs::File::from_std(file),
+            path,
+        })
+    }
+}
+
 /// Check if the given path exists and rename it until the new (renamed) file does not exist.
 pub fn free_file(mut path: PathBuf) -> (PathBuf, bool) {
     // do not rename it if it exists but is a special file
@@ -82,24 +177,23 @@ pub fn is_special_file<P: AsRef<Path>>(path: P) -> bool {
 }
 
 lazy_static::lazy_static! {
-    static ref ILLEGAL_RE: Regex = Regex::new(r#"[\?<>:\*\|":]"#).unwrap();
+    static ref WINDOWS_NON_PRINTABLE_RE: Regex = Regex::new(r"[\x00-\x1f\x80-\x9f]").unwrap();
-    static ref CONTROL_RE: Regex = Regex::new(r"[\x00-\x1f\x80-\x9f]").unwrap();
+    static ref WINDOWS_ILLEGAL_RE: Regex = Regex::new(r#"[<>:"|?*]"#).unwrap();
-    static ref RESERVED_RE: Regex = Regex::new(r"^\.+$").unwrap();
     static ref WINDOWS_RESERVED_RE: Regex = RegexBuilder::new(r"(?i)^(con|prn|aux|nul|com[0-9]|lpt[0-9])(\..*)?$")
         .case_insensitive(true)
         .build()
         .unwrap();
     static ref WINDOWS_TRAILING_RE: Regex = Regex::new(r"[\. ]+$").unwrap();
+
+    static ref LINUX_NON_PRINTABLE: Regex = Regex::new(r"[\x00]").unwrap();
+
+    static ref RESERVED_RE: Regex = Regex::new(r"^\.+$").unwrap();
 }
 
-/// Sanitizes a filename with the option to include/exclude the path separator from sanitizing. This
+/// Sanitizes a filename with the option to include/exclude the path separator from sanitizing.
-/// is based of the implementation of the
+pub fn sanitize<S: AsRef<str>>(path: S, include_path_separator: bool, universal: bool) -> String {
-/// [`sanitize-filename`](https://crates.io/crates/sanitize-filename) crate.
-pub fn sanitize<S: AsRef<str>>(path: S, include_path_separator: bool) -> String {
     let path = Cow::from(path.as_ref().trim());
 
-    let path = ILLEGAL_RE.replace_all(&path, "");
-    let path = CONTROL_RE.replace_all(&path, "");
     let path = RESERVED_RE.replace(&path, "");
 
     let collect = |name: String| {
@@ -110,8 +204,10 @@ pub fn sanitize<S: AsRef<str>>(path: S, include_path_separator: bool) -> String
         }
     };
 
-    if cfg!(windows) {
+    if universal || cfg!(windows) {
-        let path = WINDOWS_RESERVED_RE.replace(&path, "");
+        let path = WINDOWS_NON_PRINTABLE_RE.replace_all(&path, "");
+        let path = WINDOWS_ILLEGAL_RE.replace_all(&path, "");
+        let path = WINDOWS_RESERVED_RE.replace_all(&path, "");
         let path = WINDOWS_TRAILING_RE.replace(&path, "");
         let mut path = path.to_string();
         if include_path_separator {
@@ -119,6 +215,7 @@ pub fn sanitize<S: AsRef<str>>(path: S, include_path_separator: bool) -> String
         }
         collect(path)
     } else {
+        let path = LINUX_NON_PRINTABLE.replace_all(&path, "");
         let mut path = path.to_string();
         if include_path_separator {
             path = path.replace('/', "");

crunchy-cli-core/src/utils/parse.rs

@@ -46,10 +46,13 @@ impl UrlFilter {
             let from_season = f.from_season.unwrap_or(u32::MIN);
             let to_season = f.to_season.unwrap_or(u32::MAX);
 
-            episode >= from_episode
+            if season < from_season || season > to_season {
-                && episode <= to_episode
+                false
-                && season >= from_season
+            } else if season == from_season || (f.from_season.is_none() && f.to_season.is_none()) {
-                && season <= to_season
+                episode >= from_episode && episode <= to_episode
+            } else {
+                true
+            }
         })
     }
 }
@@ -135,7 +138,7 @@ pub async fn parse_url(
     let old_url_regex = Regex::new(r"https?://(www\.)?crunchyroll\.com/.+").unwrap();
     if old_url_regex.is_match(&url) {
         debug!("Detected maybe old url");
-        // replace the 'http' prefix with 'https' as https is not supported by the reqwest client
+        // replace the 'http' prefix with 'https' as http is not supported by the reqwest client
         if url.starts_with("http://") {
             url.replace_range(0..4, "https")
         }
@@ -144,7 +147,7 @@ pub async fn parse_url(
         url = crunchy.client().get(&url).send().await?.url().to_string()
     }
 
-    let parsed_url = crunchyroll_rs::parse_url(url).map_or(Err(anyhow!("Invalid url")), Ok)?;
+    let parsed_url = crunchyroll_rs::parse_url(url).ok_or(anyhow!("Invalid url"))?;
     debug!("Url type: {:?}", parsed_url);
     let media_collection = match parsed_url {
         UrlType::Series(id)

crunchy-cli-core/src/utils/rate_limit.rs

@@ -0,0 +1,73 @@
+use async_speed_limit::Limiter;
+use crunchyroll_rs::error::Error;
+use futures_util::TryStreamExt;
+use reqwest::{Client, Request, Response, ResponseBuilderExt};
+use std::future::Future;
+use std::io;
+use std::pin::Pin;
+use std::sync::Arc;
+use std::task::{Context, Poll};
+use tower_service::Service;
+
+#[derive(Clone)]
+pub struct RateLimiterService {
+    client: Arc<Client>,
+    rate_limiter: Limiter,
+}
+
+impl RateLimiterService {
+    pub fn new(bytes: u32, client: Client) -> Self {
+        Self {
+            client: Arc::new(client),
+            rate_limiter: Limiter::new(bytes as f64),
+        }
+    }
+}
+
+impl Service<Request> for RateLimiterService {
+    type Response = Response;
+    type Error = Error;
+    type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
+
+    fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        Poll::Ready(Ok(()))
+    }
+
+    fn call(&mut self, req: Request) -> Self::Future {
+        let client = self.client.clone();
+        let rate_limiter = self.rate_limiter.clone();
+
+        Box::pin(async move {
+            let mut body = vec![];
+            let res = client.execute(req).await?;
+            let _url = res.url().clone().to_string();
+            let url = _url.as_str();
+
+            let mut http_res = http::Response::builder()
+                .url(res.url().clone())
+                .status(res.status())
+                .version(res.version());
+            *http_res.headers_mut().unwrap() = res.headers().clone();
+            http_res
+                .extensions_ref()
+                .unwrap()
+                .clone_from(&res.extensions());
+
+            let limiter = rate_limiter.limit(
+                res.bytes_stream()
+                    .map_err(io::Error::other)
+                    .into_async_read(),
+            );
+
+            futures_util::io::copy(limiter, &mut body)
+                .await
+                .map_err(|e| Error::Request {
+                    url: url.to_string(),
+                    status: None,
+                    message: e.to_string(),
+                })?;
+
+            Ok(Response::from(http_res.body(body).unwrap()))
+        })
+    }
+}

crunchy-cli-core/src/utils/sync.rs

@@ -0,0 +1,432 @@
+use std::io::Read;
+use std::process::Stdio;
+use std::{
+    cmp,
+    collections::{HashMap, HashSet},
+    mem,
+    ops::Not,
+    path::Path,
+    process::Command,
+};
+
+use chrono::TimeDelta;
+use crunchyroll_rs::Locale;
+use log::debug;
+use tempfile::TempPath;
+
+use anyhow::{bail, Result};
+use rusty_chromaprint::{Configuration, Fingerprinter};
+
+use super::fmt::format_time_delta;
+
+pub struct SyncAudio {
+    pub format_id: usize,
+    pub path: TempPath,
+    pub locale: Locale,
+    pub sample_rate: u32,
+    pub video_idx: usize,
+}
+
+#[derive(Debug, Clone, Copy)]
+struct TimeRange {
+    start: f64,
+    end: f64,
+}
+
+pub fn sync_audios(
+    available_audios: &Vec<SyncAudio>,
+    sync_tolerance: u32,
+    sync_precision: u32,
+) -> Result<Option<HashMap<usize, TimeDelta>>> {
+    let mut result: HashMap<usize, TimeDelta> = HashMap::new();
+
+    let mut sync_audios = vec![];
+    let mut chromaprints = HashMap::new();
+    let mut formats = HashSet::new();
+    for audio in available_audios {
+        if formats.contains(&audio.format_id) {
+            continue;
+        }
+        formats.insert(audio.format_id);
+        sync_audios.push((audio.format_id, &audio.path, audio.sample_rate));
+        chromaprints.insert(
+            audio.format_id,
+            generate_chromaprint(
+                &audio.path,
+                audio.sample_rate,
+                &TimeDelta::zero(),
+                &TimeDelta::zero(),
+                &TimeDelta::zero(),
+            )?,
+        );
+    }
+    sync_audios.sort_by_key(|sync_audio| chromaprints.get(&sync_audio.0).unwrap().len());
+
+    let base_audio = sync_audios.remove(0);
+
+    let mut start = f64::MAX;
+    let mut end = f64::MIN;
+    let mut initial_offsets = HashMap::new();
+    for audio in &sync_audios {
+        debug!(
+            "Initial comparison of format {} to {}",
+            audio.0, &base_audio.0
+        );
+
+        let (lhs_ranges, rhs_ranges) = compare_chromaprints(
+            chromaprints.get(&base_audio.0).unwrap(),
+            chromaprints.get(&audio.0).unwrap(),
+            sync_tolerance,
+        );
+        if lhs_ranges.is_empty() || rhs_ranges.is_empty() {
+            bail!(
+                "Failed to sync videos, couldn't find matching audio parts between format {} and {}",
+                base_audio.0 + 1,
+                audio.0 + 1
+            );
+        }
+        let lhs_range = lhs_ranges[0];
+        let rhs_range = rhs_ranges[0];
+        start = start.min(lhs_range.start);
+        end = end.max(lhs_range.end);
+        start = start.min(rhs_range.start);
+        end = end.max(rhs_range.end);
+        let offset = TimeDelta::milliseconds(((rhs_range.start - lhs_range.start) * 1000.0) as i64);
+        initial_offsets.insert(audio.0, TimeDelta::zero().checked_sub(&offset).unwrap());
+        debug!(
+            "Found initial offset of {}ms ({} - {} {}s) ({} - {} {}s) for format {} to {}",
+            offset.num_milliseconds(),
+            lhs_range.start,
+            lhs_range.end,
+            lhs_range.end - lhs_range.start,
+            rhs_range.start,
+            rhs_range.end,
+            rhs_range.end - rhs_range.start,
+            audio.0,
+            base_audio.0
+        );
+    }
+
+    debug!(
+        "Found matching audio parts at {} - {}, narrowing search",
+        start, end
+    );
+
+    let start = TimeDelta::milliseconds((start * 1000.0) as i64 - 20000);
+    let end = TimeDelta::milliseconds((end * 1000.0) as i64 + 20000);
+
+    for sync_audio in &sync_audios {
+        let chromaprint = generate_chromaprint(
+            sync_audio.1,
+            sync_audio.2,
+            &start,
+            &end,
+            initial_offsets.get(&sync_audio.0).unwrap(),
+        )?;
+        chromaprints.insert(sync_audio.0, chromaprint);
+    }
+
+    let mut runs: HashMap<usize, i64> = HashMap::new();
+    let iterator_range_limits: i64 = 2 ^ sync_precision as i64;
+    for i in -iterator_range_limits..=iterator_range_limits {
+        let base_offset = TimeDelta::milliseconds(
+            ((0.128 / iterator_range_limits as f64 * i as f64) * 1000.0) as i64,
+        );
+        chromaprints.insert(
+            base_audio.0,
+            generate_chromaprint(base_audio.1, base_audio.2, &start, &end, &base_offset)?,
+        );
+        for audio in &sync_audios {
+            let initial_offset = initial_offsets.get(&audio.0).copied().unwrap();
+            let offset = find_offset(
+                (&base_audio.0, chromaprints.get(&base_audio.0).unwrap()),
+                &base_offset,
+                (&audio.0, chromaprints.get(&audio.0).unwrap()),
+                &initial_offset,
+                &start,
+                sync_tolerance,
+            );
+            if offset.is_none() {
+                continue;
+            }
+            let offset = offset.unwrap();
+
+            result.insert(
+                audio.0,
+                result
+                    .get(&audio.0)
+                    .copied()
+                    .unwrap_or_default()
+                    .checked_add(&offset)
+                    .unwrap(),
+            );
+            runs.insert(audio.0, runs.get(&audio.0).copied().unwrap_or_default() + 1);
+        }
+    }
+    let mut result: HashMap<usize, TimeDelta> = result
+        .iter()
+        .map(|(format_id, offset)| {
+            (
+                *format_id,
+                TimeDelta::milliseconds(
+                    offset.num_milliseconds() / runs.get(format_id).copied().unwrap(),
+                ),
+            )
+        })
+        .collect();
+    result.insert(base_audio.0, TimeDelta::milliseconds(0));
+
+    Ok(Some(result))
+}
+
+fn find_offset(
+    lhs: (&usize, &Vec<u32>),
+    lhs_shift: &TimeDelta,
+    rhs: (&usize, &Vec<u32>),
+    rhs_shift: &TimeDelta,
+    start: &TimeDelta,
+    sync_tolerance: u32,
+) -> Option<TimeDelta> {
+    let (lhs_ranges, rhs_ranges) = compare_chromaprints(lhs.1, rhs.1, sync_tolerance);
+    if lhs_ranges.is_empty() || rhs_ranges.is_empty() {
+        return None;
+    }
+    let lhs_range = lhs_ranges[0];
+    let rhs_range = rhs_ranges[0];
+    let offset = rhs_range.end - lhs_range.end;
+    let offset = TimeDelta::milliseconds((offset * 1000.0) as i64)
+        .checked_add(lhs_shift)?
+        .checked_sub(rhs_shift)?;
+    debug!(
+        "Found offset of {}ms ({} - {} {}s) ({} - {} {}s) for format {} to {}",
+        offset.num_milliseconds(),
+        lhs_range.start + start.num_milliseconds() as f64 / 1000.0,
+        lhs_range.end + start.num_milliseconds() as f64 / 1000.0,
+        lhs_range.end - lhs_range.start,
+        rhs_range.start + start.num_milliseconds() as f64 / 1000.0,
+        rhs_range.end + start.num_milliseconds() as f64 / 1000.0,
+        rhs_range.end - rhs_range.start,
+        rhs.0,
+        lhs.0
+    );
+    Some(offset)
+}
+
+fn generate_chromaprint(
+    input_file: &Path,
+    sample_rate: u32,
+    start: &TimeDelta,
+    end: &TimeDelta,
+    offset: &TimeDelta,
+) -> Result<Vec<u32>> {
+    let mut ss_argument: &TimeDelta = &start.checked_sub(offset).unwrap();
+    let mut offset_argument = &TimeDelta::zero();
+    if *offset < TimeDelta::zero() {
+        ss_argument = start;
+        offset_argument = offset;
+    };
+
+    let mut printer = Fingerprinter::new(&Configuration::preset_test1());
+    printer.start(sample_rate, 2)?;
+
+    let mut command = Command::new("ffmpeg");
+    command
+        .arg("-hide_banner")
+        .arg("-y")
+        .args(["-ss", format_time_delta(ss_argument).as_str()]);
+
+    if end.is_zero().not() {
+        command.args(["-to", format_time_delta(end).as_str()]);
+    }
+
+    command
+        .args(["-itsoffset", format_time_delta(offset_argument).as_str()])
+        .args(["-i", input_file.to_string_lossy().to_string().as_str()])
+        .args(["-ac", "2"])
+        .args([
+            "-f",
+            if cfg!(target_endian = "big") {
+                "s16be"
+            } else {
+                "s16le"
+            },
+        ])
+        .arg("-");
+
+    let mut handle = command
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()?;
+
+    // the stdout is read in chunks because keeping all the raw audio data in memory would take up
+    // a significant amount of space
+    let mut stdout = handle.stdout.take().unwrap();
+    let mut buf: [u8; 128_000] = [0; 128_000];
+    while handle.try_wait()?.is_none() {
+        loop {
+            let read_bytes = stdout.read(&mut buf)?;
+            if read_bytes == 0 {
+                break;
+            }
+            let data: [i16; 64_000] = unsafe { mem::transmute(buf) };
+            printer.consume(&data[0..(read_bytes / 2)])
+        }
+    }
+
+    if !handle.wait()?.success() {
+        bail!("{}", std::io::read_to_string(handle.stderr.unwrap())?)
+    }
+
+    printer.finish();
+    return Ok(printer.fingerprint().into());
+}
+
+fn compare_chromaprints(
+    lhs_chromaprint: &Vec<u32>,
+    rhs_chromaprint: &Vec<u32>,
+    sync_tolerance: u32,
+) -> (Vec<TimeRange>, Vec<TimeRange>) {
+    let lhs_inverse_index = create_inverse_index(lhs_chromaprint);
+    let rhs_inverse_index = create_inverse_index(rhs_chromaprint);
+
+    let mut possible_shifts = HashSet::new();
+    for lhs_pair in lhs_inverse_index {
+        let original_point = lhs_pair.0;
+        for i in -2..=2 {
+            let modified_point = (original_point as i32 + i) as u32;
+            if rhs_inverse_index.contains_key(&modified_point) {
+                let rhs_index = rhs_inverse_index.get(&modified_point).copied().unwrap();
+                possible_shifts.insert(rhs_index as i32 - lhs_pair.1 as i32);
+            }
+        }
+    }
+
+    let mut all_lhs_time_ranges = vec![];
+    let mut all_rhs_time_ranges = vec![];
+    for shift_amount in possible_shifts {
+        let time_range_pair = find_time_ranges(
+            lhs_chromaprint,
+            rhs_chromaprint,
+            shift_amount,
+            sync_tolerance,
+        );
+        if time_range_pair.is_none() {
+            continue;
+        }
+        let (mut lhs_time_ranges, mut rhs_time_ranges) = time_range_pair.unwrap();
+        let mut lhs_time_ranges: Vec<TimeRange> = lhs_time_ranges
+            .drain(..)
+            .filter(|time_range| {
+                (20.0 < (time_range.end - time_range.start))
+                    && ((time_range.end - time_range.start) < 180.0)
+                    && time_range.end > 0.0
+            })
+            .collect();
+        lhs_time_ranges.sort_by(|a, b| (b.end - b.start).total_cmp(&(a.end - a.start)));
+        let mut rhs_time_ranges: Vec<TimeRange> = rhs_time_ranges
+            .drain(..)
+            .filter(|time_range| {
+                (20.0 < (time_range.end - time_range.start))
+                    && ((time_range.end - time_range.start) < 180.0)
+                    && time_range.end > 0.0
+            })
+            .collect();
+        rhs_time_ranges.sort_by(|a, b| (b.end - b.start).total_cmp(&(a.end - a.start)));
+        if lhs_time_ranges.is_empty() || rhs_time_ranges.is_empty() {
+            continue;
+        }
+
+        all_lhs_time_ranges.push(lhs_time_ranges[0]);
+        all_rhs_time_ranges.push(rhs_time_ranges[0]);
+    }
+    all_lhs_time_ranges.sort_by(|a, b| (a.end - a.start).total_cmp(&(b.end - b.start)));
+    all_lhs_time_ranges.reverse();
+    all_rhs_time_ranges.sort_by(|a, b| (a.end - a.start).total_cmp(&(b.end - b.start)));
+    all_rhs_time_ranges.reverse();
+
+    (all_lhs_time_ranges, all_rhs_time_ranges)
+}
+
+fn create_inverse_index(chromaprint: &Vec<u32>) -> HashMap<u32, usize> {
+    let mut inverse_index = HashMap::with_capacity(chromaprint.capacity());
+    for (i, fingerprint) in chromaprint.iter().enumerate().take(chromaprint.capacity()) {
+        inverse_index.insert(*fingerprint, i);
+    }
+    inverse_index
+}
+
+fn find_time_ranges(
+    lhs_chromaprint: &[u32],
+    rhs_chromaprint: &[u32],
+    shift_amount: i32,
+    sync_tolerance: u32,
+) -> Option<(Vec<TimeRange>, Vec<TimeRange>)> {
+    let mut lhs_shift: i32 = 0;
+    let mut rhs_shift: i32 = 0;
+    if shift_amount < 0 {
+        lhs_shift -= shift_amount;
+    } else {
+        rhs_shift += shift_amount;
+    }
+
+    let mut lhs_matching_timestamps = vec![];
+    let mut rhs_matching_timestamps = vec![];
+    let upper_limit =
+        cmp::min(lhs_chromaprint.len(), rhs_chromaprint.len()) as i32 - shift_amount.abs();
+
+    for i in 0..upper_limit {
+        let lhs_position = i + lhs_shift;
+        let rhs_position = i + rhs_shift;
+        let difference = (lhs_chromaprint[lhs_position as usize]
+            ^ rhs_chromaprint[rhs_position as usize])
+            .count_ones();
+
+        if difference > sync_tolerance {
+            continue;
+        }
+
+        lhs_matching_timestamps.push(lhs_position as f64 * 0.128);
+        rhs_matching_timestamps.push(rhs_position as f64 * 0.128);
+    }
+    lhs_matching_timestamps.push(f64::MAX);
+    rhs_matching_timestamps.push(f64::MAX);
+
+    let lhs_time_ranges = timestamps_to_ranges(lhs_matching_timestamps);
+    lhs_time_ranges.as_ref()?;
+    let lhs_time_ranges = lhs_time_ranges.unwrap();
+    let rhs_time_ranges = timestamps_to_ranges(rhs_matching_timestamps).unwrap();
+
+    Some((lhs_time_ranges, rhs_time_ranges))
+}
+
+fn timestamps_to_ranges(mut timestamps: Vec<f64>) -> Option<Vec<TimeRange>> {
+    if timestamps.is_empty() {
+        return None;
+    }
+
+    timestamps.sort_by(|a, b| a.total_cmp(b));
+
+    let mut time_ranges = vec![];
+    let mut current_range = TimeRange {
+        start: timestamps[0],
+        end: timestamps[0],
+    };
+
+    for i in 0..timestamps.len() - 1 {
+        let current = timestamps[i];
+        let next = timestamps[i + 1];
+        if next - current <= 1.0 {
+            current_range.end = next;
+            continue;
+        }
+
+        time_ranges.push(current_range);
+        current_range.start = next;
+        current_range.end = next;
+    }
+    if !time_ranges.is_empty() {
+        Some(time_ranges)
+    } else {
+        None
+    }
+}

crunchy-cli-core/src/utils/video.rs

@@ -1,67 +1,46 @@
 use anyhow::{bail, Result};
-use crunchyroll_rs::media::{Resolution, Stream, VariantData};
+use crunchyroll_rs::media::{Resolution, Stream, StreamData};
 use crunchyroll_rs::Locale;
 
-pub async fn variant_data_from_stream(
+pub async fn stream_data_from_stream(
     stream: &Stream,
     resolution: &Resolution,
-    subtitle: Option<Locale>,
+    hardsub_subtitle: Option<Locale>,
-) -> Result<Option<(VariantData, VariantData, bool)>> {
+) -> Result<Option<(StreamData, StreamData, bool)>> {
-    // sometimes Crunchyroll marks episodes without real subtitles that they have subtitles and
+    let (hardsub_locale, mut contains_hardsub) = if hardsub_subtitle.is_some() {
-    // reports that only hardsub episode are existing. the following lines are trying to prevent
+        (hardsub_subtitle, true)
-    // potential errors which might get caused by this incorrect reporting
-    // (https://github.com/crunchy-labs/crunchy-cli/issues/231)
-    let mut hardsub_locales = stream.streaming_hardsub_locales();
-    let (hardsub_locale, mut contains_hardsub) = if !hardsub_locales
-        .contains(&Locale::Custom("".to_string()))
-        && !hardsub_locales.contains(&Locale::Custom(":".to_string()))
-    {
-        // if only one hardsub locale exists, assume that this stream doesn't really contains hardsubs
-        if hardsub_locales.len() == 1 {
-            (Some(hardsub_locales.remove(0)), false)
     } else {
-            // fallback to `None`. this should trigger an error message in `stream.dash_streaming_data`
-            // that the requested stream is not available
         (None, false)
-        }
-    } else {
-        let hardsubs_requested = subtitle.is_some();
-        (subtitle, hardsubs_requested)
     };
 
-    let mut streaming_data = match stream.dash_streaming_data(hardsub_locale).await {
+    let (mut videos, mut audios) = match stream.stream_data(hardsub_locale).await {
         Ok(data) => data,
         Err(e) => {
             // the error variant is only `crunchyroll_rs::error::Error::Input` when the requested
             // hardsub is not available
             if let crunchyroll_rs::error::Error::Input { .. } = e {
                 contains_hardsub = false;
-                stream.dash_streaming_data(None).await?
+                stream.stream_data(None).await?
             } else {
                 bail!(e)
             }
         }
-    };
+    }
-    streaming_data
+    .unwrap();
-        .0
+
-        .sort_by(|a, b| a.bandwidth.cmp(&b.bandwidth).reverse());
+    if videos.iter().any(|v| v.drm.is_some()) || audios.iter().any(|v| v.drm.is_some()) {
-    streaming_data
+        bail!("Stream is DRM protected")
-        .1
+    }
-        .sort_by(|a, b| a.bandwidth.cmp(&b.bandwidth).reverse());
+
+    videos.sort_by(|a, b| a.bandwidth.cmp(&b.bandwidth).reverse());
+    audios.sort_by(|a, b| a.bandwidth.cmp(&b.bandwidth).reverse());
 
     let video_variant = match resolution.height {
-        u64::MAX => Some(streaming_data.0.into_iter().next().unwrap()),
+        u64::MAX => Some(videos.into_iter().next().unwrap()),
-        u64::MIN => Some(streaming_data.0.into_iter().last().unwrap()),
+        u64::MIN => Some(videos.into_iter().last().unwrap()),
-        _ => streaming_data
+        _ => videos
-            .0
             .into_iter()
-            .find(|v| resolution.height == v.resolution.height),
+            .find(|v| resolution.height == v.resolution().unwrap().height),
     };
-    Ok(video_variant.map(|v| {
+    Ok(video_variant.map(|v| (v, audios.first().unwrap().clone(), contains_hardsub)))
-        (
-            v,
-            streaming_data.1.first().unwrap().clone(),
-            contains_hardsub,
-        )
-    }))
 }

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1692128808,
+        "lastModified": 1710534455,
-        "narHash": "sha256-Di1Zm/P042NuwThMiZNrtmaAjd4Tm2qBOKHX7xUOfMk=",
+        "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4ed9856be002a730234a1a1ed9dcd9dd10cbdb40",
+        "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212",
         "type": "github"
       },
       "original": {
@@ -41,11 +41,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1689068808,
+        "lastModified": 1710146030,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -26,7 +26,7 @@
           };
 
           buildNoDefaultFeatures = true;
-          buildFeatures = [ "openssl" ];
+          buildFeatures = [ "openssl-tls" ];
 
           nativeBuildInputs = [
             pkgs.pkg-config

src/main.rs

@@ -8,5 +8,5 @@ compile_error!("At least one tls feature must be activated");
 
 #[tokio::main]
 async fn main() {
-    crunchy_cli_core::cli_entrypoint().await
+    crunchy_cli_core::main(&std::env::args().collect::<Vec<String>>()).await
 }