Compare commits
10 Commits
25fe7f6ac9
...
v0.2.0
| Author | SHA1 | Date | |
|---|---|---|---|
| de01cedee0 | |||
| 2730fa3cae | |||
| 91a831c5f9 | |||
| 52e9ae0ab7 | |||
| 64d8b40e61 | |||
| 0cc15c8d90 | |||
| 1d3abd53d4 | |||
| 592cfd4093 | |||
| 69e12cf5b9 | |||
| c9e3aa92ec |
21
.github/workflows/release.yml
vendored
21
.github/workflows/release.yml
vendored
@@ -29,7 +29,7 @@ jobs:
|
|||||||
- os: ubuntu-24.04-arm
|
- os: ubuntu-24.04-arm
|
||||||
arch: arm64
|
arch: arm64
|
||||||
plat: linux
|
plat: linux
|
||||||
- os: macos-latest
|
- os: macos-15-intel
|
||||||
arch: x64
|
arch: x64
|
||||||
plat: darwin
|
plat: darwin
|
||||||
- os: macos-14
|
- os: macos-14
|
||||||
@@ -47,6 +47,15 @@ jobs:
|
|||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: bun install
|
run: bun install
|
||||||
|
|
||||||
|
- name: Install fftw (cavacore build dependency)
|
||||||
|
run: |
|
||||||
|
if uname -s | grep -qi darwin; then
|
||||||
|
brew install fftw
|
||||||
|
else
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y libfftw3-dev
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Build native cavacore library
|
- name: Build native cavacore library
|
||||||
run: scripts/build-cavacore.sh
|
run: scripts/build-cavacore.sh
|
||||||
|
|
||||||
@@ -57,8 +66,14 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
DIST_TAR: podtui-${{ matrix.plat }}-${{ matrix.arch }}.tar.gz
|
DIST_TAR: podtui-${{ matrix.plat }}-${{ matrix.arch }}.tar.gz
|
||||||
run: |
|
run: |
|
||||||
tar -xzf dist/$DIST_TAR -C dist
|
# The embedded runtime reads the launching process's CWD bunfig.toml.
|
||||||
./dist/podtui --version
|
# This repo's bunfig lists a preload the standalone can't resolve
|
||||||
|
# ("preload not found"), so kicking the binary from the workspace root
|
||||||
|
# would falsely fail every build. cd into a clean dir first.
|
||||||
|
SMOKE_DIR=$(mktemp -d)
|
||||||
|
tar -xzf "dist/$DIST_TAR" -C "$SMOKE_DIR"
|
||||||
|
cd "$SMOKE_DIR"
|
||||||
|
./podtui-*/podtui --version
|
||||||
|
|
||||||
- name: Upload artifact
|
- name: Upload artifact
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
|
|||||||
193
CONTRIBUTING.md
Normal file
193
CONTRIBUTING.md
Normal file
@@ -0,0 +1,193 @@
|
|||||||
|
# Contributing to PodTui
|
||||||
|
|
||||||
|
This file is written **for humans**. If you're an AI agent or LLM working in
|
||||||
|
this repo, read [AGENTS.md](AGENTS.md) instead — it has the machine-oriented
|
||||||
|
build/test/lint contract and code-style rules. Both describe the same project;
|
||||||
|
CONTRIBUTING.md focuses on *understanding* and *navigating* the codebase.
|
||||||
|
|
||||||
|
PodTui is a keyboard-first, yazi-style terminal podcast client. TypeScript +
|
||||||
|
[OpenTUI](https://github.com/opentui/opentui) on top, [Bun](https://bun.sh)
|
||||||
|
as the runtime and toolchain.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Quick start
|
||||||
|
|
||||||
|
```bash
|
||||||
|
brew install bun # or: curl -fsSL https://bun.sh/install | bash
|
||||||
|
git clone git@github.com:mikefreno/podtui.git
|
||||||
|
cd podtui
|
||||||
|
|
||||||
|
bun install # install JS dependencies
|
||||||
|
make native # build libcavacore.dylib from the vendored C source
|
||||||
|
bun run dev # launch with hot reload (alias: make dev)
|
||||||
|
```
|
||||||
|
|
||||||
|
The app is a TUI — it expects a real terminal (Ghostty, kitty, iTerm2,
|
||||||
|
WezTerm, tmux, …). It will not render in a plain captured `bash` session.
|
||||||
|
|
||||||
|
## What each command does
|
||||||
|
|
||||||
|
| Command | Purpose |
|
||||||
|
|--------------------|--------------------------------------------------------------------------|
|
||||||
|
| `bun install` | Install JS dependencies |
|
||||||
|
| `make native` | Compile `cava/cavacore.c` → `src/native/libcavacore.<dylib\|so>` |
|
||||||
|
| `bun run dev` | Run with hot reload |
|
||||||
|
| `bun run start` | Run once (no watch) |
|
||||||
|
| `bun test` | Run the test suite (see [Testing](#testing)) |
|
||||||
|
| `bun run lint` | Type-check |
|
||||||
|
| `bun run build` | Bundle JS into `dist/` + copy native libs (the `podtui` npm script path) |
|
||||||
|
| `make dist` | Compile the standalone binary + make the current platform's tarball |
|
||||||
|
| `make clean` | Remove `dist/` |
|
||||||
|
|
||||||
|
## Repository layout
|
||||||
|
|
||||||
|
```
|
||||||
|
src/
|
||||||
|
api/ Network + XML/RSS — client.ts, rss-parser.ts
|
||||||
|
components/ Reusable UI pieces: Shell, Navigation, YaziPaneRow, TabPanel…
|
||||||
|
config/ App config: keybinds.jsonc, shortcuts, auth
|
||||||
|
constants/ Static tables (sync formats, themes)
|
||||||
|
context/ Solid contexts: KeybindContext, NavigationContext, ThemeContext
|
||||||
|
hooks/ useAudio, useMultimediaKeys, useCachedData
|
||||||
|
native/ FFI glue + the built libcavacore.{dylib,so}
|
||||||
|
pages/ App screens: Feed, MyShows, Discover, Search, Player, Settings
|
||||||
|
stores/ Zustand stores — app, feed, audio-nav, search, auth, progress…
|
||||||
|
styles/ theme.css
|
||||||
|
themes/ catppuccin, gruvbox, nord, tokyo schemes + schema.json
|
||||||
|
types/ All shared interfaces (podcast, episode, feed, settings…)
|
||||||
|
ui/ Modal-adjacent UI: command.tsx, dialog.tsx, toast.tsx
|
||||||
|
utils/ Parser/persistence/audio helpers (audio-player, config-dir…)
|
||||||
|
scripts/
|
||||||
|
build-cavacore.sh C → shared lib; finds libfftw3.a on macOS & Debian
|
||||||
|
tui-harness.tsx Headless harness for scripted interaction (see below)
|
||||||
|
cava/ Vendored cavacore C source (MIT, from karlstav/cava)
|
||||||
|
tests/ bun test suite + cavacore smoke test
|
||||||
|
dist/ Build output (JS bundle + libs + tarballs)
|
||||||
|
```
|
||||||
|
|
||||||
|
## Native libraries: how the FFI layer works
|
||||||
|
|
||||||
|
PodTui loads **two** native libraries at runtime:
|
||||||
|
|
||||||
|
1. **libopentui** — the OpenTUI renderer (shipped inside the
|
||||||
|
`@opentui/core-<platform>-<arch>` npm packages, copied to `dist/` by
|
||||||
|
`build.ts`).
|
||||||
|
2. **libcavacore** — the audio spectrum renderer, built from C. The source is
|
||||||
|
vendored under `cava/` (it must stay committed — every CI runner builds it).
|
||||||
|
`libfftw3` is needed to build it:
|
||||||
|
- macOS: `brew install fftw`
|
||||||
|
- Debian/Ubuntu: `apt-get install libfftw3-dev`
|
||||||
|
(CI installs it for you; locally run `make native`.)
|
||||||
|
|
||||||
|
**Critical sibling rule**: both libraries are loaded *relative to the binary*,
|
||||||
|
so `podtui`, `libopentui.*` and `libcavacore.*` must sit in the **same
|
||||||
|
directory**. Never move a single binary out of the tarball. The Homebrew
|
||||||
|
formula keeps all three in `libexec/` and exposes only a `podtui` symlink.
|
||||||
|
|
||||||
|
Cavacore smoke test: `bun tests/cavacore-smoke.ts`
|
||||||
|
(FFI-calls `cava_init` / `cava_execute` / `cava_destroy` and prints results).
|
||||||
|
|
||||||
|
## Gotchas (read before touching anything)
|
||||||
|
|
||||||
|
1. **Never add a top-level `preload` to `bunfig.toml`.**
|
||||||
|
A compiled PodTui binary's embedded runtime reads the *launching process's*
|
||||||
|
CWD `bunfig.toml`, and a `preload` entry points at a module the standalone
|
||||||
|
can't resolve (`@opentui/solid/preload`) → the binary dies at startup with
|
||||||
|
`preload not found`. This is why `bunfig.toml` has **no** top-level
|
||||||
|
`preload`; dev-mode preloading happens via explicit `--preload` flags in
|
||||||
|
`package.json`. The `[test]` section *does* keep a preload — that only
|
||||||
|
affects `bun test`.
|
||||||
|
|
||||||
|
2. **Smoke-test the compiled binary from a bunfig-free dir.**
|
||||||
|
Because of (1), `./dist/podtui --version` run from the repo root launched
|
||||||
|
inside CI would fail. CI always unpacks the tarball into a `mktemp` dir
|
||||||
|
before booting. Do the same when testing a release build locally.
|
||||||
|
|
||||||
|
3. **Homebrew's dylib-repair warning is benign.**
|
||||||
|
`brew install` may print “load commands do not fit in the header … needs
|
||||||
|
`-headerpad`” for a prebuilt dylib. The app dlopens the libs by path, so
|
||||||
|
the warning is cosmetic; installs complete and the app boots.
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bun test # full suite (54 tests across 6 files today)
|
||||||
|
```
|
||||||
|
|
||||||
|
The suite covers the keyboard/nav model, keybind dispatch, and the yazi pane
|
||||||
|
logic; plus `tests/cavacore-smoke.ts` asserting the native lib exports.
|
||||||
|
|
||||||
|
For scripted end-to-end interaction there's a **headless harness**,
|
||||||
|
`scripts/tui-harness.tsx`: each invocation snapshot-rebuilds the app state
|
||||||
|
into a sandboxed `.harness/` config dir, replays the saved action log
|
||||||
|
(`.harness/actions.json`), executes one more key/action passed on the CLI, and
|
||||||
|
prints the resulting frame + a style summary — all without a real terminal.
|
||||||
|
Audio is a no-op during those snapshots. The last frame lands in
|
||||||
|
`.harness/last-frame.{json,txt}` for inspection.
|
||||||
|
|
||||||
|
## Releasing
|
||||||
|
|
||||||
|
Releases are built and published from **tags**
|
||||||
|
|
||||||
|
### Steps
|
||||||
|
|
||||||
|
1. Bump `VERSION` in `src/index.tsx` (e.g. `0.1.0` → `0.2.0`). Commit and push.
|
||||||
|
2. Tag and push:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git tag -a v0.2.0 -m 'PodTUI v0.2.0' && git push gh v0.2.0
|
||||||
|
```
|
||||||
|
|
||||||
|
3. CI (`.github/workflows/release.yml`) runs four builds in parallel,
|
||||||
|
each producing `podtui-<platform>-<arch>.tar.gz`:
|
||||||
|
|
||||||
|
| Runner | Platform/Arch |
|
||||||
|
|---------------------|---------------|
|
||||||
|
| `ubuntu-latest` | linux-x64 |
|
||||||
|
| `ubuntu-24.04-arm` | linux-arm64 |
|
||||||
|
| `macos-15-intel` | darwin-x64 |
|
||||||
|
| `macos-14` | darwin-arm64 |
|
||||||
|
|
||||||
|
Each runner: installs deps → installs fftw → `scripts/build-cavacore.sh`
|
||||||
|
→ `make dist` → smoke-boots the binary from a temp dir → uploads the
|
||||||
|
tarball. (`macos-15-intel` matters: GitHub's `macos-latest` is arm64 now.)
|
||||||
|
|
||||||
|
4. A release is auto-created with all 4 tarballs attached. `brew` never
|
||||||
|
sees the new version: the **tap self-updates**: the
|
||||||
|
`mikefreno/homebrew-podtui` repo has a scheduled workflow (hourly) that
|
||||||
|
polls GitHub releases, and when a new tag appears, rewrites
|
||||||
|
`Formula/podtui.rb` (URLs + arm64/x64 `sha256`) and pushes it — no
|
||||||
|
secrets. See `scripts/sync-formula.sh` in that repo for the logic. Local
|
||||||
|
test: `brew install mikefreno/podtui/podtui`.
|
||||||
|
|
||||||
|
### Manual fallback
|
||||||
|
|
||||||
|
If you ever need to sync the tap by hand (or before the hourly job runs):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd <clone of mikefreno/homebrew-podtui>
|
||||||
|
./scripts/sync-formula.sh 0.2.0
|
||||||
|
git commit -am 'podtui 0.2.0' && git push
|
||||||
|
```
|
||||||
|
|
||||||
|
### Local release build
|
||||||
|
|
||||||
|
```bash
|
||||||
|
make dist # builds the binary + tarball for THIS machine only
|
||||||
|
```
|
||||||
|
|
||||||
|
Bun cannot cross-compile — the other platforms come from CI.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Open items / things to sort out
|
||||||
|
|
||||||
|
- **LICENSE**: `README.md` says "TBD — choose and document a license before
|
||||||
|
the first release". Pick one (MIT/BSD-3) and add `LICENSE` + update the
|
||||||
|
README footer.
|
||||||
|
- **Native libs in `dist/` still need committing?** No — they're built from
|
||||||
|
sources kept in the repo (`cava/`, `node_modules/@opentui/core-*`). Only
|
||||||
|
`src/native/libcavacore.dylib` is a committed binary artifact; macOS arm64
|
||||||
|
ships from it directly until a full rebuild replaces it. On other hosts the
|
||||||
|
`make native` build is required — see `scripts/build-cavacore.sh`.
|
||||||
11
Makefile
11
Makefile
@@ -47,18 +47,19 @@ native:
|
|||||||
scripts/build-cavacore.sh
|
scripts/build-cavacore.sh
|
||||||
|
|
||||||
## Standalone binary + native-libs tarball for the current platform.
|
## Standalone binary + native-libs tarball for the current platform.
|
||||||
## Compiles against an empty bunfig so the binary does not bake the
|
## Unaffected by bunfig.toml at build time. Note: the compiled runtime reads
|
||||||
## @opentui/solid/preload entry (which would break the compiled executable).
|
## the launching process's CWD bunfig.toml, so smoke tests must run the binary
|
||||||
|
## from a bunfig-free dir (see release.yml).
|
||||||
dist:
|
dist:
|
||||||
BUN_CONFIG=bunfig.standalone.toml bun run build.ts --compile
|
bun run build.ts --compile
|
||||||
|
|
||||||
## macOS build (run on a macOS runner / host).
|
## macOS build (run on a macOS runner / host).
|
||||||
dist-mac:
|
dist-mac:
|
||||||
BUN_CONFIG=bunfig.standalone.toml bun run build.ts --compile
|
bun run build.ts --compile
|
||||||
|
|
||||||
## Linux build (run on a Linux runner / host).
|
## Linux build (run on a Linux runner / host).
|
||||||
dist-linux:
|
dist-linux:
|
||||||
BUN_CONFIG=bunfig.standalone.toml bun run build.ts --compile
|
bun run build.ts --compile
|
||||||
|
|
||||||
## Remove build artifacts.
|
## Remove build artifacts.
|
||||||
clean:
|
clean:
|
||||||
|
|||||||
12
README.md
12
README.md
@@ -70,6 +70,11 @@ sudo install -m755 podtui /usr/local/bin/podtui
|
|||||||
> The tarball contains `podtui` plus `libopentui.<ext>` and
|
> The tarball contains `podtui` plus `libopentui.<ext>` and
|
||||||
> `libcavacore.<ext>` **beside it** — keep them together (don't move just the
|
> `libcavacore.<ext>` **beside it** — keep them together (don't move just the
|
||||||
> binary alone), or the native FFI libraries won't load.
|
> binary alone), or the native FFI libraries won't load.
|
||||||
|
>
|
||||||
|
> One caveat: the embedded runtime reads a `bunfig.toml` from the directory
|
||||||
|
> you launch from. If that file has a `preload` entry (as Bun project
|
||||||
|
> directories often do), startup fails with `preload not found`. Launching
|
||||||
|
> from a normal directory (home, `~/bin`, …) works fine.
|
||||||
|
|
||||||
### 3. Arch Linux (AUR)
|
### 3. Arch Linux (AUR)
|
||||||
|
|
||||||
@@ -187,9 +192,10 @@ make dist-mac # (run on macOS) → podtui-darwin-<arch>.tar.gz
|
|||||||
make dist-linux # (run on Linux) → podtui-linux-<arch>.tar.gz
|
make dist-linux # (run on Linux) → podtui-linux-<arch>.tar.gz
|
||||||
```
|
```
|
||||||
|
|
||||||
`make dist` compiles against `bunfig.standalone.toml` (a preload-free Bun
|
`make dist` emits a config-independent binary: Bun does not bake bunfig
|
||||||
config) so the emitted binary doesn't bake in the dev-only `@opentui/solid`
|
settings into `--compile` output, and the solid JSX transform is registered in
|
||||||
preload. The solid JSX transform is registered in `build.ts` itself.
|
`build.ts` itself. The binary then embeds the `preload`-free runtime, so launch
|
||||||
|
it from any normal directory.
|
||||||
|
|
||||||
## Packaging model
|
## Packaging model
|
||||||
|
|
||||||
|
|||||||
5
build.ts
5
build.ts
@@ -5,9 +5,8 @@ import { plugin } from "bun";
|
|||||||
|
|
||||||
// Register the solid transform globally (dedup'd by name). This is what makes
|
// Register the solid transform globally (dedup'd by name). This is what makes
|
||||||
// `--compile` work: compile-mode builds only apply `onLoad` transform plugins
|
// `--compile` work: compile-mode builds only apply `onLoad` transform plugins
|
||||||
// that are registered via `plugin()`, not the `plugins:` array. The compiled
|
// that are registered via `plugin()`, not the `plugins:` array. The transform
|
||||||
// binary is then built against an empty bunfig (PODTUI_COMPILE config) so the
|
// is fully embedded in the compiled binary.
|
||||||
// runtime bakes NO preload — the solid transform is already in the binary.
|
|
||||||
plugin(solidPlugin);
|
plugin(solidPlugin);
|
||||||
|
|
||||||
const COMPILE =
|
const COMPILE =
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
# Standalone compile config for `bun build --compile` / `make dist`.
|
|
||||||
#
|
|
||||||
# This file MUST stay free of a `preload` key: Bun bakes bunfig preloads into
|
|
||||||
# compiled binaries as launch metadata, and `@opentui/solid/preload` (used for
|
|
||||||
# `bun run` dev/test) isn't embedded in the standalone, so a baked-in preload
|
|
||||||
# makes the compiled binary fail at startup with:
|
|
||||||
# error: preload not found "@opentui/solid/preload"
|
|
||||||
#
|
|
||||||
# The solid JSX transform is registered in build.ts itself (`plugin(solidPlugin)`),
|
|
||||||
# so compiling against this config needs no global preload. Invoke as:
|
|
||||||
# BUN_CONFIG=bunfig.standalone.toml bun run build.ts --compile
|
|
||||||
@@ -1,4 +1,9 @@
|
|||||||
preload = ["@opentui/solid/preload"]
|
# NO top-level `preload` here — intentional. A compiled PodTUI binary's
|
||||||
|
# embedded Bun runtime reads the launching process's CWD bunfig.toml, and a
|
||||||
|
# top-level `preload` entry (e.g. "@opentui/solid/preload", which the
|
||||||
|
# standalone cannot resolve) makes the binary die at startup with
|
||||||
|
# "preload not found". Dev/test still get the solid transform via explicit
|
||||||
|
# `--preload` flags in package.json and the [test] section below.
|
||||||
|
|
||||||
[test]
|
[test]
|
||||||
preload = "@opentui/solid/preload"
|
preload = "@opentui/solid/preload"
|
||||||
|
|||||||
19
cava/LICENSE-cava.txt
Normal file
19
cava/LICENSE-cava.txt
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
Copyright (c) 2015 Karl Stavestrand <karl@stavestrand.no>
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
588
cava/cavacore.c
Normal file
588
cava/cavacore.c
Normal file
@@ -0,0 +1,588 @@
|
|||||||
|
#include "cavacore.h"
|
||||||
|
#ifndef M_PI
|
||||||
|
#define M_PI 3.1415926535897932385
|
||||||
|
#endif
|
||||||
|
#include <fftw3.h>
|
||||||
|
#include <math.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#ifdef __ANDROID__
|
||||||
|
#include <jni.h>
|
||||||
|
struct cava_plan *plan;
|
||||||
|
double *cava_in;
|
||||||
|
double *cava_out;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static double amplitude_to_decibels(double value) {
|
||||||
|
// Magic number 20 comes from converting amplitude ratios to decibels.
|
||||||
|
return 20 * log10(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
struct cava_plan *cava_init(int number_of_bars, unsigned int rate, int channels, int autosens,
|
||||||
|
double noise_reduction, int low_cut_off, int high_cut_off,
|
||||||
|
int scaling_mode) {
|
||||||
|
struct cava_plan *p = malloc(sizeof(struct cava_plan));
|
||||||
|
p->status = 0;
|
||||||
|
|
||||||
|
// sanity checks:
|
||||||
|
if (channels < 1 || channels > 2) {
|
||||||
|
snprintf(p->error_message, 1024,
|
||||||
|
"cava_init called with illegal number of channels: %d, number of channels "
|
||||||
|
"supported are "
|
||||||
|
"1 and 2",
|
||||||
|
channels);
|
||||||
|
p->status = -1;
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
if (rate < 1 || rate > 384000) {
|
||||||
|
snprintf(p->error_message, 1024, "cava_init called with illegal sample rate: %d\n", rate);
|
||||||
|
p->status = -1;
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
int fft_buffer_size = 512;
|
||||||
|
|
||||||
|
if (rate > 8125 && rate <= 16250)
|
||||||
|
fft_buffer_size *= 2;
|
||||||
|
else if (rate > 16250 && rate <= 32500)
|
||||||
|
fft_buffer_size *= 4;
|
||||||
|
else if (rate > 32500 && rate <= 75000)
|
||||||
|
fft_buffer_size *= 8;
|
||||||
|
else if (rate > 75000 && rate <= 150000)
|
||||||
|
fft_buffer_size *= 16;
|
||||||
|
else if (rate > 150000 && rate <= 300000)
|
||||||
|
fft_buffer_size *= 32;
|
||||||
|
else if (rate > 300000)
|
||||||
|
fft_buffer_size *= 64;
|
||||||
|
|
||||||
|
if (number_of_bars < 1) {
|
||||||
|
snprintf(p->error_message, 1024,
|
||||||
|
"cava_init called with illegal number of bars: %d, number of channels must be "
|
||||||
|
"positive integer\n",
|
||||||
|
number_of_bars);
|
||||||
|
p->status = -1;
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (number_of_bars > fft_buffer_size / 2 + 1) {
|
||||||
|
snprintf(p->error_message, 1024,
|
||||||
|
"cava_init called with illegal number of bars: %d, for %d sample rate number of "
|
||||||
|
"bars can't be more than %d\n",
|
||||||
|
number_of_bars, rate, fft_buffer_size / 2 + 1);
|
||||||
|
p->status = -1;
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
if (low_cut_off < 1 || high_cut_off < 1) {
|
||||||
|
snprintf(p->error_message, 1024, "low_cut_off must be a positive value\n");
|
||||||
|
p->status = -1;
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
if (low_cut_off >= high_cut_off) {
|
||||||
|
snprintf(p->error_message, 1024, "high_cut_off must be a higher than low_cut_off\n");
|
||||||
|
p->status = -1;
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
if ((unsigned int)high_cut_off > rate / 2) {
|
||||||
|
snprintf(p->error_message, 1024,
|
||||||
|
"high_cut_off can't be higher than sample rate / 2. (Nyquist Sampling Theorem)\n");
|
||||||
|
p->status = -1;
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
if (scaling_mode != CAVA_SCALING_LINEAR && scaling_mode != CAVA_SCALING_DECIBEL) {
|
||||||
|
snprintf(p->error_message, 1024, "unknown scaling mode: %d\n", scaling_mode);
|
||||||
|
p->status = -1;
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
p->number_of_bars = number_of_bars;
|
||||||
|
p->audio_channels = channels;
|
||||||
|
p->rate = rate;
|
||||||
|
p->autosens = 1;
|
||||||
|
p->sens_init = 1;
|
||||||
|
p->sens = 1.0;
|
||||||
|
p->autosens = autosens;
|
||||||
|
p->framerate = 75;
|
||||||
|
p->frame_skip = 1;
|
||||||
|
p->noise_reduction = noise_reduction;
|
||||||
|
p->scaling_mode = scaling_mode;
|
||||||
|
|
||||||
|
int fftw_flag = FFTW_MEASURE;
|
||||||
|
#ifdef __ANDROID__
|
||||||
|
fftw_flag = FFTW_ESTIMATE;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
p->FFTbassbufferSize = fft_buffer_size * 2;
|
||||||
|
p->FFTbufferSize = fft_buffer_size;
|
||||||
|
|
||||||
|
p->input_buffer_size = p->FFTbassbufferSize * channels;
|
||||||
|
|
||||||
|
p->input_buffer = (double *)malloc(p->input_buffer_size * sizeof(double));
|
||||||
|
|
||||||
|
p->FFTbuffer_lower_cut_off = (int *)malloc((number_of_bars + 1) * sizeof(int));
|
||||||
|
p->FFTbuffer_upper_cut_off = (int *)malloc((number_of_bars + 1) * sizeof(int));
|
||||||
|
p->eq = (double *)malloc((number_of_bars + 1) * sizeof(double));
|
||||||
|
p->cut_off_frequency = (float *)malloc((number_of_bars + 1) * sizeof(float));
|
||||||
|
|
||||||
|
p->cava_fall = (double *)malloc(number_of_bars * channels * sizeof(double));
|
||||||
|
p->cava_mem = (double *)malloc(number_of_bars * channels * sizeof(double));
|
||||||
|
p->cava_peak = (double *)malloc(number_of_bars * channels * sizeof(double));
|
||||||
|
p->prev_cava_out = (double *)malloc(number_of_bars * channels * sizeof(double));
|
||||||
|
|
||||||
|
// Hann Window calculate multipliers
|
||||||
|
p->bass_multiplier = (double *)malloc(p->FFTbassbufferSize * sizeof(double));
|
||||||
|
p->multiplier = (double *)malloc(p->FFTbufferSize * sizeof(double));
|
||||||
|
for (int i = 0; i < p->FFTbassbufferSize; i++) {
|
||||||
|
p->bass_multiplier[i] = 0.5 * (1 - cos(2 * M_PI * i / (p->FFTbassbufferSize - 1)));
|
||||||
|
}
|
||||||
|
for (int i = 0; i < p->FFTbufferSize; i++) {
|
||||||
|
p->multiplier[i] = 0.5 * (1 - cos(2 * M_PI * i / (p->FFTbufferSize - 1)));
|
||||||
|
}
|
||||||
|
|
||||||
|
// BASS
|
||||||
|
p->in_bass_l = fftw_alloc_real(p->FFTbassbufferSize);
|
||||||
|
p->in_bass_l_raw = fftw_alloc_real(p->FFTbassbufferSize);
|
||||||
|
p->out_bass_l = fftw_alloc_complex(p->FFTbassbufferSize / 2 + 1);
|
||||||
|
p->p_bass_l =
|
||||||
|
fftw_plan_dft_r2c_1d(p->FFTbassbufferSize, p->in_bass_l, p->out_bass_l, fftw_flag);
|
||||||
|
|
||||||
|
// MID + TREBLE
|
||||||
|
p->in_l = fftw_alloc_real(p->FFTbufferSize);
|
||||||
|
p->in_l_raw = fftw_alloc_real(p->FFTbufferSize);
|
||||||
|
p->out_l = fftw_alloc_complex(p->FFTbufferSize / 2 + 1);
|
||||||
|
p->p_l = fftw_plan_dft_r2c_1d(p->FFTbufferSize, p->in_l, p->out_l, fftw_flag);
|
||||||
|
|
||||||
|
memset(p->in_bass_l, 0, sizeof(double) * p->FFTbassbufferSize);
|
||||||
|
memset(p->in_l, 0, sizeof(double) * p->FFTbufferSize);
|
||||||
|
memset(p->in_bass_l_raw, 0, sizeof(double) * p->FFTbassbufferSize);
|
||||||
|
memset(p->in_l_raw, 0, sizeof(double) * p->FFTbufferSize);
|
||||||
|
memset(p->out_bass_l, 0, (p->FFTbassbufferSize / 2 + 1) * sizeof(fftw_complex));
|
||||||
|
memset(p->out_l, 0, (p->FFTbufferSize / 2 + 1) * sizeof(fftw_complex));
|
||||||
|
if (p->audio_channels == 2) {
|
||||||
|
// BASS
|
||||||
|
p->in_bass_r = fftw_alloc_real(p->FFTbassbufferSize);
|
||||||
|
p->in_bass_r_raw = fftw_alloc_real(p->FFTbassbufferSize);
|
||||||
|
p->out_bass_r = fftw_alloc_complex(p->FFTbassbufferSize / 2 + 1);
|
||||||
|
p->p_bass_r =
|
||||||
|
fftw_plan_dft_r2c_1d(p->FFTbassbufferSize, p->in_bass_r, p->out_bass_r, fftw_flag);
|
||||||
|
|
||||||
|
// MID + TREBLE
|
||||||
|
p->in_r = fftw_alloc_real(p->FFTbufferSize);
|
||||||
|
p->in_r_raw = fftw_alloc_real(p->FFTbufferSize);
|
||||||
|
p->out_r = fftw_alloc_complex(p->FFTbufferSize / 2 + 1);
|
||||||
|
|
||||||
|
p->p_r = fftw_plan_dft_r2c_1d(p->FFTbufferSize, p->in_r, p->out_r, fftw_flag);
|
||||||
|
|
||||||
|
memset(p->in_bass_r, 0, sizeof(double) * p->FFTbassbufferSize);
|
||||||
|
memset(p->in_r, 0, sizeof(double) * p->FFTbufferSize);
|
||||||
|
memset(p->in_bass_r_raw, 0, sizeof(double) * p->FFTbassbufferSize);
|
||||||
|
memset(p->in_r_raw, 0, sizeof(double) * p->FFTbufferSize);
|
||||||
|
memset(p->out_bass_r, 0, (p->FFTbassbufferSize / 2 + 1) * sizeof(fftw_complex));
|
||||||
|
memset(p->out_r, 0, (p->FFTbufferSize / 2 + 1) * sizeof(fftw_complex));
|
||||||
|
}
|
||||||
|
|
||||||
|
memset(p->input_buffer, 0, sizeof(double) * p->input_buffer_size);
|
||||||
|
|
||||||
|
memset(p->cava_fall, 0, sizeof(double) * number_of_bars * channels);
|
||||||
|
memset(p->cava_mem, 0, sizeof(double) * number_of_bars * channels);
|
||||||
|
memset(p->cava_peak, 0, sizeof(double) * number_of_bars * channels);
|
||||||
|
memset(p->prev_cava_out, 0, sizeof(double) * number_of_bars * channels);
|
||||||
|
|
||||||
|
// process: calculate cutoff frequencies and eq
|
||||||
|
int lower_cut_off = low_cut_off;
|
||||||
|
int upper_cut_off = high_cut_off;
|
||||||
|
int bass_cut_off = 100;
|
||||||
|
|
||||||
|
// calculate frequency constant (used to distribute bars across the frequency band)
|
||||||
|
double frequency_constant = log10((float)lower_cut_off / (float)upper_cut_off) /
|
||||||
|
(1 / ((float)p->number_of_bars + 1) - 1);
|
||||||
|
|
||||||
|
float *relative_cut_off = (float *)malloc((p->number_of_bars + 1) * sizeof(float));
|
||||||
|
|
||||||
|
p->bass_cut_off_bar = 0;
|
||||||
|
int first_bar = 1;
|
||||||
|
|
||||||
|
float min_bandwidth = p->rate / p->FFTbassbufferSize;
|
||||||
|
|
||||||
|
for (int n = 0; n < p->number_of_bars + 1; n++) {
|
||||||
|
double bar_distribution_coefficient = frequency_constant * (-1);
|
||||||
|
bar_distribution_coefficient +=
|
||||||
|
((float)n + 1) / ((float)p->number_of_bars + 1) * frequency_constant;
|
||||||
|
p->cut_off_frequency[n] = upper_cut_off * pow(10, bar_distribution_coefficient);
|
||||||
|
|
||||||
|
if (n > 0) {
|
||||||
|
if (p->cut_off_frequency[n - 1] >= p->cut_off_frequency[n])
|
||||||
|
p->cut_off_frequency[n] = p->cut_off_frequency[n - 1] + min_bandwidth;
|
||||||
|
}
|
||||||
|
|
||||||
|
// remember nyquist!
|
||||||
|
relative_cut_off[n] = p->cut_off_frequency[n] / (p->rate / 2);
|
||||||
|
|
||||||
|
if (p->cut_off_frequency[n] < bass_cut_off) {
|
||||||
|
// BASS
|
||||||
|
p->FFTbuffer_lower_cut_off[n] = relative_cut_off[n] * (p->FFTbassbufferSize / 2);
|
||||||
|
p->bass_cut_off_bar++;
|
||||||
|
if (p->bass_cut_off_bar > 1)
|
||||||
|
first_bar = 0;
|
||||||
|
|
||||||
|
if (p->FFTbuffer_lower_cut_off[n] > p->FFTbassbufferSize / 2) {
|
||||||
|
p->FFTbuffer_lower_cut_off[n] = p->FFTbassbufferSize / 2;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// MID + TREBLE
|
||||||
|
p->FFTbuffer_lower_cut_off[n] =
|
||||||
|
ceil(relative_cut_off[n] * (float)(p->FFTbufferSize / 2));
|
||||||
|
if (n == p->bass_cut_off_bar) {
|
||||||
|
first_bar = 1;
|
||||||
|
if (n > 0) {
|
||||||
|
p->FFTbuffer_upper_cut_off[n - 1] =
|
||||||
|
relative_cut_off[n] * (p->FFTbassbufferSize / 2) - 1;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
first_bar = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (p->FFTbuffer_lower_cut_off[n] > p->FFTbufferSize / 2) {
|
||||||
|
p->FFTbuffer_lower_cut_off[n] = p->FFTbufferSize / 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (n > 0) {
|
||||||
|
if (!first_bar) {
|
||||||
|
p->FFTbuffer_upper_cut_off[n - 1] = p->FFTbuffer_lower_cut_off[n] - 1;
|
||||||
|
|
||||||
|
// pushing the spectrum up if the exponential function gets "clumped" in the
|
||||||
|
// bass and calculating new cut off frequencies
|
||||||
|
if (p->FFTbuffer_lower_cut_off[n] <= p->FFTbuffer_lower_cut_off[n - 1]) {
|
||||||
|
|
||||||
|
// check if there is room for more first
|
||||||
|
int room_for_more = 0;
|
||||||
|
|
||||||
|
if (n < p->bass_cut_off_bar) {
|
||||||
|
if (p->FFTbuffer_lower_cut_off[n - 1] + 1 < p->FFTbassbufferSize / 2 + 1)
|
||||||
|
room_for_more = 1;
|
||||||
|
} else {
|
||||||
|
if (p->FFTbuffer_lower_cut_off[n - 1] + 1 < p->FFTbufferSize / 2 + 1)
|
||||||
|
room_for_more = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (room_for_more) {
|
||||||
|
// push the spectrum up
|
||||||
|
p->FFTbuffer_lower_cut_off[n] = p->FFTbuffer_lower_cut_off[n - 1] + 1;
|
||||||
|
p->FFTbuffer_upper_cut_off[n - 1] = p->FFTbuffer_lower_cut_off[n] - 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (p->FFTbuffer_upper_cut_off[n - 1] < p->FFTbuffer_lower_cut_off[n - 1])
|
||||||
|
p->FFTbuffer_upper_cut_off[n - 1] = p->FFTbuffer_lower_cut_off[n - 1] + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// calculate actual cut off frequency
|
||||||
|
if (n < p->bass_cut_off_bar)
|
||||||
|
relative_cut_off[n] =
|
||||||
|
(float)(p->FFTbuffer_lower_cut_off[n]) / ((float)p->FFTbassbufferSize / 2);
|
||||||
|
else
|
||||||
|
relative_cut_off[n] =
|
||||||
|
(float)(p->FFTbuffer_lower_cut_off[n]) / ((float)p->FFTbufferSize / 2);
|
||||||
|
|
||||||
|
p->cut_off_frequency[n] = relative_cut_off[n] * ((float)p->rate / 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
// hard coded eq
|
||||||
|
for (int n = 0; n < p->number_of_bars; n++) {
|
||||||
|
|
||||||
|
// the numbers that come out of the FFT are very high
|
||||||
|
// the EQ is used to "normalize" them by dividing with this very huge number
|
||||||
|
p->eq[n] = 1 / pow(2, 28);
|
||||||
|
|
||||||
|
// need to boost the EQ for higher frequencies
|
||||||
|
p->eq[n] *= pow(p->cut_off_frequency[n + 1], 0.85);
|
||||||
|
|
||||||
|
if (n < p->bass_cut_off_bar) {
|
||||||
|
p->eq[n] /= log2(p->FFTbassbufferSize);
|
||||||
|
} else {
|
||||||
|
p->eq[n] /= log2(p->FFTbufferSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
p->eq[n] /= p->FFTbuffer_upper_cut_off[n] - p->FFTbuffer_lower_cut_off[n] + 1;
|
||||||
|
}
|
||||||
|
free(relative_cut_off);
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
void cava_execute(double *cava_in, int new_samples, double *cava_out, struct cava_plan *p) {
|
||||||
|
|
||||||
|
// do not overflow
|
||||||
|
if (new_samples > p->input_buffer_size) {
|
||||||
|
new_samples = p->input_buffer_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
int silence = 1;
|
||||||
|
if (new_samples > 0) {
|
||||||
|
// process: approximate actual framerate. This will be off by +10% at 60 fps, but should be
|
||||||
|
// good enough for the autosens and smoothing algorithms to be adjusted accordingly if
|
||||||
|
// framerate is a lot more or less.
|
||||||
|
p->framerate -= p->framerate / 64.0;
|
||||||
|
p->framerate +=
|
||||||
|
(double)(p->rate * p->frame_skip) / (new_samples / p->audio_channels) / 64.0;
|
||||||
|
p->frame_skip = 1;
|
||||||
|
|
||||||
|
// shifting input buffer
|
||||||
|
for (int n = p->input_buffer_size - 1; n >= new_samples; n--) {
|
||||||
|
p->input_buffer[n] = p->input_buffer[n - new_samples];
|
||||||
|
}
|
||||||
|
|
||||||
|
// fill the input buffer
|
||||||
|
for (int n = 0; n < new_samples; n++) {
|
||||||
|
if (p->scaling_mode == CAVA_SCALING_DECIBEL) {
|
||||||
|
// Audio signals come in the range [-32768, 32768], normalize to [-1, 1].
|
||||||
|
p->input_buffer[new_samples - n - 1] = cava_in[n] / 32768.0;
|
||||||
|
} else {
|
||||||
|
p->input_buffer[new_samples - n - 1] = cava_in[n];
|
||||||
|
}
|
||||||
|
if (cava_in[n]) {
|
||||||
|
silence = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
p->frame_skip++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// fill the bass, mid and treble buffers
|
||||||
|
for (int n = 0; n < p->FFTbassbufferSize; n++) {
|
||||||
|
if (p->audio_channels == 2) {
|
||||||
|
p->in_bass_r_raw[n] = p->input_buffer[n * 2];
|
||||||
|
p->in_bass_l_raw[n] = p->input_buffer[n * 2 + 1];
|
||||||
|
} else {
|
||||||
|
p->in_bass_l_raw[n] = p->input_buffer[n];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (int n = 0; n < p->FFTbufferSize; n++) {
|
||||||
|
if (p->audio_channels == 2) {
|
||||||
|
p->in_r_raw[n] = p->input_buffer[n * 2];
|
||||||
|
p->in_l_raw[n] = p->input_buffer[n * 2 + 1];
|
||||||
|
} else {
|
||||||
|
p->in_l_raw[n] = p->input_buffer[n];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hann Window
|
||||||
|
for (int i = 0; i < p->FFTbassbufferSize; i++) {
|
||||||
|
p->in_bass_l[i] = p->bass_multiplier[i] * p->in_bass_l_raw[i];
|
||||||
|
if (p->audio_channels == 2)
|
||||||
|
p->in_bass_r[i] = p->bass_multiplier[i] * p->in_bass_r_raw[i];
|
||||||
|
}
|
||||||
|
for (int i = 0; i < p->FFTbufferSize; i++) {
|
||||||
|
p->in_l[i] = p->multiplier[i] * p->in_l_raw[i];
|
||||||
|
if (p->audio_channels == 2)
|
||||||
|
p->in_r[i] = p->multiplier[i] * p->in_r_raw[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
// process: execute FFT and sort frequency bands
|
||||||
|
|
||||||
|
fftw_execute(p->p_bass_l);
|
||||||
|
fftw_execute(p->p_l);
|
||||||
|
if (p->audio_channels == 2) {
|
||||||
|
fftw_execute(p->p_bass_r);
|
||||||
|
fftw_execute(p->p_r);
|
||||||
|
}
|
||||||
|
|
||||||
|
// process: separate frequency bands
|
||||||
|
for (int n = 0; n < p->number_of_bars; n++) {
|
||||||
|
|
||||||
|
double temp_l = 0;
|
||||||
|
double temp_r = 0;
|
||||||
|
|
||||||
|
// process: add upp FFT values within bands
|
||||||
|
for (int i = p->FFTbuffer_lower_cut_off[n]; i <= p->FFTbuffer_upper_cut_off[n]; i++) {
|
||||||
|
|
||||||
|
if (n < p->bass_cut_off_bar) {
|
||||||
|
temp_l += hypot(p->out_bass_l[i][0], p->out_bass_l[i][1]);
|
||||||
|
if (p->audio_channels == 2)
|
||||||
|
temp_r += hypot(p->out_bass_r[i][0], p->out_bass_r[i][1]);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
temp_l += hypot(p->out_l[i][0], p->out_l[i][1]);
|
||||||
|
if (p->audio_channels == 2)
|
||||||
|
temp_r += hypot(p->out_r[i][0], p->out_r[i][1]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// getting average and applying configured scaling
|
||||||
|
if (p->scaling_mode == CAVA_SCALING_DECIBEL) {
|
||||||
|
const double max_db = 70;
|
||||||
|
temp_l = amplitude_to_decibels(temp_l) / max_db;
|
||||||
|
if (!isfinite(temp_l)) {
|
||||||
|
temp_l = 0;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
temp_l *= p->eq[n];
|
||||||
|
}
|
||||||
|
cava_out[n] = temp_l;
|
||||||
|
|
||||||
|
if (p->audio_channels == 2) {
|
||||||
|
if (p->scaling_mode == CAVA_SCALING_DECIBEL) {
|
||||||
|
const double max_db = 70;
|
||||||
|
temp_r = amplitude_to_decibels(temp_r) / max_db;
|
||||||
|
if (!isfinite(temp_r)) {
|
||||||
|
temp_r = 0;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
temp_r *= p->eq[n];
|
||||||
|
}
|
||||||
|
cava_out[n + p->number_of_bars] = temp_r;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// applying sens or getting max value
|
||||||
|
if (p->autosens) {
|
||||||
|
for (int n = 0; n < p->number_of_bars * p->audio_channels; n++) {
|
||||||
|
cava_out[n] *= p->sens;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// process [smoothing]
|
||||||
|
int overshoot = 0;
|
||||||
|
|
||||||
|
double framerate_mod = 66 / p->framerate;
|
||||||
|
double gravity_mod = pow((framerate_mod), 2.5) * 2 / p->noise_reduction;
|
||||||
|
double integral_mod = pow((framerate_mod), 0.1);
|
||||||
|
|
||||||
|
for (int n = 0; n < p->number_of_bars * p->audio_channels; n++) {
|
||||||
|
|
||||||
|
// process [smoothing]: falloff
|
||||||
|
|
||||||
|
if (cava_out[n] < p->prev_cava_out[n] && p->noise_reduction > 0.1) {
|
||||||
|
cava_out[n] =
|
||||||
|
p->cava_peak[n] * (1.0 - (p->cava_fall[n] * p->cava_fall[n] * gravity_mod));
|
||||||
|
|
||||||
|
if (cava_out[n] < 0.0)
|
||||||
|
cava_out[n] = 0.0;
|
||||||
|
p->cava_fall[n] += 0.028;
|
||||||
|
} else {
|
||||||
|
p->cava_peak[n] = cava_out[n];
|
||||||
|
p->cava_fall[n] = 0.0;
|
||||||
|
}
|
||||||
|
p->prev_cava_out[n] = cava_out[n];
|
||||||
|
|
||||||
|
// process [smoothing]: integral
|
||||||
|
cava_out[n] = p->cava_mem[n] * p->noise_reduction / integral_mod + cava_out[n];
|
||||||
|
|
||||||
|
p->cava_mem[n] = cava_out[n];
|
||||||
|
if (p->autosens) {
|
||||||
|
// check if we overshoot target height
|
||||||
|
if (cava_out[n] > 1.0) {
|
||||||
|
overshoot = 1;
|
||||||
|
cava_out[n] = 1.0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// calculating automatic sense adjustment
|
||||||
|
if (p->autosens) {
|
||||||
|
if (overshoot) {
|
||||||
|
p->sens = p->sens * (1 - (0.02 * framerate_mod));
|
||||||
|
p->sens_init = 0;
|
||||||
|
} else {
|
||||||
|
if (!silence) {
|
||||||
|
p->sens = p->sens * (1 + (0.001 * framerate_mod * p->autosens));
|
||||||
|
if (p->sens_init)
|
||||||
|
p->sens = p->sens * (1 + (0.1 * framerate_mod));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void cava_destroy(struct cava_plan *p) {
|
||||||
|
|
||||||
|
free(p->input_buffer);
|
||||||
|
free(p->bass_multiplier);
|
||||||
|
free(p->multiplier);
|
||||||
|
free(p->eq);
|
||||||
|
free(p->cut_off_frequency);
|
||||||
|
free(p->FFTbuffer_lower_cut_off);
|
||||||
|
free(p->FFTbuffer_upper_cut_off);
|
||||||
|
free(p->cava_fall);
|
||||||
|
free(p->cava_mem);
|
||||||
|
free(p->cava_peak);
|
||||||
|
free(p->prev_cava_out);
|
||||||
|
|
||||||
|
fftw_free(p->in_bass_l);
|
||||||
|
fftw_free(p->in_bass_l_raw);
|
||||||
|
fftw_free(p->out_bass_l);
|
||||||
|
fftw_destroy_plan(p->p_bass_l);
|
||||||
|
|
||||||
|
fftw_free(p->in_l);
|
||||||
|
fftw_free(p->in_l_raw);
|
||||||
|
fftw_free(p->out_l);
|
||||||
|
fftw_destroy_plan(p->p_l);
|
||||||
|
|
||||||
|
if (p->audio_channels == 2) {
|
||||||
|
fftw_free(p->in_bass_r);
|
||||||
|
fftw_free(p->in_bass_r_raw);
|
||||||
|
fftw_free(p->out_bass_r);
|
||||||
|
fftw_destroy_plan(p->p_bass_r);
|
||||||
|
|
||||||
|
fftw_free(p->in_r);
|
||||||
|
fftw_free(p->out_r);
|
||||||
|
fftw_free(p->in_r_raw);
|
||||||
|
fftw_destroy_plan(p->p_r);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef __ANDROID__
|
||||||
|
JNIEXPORT jfloatArray JNICALL Java_com_karlstav_cava_MyGLRenderer_InitCava(
|
||||||
|
JNIEnv *env, jobject thiz, jint number_of_bars_set, jint refresh_rate, jint lower_cut_off,
|
||||||
|
jint higher_cut_off) {
|
||||||
|
jfloatArray cuttOffFreq = (*env)->NewFloatArray(env, number_of_bars_set + 1);
|
||||||
|
float noise_reduction = pow((float)refresh_rate / 130, 0.75);
|
||||||
|
|
||||||
|
plan = cava_init(number_of_bars_set, 44100, 1, 1, noise_reduction, lower_cut_off,
|
||||||
|
higher_cut_off, CAVA_SCALING_LINEAR);
|
||||||
|
cava_in = (double *)malloc(plan->FFTbassbufferSize * sizeof(double));
|
||||||
|
cava_out = (double *)malloc(plan->number_of_bars * sizeof(double));
|
||||||
|
(*env)->SetFloatArrayRegion(env, cuttOffFreq, 0, plan->number_of_bars + 1,
|
||||||
|
plan->cut_off_frequency);
|
||||||
|
return cuttOffFreq;
|
||||||
|
}
|
||||||
|
|
||||||
|
JNIEXPORT jdoubleArray JNICALL Java_com_karlstav_cava_MyGLRenderer_ExecCava(JNIEnv *env,
|
||||||
|
jobject thiz,
|
||||||
|
jdoubleArray cava_input,
|
||||||
|
jint new_samples) {
|
||||||
|
|
||||||
|
jdoubleArray cavaReturn = (*env)->NewDoubleArray(env, plan->number_of_bars);
|
||||||
|
|
||||||
|
cava_in = (*env)->GetDoubleArrayElements(env, cava_input, NULL);
|
||||||
|
|
||||||
|
cava_execute(cava_in, new_samples, cava_out, plan);
|
||||||
|
(*env)->SetDoubleArrayRegion(env, cavaReturn, 0, plan->number_of_bars, cava_out);
|
||||||
|
(*env)->ReleaseDoubleArrayElements(env, cava_input, cava_in, JNI_ABORT);
|
||||||
|
|
||||||
|
return cavaReturn;
|
||||||
|
}
|
||||||
|
|
||||||
|
JNIEXPORT int JNICALL Java_com_karlstav_cava_CavaCoreTest_InitCava(JNIEnv *env, jobject thiz,
|
||||||
|
jint number_of_bars_set) {
|
||||||
|
|
||||||
|
plan = cava_init(number_of_bars_set, 44100, 1, 1, 0.7, 50, 10000, CAVA_SCALING_LINEAR);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
JNIEXPORT jdoubleArray JNICALL Java_com_karlstav_cava_CavaCoreTest_ExecCava(JNIEnv *env,
|
||||||
|
jobject thiz,
|
||||||
|
jdoubleArray cava_input,
|
||||||
|
jint new_samples) {
|
||||||
|
|
||||||
|
jdoubleArray cavaReturn = (*env)->NewDoubleArray(env, plan->number_of_bars);
|
||||||
|
|
||||||
|
cava_in = (*env)->GetDoubleArrayElements(env, cava_input, NULL);
|
||||||
|
|
||||||
|
cava_execute(cava_in, new_samples, cava_out, plan);
|
||||||
|
(*env)->SetDoubleArrayRegion(env, cavaReturn, 0, plan->number_of_bars, cava_out);
|
||||||
|
(*env)->ReleaseDoubleArrayElements(env, cava_input, cava_in, JNI_ABORT);
|
||||||
|
|
||||||
|
return cavaReturn;
|
||||||
|
}
|
||||||
|
JNIEXPORT void JNICALL Java_com_karlstav_cava_MyGLRenderer_DestroyCava(JNIEnv *env, jobject thiz) {
|
||||||
|
cava_destroy(plan);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
139
cava/cavacore.h
Normal file
139
cava/cavacore.h
Normal file
@@ -0,0 +1,139 @@
|
|||||||
|
/*
|
||||||
|
Copyright (c) 2022 Karl Stavestrand <karl@stavestrand.no>
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
*/
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
#pragma once
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
#include <fftw3.h>
|
||||||
|
|
||||||
|
#define CAVA_SCALING_LINEAR 0
|
||||||
|
#define CAVA_SCALING_DECIBEL 1
|
||||||
|
|
||||||
|
// cava_plan, parameters used internally by cavacore, do not modify these directly
|
||||||
|
// only the cut off frequencies is of any potential interest to read out,
|
||||||
|
// the rest should most likely be hidden somehow
|
||||||
|
struct cava_plan {
|
||||||
|
int FFTbassbufferSize;
|
||||||
|
int FFTbufferSize;
|
||||||
|
int number_of_bars;
|
||||||
|
int audio_channels;
|
||||||
|
int input_buffer_size;
|
||||||
|
int rate;
|
||||||
|
int bass_cut_off_bar;
|
||||||
|
int sens_init;
|
||||||
|
int autosens;
|
||||||
|
int frame_skip;
|
||||||
|
int status;
|
||||||
|
int scaling_mode;
|
||||||
|
char error_message[1024];
|
||||||
|
|
||||||
|
double sens;
|
||||||
|
double framerate;
|
||||||
|
double noise_reduction;
|
||||||
|
|
||||||
|
fftw_plan p_bass_l, p_bass_r;
|
||||||
|
fftw_plan p_l, p_r;
|
||||||
|
|
||||||
|
fftw_complex *out_bass_l, *out_bass_r;
|
||||||
|
fftw_complex *out_l, *out_r;
|
||||||
|
|
||||||
|
double *bass_multiplier;
|
||||||
|
double *multiplier;
|
||||||
|
|
||||||
|
double *in_bass_r_raw, *in_bass_l_raw;
|
||||||
|
double *in_r_raw, *in_l_raw;
|
||||||
|
double *in_bass_r, *in_bass_l;
|
||||||
|
double *in_r, *in_l;
|
||||||
|
double *prev_cava_out, *cava_mem;
|
||||||
|
double *input_buffer, *cava_peak;
|
||||||
|
|
||||||
|
double *eq;
|
||||||
|
|
||||||
|
float *cut_off_frequency;
|
||||||
|
int *FFTbuffer_lower_cut_off;
|
||||||
|
int *FFTbuffer_upper_cut_off;
|
||||||
|
double *cava_fall;
|
||||||
|
};
|
||||||
|
|
||||||
|
// cava_init, initialize visualization, takes the following parameters:
|
||||||
|
|
||||||
|
// number_of_bars, number of wanted bars per channel
|
||||||
|
|
||||||
|
// rate, sample rate of input signal
|
||||||
|
|
||||||
|
// channels, number of interleaved channels in input
|
||||||
|
|
||||||
|
// autosens, toggle automatic sensitivity adjustment 1 = on, 0 = off
|
||||||
|
// on, gives a dynamically adjusted output signal from 0 to 1
|
||||||
|
// the output is continuously adjusted to use the entire range
|
||||||
|
// off, will pass the raw values from cava directly to the output
|
||||||
|
// the max values will then be dependent on the input
|
||||||
|
|
||||||
|
// noise_reduction, adjust noise reduction filters. 0 - 1, recommended 0.77
|
||||||
|
// the raw visualization is very noisy, this factor adjusts the integral
|
||||||
|
// and gravity filters inside cavacore to keep the signal smooth
|
||||||
|
// 1 will be very slow and smooth, 0 will be fast but noisy.
|
||||||
|
|
||||||
|
// low_cut_off, high_cut_off cut off frequencies for visualization in Hz
|
||||||
|
// recommended: 50, 10000
|
||||||
|
|
||||||
|
// scaling_mode, output scaling mode:
|
||||||
|
// CAVA_SCALING_LINEAR = legacy linear scaling
|
||||||
|
// CAVA_SCALING_DECIBEL = dB-based logarithmic scaling
|
||||||
|
|
||||||
|
// returns a cava_plan to be used by cava_execute. If cava_plan.status is 0 all is OK.
|
||||||
|
// If cava_plan.status is -1, cava_init was called with an illegal parameter, see error string in
|
||||||
|
// cava_plan.error_message
|
||||||
|
extern struct cava_plan *cava_init(int number_of_bars, unsigned int rate, int channels,
|
||||||
|
int autosens, double noise_reduction, int low_cut_off,
|
||||||
|
int high_cut_off, int scaling_mode);
|
||||||
|
|
||||||
|
// cava_execute, executes visualization
|
||||||
|
|
||||||
|
// cava_in, input buffer can be any size. internal buffers in cavacore is
|
||||||
|
// 4096 * number of channels at 44100 samples rate, if new_samples is greater
|
||||||
|
// then samples will be discarded. However it is recommended to use less
|
||||||
|
// new samples per execution as this determines your framerate.
|
||||||
|
// 512 samples at 44100 sample rate mono, gives about 86 frames per second.
|
||||||
|
|
||||||
|
// new_samples, the number of samples in cava_in to be processed per execution
|
||||||
|
// in case of async reading of data this number is allowed to vary from execution to execution
|
||||||
|
|
||||||
|
// cava_out, output buffer. Size must be number of bars * number of channels. Bars will
|
||||||
|
// be sorted from lowest to highest frequency. If stereo input channels are configured
|
||||||
|
// then all left channel bars will be first then the right.
|
||||||
|
|
||||||
|
// plan, the cava_plan struct returned from cava_init
|
||||||
|
|
||||||
|
// cava_execute assumes cava_in samples to be interleaved if more than one channel
|
||||||
|
// only up to two channels are supported.
|
||||||
|
extern void cava_execute(double *cava_in, int new_samples, double *cava_out,
|
||||||
|
struct cava_plan *plan);
|
||||||
|
|
||||||
|
// cava_destroy, destroys the plan, frees up memory
|
||||||
|
extern void cava_destroy(struct cava_plan *plan);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
405
discover/featured.json
Normal file
405
discover/featured.json
Normal file
@@ -0,0 +1,405 @@
|
|||||||
|
{
|
||||||
|
"version": 2,
|
||||||
|
"podcasts": [
|
||||||
|
{
|
||||||
|
"id": "discover-daily",
|
||||||
|
"title": "The Daily",
|
||||||
|
"description": "This is how the news should sound. Twenty minutes a day, five days a week, hosted by Michael Barbaro and Sabrina Tavernise. Powered by New York Times journalism.",
|
||||||
|
"feedUrl": "http://rss.art19.com/the-daily",
|
||||||
|
"author": "The New York Times",
|
||||||
|
"categories": ["News", "Politics"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-up-first",
|
||||||
|
"title": "Up First",
|
||||||
|
"description": "NPR's Up First covers the three biggest stories of the day, with reporting and analysis from NPR News — in 10 minutes.",
|
||||||
|
"feedUrl": "https://feeds.npr.org/510318/podcast.xml",
|
||||||
|
"author": "NPR",
|
||||||
|
"categories": ["News"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-npr-politics",
|
||||||
|
"title": "The NPR Politics Podcast",
|
||||||
|
"description": "Where everyone gathers for the political conversation of the day. NPR's political reporters talk through the biggest news of the week.",
|
||||||
|
"feedUrl": "https://feeds.npr.org/510310/podcast.xml",
|
||||||
|
"author": "NPR",
|
||||||
|
"categories": ["News", "Politics"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-code-switch",
|
||||||
|
"title": "Code Switch",
|
||||||
|
"description": "Race. In your face. A podcast from NPR that fearlessly explores how race impacts every part of society — from politics to pop culture.",
|
||||||
|
"feedUrl": "https://feeds.npr.org/510312/podcast.xml",
|
||||||
|
"author": "NPR",
|
||||||
|
"categories": ["News", "Culture", "Politics"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-rough-translation",
|
||||||
|
"title": "Rough Translation",
|
||||||
|
"description": "How are the things we're talking about covered in the rest of the world? NPR's Rough Translation takes you to far-off places and shows you the unexpected.",
|
||||||
|
"feedUrl": "https://feeds.npr.org/510324/podcast.xml",
|
||||||
|
"author": "NPR",
|
||||||
|
"categories": ["News", "Culture"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-crime-junkie",
|
||||||
|
"title": "Crime Junkie",
|
||||||
|
"description": "Crime Junkie satisfies true crime cravings with host Ashley Flowers' obsessed yet accessible approach to real-life mysteries — from unsolved murders to missing persons.",
|
||||||
|
"feedUrl": "https://feeds.simplecast.com/qm_9xx0g",
|
||||||
|
"author": "audiochuck",
|
||||||
|
"categories": ["True Crime"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-serial",
|
||||||
|
"title": "Serial",
|
||||||
|
"description": "Serial Productions makes narrative podcasts that have transformed the medium. From the team that brought you the original Serial, one of the most influential podcasts of all time.",
|
||||||
|
"feedUrl": "https://feeds.simplecast.com/PpzWFGhg",
|
||||||
|
"author": "Serial Productions & The New York Times",
|
||||||
|
"categories": ["True Crime", "Storytelling"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-intelligence-matters",
|
||||||
|
"title": "Intelligence Matters",
|
||||||
|
"description": "A deep dive into national security, intelligence, and foreign policy with top former officials and experts hosted by CBS News senior correspondent.",
|
||||||
|
"feedUrl": "https://rss.art19.com/intelligence-matters",
|
||||||
|
"author": "CBS News",
|
||||||
|
"categories": ["True Crime", "Politics", "News"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-smartless",
|
||||||
|
"title": "SmartLess",
|
||||||
|
"description": "Jason Bateman, Sean Hayes, and Will Arnett bring you unscripted conversations with surprise celebrity guests — each episode one host reveals the guest to the others.",
|
||||||
|
"feedUrl": "https://rss.art19.com/smartless",
|
||||||
|
"author": "Jason Bateman, Sean Hayes, Will Arnett",
|
||||||
|
"categories": ["Comedy", "Entertainment"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-this-past-weekend",
|
||||||
|
"title": "This Past Weekend w/ Theo Von",
|
||||||
|
"description": "Comedian Theo Von's uniquely southern perspective blends heartfelt vulnerability and offbeat humor in conversations ranging from celebrity interviews to solo musings.",
|
||||||
|
"feedUrl": "https://feeds.megaphone.fm/thispastweekend",
|
||||||
|
"author": "Theo Von",
|
||||||
|
"categories": ["Comedy"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-joe-rogan",
|
||||||
|
"title": "The Joe Rogan Experience",
|
||||||
|
"description": "The official podcast of comedian Joe Rogan. Long-form conversations with guests from every corner of culture, science, comedy, and beyond.",
|
||||||
|
"feedUrl": "https://feeds.megaphone.fm/GLT1412515089",
|
||||||
|
"author": "Joe Rogan",
|
||||||
|
"categories": ["Comedy", "Entertainment"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-comedy-bang-bang",
|
||||||
|
"title": "Comedy Bang Bang: The Podcast",
|
||||||
|
"description": "A weekly comedy podcast hosted by Scott Aukerman featuring improv, games, and hilarious conversations with celebrities and the world's best comedians.",
|
||||||
|
"feedUrl": "https://rss.art19.com/comedy-bang-bang",
|
||||||
|
"author": "Earwolf",
|
||||||
|
"categories": ["Comedy"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-office-ladies",
|
||||||
|
"title": "Office Ladies",
|
||||||
|
"description": "The Office stars Jenna Fischer and Angela Kinsey break down each episode of The Office with behind-the-scenes stories, fun facts, and fan Q&A.",
|
||||||
|
"feedUrl": "https://rss.art19.com/office-ladies",
|
||||||
|
"author": "Earwolf",
|
||||||
|
"categories": ["Comedy", "Entertainment"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-how-did-this-get-made",
|
||||||
|
"title": "How Did This Get Made?",
|
||||||
|
"description": "Comedians Paul Scheer, June Diane Raphael, and Jason Mantzoukas break down the very best of the worst films ever made — blockbuster flops, cult classics, and Nic Cage movies.",
|
||||||
|
"feedUrl": "https://rss.art19.com/how-did-this-get-made",
|
||||||
|
"author": "Earwolf",
|
||||||
|
"categories": ["Comedy", "Film"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-wait-wait",
|
||||||
|
"title": "Wait Wait... Don't Tell Me!",
|
||||||
|
"description": "NPR's weekly news quiz show. Test your knowledge against the week's biggest news, with panelists and celebrity guests competing in hilarious trivia.",
|
||||||
|
"feedUrl": "https://feeds.npr.org/344098539/podcast.xml",
|
||||||
|
"author": "NPR",
|
||||||
|
"categories": ["Comedy", "News"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-new-heights",
|
||||||
|
"title": "New Heights with Jason & Travis Kelce",
|
||||||
|
"description": "Football's funniest family duo — Super Bowl champions Jason and Travis Kelce — drop weekly insights about the NFL and share inside perspectives on sports headlines.",
|
||||||
|
"feedUrl": "https://rss.art19.com/new-heights",
|
||||||
|
"author": "Jason & Travis Kelce",
|
||||||
|
"categories": ["Sports", "Comedy"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-bill-simmons",
|
||||||
|
"title": "The Bill Simmons Podcast",
|
||||||
|
"description": "Bill Simmons and his cadre of opinionated guests discuss sports, pop culture, and everything in between on The Ringer's flagship podcast.",
|
||||||
|
"feedUrl": "https://rss.art19.com/the-bill-simmons-podcast",
|
||||||
|
"author": "The Ringer",
|
||||||
|
"categories": ["Sports", "Entertainment"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-acquired",
|
||||||
|
"title": "Acquired",
|
||||||
|
"description": "Acquired tells the stories and strategies of the world's greatest companies. Each episode is a deep dive into a single company's history and the playbooks behind its success.",
|
||||||
|
"feedUrl": "https://feeds.transistor.fm/acquired",
|
||||||
|
"author": "Ben Gilbert & David Rosenthal",
|
||||||
|
"categories": ["Business", "Technology"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-all-in",
|
||||||
|
"title": "All-In Podcast",
|
||||||
|
"description": "Four tech industry veterans share their unfiltered perspectives on technology, economics, politics, and culture. Insightful, opinionated, and occasionally controversial.",
|
||||||
|
"feedUrl": "https://allinchamathjason.libsyn.com/rss",
|
||||||
|
"author": "Chamath Palihapitiya, Jason Calacanis, David Sacks & David Friedberg",
|
||||||
|
"categories": ["Business", "Technology", "Politics"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-planet-money",
|
||||||
|
"title": "Planet Money",
|
||||||
|
"description": "The economy explained. NPR's Planet Money breaks down the economy with creative storytelling that makes sense of a complicated, ever-changing world.",
|
||||||
|
"feedUrl": "https://feeds.npr.org/510289/podcast.xml",
|
||||||
|
"author": "NPR",
|
||||||
|
"categories": ["Business", "Economics"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-how-i-built-this",
|
||||||
|
"title": "How I Built This with Guy Raz",
|
||||||
|
"description": "Guy Raz interviews the world's best-known entrepreneurs to learn how they built their iconic brands. A master-class on innovation, creativity, and leadership.",
|
||||||
|
"feedUrl": "https://feeds.npr.org/510313/podcast.xml",
|
||||||
|
"author": "NPR / Wondery",
|
||||||
|
"categories": ["Business", "Technology"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-freakonomics",
|
||||||
|
"title": "Freakonomics Radio",
|
||||||
|
"description": "Discover the hidden side of everything with Stephen Dubner. Each episode explores the riddles of everyday life using the tools of economics.",
|
||||||
|
"feedUrl": "https://feeds.feedburner.com/freakonomicsradio",
|
||||||
|
"author": "Stephen J. Dubner",
|
||||||
|
"categories": ["Business", "Economics", "Society"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-darknet-diaries",
|
||||||
|
"title": "Darknet Diaries",
|
||||||
|
"description": "True stories from the dark side of the Internet. Host Jack Rhysider investigates hacks, data breaches, cybercrime, and digital espionage with rigorous journalism and captivating storytelling.",
|
||||||
|
"feedUrl": "https://podcast.darknetdiaries.com/",
|
||||||
|
"author": "Jack Rhysider",
|
||||||
|
"categories": ["Technology", "True Crime"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-changelog",
|
||||||
|
"title": "The Changelog",
|
||||||
|
"description": "Software's best weekly news brief, deep technical interviews, and talk show. Conversations with the hackers, leaders, and innovators of the open source and software world.",
|
||||||
|
"feedUrl": "https://changelog.fm/rss",
|
||||||
|
"author": "Changelog Media",
|
||||||
|
"categories": ["Technology", "Software Engineering"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-twit",
|
||||||
|
"title": "This Week in Tech (TWiT)",
|
||||||
|
"description": "Your first podcast of the week, the last word in tech. Leo Laporte and a rotating panel of tech experts discuss the week's biggest tech news.",
|
||||||
|
"feedUrl": "https://feeds.twit.tv/twit.xml",
|
||||||
|
"author": "TWiT",
|
||||||
|
"categories": ["Technology"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-radiolab",
|
||||||
|
"title": "Radiolab",
|
||||||
|
"description": "Radiolab is on a curiosity bender. Each episode weaves together science, legal history, and deeply human stories with innovative sound design. Hosted by Lulu Miller and Latif Nasser.",
|
||||||
|
"feedUrl": "http://feeds.wnyc.org/radiolab",
|
||||||
|
"author": "WNYC Studios",
|
||||||
|
"categories": ["Science", "Storytelling"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-huberman-lab",
|
||||||
|
"title": "Huberman Lab",
|
||||||
|
"description": "Regularly ranked as the #1 health podcast in the world. Dr. Andrew Huberman discusses science and science-based tools for everyday life: sleep, focus, fitness, and performance.",
|
||||||
|
"feedUrl": "https://feeds.megaphone.fm/hubermanlab",
|
||||||
|
"author": "Scicomm Media",
|
||||||
|
"categories": ["Health", "Science"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-skeptics-guide",
|
||||||
|
"title": "The Skeptics' Guide to the Universe",
|
||||||
|
"description": "Your guide to reality. A weekly science and critical thinking podcast that explores myths, conspiracies, pseudoscience, and the latest scientific discoveries — with a skeptical eye.",
|
||||||
|
"feedUrl": "https://feeds.feedburner.com/TheSkepticsGuideToTheUniverse",
|
||||||
|
"author": "Steven Novella",
|
||||||
|
"categories": ["Science", "Philosophy"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-throughline",
|
||||||
|
"title": "Throughline",
|
||||||
|
"description": "The past is never past. NPR's Throughline travels beyond the headlines to answer the question 'How did we get here?' Each episode brings history to life from ancient civilizations to forgotten figures.",
|
||||||
|
"feedUrl": "https://feeds.npr.org/510333/podcast.xml",
|
||||||
|
"author": "NPR",
|
||||||
|
"categories": ["History", "Politics"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-hardcore-history",
|
||||||
|
"title": "Dan Carlin's Hardcore History",
|
||||||
|
"description": "In Hardcore History, journalist and broadcaster Dan Carlin applies his unorthodox, 'Martian' way of thinking to the past. Multi-hour deep dives into pivotal events that blend high drama with masterful narration.",
|
||||||
|
"feedUrl": "https://feeds.feedburner.com/dancarlin/history",
|
||||||
|
"author": "Dan Carlin",
|
||||||
|
"categories": ["History"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-history-of-rome",
|
||||||
|
"title": "The History of Rome",
|
||||||
|
"description": "A weekly chronological podcast tracing the entire history of Rome, from its mythical founding to the fall of the Western Empire. A masterclass in narrative history.",
|
||||||
|
"feedUrl": "https://feeds.feedburner.com/TheHistoryOfRome",
|
||||||
|
"author": "Mike Duncan",
|
||||||
|
"categories": ["History"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-philosophize-this",
|
||||||
|
"title": "Philosophize This!",
|
||||||
|
"description": "Stephen West walks through the entire history of philosophy chronologically, from the pre-Socratics to contemporary thinkers. Making profound ideas accessible without dumbing them down.",
|
||||||
|
"feedUrl": "https://philosophizethis.libsyn.com/rss",
|
||||||
|
"author": "Stephen West",
|
||||||
|
"categories": ["Philosophy", "Education"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-very-bad-wizards",
|
||||||
|
"title": "Very Bad Wizards",
|
||||||
|
"description": "A philosopher (Tamler Sommers) and a psychologist (David Pizarro) discuss human nature, ethics, free will, and whatever movie they just watched. Irreverent, insightful, and intellectually honest.",
|
||||||
|
"feedUrl": "https://feeds.libsyn.com/474285/rss",
|
||||||
|
"author": "Tamler Sommers & David Pizarro",
|
||||||
|
"categories": ["Philosophy", "Science"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-big-picture",
|
||||||
|
"title": "The Big Picture",
|
||||||
|
"description": "The Ringer's Sean Fennessey and Amanda Dobbins discuss the week in movies, TV, and streaming — from box office analysis to what's worth your time.",
|
||||||
|
"feedUrl": "https://rss.art19.com/the-big-picture",
|
||||||
|
"author": "The Ringer",
|
||||||
|
"categories": ["Film", "Entertainment"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-all-songs-considered",
|
||||||
|
"title": "All Songs Considered",
|
||||||
|
"description": "NPR's flagship music discovery podcast, delivering the best new releases every week across indie rock, jazz, electronic, and everything in between. Discover music you wouldn't stumble across on your own.",
|
||||||
|
"feedUrl": "https://feeds.npr.org/510019/podcast.xml",
|
||||||
|
"author": "NPR Music",
|
||||||
|
"categories": ["Music"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-switched-on-pop",
|
||||||
|
"title": "Switched on Pop",
|
||||||
|
"description": "Musicologist Nate Sloan and songwriter Charlie Harding explain why pop music sounds the way it does — pulling apart chord progressions, production tricks, and cultural trends with zero snobbery.",
|
||||||
|
"feedUrl": "https://feeds.megaphone.fm/switchedonpop",
|
||||||
|
"author": "Vox Media / Panoply",
|
||||||
|
"categories": ["Music"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-hit-parade",
|
||||||
|
"title": "Hit Parade",
|
||||||
|
"description": "Slate's Chris Molanphy traces how songs and genres conquered the Billboard charts, weaving chart history, cultural context, and pure trivia into each episode.",
|
||||||
|
"feedUrl": "https://feeds.megaphone.fm/hitparade",
|
||||||
|
"author": "Slate",
|
||||||
|
"categories": ["Music", "History"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-song-exploder",
|
||||||
|
"title": "Song Exploder",
|
||||||
|
"description": "Musicians take apart their songs, piece by piece, and tell the story of how they were made. Past guests include Billie Eilish, Fleetwood Mac, and Lin-Manuel Miranda.",
|
||||||
|
"feedUrl": "https://songexploder.net/rss",
|
||||||
|
"author": "Hrishikesh Hirway",
|
||||||
|
"categories": ["Music", "Arts"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-blank-check",
|
||||||
|
"title": "Blank Check with Griffin & David",
|
||||||
|
"description": "Reviews of directors' complete filmographies, episode by episode. Specifically, auteurs whose early successes afforded them the rare 'blank check' from Hollywood. Painstakingly hilarious detail.",
|
||||||
|
"feedUrl": "https://audioboom.com/channels/4278829.rss",
|
||||||
|
"author": "Griffin Newman & David Sims",
|
||||||
|
"categories": ["Film", "Comedy"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-99-invisible",
|
||||||
|
"title": "99% Invisible",
|
||||||
|
"description": "A sound-rich, narrative podcast about all the thought that goes into the things we don't think about — the unnoticed architecture and design that shape our world. Hosted by Roman Mars.",
|
||||||
|
"feedUrl": "https://feeds.simplecast.com/BqbsxVfO",
|
||||||
|
"author": "Roman Mars",
|
||||||
|
"categories": ["Design", "Arts", "Culture"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-gastropod",
|
||||||
|
"title": "Gastropod",
|
||||||
|
"description": "Food with a side of science and history. Co-hosts Cynthia Graber and Nicola Twilley explore the hidden history and surprising science behind a different food or farming topic every other week.",
|
||||||
|
"feedUrl": "https://gastropod.com/feed",
|
||||||
|
"author": "Cynthia Graber & Nicola Twilley",
|
||||||
|
"categories": ["Food", "Science", "History"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-this-american-life",
|
||||||
|
"title": "This American Life",
|
||||||
|
"description": "Hosted by Ira Glass, each episode weaves together stories around a single theme. Combining investigative reporting with intimate personal narratives, it sets the gold standard for audio storytelling.",
|
||||||
|
"feedUrl": "https://www.thisamericanlife.org/podcast/rss.xml",
|
||||||
|
"author": "This American Life",
|
||||||
|
"categories": ["Storytelling", "Culture"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-ted-talks-daily",
|
||||||
|
"title": "TED Talks Daily",
|
||||||
|
"description": "Thought-provoking ideas on every subject imaginable from the world's leading thinkers and creators. A new TED Talk every weekday.",
|
||||||
|
"feedUrl": "https://feeds.feedburner.com/TEDTalks_audio",
|
||||||
|
"author": "TED",
|
||||||
|
"categories": ["Education", "Storytelling"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-tim-ferriss",
|
||||||
|
"title": "The Tim Ferriss Show",
|
||||||
|
"description": "Tim Ferriss deconstructs world-class performers — from billionaires to chess prodigies to athletes — to extract the tools, tactics, and routines you can apply to your own life.",
|
||||||
|
"feedUrl": "https://rss.art19.com/tim-ferriss-show",
|
||||||
|
"author": "Tim Ferriss",
|
||||||
|
"categories": ["Self-Improvement", "Business"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-jordan-harbinger",
|
||||||
|
"title": "The Jordan Harbinger Show",
|
||||||
|
"description": "In-depth conversations with fascinating minds — from Ray Dalio to arms traffickers. Jordan Harbinger unpacks guests' wisdom into practical nuggets for work, life, and relationships.",
|
||||||
|
"feedUrl": "https://rss.art19.com/the-jordan-harbinger-show",
|
||||||
|
"author": "Jordan Harbinger",
|
||||||
|
"categories": ["Self-Improvement"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-on-purpose",
|
||||||
|
"title": "On Purpose with Jay Shetty",
|
||||||
|
"description": "Jay Shetty hosts conversations and workshops designed to make you happier, healthier, and more healed. Interviews with experts, celebrities, and thought leaders on mindset and habit-building.",
|
||||||
|
"feedUrl": "https://rss.art19.com/on-purpose-with-jay-shetty",
|
||||||
|
"author": "Jay Shetty",
|
||||||
|
"categories": ["Self-Improvement", "Health"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-10-percent-happier",
|
||||||
|
"title": "10% Happier with Dan Harris",
|
||||||
|
"description": "Self-help for the skeptical. ABC News anchor Dan Harris explores meditation and mindfulness with scientists, monks, and teachers, born from his own panic attack on live TV.",
|
||||||
|
"feedUrl": "https://rss.art19.com/ten-percent-happier",
|
||||||
|
"author": "Dan Harris",
|
||||||
|
"categories": ["Self-Improvement", "Health", "Philosophy"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-school-of-greatness",
|
||||||
|
"title": "The School of Greatness",
|
||||||
|
"description": "Former pro athlete Lewis Howes interviews successful people across business, sports, science, and literature to help you unlock your inner greatness and live your best life.",
|
||||||
|
"feedUrl": "https://rss.art19.com/the-school-of-greatness",
|
||||||
|
"author": "Lewis Howes",
|
||||||
|
"categories": ["Self-Improvement", "Business"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-sysk",
|
||||||
|
"title": "Stuff You Should Know",
|
||||||
|
"description": "If you've ever wanted to know about champagne, satanism, the Stonewall Uprising, chaos theory, LSD, El Nino, true crime or Roswell — Josh and Chuck have got you covered.",
|
||||||
|
"feedUrl": "https://www.omnycontent.com/d/playlist/e73c998e-6e60-432f-8610-ae210140c5b1/A91018A4-EA4F-4130-BF55-AE270180C327/44710ECC-10BB-48D1-93C7-AE270180C33E/podcast.rss",
|
||||||
|
"author": "iHeartPodcasts (Josh Clark & Chuck Bryant)",
|
||||||
|
"categories": ["Education", "Comedy"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "discover-in-our-time",
|
||||||
|
"title": "In Our Time",
|
||||||
|
"description": "Melvyn Bragg and guests on BBC Radio 4 discuss the history of ideas — from the Peloponnesian War to the science of photography. A weekly graduate seminar in audio form since 1998.",
|
||||||
|
"feedUrl": "https://podcasts.files.bbci.co.uk/b006qykl.rss",
|
||||||
|
"author": "BBC Radio 4",
|
||||||
|
"categories": ["History", "Education", "Philosophy"]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
7
notes.md
7
notes.md
@@ -1,7 +0,0 @@
|
|||||||
- [x] Audio play can survive quit out
|
|
||||||
- [x] Discover tab does not move highlight on jk, only moves a star, My Feeds tab
|
|
||||||
moves nothing, other tabs(and main tab panel) are the correct pattern
|
|
||||||
- [x] Weird focus colors happen at times, the search panel does not get the correct pane
|
|
||||||
border color when focused for instance
|
|
||||||
- [x] Feed tab needs to fully drop the depth 1 panel - its effectively a duplication
|
|
||||||
of My Shows - Just immediately go into the full list
|
|
||||||
@@ -8,13 +8,13 @@
|
|||||||
"podtui": "./dist/index.js"
|
"podtui": "./dist/index.js"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "bun src/index.tsx",
|
"start": "bun --preload @opentui/solid/preload src/index.tsx",
|
||||||
"dev": "bun --watch src/index.tsx",
|
"dev": "bun --preload @opentui/solid/preload --watch src/index.tsx",
|
||||||
"build:native": "bash scripts/build-cavacore.sh",
|
"build:native": "bash scripts/build-cavacore.sh",
|
||||||
"build": "bun run build.ts",
|
"build": "bun run build.ts",
|
||||||
"dist": "bun dist/index.js",
|
"dist": "bun dist/index.js",
|
||||||
"test": "bun test",
|
"test": "bun test",
|
||||||
"lint": "bun run lint.ts"
|
"lint": "bun tsc --noEmit"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/bun": "latest",
|
"@types/bun": "latest",
|
||||||
|
|||||||
@@ -19,36 +19,58 @@ mkdir -p "$OUT_DIR"
|
|||||||
OS="$(uname -s)"
|
OS="$(uname -s)"
|
||||||
ARCH="$(uname -m)"
|
ARCH="$(uname -m)"
|
||||||
|
|
||||||
# Resolve fftw3 paths
|
# Resolve fftw3 paths. The static archive lives in different places per
|
||||||
|
# platform: Homebrew (/opt/homebrew on arm64, /usr/local on Intel) and, on
|
||||||
|
# Debian/Ubuntu, the multiarch dir /usr/lib/<triplet> (e.g.
|
||||||
|
# x86_64-linux-gnu, aarch64-linux-gnu).
|
||||||
if [ "$OS" = "Darwin" ]; then
|
if [ "$OS" = "Darwin" ]; then
|
||||||
if [ "$ARCH" = "arm64" ]; then
|
LIB_EXT="dylib"
|
||||||
FFTW_PREFIX="${FFTW_PREFIX:-/opt/homebrew}"
|
SHARED_FLAG="-dynamiclib"
|
||||||
else
|
INSTALL_NAME="-install_name @rpath/libcavacore.dylib"
|
||||||
FFTW_PREFIX="${FFTW_PREFIX:-/usr/local}"
|
if [ "$ARCH" = "arm64" ]; then
|
||||||
fi
|
FFTW_HINTS="/opt/homebrew /usr/local"
|
||||||
LIB_EXT="dylib"
|
else
|
||||||
SHARED_FLAG="-dynamiclib"
|
FFTW_HINTS="/usr/local /opt/homebrew"
|
||||||
INSTALL_NAME="-install_name @rpath/libcavacore.dylib"
|
fi
|
||||||
else
|
else
|
||||||
FFTW_PREFIX="${FFTW_PREFIX:-/usr}"
|
LIB_EXT="so"
|
||||||
LIB_EXT="so"
|
SHARED_FLAG="-shared"
|
||||||
SHARED_FLAG="-shared"
|
INSTALL_NAME=""
|
||||||
INSTALL_NAME=""
|
FFTW_HINTS="/usr /usr/local"
|
||||||
|
fi
|
||||||
|
|
||||||
|
FFTW_PREFIX="${FFTW_PREFIX:-}"
|
||||||
|
FFTW_STATIC=""
|
||||||
|
if [ -n "$FFTW_PREFIX" ]; then
|
||||||
|
FFTW_STATIC="$FFTW_PREFIX/lib/libfftw3.a"
|
||||||
|
else
|
||||||
|
for hint in $FFTW_HINTS; do
|
||||||
|
for cand in "$hint/lib/libfftw3.a" "$hint/lib/${ARCH}-linux-gnu/libfftw3.a"; do
|
||||||
|
if [ -f "$cand" ]; then
|
||||||
|
FFTW_STATIC="$cand"
|
||||||
|
FFTW_PREFIX="$hint"
|
||||||
|
break 2
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "$FFTW_STATIC" ] || [ ! -f "$FFTW_STATIC" ]; then
|
||||||
|
echo "Error: libfftw3.a not found (searched: ${FFTW_HINTS})"
|
||||||
|
echo "Install fftw3: brew install fftw (macOS) or apt install libfftw3-dev (Linux)"
|
||||||
|
echo "or point FFTW_PREFIX at a prefix containing lib/libfftw3.a."
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
FFTW_INCLUDE="$FFTW_PREFIX/include"
|
FFTW_INCLUDE="$FFTW_PREFIX/include"
|
||||||
FFTW_STATIC="$FFTW_PREFIX/lib/libfftw3.a"
|
if [ ! -d "$FFTW_INCLUDE" ]; then
|
||||||
|
FFTW_INCLUDE="$FFTW_PREFIX/include/$(basename "$(dirname "$FFTW_STATIC")")"
|
||||||
if [ ! -f "$FFTW_STATIC" ]; then
|
|
||||||
echo "Error: libfftw3.a not found at $FFTW_STATIC"
|
|
||||||
echo "Install fftw3: brew install fftw (macOS) or apt install libfftw3-dev (Linux)"
|
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -f "$SRC" ]; then
|
if [ ! -f "$SRC" ]; then
|
||||||
echo "Error: cavacore.c not found at $SRC"
|
echo "Error: cavacore.c not found at $SRC"
|
||||||
echo "Ensure the cava submodule is initialized: git submodule update --init"
|
echo "The cava source is vendored under cava/ (from github.com/karlstav/cava, MIT)."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
OUT="$OUT_DIR/libcavacore.$LIB_EXT"
|
OUT="$OUT_DIR/libcavacore.$LIB_EXT"
|
||||||
@@ -59,21 +81,21 @@ echo " FFTW3: $FFTW_STATIC"
|
|||||||
echo " Output: $OUT"
|
echo " Output: $OUT"
|
||||||
|
|
||||||
cc -O2 \
|
cc -O2 \
|
||||||
$SHARED_FLAG \
|
$SHARED_FLAG \
|
||||||
$INSTALL_NAME \
|
$INSTALL_NAME \
|
||||||
-fPIC \
|
-fPIC \
|
||||||
-I"$FFTW_INCLUDE" \
|
-I"$FFTW_INCLUDE" \
|
||||||
-I"$ROOT/cava" \
|
-I"$ROOT/cava" \
|
||||||
-o "$OUT" \
|
-o "$OUT" \
|
||||||
"$SRC" \
|
"$SRC" \
|
||||||
"$FFTW_STATIC" \
|
"$FFTW_STATIC" \
|
||||||
-lm
|
-lm
|
||||||
|
|
||||||
echo "Built: $OUT"
|
echo "Built: $OUT"
|
||||||
|
|
||||||
# Verify exported symbols
|
# Verify exported symbols
|
||||||
if [ "$OS" = "Darwin" ]; then
|
if [ "$OS" = "Darwin" ]; then
|
||||||
echo ""
|
echo ""
|
||||||
echo "Exported symbols:"
|
echo "Exported symbols:"
|
||||||
nm -gU "$OUT" | grep "cava_"
|
nm -gU "$OUT" | grep "cava_"
|
||||||
fi
|
fi
|
||||||
|
|||||||
240
scripts/release-tag.sh
Executable file
240
scripts/release-tag.sh
Executable file
@@ -0,0 +1,240 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# release-tag.sh — PodTui version bump, commit, tag, and push.
|
||||||
|
#
|
||||||
|
# Mirrors the release flow from FlexLove's scripts/make-tag.sh, adapted for
|
||||||
|
# PodTui's single version source (src/index.tsx) and dual remotes (gh, gt).
|
||||||
|
#
|
||||||
|
# Usage:
|
||||||
|
# scripts/release-tag.sh interactive release
|
||||||
|
# scripts/release-tag.sh --dry-run plan the bump/tag/pushes without doing
|
||||||
|
#
|
||||||
|
# Pushing a v* tag to the `gh` remote triggers .github/workflows/release.yml
|
||||||
|
# (4-platform tarball builds) — the release and the Homebrew tap update then
|
||||||
|
# happen automatically and need no further local action.
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
RED='\033[0;31m'
|
||||||
|
GREEN='\033[0;32m'
|
||||||
|
YELLOW='\033[1;33m'
|
||||||
|
BLUE='\033[0;34m'
|
||||||
|
CYAN='\033[0;36m'
|
||||||
|
NC='\033[0m' # No Color
|
||||||
|
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
|
||||||
|
cd "$PROJECT_ROOT"
|
||||||
|
|
||||||
|
DRY_RUN=0
|
||||||
|
for arg in "$@"; do
|
||||||
|
case "$arg" in
|
||||||
|
--dry-run | -n) DRY_RUN=1 ;;
|
||||||
|
--help | -h)
|
||||||
|
echo "Usage: scripts/release-tag.sh [--dry-run]"
|
||||||
|
echo " --dry-run, -n show the plan without committing, tagging, or pushing"
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo -e "${RED}Unknown option: ${arg}${NC}" >&2
|
||||||
|
exit 2
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ ! -d .git ] && [ ! -f .git ]; then
|
||||||
|
echo -e "${RED}Error: Not in a git repository${NC}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! git diff-index --quiet HEAD --; then
|
||||||
|
echo -e "${YELLOW}You have uncommitted changes:${NC}"
|
||||||
|
git status --short
|
||||||
|
echo ""
|
||||||
|
read -p "Continue anyway? (y/n) " -n 1 -r
|
||||||
|
echo
|
||||||
|
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
|
||||||
|
echo -e "${RED}Aborted${NC}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo ""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Current version from the latest tag; fall back to src/index.tsx.
|
||||||
|
CURRENT_VERSION=$(git describe --tags --abbrev=0 2>/dev/null | sed 's/^v//')
|
||||||
|
if [ -z "$CURRENT_VERSION" ]; then
|
||||||
|
CURRENT_VERSION=$(grep -m 1 "^const VERSION" src/index.tsx | sed -E 's/.*"([0-9]+\.[0-9]+\.[0-9]+)".*/\1/')
|
||||||
|
if [ -z "$CURRENT_VERSION" ]; then
|
||||||
|
echo -e "${RED}Error: could not extract version from git tags or src/index.tsx${NC}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo -e "${YELLOW}No tags found; using VERSION from src/index.tsx (${CURRENT_VERSION})${NC}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo -e "${CYAN}Current version:${NC} ${GREEN}v${CURRENT_VERSION}${NC}"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
IFS='.' read -r MAJOR MINOR PATCH <<<"$CURRENT_VERSION"
|
||||||
|
MAJOR=$(echo "$MAJOR" | sed 's/[^0-9].*//')
|
||||||
|
MINOR=$(echo "$MINOR" | sed 's/[^0-9].*//')
|
||||||
|
PATCH=$(echo "$PATCH" | sed 's/[^0-9].*//')
|
||||||
|
|
||||||
|
echo -e "${CYAN}Select version bump type:${NC}"
|
||||||
|
echo " 1) Major (breaking changes) ${MAJOR}.${MINOR}.${PATCH} → $((MAJOR + 1)).0.0"
|
||||||
|
echo " 2) Minor (new features) ${MAJOR}.${MINOR}.${PATCH} → ${MAJOR}.$((MINOR + 1)).0"
|
||||||
|
echo " 3) Patch (bug fixes) ${MAJOR}.${MINOR}.${PATCH} → ${MAJOR}.${MINOR}.$((PATCH + 1))"
|
||||||
|
echo " 4) Custom version"
|
||||||
|
echo " 5) Cancel"
|
||||||
|
echo ""
|
||||||
|
read -p "Enter choice (1-5): " -n 1 -r CHOICE
|
||||||
|
echo ""
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
case $CHOICE in
|
||||||
|
1)
|
||||||
|
NEW_VERSION="$((MAJOR + 1)).0.0"
|
||||||
|
;;
|
||||||
|
2)
|
||||||
|
NEW_VERSION="${MAJOR}.$((MINOR + 1)).0"
|
||||||
|
;;
|
||||||
|
3)
|
||||||
|
NEW_VERSION="${MAJOR}.${MINOR}.$((PATCH + 1))"
|
||||||
|
;;
|
||||||
|
4)
|
||||||
|
read -p "Enter custom version (e.g., 1.0.0-beta): " -r NEW_VERSION
|
||||||
|
;;
|
||||||
|
5)
|
||||||
|
echo -e "${RED}Cancelled${NC}"
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo -e "${RED}Invalid choice${NC}"
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Version sanity check (tags are vMAJOR.MINOR.PATCH).
|
||||||
|
if ! echo "$NEW_VERSION" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$'; then
|
||||||
|
echo -e "${RED}Error: ${NEW_VERSION} is not a valid X.Y.Z version (v tags only)${NC}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo -e "${CYAN}New version:${NC} ${GREEN}v${NEW_VERSION}${NC}"
|
||||||
|
echo ""
|
||||||
|
echo -e "${YELLOW}This will:${NC}"
|
||||||
|
echo " 1. Set src/index.tsx → VERSION = \"${NEW_VERSION}\""
|
||||||
|
echo " 2. Commit the bump"
|
||||||
|
echo " 3. Create annotated tag v${NEW_VERSION}"
|
||||||
|
echo " 4. Push master and the tag to every remote"
|
||||||
|
REMOTES=$(git remote)
|
||||||
|
for r in $REMOTES; do
|
||||||
|
echo " → $r"
|
||||||
|
done
|
||||||
|
echo ""
|
||||||
|
echo -e "${YELLOW}Note: pushing the tag to ${BLUE}gh${YELLOW} triggers release.yml CI (4-platform"
|
||||||
|
echo "binaries + GitHub Release) and the homebrew-podtui tap update.${NC}"
|
||||||
|
echo ""
|
||||||
|
read -p "Proceed? (y/n) " -n 1 -r
|
||||||
|
echo ""
|
||||||
|
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
|
||||||
|
echo -e "${YELLOW}Aborted — no changes made${NC}"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$DRY_RUN" -eq 1 ]; then
|
||||||
|
echo ""
|
||||||
|
echo -e "${CYAN}[dry-run]${NC} would have:"
|
||||||
|
echo " sed src/index.tsx: VERSION \"${CURRENT_VERSION}\" → \"${NEW_VERSION}\""
|
||||||
|
echo " git commit -m \"bump VERSION to ${NEW_VERSION}\""
|
||||||
|
echo " git tag -a v${NEW_VERSION} -m \"PodTUI v${NEW_VERSION}\""
|
||||||
|
for r in $REMOTES; do echo " push $r master"; done
|
||||||
|
for r in $REMOTES; do echo " push $r v${NEW_VERSION}"; done
|
||||||
|
echo ""
|
||||||
|
echo -e "${GREEN}Plan only — nothing written${NC}"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ── Apply the bump ───────────────────────────────────────────────────────────
|
||||||
|
echo ""
|
||||||
|
echo -e "${CYAN}[1/4]${NC} Updating src/index.tsx..."
|
||||||
|
sed -i.bak "s/const VERSION = \"[^\"]*\"/const VERSION = \"${NEW_VERSION}\"/" src/index.tsx
|
||||||
|
rm -f src/index.tsx.bak
|
||||||
|
echo -e "${GREEN}✓ src/index.tsx updated${NC}"
|
||||||
|
|
||||||
|
if git diff --quiet -- src/index.tsx; then
|
||||||
|
if git rev-parse -q --verify "refs/tags/v${NEW_VERSION}" >/dev/null; then
|
||||||
|
echo -e "${YELLOW}Already at ${NEW_VERSION} and tag v${NEW_VERSION} exists — nothing to release.${NC}"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
echo -e "${YELLOW}VERSION is already ${NEW_VERSION} (bump already committed).${NC}"
|
||||||
|
echo -e "${YELLOW}Will skip the commit and just create the missing tag + push.${NC}"
|
||||||
|
read -p "Tag v${NEW_VERSION} on current HEAD and push? (y/n) " -n 1 -r
|
||||||
|
echo
|
||||||
|
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
|
||||||
|
echo -e "${YELLOW}Aborted — no changes made${NC}"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
git add src/index.tsx
|
||||||
|
echo -e "${GREEN}✓ staged${NC}"
|
||||||
|
|
||||||
|
echo -e "${CYAN}[2/4]${NC} Committing..."
|
||||||
|
DEFAULT_COMMIT_MSG="bump VERSION to ${NEW_VERSION}"
|
||||||
|
echo -e "Default commit message: ${CYAN}${DEFAULT_COMMIT_MSG}${NC}"
|
||||||
|
read -p "Use default? (y/n) " -n 1 -r
|
||||||
|
echo
|
||||||
|
if [[ $REPLY =~ ^[Nn]$ ]]; then
|
||||||
|
read -p "Enter commit message: " -r COMMIT_MSG
|
||||||
|
else
|
||||||
|
COMMIT_MSG="$DEFAULT_COMMIT_MSG"
|
||||||
|
fi
|
||||||
|
git commit -m "$COMMIT_MSG"
|
||||||
|
echo -e "${GREEN}✓ committed: ${COMMIT_MSG}${NC}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo -e "${CYAN}[3/4]${NC} Tagging..."
|
||||||
|
git tag -a "v${NEW_VERSION}" -m "PodTUI v${NEW_VERSION}"
|
||||||
|
echo -e "${GREEN}✓ tagged v${NEW_VERSION}${NC}"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
echo -e "${CYAN}[4/4]${NC} Pushing..."
|
||||||
|
FAILED=""
|
||||||
|
for r in $REMOTES; do
|
||||||
|
if ! git push "$r" master; then
|
||||||
|
FAILED="${FAILED}${r} (branch) "
|
||||||
|
fi
|
||||||
|
if ! git push "$r" tag "v${NEW_VERSION}"; then
|
||||||
|
FAILED="${FAILED}${r} (tag) "
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
if [ -n "$FAILED" ]; then
|
||||||
|
echo -e "${RED}═══════════════════════════════════════${NC}"
|
||||||
|
echo -e "${RED}✗ Push failed for: ${FAILED}${NC}"
|
||||||
|
echo -e "${RED}═══════════════════════════════════════${NC}"
|
||||||
|
echo ""
|
||||||
|
echo -e "${YELLOW}The commit and tag exist locally. To retry:${NC}"
|
||||||
|
for r in $REMOTES; do
|
||||||
|
echo " git push ${r} master"
|
||||||
|
echo " git push ${r} v${NEW_VERSION}"
|
||||||
|
done
|
||||||
|
echo ""
|
||||||
|
echo -e "${YELLOW}To undo:${NC}"
|
||||||
|
echo " git tag -d v${NEW_VERSION}"
|
||||||
|
echo " git reset --soft HEAD~1"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo -e "${GREEN}═══════════════════════════════════════${NC}"
|
||||||
|
echo -e "${GREEN}✓ PodTui v${NEW_VERSION} released${NC}"
|
||||||
|
echo -e "${GREEN}═══════════════════════════════════════${NC}"
|
||||||
|
echo ""
|
||||||
|
echo -e "${CYAN}Version:${NC} ${CURRENT_VERSION} → ${GREEN}${NEW_VERSION}${NC}"
|
||||||
|
echo -e "${CYAN}Tag:${NC} v${NEW_VERSION}"
|
||||||
|
echo ""
|
||||||
|
echo -e "${BLUE}Next steps (automatic, nothing to do):${NC}"
|
||||||
|
echo " 1. GitHub Action release.yml builds 4 tarballs and attaches them:"
|
||||||
|
echo -e " ${CYAN}gh run watch \$(gh run list --limit 1 --json databaseId -q .[0].databaseId)${NC}"
|
||||||
|
echo " 2. mikefreno/homebrew-podtui self-updates within the hour (Formula"
|
||||||
|
echo " URLs + sha256s); brew upgrade podtui afterwards."
|
||||||
@@ -436,16 +436,9 @@ async function main() {
|
|||||||
}
|
}
|
||||||
if (newAction) {
|
if (newAction) {
|
||||||
if (flags.audio && audioControls?.switchBackend) {
|
if (flags.audio && audioControls?.switchBackend) {
|
||||||
// Re-detect: clear env so detection picks the best real backend.
|
|
||||||
delete process.env.PODTUI_AUDIO_BACKEND;
|
|
||||||
// Force (re)creation of a real backend; useAudio caches, switchBackend resets.
|
// Force (re)creation of a real backend; useAudio caches, switchBackend resets.
|
||||||
|
delete process.env.PODTUI_AUDIO_BACKEND;
|
||||||
await audioControls.switchBackend("mpv").catch(() => {});
|
await audioControls.switchBackend("mpv").catch(() => {});
|
||||||
if (
|
|
||||||
!audioControls.backendName() ||
|
|
||||||
audioControls.backendName() === "none"
|
|
||||||
) {
|
|
||||||
await audioControls.switchBackend("afplay").catch(() => {});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
actions.push(newAction);
|
actions.push(newAction);
|
||||||
saveActions(actions);
|
saveActions(actions);
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
import type { TabId } from "./Tab"
|
|
||||||
import { useTheme } from "@/context/ThemeContext"
|
|
||||||
|
|
||||||
type NavigationProps = {
|
|
||||||
activeTab: TabId
|
|
||||||
onTabSelect: (tab: TabId) => void
|
|
||||||
}
|
|
||||||
|
|
||||||
export function Navigation(props: NavigationProps) {
|
|
||||||
const { theme } = useTheme();
|
|
||||||
return (
|
|
||||||
<box style={{ flexDirection: "row", width: "100%", height: 1 }}>
|
|
||||||
<text fg={theme.text}>
|
|
||||||
{props.activeTab === "feed" ? "[" : " "}Feed{props.activeTab === "feed" ? "]" : " "}
|
|
||||||
<span> </span>
|
|
||||||
{props.activeTab === "shows" ? "[" : " "}My Shows{props.activeTab === "shows" ? "]" : " "}
|
|
||||||
<span> </span>
|
|
||||||
{props.activeTab === "discover" ? "[" : " "}Discover{props.activeTab === "discover" ? "]" : " "}
|
|
||||||
<span> </span>
|
|
||||||
{props.activeTab === "search" ? "[" : " "}Search{props.activeTab === "search" ? "]" : " "}
|
|
||||||
<span> </span>
|
|
||||||
{props.activeTab === "player" ? "[" : " "}Player{props.activeTab === "player" ? "]" : " "}
|
|
||||||
<span> </span>
|
|
||||||
{props.activeTab === "settings" ? "[" : " "}Settings{props.activeTab === "settings" ? "]" : " "}
|
|
||||||
</text>
|
|
||||||
</box>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -88,7 +88,7 @@ function ensureBackend(): AudioBackend {
|
|||||||
// ── Process-exit teardown ─────────────────────────────────────────────
|
// ── Process-exit teardown ─────────────────────────────────────────────
|
||||||
// `q` (the quit action) calls `process.exit(0)`, which bypasses Solid's
|
// `q` (the quit action) calls `process.exit(0)`, which bypasses Solid's
|
||||||
// onCleanup — where `backend.dispose()` would otherwise kill the spawned
|
// onCleanup — where `backend.dispose()` would otherwise kill the spawned
|
||||||
// player (mpv/ffplay/afplay). Without this hook those child processes
|
// player (mpv). Without this hook those child processes
|
||||||
// survive the host and keep playing audio after the TUI has quit. The
|
// survive the host and keep playing audio after the TUI has quit. The
|
||||||
// `exit` event fires synchronously on `process.exit(N)`; the signal
|
// `exit` event fires synchronously on `process.exit(N)`; the signal
|
||||||
// handlers cover Ctrl-C / kill, which otherwise terminate without running
|
// handlers cover Ctrl-C / kill, which otherwise terminate without running
|
||||||
|
|||||||
@@ -5,43 +5,43 @@
|
|||||||
* regardless of which component is focused. Uses the event bus to
|
* regardless of which component is focused. Uses the event bus to
|
||||||
* decouple key detection from audio control logic.
|
* decouple key detection from audio control logic.
|
||||||
*
|
*
|
||||||
* Keys are only handled when an episode is loaded (or for play/pause,
|
* Volume and speed are app-level settings — adjustable with or without
|
||||||
* always). This prevents accidental volume/seek changes when there's
|
* an episode loaded (they apply to the next playback and persist). Seek
|
||||||
* nothing playing.
|
* is playback-dependent, so it still requires a loaded episode.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { useKeyboard } from "@opentui/solid"
|
import { useKeyboard } from "@opentui/solid";
|
||||||
import { emit } from "../utils/event-bus"
|
import { emit } from "../utils/event-bus";
|
||||||
|
|
||||||
export type MediaKeyAction =
|
export type MediaKeyAction =
|
||||||
| "media.toggle"
|
| "media.toggle"
|
||||||
| "media.volumeUp"
|
| "media.volumeUp"
|
||||||
| "media.volumeDown"
|
| "media.volumeDown"
|
||||||
| "media.seekForward"
|
| "media.seekForward"
|
||||||
| "media.seekBackward"
|
| "media.seekBackward"
|
||||||
| "media.speedCycle"
|
| "media.speedCycle";
|
||||||
|
|
||||||
/** Key-to-action mappings for multimedia controls */
|
/** Key-to-action mappings for multimedia controls */
|
||||||
const MEDIA_KEY_MAP: Record<string, MediaKeyAction> = {
|
const MEDIA_KEY_MAP: Record<string, MediaKeyAction> = {
|
||||||
// Common terminal media keys — these overlap with Player.tsx local
|
// Common terminal media keys — these overlap with Player.tsx local
|
||||||
// bindings, but Player guards on `props.focused` so the global
|
// bindings, but Player guards on `props.focused` so the global
|
||||||
// handler fires independently when the player tab is *not* active.
|
// handler fires independently when the player tab is *not* active.
|
||||||
//
|
//
|
||||||
// When Player IS focused both handlers fire, but since the audio
|
// When Player IS focused both handlers fire, but since the audio
|
||||||
// actions are idempotent (toggle = toggle, seek = additive) having
|
// actions are idempotent (toggle = toggle, seek = additive) having
|
||||||
// them called twice for the same keypress is avoided by the event
|
// them called twice for the same keypress is avoided by the event
|
||||||
// bus approach — the audio hook only processes event-bus events, and
|
// bus approach — the audio hook only processes event-bus events, and
|
||||||
// Player.tsx calls audio methods directly. We therefore guard with
|
// Player.tsx calls audio methods directly. We therefore guard with
|
||||||
// a "playerFocused" flag passed via options.
|
// a "playerFocused" flag passed via options.
|
||||||
}
|
};
|
||||||
|
|
||||||
export interface MultimediaKeysOptions {
|
export interface MultimediaKeysOptions {
|
||||||
/** When true, skip handling (Player.tsx handles keys locally) */
|
/** When true, skip handling (Player.tsx handles keys locally) */
|
||||||
playerFocused?: () => boolean
|
playerFocused?: () => boolean;
|
||||||
/** When true, skip handling (text input has focus) */
|
/** When true, skip handling (text input has focus) */
|
||||||
inputFocused?: () => boolean
|
inputFocused?: () => boolean;
|
||||||
/** Whether an episode is currently loaded */
|
/** Whether an episode is currently loaded */
|
||||||
hasEpisode?: () => boolean
|
hasEpisode?: () => boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -49,50 +49,47 @@ export interface MultimediaKeysOptions {
|
|||||||
* event bus. Call once at the app level (e.g. in App.tsx).
|
* event bus. Call once at the app level (e.g. in App.tsx).
|
||||||
*/
|
*/
|
||||||
export function useMultimediaKeys(options: MultimediaKeysOptions = {}) {
|
export function useMultimediaKeys(options: MultimediaKeysOptions = {}) {
|
||||||
useKeyboard((key) => {
|
useKeyboard((key) => {
|
||||||
// Don't intercept when a text input owns the keyboard
|
// Don't intercept when a text input owns the keyboard
|
||||||
if (options.inputFocused?.()) return
|
if (options.inputFocused?.()) return;
|
||||||
|
|
||||||
// Don't intercept when Player component handles its own keys
|
// Don't intercept when Player component handles its own keys
|
||||||
if (options.playerFocused?.()) return
|
if (options.playerFocused?.()) return;
|
||||||
|
|
||||||
// Ctrl/Meta combos are app-level shortcuts, not media keys
|
// Ctrl/Meta combos are app-level shortcuts, not media keys
|
||||||
if (key.ctrl || key.meta) return
|
if (key.ctrl || key.meta) return;
|
||||||
|
|
||||||
switch (key.name) {
|
switch (key.name) {
|
||||||
case "space":
|
case "space":
|
||||||
// Toggle play/pause — always valid (may start a loaded episode)
|
// Toggle play/pause — always valid (may start a loaded episode)
|
||||||
emit("media.toggle", {})
|
emit("media.toggle", {});
|
||||||
break
|
break;
|
||||||
|
|
||||||
case "up":
|
case "up":
|
||||||
if (!options.hasEpisode?.()) return
|
emit("media.volumeUp", {});
|
||||||
emit("media.volumeUp", {})
|
break;
|
||||||
break
|
|
||||||
|
|
||||||
case "down":
|
case "down":
|
||||||
if (!options.hasEpisode?.()) return
|
emit("media.volumeDown", {});
|
||||||
emit("media.volumeDown", {})
|
break;
|
||||||
break
|
|
||||||
|
|
||||||
case "left":
|
case "left":
|
||||||
if (!options.hasEpisode?.()) return
|
if (!options.hasEpisode?.()) return;
|
||||||
emit("media.seekBackward", {})
|
emit("media.seekBackward", {});
|
||||||
break
|
break;
|
||||||
|
|
||||||
case "right":
|
case "right":
|
||||||
if (!options.hasEpisode?.()) return
|
if (!options.hasEpisode?.()) return;
|
||||||
emit("media.seekForward", {})
|
emit("media.seekForward", {});
|
||||||
break
|
break;
|
||||||
|
|
||||||
case "s":
|
case "s":
|
||||||
if (!options.hasEpisode?.()) return
|
emit("media.speedCycle", {});
|
||||||
emit("media.speedCycle", {})
|
break;
|
||||||
break
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// Not a media key — do nothing
|
// Not a media key — do nothing
|
||||||
break
|
break;
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
const VERSION = "0.1.0";
|
const VERSION = "0.2.0";
|
||||||
|
|
||||||
interface CliArgs {
|
interface CliArgs {
|
||||||
version: boolean;
|
version: boolean;
|
||||||
|
|||||||
Binary file not shown.
@@ -65,6 +65,12 @@ function DiscoverPage() {
|
|||||||
};
|
};
|
||||||
onMount(ensureFocus);
|
onMount(ensureFocus);
|
||||||
|
|
||||||
|
// Auto-fetch the featured-shows manifest on first mount (network failure is
|
||||||
|
// non-fatal — the list stays empty until the user hits refresh).
|
||||||
|
onMount(() => {
|
||||||
|
discoverStore.refresh().catch(() => {});
|
||||||
|
});
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
nav.registerResolver(`${nav.activeTab()}:${DEPTH_CENTER_PANE}`, (i) => {
|
nav.registerResolver(`${nav.activeTab()}:${DEPTH_CENTER_PANE}`, (i) => {
|
||||||
if (depth() === 0) return categories()[i]?.id;
|
if (depth() === 0) return categories()[i]?.id;
|
||||||
@@ -243,7 +249,9 @@ function DiscoverPage() {
|
|||||||
{podcast.title}
|
{podcast.title}
|
||||||
</text>
|
</text>
|
||||||
<Show when={podcast.isSubscribed}>
|
<Show when={podcast.isSubscribed}>
|
||||||
<text fg={index() === lf() ? theme.surface : theme.success}>
|
<text
|
||||||
|
fg={index() === lf() ? theme.surface : theme.success}
|
||||||
|
>
|
||||||
[+]
|
[+]
|
||||||
</text>
|
</text>
|
||||||
</Show>
|
</Show>
|
||||||
|
|||||||
@@ -1,64 +1,85 @@
|
|||||||
import type { BackendName } from "../utils/audio-player"
|
import type { BackendName } from "@/utils/audio-player";
|
||||||
import { useTheme } from "@/context/ThemeContext"
|
import { useTheme } from "@/context/ThemeContext";
|
||||||
|
|
||||||
type PlaybackControlsProps = {
|
type PlaybackControlsProps = {
|
||||||
isPlaying: boolean
|
isPlaying: boolean;
|
||||||
volume: number
|
volume: number;
|
||||||
speed: number
|
speed: number;
|
||||||
backendName?: BackendName
|
backendName?: BackendName;
|
||||||
hasAudioUrl?: boolean
|
hasAudioUrl?: boolean;
|
||||||
onToggle: () => void
|
onToggle: () => void;
|
||||||
onPrev: () => void
|
onPrev: () => void;
|
||||||
onNext: () => void
|
onNext: () => void;
|
||||||
onVolumeChange: (value: number) => void
|
onVolumeChange: (value: number) => void;
|
||||||
onSpeedChange: (value: number) => void
|
onSpeedChange: (value: number) => void;
|
||||||
}
|
};
|
||||||
|
|
||||||
const BACKEND_LABELS: Record<BackendName, string> = {
|
const BACKEND_LABELS: Record<BackendName, string> = {
|
||||||
mpv: "mpv",
|
mpv: "mpv",
|
||||||
ffplay: "ffplay",
|
none: "none",
|
||||||
afplay: "afplay",
|
};
|
||||||
system: "system",
|
|
||||||
none: "none",
|
|
||||||
}
|
|
||||||
|
|
||||||
export function PlaybackControls(props: PlaybackControlsProps) {
|
export function PlaybackControls(props: PlaybackControlsProps) {
|
||||||
const { theme } = useTheme();
|
const { theme } = useTheme();
|
||||||
return (
|
return (
|
||||||
<box flexDirection="row" gap={1} alignItems="center" border padding={1} borderColor={theme.border}>
|
<box
|
||||||
<box border padding={0} onMouseDown={props.onPrev} borderColor={theme.border}>
|
flexDirection="row"
|
||||||
<text fg={theme.primary}>[Prev]</text>
|
gap={1}
|
||||||
</box>
|
alignItems="center"
|
||||||
<box border padding={0} onMouseDown={props.onToggle} borderColor={theme.border}>
|
border
|
||||||
<text fg={theme.primary}>{props.isPlaying ? "[Pause]" : "[Play]"}</text>
|
padding={1}
|
||||||
</box>
|
borderColor={theme.border}
|
||||||
<box border padding={0} onMouseDown={props.onNext} borderColor={theme.border}>
|
>
|
||||||
<text fg={theme.primary}>[Next]</text>
|
<box
|
||||||
</box>
|
border
|
||||||
<box flexDirection="row" gap={1} marginLeft={2}>
|
padding={0}
|
||||||
<text fg={theme.textMuted}>Vol</text>
|
onMouseDown={props.onPrev}
|
||||||
<text fg={theme.text}>{Math.round(props.volume * 100)}%</text>
|
borderColor={theme.border}
|
||||||
</box>
|
>
|
||||||
<box flexDirection="row" gap={1} marginLeft={2}>
|
<text fg={theme.primary}>[Prev]</text>
|
||||||
<text fg={theme.textMuted}>Speed</text>
|
</box>
|
||||||
<text fg={theme.text}>{props.speed}x</text>
|
<box
|
||||||
</box>
|
border
|
||||||
{props.backendName && props.backendName !== "none" && (
|
padding={0}
|
||||||
<box flexDirection="row" gap={1} marginLeft={2}>
|
onMouseDown={props.onToggle}
|
||||||
<text fg={theme.textMuted}>via</text>
|
borderColor={theme.border}
|
||||||
<text fg={theme.primary}>{BACKEND_LABELS[props.backendName]}</text>
|
>
|
||||||
</box>
|
<text fg={theme.primary}>{props.isPlaying ? "[Pause]" : "[Play]"}</text>
|
||||||
)}
|
</box>
|
||||||
{props.backendName === "none" && (
|
<box
|
||||||
<box marginLeft={2}>
|
border
|
||||||
<text fg={theme.warning}>No audio player found</text>
|
padding={0}
|
||||||
</box>
|
onMouseDown={props.onNext}
|
||||||
)}
|
borderColor={theme.border}
|
||||||
{props.hasAudioUrl === false && (
|
>
|
||||||
<box marginLeft={2}>
|
<text fg={theme.primary}>[Next]</text>
|
||||||
<text fg={theme.warning}>No audio URL</text>
|
</box>
|
||||||
</box>
|
<box flexDirection="row" gap={1} marginLeft={2}>
|
||||||
)}
|
<text fg={theme.textMuted}>Vol</text>
|
||||||
</box>
|
<text fg={theme.text}>{Math.round(props.volume * 100)}%</text>
|
||||||
)
|
<text fg={theme.textMuted}>↑↓</text>
|
||||||
|
</box>
|
||||||
|
<box flexDirection="row" gap={1} marginLeft={2}>
|
||||||
|
<text fg={theme.textMuted}>Speed</text>
|
||||||
|
<text fg={theme.text}>{props.speed}x</text>
|
||||||
|
<text fg={theme.textMuted}>s</text>
|
||||||
|
</box>
|
||||||
|
{props.backendName && props.backendName !== "none" && (
|
||||||
|
<box flexDirection="row" gap={1} marginLeft={2}>
|
||||||
|
<text fg={theme.textMuted}>via</text>
|
||||||
|
<text fg={theme.primary}>{BACKEND_LABELS[props.backendName]}</text>
|
||||||
|
</box>
|
||||||
|
)}
|
||||||
|
{props.backendName === "none" && (
|
||||||
|
<box marginLeft={2}>
|
||||||
|
<text fg={theme.warning}>No audio player found</text>
|
||||||
|
</box>
|
||||||
|
)}
|
||||||
|
{props.hasAudioUrl === false && (
|
||||||
|
<box marginLeft={2}>
|
||||||
|
<text fg={theme.warning}>No audio URL</text>
|
||||||
|
</box>
|
||||||
|
)}
|
||||||
|
</box>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -82,8 +82,9 @@ export function PlayerPage() {
|
|||||||
<RealtimeWaveform
|
<RealtimeWaveform
|
||||||
visualizerConfig={(() => {
|
visualizerConfig={(() => {
|
||||||
const viz = useAppStore().state().settings.visualizer;
|
const viz = useAppStore().state().settings.visualizer;
|
||||||
|
// bars is width-derived in RealtimeWaveform; pass only the
|
||||||
|
// audio-processing params here.
|
||||||
return {
|
return {
|
||||||
bars: viz.bars,
|
|
||||||
noiseReduction: viz.noiseReduction,
|
noiseReduction: viz.noiseReduction,
|
||||||
lowCutOff: viz.lowCutOff,
|
lowCutOff: viz.lowCutOff,
|
||||||
highCutOff: viz.highCutOff,
|
highCutOff: viz.highCutOff,
|
||||||
@@ -109,7 +110,7 @@ export function PlayerPage() {
|
|||||||
|
|
||||||
<box height={1} />
|
<box height={1} />
|
||||||
<text fg={muted()}>
|
<text fg={muted()}>
|
||||||
{"P play/pause N next B prev </ seek · h back"}
|
{"P play/pause N next B prev ◀▶ seek h back"}
|
||||||
</text>
|
</text>
|
||||||
</box>
|
</box>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -8,32 +8,34 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { createSignal, createEffect, onCleanup, on, untrack } from "solid-js";
|
import { createSignal, createEffect, onCleanup, on, untrack } from "solid-js";
|
||||||
|
import { useTerminalDimensions } from "@opentui/solid";
|
||||||
import {
|
import {
|
||||||
loadCavaCore,
|
loadCavaCore,
|
||||||
type CavaCore,
|
type CavaCore,
|
||||||
type CavaCoreConfig,
|
type CavaCoreConfig,
|
||||||
} from "@/utils/cavacore";
|
} from "@/utils/cavacore";
|
||||||
import { AudioStreamReader } from "@/utils/audio-stream-reader";
|
import { AudioStreamReader } from "@/utils/audio-stream-reader";
|
||||||
import { useAudio } from "@/hooks/useAudio";
|
import { useAudio } from "@/hooks/useAudio";
|
||||||
import { useTheme } from "@/context/ThemeContext";
|
import { useTheme } from "@/context/ThemeContext";
|
||||||
|
import { PANE_RATIO } from "@/utils/navigation";
|
||||||
|
|
||||||
// ── Types ────────────────────────────────────────────────────────────
|
// ── Types ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
export type RealtimeWaveformProps = {
|
export type RealtimeWaveformProps = {
|
||||||
visualizerConfig?: Partial<CavaCoreConfig>;
|
visualizerConfig?: Partial<CavaCoreConfig>;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Unicode lower block elements: space (silence) through full block (max) */
|
/** Unicode lower block elements: space (silence) through full block (max) */
|
||||||
const BARS = [
|
const BARS = [
|
||||||
" ",
|
" ",
|
||||||
"\u2581",
|
"\u2581",
|
||||||
"\u2582",
|
"\u2582",
|
||||||
"\u2583",
|
"\u2583",
|
||||||
"\u2584",
|
"\u2584",
|
||||||
"\u2585",
|
"\u2585",
|
||||||
"\u2586",
|
"\u2586",
|
||||||
"\u2587",
|
"\u2587",
|
||||||
"\u2588",
|
"\u2588",
|
||||||
];
|
];
|
||||||
|
|
||||||
/** Target frame interval in ms (~30 fps) */
|
/** Target frame interval in ms (~30 fps) */
|
||||||
@@ -45,212 +47,231 @@ const SAMPLES_PER_FRAME = 512;
|
|||||||
// ── Component ────────────────────────────────────────────────────────
|
// ── Component ────────────────────────────────────────────────────────
|
||||||
|
|
||||||
export function RealtimeWaveform(props: RealtimeWaveformProps) {
|
export function RealtimeWaveform(props: RealtimeWaveformProps) {
|
||||||
const { theme } = useTheme();
|
const { theme } = useTheme();
|
||||||
const audio = useAudio();
|
const audio = useAudio();
|
||||||
|
|
||||||
// Frequency bar values (0.0–1.0 per bar)
|
// Frequency bar values (0.0–1.0 per bar)
|
||||||
const [barData, setBarData] = createSignal<number[]>([]);
|
const [barData, setBarData] = createSignal<number[]>([]);
|
||||||
|
|
||||||
// Track whether cavacore is available
|
let cava: CavaCore | null = null;
|
||||||
const [available, setAvailable] = createSignal(false);
|
let reader: AudioStreamReader | null = null;
|
||||||
|
let frameTimer: ReturnType<typeof setInterval> | null = null;
|
||||||
|
let sampleBuffer: Float64Array | null = null;
|
||||||
|
|
||||||
let cava: CavaCore | null = null;
|
// Bar count scales with terminal width so the waveform fills its pane.
|
||||||
let reader: AudioStreamReader | null = null;
|
// The player is a 2-pane row: current column = (current+preview) of
|
||||||
let frameTimer: ReturnType<typeof setInterval> | null = null;
|
// (parent+current+preview) of the terminal width. Subtract ~8 chars of
|
||||||
let sampleBuffer: Float64Array | null = null;
|
// chrome (scrollbox border + box padding + waveform border + padding).
|
||||||
|
// Falls back to 64 before the renderer reports a real size.
|
||||||
|
const dimensions = useTerminalDimensions();
|
||||||
|
const numBars = () => {
|
||||||
|
const total = PANE_RATIO.parent + PANE_RATIO.current + PANE_RATIO.preview;
|
||||||
|
const current = PANE_RATIO.current + PANE_RATIO.preview; // 2-pane grows current
|
||||||
|
const width = dimensions().width;
|
||||||
|
if (!width) return 64;
|
||||||
|
return Math.max(
|
||||||
|
8,
|
||||||
|
Math.min(256, Math.floor((width * current) / total) - 8),
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
// ── Lifecycle: init cavacore once ──────────────────────────────────
|
// ── Lifecycle: init cavacore once ──────────────────────────────────
|
||||||
|
|
||||||
const initCava = () => {
|
const initCava = () => {
|
||||||
if (cava) return true;
|
if (cava) return true;
|
||||||
|
|
||||||
cava = loadCavaCore();
|
cava = loadCavaCore();
|
||||||
if (!cava) {
|
if (!cava) {
|
||||||
setAvailable(false);
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
setAvailable(true);
|
return true;
|
||||||
return true;
|
};
|
||||||
};
|
|
||||||
|
|
||||||
// ── Start/stop the visualization pipeline ──────────────────────────
|
// ── Start/stop the visualization pipeline ──────────────────────────
|
||||||
|
|
||||||
const startVisualization = (url: string, position: number, speed: number) => {
|
const startVisualization = (url: string, position: number, speed: number) => {
|
||||||
stopVisualization();
|
stopVisualization();
|
||||||
|
|
||||||
if (!url || !initCava() || !cava) return;
|
if (!url || !initCava() || !cava) return;
|
||||||
|
|
||||||
// Initialize cavacore with current resolution + any overrides
|
// Initialize cavacore with current resolution + any overrides.
|
||||||
const config: CavaCoreConfig = {
|
// bars is width-derived (see numBars); visualizerConfig supplies the
|
||||||
bars: 32,
|
// audio-processing params (noise reduction, cutoffs, etc.).
|
||||||
sampleRate: 44100,
|
const config: CavaCoreConfig = {
|
||||||
channels: 1,
|
bars: numBars(),
|
||||||
...props.visualizerConfig,
|
sampleRate: 44100,
|
||||||
};
|
channels: 1,
|
||||||
cava.init(config);
|
...props.visualizerConfig,
|
||||||
|
};
|
||||||
|
cava.init(config);
|
||||||
|
|
||||||
// Pre-allocate sample read buffer
|
// Pre-allocate sample read buffer
|
||||||
sampleBuffer = new Float64Array(SAMPLES_PER_FRAME);
|
sampleBuffer = new Float64Array(SAMPLES_PER_FRAME);
|
||||||
|
|
||||||
// Start ffmpeg decode stream (reuse reader if same URL, else create new)
|
// Start ffmpeg decode stream (reuse reader if same URL, else create new)
|
||||||
if (!reader || reader.url !== url) {
|
if (!reader || reader.url !== url) {
|
||||||
if (reader) reader.stop();
|
if (reader) reader.stop();
|
||||||
reader = new AudioStreamReader({ url });
|
reader = new AudioStreamReader({ url });
|
||||||
}
|
}
|
||||||
reader.start(position, speed);
|
reader.start(position, speed);
|
||||||
|
|
||||||
// Start render loop
|
// Start render loop
|
||||||
frameTimer = setInterval(renderFrame, FRAME_INTERVAL);
|
frameTimer = setInterval(renderFrame, FRAME_INTERVAL);
|
||||||
};
|
};
|
||||||
|
|
||||||
const stopVisualization = () => {
|
const stopVisualization = () => {
|
||||||
if (frameTimer) {
|
if (frameTimer) {
|
||||||
clearInterval(frameTimer);
|
clearInterval(frameTimer);
|
||||||
frameTimer = null;
|
frameTimer = null;
|
||||||
}
|
}
|
||||||
if (reader) {
|
if (reader) {
|
||||||
reader.stop();
|
reader.stop();
|
||||||
// Don't null reader — we reuse it across start/stop cycles
|
// Don't null reader — we reuse it across start/stop cycles
|
||||||
}
|
}
|
||||||
if (cava?.isReady) {
|
if (cava?.isReady) {
|
||||||
cava.destroy();
|
cava.destroy();
|
||||||
}
|
}
|
||||||
sampleBuffer = null;
|
sampleBuffer = null;
|
||||||
};
|
};
|
||||||
|
|
||||||
// ── Render loop (called at ~30fps) ─────────────────────────────────
|
// ── Render loop (called at ~30fps) ─────────────────────────────────
|
||||||
|
|
||||||
const renderFrame = () => {
|
const renderFrame = () => {
|
||||||
if (!cava?.isReady || !reader?.running || !sampleBuffer) return;
|
if (!cava?.isReady || !reader?.running || !sampleBuffer) return;
|
||||||
|
|
||||||
// Read available PCM samples from the stream
|
// Read available PCM samples from the stream
|
||||||
const count = reader.read(sampleBuffer);
|
const count = reader.read(sampleBuffer);
|
||||||
if (count === 0) return;
|
if (count === 0) return;
|
||||||
|
|
||||||
// Feed samples to cavacore → get frequency bars
|
// Feed samples to cavacore → get frequency bars
|
||||||
const input =
|
const input =
|
||||||
count < sampleBuffer.length
|
count < sampleBuffer.length
|
||||||
? sampleBuffer.subarray(0, count)
|
? sampleBuffer.subarray(0, count)
|
||||||
: sampleBuffer;
|
: sampleBuffer;
|
||||||
const output = cava.execute(input);
|
const output = cava.execute(input);
|
||||||
|
|
||||||
// Copy bar values to a new array for the signal
|
// Copy bar values to a new array for the signal
|
||||||
setBarData(Array.from(output));
|
setBarData(Array.from(output as Float64Array));
|
||||||
};
|
};
|
||||||
|
|
||||||
createEffect(
|
createEffect(
|
||||||
on(
|
on(
|
||||||
[
|
[
|
||||||
audio.isPlaying,
|
audio.isPlaying,
|
||||||
() => audio.currentEpisode()?.audioUrl ?? "", // may need to fire an error here
|
() => audio.currentEpisode()?.audioUrl ?? "",
|
||||||
audio.speed,
|
audio.speed,
|
||||||
() => 32,
|
numBars,
|
||||||
],
|
],
|
||||||
([playing, url, speed]) => {
|
([playing, url, speed]) => {
|
||||||
if (playing && url) {
|
if (playing && url) {
|
||||||
const pos = untrack(audio.position);
|
const pos = untrack(audio.position);
|
||||||
startVisualization(url, pos, speed);
|
startVisualization(url, pos, speed);
|
||||||
} else {
|
} else {
|
||||||
stopVisualization();
|
stopVisualization();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
// ── Seek detection: lightweight effect for position jumps ──────────
|
// ── Seek detection: lightweight effect for position jumps ──────────
|
||||||
//
|
//
|
||||||
// Watches position and restarts the reader (not the whole pipeline)
|
// Watches position and restarts the reader (not the whole pipeline)
|
||||||
// only on significant jumps (>2s), which indicate a user seek.
|
// only on significant jumps (>2s), which indicate a user seek.
|
||||||
// This is intentionally a separate effect — it should NOT trigger a
|
// This is intentionally a separate effect — it should NOT trigger a
|
||||||
// full pipeline restart, just restart the ffmpeg stream at the new pos.
|
// full pipeline restart, just restart the ffmpeg stream at the new pos.
|
||||||
|
|
||||||
let lastSyncPosition = 0;
|
let lastSyncPosition = 0;
|
||||||
createEffect(
|
createEffect(
|
||||||
on(audio.position, (pos) => {
|
on(audio.position, (pos) => {
|
||||||
if (!audio.isPlaying || !reader?.running) {
|
if (!audio.isPlaying || !reader?.running) {
|
||||||
lastSyncPosition = pos;
|
lastSyncPosition = pos;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const delta = Math.abs(pos - lastSyncPosition);
|
const delta = Math.abs(pos - lastSyncPosition);
|
||||||
lastSyncPosition = pos;
|
lastSyncPosition = pos;
|
||||||
|
|
||||||
if (delta > 2) {
|
if (delta > 2) {
|
||||||
reader.restart(pos, audio.speed() ?? 1);
|
reader.restart(pos, audio.speed() ?? 1);
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
// Cleanup on unmount
|
// Cleanup on unmount
|
||||||
onCleanup(() => {
|
onCleanup(() => {
|
||||||
stopVisualization();
|
stopVisualization();
|
||||||
if (reader) {
|
if (reader) {
|
||||||
reader.stop();
|
reader.stop();
|
||||||
reader = null;
|
reader = null;
|
||||||
}
|
}
|
||||||
// Don't null cava itself — it can be reused. But do destroy its plan.
|
// Don't null cava itself — it can be reused. But do destroy its plan.
|
||||||
if (cava?.isReady) {
|
if (cava?.isReady) {
|
||||||
cava.destroy();
|
cava.destroy();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// ── Rendering ──────────────────────────────────────────────────────
|
// ── Rendering ──────────────────────────────────────────────────────
|
||||||
|
|
||||||
const playedRatio = () =>
|
const playedRatio = () =>
|
||||||
audio.duration() <= 0
|
audio.duration() <= 0
|
||||||
? 0
|
? 0
|
||||||
: Math.min(1, audio.position() / audio.duration());
|
: Math.min(1, audio.position() / audio.duration());
|
||||||
|
|
||||||
const renderLine = () => {
|
const renderLine = () => {
|
||||||
const bars = barData();
|
const bars = barData();
|
||||||
const numBars = 32;
|
const count = numBars();
|
||||||
|
|
||||||
// If no data yet, show empty placeholder
|
// If no data yet, show empty placeholder
|
||||||
if (bars.length === 0) {
|
if (bars.length === 0) {
|
||||||
const placeholder = ".".repeat(numBars);
|
const placeholder = ".".repeat(count);
|
||||||
return (
|
return (
|
||||||
<box flexDirection="row" gap={0}>
|
<box flexDirection="row" gap={0}>
|
||||||
<text fg="#3b4252">{placeholder}</text>
|
<text fg="#3b4252">{placeholder}</text>
|
||||||
</box>
|
</box>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const played = Math.floor(numBars * playedRatio());
|
const played = Math.floor(count * playedRatio());
|
||||||
const playedColor = audio.isPlaying() ? "#6fa8ff" : "#7d8590";
|
const playedColor = audio.isPlaying() ? "#6fa8ff" : "#7d8590";
|
||||||
const futureColor = "#3b4252";
|
const futureColor = "#3b4252";
|
||||||
|
|
||||||
const playedChars = bars
|
const playedChars = bars
|
||||||
.slice(0, played)
|
.slice(0, played)
|
||||||
.map((v) => BARS[Math.min(BARS.length - 1, Math.floor(v * BARS.length))])
|
.map((v) => BARS[Math.min(BARS.length - 1, Math.floor(v * BARS.length))])
|
||||||
.join("");
|
.join("");
|
||||||
|
|
||||||
const futureChars = bars
|
const futureChars = bars
|
||||||
.slice(played)
|
.slice(played)
|
||||||
.map((v) => BARS[Math.min(BARS.length - 1, Math.floor(v * BARS.length))])
|
.map((v) => BARS[Math.min(BARS.length - 1, Math.floor(v * BARS.length))])
|
||||||
.join("");
|
.join("");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<box flexDirection="row" gap={0}>
|
<box flexDirection="row" gap={0}>
|
||||||
<text fg={playedColor}>{playedChars || " "}</text>
|
<text fg={playedColor}>{playedChars || " "}</text>
|
||||||
<text fg={futureColor}>{futureChars || " "}</text>
|
<text fg={futureColor}>{futureChars || " "}</text>
|
||||||
</box>
|
</box>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleClick = (event: { x: number }) => {
|
const handleClick = (event: { x: number }) => {
|
||||||
const numBars = 32;
|
const count = numBars();
|
||||||
const ratio = event.x / numBars;
|
const ratio = event.x / count;
|
||||||
const next = Math.max(
|
const next = Math.max(
|
||||||
0,
|
0,
|
||||||
Math.min(audio.duration(), Math.round(audio.duration() * ratio)),
|
Math.min(audio.duration(), Math.round(audio.duration() * ratio)),
|
||||||
);
|
);
|
||||||
audio.seek(next);
|
audio.seek(next);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<box border borderColor={theme.border} padding={1} onMouseDown={handleClick}>
|
<box
|
||||||
{renderLine()}
|
border
|
||||||
</box>
|
borderColor={theme.border}
|
||||||
);
|
padding={1}
|
||||||
|
onMouseDown={handleClick}
|
||||||
|
>
|
||||||
|
{renderLine()}
|
||||||
|
</box>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
@@ -25,6 +25,7 @@ import {
|
|||||||
onCleanup,
|
onCleanup,
|
||||||
} from "solid-js";
|
} from "solid-js";
|
||||||
import { useSearchStore } from "@/stores/search";
|
import { useSearchStore } from "@/stores/search";
|
||||||
|
import { useFeedStore } from "@/stores/feed";
|
||||||
import { format } from "date-fns";
|
import { format } from "date-fns";
|
||||||
import { useTheme } from "@/context/ThemeContext";
|
import { useTheme } from "@/context/ThemeContext";
|
||||||
import {
|
import {
|
||||||
@@ -44,6 +45,7 @@ export const SearchPaneCount = 1;
|
|||||||
|
|
||||||
function SearchPage() {
|
function SearchPage() {
|
||||||
const searchStore = useSearchStore();
|
const searchStore = useSearchStore();
|
||||||
|
const feedStore = useFeedStore();
|
||||||
const [inputValue, setInputValue] = createSignal("");
|
const [inputValue, setInputValue] = createSignal("");
|
||||||
const { theme } = useTheme();
|
const { theme } = useTheme();
|
||||||
const muted = () => theme.muted || theme.text;
|
const muted = () => theme.muted || theme.text;
|
||||||
@@ -60,16 +62,22 @@ function SearchPage() {
|
|||||||
// `inputFocused` is true while the query input is being typed in. The Shell
|
// `inputFocused` is true while the query input is being typed in. The Shell
|
||||||
// router yields keys to the <input> while this is true; Escape (in Shell)
|
// router yields keys to the <input> while this is true; Escape (in Shell)
|
||||||
// sets it false so navigation resumes; `s` (search action) sets it true.
|
// sets it false so navigation resumes; `s` (search action) sets it true.
|
||||||
// Depth transitions also drive it: typing is the default on the query depth.
|
//
|
||||||
let prevDepth = depth();
|
// Typing is the default only on the query depth (0); the results depth
|
||||||
onMount(() => nav.setInputFocused(true));
|
// (1) is always list-navigation. Drive `inputFocused` straight off
|
||||||
|
// `depth()` rather than seeding it `true` on mount and patching on change:
|
||||||
|
// the depth stack persists across tab switches, so re-mounting this page
|
||||||
|
// at depth 1 (e.g. after searching, leaving, and returning to the tab)
|
||||||
|
// must NOT leave `inputFocused` stuck on — otherwise the Shell swallows
|
||||||
|
// j/k (yielding to a non-existent input) and only the scrollbox's native
|
||||||
|
// scroll responds.
|
||||||
|
//
|
||||||
|
// The effect only re-runs on a depth transition, so Escape (defocus) and
|
||||||
|
// `s` (refocus) at the same depth are not clobbered.
|
||||||
|
onMount(() => nav.setInputFocused(depth() === 0));
|
||||||
onCleanup(() => nav.setInputFocused(false));
|
onCleanup(() => nav.setInputFocused(false));
|
||||||
createEffect(() => {
|
createEffect(() => {
|
||||||
const d = depth();
|
nav.setInputFocused(depth() === 0);
|
||||||
if (d !== prevDepth) {
|
|
||||||
nav.setInputFocused(d === 0);
|
|
||||||
prevDepth = d;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// ── results (depth 1) ─────────────────────────────────────────────────────
|
// ── results (depth 1) ─────────────────────────────────────────────────────
|
||||||
@@ -121,6 +129,8 @@ function SearchPage() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleSubscribe = (result: SearchResult) => {
|
const handleSubscribe = (result: SearchResult) => {
|
||||||
|
// Actually add the feed to the feed store, then mark the result subscribed
|
||||||
|
feedStore.addFeed(result.podcast, result.sourceId).catch(() => {});
|
||||||
searchStore.markSubscribed(result.podcast.id);
|
searchStore.markSubscribed(result.podcast.id);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -312,7 +322,9 @@ function SearchPage() {
|
|||||||
{result.podcast.title}
|
{result.podcast.title}
|
||||||
</text>
|
</text>
|
||||||
<Show when={result.podcast.isSubscribed}>
|
<Show when={result.podcast.isSubscribed}>
|
||||||
<text fg={index() === fi() ? theme.surface : theme.success}>
|
<text
|
||||||
|
fg={index() === fi() ? theme.surface : theme.success}
|
||||||
|
>
|
||||||
[+]
|
[+]
|
||||||
</text>
|
</text>
|
||||||
</Show>
|
</Show>
|
||||||
|
|||||||
@@ -2,42 +2,37 @@ import { SourceType } from "@/types/source";
|
|||||||
import { useTheme } from "@/context/ThemeContext";
|
import { useTheme } from "@/context/ThemeContext";
|
||||||
|
|
||||||
type SourceBadgeProps = {
|
type SourceBadgeProps = {
|
||||||
sourceId: string;
|
sourceId: string;
|
||||||
sourceName?: string;
|
sourceName?: string;
|
||||||
sourceType?: SourceType;
|
sourceType?: SourceType;
|
||||||
};
|
};
|
||||||
|
|
||||||
const typeLabel = (sourceType?: SourceType) => {
|
const typeLabel = (sourceType?: SourceType) => {
|
||||||
if (sourceType === SourceType.API) return "API";
|
if (sourceType === SourceType.API) return "API";
|
||||||
if (sourceType === SourceType.RSS) return "RSS";
|
if (sourceType === SourceType.RSS) return "RSS";
|
||||||
if (sourceType === SourceType.CUSTOM) return "Custom";
|
if (sourceType === SourceType.CUSTOM) return "Custom";
|
||||||
return "Source";
|
return "Source";
|
||||||
};
|
|
||||||
|
|
||||||
const typeColor = (sourceType?: SourceType) => {
|
|
||||||
if (sourceType === SourceType.API) return theme.primary;
|
|
||||||
if (sourceType === SourceType.RSS) return theme.success;
|
|
||||||
if (sourceType === SourceType.CUSTOM) return theme.warning;
|
|
||||||
return theme.textMuted;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// No module-level typeColor here — it needs the theme from the component.
|
||||||
|
// The correct definition lives inside SourceBadge below.
|
||||||
export function SourceBadge(props: SourceBadgeProps) {
|
export function SourceBadge(props: SourceBadgeProps) {
|
||||||
const { theme } = useTheme();
|
const { theme } = useTheme();
|
||||||
const label = () => props.sourceName || props.sourceId;
|
const label = () => props.sourceName || props.sourceId;
|
||||||
|
|
||||||
const typeColor = (sourceType?: SourceType) => {
|
const typeColor = (sourceType?: SourceType) => {
|
||||||
if (sourceType === SourceType.API) return theme.primary;
|
if (sourceType === SourceType.API) return theme.primary;
|
||||||
if (sourceType === SourceType.RSS) return theme.success;
|
if (sourceType === SourceType.RSS) return theme.success;
|
||||||
if (sourceType === SourceType.CUSTOM) return theme.warning;
|
if (sourceType === SourceType.CUSTOM) return theme.warning;
|
||||||
return theme.textMuted;
|
return theme.textMuted;
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<box flexDirection="row" gap={1} padding={0}>
|
<box flexDirection="row" gap={1} padding={0}>
|
||||||
<text fg={typeColor(props.sourceType)}>
|
<text fg={typeColor(props.sourceType)}>
|
||||||
[{typeLabel(props.sourceType)}]
|
[{typeLabel(props.sourceType)}]
|
||||||
</text>
|
</text>
|
||||||
<text fg={theme.textMuted}>{label()}</text>
|
<text fg={theme.textMuted}>{label()}</text>
|
||||||
</box>
|
</box>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,130 +1,130 @@
|
|||||||
import { createSignal } from "solid-js";
|
import { createSignal } from "solid-js";
|
||||||
import { DEFAULT_THEME, THEME_JSON } from "../constants/themes";
|
import { DEFAULT_THEME, THEME_JSON } from "../constants/themes";
|
||||||
import type {
|
import type {
|
||||||
AppSettings,
|
AppSettings,
|
||||||
AppState,
|
AppState,
|
||||||
ThemeColors,
|
ThemeColors,
|
||||||
ThemeName,
|
ThemeName,
|
||||||
ThemeMode,
|
ThemeMode,
|
||||||
UserPreferences,
|
UserPreferences,
|
||||||
VisualizerSettings,
|
VisualizerSettings,
|
||||||
} from "../types/settings";
|
} from "../types/settings";
|
||||||
import { resolveTheme } from "../utils/theme-resolver";
|
import { resolveTheme } from "../utils/theme-resolver";
|
||||||
import type { ThemeJson } from "../types/theme-schema";
|
import type { ThemeJson } from "../types/theme-schema";
|
||||||
import {
|
import {
|
||||||
loadAppStateFromFile,
|
loadAppStateFromFile,
|
||||||
saveAppStateToFile,
|
saveAppStateToFile,
|
||||||
} from "../utils/app-persistence";
|
} from "../utils/app-persistence";
|
||||||
|
|
||||||
const defaultVisualizerSettings: VisualizerSettings = {
|
const defaultVisualizerSettings: VisualizerSettings = {
|
||||||
bars: 32,
|
bars: 64,
|
||||||
sensitivity: 1,
|
sensitivity: 1,
|
||||||
noiseReduction: 0.77,
|
noiseReduction: 0.77,
|
||||||
lowCutOff: 50,
|
lowCutOff: 50,
|
||||||
highCutOff: 10000,
|
highCutOff: 10000,
|
||||||
};
|
};
|
||||||
|
|
||||||
const defaultSettings: AppSettings = {
|
const defaultSettings: AppSettings = {
|
||||||
theme: "system",
|
theme: "system",
|
||||||
fontSize: 14,
|
fontSize: 14,
|
||||||
playbackSpeed: 1,
|
playbackSpeed: 1,
|
||||||
downloadPath: "",
|
downloadPath: "",
|
||||||
visualizer: defaultVisualizerSettings,
|
visualizer: defaultVisualizerSettings,
|
||||||
};
|
};
|
||||||
|
|
||||||
const defaultPreferences: UserPreferences = {
|
const defaultPreferences: UserPreferences = {
|
||||||
showExplicit: false,
|
showExplicit: false,
|
||||||
autoDownload: false,
|
autoDownload: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
const defaultState: AppState = {
|
const defaultState: AppState = {
|
||||||
settings: defaultSettings,
|
settings: defaultSettings,
|
||||||
preferences: defaultPreferences,
|
preferences: defaultPreferences,
|
||||||
customTheme: DEFAULT_THEME,
|
customTheme: DEFAULT_THEME,
|
||||||
};
|
};
|
||||||
|
|
||||||
export function createAppStore() {
|
export function createAppStore() {
|
||||||
// Start with defaults; async load will update once ready
|
// Start with defaults; async load will update once ready
|
||||||
const [state, setState] = createSignal<AppState>(defaultState);
|
const [state, setState] = createSignal<AppState>(defaultState);
|
||||||
|
|
||||||
// Fire-and-forget async initialisation
|
// Fire-and-forget async initialisation
|
||||||
const init = async () => {
|
const init = async () => {
|
||||||
const loaded = await loadAppStateFromFile();
|
const loaded = await loadAppStateFromFile();
|
||||||
setState(loaded);
|
setState(loaded);
|
||||||
};
|
};
|
||||||
init();
|
init();
|
||||||
|
|
||||||
const saveState = (next: AppState) => {
|
const saveState = (next: AppState) => {
|
||||||
saveAppStateToFile(next).catch(() => {});
|
saveAppStateToFile(next).catch(() => {});
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateState = (next: AppState) => {
|
const updateState = (next: AppState) => {
|
||||||
setState(next);
|
setState(next);
|
||||||
saveState(next);
|
saveState(next);
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateSettings = (updates: Partial<AppSettings>) => {
|
const updateSettings = (updates: Partial<AppSettings>) => {
|
||||||
const next = {
|
const next = {
|
||||||
...state(),
|
...state(),
|
||||||
settings: { ...state().settings, ...updates },
|
settings: { ...state().settings, ...updates },
|
||||||
};
|
};
|
||||||
updateState(next);
|
updateState(next);
|
||||||
};
|
};
|
||||||
|
|
||||||
const updatePreferences = (updates: Partial<UserPreferences>) => {
|
const updatePreferences = (updates: Partial<UserPreferences>) => {
|
||||||
const next = {
|
const next = {
|
||||||
...state(),
|
...state(),
|
||||||
preferences: { ...state().preferences, ...updates },
|
preferences: { ...state().preferences, ...updates },
|
||||||
};
|
};
|
||||||
updateState(next);
|
updateState(next);
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateCustomTheme = (updates: Partial<ThemeColors>) => {
|
const updateCustomTheme = (updates: Partial<ThemeColors>) => {
|
||||||
const next = {
|
const next = {
|
||||||
...state(),
|
...state(),
|
||||||
customTheme: { ...state().customTheme, ...updates },
|
customTheme: { ...state().customTheme, ...updates },
|
||||||
};
|
};
|
||||||
updateState(next);
|
updateState(next);
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateVisualizer = (updates: Partial<VisualizerSettings>) => {
|
const updateVisualizer = (updates: Partial<VisualizerSettings>) => {
|
||||||
updateSettings({
|
updateSettings({
|
||||||
visualizer: { ...state().settings.visualizer, ...updates },
|
visualizer: { ...state().settings.visualizer, ...updates },
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const setTheme = (theme: ThemeName) => {
|
const setTheme = (theme: ThemeName) => {
|
||||||
updateSettings({ theme });
|
updateSettings({ theme });
|
||||||
};
|
};
|
||||||
|
|
||||||
const resolveThemeColors = (): ThemeColors => {
|
const resolveThemeColors = (): ThemeColors => {
|
||||||
const theme = state().settings.theme;
|
const theme = state().settings.theme;
|
||||||
if (theme === "custom") return state().customTheme;
|
if (theme === "custom") return state().customTheme;
|
||||||
if (theme === "system") return DEFAULT_THEME;
|
if (theme === "system") return DEFAULT_THEME;
|
||||||
const json = THEME_JSON[theme];
|
const json = THEME_JSON[theme];
|
||||||
if (!json) return DEFAULT_THEME;
|
if (!json) return DEFAULT_THEME;
|
||||||
return resolveTheme(
|
return resolveTheme(
|
||||||
json as ThemeJson,
|
json as ThemeJson,
|
||||||
"dark" as ThemeMode,
|
"dark" as ThemeMode,
|
||||||
) as unknown as ThemeColors;
|
) as unknown as ThemeColors;
|
||||||
};
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
state,
|
state,
|
||||||
updateSettings,
|
updateSettings,
|
||||||
updatePreferences,
|
updatePreferences,
|
||||||
updateCustomTheme,
|
updateCustomTheme,
|
||||||
updateVisualizer,
|
updateVisualizer,
|
||||||
setTheme,
|
setTheme,
|
||||||
resolveTheme: resolveThemeColors,
|
resolveTheme: resolveThemeColors,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
let appStoreInstance: ReturnType<typeof createAppStore> | null = null;
|
let appStoreInstance: ReturnType<typeof createAppStore> | null = null;
|
||||||
|
|
||||||
export function useAppStore() {
|
export function useAppStore() {
|
||||||
if (!appStoreInstance) {
|
if (!appStoreInstance) {
|
||||||
appStoreInstance = createAppStore();
|
appStoreInstance = createAppStore();
|
||||||
}
|
}
|
||||||
return appStoreInstance;
|
return appStoreInstance;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,215 +1,220 @@
|
|||||||
/**
|
/**
|
||||||
* Discover store for PodTUI
|
* Discover store for PodTUI
|
||||||
* Manages trending/popular podcasts and category filtering
|
* Manages trending/popular podcasts and category filtering.
|
||||||
|
*
|
||||||
|
* The featured-shows list is fetched at runtime from a JSON file hosted in the
|
||||||
|
* GitHub repo (discover/featured.json on the `master` branch), so the list
|
||||||
|
* can be updated without shipping a new release. The feed URL, de-duped set,
|
||||||
|
* and version field act as the cache key — a fresh fetch only happens when the
|
||||||
|
* version bumps or the cache window (24h) expires.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { createSignal } from "solid-js"
|
import { createSignal } from "solid-js";
|
||||||
import type { Podcast } from "../types/podcast"
|
import type { Podcast } from "../types/podcast";
|
||||||
|
import { useFeedStore } from "./feed";
|
||||||
|
|
||||||
export interface DiscoverCategory {
|
export interface DiscoverCategory {
|
||||||
id: string
|
id: string;
|
||||||
name: string
|
name: string;
|
||||||
icon: string
|
icon: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const DISCOVER_CATEGORIES: DiscoverCategory[] = [
|
export const DISCOVER_CATEGORIES: DiscoverCategory[] = [
|
||||||
{ id: "all", name: "All", icon: "*" },
|
{ id: "all", name: "All", icon: "*" },
|
||||||
{ id: "technology", name: "Technology", icon: ">" },
|
{ id: "technology", name: "Technology", icon: ">" },
|
||||||
{ id: "science", name: "Science", icon: "~" },
|
{ id: "science", name: "Science", icon: "~" },
|
||||||
{ id: "comedy", name: "Comedy", icon: ")" },
|
{ id: "comedy", name: "Comedy", icon: ")" },
|
||||||
{ id: "news", name: "News", icon: "!" },
|
{ id: "news", name: "News", icon: "!" },
|
||||||
{ id: "business", name: "Business", icon: "$" },
|
{ id: "business", name: "Business", icon: "$" },
|
||||||
{ id: "health", name: "Health", icon: "+" },
|
{ id: "health", name: "Health", icon: "+" },
|
||||||
{ id: "education", name: "Education", icon: "?" },
|
{ id: "education", name: "Education", icon: "?" },
|
||||||
{ id: "sports", name: "Sports", icon: "#" },
|
{ id: "sports", name: "Sports", icon: "#" },
|
||||||
{ id: "true-crime", name: "True Crime", icon: "%" },
|
{ id: "true-crime", name: "True Crime", icon: "%" },
|
||||||
{ id: "arts", name: "Arts", icon: "@" },
|
{ id: "arts", name: "Arts", icon: "@" },
|
||||||
]
|
];
|
||||||
|
|
||||||
/** Mock trending podcasts */
|
// ── Remote featured-shows manifest ───────────────────────────────────────────
|
||||||
const TRENDING_PODCASTS: Podcast[] = [
|
// The raw GitHub URL serving discover/featured.json from the master branch.
|
||||||
{
|
// Update this file in the repo (no release needed) to refresh the list.
|
||||||
id: "trend-1",
|
const FEATURED_JSON_URL =
|
||||||
title: "AI Today",
|
"https://raw.githubusercontent.com/mikefreno/PodTui/master/discover/featured.json";
|
||||||
description: "The latest developments in artificial intelligence, machine learning, and their impact on society.",
|
|
||||||
feedUrl: "https://example.com/aitoday.rss",
|
/** Cache window for the remote featured list (24 hours) */
|
||||||
author: "Tech Futures",
|
const FEATURED_CACHE_TTL_MS = 24 * 60 * 60 * 1000;
|
||||||
categories: ["Technology", "Science"],
|
|
||||||
coverUrl: undefined,
|
/** Shape of a single entry in the remote JSON */
|
||||||
lastUpdated: new Date(),
|
interface FeaturedEntry {
|
||||||
isSubscribed: false,
|
id: string;
|
||||||
},
|
title: string;
|
||||||
{
|
description: string;
|
||||||
id: "trend-2",
|
feedUrl: string;
|
||||||
title: "The History Hour",
|
author?: string;
|
||||||
description: "Fascinating stories from history that shaped our world today.",
|
categories?: string[];
|
||||||
feedUrl: "https://example.com/historyhour.rss",
|
}
|
||||||
author: "History Channel",
|
|
||||||
categories: ["Education", "History"],
|
/** Shape of the remote JSON manifest */
|
||||||
lastUpdated: new Date(),
|
interface FeaturedManifest {
|
||||||
isSubscribed: false,
|
version: number;
|
||||||
},
|
podcasts: FeaturedEntry[];
|
||||||
{
|
}
|
||||||
id: "trend-3",
|
|
||||||
title: "Comedy Gold",
|
/** Convert a JSON entry to a runtime Podcast (adding derived fields) */
|
||||||
description: "Weekly stand-up comedy, sketches, and hilarious conversations.",
|
function entryToPodcast(entry: FeaturedEntry): Podcast {
|
||||||
feedUrl: "https://example.com/comedygold.rss",
|
return {
|
||||||
author: "Laugh Factory",
|
id: entry.id,
|
||||||
categories: ["Comedy", "Entertainment"],
|
title: entry.title,
|
||||||
lastUpdated: new Date(),
|
description: entry.description,
|
||||||
isSubscribed: false,
|
feedUrl: entry.feedUrl,
|
||||||
},
|
author: entry.author,
|
||||||
{
|
categories: entry.categories ?? [],
|
||||||
id: "trend-4",
|
coverUrl: undefined,
|
||||||
title: "Market Watch",
|
lastUpdated: new Date(),
|
||||||
description: "Daily financial news, stock analysis, and investing tips.",
|
isSubscribed: false,
|
||||||
feedUrl: "https://example.com/marketwatch.rss",
|
};
|
||||||
author: "Finance Daily",
|
}
|
||||||
categories: ["Business", "News"],
|
|
||||||
lastUpdated: new Date(),
|
/** Reconcile isSubscribed state across the discover list against the feed store */
|
||||||
isSubscribed: true,
|
function syncSubscriptionState(
|
||||||
},
|
podcasts: Podcast[],
|
||||||
{
|
subscribedUrls: Set<string>,
|
||||||
id: "trend-5",
|
subscribedIds: Set<string>,
|
||||||
title: "Science Weekly",
|
): Podcast[] {
|
||||||
description: "Breaking science news and in-depth analysis of the latest research.",
|
return podcasts.map((p) => ({
|
||||||
feedUrl: "https://example.com/scienceweekly.rss",
|
...p,
|
||||||
author: "Science Network",
|
isSubscribed: subscribedUrls.has(p.feedUrl) || subscribedIds.has(p.id),
|
||||||
categories: ["Science", "Education"],
|
}));
|
||||||
lastUpdated: new Date(),
|
}
|
||||||
isSubscribed: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: "trend-6",
|
|
||||||
title: "True Crime Files",
|
|
||||||
description: "Investigative journalism into real criminal cases and unsolved mysteries.",
|
|
||||||
feedUrl: "https://example.com/truecrime.rss",
|
|
||||||
author: "Crime Network",
|
|
||||||
categories: ["True Crime", "Documentary"],
|
|
||||||
lastUpdated: new Date(),
|
|
||||||
isSubscribed: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: "trend-7",
|
|
||||||
title: "Wellness Journey",
|
|
||||||
description: "Tips for mental and physical health, meditation, and mindful living.",
|
|
||||||
feedUrl: "https://example.com/wellness.rss",
|
|
||||||
author: "Health Media",
|
|
||||||
categories: ["Health", "Self-Help"],
|
|
||||||
lastUpdated: new Date(),
|
|
||||||
isSubscribed: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: "trend-8",
|
|
||||||
title: "Sports Talk Live",
|
|
||||||
description: "Live commentary, analysis, and interviews from the world of sports.",
|
|
||||||
feedUrl: "https://example.com/sportstalk.rss",
|
|
||||||
author: "Sports Network",
|
|
||||||
categories: ["Sports", "News"],
|
|
||||||
lastUpdated: new Date(),
|
|
||||||
isSubscribed: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: "trend-9",
|
|
||||||
title: "Creative Minds",
|
|
||||||
description: "Interviews with artists, designers, and creative professionals.",
|
|
||||||
feedUrl: "https://example.com/creativeminds.rss",
|
|
||||||
author: "Arts Weekly",
|
|
||||||
categories: ["Arts", "Culture"],
|
|
||||||
lastUpdated: new Date(),
|
|
||||||
isSubscribed: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: "trend-10",
|
|
||||||
title: "Dev Talk",
|
|
||||||
description: "Software development, programming tutorials, and tech career advice.",
|
|
||||||
feedUrl: "https://example.com/devtalk.rss",
|
|
||||||
author: "Code Academy",
|
|
||||||
categories: ["Technology", "Education"],
|
|
||||||
lastUpdated: new Date(),
|
|
||||||
isSubscribed: true,
|
|
||||||
},
|
|
||||||
]
|
|
||||||
|
|
||||||
/** Create discover store */
|
/** Create discover store */
|
||||||
export function createDiscoverStore() {
|
export function createDiscoverStore() {
|
||||||
const [selectedCategory, setSelectedCategory] = createSignal<string>("all")
|
const [selectedCategory, setSelectedCategory] = createSignal<string>("all");
|
||||||
const [isLoading, setIsLoading] = createSignal(false)
|
const [isLoading, setIsLoading] = createSignal(false);
|
||||||
const [podcasts, setPodcasts] = createSignal<Podcast[]>(TRENDING_PODCASTS)
|
const [podcasts, setPodcasts] = createSignal<Podcast[]>([]);
|
||||||
|
|
||||||
/** Get filtered podcasts by category */
|
// In-memory cache timestamp for the remote manifest (within 24h, skip refetch)
|
||||||
const filteredPodcasts = () => {
|
let cachedAt = 0;
|
||||||
const category = selectedCategory()
|
|
||||||
if (category === "all") {
|
|
||||||
return podcasts()
|
|
||||||
}
|
|
||||||
|
|
||||||
return podcasts().filter((p) => {
|
/** Reconcile local isSubscribed flags with the feed store */
|
||||||
const cats = p.categories?.map((c) => c.toLowerCase()) ?? []
|
const syncSubscriptions = () => {
|
||||||
return cats.some((c) => c.includes(category.toLowerCase().replace("-", " ")))
|
const feedStore = useFeedStore();
|
||||||
})
|
const feeds = feedStore.feeds();
|
||||||
}
|
const urls = new Set(feeds.map((f) => f.podcast.feedUrl));
|
||||||
|
const ids = new Set(feeds.map((f) => f.podcast.id));
|
||||||
|
setPodcasts((prev) => syncSubscriptionState(prev, urls, ids));
|
||||||
|
};
|
||||||
|
|
||||||
/** Subscribe to a podcast */
|
/** Fetch the featured-shows manifest from GitHub if stale */
|
||||||
const subscribe = (podcastId: string) => {
|
const refresh = async () => {
|
||||||
setPodcasts((prev) =>
|
setIsLoading(true);
|
||||||
prev.map((p) =>
|
try {
|
||||||
p.id === podcastId ? { ...p, isSubscribed: true } : p
|
// Skip if cache is still fresh
|
||||||
)
|
const now = Date.now();
|
||||||
)
|
if (now - cachedAt < FEATURED_CACHE_TTL_MS) {
|
||||||
}
|
syncSubscriptions();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/** Unsubscribe from a podcast */
|
const resp = await fetch(FEATURED_JSON_URL, {
|
||||||
const unsubscribe = (podcastId: string) => {
|
headers: { "User-Agent": "PodTUI/1.0" },
|
||||||
setPodcasts((prev) =>
|
});
|
||||||
prev.map((p) =>
|
if (!resp.ok) {
|
||||||
p.id === podcastId ? { ...p, isSubscribed: false } : p
|
syncSubscriptions();
|
||||||
)
|
return;
|
||||||
)
|
}
|
||||||
}
|
const manifest = (await resp.json()) as FeaturedManifest;
|
||||||
|
if (!manifest?.podcasts?.length) {
|
||||||
|
syncSubscriptions();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/** Toggle subscription */
|
// Build the podcast list from the manifest entries
|
||||||
const toggleSubscription = (podcastId: string) => {
|
const fetched = manifest.podcasts.map(entryToPodcast);
|
||||||
const podcast = podcasts().find((p) => p.id === podcastId)
|
cachedAt = now;
|
||||||
if (podcast?.isSubscribed) {
|
setPodcasts(fetched);
|
||||||
unsubscribe(podcastId)
|
|
||||||
} else {
|
|
||||||
subscribe(podcastId)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Refresh trending podcasts (mock) */
|
// Reflect current feed-store subscriptions
|
||||||
const refresh = async () => {
|
syncSubscriptions();
|
||||||
setIsLoading(true)
|
} catch {
|
||||||
// Simulate network delay
|
// Network failure — keep whatever we have (stale or empty)
|
||||||
await new Promise((r) => setTimeout(r, 500))
|
} finally {
|
||||||
// In real app, would fetch from API
|
setIsLoading(false);
|
||||||
setIsLoading(false)
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
return {
|
/** Get filtered podcasts by category */
|
||||||
// State
|
const filteredPodcasts = () => {
|
||||||
selectedCategory,
|
const category = selectedCategory();
|
||||||
isLoading,
|
if (category === "all") {
|
||||||
podcasts,
|
return podcasts();
|
||||||
filteredPodcasts,
|
}
|
||||||
categories: DISCOVER_CATEGORIES,
|
|
||||||
|
|
||||||
// Actions
|
return podcasts().filter((p) => {
|
||||||
setSelectedCategory,
|
const cats = p.categories?.map((c) => c.toLowerCase()) ?? [];
|
||||||
subscribe,
|
return cats.some((c) =>
|
||||||
unsubscribe,
|
c.includes(category.toLowerCase().replace("-", " ")),
|
||||||
toggleSubscription,
|
);
|
||||||
refresh,
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
|
/** Subscribe to a podcast */
|
||||||
|
const subscribe = (podcastId: string) => {
|
||||||
|
const podcast = podcasts().find((p) => p.id === podcastId);
|
||||||
|
if (podcast) {
|
||||||
|
// Actually add the feed to the feed store
|
||||||
|
const feedStore = useFeedStore();
|
||||||
|
feedStore.addFeed(podcast, "discover").catch(() => {});
|
||||||
|
}
|
||||||
|
setPodcasts((prev) =>
|
||||||
|
prev.map((p) => (p.id === podcastId ? { ...p, isSubscribed: true } : p)),
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Unsubscribe from a podcast */
|
||||||
|
const unsubscribe = (podcastId: string) => {
|
||||||
|
const podcast = podcasts().find((p) => p.id === podcastId);
|
||||||
|
if (podcast) {
|
||||||
|
// Remove the feed from the feed store
|
||||||
|
const feedStore = useFeedStore();
|
||||||
|
feedStore.removeFeedByUrl(podcast.feedUrl);
|
||||||
|
}
|
||||||
|
setPodcasts((prev) =>
|
||||||
|
prev.map((p) => (p.id === podcastId ? { ...p, isSubscribed: false } : p)),
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Toggle subscription */
|
||||||
|
const toggleSubscription = (podcastId: string) => {
|
||||||
|
const podcast = podcasts().find((p) => p.id === podcastId);
|
||||||
|
if (podcast?.isSubscribed) {
|
||||||
|
unsubscribe(podcastId);
|
||||||
|
} else {
|
||||||
|
subscribe(podcastId);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
// State
|
||||||
|
selectedCategory,
|
||||||
|
isLoading,
|
||||||
|
podcasts,
|
||||||
|
filteredPodcasts,
|
||||||
|
categories: DISCOVER_CATEGORIES,
|
||||||
|
|
||||||
|
// Actions
|
||||||
|
setSelectedCategory,
|
||||||
|
subscribe,
|
||||||
|
unsubscribe,
|
||||||
|
toggleSubscription,
|
||||||
|
refresh,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Singleton discover store */
|
/** Singleton discover store */
|
||||||
let discoverStoreInstance: ReturnType<typeof createDiscoverStore> | null = null
|
let discoverStoreInstance: ReturnType<typeof createDiscoverStore> | null = null;
|
||||||
|
|
||||||
export function useDiscoverStore() {
|
export function useDiscoverStore() {
|
||||||
if (!discoverStoreInstance) {
|
if (!discoverStoreInstance) {
|
||||||
discoverStoreInstance = createDiscoverStore()
|
discoverStoreInstance = createDiscoverStore();
|
||||||
}
|
}
|
||||||
return discoverStoreInstance
|
return discoverStoreInstance;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,15 +7,15 @@ import { createSignal } from "solid-js";
|
|||||||
import { FeedVisibility } from "../types/feed";
|
import { FeedVisibility } from "../types/feed";
|
||||||
import type { Feed, FeedFilter, FeedSortField } from "../types/feed";
|
import type { Feed, FeedFilter, FeedSortField } from "../types/feed";
|
||||||
import type { Podcast } from "../types/podcast";
|
import type { Podcast } from "../types/podcast";
|
||||||
import type { Episode, EpisodeStatus } from "../types/episode";
|
import type { Episode } from "../types/episode";
|
||||||
import type { PodcastSource, SourceType } from "../types/source";
|
import type { PodcastSource } from "../types/source";
|
||||||
import { DEFAULT_SOURCES } from "../types/source";
|
import { DEFAULT_SOURCES } from "../types/source";
|
||||||
import { parseRSSFeed } from "../api/rss-parser";
|
import { parseRSSFeed } from "../api/rss-parser";
|
||||||
import {
|
import {
|
||||||
loadFeedsFromFile,
|
loadFeedsFromFile,
|
||||||
saveFeedsToFile,
|
saveFeedsToFile,
|
||||||
loadSourcesFromFile,
|
loadSourcesFromFile,
|
||||||
saveSourcesToFile,
|
saveSourcesToFile,
|
||||||
} from "../utils/feeds-persistence";
|
} from "../utils/feeds-persistence";
|
||||||
import { useDownloadStore } from "./download";
|
import { useDownloadStore } from "./download";
|
||||||
import { DownloadStatus } from "../types/episode";
|
import { DownloadStatus } from "../types/episode";
|
||||||
@@ -35,461 +35,491 @@ const episodeLoadCount = new Map<string, number>();
|
|||||||
|
|
||||||
/** Save feeds to file (async, fire-and-forget) */
|
/** Save feeds to file (async, fire-and-forget) */
|
||||||
function saveFeeds(feeds: Feed[]): void {
|
function saveFeeds(feeds: Feed[]): void {
|
||||||
saveFeedsToFile(feeds).catch(() => {});
|
saveFeedsToFile(feeds).catch(() => {});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Save sources to file (async, fire-and-forget) */
|
/** Save sources to file (async, fire-and-forget) */
|
||||||
function saveSources(sources: PodcastSource[]): void {
|
function saveSources(sources: PodcastSource[]): void {
|
||||||
saveSourcesToFile(sources).catch(() => {});
|
saveSourcesToFile(sources).catch(() => {});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Create feed store */
|
/** Create feed store */
|
||||||
export function createFeedStore() {
|
export function createFeedStore() {
|
||||||
const [feeds, setFeeds] = createSignal<Feed[]>([]);
|
const [feeds, setFeeds] = createSignal<Feed[]>([]);
|
||||||
const [sources, setSources] = createSignal<PodcastSource[]>([
|
const [sources, setSources] = createSignal<PodcastSource[]>([
|
||||||
...DEFAULT_SOURCES,
|
...DEFAULT_SOURCES,
|
||||||
]);
|
]);
|
||||||
const [filter, setFilter] = createSignal<FeedFilter>({
|
const [filter, setFilter] = createSignal<FeedFilter>({
|
||||||
visibility: "all",
|
visibility: "all",
|
||||||
sortBy: "updated" as FeedSortField,
|
sortBy: "updated" as FeedSortField,
|
||||||
sortDirection: "desc",
|
sortDirection: "desc",
|
||||||
});
|
});
|
||||||
const [selectedFeedId, setSelectedFeedId] = createSignal<string | null>(null);
|
const [selectedFeedId, setSelectedFeedId] = createSignal<string | null>(null);
|
||||||
const [isLoadingMore, setIsLoadingMore] = createSignal(false);
|
const [isLoadingMore, setIsLoadingMore] = createSignal(false);
|
||||||
const [isLoadingFeeds, setIsLoadingFeeds] = createSignal(false);
|
const [isLoadingFeeds, setIsLoadingFeeds] = createSignal(false);
|
||||||
|
|
||||||
/** Get filtered and sorted feeds */
|
/** Get filtered and sorted feeds */
|
||||||
const getFilteredFeeds = (): Feed[] => {
|
const getFilteredFeeds = (): Feed[] => {
|
||||||
let result = [...feeds()];
|
let result = [...feeds()];
|
||||||
const f = filter();
|
const f = filter();
|
||||||
const authStore = useAuthStore();
|
const authStore = useAuthStore();
|
||||||
|
|
||||||
// Filter by visibility
|
// Filter by visibility
|
||||||
if (f.visibility && f.visibility !== "all") {
|
if (f.visibility && f.visibility !== "all") {
|
||||||
result = result.filter((feed) => feed.visibility === f.visibility);
|
result = result.filter((feed) => feed.visibility === f.visibility);
|
||||||
} else if (f.visibility === "all") {
|
} else if (f.visibility === "all") {
|
||||||
// Only show private feeds if authenticated
|
// Only show private feeds if authenticated
|
||||||
result = result.filter((feed) => feed.visibility === FeedVisibility.PUBLIC || authStore.isAuthenticated);
|
result = result.filter(
|
||||||
}
|
(feed) =>
|
||||||
|
feed.visibility === FeedVisibility.PUBLIC ||
|
||||||
|
authStore.isAuthenticated,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// Filter by source
|
// Filter by source
|
||||||
if (f.sourceId) {
|
if (f.sourceId) {
|
||||||
result = result.filter((feed) => feed.sourceId === f.sourceId);
|
result = result.filter((feed) => feed.sourceId === f.sourceId);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Filter by pinned
|
// Filter by pinned
|
||||||
if (f.pinnedOnly) {
|
if (f.pinnedOnly) {
|
||||||
result = result.filter((feed) => feed.isPinned);
|
result = result.filter((feed) => feed.isPinned);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Filter by search query
|
// Filter by search query
|
||||||
if (f.searchQuery) {
|
if (f.searchQuery) {
|
||||||
const query = f.searchQuery.toLowerCase();
|
const query = f.searchQuery.toLowerCase();
|
||||||
result = result.filter(
|
result = result.filter(
|
||||||
(feed) =>
|
(feed) =>
|
||||||
feed.podcast.title.toLowerCase().includes(query) ||
|
feed.podcast.title.toLowerCase().includes(query) ||
|
||||||
feed.customName?.toLowerCase().includes(query) ||
|
feed.customName?.toLowerCase().includes(query) ||
|
||||||
feed.podcast.description?.toLowerCase().includes(query),
|
feed.podcast.description?.toLowerCase().includes(query),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sort by selected field
|
// Sort by selected field
|
||||||
const sortDir = f.sortDirection === "asc" ? 1 : -1;
|
const sortDir = f.sortDirection === "asc" ? 1 : -1;
|
||||||
result.sort((a, b) => {
|
result.sort((a, b) => {
|
||||||
switch (f.sortBy) {
|
switch (f.sortBy) {
|
||||||
case "title":
|
case "title":
|
||||||
return (
|
return (
|
||||||
sortDir *
|
sortDir *
|
||||||
(a.customName || a.podcast.title).localeCompare(
|
(a.customName || a.podcast.title).localeCompare(
|
||||||
b.customName || b.podcast.title,
|
b.customName || b.podcast.title,
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
case "episodeCount":
|
case "episodeCount":
|
||||||
return sortDir * (a.episodes.length - b.episodes.length);
|
return sortDir * (a.episodes.length - b.episodes.length);
|
||||||
case "latestEpisode":
|
case "latestEpisode":
|
||||||
const aLatest = a.episodes[0]?.pubDate?.getTime() || 0;
|
const aLatest = a.episodes[0]?.pubDate?.getTime() || 0;
|
||||||
const bLatest = b.episodes[0]?.pubDate?.getTime() || 0;
|
const bLatest = b.episodes[0]?.pubDate?.getTime() || 0;
|
||||||
return sortDir * (aLatest - bLatest);
|
return sortDir * (aLatest - bLatest);
|
||||||
case "updated":
|
case "updated":
|
||||||
default:
|
default:
|
||||||
return sortDir * (a.lastUpdated.getTime() - b.lastUpdated.getTime());
|
return sortDir * (a.lastUpdated.getTime() - b.lastUpdated.getTime());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Pinned feeds always first
|
// Pinned feeds always first
|
||||||
result.sort((a, b) => {
|
result.sort((a, b) => {
|
||||||
if (a.isPinned && !b.isPinned) return -1;
|
if (a.isPinned && !b.isPinned) return -1;
|
||||||
if (!a.isPinned && b.isPinned) return 1;
|
if (!a.isPinned && b.isPinned) return 1;
|
||||||
return 0;
|
return 0;
|
||||||
});
|
});
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Get episodes in reverse chronological order across all feeds */
|
/** Get episodes in reverse chronological order across all feeds */
|
||||||
const getAllEpisodesChronological = (): Array<{
|
const getAllEpisodesChronological = (): Array<{
|
||||||
episode: Episode;
|
episode: Episode;
|
||||||
feed: Feed;
|
feed: Feed;
|
||||||
}> => {
|
}> => {
|
||||||
const allEpisodes: Array<{ episode: Episode; feed: Feed }> = [];
|
const allEpisodes: Array<{ episode: Episode; feed: Feed }> = [];
|
||||||
|
|
||||||
for (const feed of feeds()) {
|
for (const feed of feeds()) {
|
||||||
for (const episode of feed.episodes) {
|
for (const episode of feed.episodes) {
|
||||||
allEpisodes.push({ episode, feed });
|
allEpisodes.push({ episode, feed });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sort by publication date (newest first)
|
// Sort by publication date (newest first)
|
||||||
allEpisodes.sort(
|
allEpisodes.sort(
|
||||||
(a, b) => b.episode.pubDate.getTime() - a.episode.pubDate.getTime(),
|
(a, b) => b.episode.pubDate.getTime() - a.episode.pubDate.getTime(),
|
||||||
);
|
);
|
||||||
|
|
||||||
return allEpisodes;
|
return allEpisodes;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Sort episodes in reverse chronological order (newest first) */
|
/** Sort episodes in reverse chronological order (newest first) */
|
||||||
const sortEpisodesReverseChronological = (episodes: Episode[]): Episode[] => {
|
const sortEpisodesReverseChronological = (episodes: Episode[]): Episode[] => {
|
||||||
return [...episodes].sort(
|
return [...episodes].sort(
|
||||||
(a, b) => b.pubDate.getTime() - a.pubDate.getTime(),
|
(a, b) => b.pubDate.getTime() - a.pubDate.getTime(),
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Fetch latest episodes from an RSS feed URL, caching all parsed episodes */
|
/** Fetch latest episodes from an RSS feed URL, caching all parsed episodes */
|
||||||
const fetchEpisodes = async (
|
const fetchEpisodes = async (
|
||||||
feedUrl: string,
|
feedUrl: string,
|
||||||
limit: number,
|
limit: number,
|
||||||
feedId?: string,
|
feedId?: string,
|
||||||
): Promise<Episode[]> => {
|
): Promise<Episode[]> => {
|
||||||
try {
|
try {
|
||||||
const response = await fetch(feedUrl, {
|
const response = await fetch(feedUrl, {
|
||||||
headers: {
|
headers: {
|
||||||
"Accept-Encoding": "identity",
|
"Accept-Encoding": "identity",
|
||||||
Accept: "application/rss+xml, application/xml, text/xml, */*",
|
Accept: "application/rss+xml, application/xml, text/xml, */*",
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
if (!response.ok) return [];
|
if (!response.ok) return [];
|
||||||
const xml = await response.text();
|
const xml = await response.text();
|
||||||
const parsed = parseRSSFeed(xml, feedUrl);
|
const parsed = parseRSSFeed(xml, feedUrl);
|
||||||
const allEpisodes = sortEpisodesReverseChronological(parsed.episodes);
|
const allEpisodes = sortEpisodesReverseChronological(parsed.episodes);
|
||||||
|
|
||||||
// Cache all parsed episodes for pagination
|
// Cache all parsed episodes for pagination
|
||||||
if (feedId) {
|
if (feedId) {
|
||||||
fullEpisodeCache.set(feedId, allEpisodes);
|
fullEpisodeCache.set(feedId, allEpisodes);
|
||||||
episodeLoadCount.set(feedId, Math.min(limit, allEpisodes.length));
|
episodeLoadCount.set(feedId, Math.min(limit, allEpisodes.length));
|
||||||
}
|
}
|
||||||
|
|
||||||
return allEpisodes.slice(0, limit);
|
return allEpisodes.slice(0, limit);
|
||||||
} catch {
|
} catch {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Add a new feed and auto-fetch latest 20 episodes */
|
/** Check if a feed with this URL already exists */
|
||||||
const addFeed = async (
|
const hasFeedByUrl = (feedUrl: string): boolean => {
|
||||||
podcast: Podcast,
|
return feeds().some((f) => f.podcast.feedUrl === feedUrl);
|
||||||
sourceId: string,
|
};
|
||||||
visibility: FeedVisibility = FeedVisibility.PUBLIC,
|
|
||||||
) => {
|
|
||||||
const feedId = crypto.randomUUID();
|
|
||||||
const episodes = await fetchEpisodes(
|
|
||||||
podcast.feedUrl,
|
|
||||||
MAX_EPISODES_SUBSCRIBE,
|
|
||||||
feedId,
|
|
||||||
);
|
|
||||||
const newFeed: Feed = {
|
|
||||||
id: feedId,
|
|
||||||
podcast,
|
|
||||||
episodes,
|
|
||||||
visibility,
|
|
||||||
sourceId,
|
|
||||||
lastUpdated: new Date(),
|
|
||||||
isPinned: false,
|
|
||||||
};
|
|
||||||
setFeeds((prev) => {
|
|
||||||
const updated = [...prev, newFeed];
|
|
||||||
saveFeeds(updated);
|
|
||||||
return updated;
|
|
||||||
});
|
|
||||||
return newFeed;
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Auto-download newest episodes for a feed */
|
/** Add a new feed and auto-fetch latest 20 episodes */
|
||||||
const autoDownloadEpisodes = (
|
const addFeed = async (
|
||||||
feedId: string,
|
podcast: Podcast,
|
||||||
newEpisodes: Episode[],
|
sourceId: string,
|
||||||
count: number,
|
visibility: FeedVisibility = FeedVisibility.PUBLIC,
|
||||||
) => {
|
): Promise<Feed | null> => {
|
||||||
try {
|
// Guard: don't add a feed we already have (matched by feedUrl)
|
||||||
const dlStore = useDownloadStore();
|
if (hasFeedByUrl(podcast.feedUrl)) {
|
||||||
// Sort by pubDate descending (newest first)
|
return feeds().find((f) => f.podcast.feedUrl === podcast.feedUrl) ?? null;
|
||||||
const sorted = [...newEpisodes].sort(
|
}
|
||||||
(a, b) => b.pubDate.getTime() - a.pubDate.getTime(),
|
|
||||||
);
|
|
||||||
// count = 0 means download all new episodes
|
|
||||||
const toDownload = count > 0 ? sorted.slice(0, count) : sorted;
|
|
||||||
for (const ep of toDownload) {
|
|
||||||
const status = dlStore.getDownloadStatus(ep.id);
|
|
||||||
if (
|
|
||||||
status === DownloadStatus.NONE ||
|
|
||||||
status === DownloadStatus.FAILED
|
|
||||||
) {
|
|
||||||
dlStore.startDownload(ep, feedId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
// Download store may not be available yet
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Refresh a single feed - re-fetch latest 50 episodes */
|
const feedId = crypto.randomUUID();
|
||||||
const refreshFeed = async (feedId: string) => {
|
const episodes = await fetchEpisodes(
|
||||||
const feed = getFeed(feedId);
|
podcast.feedUrl,
|
||||||
if (!feed) return;
|
MAX_EPISODES_SUBSCRIBE,
|
||||||
const oldEpisodeIds = new Set(feed.episodes.map((e) => e.id));
|
feedId,
|
||||||
const episodes = await fetchEpisodes(
|
);
|
||||||
feed.podcast.feedUrl,
|
const newFeed: Feed = {
|
||||||
MAX_EPISODES_REFRESH,
|
id: feedId,
|
||||||
feedId,
|
podcast,
|
||||||
);
|
episodes,
|
||||||
setFeeds((prev) => {
|
visibility,
|
||||||
const updated = prev.map((f) =>
|
sourceId,
|
||||||
f.id === feedId ? { ...f, episodes, lastUpdated: new Date() } : f,
|
lastUpdated: new Date(),
|
||||||
);
|
isPinned: false,
|
||||||
saveFeeds(updated);
|
};
|
||||||
return updated;
|
setFeeds((prev) => {
|
||||||
});
|
const updated = [...prev, newFeed];
|
||||||
|
saveFeeds(updated);
|
||||||
|
return updated;
|
||||||
|
});
|
||||||
|
return newFeed;
|
||||||
|
};
|
||||||
|
|
||||||
// Auto-download new episodes if enabled for this feed
|
/** Auto-download newest episodes for a feed */
|
||||||
if (feed.autoDownload) {
|
const autoDownloadEpisodes = (
|
||||||
const newEpisodes = episodes.filter((e) => !oldEpisodeIds.has(e.id));
|
feedId: string,
|
||||||
if (newEpisodes.length > 0) {
|
newEpisodes: Episode[],
|
||||||
autoDownloadEpisodes(feedId, newEpisodes, feed.autoDownloadCount ?? 0);
|
count: number,
|
||||||
}
|
) => {
|
||||||
}
|
try {
|
||||||
};
|
const dlStore = useDownloadStore();
|
||||||
|
// Sort by pubDate descending (newest first)
|
||||||
|
const sorted = [...newEpisodes].sort(
|
||||||
|
(a, b) => b.pubDate.getTime() - a.pubDate.getTime(),
|
||||||
|
);
|
||||||
|
// count = 0 means download all new episodes
|
||||||
|
const toDownload = count > 0 ? sorted.slice(0, count) : sorted;
|
||||||
|
for (const ep of toDownload) {
|
||||||
|
const status = dlStore.getDownloadStatus(ep.id);
|
||||||
|
if (
|
||||||
|
status === DownloadStatus.NONE ||
|
||||||
|
status === DownloadStatus.FAILED
|
||||||
|
) {
|
||||||
|
dlStore.startDownload(ep, feedId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// Download store may not be available yet
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/** Refresh all feeds */
|
/** Refresh a single feed - re-fetch latest 50 episodes */
|
||||||
const refreshAllFeeds = async () => {
|
const refreshFeed = async (feedId: string) => {
|
||||||
setIsLoadingFeeds(true);
|
const feed = getFeed(feedId);
|
||||||
try {
|
if (!feed) return;
|
||||||
const currentFeeds = feeds();
|
const oldEpisodeIds = new Set(feed.episodes.map((e) => e.id));
|
||||||
for (const feed of currentFeeds) {
|
const episodes = await fetchEpisodes(
|
||||||
await refreshFeed(feed.id);
|
feed.podcast.feedUrl,
|
||||||
}
|
MAX_EPISODES_REFRESH,
|
||||||
} finally {
|
feedId,
|
||||||
setIsLoadingFeeds(false);
|
);
|
||||||
}
|
setFeeds((prev) => {
|
||||||
};
|
const updated = prev.map((f) =>
|
||||||
|
f.id === feedId ? { ...f, episodes, lastUpdated: new Date() } : f,
|
||||||
|
);
|
||||||
|
saveFeeds(updated);
|
||||||
|
return updated;
|
||||||
|
});
|
||||||
|
|
||||||
(async () => {
|
// Auto-download new episodes if enabled for this feed
|
||||||
const loadedFeeds = await loadFeedsFromFile();
|
if (feed.autoDownload) {
|
||||||
if (loadedFeeds.length > 0) setFeeds(loadedFeeds);
|
const newEpisodes = episodes.filter((e) => !oldEpisodeIds.has(e.id));
|
||||||
const loadedSources = await loadSourcesFromFile<PodcastSource>();
|
if (newEpisodes.length > 0) {
|
||||||
if (loadedSources && loadedSources.length > 0) setSources(loadedSources);
|
autoDownloadEpisodes(feedId, newEpisodes, feed.autoDownloadCount ?? 0);
|
||||||
await refreshAllFeeds();
|
}
|
||||||
})();
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/** Remove a feed */
|
/** Refresh all feeds */
|
||||||
const removeFeed = (feedId: string) => {
|
const refreshAllFeeds = async () => {
|
||||||
fullEpisodeCache.delete(feedId);
|
setIsLoadingFeeds(true);
|
||||||
episodeLoadCount.delete(feedId);
|
try {
|
||||||
setFeeds((prev) => {
|
const currentFeeds = feeds();
|
||||||
const updated = prev.filter((f) => f.id !== feedId);
|
for (const feed of currentFeeds) {
|
||||||
saveFeeds(updated);
|
await refreshFeed(feed.id);
|
||||||
return updated;
|
}
|
||||||
});
|
} finally {
|
||||||
};
|
setIsLoadingFeeds(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/** Update a feed */
|
(async () => {
|
||||||
const updateFeed = (feedId: string, updates: Partial<Feed>) => {
|
const loadedFeeds = await loadFeedsFromFile();
|
||||||
setFeeds((prev) => {
|
if (loadedFeeds.length > 0) setFeeds(loadedFeeds);
|
||||||
const updated = prev.map((f) =>
|
const loadedSources = await loadSourcesFromFile<PodcastSource>();
|
||||||
f.id === feedId ? { ...f, ...updates, lastUpdated: new Date() } : f,
|
if (loadedSources && loadedSources.length > 0) setSources(loadedSources);
|
||||||
);
|
await refreshAllFeeds();
|
||||||
saveFeeds(updated);
|
})();
|
||||||
return updated;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Toggle feed pinned status */
|
/** Remove a feed */
|
||||||
const togglePinned = (feedId: string) => {
|
const removeFeed = (feedId: string) => {
|
||||||
setFeeds((prev) => {
|
fullEpisodeCache.delete(feedId);
|
||||||
const updated = prev.map((f) =>
|
episodeLoadCount.delete(feedId);
|
||||||
f.id === feedId ? { ...f, isPinned: !f.isPinned } : f,
|
setFeeds((prev) => {
|
||||||
);
|
const updated = prev.filter((f) => f.id !== feedId);
|
||||||
saveFeeds(updated);
|
saveFeeds(updated);
|
||||||
return updated;
|
return updated;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Add a source */
|
/** Remove a feed by its RSS URL (for sources that match by URL, not ID) */
|
||||||
const addSource = (source: Omit<PodcastSource, "id">) => {
|
const removeFeedByUrl = (feedUrl: string) => {
|
||||||
const newSource: PodcastSource = {
|
const feed = feeds().find((f) => f.podcast.feedUrl === feedUrl);
|
||||||
...source,
|
if (feed) {
|
||||||
id: crypto.randomUUID(),
|
fullEpisodeCache.delete(feed.id);
|
||||||
};
|
episodeLoadCount.delete(feed.id);
|
||||||
setSources((prev) => {
|
setFeeds((prev) => {
|
||||||
const updated = [...prev, newSource];
|
const updated = prev.filter((f) => f.podcast.feedUrl !== feedUrl);
|
||||||
saveSources(updated);
|
saveFeeds(updated);
|
||||||
return updated;
|
return updated;
|
||||||
});
|
});
|
||||||
return newSource;
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Update a source */
|
/** Update a feed */
|
||||||
const updateSource = (sourceId: string, updates: Partial<PodcastSource>) => {
|
const updateFeed = (feedId: string, updates: Partial<Feed>) => {
|
||||||
setSources((prev) => {
|
setFeeds((prev) => {
|
||||||
const updated = prev.map((source) =>
|
const updated = prev.map((f) =>
|
||||||
source.id === sourceId ? { ...source, ...updates } : source,
|
f.id === feedId ? { ...f, ...updates, lastUpdated: new Date() } : f,
|
||||||
);
|
);
|
||||||
saveSources(updated);
|
saveFeeds(updated);
|
||||||
return updated;
|
return updated;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Remove a source */
|
/** Toggle feed pinned status */
|
||||||
const removeSource = (sourceId: string) => {
|
const togglePinned = (feedId: string) => {
|
||||||
// Don't remove default sources
|
setFeeds((prev) => {
|
||||||
if (sourceId === "itunes" || sourceId === "rss") return false;
|
const updated = prev.map((f) =>
|
||||||
|
f.id === feedId ? { ...f, isPinned: !f.isPinned } : f,
|
||||||
|
);
|
||||||
|
saveFeeds(updated);
|
||||||
|
return updated;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
setSources((prev) => {
|
/** Add a source */
|
||||||
const updated = prev.filter((s) => s.id !== sourceId);
|
const addSource = (source: Omit<PodcastSource, "id">) => {
|
||||||
saveSources(updated);
|
const newSource: PodcastSource = {
|
||||||
return updated;
|
...source,
|
||||||
});
|
id: crypto.randomUUID(),
|
||||||
return true;
|
};
|
||||||
};
|
setSources((prev) => {
|
||||||
|
const updated = [...prev, newSource];
|
||||||
|
saveSources(updated);
|
||||||
|
return updated;
|
||||||
|
});
|
||||||
|
return newSource;
|
||||||
|
};
|
||||||
|
|
||||||
/** Toggle source enabled status */
|
/** Update a source */
|
||||||
const toggleSource = (sourceId: string) => {
|
const updateSource = (sourceId: string, updates: Partial<PodcastSource>) => {
|
||||||
setSources((prev) => {
|
setSources((prev) => {
|
||||||
const updated = prev.map((s) =>
|
const updated = prev.map((source) =>
|
||||||
s.id === sourceId ? { ...s, enabled: !s.enabled } : s,
|
source.id === sourceId ? { ...source, ...updates } : source,
|
||||||
);
|
);
|
||||||
saveSources(updated);
|
saveSources(updated);
|
||||||
return updated;
|
return updated;
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Get feed by ID */
|
/** Remove a source */
|
||||||
const getFeed = (feedId: string): Feed | undefined => {
|
const removeSource = (sourceId: string) => {
|
||||||
return feeds().find((f) => f.id === feedId);
|
// Don't remove default sources
|
||||||
};
|
if (sourceId === "itunes" || sourceId === "rss") return false;
|
||||||
|
|
||||||
/** Get selected feed */
|
setSources((prev) => {
|
||||||
const getSelectedFeed = (): Feed | undefined => {
|
const updated = prev.filter((s) => s.id !== sourceId);
|
||||||
const id = selectedFeedId();
|
saveSources(updated);
|
||||||
return id ? getFeed(id) : undefined;
|
return updated;
|
||||||
};
|
});
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
/** Check if a feed has more episodes available beyond what's currently loaded */
|
/** Toggle source enabled status */
|
||||||
const hasMoreEpisodes = (feedId: string): boolean => {
|
const toggleSource = (sourceId: string) => {
|
||||||
const cached = fullEpisodeCache.get(feedId);
|
setSources((prev) => {
|
||||||
if (!cached) return false;
|
const updated = prev.map((s) =>
|
||||||
const loaded = episodeLoadCount.get(feedId) ?? 0;
|
s.id === sourceId ? { ...s, enabled: !s.enabled } : s,
|
||||||
return loaded < cached.length;
|
);
|
||||||
};
|
saveSources(updated);
|
||||||
|
return updated;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
/** Load the next chunk of episodes for a feed from the cache.
|
/** Get feed by ID */
|
||||||
* If no cache exists (e.g. app restart), re-fetches from the RSS feed. */
|
const getFeed = (feedId: string): Feed | undefined => {
|
||||||
const loadMoreEpisodes = async (feedId: string) => {
|
return feeds().find((f) => f.id === feedId);
|
||||||
if (isLoadingMore()) return;
|
};
|
||||||
const feed = getFeed(feedId);
|
|
||||||
if (!feed) return;
|
|
||||||
|
|
||||||
setIsLoadingMore(true);
|
/** Get selected feed */
|
||||||
try {
|
const getSelectedFeed = (): Feed | undefined => {
|
||||||
let cached = fullEpisodeCache.get(feedId);
|
const id = selectedFeedId();
|
||||||
|
return id ? getFeed(id) : undefined;
|
||||||
|
};
|
||||||
|
|
||||||
// If no cache, re-fetch and parse the full feed
|
/** Check if a feed has more episodes available beyond what's currently loaded */
|
||||||
if (!cached) {
|
const hasMoreEpisodes = (feedId: string): boolean => {
|
||||||
const response = await fetch(feed.podcast.feedUrl, {
|
const cached = fullEpisodeCache.get(feedId);
|
||||||
headers: {
|
if (!cached) return false;
|
||||||
"Accept-Encoding": "identity",
|
const loaded = episodeLoadCount.get(feedId) ?? 0;
|
||||||
Accept: "application/rss+xml, application/xml, text/xml, */*",
|
return loaded < cached.length;
|
||||||
},
|
};
|
||||||
});
|
|
||||||
if (!response.ok) return;
|
|
||||||
const xml = await response.text();
|
|
||||||
const parsed = parseRSSFeed(xml, feed.podcast.feedUrl);
|
|
||||||
cached = parsed.episodes;
|
|
||||||
fullEpisodeCache.set(feedId, cached);
|
|
||||||
// Set current load count to match what's already displayed
|
|
||||||
episodeLoadCount.set(feedId, feed.episodes.length);
|
|
||||||
}
|
|
||||||
|
|
||||||
const currentCount = episodeLoadCount.get(feedId) ?? feed.episodes.length;
|
/** Load the next chunk of episodes for a feed from the cache.
|
||||||
const newCount = Math.min(
|
* If no cache exists (e.g. app restart), re-fetches from the RSS feed. */
|
||||||
currentCount + MAX_EPISODES_REFRESH,
|
const loadMoreEpisodes = async (feedId: string) => {
|
||||||
cached.length,
|
if (isLoadingMore()) return;
|
||||||
);
|
const feed = getFeed(feedId);
|
||||||
|
if (!feed) return;
|
||||||
|
|
||||||
if (newCount <= currentCount) return; // nothing more to load
|
setIsLoadingMore(true);
|
||||||
|
try {
|
||||||
|
let cached = fullEpisodeCache.get(feedId);
|
||||||
|
|
||||||
episodeLoadCount.set(feedId, newCount);
|
// If no cache, re-fetch and parse the full feed
|
||||||
const episodes = cached.slice(0, newCount);
|
if (!cached) {
|
||||||
|
const response = await fetch(feed.podcast.feedUrl, {
|
||||||
|
headers: {
|
||||||
|
"Accept-Encoding": "identity",
|
||||||
|
Accept: "application/rss+xml, application/xml, text/xml, */*",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (!response.ok) return;
|
||||||
|
const xml = await response.text();
|
||||||
|
const parsed = parseRSSFeed(xml, feed.podcast.feedUrl);
|
||||||
|
cached = parsed.episodes;
|
||||||
|
fullEpisodeCache.set(feedId, cached);
|
||||||
|
// Set current load count to match what's already displayed
|
||||||
|
episodeLoadCount.set(feedId, feed.episodes.length);
|
||||||
|
}
|
||||||
|
|
||||||
setFeeds((prev) => {
|
const currentCount = episodeLoadCount.get(feedId) ?? feed.episodes.length;
|
||||||
const updated = prev.map((f) =>
|
const newCount = Math.min(
|
||||||
f.id === feedId ? { ...f, episodes } : f,
|
currentCount + MAX_EPISODES_REFRESH,
|
||||||
);
|
cached.length,
|
||||||
saveFeeds(updated);
|
);
|
||||||
return updated;
|
|
||||||
});
|
|
||||||
} finally {
|
|
||||||
setIsLoadingMore(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Set auto-download settings for a feed */
|
if (newCount <= currentCount) return; // nothing more to load
|
||||||
const setAutoDownload = (
|
|
||||||
feedId: string,
|
|
||||||
enabled: boolean,
|
|
||||||
count: number = 0,
|
|
||||||
) => {
|
|
||||||
updateFeed(feedId, { autoDownload: enabled, autoDownloadCount: count });
|
|
||||||
};
|
|
||||||
|
|
||||||
return {
|
episodeLoadCount.set(feedId, newCount);
|
||||||
// State
|
const episodes = cached.slice(0, newCount);
|
||||||
feeds,
|
|
||||||
sources,
|
|
||||||
filter,
|
|
||||||
selectedFeedId,
|
|
||||||
isLoadingMore,
|
|
||||||
|
|
||||||
// Computed
|
setFeeds((prev) => {
|
||||||
getFilteredFeeds,
|
const updated = prev.map((f) =>
|
||||||
getAllEpisodesChronological,
|
f.id === feedId ? { ...f, episodes } : f,
|
||||||
getFeed,
|
);
|
||||||
getSelectedFeed,
|
saveFeeds(updated);
|
||||||
hasMoreEpisodes,
|
return updated;
|
||||||
isLoadingFeeds,
|
});
|
||||||
|
} finally {
|
||||||
|
setIsLoadingMore(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// Actions
|
/** Set auto-download settings for a feed */
|
||||||
setFilter,
|
const setAutoDownload = (
|
||||||
setSelectedFeedId,
|
feedId: string,
|
||||||
addFeed,
|
enabled: boolean,
|
||||||
removeFeed,
|
count: number = 0,
|
||||||
updateFeed,
|
) => {
|
||||||
togglePinned,
|
updateFeed(feedId, { autoDownload: enabled, autoDownloadCount: count });
|
||||||
refreshFeed,
|
};
|
||||||
refreshAllFeeds,
|
|
||||||
loadMoreEpisodes,
|
return {
|
||||||
addSource,
|
// State
|
||||||
removeSource,
|
feeds,
|
||||||
toggleSource,
|
sources,
|
||||||
updateSource,
|
filter,
|
||||||
setAutoDownload,
|
selectedFeedId,
|
||||||
};
|
isLoadingMore,
|
||||||
|
|
||||||
|
// Computed
|
||||||
|
getFilteredFeeds,
|
||||||
|
getAllEpisodesChronological,
|
||||||
|
getFeed,
|
||||||
|
getSelectedFeed,
|
||||||
|
hasMoreEpisodes,
|
||||||
|
isLoadingFeeds,
|
||||||
|
|
||||||
|
// Actions
|
||||||
|
setFilter,
|
||||||
|
setSelectedFeedId,
|
||||||
|
addFeed,
|
||||||
|
hasFeedByUrl,
|
||||||
|
removeFeed,
|
||||||
|
removeFeedByUrl,
|
||||||
|
updateFeed,
|
||||||
|
togglePinned,
|
||||||
|
refreshFeed,
|
||||||
|
refreshAllFeeds,
|
||||||
|
loadMoreEpisodes,
|
||||||
|
addSource,
|
||||||
|
removeSource,
|
||||||
|
toggleSource,
|
||||||
|
updateSource,
|
||||||
|
setAutoDownload,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Singleton feed store */
|
/** Singleton feed store */
|
||||||
let feedStoreInstance: ReturnType<typeof createFeedStore> | null = null;
|
let feedStoreInstance: ReturnType<typeof createFeedStore> | null = null;
|
||||||
|
|
||||||
export function useFeedStore() {
|
export function useFeedStore() {
|
||||||
if (!feedStoreInstance) {
|
if (!feedStoreInstance) {
|
||||||
feedStoreInstance = createFeedStore();
|
feedStoreInstance = createFeedStore();
|
||||||
}
|
}
|
||||||
return feedStoreInstance;
|
return feedStoreInstance;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,95 +2,95 @@ import type { RGBA } from "@opentui/core";
|
|||||||
import type { ColorValue, ThemeJson, Variant } from "./theme-schema";
|
import type { ColorValue, ThemeJson, Variant } from "./theme-schema";
|
||||||
|
|
||||||
export type ThemeName =
|
export type ThemeName =
|
||||||
| "system"
|
| "system"
|
||||||
| "catppuccin"
|
| "catppuccin"
|
||||||
| "gruvbox"
|
| "gruvbox"
|
||||||
| "tokyo"
|
| "tokyo"
|
||||||
| "nord"
|
| "nord"
|
||||||
| "custom";
|
| "custom";
|
||||||
|
|
||||||
export type LayerBackgrounds = {
|
export type LayerBackgrounds = {
|
||||||
layer0: ColorValue;
|
layer0: ColorValue;
|
||||||
layer1: ColorValue;
|
layer1: ColorValue;
|
||||||
layer2: ColorValue;
|
layer2: ColorValue;
|
||||||
layer3: ColorValue;
|
layer3: ColorValue;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type ThemeColors = {
|
export type ThemeColors = {
|
||||||
background: ColorValue;
|
background: ColorValue;
|
||||||
surface: ColorValue;
|
surface: ColorValue;
|
||||||
primary: ColorValue;
|
primary: ColorValue;
|
||||||
secondary: ColorValue;
|
secondary: ColorValue;
|
||||||
accent: ColorValue;
|
accent: ColorValue;
|
||||||
text: ColorValue;
|
text: ColorValue;
|
||||||
textPrimary?: ColorValue;
|
textPrimary?: ColorValue;
|
||||||
textSecondary?: ColorValue;
|
textSecondary?: ColorValue;
|
||||||
textTertiary?: ColorValue;
|
textTertiary?: ColorValue;
|
||||||
textSelectedPrimary?: ColorValue;
|
textSelectedPrimary?: ColorValue;
|
||||||
textSelectedSecondary?: ColorValue;
|
textSelectedSecondary?: ColorValue;
|
||||||
textSelectedTertiary?: ColorValue;
|
textSelectedTertiary?: ColorValue;
|
||||||
muted: ColorValue;
|
muted: ColorValue;
|
||||||
warning: ColorValue;
|
warning: ColorValue;
|
||||||
error: ColorValue;
|
error: ColorValue;
|
||||||
success: ColorValue;
|
success: ColorValue;
|
||||||
layerBackgrounds?: LayerBackgrounds;
|
layerBackgrounds?: LayerBackgrounds;
|
||||||
_hasSelectedListItemText?: boolean;
|
_hasSelectedListItemText?: boolean;
|
||||||
thinkingOpacity?: number;
|
thinkingOpacity?: number;
|
||||||
selectedListItemText?: ColorValue;
|
selectedListItemText?: ColorValue;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type ThemeVariant = {
|
export type ThemeVariant = {
|
||||||
name: string;
|
name: string;
|
||||||
colors: ThemeColors;
|
colors: ThemeColors;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type ThemeToken = {
|
export type ThemeToken = {
|
||||||
[key: string]: string;
|
[key: string]: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type ResolvedTheme = Record<string, RGBA> & {
|
export type ResolvedTheme = Record<string, RGBA> & {
|
||||||
layerBackgrounds: Record<string, RGBA>;
|
layerBackgrounds: Record<string, RGBA>;
|
||||||
_hasSelectedListItemText: boolean;
|
_hasSelectedListItemText: boolean;
|
||||||
thinkingOpacity: number;
|
thinkingOpacity: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type DesktopTheme = {
|
export type DesktopTheme = {
|
||||||
name: string;
|
name: string;
|
||||||
variants: ThemeVariant[];
|
variants: ThemeVariant[];
|
||||||
defaultVariant: string;
|
defaultVariant: string;
|
||||||
tokens: ThemeToken;
|
tokens: ThemeToken;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type VisualizerSettings = {
|
export type VisualizerSettings = {
|
||||||
/** Number of frequency bars (8–128, default: 32) */
|
/** Number of frequency bars (8–128, default: 64) */
|
||||||
bars: number;
|
bars: number;
|
||||||
/** Automatic sensitivity: 1 = enabled, 0 = disabled (default: 1) */
|
/** Automatic sensitivity: 1 = enabled, 0 = disabled (default: 1) */
|
||||||
sensitivity: number;
|
sensitivity: number;
|
||||||
/** Noise reduction factor 0.0–1.0 (default: 0.77) */
|
/** Noise reduction factor 0.0–1.0 (default: 0.77) */
|
||||||
noiseReduction: number;
|
noiseReduction: number;
|
||||||
/** Low frequency cutoff in Hz (default: 50) */
|
/** Low frequency cutoff in Hz (default: 50) */
|
||||||
lowCutOff: number;
|
lowCutOff: number;
|
||||||
/** High frequency cutoff in Hz (default: 10000) */
|
/** High frequency cutoff in Hz (default: 10000) */
|
||||||
highCutOff: number;
|
highCutOff: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type AppSettings = {
|
export type AppSettings = {
|
||||||
theme: ThemeName;
|
theme: ThemeName;
|
||||||
fontSize: number;
|
fontSize: number;
|
||||||
playbackSpeed: number;
|
playbackSpeed: number;
|
||||||
downloadPath: string;
|
downloadPath: string;
|
||||||
visualizer: VisualizerSettings;
|
visualizer: VisualizerSettings;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type UserPreferences = {
|
export type UserPreferences = {
|
||||||
showExplicit: boolean;
|
showExplicit: boolean;
|
||||||
autoDownload: boolean;
|
autoDownload: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type AppState = {
|
export type AppState = {
|
||||||
settings: AppSettings;
|
settings: AppSettings;
|
||||||
preferences: UserPreferences;
|
preferences: UserPreferences;
|
||||||
customTheme: ThemeColors;
|
customTheme: ThemeColors;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type ThemeMode = "dark" | "light";
|
export type ThemeMode = "dark" | "light";
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
import {
|
import {
|
||||||
createContext,
|
createContext,
|
||||||
createMemo,
|
createMemo,
|
||||||
createSignal,
|
createSignal,
|
||||||
onCleanup,
|
onCleanup,
|
||||||
useContext,
|
useContext,
|
||||||
type Accessor,
|
type Accessor,
|
||||||
type ParentProps,
|
type ParentProps,
|
||||||
For,
|
For,
|
||||||
Show,
|
Show,
|
||||||
} from "solid-js";
|
} from "solid-js";
|
||||||
import { useKeyboard, useTerminalDimensions } from "@opentui/solid";
|
import { useKeyboard, useTerminalDimensions } from "@opentui/solid";
|
||||||
import { KeybindsResolved, useKeybinds } from "../context/KeybindContext";
|
import { KeybindsResolved, useKeybinds } from "../context/KeybindContext";
|
||||||
@@ -21,313 +21,319 @@ import { SelectableBox, SelectableText } from "@/components/Selectable";
|
|||||||
* Command option for the command palette.
|
* Command option for the command palette.
|
||||||
*/
|
*/
|
||||||
export type CommandOption = {
|
export type CommandOption = {
|
||||||
/** Display title */
|
/** Display title */
|
||||||
title: string;
|
title: string;
|
||||||
/** Unique identifier */
|
/** Unique identifier */
|
||||||
value: string;
|
value: string;
|
||||||
/** Description shown below title */
|
/** Description shown below title */
|
||||||
description?: string;
|
description?: string;
|
||||||
/** Category for grouping */
|
/** Category for grouping */
|
||||||
category?: string;
|
category?: string;
|
||||||
/** Keybind reference */
|
/** Keybind reference */
|
||||||
keybind?: keyof KeybindsResolved;
|
keybind?: keyof KeybindsResolved;
|
||||||
/** Whether this command is suggested */
|
/** Whether this command is suggested */
|
||||||
suggested?: boolean;
|
suggested?: boolean;
|
||||||
/** Slash command configuration */
|
/** Slash command configuration */
|
||||||
slash?: {
|
slash?: {
|
||||||
name: string;
|
name: string;
|
||||||
aliases?: string[];
|
aliases?: string[];
|
||||||
};
|
};
|
||||||
/** Whether to hide from command list */
|
/** Whether to hide from command list */
|
||||||
hidden?: boolean;
|
hidden?: boolean;
|
||||||
/** Whether command is enabled */
|
/** Whether command is enabled */
|
||||||
enabled?: boolean;
|
enabled?: boolean;
|
||||||
/** Footer text (usually keybind display) */
|
/** Footer text (usually keybind display) */
|
||||||
footer?: string;
|
footer?: string;
|
||||||
/** Handler when command is selected */
|
/** Handler when command is selected */
|
||||||
onSelect?: (dialog: ReturnType<typeof useDialog>) => void;
|
onSelect?: (dialog: ReturnType<typeof useDialog>) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
type CommandContext = ReturnType<typeof init>;
|
type CommandContext = ReturnType<typeof init>;
|
||||||
const ctx = createContext<CommandContext>();
|
const ctx = createContext<CommandContext>();
|
||||||
|
|
||||||
function init() {
|
function init() {
|
||||||
const [registrations, setRegistrations] = createSignal<
|
const [registrations, setRegistrations] = createSignal<
|
||||||
Accessor<CommandOption[]>[]
|
Accessor<CommandOption[]>[]
|
||||||
>([]);
|
>([]);
|
||||||
const [suspendCount, setSuspendCount] = createSignal(0);
|
const [suspendCount, setSuspendCount] = createSignal(0);
|
||||||
const dialog = useDialog();
|
const dialog = useDialog();
|
||||||
const keybind = useKeybinds();
|
const keybind = useKeybinds();
|
||||||
|
|
||||||
const entries = createMemo(() => {
|
const entries = createMemo(() => {
|
||||||
const all = registrations().flatMap((x) => x());
|
const all = registrations().flatMap((x) => x());
|
||||||
return all.map((x) => ({
|
return all.map((x) => ({
|
||||||
...x,
|
...x,
|
||||||
footer: x.keybind ? keybind.print(x.keybind) : undefined,
|
footer: x.keybind ? keybind.print(x.keybind) : undefined,
|
||||||
}));
|
}));
|
||||||
});
|
});
|
||||||
|
|
||||||
const isEnabled = (option: CommandOption) => option.enabled !== false;
|
const isEnabled = (option: CommandOption) => option.enabled !== false;
|
||||||
const isVisible = (option: CommandOption) =>
|
const isVisible = (option: CommandOption) =>
|
||||||
isEnabled(option) && !option.hidden;
|
isEnabled(option) && !option.hidden;
|
||||||
|
|
||||||
const visibleOptions = createMemo(() =>
|
const visibleOptions = createMemo(() =>
|
||||||
entries().filter((option) => isVisible(option)),
|
entries().filter((option) => isVisible(option)),
|
||||||
);
|
);
|
||||||
const suggestedOptions = createMemo(() =>
|
const suggestedOptions = createMemo(() =>
|
||||||
visibleOptions()
|
visibleOptions()
|
||||||
.filter((option) => option.suggested)
|
.filter((option) => option.suggested)
|
||||||
.map((option) => ({
|
.map((option) => ({
|
||||||
...option,
|
...option,
|
||||||
value: `suggested:${option.value}`,
|
value: `suggested:${option.value}`,
|
||||||
category: "Suggested",
|
category: "Suggested",
|
||||||
})),
|
})),
|
||||||
);
|
);
|
||||||
const suspended = () => suspendCount() > 0;
|
const suspended = () => suspendCount() > 0;
|
||||||
|
|
||||||
// Handle keybind shortcuts
|
// Handle keybind shortcuts
|
||||||
useKeyboard((evt) => {
|
useKeyboard((evt) => {
|
||||||
if (suspended()) return;
|
if (suspended()) return;
|
||||||
if (dialog.isOpen) return;
|
if (dialog.isOpen) return;
|
||||||
for (const option of entries()) {
|
for (const option of entries()) {
|
||||||
if (!isEnabled(option)) continue;
|
if (!isEnabled(option)) continue;
|
||||||
if (option.keybind && keybind.match(option.keybind, evt)) {
|
if (option.keybind && keybind.match(option.keybind, evt)) {
|
||||||
evt.preventDefault();
|
evt.preventDefault();
|
||||||
option.onSelect?.(dialog);
|
option.onSelect?.(dialog);
|
||||||
emit("command.execute", { command: option.value });
|
emit("command.execute", { command: option.value });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const result = {
|
const result = {
|
||||||
/**
|
/**
|
||||||
* Trigger a command by its value.
|
* Trigger a command by its value.
|
||||||
*/
|
*/
|
||||||
trigger(name: string) {
|
trigger(name: string) {
|
||||||
for (const option of entries()) {
|
for (const option of entries()) {
|
||||||
if (option.value === name) {
|
if (option.value === name) {
|
||||||
if (!isEnabled(option)) return;
|
if (!isEnabled(option)) return;
|
||||||
option.onSelect?.(dialog);
|
option.onSelect?.(dialog);
|
||||||
emit("command.execute", { command: name });
|
emit("command.execute", { command: name });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* Get all slash commands.
|
* Get all slash commands.
|
||||||
*/
|
*/
|
||||||
slashes() {
|
slashes() {
|
||||||
return visibleOptions().flatMap((option) => {
|
return visibleOptions().flatMap((option) => {
|
||||||
const slash = option.slash;
|
const slash = option.slash;
|
||||||
if (!slash) return [];
|
if (!slash) return [];
|
||||||
return {
|
return {
|
||||||
display: "/" + slash.name,
|
display: "/" + slash.name,
|
||||||
description: option.description ?? option.title,
|
description: option.description ?? option.title,
|
||||||
aliases: slash.aliases?.map((alias) => "/" + alias),
|
aliases: slash.aliases?.map((alias) => "/" + alias),
|
||||||
onSelect: () => result.trigger(option.value),
|
onSelect: () => result.trigger(option.value),
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* Enable/disable keybinds temporarily.
|
* Enable/disable keybinds temporarily.
|
||||||
*/
|
*/
|
||||||
keybinds(enabled: boolean) {
|
keybinds(enabled: boolean) {
|
||||||
setSuspendCount((count) => count + (enabled ? -1 : 1));
|
setSuspendCount((count) => count + (enabled ? -1 : 1));
|
||||||
},
|
},
|
||||||
suspended,
|
suspended,
|
||||||
/**
|
/**
|
||||||
* Show the command palette dialog.
|
* Show the command palette dialog.
|
||||||
*/
|
*/
|
||||||
show() {
|
show() {
|
||||||
dialog.replace(() => (
|
dialog.replace(() => (
|
||||||
<CommandDialog
|
<CommandDialog
|
||||||
options={visibleOptions()}
|
options={visibleOptions()}
|
||||||
suggestedOptions={suggestedOptions()}
|
suggestedOptions={suggestedOptions()}
|
||||||
/>
|
/>
|
||||||
));
|
));
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* Register commands. Returns cleanup function.
|
* Register commands. Returns cleanup function.
|
||||||
*/
|
*/
|
||||||
register(cb: () => CommandOption[]) {
|
register(cb: () => CommandOption[]) {
|
||||||
const results = createMemo(cb);
|
const results = createMemo(cb);
|
||||||
setRegistrations((arr) => [results, ...arr]);
|
setRegistrations((arr) => [results, ...arr]);
|
||||||
onCleanup(() => {
|
onCleanup(() => {
|
||||||
setRegistrations((arr) => arr.filter((x) => x !== results));
|
setRegistrations((arr) => arr.filter((x) => x !== results));
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* Get all visible options.
|
* Get all visible options.
|
||||||
*/
|
*/
|
||||||
get options() {
|
get options() {
|
||||||
return visibleOptions();
|
return visibleOptions();
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useCommandDialog() {
|
export function useCommandDialog() {
|
||||||
const value = useContext(ctx);
|
const value = useContext(ctx);
|
||||||
if (!value) {
|
if (!value) {
|
||||||
throw new Error("useCommandDialog must be used within a CommandProvider");
|
throw new Error("useCommandDialog must be used within a CommandProvider");
|
||||||
}
|
}
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function CommandProvider(props: ParentProps) {
|
export function CommandProvider(props: ParentProps) {
|
||||||
const value = init();
|
const value = init();
|
||||||
const dialog = useDialog();
|
const dialog = useDialog();
|
||||||
const keybind = useKeybinds();
|
const keybind = useKeybinds();
|
||||||
|
|
||||||
// Open command palette on ctrl+p or command_list keybind
|
// Open the command palette via the `command` keybind (bound to `:` in
|
||||||
useKeyboard((evt) => {
|
// keybinds.jsonc). The old hardcoded "command_list" name was never a
|
||||||
if (value.suspended()) return;
|
// canonical action, so the palette was unreachable dead code.
|
||||||
if (dialog.isOpen) return;
|
useKeyboard((evt) => {
|
||||||
if (evt.defaultPrevented) return;
|
if (value.suspended()) return;
|
||||||
if (keybind.match("command_list", evt)) {
|
if (dialog.isOpen) return;
|
||||||
evt.preventDefault();
|
if (evt.defaultPrevented) return;
|
||||||
value.show();
|
if (keybind.match("command", evt)) {
|
||||||
return;
|
evt.preventDefault();
|
||||||
}
|
value.show();
|
||||||
});
|
return;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
return <ctx.Provider value={value}>{props.children}</ctx.Provider>;
|
return <ctx.Provider value={value}>{props.children}</ctx.Provider>;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Command palette dialog component.
|
* Command palette dialog component.
|
||||||
*/
|
*/
|
||||||
function CommandDialog(props: {
|
function CommandDialog(props: {
|
||||||
options: CommandOption[];
|
options: CommandOption[];
|
||||||
suggestedOptions: CommandOption[];
|
suggestedOptions: CommandOption[];
|
||||||
}) {
|
}) {
|
||||||
const { theme } = useTheme();
|
const { theme } = useTheme();
|
||||||
const dialog = useDialog();
|
const dialog = useDialog();
|
||||||
const dimensions = useTerminalDimensions();
|
const dimensions = useTerminalDimensions();
|
||||||
const [filter, setFilter] = createSignal("");
|
const [filter, setFilter] = createSignal("");
|
||||||
const [selectedIndex, setSelectedIndex] = createSignal(0);
|
const [selectedIndex, setSelectedIndex] = createSignal(0);
|
||||||
|
|
||||||
const filteredOptions = createMemo(() => {
|
const filteredOptions = createMemo(() => {
|
||||||
const query = filter().toLowerCase();
|
const query = filter().toLowerCase();
|
||||||
if (!query) {
|
if (!query) {
|
||||||
return [...props.suggestedOptions, ...props.options];
|
return [...props.suggestedOptions, ...props.options];
|
||||||
}
|
}
|
||||||
return props.options.filter(
|
return props.options.filter(
|
||||||
(option) =>
|
(option) =>
|
||||||
option.title.toLowerCase().includes(query) ||
|
option.title.toLowerCase().includes(query) ||
|
||||||
option.description?.toLowerCase().includes(query) ||
|
option.description?.toLowerCase().includes(query) ||
|
||||||
option.category?.toLowerCase().includes(query),
|
option.category?.toLowerCase().includes(query),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Reset selection when filter changes
|
// Reset selection when filter changes
|
||||||
createMemo(() => {
|
createMemo(() => {
|
||||||
filter();
|
filter();
|
||||||
setSelectedIndex(0);
|
setSelectedIndex(0);
|
||||||
});
|
});
|
||||||
|
|
||||||
useKeyboard((evt) => {
|
useKeyboard((evt) => {
|
||||||
if (evt.name === "escape") {
|
if (evt.name === "escape") {
|
||||||
dialog.clear();
|
dialog.clear();
|
||||||
evt.preventDefault();
|
evt.preventDefault();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (evt.name === "return" || evt.name === "enter") {
|
if (evt.name === "return" || evt.name === "enter") {
|
||||||
const option = filteredOptions()[selectedIndex()];
|
const option = filteredOptions()[selectedIndex()];
|
||||||
if (option) {
|
if (option) {
|
||||||
option.onSelect?.(dialog);
|
option.onSelect?.(dialog);
|
||||||
dialog.clear();
|
dialog.clear();
|
||||||
}
|
}
|
||||||
evt.preventDefault();
|
evt.preventDefault();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (evt.name === "up" || (evt.ctrl && evt.name === "p")) {
|
if (evt.name === "up" || (evt.ctrl && evt.name === "p")) {
|
||||||
setSelectedIndex((i) => Math.max(0, i - 1));
|
setSelectedIndex((i) => Math.max(0, i - 1));
|
||||||
evt.preventDefault();
|
evt.preventDefault();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (evt.name === "down" || (evt.ctrl && evt.name === "n")) {
|
if (evt.name === "down" || (evt.ctrl && evt.name === "n")) {
|
||||||
setSelectedIndex((i) => Math.min(filteredOptions().length - 1, i + 1));
|
setSelectedIndex((i) => Math.min(filteredOptions().length - 1, i + 1));
|
||||||
evt.preventDefault();
|
evt.preventDefault();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle text input
|
// Handle text input
|
||||||
if (evt.name && evt.name.length === 1 && !evt.ctrl && !evt.meta) {
|
if (evt.name && evt.name.length === 1 && !evt.ctrl && !evt.meta) {
|
||||||
setFilter((f) => f + evt.name);
|
setFilter((f) => f + evt.name);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (evt.name === "backspace") {
|
if (evt.name === "backspace") {
|
||||||
setFilter((f) => f.slice(0, -1));
|
setFilter((f) => f.slice(0, -1));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const maxHeight = Math.floor(dimensions().height * 0.6);
|
const maxHeight = Math.floor(dimensions().height * 0.6);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<box flexDirection="column" padding={1} borderColor={theme.border}>
|
<box flexDirection="column" padding={1} borderColor={theme.border}>
|
||||||
{/* Search input */}
|
{/* Search input */}
|
||||||
<box marginBottom={1}>
|
<box marginBottom={1}>
|
||||||
<text fg={theme.textMuted}>{"> "}</text>
|
<text fg={theme.textMuted}>{"> "}</text>
|
||||||
<text fg={theme.text}>{filter() || "Type to search commands..."}</text>
|
<text fg={theme.text}>{filter() || "Type to search commands..."}</text>
|
||||||
</box>
|
</box>
|
||||||
|
|
||||||
{/* Command list */}
|
{/* Command list */}
|
||||||
<box flexDirection="column" maxHeight={maxHeight} borderColor={theme.border}>
|
<box
|
||||||
<For each={filteredOptions().slice(0, 10)}>
|
flexDirection="column"
|
||||||
{(option, index) => (
|
maxHeight={maxHeight}
|
||||||
<SelectableBox
|
borderColor={theme.border}
|
||||||
selected={() => index() === selectedIndex()}
|
>
|
||||||
flexDirection="column"
|
<For each={filteredOptions().slice(0, 10)}>
|
||||||
padding={1}
|
{(option, index) => (
|
||||||
onMouseDown={() => {
|
<SelectableBox
|
||||||
setSelectedIndex(index());
|
selected={() => index() === selectedIndex()}
|
||||||
const selectedOption = filteredOptions()[index()];
|
flexDirection="column"
|
||||||
if (selectedOption) {
|
padding={1}
|
||||||
selectedOption.onSelect?.(dialog);
|
onMouseDown={() => {
|
||||||
dialog.clear();
|
setSelectedIndex(index());
|
||||||
}
|
const selectedOption = filteredOptions()[index()];
|
||||||
}}
|
if (selectedOption) {
|
||||||
>
|
selectedOption.onSelect?.(dialog);
|
||||||
<box flexDirection="column" flexGrow={1}>
|
dialog.clear();
|
||||||
<SelectableText
|
}
|
||||||
selected={() => index() === selectedIndex()}
|
}}
|
||||||
primary
|
>
|
||||||
>
|
<box flexDirection="column" flexGrow={1}>
|
||||||
{option.title}
|
<SelectableText
|
||||||
</SelectableText>
|
selected={() => index() === selectedIndex()}
|
||||||
<Show when={option.footer}>
|
primary
|
||||||
<SelectableText
|
>
|
||||||
selected={() => index() === selectedIndex()}
|
{option.title}
|
||||||
tertiary
|
</SelectableText>
|
||||||
>
|
<Show when={option.footer}>
|
||||||
{option.footer}
|
<SelectableText
|
||||||
</SelectableText>
|
selected={() => index() === selectedIndex()}
|
||||||
</Show>
|
tertiary
|
||||||
<Show when={option.description}>
|
>
|
||||||
<SelectableText
|
{option.footer}
|
||||||
selected={() => index() === selectedIndex()}
|
</SelectableText>
|
||||||
tertiary
|
</Show>
|
||||||
>
|
<Show when={option.description}>
|
||||||
{option.description}
|
<SelectableText
|
||||||
</SelectableText>
|
selected={() => index() === selectedIndex()}
|
||||||
</Show>
|
tertiary
|
||||||
</box>
|
>
|
||||||
</SelectableBox>
|
{option.description}
|
||||||
)}
|
</SelectableText>
|
||||||
</For>
|
</Show>
|
||||||
<Show when={filteredOptions().length === 0}>
|
</box>
|
||||||
<text fg={theme.textMuted} style={{ padding: 1 }}>
|
</SelectableBox>
|
||||||
No commands found
|
)}
|
||||||
</text>
|
</For>
|
||||||
</Show>
|
<Show when={filteredOptions().length === 0}>
|
||||||
</box>
|
<text fg={theme.textMuted} style={{ padding: 1 }}>
|
||||||
</box>
|
No commands found
|
||||||
);
|
</text>
|
||||||
|
</Show>
|
||||||
|
</box>
|
||||||
|
</box>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,11 @@
|
|||||||
/**
|
/**
|
||||||
* Cross-platform audio playback engine for PodTUI.
|
* Audio playback engine for PodTUI.
|
||||||
*
|
*
|
||||||
* Backend priority:
|
* Single backend: mpv — full IPC control (seek, volume, speed, position
|
||||||
* 1. mpv — full IPC control (seek, volume, speed, position tracking)
|
* tracking), so speed/volume/seek changes apply instantly with no process
|
||||||
* 2. ffplay — basic control via process signals
|
* restart. When mpv isn't installed there is no fallback: the no-op backend
|
||||||
* 3. afplay — macOS built-in (no seek/speed, volume only)
|
* surfaces "No audio player found" honestly rather than degrading through
|
||||||
* 4. system — open/xdg-open/start (fire-and-forget, no control)
|
* players that can't change speed/volume without restarting.
|
||||||
*
|
|
||||||
* All backends implement the AudioBackend interface so the Player
|
|
||||||
* component doesn't need to care which one is active.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { platform } from "os";
|
import { platform } from "os";
|
||||||
@@ -18,7 +15,7 @@ import { join } from "path";
|
|||||||
|
|
||||||
// ── Types ────────────────────────────────────────────────────────────
|
// ── Types ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
export type BackendName = "mpv" | "ffplay" | "afplay" | "system" | "none";
|
export type BackendName = "mpv" | "none";
|
||||||
|
|
||||||
export interface AudioState {
|
export interface AudioState {
|
||||||
playing: boolean;
|
playing: boolean;
|
||||||
@@ -381,467 +378,6 @@ export class MpvBackend implements AudioBackend {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── ffplay Backend ───────────────────────────────────────────────────
|
|
||||||
// ffplay has no IPC. We track duration from episode metadata and
|
|
||||||
// position via elapsed wall-clock time. Seek requires restarting.
|
|
||||||
|
|
||||||
class FfplayBackend implements AudioBackend {
|
|
||||||
readonly name: BackendName = "ffplay";
|
|
||||||
private proc: ReturnType<typeof Bun.spawn> | null = null;
|
|
||||||
private _playing = false;
|
|
||||||
private _paused = false;
|
|
||||||
private _position = 0;
|
|
||||||
private _duration = 0;
|
|
||||||
private _volume = 100;
|
|
||||||
private _speed = 1;
|
|
||||||
private _url = "";
|
|
||||||
private startTime = 0;
|
|
||||||
private pollTimer: ReturnType<typeof setInterval> | null = null;
|
|
||||||
|
|
||||||
async play(url: string, opts?: PlayOptions): Promise<void> {
|
|
||||||
await this.stop();
|
|
||||||
|
|
||||||
this._url = url;
|
|
||||||
this._volume = Math.round((opts?.volume ?? 1) * 100);
|
|
||||||
this._speed = opts?.speed ?? 1;
|
|
||||||
this._position = opts?.startPosition ?? 0;
|
|
||||||
|
|
||||||
this.spawnProcess();
|
|
||||||
}
|
|
||||||
|
|
||||||
private spawnProcess(): void {
|
|
||||||
const args = [
|
|
||||||
"ffplay",
|
|
||||||
"-nodisp",
|
|
||||||
"-autoexit",
|
|
||||||
"-loglevel",
|
|
||||||
"quiet",
|
|
||||||
"-volume",
|
|
||||||
String(this._volume),
|
|
||||||
];
|
|
||||||
|
|
||||||
if (this._position > 0) {
|
|
||||||
args.push("-ss", String(this._position));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this._speed !== 1) {
|
|
||||||
args.push("-af", `atempo=${this._speed}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
args.push("-i", this._url);
|
|
||||||
|
|
||||||
this.proc = Bun.spawn(args, {
|
|
||||||
stdout: "ignore",
|
|
||||||
stderr: "ignore",
|
|
||||||
stdin: "ignore",
|
|
||||||
});
|
|
||||||
|
|
||||||
this._playing = true;
|
|
||||||
this._paused = false;
|
|
||||||
this.startTime = Date.now();
|
|
||||||
this.startPolling();
|
|
||||||
|
|
||||||
this.proc.exited
|
|
||||||
.then(() => {
|
|
||||||
this._playing = false;
|
|
||||||
this.stopPolling();
|
|
||||||
})
|
|
||||||
.catch(() => {});
|
|
||||||
}
|
|
||||||
|
|
||||||
private startPolling(): void {
|
|
||||||
this.stopPolling();
|
|
||||||
this.pollTimer = setInterval(() => {
|
|
||||||
if (!this._playing) return;
|
|
||||||
const elapsed = ((Date.now() - this.startTime) / 1000) * this._speed;
|
|
||||||
this._position = this._position + elapsed;
|
|
||||||
this.startTime = Date.now();
|
|
||||||
}, 500);
|
|
||||||
}
|
|
||||||
|
|
||||||
private stopPolling(): void {
|
|
||||||
if (this.pollTimer) {
|
|
||||||
clearInterval(this.pollTimer);
|
|
||||||
this.pollTimer = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async pause(): Promise<void> {
|
|
||||||
if (this.proc) {
|
|
||||||
const pid = (this.proc as unknown as { pid?: number } | null)?.pid;
|
|
||||||
try {
|
|
||||||
if (pid) process.kill(pid, "SIGSTOP");
|
|
||||||
} catch {}
|
|
||||||
this._paused = true;
|
|
||||||
}
|
|
||||||
this._playing = false;
|
|
||||||
this.stopPolling();
|
|
||||||
}
|
|
||||||
|
|
||||||
async resume(): Promise<void> {
|
|
||||||
if (!this._url) return;
|
|
||||||
if (this.proc && this._paused) {
|
|
||||||
const pid = (this.proc as unknown as { pid?: number } | null)?.pid;
|
|
||||||
try {
|
|
||||||
if (pid) process.kill(pid, "SIGCONT");
|
|
||||||
} catch {}
|
|
||||||
this._paused = false;
|
|
||||||
this._playing = true;
|
|
||||||
this.startTime = Date.now();
|
|
||||||
this.startPolling();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.spawnProcess();
|
|
||||||
}
|
|
||||||
|
|
||||||
async stop(): Promise<void> {
|
|
||||||
this.stopPolling();
|
|
||||||
if (this.proc) {
|
|
||||||
try {
|
|
||||||
this.proc.kill();
|
|
||||||
} catch {}
|
|
||||||
this.proc = null;
|
|
||||||
}
|
|
||||||
this._playing = false;
|
|
||||||
this._paused = false;
|
|
||||||
this._position = 0;
|
|
||||||
this._url = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
async seek(seconds: number): Promise<void> {
|
|
||||||
this._position = seconds;
|
|
||||||
if (this._playing && this._url) {
|
|
||||||
// Restart at new position
|
|
||||||
if (this.proc) {
|
|
||||||
try {
|
|
||||||
this.proc.kill();
|
|
||||||
} catch {}
|
|
||||||
this.proc = null;
|
|
||||||
}
|
|
||||||
this.spawnProcess();
|
|
||||||
const pid = (this.proc as unknown as { pid?: number } | null)?.pid;
|
|
||||||
if (this._paused && pid) {
|
|
||||||
try {
|
|
||||||
process.kill(pid, "SIGSTOP");
|
|
||||||
} catch {}
|
|
||||||
this._playing = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async setVolume(volume: number): Promise<void> {
|
|
||||||
this._volume = Math.round(volume * 100);
|
|
||||||
// ffplay has no runtime IPC; volume will apply on next play/resume.
|
|
||||||
// Restart the process to apply immediately if currently playing.
|
|
||||||
if (this._url && (this._playing || this._paused)) {
|
|
||||||
this.stopPolling();
|
|
||||||
if (this.proc) {
|
|
||||||
try {
|
|
||||||
this.proc.kill();
|
|
||||||
} catch {}
|
|
||||||
this.proc = null;
|
|
||||||
}
|
|
||||||
this.spawnProcess();
|
|
||||||
const pid = (this.proc as unknown as { pid?: number } | null)?.pid;
|
|
||||||
if (this._paused && pid) {
|
|
||||||
try {
|
|
||||||
process.kill(pid, "SIGSTOP");
|
|
||||||
} catch {}
|
|
||||||
this._playing = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async setSpeed(speed: number): Promise<void> {
|
|
||||||
this._speed = speed;
|
|
||||||
if (this._url && (this._playing || this._paused)) {
|
|
||||||
this.stopPolling();
|
|
||||||
if (this.proc) {
|
|
||||||
try {
|
|
||||||
this.proc.kill();
|
|
||||||
} catch {}
|
|
||||||
this.proc = null;
|
|
||||||
}
|
|
||||||
this.spawnProcess();
|
|
||||||
const pid = (this.proc as unknown as { pid?: number } | null)?.pid;
|
|
||||||
if (this._paused && pid) {
|
|
||||||
try {
|
|
||||||
process.kill(pid, "SIGSTOP");
|
|
||||||
} catch {}
|
|
||||||
this._playing = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async getPosition(): Promise<number> {
|
|
||||||
return this._position;
|
|
||||||
}
|
|
||||||
|
|
||||||
async getDuration(): Promise<number> {
|
|
||||||
return this._duration;
|
|
||||||
}
|
|
||||||
|
|
||||||
isPlaying(): boolean {
|
|
||||||
return this._playing;
|
|
||||||
}
|
|
||||||
|
|
||||||
dispose(): void {
|
|
||||||
this.stop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── afplay Backend (macOS) ───────────────────────────────────────────
|
|
||||||
// Built-in on macOS. Supports volume and rate but no seek or position.
|
|
||||||
|
|
||||||
class AfplayBackend implements AudioBackend {
|
|
||||||
readonly name: BackendName = "afplay";
|
|
||||||
private proc: ReturnType<typeof Bun.spawn> | null = null;
|
|
||||||
private _playing = false;
|
|
||||||
private _paused = false;
|
|
||||||
private _position = 0;
|
|
||||||
private _duration = 0;
|
|
||||||
private _volume = 1;
|
|
||||||
private _speed = 1;
|
|
||||||
private _url = "";
|
|
||||||
private startTime = 0;
|
|
||||||
private pollTimer: ReturnType<typeof setInterval> | null = null;
|
|
||||||
|
|
||||||
async play(url: string, opts?: PlayOptions): Promise<void> {
|
|
||||||
await this.stop();
|
|
||||||
|
|
||||||
this._url = url;
|
|
||||||
this._volume = opts?.volume ?? 1;
|
|
||||||
this._speed = opts?.speed ?? 1;
|
|
||||||
this._position = opts?.startPosition ?? 0;
|
|
||||||
|
|
||||||
this.spawnProcess();
|
|
||||||
}
|
|
||||||
|
|
||||||
private spawnProcess(): void {
|
|
||||||
// afplay supports --volume (0-1) and --rate
|
|
||||||
const args = [
|
|
||||||
"afplay",
|
|
||||||
"--volume",
|
|
||||||
String(this._volume),
|
|
||||||
"--rate",
|
|
||||||
String(this._speed),
|
|
||||||
];
|
|
||||||
|
|
||||||
if (this._position > 0) {
|
|
||||||
args.push(
|
|
||||||
"--time",
|
|
||||||
String(this._duration > 0 ? this._duration - this._position : 0),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
args.push(this._url);
|
|
||||||
|
|
||||||
this.proc = Bun.spawn(args, {
|
|
||||||
stdout: "ignore",
|
|
||||||
stderr: "ignore",
|
|
||||||
stdin: "ignore",
|
|
||||||
});
|
|
||||||
|
|
||||||
this._playing = true;
|
|
||||||
this._paused = false;
|
|
||||||
this.startTime = Date.now();
|
|
||||||
this.startPolling();
|
|
||||||
|
|
||||||
this.proc.exited
|
|
||||||
.then(() => {
|
|
||||||
this._playing = false;
|
|
||||||
this.stopPolling();
|
|
||||||
})
|
|
||||||
.catch(() => {});
|
|
||||||
}
|
|
||||||
|
|
||||||
private startPolling(): void {
|
|
||||||
this.stopPolling();
|
|
||||||
this.pollTimer = setInterval(() => {
|
|
||||||
if (!this._playing) return;
|
|
||||||
const elapsed = ((Date.now() - this.startTime) / 1000) * this._speed;
|
|
||||||
this._position = this._position + elapsed;
|
|
||||||
this.startTime = Date.now();
|
|
||||||
}, 500);
|
|
||||||
}
|
|
||||||
|
|
||||||
private stopPolling(): void {
|
|
||||||
if (this.pollTimer) {
|
|
||||||
clearInterval(this.pollTimer);
|
|
||||||
this.pollTimer = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async pause(): Promise<void> {
|
|
||||||
if (this.proc) {
|
|
||||||
const pid = (this.proc as unknown as { pid?: number } | null)?.pid;
|
|
||||||
try {
|
|
||||||
if (pid) process.kill(pid, "SIGSTOP");
|
|
||||||
} catch {}
|
|
||||||
this._paused = true;
|
|
||||||
}
|
|
||||||
this._playing = false;
|
|
||||||
this.stopPolling();
|
|
||||||
}
|
|
||||||
|
|
||||||
async resume(): Promise<void> {
|
|
||||||
if (!this._url) return;
|
|
||||||
if (this.proc && this._paused) {
|
|
||||||
const pid = (this.proc as unknown as { pid?: number } | null)?.pid;
|
|
||||||
try {
|
|
||||||
if (pid) process.kill(pid, "SIGCONT");
|
|
||||||
} catch {}
|
|
||||||
this._paused = false;
|
|
||||||
this._playing = true;
|
|
||||||
this.startTime = Date.now();
|
|
||||||
this.startPolling();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.spawnProcess();
|
|
||||||
}
|
|
||||||
|
|
||||||
async stop(): Promise<void> {
|
|
||||||
this.stopPolling();
|
|
||||||
if (this.proc) {
|
|
||||||
try {
|
|
||||||
this.proc.kill();
|
|
||||||
} catch {}
|
|
||||||
this.proc = null;
|
|
||||||
}
|
|
||||||
this._playing = false;
|
|
||||||
this._paused = false;
|
|
||||||
this._position = 0;
|
|
||||||
this._url = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
async seek(seconds: number): Promise<void> {
|
|
||||||
this._position = seconds;
|
|
||||||
if (this._playing && this._url) {
|
|
||||||
if (this.proc) {
|
|
||||||
try {
|
|
||||||
this.proc.kill();
|
|
||||||
} catch {}
|
|
||||||
this.proc = null;
|
|
||||||
}
|
|
||||||
this.spawnProcess();
|
|
||||||
const pid = (this.proc as unknown as { pid?: number } | null)?.pid;
|
|
||||||
if (this._paused && pid) {
|
|
||||||
try {
|
|
||||||
process.kill(pid, "SIGSTOP");
|
|
||||||
} catch {}
|
|
||||||
this._playing = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async setVolume(volume: number): Promise<void> {
|
|
||||||
this._volume = volume;
|
|
||||||
// Restart the process with new volume to apply immediately
|
|
||||||
if (this._url && (this._playing || this._paused)) {
|
|
||||||
this.stopPolling();
|
|
||||||
if (this.proc) {
|
|
||||||
try {
|
|
||||||
this.proc.kill();
|
|
||||||
} catch {}
|
|
||||||
this.proc = null;
|
|
||||||
}
|
|
||||||
this.spawnProcess();
|
|
||||||
const pid = (this.proc as unknown as { pid?: number } | null)?.pid;
|
|
||||||
if (this._paused && pid) {
|
|
||||||
try {
|
|
||||||
process.kill(pid, "SIGSTOP");
|
|
||||||
} catch {}
|
|
||||||
this._playing = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async setSpeed(speed: number): Promise<void> {
|
|
||||||
this._speed = speed;
|
|
||||||
// Restart the process with new rate to apply immediately
|
|
||||||
if (this._url && (this._playing || this._paused)) {
|
|
||||||
this.stopPolling();
|
|
||||||
if (this.proc) {
|
|
||||||
try {
|
|
||||||
this.proc.kill();
|
|
||||||
} catch {}
|
|
||||||
this.proc = null;
|
|
||||||
}
|
|
||||||
this.spawnProcess();
|
|
||||||
const pid = (this.proc as unknown as { pid?: number } | null)?.pid;
|
|
||||||
if (this._paused && pid) {
|
|
||||||
try {
|
|
||||||
process.kill(pid, "SIGSTOP");
|
|
||||||
} catch {}
|
|
||||||
this._playing = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async getPosition(): Promise<number> {
|
|
||||||
return this._position;
|
|
||||||
}
|
|
||||||
|
|
||||||
async getDuration(): Promise<number> {
|
|
||||||
return this._duration;
|
|
||||||
}
|
|
||||||
|
|
||||||
isPlaying(): boolean {
|
|
||||||
return this._playing;
|
|
||||||
}
|
|
||||||
|
|
||||||
dispose(): void {
|
|
||||||
this.stop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── System Backend (open/xdg-open) ───────────────────────────────────
|
|
||||||
// Fire-and-forget. Opens the URL in the default handler. No control.
|
|
||||||
|
|
||||||
class SystemBackend implements AudioBackend {
|
|
||||||
readonly name: BackendName = "system";
|
|
||||||
private _playing = false;
|
|
||||||
|
|
||||||
async play(url: string): Promise<void> {
|
|
||||||
const os = platform();
|
|
||||||
const cmd =
|
|
||||||
os === "darwin" ? "open" : os === "win32" ? "start" : "xdg-open";
|
|
||||||
|
|
||||||
Bun.spawn([cmd, url], {
|
|
||||||
stdout: "ignore",
|
|
||||||
stderr: "ignore",
|
|
||||||
stdin: "ignore",
|
|
||||||
});
|
|
||||||
|
|
||||||
this._playing = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
async pause(): Promise<void> {
|
|
||||||
this._playing = false;
|
|
||||||
}
|
|
||||||
async resume(): Promise<void> {
|
|
||||||
this._playing = true;
|
|
||||||
}
|
|
||||||
async stop(): Promise<void> {
|
|
||||||
this._playing = false;
|
|
||||||
}
|
|
||||||
async seek(): Promise<void> {}
|
|
||||||
async setVolume(): Promise<void> {}
|
|
||||||
async setSpeed(): Promise<void> {}
|
|
||||||
async getPosition(): Promise<number> {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
async getDuration(): Promise<number> {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
isPlaying(): boolean {
|
|
||||||
return this._playing;
|
|
||||||
}
|
|
||||||
dispose(): void {
|
|
||||||
this._playing = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── No-op Backend ────────────────────────────────────────────────────
|
// ── No-op Backend ────────────────────────────────────────────────────
|
||||||
|
|
||||||
class NoopBackend implements AudioBackend {
|
class NoopBackend implements AudioBackend {
|
||||||
@@ -896,53 +432,6 @@ export function detectPlayers(): DetectedPlayer[] {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const ffplayPath = which("ffplay");
|
|
||||||
if (ffplayPath) {
|
|
||||||
players.push({
|
|
||||||
name: "ffplay",
|
|
||||||
path: ffplayPath,
|
|
||||||
capabilities: {
|
|
||||||
seek: true,
|
|
||||||
volume: true,
|
|
||||||
speed: false,
|
|
||||||
positionTracking: false,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const os = platform();
|
|
||||||
if (os === "darwin") {
|
|
||||||
const afplayPath = which("afplay");
|
|
||||||
if (afplayPath) {
|
|
||||||
players.push({
|
|
||||||
name: "afplay",
|
|
||||||
path: afplayPath,
|
|
||||||
capabilities: {
|
|
||||||
seek: true,
|
|
||||||
volume: true,
|
|
||||||
speed: true,
|
|
||||||
positionTracking: false,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// System open is always available as fallback
|
|
||||||
const openCmd =
|
|
||||||
os === "darwin" ? "open" : os === "win32" ? "start" : "xdg-open";
|
|
||||||
if (which(openCmd)) {
|
|
||||||
players.push({
|
|
||||||
name: "system",
|
|
||||||
path: which(openCmd),
|
|
||||||
capabilities: {
|
|
||||||
seek: false,
|
|
||||||
volume: false,
|
|
||||||
speed: false,
|
|
||||||
positionTracking: false,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return players;
|
return players;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -953,14 +442,7 @@ export function createAudioBackend(preferred?: BackendName): AudioBackend {
|
|||||||
// An explicit `preferred` argument still wins.
|
// An explicit `preferred` argument still wins.
|
||||||
if (!preferred) {
|
if (!preferred) {
|
||||||
const envPref = process.env.PODTUI_AUDIO_BACKEND as BackendName | undefined;
|
const envPref = process.env.PODTUI_AUDIO_BACKEND as BackendName | undefined;
|
||||||
if (
|
if (envPref && (envPref === "mpv" || envPref === "none")) {
|
||||||
envPref &&
|
|
||||||
(envPref === "mpv" ||
|
|
||||||
envPref === "ffplay" ||
|
|
||||||
envPref === "afplay" ||
|
|
||||||
envPref === "system" ||
|
|
||||||
envPref === "none")
|
|
||||||
) {
|
|
||||||
preferred = envPref;
|
preferred = envPref;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -970,25 +452,13 @@ export function createAudioBackend(preferred?: BackendName): AudioBackend {
|
|||||||
if (backend) return backend;
|
if (backend) return backend;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Auto-detect in priority order
|
return which("mpv") ? new MpvBackend() : new NoopBackend();
|
||||||
const players = detectPlayers();
|
|
||||||
if (players.length === 0) return new NoopBackend();
|
|
||||||
|
|
||||||
return createBackendByName(players[0].name) ?? new NoopBackend();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function createBackendByName(name: BackendName): AudioBackend | null {
|
function createBackendByName(name: BackendName): AudioBackend | null {
|
||||||
switch (name) {
|
switch (name) {
|
||||||
case "mpv":
|
case "mpv":
|
||||||
return which("mpv") ? new MpvBackend() : null;
|
return which("mpv") ? new MpvBackend() : null;
|
||||||
case "ffplay":
|
|
||||||
return which("ffplay") ? new FfplayBackend() : null;
|
|
||||||
case "afplay":
|
|
||||||
return platform() === "darwin" && which("afplay")
|
|
||||||
? new AfplayBackend()
|
|
||||||
: null;
|
|
||||||
case "system":
|
|
||||||
return new SystemBackend();
|
|
||||||
case "none":
|
case "none":
|
||||||
return new NoopBackend();
|
return new NoopBackend();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,18 +11,18 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/** PCM output format constants */
|
/** PCM output format constants */
|
||||||
const SAMPLE_RATE = 44100
|
const SAMPLE_RATE = 44100;
|
||||||
const CHANNELS = 1
|
const CHANNELS = 1;
|
||||||
const BYTES_PER_SAMPLE = 2 // s16le
|
const BYTES_PER_SAMPLE = 2; // s16le
|
||||||
|
|
||||||
/** How many samples to buffer (~1 second) */
|
/** How many samples to buffer (~1 second) */
|
||||||
const RING_BUFFER_SAMPLES = SAMPLE_RATE
|
const RING_BUFFER_SAMPLES = SAMPLE_RATE;
|
||||||
|
|
||||||
export interface AudioStreamReaderOptions {
|
export interface AudioStreamReaderOptions {
|
||||||
/** Audio URL or file path to decode */
|
/** Audio URL or file path to decode */
|
||||||
url: string
|
url: string;
|
||||||
/** Sample rate (default: 44100) */
|
/** Sample rate (default: 44100) */
|
||||||
sampleRate?: number
|
sampleRate?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -30,202 +30,232 @@ export interface AudioStreamReaderOptions {
|
|||||||
* Each start() increments this; the read loop checks it to know
|
* Each start() increments this; the read loop checks it to know
|
||||||
* if it's been superseded and should bail out.
|
* if it's been superseded and should bail out.
|
||||||
*/
|
*/
|
||||||
let globalGeneration = 0
|
let globalGeneration = 0;
|
||||||
|
|
||||||
export class AudioStreamReader {
|
export class AudioStreamReader {
|
||||||
private proc: ReturnType<typeof Bun.spawn> | null = null
|
private proc: ReturnType<typeof Bun.spawn> | null = null;
|
||||||
private ringBuffer: Float64Array
|
private ringBuffer: Float64Array;
|
||||||
private writePos = 0
|
private writePos = 0;
|
||||||
private totalSamplesWritten = 0
|
private totalSamplesWritten = 0;
|
||||||
private _running = false
|
private _running = false;
|
||||||
private generation = 0
|
private generation = 0;
|
||||||
readonly url: string
|
readonly url: string;
|
||||||
private sampleRate: number
|
private sampleRate: number;
|
||||||
|
|
||||||
constructor(options: AudioStreamReaderOptions) {
|
constructor(options: AudioStreamReaderOptions) {
|
||||||
this.url = options.url
|
this.url = options.url;
|
||||||
this.sampleRate = options.sampleRate ?? SAMPLE_RATE
|
this.sampleRate = options.sampleRate ?? SAMPLE_RATE;
|
||||||
this.ringBuffer = new Float64Array(RING_BUFFER_SAMPLES)
|
this.ringBuffer = new Float64Array(RING_BUFFER_SAMPLES);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Whether the reader is actively reading samples. */
|
/** Whether the reader is actively reading samples. */
|
||||||
get running(): boolean {
|
get running(): boolean {
|
||||||
return this._running
|
return this._running;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Total number of samples written since start(). */
|
/** Total number of samples written since start(). */
|
||||||
get samplesWritten(): number {
|
get samplesWritten(): number {
|
||||||
return this.totalSamplesWritten
|
return this.totalSamplesWritten;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Start the ffmpeg decode process and begin reading PCM data.
|
* Start the ffmpeg decode process and begin reading PCM data.
|
||||||
*
|
*
|
||||||
* If already running, the previous process is killed first.
|
* If already running, the previous process is killed first.
|
||||||
* Uses a generation counter to guarantee that only one read loop
|
* Uses a generation counter to guarantee that only one read loop
|
||||||
* is ever active — stale loops from killed processes bail out
|
* is ever active — stale loops from killed processes bail out
|
||||||
* immediately.
|
* immediately.
|
||||||
*
|
*
|
||||||
* @param startPosition Seek position in seconds (default: 0).
|
* @param startPosition Seek position in seconds (default: 0).
|
||||||
* @param speed Playback speed multiplier (default: 1). Applies ffmpeg
|
* @param speed Playback speed multiplier (default: 1). Applies ffmpeg
|
||||||
* atempo filter so visualization stays in sync with audio.
|
* atempo filter so visualization stays in sync with audio.
|
||||||
*/
|
*/
|
||||||
start(startPosition = 0, speed = 1): void {
|
start(startPosition = 0, speed = 1): void {
|
||||||
// Always kill the previous process first — no early return on _running
|
// Always kill the previous process first — no early return on _running
|
||||||
this.killProcess()
|
this.killProcess();
|
||||||
|
|
||||||
if (!Bun.which("ffmpeg")) {
|
if (!Bun.which("ffmpeg")) {
|
||||||
throw new Error("ffmpeg not found — required for audio visualization")
|
throw new Error("ffmpeg not found — required for audio visualization");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Increment generation so any lingering read loop from a previous
|
// Increment generation so any lingering read loop from a previous
|
||||||
// start() will see a mismatch and exit.
|
// start() will see a mismatch and exit.
|
||||||
this.generation = ++globalGeneration
|
this.generation = ++globalGeneration;
|
||||||
|
|
||||||
const args = [
|
const args = [
|
||||||
"ffmpeg",
|
"ffmpeg",
|
||||||
"-loglevel", "quiet",
|
"-loglevel",
|
||||||
"-reconnect", "1",
|
"quiet",
|
||||||
"-reconnect_streamed", "1",
|
// Read input at native frame rate so decoded PCM stays in sync with
|
||||||
"-reconnect_delay_max", "5",
|
// real-time playback. Without -re, ffmpeg greedily decodes the whole
|
||||||
]
|
// file as fast as possible: the ring buffer fills with audio seconds
|
||||||
|
// ahead of the player (laggy bars), then the process exits when it
|
||||||
|
// hits EOF (bars freeze ~10s in).
|
||||||
|
"-re",
|
||||||
|
"-reconnect",
|
||||||
|
"1",
|
||||||
|
"-reconnect_streamed",
|
||||||
|
"1",
|
||||||
|
"-reconnect_delay_max",
|
||||||
|
"5",
|
||||||
|
];
|
||||||
|
|
||||||
// Seek before input for network efficiency
|
// Seek before input for network efficiency
|
||||||
if (startPosition > 0) {
|
if (startPosition > 0) {
|
||||||
args.push("-ss", String(startPosition))
|
args.push("-ss", String(startPosition));
|
||||||
}
|
}
|
||||||
|
|
||||||
args.push("-i", this.url)
|
args.push("-i", this.url);
|
||||||
|
|
||||||
// Apply speed via atempo filter if not 1x.
|
// Apply speed via atempo filter if not 1x.
|
||||||
// ffmpeg atempo only supports 0.5–100.0; chain multiple for extremes.
|
// ffmpeg atempo only supports 0.5–100.0; chain multiple for extremes.
|
||||||
if (speed !== 1 && speed > 0) {
|
if (speed !== 1 && speed > 0) {
|
||||||
args.push("-af", buildAtempoChain(speed))
|
args.push("-af", buildAtempoChain(speed));
|
||||||
}
|
}
|
||||||
|
|
||||||
args.push(
|
args.push(
|
||||||
"-ac", String(CHANNELS),
|
"-ac",
|
||||||
"-ar", String(this.sampleRate),
|
String(CHANNELS),
|
||||||
"-f", "s16le",
|
"-ar",
|
||||||
"-acodec", "pcm_s16le",
|
String(this.sampleRate),
|
||||||
"-",
|
"-f",
|
||||||
)
|
"s16le",
|
||||||
|
"-acodec",
|
||||||
|
"pcm_s16le",
|
||||||
|
"-",
|
||||||
|
);
|
||||||
|
|
||||||
this.proc = Bun.spawn(args, {
|
this.proc = Bun.spawn(args, {
|
||||||
stdout: "pipe",
|
stdout: "pipe",
|
||||||
stderr: "ignore",
|
stderr: "ignore",
|
||||||
stdin: "ignore",
|
stdin: "ignore",
|
||||||
})
|
});
|
||||||
|
|
||||||
this._running = true
|
this._running = true;
|
||||||
this.writePos = 0
|
this.writePos = 0;
|
||||||
this.totalSamplesWritten = 0
|
this.totalSamplesWritten = 0;
|
||||||
|
|
||||||
// Capture generation for this run
|
// Capture generation for this run
|
||||||
const myGeneration = this.generation
|
const myGeneration = this.generation;
|
||||||
|
|
||||||
// Start async reading loop
|
// Start async reading loop
|
||||||
this.readLoop(myGeneration)
|
this.readLoop(myGeneration);
|
||||||
|
|
||||||
// Detect process exit
|
// Detect process exit
|
||||||
this.proc.exited.then(() => {
|
this.proc.exited
|
||||||
// Only clear _running if this is still the current generation
|
.then(() => {
|
||||||
if (this.generation === myGeneration) {
|
// Only clear _running if this is still the current generation
|
||||||
this._running = false
|
if (this.generation === myGeneration) {
|
||||||
}
|
this._running = false;
|
||||||
}).catch(() => {
|
}
|
||||||
if (this.generation === myGeneration) {
|
})
|
||||||
this._running = false
|
.catch(() => {
|
||||||
}
|
if (this.generation === myGeneration) {
|
||||||
})
|
this._running = false;
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read available samples into the provided buffer.
|
* Read available samples into the provided buffer.
|
||||||
* Returns the number of samples actually copied.
|
* Returns the number of samples actually copied.
|
||||||
*
|
*
|
||||||
* @param out - Float64Array to fill with samples (scaled ~+/-32768 for cavacore).
|
* @param out - Float64Array to fill with samples (scaled ~+/-32768 for cavacore).
|
||||||
* @returns Number of samples written to `out`.
|
* @returns Number of samples written to `out`.
|
||||||
*/
|
*/
|
||||||
read(out: Float64Array): number {
|
read(out: Float64Array): number {
|
||||||
const available = Math.min(out.length, this.totalSamplesWritten, this.ringBuffer.length)
|
const available = Math.min(
|
||||||
if (available <= 0) return 0
|
out.length,
|
||||||
|
this.totalSamplesWritten,
|
||||||
|
this.ringBuffer.length,
|
||||||
|
);
|
||||||
|
if (available <= 0) return 0;
|
||||||
|
|
||||||
// Read the most recent `available` samples from the ring buffer
|
// Read the most recent `available` samples from the ring buffer
|
||||||
const readStart = (this.writePos - available + this.ringBuffer.length) % this.ringBuffer.length
|
const readStart =
|
||||||
|
(this.writePos - available + this.ringBuffer.length) %
|
||||||
|
this.ringBuffer.length;
|
||||||
|
|
||||||
if (readStart + available <= this.ringBuffer.length) {
|
if (readStart + available <= this.ringBuffer.length) {
|
||||||
out.set(this.ringBuffer.subarray(readStart, readStart + available))
|
out.set(this.ringBuffer.subarray(readStart, readStart + available));
|
||||||
} else {
|
} else {
|
||||||
const firstChunk = this.ringBuffer.length - readStart
|
const firstChunk = this.ringBuffer.length - readStart;
|
||||||
out.set(this.ringBuffer.subarray(readStart, this.ringBuffer.length))
|
out.set(this.ringBuffer.subarray(readStart, this.ringBuffer.length));
|
||||||
out.set(this.ringBuffer.subarray(0, available - firstChunk), firstChunk)
|
out.set(this.ringBuffer.subarray(0, available - firstChunk), firstChunk);
|
||||||
}
|
}
|
||||||
|
|
||||||
return available
|
return available;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Stop the ffmpeg process and clean up.
|
* Stop the ffmpeg process and clean up.
|
||||||
* Safe to call multiple times. Guarantees the read loop exits.
|
* Safe to call multiple times. Guarantees the read loop exits.
|
||||||
*/
|
*/
|
||||||
stop(): void {
|
stop(): void {
|
||||||
// Bump generation to invalidate any running read loop
|
// Bump generation to invalidate any running read loop
|
||||||
this.generation = ++globalGeneration
|
this.generation = ++globalGeneration;
|
||||||
this._running = false
|
this._running = false;
|
||||||
this.killProcess()
|
this.killProcess();
|
||||||
this.writePos = 0
|
this.writePos = 0;
|
||||||
this.totalSamplesWritten = 0
|
this.totalSamplesWritten = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Restart the reader at a new position and/or speed.
|
* Restart the reader at a new position and/or speed.
|
||||||
*/
|
*/
|
||||||
restart(startPosition = 0, speed = 1): void {
|
restart(startPosition = 0, speed = 1): void {
|
||||||
this.start(startPosition, speed)
|
this.start(startPosition, speed);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Kill the ffmpeg process without touching generation/state. */
|
/** Kill the ffmpeg process without touching generation/state. */
|
||||||
private killProcess(): void {
|
private killProcess(): void {
|
||||||
if (this.proc) {
|
if (this.proc) {
|
||||||
try { this.proc.kill() } catch { /* ignore */ }
|
try {
|
||||||
this.proc = null
|
this.proc.kill();
|
||||||
}
|
} catch {
|
||||||
}
|
/* ignore */
|
||||||
|
}
|
||||||
|
this.proc = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** Internal: continuously reads stdout from ffmpeg and fills the ring buffer. */
|
/** Internal: continuously reads stdout from ffmpeg and fills the ring buffer. */
|
||||||
private async readLoop(myGeneration: number): Promise<void> {
|
private async readLoop(myGeneration: number): Promise<void> {
|
||||||
const stdout = this.proc?.stdout
|
const stdout = this.proc?.stdout;
|
||||||
if (!stdout || typeof stdout === "number") return
|
if (!stdout || typeof stdout === "number") return;
|
||||||
|
|
||||||
const reader = (stdout as ReadableStream<Uint8Array>).getReader()
|
const reader = (stdout as ReadableStream<Uint8Array>).getReader();
|
||||||
try {
|
try {
|
||||||
while (this.generation === myGeneration) {
|
while (this.generation === myGeneration) {
|
||||||
const { done, value } = await reader.read()
|
const { done, value } = await reader.read();
|
||||||
if (done || this.generation !== myGeneration) break
|
if (done || this.generation !== myGeneration) break;
|
||||||
if (!value || value.byteLength === 0) continue
|
if (!value || value.byteLength === 0) continue;
|
||||||
|
|
||||||
const sampleCount = Math.floor(value.byteLength / BYTES_PER_SAMPLE)
|
const sampleCount = Math.floor(value.byteLength / BYTES_PER_SAMPLE);
|
||||||
if (sampleCount === 0) continue
|
if (sampleCount === 0) continue;
|
||||||
|
|
||||||
const int16View = new Int16Array(
|
const int16View = new Int16Array(
|
||||||
value.buffer,
|
value.buffer,
|
||||||
value.byteOffset,
|
value.byteOffset,
|
||||||
sampleCount,
|
sampleCount,
|
||||||
)
|
);
|
||||||
|
|
||||||
for (let i = 0; i < sampleCount; i++) {
|
for (let i = 0; i < sampleCount; i++) {
|
||||||
this.ringBuffer[this.writePos] = int16View[i]
|
this.ringBuffer[this.writePos] = int16View[i];
|
||||||
this.writePos = (this.writePos + 1) % this.ringBuffer.length
|
this.writePos = (this.writePos + 1) % this.ringBuffer.length;
|
||||||
this.totalSamplesWritten++
|
this.totalSamplesWritten++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
// Stream ended or process killed — expected during stop()
|
// Stream ended or process killed — expected during stop()
|
||||||
} finally {
|
} finally {
|
||||||
try { reader.releaseLock() } catch { /* ignore */ }
|
try {
|
||||||
}
|
reader.releaseLock();
|
||||||
}
|
} catch {
|
||||||
|
/* ignore */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -234,18 +264,18 @@ export class AudioStreamReader {
|
|||||||
* multiple filters for extreme values (e.g. 0.25 = atempo=0.5,atempo=0.5).
|
* multiple filters for extreme values (e.g. 0.25 = atempo=0.5,atempo=0.5).
|
||||||
*/
|
*/
|
||||||
function buildAtempoChain(speed: number): string {
|
function buildAtempoChain(speed: number): string {
|
||||||
const parts: string[] = []
|
const parts: string[] = [];
|
||||||
let remaining = Math.max(0.25, Math.min(4, speed))
|
let remaining = Math.max(0.25, Math.min(4, speed));
|
||||||
|
|
||||||
while (remaining > 100) {
|
while (remaining > 100) {
|
||||||
parts.push("atempo=100.0")
|
parts.push("atempo=100.0");
|
||||||
remaining /= 100
|
remaining /= 100;
|
||||||
}
|
}
|
||||||
while (remaining < 0.5) {
|
while (remaining < 0.5) {
|
||||||
parts.push("atempo=0.5")
|
parts.push("atempo=0.5");
|
||||||
remaining /= 0.5
|
remaining /= 0.5;
|
||||||
}
|
}
|
||||||
parts.push(`atempo=${remaining}`)
|
parts.push(`atempo=${remaining}`);
|
||||||
|
|
||||||
return parts.join(",")
|
return parts.join(",");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,170 +16,178 @@
|
|||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { dlopen, FFIType, ptr } from "bun:ffi"
|
import { dlopen, FFIType, ptr } from "bun:ffi";
|
||||||
import { existsSync } from "fs"
|
import { existsSync } from "fs";
|
||||||
import { join, dirname } from "path"
|
import { join, dirname } from "path";
|
||||||
|
|
||||||
// ── Types ────────────────────────────────────────────────────────────
|
// ── Types ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
export interface CavaCoreConfig {
|
export interface CavaCoreConfig {
|
||||||
/** Number of frequency bars (default: 32) */
|
/** Number of frequency bars (default: 32) */
|
||||||
bars?: number
|
bars?: number;
|
||||||
/** Audio sample rate in Hz (default: 44100) */
|
/** Audio sample rate in Hz (default: 44100) */
|
||||||
sampleRate?: number
|
sampleRate?: number;
|
||||||
/** Number of audio channels (default: 1 = mono) */
|
/** Number of audio channels (default: 1 = mono) */
|
||||||
channels?: number
|
channels?: number;
|
||||||
/** Automatic sensitivity: 1 = enabled, 0 = disabled (default: 1) */
|
/** Automatic sensitivity: 1 = enabled, 0 = disabled (default: 1) */
|
||||||
autosens?: number
|
autosens?: number;
|
||||||
/** Noise reduction factor 0.0–1.0 (default: 0.77) */
|
/** Noise reduction factor 0.0–1.0 (default: 0.77) */
|
||||||
noiseReduction?: number
|
noiseReduction?: number;
|
||||||
/** Low frequency cutoff in Hz (default: 50) */
|
/** Low frequency cutoff in Hz (default: 50) */
|
||||||
lowCutOff?: number
|
lowCutOff?: number;
|
||||||
/** High frequency cutoff in Hz (default: 10000) */
|
/** High frequency cutoff in Hz (default: 10000) */
|
||||||
highCutOff?: number
|
highCutOff?: number;
|
||||||
|
/** Output scaling mode: 0 = linear (default), 1 = decibel */
|
||||||
|
scalingMode?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
const DEFAULTS: Required<CavaCoreConfig> = {
|
const DEFAULTS: Required<CavaCoreConfig> = {
|
||||||
bars: 32,
|
bars: 32,
|
||||||
sampleRate: 44100,
|
sampleRate: 44100,
|
||||||
channels: 1,
|
channels: 1,
|
||||||
autosens: 1,
|
autosens: 1,
|
||||||
noiseReduction: 0.77,
|
noiseReduction: 0.77,
|
||||||
lowCutOff: 50,
|
lowCutOff: 50,
|
||||||
highCutOff: 10000,
|
highCutOff: 10000,
|
||||||
}
|
scalingMode: 0,
|
||||||
|
};
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
type CavaLib = { symbols: Record<string, (...args: any[]) => any>; close(): void }
|
type CavaLib = {
|
||||||
|
symbols: Record<string, (...args: any[]) => any>;
|
||||||
|
close(): void;
|
||||||
|
};
|
||||||
|
|
||||||
// ── Library resolution ───────────────────────────────────────────────
|
// ── Library resolution ───────────────────────────────────────────────
|
||||||
|
|
||||||
function findLibrary(): string | null {
|
function findLibrary(): string | null {
|
||||||
const platform = process.platform
|
const platform = process.platform;
|
||||||
const libName = platform === "darwin"
|
const libName =
|
||||||
? "libcavacore.dylib"
|
platform === "darwin"
|
||||||
: platform === "win32"
|
? "libcavacore.dylib"
|
||||||
? "cavacore.dll"
|
: platform === "win32"
|
||||||
: "libcavacore.so"
|
? "cavacore.dll"
|
||||||
|
: "libcavacore.so";
|
||||||
|
|
||||||
// Candidate paths, in priority order:
|
// Candidate paths, in priority order:
|
||||||
// 1. src/native/ (development)
|
// 1. src/native/ (development)
|
||||||
// 2. Same directory as the running executable (dist bundle)
|
// 2. Same directory as the running executable (dist bundle)
|
||||||
// 3. dist/ relative to cwd
|
// 3. dist/ relative to cwd
|
||||||
const candidates = [
|
const candidates = [
|
||||||
join(import.meta.dir, "..", "native", libName),
|
join(import.meta.dir, "..", "native", libName),
|
||||||
join(dirname(process.execPath), libName),
|
join(dirname(process.execPath), libName),
|
||||||
join(process.cwd(), "dist", libName),
|
join(process.cwd(), "dist", libName),
|
||||||
]
|
];
|
||||||
|
|
||||||
for (const candidate of candidates) {
|
for (const candidate of candidates) {
|
||||||
if (existsSync(candidate)) return candidate
|
if (existsSync(candidate)) return candidate;
|
||||||
}
|
}
|
||||||
|
|
||||||
return null
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── CavaCore class ───────────────────────────────────────────────────
|
// ── CavaCore class ───────────────────────────────────────────────────
|
||||||
|
|
||||||
export class CavaCore {
|
export class CavaCore {
|
||||||
private lib: CavaLib
|
private lib: CavaLib;
|
||||||
private plan: ReturnType<CavaLib["symbols"]["cava_init"]> | null = null
|
private plan: ReturnType<CavaLib["symbols"]["cava_init"]> | null = null;
|
||||||
private inputBuffer: Float64Array | null = null
|
private inputBuffer: Float64Array | null = null;
|
||||||
private outputBuffer: Float64Array | null = null
|
private outputBuffer: Float64Array | null = null;
|
||||||
private _bars = 0
|
private _bars = 0;
|
||||||
private _channels = 1
|
private _channels = 1;
|
||||||
private _destroyed = false
|
private _destroyed = false;
|
||||||
|
|
||||||
/** Use loadCavaCore() instead of constructing directly. */
|
/** Use loadCavaCore() instead of constructing directly. */
|
||||||
constructor(lib: CavaLib) {
|
constructor(lib: CavaLib) {
|
||||||
this.lib = lib
|
this.lib = lib;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Number of frequency bars configured. */
|
/** Number of frequency bars configured. */
|
||||||
get bars(): number {
|
get bars(): number {
|
||||||
return this._bars
|
return this._bars;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Whether this instance has been initialized (and not yet destroyed). */
|
/** Whether this instance has been initialized (and not yet destroyed). */
|
||||||
get isReady(): boolean {
|
get isReady(): boolean {
|
||||||
return this.plan !== null && !this._destroyed
|
return this.plan !== null && !this._destroyed;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize the cavacore engine with the given configuration.
|
* Initialize the cavacore engine with the given configuration.
|
||||||
* Must be called before execute(). Can be called again after destroy()
|
* Must be called before execute(). Can be called again after destroy()
|
||||||
* to reinitialize with different parameters.
|
* to reinitialize with different parameters.
|
||||||
*/
|
*/
|
||||||
init(config: CavaCoreConfig = {}): void {
|
init(config: CavaCoreConfig = {}): void {
|
||||||
if (this.plan) {
|
if (this.plan) {
|
||||||
this.destroy()
|
this.destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
const cfg = { ...DEFAULTS, ...config }
|
const cfg = { ...DEFAULTS, ...config };
|
||||||
this._bars = cfg.bars
|
this._bars = cfg.bars;
|
||||||
this._channels = cfg.channels
|
this._channels = cfg.channels;
|
||||||
|
|
||||||
this.plan = this.lib.symbols.cava_init(
|
this.plan = this.lib.symbols.cava_init(
|
||||||
cfg.bars,
|
cfg.bars,
|
||||||
cfg.sampleRate,
|
cfg.sampleRate,
|
||||||
cfg.channels,
|
cfg.channels,
|
||||||
cfg.autosens,
|
cfg.autosens,
|
||||||
cfg.noiseReduction,
|
cfg.noiseReduction,
|
||||||
cfg.lowCutOff,
|
cfg.lowCutOff,
|
||||||
cfg.highCutOff,
|
cfg.highCutOff,
|
||||||
)
|
cfg.scalingMode,
|
||||||
|
);
|
||||||
|
|
||||||
if (!this.plan) {
|
if (!this.plan) {
|
||||||
throw new Error("cava_init returned null — initialization failed")
|
throw new Error("cava_init returned null — initialization failed");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Pre-allocate output buffer (bars * channels)
|
// Pre-allocate output buffer (bars * channels)
|
||||||
this.outputBuffer = new Float64Array(cfg.bars * cfg.channels)
|
this.outputBuffer = new Float64Array(cfg.bars * cfg.channels);
|
||||||
this._destroyed = false
|
this._destroyed = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Feed PCM samples into cavacore and get frequency bar values back.
|
* Feed PCM samples into cavacore and get frequency bar values back.
|
||||||
*
|
*
|
||||||
* @param samples - Float64Array of PCM samples (scaled ~±32768).
|
* @param samples - Float64Array of PCM samples (scaled ~±32768).
|
||||||
* The array length determines the number of samples processed.
|
* The array length determines the number of samples processed.
|
||||||
* @returns Float64Array of bar values (0.0–1.0 range, length = bars * channels).
|
* @returns Float64Array of bar values (0.0–1.0 range, length = bars * channels).
|
||||||
* Returns the same buffer reference each call (overwritten in place).
|
* Returns the same buffer reference each call (overwritten in place).
|
||||||
*/
|
*/
|
||||||
execute(samples: Float64Array): Float64Array {
|
execute(samples: Float64Array): Float64Array {
|
||||||
if (!this.plan || !this.outputBuffer) {
|
if (!this.plan || !this.outputBuffer) {
|
||||||
throw new Error("CavaCore not initialized — call init() first")
|
throw new Error("CavaCore not initialized — call init() first");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reuse input buffer if same size, otherwise allocate new
|
// Reuse input buffer if same size, otherwise allocate new
|
||||||
if (!this.inputBuffer || this.inputBuffer.length !== samples.length) {
|
if (!this.inputBuffer || this.inputBuffer.length !== samples.length) {
|
||||||
this.inputBuffer = new Float64Array(samples.length)
|
this.inputBuffer = new Float64Array(samples.length);
|
||||||
}
|
}
|
||||||
this.inputBuffer.set(samples)
|
this.inputBuffer.set(samples);
|
||||||
|
|
||||||
this.lib.symbols.cava_execute(
|
this.lib.symbols.cava_execute(
|
||||||
ptr(this.inputBuffer),
|
ptr(this.inputBuffer),
|
||||||
samples.length,
|
samples.length,
|
||||||
ptr(this.outputBuffer),
|
ptr(this.outputBuffer),
|
||||||
this.plan,
|
this.plan,
|
||||||
)
|
);
|
||||||
|
|
||||||
return this.outputBuffer
|
return this.outputBuffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Release all native resources. Safe to call multiple times.
|
* Release all native resources. Safe to call multiple times.
|
||||||
* After calling destroy(), init() can be called again to reuse the instance.
|
* After calling destroy(), init() can be called again to reuse the instance.
|
||||||
*/
|
*/
|
||||||
destroy(): void {
|
destroy(): void {
|
||||||
if (this.plan && !this._destroyed) {
|
if (this.plan && !this._destroyed) {
|
||||||
this.lib.symbols.cava_destroy(this.plan)
|
this.lib.symbols.cava_destroy(this.plan);
|
||||||
this.plan = null
|
this.plan = null;
|
||||||
this._destroyed = true
|
this._destroyed = true;
|
||||||
}
|
}
|
||||||
this.inputBuffer = null
|
this.inputBuffer = null;
|
||||||
this.outputBuffer = null
|
this.outputBuffer = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Factory ──────────────────────────────────────────────────────────
|
// ── Factory ──────────────────────────────────────────────────────────
|
||||||
@@ -190,41 +198,42 @@ export class CavaCore {
|
|||||||
* to the static waveform display.
|
* to the static waveform display.
|
||||||
*/
|
*/
|
||||||
export function loadCavaCore(): CavaCore | null {
|
export function loadCavaCore(): CavaCore | null {
|
||||||
try {
|
try {
|
||||||
const libPath = findLibrary()
|
const libPath = findLibrary();
|
||||||
if (!libPath) return null
|
if (!libPath) return null;
|
||||||
|
|
||||||
const lib = dlopen(libPath, {
|
const lib = dlopen(libPath, {
|
||||||
cava_init: {
|
cava_init: {
|
||||||
args: [
|
args: [
|
||||||
FFIType.i32, // bars
|
FFIType.i32, // bars
|
||||||
FFIType.u32, // rate
|
FFIType.u32, // rate
|
||||||
FFIType.i32, // channels
|
FFIType.i32, // channels
|
||||||
FFIType.i32, // autosens
|
FFIType.i32, // autosens
|
||||||
FFIType.double, // noise_reduction
|
FFIType.double, // noise_reduction
|
||||||
FFIType.i32, // low_cut_off
|
FFIType.i32, // low_cut_off
|
||||||
FFIType.i32, // high_cut_off
|
FFIType.i32, // high_cut_off
|
||||||
],
|
FFIType.i32, // scaling_mode
|
||||||
returns: FFIType.ptr,
|
],
|
||||||
},
|
returns: FFIType.ptr,
|
||||||
cava_execute: {
|
},
|
||||||
args: [
|
cava_execute: {
|
||||||
FFIType.ptr, // cava_in (double*)
|
args: [
|
||||||
FFIType.i32, // samples
|
FFIType.ptr, // cava_in (double*)
|
||||||
FFIType.ptr, // cava_out (double*)
|
FFIType.i32, // samples
|
||||||
FFIType.ptr, // plan
|
FFIType.ptr, // cava_out (double*)
|
||||||
],
|
FFIType.ptr, // plan
|
||||||
returns: FFIType.void,
|
],
|
||||||
},
|
returns: FFIType.void,
|
||||||
cava_destroy: {
|
},
|
||||||
args: [FFIType.ptr], // plan
|
cava_destroy: {
|
||||||
returns: FFIType.void,
|
args: [FFIType.ptr], // plan
|
||||||
},
|
returns: FFIType.void,
|
||||||
})
|
},
|
||||||
|
});
|
||||||
|
|
||||||
return new CavaCore(lib as CavaLib)
|
return new CavaCore(lib as CavaLib);
|
||||||
} catch {
|
} catch {
|
||||||
// Library load failed — missing dylib, wrong arch, etc.
|
// Library load failed — missing dylib, wrong arch, etc.
|
||||||
return null
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
*
|
*
|
||||||
* The `q` (quit) action routes through `process.exit(0)`, which bypasses
|
* The `q` (quit) action routes through `process.exit(0)`, which bypasses
|
||||||
* Solid's onCleanup (where useAudio's onCleanup disposes the backend). To
|
* Solid's onCleanup (where useAudio's onCleanup disposes the backend). To
|
||||||
* keep spawned players (mpv/ffplay/afplay) from surviving the host, useAudio
|
* keep spawned players (mpv) from surviving the host, useAudio
|
||||||
* registers a `process.on("exit")` handler that synchronously disposes the
|
* registers a `process.on("exit")` handler that synchronously disposes the
|
||||||
* backend. The exit handler's whole job is "kill the child process", so this
|
* backend. The exit handler's whole job is "kill the child process", so this
|
||||||
* test pins the contract directly: a backend holding a real spawned subprocess
|
* test pins the contract directly: a backend holding a real spawned subprocess
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
*
|
*
|
||||||
* Uses a real `Bun.spawn(["sleep", "60"])` subprocess as a stand-in for the
|
* Uses a real `Bun.spawn(["sleep", "60"])` subprocess as a stand-in for the
|
||||||
* player process, injected into the (private) `proc` slot of an MpvBackend —
|
* player process, injected into the (private) `proc` slot of an MpvBackend —
|
||||||
* mpv/ffplay/afplay all share the identical kill-on-dispose pattern, so
|
* mpv is the only real backend, and it uses the kill-on-dispose
|
||||||
* exercising one is enough to guard the family.
|
* exercising one is enough to guard the family.
|
||||||
*/
|
*/
|
||||||
import { test, expect } from "bun:test";
|
import { test, expect } from "bun:test";
|
||||||
|
|||||||
@@ -2,57 +2,85 @@
|
|||||||
* Smoke test: load libcavacore.dylib via bun:ffi, init → execute → destroy.
|
* Smoke test: load libcavacore.dylib via bun:ffi, init → execute → destroy.
|
||||||
* Run: bun tests/cavacore-smoke.ts
|
* Run: bun tests/cavacore-smoke.ts
|
||||||
*/
|
*/
|
||||||
import { dlopen, FFIType, ptr } from "bun:ffi"
|
import { dlopen, FFIType, ptr } from "bun:ffi";
|
||||||
import { join } from "path"
|
import { join } from "path";
|
||||||
|
|
||||||
const libPath = join(import.meta.dir, "..", "src", "native", "libcavacore.dylib")
|
const libPath = join(
|
||||||
|
import.meta.dir,
|
||||||
|
"..",
|
||||||
|
"src",
|
||||||
|
"native",
|
||||||
|
"libcavacore.dylib",
|
||||||
|
);
|
||||||
|
|
||||||
const lib = dlopen(libPath, {
|
const lib = dlopen(libPath, {
|
||||||
cava_init: {
|
cava_init: {
|
||||||
args: [FFIType.i32, FFIType.u32, FFIType.i32, FFIType.i32, FFIType.double, FFIType.i32, FFIType.i32],
|
args: [
|
||||||
returns: FFIType.ptr,
|
FFIType.i32,
|
||||||
},
|
FFIType.u32,
|
||||||
cava_execute: {
|
FFIType.i32,
|
||||||
args: [FFIType.ptr, FFIType.i32, FFIType.ptr, FFIType.ptr],
|
FFIType.i32,
|
||||||
returns: FFIType.void,
|
FFIType.double,
|
||||||
},
|
FFIType.i32,
|
||||||
cava_destroy: {
|
FFIType.i32,
|
||||||
args: [FFIType.ptr],
|
FFIType.i32,
|
||||||
returns: FFIType.void,
|
],
|
||||||
},
|
returns: FFIType.ptr,
|
||||||
})
|
},
|
||||||
|
cava_execute: {
|
||||||
|
args: [FFIType.ptr, FFIType.i32, FFIType.ptr, FFIType.ptr],
|
||||||
|
returns: FFIType.void,
|
||||||
|
},
|
||||||
|
cava_destroy: {
|
||||||
|
args: [FFIType.ptr],
|
||||||
|
returns: FFIType.void,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const bars = 10
|
const bars = 10;
|
||||||
const rate = 44100
|
const rate = 44100;
|
||||||
const channels = 1
|
const channels = 1;
|
||||||
|
|
||||||
// Init
|
// Init
|
||||||
const plan = lib.symbols.cava_init(bars, rate, channels, 1, 0.77, 50, 10000)
|
const plan = lib.symbols.cava_init(
|
||||||
|
bars,
|
||||||
|
rate,
|
||||||
|
channels,
|
||||||
|
1,
|
||||||
|
0.77,
|
||||||
|
50,
|
||||||
|
10000,
|
||||||
|
0 /* CAVA_SCALING_LINEAR */,
|
||||||
|
);
|
||||||
if (!plan) {
|
if (!plan) {
|
||||||
console.error("FAIL: cava_init returned null")
|
console.error("FAIL: cava_init returned null");
|
||||||
process.exit(1)
|
process.exit(1);
|
||||||
}
|
}
|
||||||
console.log("cava_init OK, plan pointer:", plan)
|
console.log("cava_init OK, plan pointer:", plan);
|
||||||
|
|
||||||
// Generate a 200Hz sine wave test signal
|
// Generate a 200Hz sine wave test signal
|
||||||
const bufferSize = 512
|
const bufferSize = 512;
|
||||||
const cavaIn = new Float64Array(bufferSize)
|
const cavaIn = new Float64Array(bufferSize);
|
||||||
const cavaOut = new Float64Array(bars * channels)
|
const cavaOut = new Float64Array(bars * channels);
|
||||||
|
|
||||||
for (let k = 0; k < 100; k++) {
|
for (let k = 0; k < 100; k++) {
|
||||||
for (let n = 0; n < bufferSize; n++) {
|
for (let n = 0; n < bufferSize; n++) {
|
||||||
cavaIn[n] = Math.sin(2 * Math.PI * 200 / rate * (n + k * bufferSize)) * 20000
|
cavaIn[n] =
|
||||||
}
|
Math.sin(((2 * Math.PI * 200) / rate) * (n + k * bufferSize)) * 20000;
|
||||||
lib.symbols.cava_execute(ptr(cavaIn), bufferSize, ptr(cavaOut), plan)
|
}
|
||||||
|
lib.symbols.cava_execute(ptr(cavaIn), bufferSize, ptr(cavaOut), plan);
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("cava_execute OK, output:", Array.from(cavaOut).map(v => v.toFixed(3)))
|
console.log(
|
||||||
|
"cava_execute OK, output:",
|
||||||
|
Array.from(cavaOut).map((v) => v.toFixed(3)),
|
||||||
|
);
|
||||||
|
|
||||||
// Check that bar 2 (200Hz) has the peak
|
// Check that bar 2 (200Hz) has the peak
|
||||||
const maxIdx = cavaOut.indexOf(Math.max(...cavaOut))
|
const maxIdx = cavaOut.indexOf(Math.max(...cavaOut));
|
||||||
console.log(`Peak at bar ${maxIdx} (expected ~2 for 200Hz)`)
|
console.log(`Peak at bar ${maxIdx} (expected ~2 for 200Hz)`);
|
||||||
|
|
||||||
// Destroy
|
// Destroy
|
||||||
lib.symbols.cava_destroy(plan)
|
lib.symbols.cava_destroy(plan);
|
||||||
console.log("cava_destroy OK")
|
console.log("cava_destroy OK");
|
||||||
console.log("\nSMOKE TEST PASSED")
|
console.log("\nSMOKE TEST PASSED");
|
||||||
|
|||||||
@@ -106,7 +106,12 @@ async function renderPaneRow(props: TestPaneProps): Promise<{
|
|||||||
await new Promise((r) => setTimeout(r, 40));
|
await new Promise((r) => setTimeout(r, 40));
|
||||||
}
|
}
|
||||||
const spans = setup.captureSpans() as unknown as Frame;
|
const spans = setup.captureSpans() as unknown as Frame;
|
||||||
return { spans, destroy: () => setup.renderer.destroy() };
|
return {
|
||||||
|
spans,
|
||||||
|
destroy: async () => {
|
||||||
|
setup.renderer.destroy();
|
||||||
|
},
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const cleanups: (() => void | Promise<void>)[] = [];
|
const cleanups: (() => void | Promise<void>)[] = [];
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
"target": "ESNext",
|
"target": "ESNext",
|
||||||
"module": "ESNext",
|
"module": "ESNext",
|
||||||
"moduleResolution": "bundler",
|
"moduleResolution": "bundler",
|
||||||
"jsx": "preserve",
|
"jsx": "react-jsx",
|
||||||
"jsxImportSource": "@opentui/solid",
|
"jsxImportSource": "@opentui/solid",
|
||||||
"strict": true,
|
"strict": true,
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
|
|||||||
Reference in New Issue
Block a user