Compare commits
137 Commits
c8d29ed59d
...
v0.9.2
| Author | SHA1 | Date | |
|---|---|---|---|
| a40c2561bc | |||
| 0640172f05 | |||
| f5f4bc73b9 | |||
| 649baf40ab | |||
| 9702af640b | |||
| 48076fcef5 | |||
| 06c5cc9184 | |||
| a3641d100e | |||
| 8a173a5180 | |||
| 132d2079f7 | |||
| b53d4add29 | |||
| 6c3ad5d925 | |||
| 09d5732b55 | |||
| 9e2f232d27 | |||
| 9143078b12 | |||
| ca46de4d70 | |||
| 3e90f9e783 | |||
| c2ec356a5f | |||
| 6aac138629 | |||
| 3f0001b0d5 | |||
| 74158d75d4 | |||
| 4ff8aabb51 | |||
| 895138357f | |||
| 02c957f584 | |||
| d7ceb9d045 | |||
| 0677f82c44 | |||
| 4990eae60f | |||
| 9ddfd21685 | |||
| 22059c24ca | |||
| 0aac0a157f | |||
| df4701957b | |||
| 4b44623891 | |||
| 4ef9ab7e59 | |||
| 9df8eebf6c | |||
| badbc6a037 | |||
| 878d1e01ab | |||
| 42c48e59fb | |||
| 91d4acca90 | |||
| 20d5b57cb6 | |||
| d7aec4e810 | |||
| 77531ce41d | |||
| 26729fa5e6 | |||
| 4127fd1181 | |||
| 6c99b96b12 | |||
| acbaf2ed1c | |||
| e7ed89056e | |||
| b5432e3e5f | |||
| 13664c3cec | |||
| 0b4a551744 | |||
| ed75c2fff7 | |||
| bd7d988741 | |||
| deac6081ca | |||
| e09ae15e32 | |||
| 33af131b77 | |||
| 3d6d4918bc | |||
| 35ad858d0d | |||
| af827a9a96 | |||
| 2cf9559b0b | |||
| 20336ea716 | |||
| 8b7b38276e | |||
| 8496922aaf | |||
| 5e3ad48a2d | |||
| 005ac8fde3 | |||
| 1f0b9de456 | |||
| 3388757185 | |||
| 8049d02457 | |||
| 1b55b7117c | |||
| 15f8a098b5 | |||
| 2d7d49b91c | |||
| df9c519439 | |||
| 2bf1c229c7 | |||
| b2e9e5c16c | |||
| 41c0002090 | |||
| c0252fc9b8 | |||
| 0c3506beb5 | |||
| ef9fc13aaa | |||
| 0b0637b9dc | |||
| e73e608b9f | |||
| ebed49237c | |||
| dc2b22eaa5 | |||
| 2bb612ee07 | |||
| dc855ab8a0 | |||
| f976bdc2b7 | |||
| 1cf3361e59 | |||
| ada441300a | |||
| 6134dea044 | |||
| 93d5925dfd | |||
| de6d0ccbf6 | |||
| cda29bcb95 | |||
| 3775a9801d | |||
| a9589e7686 | |||
| c52fa14e42 | |||
| 116d095ad5 | |||
| b280af484c | |||
| 5dce21c038 | |||
| d2c46631ef | |||
| 67032460ff | |||
| 0f3ffcf934 | |||
| c813949d48 | |||
| eb220386ce | |||
| 19eae4fd5a | |||
| e70469b1ec | |||
| 30b7ff57d3 | |||
| fd689aba04 | |||
| 8eaca82ce9 | |||
| 8ac1ec1162 | |||
| 4a94ff5910 | |||
| 2e69868ffc | |||
| 491a736c32 | |||
| 12bd6be4bc | |||
| d2f6c5c525 | |||
| f758b53336 | |||
| b0bfa41028 | |||
| 25307f83e9 | |||
| db285530b6 | |||
| e1cdd6b2a5 | |||
| 2abdbaa4e9 | |||
| 1d06156b8b | |||
| c63e9e1b9c | |||
| 0facfff51b | |||
| 3ef19f80b8 | |||
| 13a31aabdc | |||
| 8dbdebfd30 | |||
| 529817323d | |||
| ace883b505 | |||
| de01cedee0 | |||
| 2730fa3cae | |||
| 91a831c5f9 | |||
| 52e9ae0ab7 | |||
| 64d8b40e61 | |||
| 0cc15c8d90 | |||
| 1d3abd53d4 | |||
| 592cfd4093 | |||
| 69e12cf5b9 | |||
| c9e3aa92ec | |||
| 25fe7f6ac9 | |||
| 85cb9fba26 |
@@ -1,11 +0,0 @@
|
||||
module.exports = {
|
||||
root: true,
|
||||
parser: "@typescript-eslint/parser",
|
||||
plugins: ["@typescript-eslint"],
|
||||
extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
|
||||
env: {
|
||||
es2022: true,
|
||||
node: true,
|
||||
},
|
||||
ignorePatterns: ["dist", "node_modules"],
|
||||
}
|
||||
102
.github/workflows/release.yml
vendored
Normal file
@@ -0,0 +1,102 @@
|
||||
name: release
|
||||
|
||||
# Builds standalone PodTui binaries for each supported OS/arch and attaches
|
||||
# them to a GitHub Release. One runner per platform because Bun cannot
|
||||
# cross-compile — each runner runs `make dist`, which emits a
|
||||
# podtui-<platform>-<arch>.tar.gz (binary + native libs side by side).
|
||||
#
|
||||
# Trigger: push a tag like v0.1.0. Bump VERSION in src/index.tsx in the same
|
||||
# commit as the tag so the released binary reports the tagged version.
|
||||
|
||||
on: # intentional: YAML `on` key
|
||||
push:
|
||||
tags:
|
||||
- "v*"
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: build (${{ matrix.os }} / ${{ matrix.arch }})
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- os: ubuntu-latest
|
||||
arch: x64
|
||||
plat: linux
|
||||
- os: ubuntu-24.04-arm
|
||||
arch: arm64
|
||||
plat: linux
|
||||
- os: macos-15-intel
|
||||
arch: x64
|
||||
plat: darwin
|
||||
- os: macos-14
|
||||
arch: arm64
|
||||
plat: darwin
|
||||
steps:
|
||||
- name: Check out repo
|
||||
uses: actions/checkout@v5
|
||||
|
||||
- name: Set up Bun
|
||||
uses: oven-sh/setup-bun@v2
|
||||
with:
|
||||
bun-version: latest
|
||||
|
||||
- name: Install dependencies
|
||||
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
|
||||
run: scripts/build-cavacore.sh
|
||||
|
||||
- name: Build standalone binary + tarball
|
||||
run: make dist
|
||||
|
||||
- name: Smoke-test binary boot
|
||||
env:
|
||||
DIST_TAR: podtui-${{ matrix.plat }}-${{ matrix.arch }}.tar.gz
|
||||
run: |
|
||||
# The binary is compiled with bunfig autoload disabled
|
||||
# (autoloadBunfig: false in build.ts), so it must boot even from a
|
||||
# directory holding a bunfig.toml with a top-level preload the
|
||||
# standalone can't resolve. Plant one to make this a real regression
|
||||
# test for "preload not found".
|
||||
SMOKE_DIR=$(mktemp -d)
|
||||
tar -xzf "dist/$DIST_TAR" -C "$SMOKE_DIR"
|
||||
printf 'preload = ["./definitely-missing.ts"]\n' > "$SMOKE_DIR/bunfig.toml"
|
||||
cd "$SMOKE_DIR"
|
||||
./podtui-*/podtui --version
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: podtui-${{ matrix.plat }}-${{ matrix.arch }}
|
||||
path: dist/podtui-*.tar.gz
|
||||
|
||||
upload:
|
||||
name: Attach to GitHub Release
|
||||
needs: build
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Download all binaries
|
||||
uses: actions/download-artifact@v7
|
||||
with:
|
||||
path: artifacts
|
||||
|
||||
- name: Publish release
|
||||
uses: softprops/action-gh-release@v3
|
||||
with:
|
||||
generate_release_notes: true
|
||||
files: |
|
||||
artifacts/**/*.tar.gz
|
||||
LICENSE
|
||||
3
.gitignore
vendored
@@ -34,3 +34,6 @@ report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
|
||||
.DS_Store
|
||||
.harness/
|
||||
.ralpi
|
||||
notes.md
|
||||
# pygienium run-state and check artifacts
|
||||
.pygienium/
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
- `bun tests/cavacore-smoke.ts` - Run specific native library smoke test
|
||||
|
||||
### Linting
|
||||
- `bun run lint` - Run ESLint with TypeScript rules
|
||||
- `bun run lint` - Run the TypeScript typecheck (`bun tsc --noEmit`)
|
||||
|
||||
## Code Style Guidelines
|
||||
|
||||
|
||||
230
CONTRIBUTING.md
Normal file
@@ -0,0 +1,230 @@
|
||||
# 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 dist-mac` / `make dist-linux` | Aliases for `dist` on their platform (CI runs these) |
|
||||
| `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. **The compiled binary must keep bunfig autoload disabled.**
|
||||
`build.ts` compiles the standalone with `autoloadBunfig: false`, so its
|
||||
embedded runtime *never* reads the launching CWD's `bunfig.toml`. Without
|
||||
that flag, a top-level `preload` in the CWD bunfig (common in Bun project
|
||||
dirs) resolves against the CWD rather than the binary and kills startup
|
||||
with `preload not found`. Don't remove the flag. Preloads for dev/test
|
||||
belong in the explicit `--preload` flags in `package.json` and the
|
||||
`[test]` section of `bunfig.toml` — not as a top-level entry.
|
||||
|
||||
2. **Smoke-test the binary from a dir with a poisoned bunfig.**
|
||||
The CI smoke test unpacks the tarball into a `mktemp` dir, drops a
|
||||
`bunfig.toml` containing an unresolvable top-level `preload` next to it,
|
||||
and boots the binary — proving bunfig autoload stayed disabled. `./dist/
|
||||
podtui --version` must work from any directory, including the repo root;
|
||||
do the same check 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. Run `scripts/release-tag.sh` (interactive: pick major/minor/patch/custom,
|
||||
confirms the plan, bumps `VERSION` in `src/index.tsx`, commits, tags
|
||||
`vX.Y.Z`, and pushes branch + tag to every remote). If the version bump is
|
||||
already committed but the tag is missing, it offers a tag-only path.
|
||||
`--dry-run` prints the plan without doing anything.
|
||||
2. Equivalent manual commands:
|
||||
|
||||
```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-tap` 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/tap/podtui`.
|
||||
5. **AUR packaging** (`packaging/aur/PKGBUILD`): the `podtui-bin` package is
|
||||
staged, not yet published (AUR account registrations are closed; see the
|
||||
README's Installation section). On each release, keep the AUR sources in sync
|
||||
with the new tag: bump `pkgver`, recompute the two tarball `sha256sums`
|
||||
entries, keep the `LICENSE` asset source (the workflow above uploads
|
||||
`LICENSE` to every release), and regenerate `packaging/aur/.SRCINFO` with
|
||||
`bash packaging/aur/gen-srcinfo.sh`.
|
||||
|
||||
### Manual fallback
|
||||
|
||||
If you ever need to sync the tap by hand (or before the hourly job runs):
|
||||
|
||||
```bash
|
||||
cd <clone of mikefreno/homebrew-tap>
|
||||
./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.
|
||||
|
||||
## Distribution & packaging
|
||||
|
||||
A release tarball is three files sitting side by side: the `podtui` binary
|
||||
plus its two FFI libraries (`libopentui.<dylib|so>`,
|
||||
`libcavacore.<dylib|so>`). The sibling rule above is why they ship together.
|
||||
|
||||
PodTui deliberately ships **no** `.deb`, `.rpm`, Flatpak, or Snap packages:
|
||||
for a terminal app that's overwhelmingly installed through repositories or
|
||||
archives, those formats add desktop-sandboxing overhead and a packaging tax
|
||||
with little benefit. Instead:
|
||||
|
||||
- **GitHub Release tarballs** are the universal path — one upload per
|
||||
OS/arch, works on any distro with `curl` + `tar`.
|
||||
- **AUR (`podtui-bin`)** covers Arch/Manjaro with the same binary through the
|
||||
native package manager.
|
||||
- **Nix / cross-distro** users build from source (or a Nix flake can be added
|
||||
later).
|
||||
|
||||
This keeps maintenance to a single build per OS/arch while still reaching the
|
||||
vast majority of desktop Linux users. The AUR PKGBUILD lives in
|
||||
`packaging/aur/` and can be built locally to test before publication:
|
||||
|
||||
```bash
|
||||
cd packaging/aur && makepkg -si
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Open items / things to sort out
|
||||
|
||||
- **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`.
|
||||
21
LICENSE
Normal file
@@ -0,0 +1,21 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2026 Michael Freno
|
||||
|
||||
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.
|
||||
65
Makefile
Normal file
@@ -0,0 +1,65 @@
|
||||
# PodTui — Makefile
|
||||
#
|
||||
# Development targets:
|
||||
# make install install dependencies (bun install) + build native lib
|
||||
# make dev run with hot reload
|
||||
# make test run the test suite
|
||||
# make build produce the JS bundle + native libs in dist/
|
||||
# make native build the cavacore FFI library from C source
|
||||
# make lint run typecheck-style checks (lsp), not eslint
|
||||
#
|
||||
# Packaging / release targets:
|
||||
# make dist build a standalone compiled binary + tarball for the
|
||||
# CURRENT platform (see dist/ for podtui + libs + tarball)
|
||||
# make dist-mac alias for `dist` targeting macOS (run on macOS)
|
||||
# make dist-linux alias for `dist` targeting Linux (run on Linux)
|
||||
# make clean remove dist/ output
|
||||
#
|
||||
# Cross-platform binaries are produced by CI (GitHub Actions) with one runner
|
||||
# per OS/arch — Bun cannot cross-compile, so dist:mac / dist:linux only produce
|
||||
# the binary for the OS they run on. Each runner runs `make dist` and uploads
|
||||
# its podtui-<platform>-<arch>.tar.gz artifact.
|
||||
|
||||
SHELL := /bin/bash
|
||||
|
||||
.PHONY: install dev build native dist dist-mac dist-linux test clean
|
||||
|
||||
## Install dependencies and build the native runtime library.
|
||||
install:
|
||||
bun install
|
||||
make native
|
||||
|
||||
## Run the dev server with hot reload.
|
||||
dev:
|
||||
bun run dev
|
||||
|
||||
## Type-check the whole project. (See AGENTS.md: `bun run lint` points at a
|
||||
## nonexistent lint.ts; LSP diagnostics are the maintained clean bar.)
|
||||
lint:
|
||||
bun tsc --noEmit
|
||||
|
||||
## Build the JS bundle + native libs into dist/ (the `podtui` npm bin target).
|
||||
build:
|
||||
bun run build
|
||||
|
||||
## Build the cavacore FFI library from src/native/cavacore.c.
|
||||
native:
|
||||
scripts/build-cavacore.sh
|
||||
|
||||
## Standalone binary + native-libs tarball for the current platform.
|
||||
## Built with bunfig autoload disabled (build.ts sets autoloadBunfig: false),
|
||||
## so the embedded runtime ignores any bunfig.toml in the launching directory.
|
||||
dist:
|
||||
bun run build.ts --compile
|
||||
|
||||
## macOS build (run on a macOS runner / host).
|
||||
dist-mac:
|
||||
bun run build.ts --compile
|
||||
|
||||
## Linux build (run on a Linux runner / host).
|
||||
dist-linux:
|
||||
bun run build.ts --compile
|
||||
|
||||
## Remove build artifacts.
|
||||
clean:
|
||||
rm -rf dist
|
||||
236
README.md
@@ -1,15 +1,237 @@
|
||||
# solid
|
||||
# PodTui
|
||||
|
||||
To install dependencies:
|
||||
A keyboard-first, terminal podcast client built on [OpenTUI](https://github.com/opentui/opentui). Subscribe to RSS feeds,
|
||||
browse episodes in a three-pane file-manager layout, and play audio through an
|
||||
external player with full transport control — all from your terminal.
|
||||
|
||||
```bash
|
||||
bun install
|
||||
## Features
|
||||
|
||||
- **Vim/yazi-style navigation** — `j/k` to move, `h/l` to swipe between panes,
|
||||
`Enter` to open, `1–6` / `[` `]` to switch tabs. The tab list is the app root:
|
||||
at launch it fills the current pane, and drilling into a tab's contents slides
|
||||
it into the parent pane.
|
||||
- **Three-pane view** — parent / current / preview (Up | Current | Preview).
|
||||
- **Podcast feeds** — add feeds, browse episodes, and manage your library
|
||||
(My Shows, Discover, Feed tabs).
|
||||
- **Search** across your subscribed shows.
|
||||
- **Audio playback** through an external player with full transport control:
|
||||
play/pause, next/previous, seek, speed, and per-episode resume progress.
|
||||
When an episode finishes, the next one plays automatically, continuing
|
||||
down the list you started it from (search results, a show, or the Feed).
|
||||
- **Themeable** and **remappable keybindings**.
|
||||
- Ships as a **standalone compiled binary** — no runtime or install step beyond
|
||||
a system audio player.
|
||||
|
||||
## Quick start
|
||||
|
||||
1. Install PodTui ([Installation](#installation)) and make sure **mpv** is in
|
||||
your `PATH`.
|
||||
2. Run `podtui` in your terminal.
|
||||
3. Press `3` to open **Discover** (or `4` to open **Search**, then `s`), drill
|
||||
in with `Enter`, and press `Enter` on a show to subscribe.
|
||||
4. Press `1` (**Feed**) or `2` (**My Shows**), open an episode with `Enter`,
|
||||
and use `P` to play/pause, `N`/`B` for next/previous, and `shift-.` /
|
||||
`shift-,` to seek.
|
||||
|
||||
Press `~` any time for in-app help. All keys are remappable — see
|
||||
[Keybindings](#keybindings).
|
||||
|
||||
## Requirements
|
||||
|
||||
- A terminal with UTF-8 and modern color support (kitty, iTerm2, WezTerm,
|
||||
Ghostty, tmux etc.).
|
||||
- **mpv** on `PATH` for audio playback. PodTui drives mpv over JSON IPC, so
|
||||
seek, speed, and position tracking all work. Without `mpv` on `PATH`,
|
||||
playback is a silent no-op (the `none` backend) — see
|
||||
[Troubleshooting](#troubleshooting).
|
||||
|
||||
## Installation
|
||||
|
||||
PodTui distributes as a **self-contained binary** for macOS (arm64/x64) and
|
||||
Linux (arm64/x64). Pick whichever fits your platform.
|
||||
|
||||
### 1. Homebrew (macOS)
|
||||
|
||||
```sh
|
||||
brew install mikefreno/tap/podtui
|
||||
```
|
||||
|
||||
To run:
|
||||
### 2. Standalone tarball (all platforms)
|
||||
|
||||
Grab `podtui-<platform>-<arch>.tar.gz` from the latest
|
||||
[GitHub Release](https://github.com/mikefreno/podtui/releases), unpack it, and
|
||||
put `podtui` on your `PATH`:
|
||||
|
||||
```bash
|
||||
bun dev
|
||||
curl -sSL -o /tmp/podtui.tar.gz \
|
||||
https://github.com/mikefreno/podtui/releases/latest/download/podtui-linux-x64.tar.gz
|
||||
sudo mkdir -p /opt/podtui
|
||||
sudo tar -xzf /tmp/podtui.tar.gz -C /opt/podtui --strip-components=1
|
||||
sudo ln -sf /opt/podtui/podtui /usr/local/bin/podtui
|
||||
```
|
||||
|
||||
This project was created using `bun create tui`. [create-tui](https://git.new/create-tui) is the easiest way to get started with OpenTUI.
|
||||
> The tarball contains `podtui` plus `libopentui.<ext>` and
|
||||
> `libcavacore.<ext>` **beside it** — keep them together (don't move just the
|
||||
> binary alone), or the native FFI libraries won't load.
|
||||
|
||||
### 3. Arch Linux (AUR)
|
||||
|
||||
```bash
|
||||
yay -S podtui-bin # once published
|
||||
```
|
||||
|
||||
Requires an AUR helper ([paru](https://github.com/morgan/paru)); the package
|
||||
pulls in `mpv` as a dependency.
|
||||
|
||||
> **Not yet on the AUR.** The `podtui-bin` package is staged and awaiting
|
||||
> publication (AUR account registrations are currently suspended). Until it
|
||||
> lands, use the standalone tarball above.
|
||||
|
||||
### 4. From source
|
||||
|
||||
PodTui is written in TypeScript and runs on [Bun](https://bun.sh). To build
|
||||
from source (development, distro packaging, unreleased versions), see
|
||||
[CONTRIBUTING.md](CONTRIBUTING.md).
|
||||
|
||||
## Usage
|
||||
|
||||
Launch `podtui`. Press `~` for the in-app help.
|
||||
|
||||
### Command-line flags
|
||||
|
||||
| Flag | Description |
|
||||
|------|-------------|
|
||||
| `-v`, `--version` | Print the version and exit |
|
||||
| `-q`, `--query <term>` | Query feeds for a show title and print matching shows, without launching the TUI |
|
||||
| `-p`, `--play <term>` | Play the matching show, without launching the TUI |
|
||||
|
||||
### Keybindings
|
||||
|
||||
All keys are remappable — edit `keybinds.jsonc` in your config directory
|
||||
(see [Configuration](#configuration)).
|
||||
|
||||
**Movement**
|
||||
|
||||
| Keys | Action |
|
||||
|------|--------|
|
||||
| `j` / `k` (or `down` / `up`) | Move down / up |
|
||||
| `J` / `K` | Jump 5 lines down / up |
|
||||
| `ctrl-d` / `ctrl-u` | Page down / up |
|
||||
| `ctrl-f` / `ctrl-b` | Full page down / up |
|
||||
| `gg` / `G` | Go to top / bottom |
|
||||
|
||||
**Panes**
|
||||
|
||||
| Keys | Action |
|
||||
|------|--------|
|
||||
| `h` / `l` (or `left` / `right`) | Focus parent pane / preview pane |
|
||||
| `Enter` | Open the item under the cursor (a tab, episode, show…) |
|
||||
| `shift-enter` | Open with the interactive variant |
|
||||
|
||||
**Selection**
|
||||
|
||||
| Keys | Action |
|
||||
|------|--------|
|
||||
| `Space` | Toggle selection |
|
||||
| `v` | Visual mode (multi-select) |
|
||||
| `ctrl-a` | Select / deselect all |
|
||||
| `ctrl-r` | Invert selection |
|
||||
| `Esc` | Cancel / escape |
|
||||
|
||||
**Tabs**
|
||||
|
||||
| Keys | Action |
|
||||
|------|--------|
|
||||
| `1`–`6` | Jump to tab 1–6 (Feed, My Shows, Discover, Search, Player, Settings) |
|
||||
| `[` / `]` | Previous / next tab |
|
||||
|
||||
**Commands, help, quit**
|
||||
|
||||
| Keys | Action |
|
||||
|------|--------|
|
||||
| `:` or `q` | Open the command palette (type `q` + `Enter` there to quit) |
|
||||
| `Q` or `ctrl-c` | Quit |
|
||||
| `~` or `f1` | In-app help |
|
||||
|
||||
**Lists**
|
||||
|
||||
| Keys | Action |
|
||||
|------|--------|
|
||||
| `s` | Search |
|
||||
| `f` | Filter |
|
||||
| `,` | Sort |
|
||||
| `.` | Toggle hidden |
|
||||
| `r` | Refresh |
|
||||
| `x` | Unsubscribe the focused show (My Shows) |
|
||||
| `d` | Download the focused episode (Feed / My Shows detail pane) |
|
||||
| `D` | Delete the focused episode's download (if one exists) |
|
||||
| `w` | Toggle the focused show in/out of the auto-download whitelist (My Shows, whitelist scope) |
|
||||
|
||||
**Audio**
|
||||
|
||||
| Keys | Action |
|
||||
|------|--------|
|
||||
| `P` | Play / pause |
|
||||
| `N` / `B` | Next / previous episode |
|
||||
| `shift-.` / `shift-,` | Seek forward / backward |
|
||||
|
||||
## Configuration
|
||||
|
||||
Configuration lives under the XDG config directory — `~/.config/podtui` by
|
||||
default (`$XDG_CONFIG_HOME/podtui` if set).
|
||||
|
||||
| File | Purpose |
|
||||
|------|---------|
|
||||
| `config.json` | Unified settings (theme, playback speed, download path), feeds, and custom feed sources |
|
||||
| `downloads.json` | Downloaded episode metadata |
|
||||
| `keybinds.jsonc` | Keybinding remaps (see above) |
|
||||
| `themes/` | Optional custom theme files |
|
||||
|
||||
Legacy `feeds.json`, `sources.json`, and `app-state.json` are auto-migrated
|
||||
into `config.json` on first run.
|
||||
|
||||
**Auto-download** — in Settings → Preferences: `Auto Download` (master
|
||||
toggle) downloads the `Auto Download Count` most recent episodes (default 2,
|
||||
any positive integer — type it in the editor) of every show in the `Auto
|
||||
Download Scope` (all / none / whitelist, default all). With the whitelist
|
||||
scope, a search field appears under the setting to pick shows (Space toggles
|
||||
a suggestion in/out), and `w` in My Shows adds/removes the focused show.
|
||||
|
||||
Env overrides: `PODTUI_AUDIO_BACKEND`, `XDG_CONFIG_HOME`, `PODTUI_NERD_FONTS`.
|
||||
|
||||
**Fonts** — PodTui prepends Nerd Font glyphs to non-episode/show list rows (tabs, Discover categories, Settings sections, the Feed and per-show "Fetch More" rows). Icons are hidden automatically when your terminal font is not Nerd Font capable (no tofu, no layout gaps); detection is heuristic (terminal type), so force it with `PODTUI_NERD_FONTS=1` or `=0` if it guesses wrong. A Nerd Font-patched font (e.g. JetBrainsMono Nerd Font) is recommended.
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
**`preload not found` at startup** — this used to happen when the binary was
|
||||
launched from a Bun project directory whose `bunfig.toml` had a `preload`
|
||||
entry. Releases are compiled with bunfig autoload disabled
|
||||
(`autoloadBunfig: false`), so current binaries ignore the CWD's `bunfig.toml`
|
||||
entirely. If you still hit it, you're on an old release — upgrade.
|
||||
|
||||
**No audio — playback is a silent no-op** — PodTui needs **mpv** on your
|
||||
`PATH`. Homebrew and AUR installs pull it in automatically; if you used the
|
||||
standalone tarball, install it yourself (`brew install mpv`, `pacman -S mpv`,
|
||||
…) and relaunch.
|
||||
|
||||
**Homebrew prints a dylib warning** — “load commands do not fit in the header
|
||||
… needs `-headerpad`” is benign: the app loads its libraries by path, the
|
||||
install completes, and the app boots normally.
|
||||
|
||||
**The app won't start / no spectrum after moving files** — `podtui` loads its
|
||||
two native libraries relative to the binary, so keep `podtui`,
|
||||
`libopentui.*`, and `libcavacore.*` together in the same directory (the
|
||||
tarball unpacks them side by side).
|
||||
|
||||
## Building from source / contributing
|
||||
|
||||
Development setup, the test suite, packaging, and the release process are
|
||||
documented in [CONTRIBUTING.md](CONTRIBUTING.md).
|
||||
|
||||
## License
|
||||
|
||||
MIT. See [LICENSE](LICENSE).
|
||||
|
||||
## Related
|
||||
|
||||
- [OpenTUI](https://github.com/opentui/opentui) — the TUI framework driving the interface
|
||||
|
||||
|
After Width: | Height: | Size: 465 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 54 KiB |
|
After Width: | Height: | Size: 759 B |
|
After Width: | Height: | Size: 2.0 KiB |
|
After Width: | Height: | Size: 2.9 KiB |
|
After Width: | Height: | Size: 5.2 KiB |
|
After Width: | Height: | Size: 54 KiB |
|
After Width: | Height: | Size: 154 KiB |
|
After Width: | Height: | Size: 5.0 KiB |
|
After Width: | Height: | Size: 8.7 KiB |
|
After Width: | Height: | Size: 2.0 KiB |
|
After Width: | Height: | Size: 5.6 KiB |
|
After Width: | Height: | Size: 7.1 KiB |
|
After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 7.6 KiB |
|
After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 154 KiB |
|
After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 30 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 34 KiB |
|
After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 24 KiB |
|
After Width: | Height: | Size: 28 KiB |
@@ -0,0 +1 @@
|
||||
<svg width="400" xmlns="http://www.w3.org/2000/svg" height="125.714" id="screenshot-993fe4cb-279d-80e0-8008-769a7b1374b8" viewBox="0 0 400 125.714" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1"><g id="shape-993fe4cb-279d-80e0-8008-769a7b1374b8" rx="0" ry="0"><g id="shape-993fe4cb-279d-80e0-8008-769a7a62c77d"><g class="fills" id="fills-993fe4cb-279d-80e0-8008-769a7a62c77d"><rect rx="6.857142857142833" ry="6.857142857142833" x="0" y="56" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)" width="34.28571428571428" height="13.714285714285666" style="fill: rgb(136, 192, 208); fill-opacity: 1;"/></g></g><g id="shape-993fe4cb-279d-80e0-8008-769a7a89c956"><g class="fills" id="fills-993fe4cb-279d-80e0-8008-769a7a89c956"><rect rx="15" ry="15" x="45.71428571428572" y="45.714285714285666" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)" width="34.28571428571428" height="34.285714285714334" style="fill: rgb(136, 192, 208); fill-opacity: 1;"/></g></g><g id="shape-993fe4cb-279d-80e0-8008-769a7a9fe4f2"><g class="fills" id="fills-993fe4cb-279d-80e0-8008-769a7a9fe4f2"><rect rx="15" ry="15" x="91.42857142857144" y="33.14285714285711" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)" width="34.28571428571428" height="59.428571428571445" style="fill: rgb(136, 192, 208); fill-opacity: 1;"/></g></g><g id="shape-993fe4cb-279d-80e0-8008-769a7ab46172"><g class="fills" id="fills-993fe4cb-279d-80e0-8008-769a7ab46172"><rect rx="15" ry="15" x="137.1428571428571" y="18.285714285714306" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)" width="34.285714285714334" height="89.14285714285714" style="fill: rgb(136, 192, 208); fill-opacity: 1;"/></g></g><g id="shape-993fe4cb-279d-80e0-8008-769a7ac82b71"><g class="fills" id="fills-993fe4cb-279d-80e0-8008-769a7ac82b71"><rect rx="15" ry="15" x="182.85714285714283" y="0" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)" width="34.285714285714334" height="125.71428571428578" style="fill: rgb(136, 192, 208); fill-opacity: 1;"/></g></g><g id="shape-993fe4cb-279d-80e0-8008-769a7ad6c7b7"><g class="fills" id="fills-993fe4cb-279d-80e0-8008-769a7ad6c7b7"><rect rx="15" ry="15" x="228.57142857142856" y="18.285714285714306" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)" width="34.28571428571428" height="89.14285714285714" style="fill: rgb(136, 192, 208); fill-opacity: 1;"/></g></g><g id="shape-993fe4cb-279d-80e0-8008-769a7aea70cd"><g class="fills" id="fills-993fe4cb-279d-80e0-8008-769a7aea70cd"><rect rx="15" ry="15" x="274.28571428571433" y="33.14285714285711" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)" width="34.28571428571428" height="59.428571428571445" style="fill: rgb(136, 192, 208); fill-opacity: 1;"/></g></g><g id="shape-993fe4cb-279d-80e0-8008-769a7af77904"><g class="fills" id="fills-993fe4cb-279d-80e0-8008-769a7af77904"><rect rx="15" ry="15" x="320" y="45.714285714285666" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)" width="34.28571428571428" height="34.285714285714334" style="fill: rgb(59, 66, 82); fill-opacity: 1;"/></g></g><g id="shape-993fe4cb-279d-80e0-8008-769a7b04705e"><g class="fills" id="fills-993fe4cb-279d-80e0-8008-769a7b04705e"><rect rx="6.857142857142833" ry="6.857142857142833" x="365.7142857142858" y="56" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)" width="34.28571428571428" height="13.714285714285666" style="fill: rgb(59, 66, 82); fill-opacity: 1;"/></g></g></g></svg>
|
||||
|
After Width: | Height: | Size: 3.6 KiB |
1
assets/App Icon/App Icon.icon/Assets/Terminal Cursor.svg
Normal file
@@ -0,0 +1 @@
|
||||
<svg width="80" xmlns="http://www.w3.org/2000/svg" height="256" id="screenshot-993fe4cb-279d-80e0-8008-76a1e45d35f1" viewBox="0 0 80 256" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1"><g id="shape-993fe4cb-279d-80e0-8008-76a1e45d35f1"><g class="fills" id="fills-993fe4cb-279d-80e0-8008-76a1e45d35f1"><rect rx="10" ry="10" x="0" y="0" transform="matrix(1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000)" width="80" height="256" style="fill: rgb(136, 192, 208); fill-opacity: 1;"/></g></g></svg>
|
||||
|
After Width: | Height: | Size: 526 B |
51
assets/App Icon/App Icon.icon/icon.json
Normal file
@@ -0,0 +1,51 @@
|
||||
{
|
||||
"fill" : {
|
||||
"solid" : "display-p3:0.18481,0.20325,0.24683,1.00000"
|
||||
},
|
||||
"groups" : [
|
||||
{
|
||||
"layers" : [
|
||||
{
|
||||
"glass" : false,
|
||||
"image-name" : "Podcast Waveform.svg",
|
||||
"name" : "Podcast Waveform",
|
||||
"position" : {
|
||||
"scale" : 2,
|
||||
"translation-in-points" : [
|
||||
0,
|
||||
0
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"blend-mode" : "normal",
|
||||
"fill" : "automatic",
|
||||
"glass" : false,
|
||||
"image-name" : "Terminal Cursor.svg",
|
||||
"name" : "Terminal Cursor",
|
||||
"position" : {
|
||||
"scale" : 2,
|
||||
"translation-in-points" : [
|
||||
320.00000000000006,
|
||||
0
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"shadow" : {
|
||||
"kind" : "neutral",
|
||||
"opacity" : 0.5
|
||||
},
|
||||
"translucency" : {
|
||||
"enabled" : true,
|
||||
"value" : 0.5
|
||||
}
|
||||
}
|
||||
],
|
||||
"supported-platforms" : {
|
||||
"circles" : [
|
||||
"watchOS"
|
||||
],
|
||||
"squares" : "shared"
|
||||
}
|
||||
}
|
||||
BIN
assets/App Icon/App Icon.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
1
assets/App Icon/App Icon.svg
Normal file
|
After Width: | Height: | Size: 5.0 KiB |
BIN
assets/App Icon/App Icon_2x.png
Normal file
|
After Width: | Height: | Size: 26 KiB |
BIN
assets/App Icon/App Icon_4x.png
Normal file
|
After Width: | Height: | Size: 59 KiB |
BIN
assets/App Icon/App Icon_6x.png
Normal file
|
After Width: | Height: | Size: 100 KiB |
184
build.ts
@@ -1,62 +1,150 @@
|
||||
import solidPlugin from "@opentui/solid/bun-plugin"
|
||||
import { copyFileSync, existsSync, mkdirSync } from "node:fs"
|
||||
import { join, dirname } from "node:path"
|
||||
import solidPlugin from "@opentui/solid/bun-plugin";
|
||||
import { copyFileSync, existsSync, mkdirSync, rmSync } from "node:fs";
|
||||
import { join } from "node:path";
|
||||
import { plugin } from "bun";
|
||||
|
||||
// Register the solid transform globally (dedup'd by name). This is what makes
|
||||
// `--compile` work: compile-mode builds only apply `onLoad` transform plugins
|
||||
// that are registered via `plugin()`, not the `plugins:` array. The transform
|
||||
// is fully embedded in the compiled binary.
|
||||
plugin(solidPlugin);
|
||||
|
||||
const COMPILE =
|
||||
process.argv.includes("--compile") || process.env.PODTUI_COMPILE === "1";
|
||||
|
||||
const platform = process.platform;
|
||||
const arch = process.arch;
|
||||
|
||||
// Platform/arch → OpenTUI package name
|
||||
const platformMap: Record<string, string> = {
|
||||
"darwin-arm64": "darwin-arm64",
|
||||
"darwin-x64": "darwin-x64",
|
||||
"linux-x64": "linux-x64",
|
||||
"linux-arm64": "linux-arm64",
|
||||
"win32-x64": "win32-x64",
|
||||
"win32-arm64": "win32-arm64",
|
||||
};
|
||||
|
||||
const libExt =
|
||||
platform === "win32" ? "dll" : platform === "darwin" ? "dylib" : "so";
|
||||
|
||||
// Build the JavaScript bundle
|
||||
await Bun.build({
|
||||
entrypoints: ["./src/index.tsx"],
|
||||
outdir: "./dist",
|
||||
target: "bun",
|
||||
minify: true,
|
||||
sourcemap: "external",
|
||||
plugins: [solidPlugin],
|
||||
})
|
||||
entrypoints: ["./src/index.tsx"],
|
||||
outdir: "./dist",
|
||||
target: "bun",
|
||||
minify: true,
|
||||
sourcemap: "external",
|
||||
plugins: [solidPlugin],
|
||||
});
|
||||
|
||||
// Copy the native library to dist for distribution
|
||||
const platform = process.platform
|
||||
const arch = process.arch
|
||||
|
||||
// Map platform/arch to OpenTUI package names
|
||||
const platformMap: Record<string, string> = {
|
||||
"darwin-arm64": "darwin-arm64",
|
||||
"darwin-x64": "darwin-x64",
|
||||
"linux-x64": "linux-x64",
|
||||
"linux-arm64": "linux-arm64",
|
||||
"win32-x64": "win32-x64",
|
||||
"win32-arm64": "win32-arm64",
|
||||
}
|
||||
|
||||
const platformKey = `${platform}-${arch}`
|
||||
const platformPkg = platformMap[platformKey]
|
||||
// Copy the opentui native library to dist for distribution.
|
||||
const platformKey = `${platform}-${arch}`;
|
||||
const platformPkg = platformMap[platformKey];
|
||||
|
||||
if (platformPkg) {
|
||||
const libName = platform === "win32"
|
||||
? "opentui.dll"
|
||||
: platform === "darwin"
|
||||
? "libopentui.dylib"
|
||||
: "libopentui.so"
|
||||
const srcPath = join("node_modules", `@opentui/core-${platformPkg}`, libName)
|
||||
|
||||
if (existsSync(srcPath)) {
|
||||
const destPath = join("dist", libName)
|
||||
copyFileSync(srcPath, destPath)
|
||||
console.log(`Copied native library: ${libName}`)
|
||||
}
|
||||
const libName = `libopentui.${libExt}`;
|
||||
const srcPath = join("node_modules", `@opentui/core-${platformPkg}`, libName);
|
||||
|
||||
if (existsSync(srcPath)) {
|
||||
const destPath = join("dist", libName);
|
||||
copyFileSync(srcPath, destPath);
|
||||
console.log(`Copied native library: ${libName}`);
|
||||
}
|
||||
}
|
||||
|
||||
// Copy cavacore native library to dist
|
||||
const cavacoreLib = platform === "darwin"
|
||||
? "libcavacore.dylib"
|
||||
: platform === "win32"
|
||||
? "cavacore.dll"
|
||||
: "libcavacore.so"
|
||||
const cavacoreSrc = join("src", "native", cavacoreLib)
|
||||
const cavacoreLib = `libcavacore.${libExt}`;
|
||||
const cavacoreSrc = join("src", "native", cavacoreLib);
|
||||
|
||||
if (existsSync(cavacoreSrc)) {
|
||||
copyFileSync(cavacoreSrc, join("dist", cavacoreLib))
|
||||
console.log(`Copied cavacore library: ${cavacoreLib}`)
|
||||
copyFileSync(cavacoreSrc, join("dist", cavacoreLib));
|
||||
console.log(`Copied cavacore library: ${cavacoreLib}`);
|
||||
} else {
|
||||
console.warn(`Warning: ${cavacoreSrc} not found — run scripts/build-cavacore.sh first`)
|
||||
console.warn(
|
||||
`Warning: ${cavacoreSrc} not found — run scripts/build-cavacore.sh first`,
|
||||
);
|
||||
}
|
||||
|
||||
console.log("Build complete")
|
||||
// ── Standalone compiled binary (dist/podtui + libs beside it) ──────────────
|
||||
// `bun run build.ts --compile` (or PODTUI_COMPILE=1). Embeds the Bun runtime
|
||||
// so end users need nothing installed; the two FFI libs are shipped as
|
||||
// SIBLING FILES next to the binary (both loaders already resolve them that
|
||||
// way: cavacore checks dirname(process.execPath); opentui embeds via its
|
||||
// bun-plugin and handles the embedded-file path itself).
|
||||
if (COMPILE) {
|
||||
const outfile = join("dist", "podtui");
|
||||
await Bun.build({
|
||||
entrypoints: ["./src/index.tsx"],
|
||||
target: "bun",
|
||||
minify: true,
|
||||
sourcemap: "external",
|
||||
plugins: [solidPlugin],
|
||||
compile: {
|
||||
outfile,
|
||||
// Don't let the embedded runtime autoload the launching CWD's
|
||||
// bunfig.toml. A top-level `preload` there (common in Bun project
|
||||
// dirs) resolves against the CWD, not the binary, so startup dies
|
||||
// with "preload not found". With autoload disabled, the binary is
|
||||
// config-independent and boots from any directory.
|
||||
autoloadBunfig: false,
|
||||
},
|
||||
});
|
||||
console.log(`Compiled standalone binary: ${outfile}`);
|
||||
|
||||
// Ensure both native libs sit beside the binary.
|
||||
const opentuiSrc = join(
|
||||
"node_modules",
|
||||
`@opentui/core-${platformPkg}`,
|
||||
`libopentui.${libExt}`,
|
||||
);
|
||||
if (existsSync(opentuiSrc)) {
|
||||
copyFileSync(opentuiSrc, join("dist", `libopentui.${libExt}`));
|
||||
}
|
||||
if (!existsSync(join("dist", cavacoreLib))) {
|
||||
console.warn(
|
||||
`Warning: ${cavacoreLib} missing beside the binary — run scripts/build-cavacore.sh`,
|
||||
);
|
||||
}
|
||||
|
||||
// Tarball: podtui + the two native libs (drop the JS bundle dir)
|
||||
const tarRoot = join("dist", `podtui-${platform}-${arch}`);
|
||||
rmSync(tarRoot, { recursive: true, force: true });
|
||||
mkdirSync(tarRoot, { recursive: true });
|
||||
copyFileSync(outfile, join(tarRoot, "podtui"));
|
||||
for (const lib of [`libopentui.${libExt}`, cavacoreLib]) {
|
||||
const s = join("dist", lib);
|
||||
if (existsSync(s)) copyFileSync(s, join(tarRoot, lib));
|
||||
}
|
||||
|
||||
// App icon: bundled into every platform tarball; Linux also gets the
|
||||
// desktop entry so the AUR package can install both system-wide
|
||||
// (icon to hicolor, entry to applications/).
|
||||
const iconSrc = join("assets", "App Icon", "App Icon.png");
|
||||
if (existsSync(iconSrc)) {
|
||||
copyFileSync(iconSrc, join(tarRoot, "podtui.png"));
|
||||
}
|
||||
if (platform === "linux") {
|
||||
const desktopSrc = join("packaging", "podtui.desktop");
|
||||
if (existsSync(desktopSrc)) {
|
||||
copyFileSync(desktopSrc, join(tarRoot, "podtui.desktop"));
|
||||
}
|
||||
}
|
||||
|
||||
const tar = Bun.spawnSync([
|
||||
"tar",
|
||||
"-czf",
|
||||
`${tarRoot}.tar.gz`,
|
||||
"-C",
|
||||
"dist",
|
||||
`podtui-${platform}-${arch}`,
|
||||
]);
|
||||
if (tar.exitCode !== 0) {
|
||||
console.error(tar.stderr.toString());
|
||||
process.exit(1);
|
||||
}
|
||||
console.log(`Tarball: ${tarRoot}.tar.gz`);
|
||||
rmSync(tarRoot, { recursive: true, force: true });
|
||||
}
|
||||
|
||||
console.log("Build complete");
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
preload = ["@opentui/solid/preload"]
|
||||
# No top-level `preload` here — dev/test get the solid JSX transform via the
|
||||
# explicit `--preload` flags in package.json and the [test] section below.
|
||||
# Releases don't read this file at all: build.ts compiles the standalone with
|
||||
# `autoloadBunfig: false`, so its embedded runtime ignores any bunfig.toml in
|
||||
# the launching directory — no more "preload not found" from CWD bunfigs.
|
||||
|
||||
[test]
|
||||
preload = "@opentui/solid/preload"
|
||||
|
||||
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
@@ -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
@@ -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
|
||||
547
discover/featured.json
Normal file
@@ -0,0 +1,547 @@
|
||||
{
|
||||
"version": 3,
|
||||
"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 & Politics"
|
||||
]
|
||||
},
|
||||
{
|
||||
"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-ben-shapiro",
|
||||
"title": "The Ben Shapiro Show",
|
||||
"description": "Ben Shapiro delivers unapologetically conservative commentary on the biggest news stories of the day, blending sharp analysis with his trademark fact-based approach.",
|
||||
"feedUrl": "https://feeds.megaphone.fm/benshow",
|
||||
"author": "The Daily Wire",
|
||||
"categories": [
|
||||
"News & Politics"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "discover-advisory-opinions",
|
||||
"title": "Advisory Opinions",
|
||||
"description": "Host Sarah Isgur and permanent guest David French have twice-weekly conversations about the law, the courts, their collision with politics, and why it all matters — from The Dispatch.",
|
||||
"feedUrl": "https://feeds.megaphone.fm/DISPME4573820108",
|
||||
"author": "The Dispatch",
|
||||
"categories": [
|
||||
"News & Politics"
|
||||
]
|
||||
},
|
||||
{
|
||||
"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",
|
||||
"News & Politics"
|
||||
]
|
||||
},
|
||||
{
|
||||
"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 & Politics"
|
||||
]
|
||||
},
|
||||
{
|
||||
"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"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
18
package.json
@@ -8,31 +8,23 @@
|
||||
"podtui": "./dist/index.js"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "bun src/index.tsx",
|
||||
"dev": "bun --watch src/index.tsx",
|
||||
"start": "bun --preload @opentui/solid/preload src/index.tsx",
|
||||
"dev": "bun --preload @opentui/solid/preload --watch src/index.tsx",
|
||||
"build:native": "bash scripts/build-cavacore.sh",
|
||||
"build": "bun run build.ts",
|
||||
"dist": "bun dist/index.js",
|
||||
"test": "bun test",
|
||||
"lint": "bun run lint.ts"
|
||||
"lint": "bun tsc --noEmit"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/bun": "latest",
|
||||
"@types/uuid": "^11.0.0",
|
||||
"@typescript-eslint/eslint-plugin": "^8.54.0",
|
||||
"@typescript-eslint/parser": "^8.54.0",
|
||||
"eslint": "^9.39.2",
|
||||
"typescript": "^5.9.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/core": "^7.28.5",
|
||||
"@babel/preset-typescript": "^7.28.5",
|
||||
"@opentui/core": "^0.1.77",
|
||||
"@opentui/solid": "^0.1.77",
|
||||
"babel-preset-solid": "1.9.9",
|
||||
"date-fns": "^4.1.0",
|
||||
"solid-js": "^1.9.9",
|
||||
"uuid": "^13.0.0",
|
||||
"zustand": "^5.0.11"
|
||||
"effect": "^3",
|
||||
"solid-js": "^1.9.9"
|
||||
}
|
||||
}
|
||||
|
||||
41
packaging/aur/.SRCINFO
Normal file
@@ -0,0 +1,41 @@
|
||||
pkgbase = podtui-bin
|
||||
pkgdesc = Terminal podcast and audio player with synchronized audio-waveform visualization
|
||||
pkgver = 0.2.0
|
||||
pkgrel = 1
|
||||
url = https://github.com/mikefreno/podtui
|
||||
arch = x86_64
|
||||
arch = aarch64
|
||||
license = MIT
|
||||
depends = mpv
|
||||
provides = podtui
|
||||
conflicts = podtui
|
||||
options = !strip
|
||||
source_x86_64 = https://github.com/mikefreno/podtui/releases/download/v0.2.0/podtui-linux-x64.tar.gz
|
||||
source_x86_64 = https://github.com/mikefreno/podtui/releases/download/v0.2.0/LICENSE
|
||||
sha256sums_x86_64 = 5c2be309341bda9550ad7669b48d3f46341c687234ddfaa0c84a6a9177f049fc
|
||||
sha256sums_x86_64 = 106a1290f2b9942a43785938cc8ccb1f72cf360babc58316f8d7feee829e98fc
|
||||
source_aarch64 = https://github.com/mikefreno/podtui/releases/download/v0.2.0/podtui-linux-arm64.tar.gz
|
||||
source_aarch64 = https://github.com/mikefreno/podtui/releases/download/v0.2.0/LICENSE
|
||||
sha256sums_aarch64 = c9c22d3a18cd192f89fbd5ff712d3502c4de0cce7550156c6a0d48d76e56e0d5
|
||||
sha256sums_aarch64 = 106a1290f2b9942a43785938cc8ccb1f72cf360babc58316f8d7feee829e98fc
|
||||
|
||||
pkgname = podtui-bin
|
||||
pkgver = 0.2.0
|
||||
pkgrel = 1
|
||||
url = https://github.com/mikefreno/podtui
|
||||
pkgdesc = Terminal podcast and audio player with synchronized audio-waveform visualization
|
||||
arch = x86_64
|
||||
arch = aarch64
|
||||
license = MIT
|
||||
depends = mpv
|
||||
provides = podtui
|
||||
conflicts = podtui
|
||||
options = !strip
|
||||
source_x86_64 = https://github.com/mikefreno/podtui/releases/download/v0.2.0/podtui-linux-x64.tar.gz
|
||||
source_x86_64 = https://github.com/mikefreno/podtui/releases/download/v0.2.0/LICENSE
|
||||
sha256sums_x86_64 = 5c2be309341bda9550ad7669b48d3f46341c687234ddfaa0c84a6a9177f049fc
|
||||
sha256sums_x86_64 = 106a1290f2b9942a43785938cc8ccb1f72cf360babc58316f8d7feee829e98fc
|
||||
source_aarch64 = https://github.com/mikefreno/podtui/releases/download/v0.2.0/podtui-linux-arm64.tar.gz
|
||||
source_aarch64 = https://github.com/mikefreno/podtui/releases/download/v0.2.0/LICENSE
|
||||
sha256sums_aarch64 = c9c22d3a18cd192f89fbd5ff712d3502c4de0cce7550156c6a0d48d76e56e0d5
|
||||
sha256sums_aarch64 = 106a1290f2b9942a43785938cc8ccb1f72cf360babc58316f8d7feee829e98fc
|
||||
63
packaging/aur/PKGBUILD
Normal file
@@ -0,0 +1,63 @@
|
||||
# Maintainer: Michael Freno <michael.freno@gmail.com>
|
||||
# Contributor: Michael Freno <michael.freno@gmail.com>
|
||||
# podtui-bin — TUI podcast/audiobook player with synchronized audio-waveform
|
||||
# visualization. Serves the official standalone release binary and its two FFI
|
||||
# sibling libraries (libcavacore.so + libopentui.so) from GitHub Releases.
|
||||
#
|
||||
# The embedded Bun runtime is statically linked into the binary — no Bun, no
|
||||
# fftw needed at runtime (fftw3 is linked statically into libcavacore.so).
|
||||
|
||||
pkgname=podtui-bin
|
||||
_pkgname=podtui
|
||||
pkgver=0.2.0
|
||||
pkgrel=1
|
||||
pkgdesc="Terminal podcast and audio player with synchronized audio-waveform visualization"
|
||||
url="https://github.com/mikefreno/podtui"
|
||||
arch=('x86_64' 'aarch64')
|
||||
license=('MIT')
|
||||
depends=('mpv') # sole audio backend; no-op without it
|
||||
provides=("${_pkgname}")
|
||||
conflicts=("${_pkgname}")
|
||||
options=('!strip') # standalone binary, pre-minified
|
||||
source_x86_64=(
|
||||
"https://github.com/mikefreno/podtui/releases/download/v${pkgver}/podtui-linux-x64.tar.gz"
|
||||
"https://github.com/mikefreno/podtui/releases/download/v${pkgver}/LICENSE"
|
||||
)
|
||||
source_aarch64=(
|
||||
"https://github.com/mikefreno/podtui/releases/download/v${pkgver}/podtui-linux-arm64.tar.gz"
|
||||
"https://github.com/mikefreno/podtui/releases/download/v${pkgver}/LICENSE"
|
||||
)
|
||||
sha256sums_x86_64=(
|
||||
'5c2be309341bda9550ad7669b48d3f46341c687234ddfaa0c84a6a9177f049fc'
|
||||
'106a1290f2b9942a43785938cc8ccb1f72cf360babc58316f8d7feee829e98fc'
|
||||
)
|
||||
sha256sums_aarch64=(
|
||||
'c9c22d3a18cd192f89fbd5ff712d3502c4de0cce7550156c6a0d48d76e56e0d5'
|
||||
'106a1290f2b9942a43785938cc8ccb1f72cf360babc58316f8d7feee829e98fc'
|
||||
)
|
||||
|
||||
package() {
|
||||
local libdir
|
||||
|
||||
case "$CARCH" in
|
||||
x86_64) libdir="podtui-linux-x64" ;;
|
||||
aarch64) libdir="podtui-linux-arm64" ;;
|
||||
esac
|
||||
|
||||
# Binary + native FFI libs must stay side by side in /usr/lib/podtui/;
|
||||
# a /usr/bin symlink works because the embedded Bun runtime resolves
|
||||
# process.execPath through symlinks (verified against the compiled binary).
|
||||
install -Dm755 "${srcdir}/${libdir}/podtui" "${pkgdir}/usr/lib/podtui/podtui"
|
||||
install -Dm644 "${srcdir}/${libdir}/libcavacore.so" "${pkgdir}/usr/lib/podtui/libcavacore.so"
|
||||
install -Dm644 "${srcdir}/${libdir}/libopentui.so" "${pkgdir}/usr/lib/podtui/libopentui.so"
|
||||
ln -s /usr/lib/podtui/podtui "${pkgdir}/usr/bin/podtui"
|
||||
|
||||
# App icon + desktop entry ship inside the release tarball; Terminal=true
|
||||
# makes launchers drop the TUI into a terminal window.
|
||||
install -Dm644 "${srcdir}/${libdir}/podtui.png" \
|
||||
"${pkgdir}/usr/share/icons/hicolor/512x512/apps/podtui.png"
|
||||
install -Dm644 "${srcdir}/${libdir}/podtui.desktop" \
|
||||
"${pkgdir}/usr/share/applications/podtui.desktop"
|
||||
|
||||
install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
|
||||
}
|
||||
60
packaging/aur/gen-srcinfo.sh
Normal file
@@ -0,0 +1,60 @@
|
||||
#!/bin/bash
|
||||
# gen-srcinfo.sh — emit .SRCINFO for the podtui-bin PKGBUILD without makepkg.
|
||||
# Emits the same field set/ordering makepkg --printsrcinfo produces for this
|
||||
# PKGBUILD shape (single package, per-arch source + sha256sums arrays).
|
||||
set -euo pipefail
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
# shellcheck disable=SC1091
|
||||
. ./PKGBUILD
|
||||
|
||||
emit() { printf '\t%s = %s\n' "$1" "$2"; }
|
||||
emit_multi() { # $1 field, rest values
|
||||
local f="$1"
|
||||
shift
|
||||
for v in "$@"; do emit "$f" "$v"; done
|
||||
}
|
||||
|
||||
pkgbase_section() {
|
||||
echo "pkgbase = ${pkgname}"
|
||||
for f in pkgdesc pkgver pkgrel url; do
|
||||
v="${!f}"
|
||||
[ -n "${v:-}" ] && emit "$f" "$v"
|
||||
done
|
||||
[ -n "${install:-}" ] && emit install "$install"
|
||||
[ "${#arch[@]}" -gt 0 ] && emit_multi arch "${arch[@]}"
|
||||
[ "${#license[@]}" -gt 0 ] && emit_multi license "${license[@]}"
|
||||
[ "${#depends[@]}" -gt 0 ] && emit_multi depends "${depends[@]}"
|
||||
[ "${#provides[@]}" -gt 0 ] && emit_multi provides "${provides[@]}"
|
||||
[ "${#conflicts[@]}" -gt 0 ] && emit_multi conflicts "${conflicts[@]}"
|
||||
[ "${#options[@]}" -gt 0 ] && emit_multi options "${options[@]}"
|
||||
emit_arch_arrays
|
||||
}
|
||||
|
||||
emit_arch_arrays() {
|
||||
for a in "${arch[@]}"; do
|
||||
src_name="source_${a}"
|
||||
sha_name="sha256sums_${a}"
|
||||
src_val="${src_name}[@]"
|
||||
sha_val="${sha_name}[@]"
|
||||
[ "${#src_name}" -gt 0 ] && emit_multi "source_${a}" "${!src_val}"
|
||||
emit_multi "sha256sums_${a}" "${!sha_val}"
|
||||
done
|
||||
}
|
||||
|
||||
pkgbase_section
|
||||
echo ""
|
||||
echo "pkgname = ${pkgname}"
|
||||
for v in pkgver pkgrel url; do
|
||||
val="${!v}"
|
||||
[ -n "${val:-}" ] && emit "$v" "$val"
|
||||
done
|
||||
emit pkgdesc "$pkgdesc"
|
||||
[ "${#arch[@]}" -gt 0 ] && emit_multi arch "${arch[@]}"
|
||||
[ "${#license[@]}" -gt 0 ] && emit_multi license "${license[@]}"
|
||||
[ "${#depends[@]}" -gt 0 ] && emit_multi depends "${depends[@]}"
|
||||
[ "${#provides[@]}" -gt 0 ] && emit_multi provides "${provides[@]}"
|
||||
[ "${#conflicts[@]}" -gt 0 ] && emit_multi conflicts "${conflicts[@]}"
|
||||
[ "${#options[@]}" -gt 0 ] && emit_multi options "${options[@]}"
|
||||
emit_arch_arrays
|
||||
11
packaging/podtui.desktop
Normal file
@@ -0,0 +1,11 @@
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=PodTui
|
||||
GenericName=Podcast Player
|
||||
Comment=Terminal podcast and audio player with waveform visualization
|
||||
Exec=podtui
|
||||
Icon=podtui
|
||||
Terminal=true
|
||||
Categories=Audio;AudioVideo;Player;
|
||||
Keywords=podcast;audio;player;terminal;
|
||||
StartupNotify=false
|
||||
@@ -19,36 +19,58 @@ mkdir -p "$OUT_DIR"
|
||||
OS="$(uname -s)"
|
||||
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 [ "$ARCH" = "arm64" ]; then
|
||||
FFTW_PREFIX="${FFTW_PREFIX:-/opt/homebrew}"
|
||||
else
|
||||
FFTW_PREFIX="${FFTW_PREFIX:-/usr/local}"
|
||||
fi
|
||||
LIB_EXT="dylib"
|
||||
SHARED_FLAG="-dynamiclib"
|
||||
INSTALL_NAME="-install_name @rpath/libcavacore.dylib"
|
||||
LIB_EXT="dylib"
|
||||
SHARED_FLAG="-dynamiclib"
|
||||
INSTALL_NAME="-install_name @rpath/libcavacore.dylib"
|
||||
if [ "$ARCH" = "arm64" ]; then
|
||||
FFTW_HINTS="/opt/homebrew /usr/local"
|
||||
else
|
||||
FFTW_HINTS="/usr/local /opt/homebrew"
|
||||
fi
|
||||
else
|
||||
FFTW_PREFIX="${FFTW_PREFIX:-/usr}"
|
||||
LIB_EXT="so"
|
||||
SHARED_FLAG="-shared"
|
||||
INSTALL_NAME=""
|
||||
LIB_EXT="so"
|
||||
SHARED_FLAG="-shared"
|
||||
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
|
||||
|
||||
FFTW_INCLUDE="$FFTW_PREFIX/include"
|
||||
FFTW_STATIC="$FFTW_PREFIX/lib/libfftw3.a"
|
||||
|
||||
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
|
||||
if [ ! -d "$FFTW_INCLUDE" ]; then
|
||||
FFTW_INCLUDE="$FFTW_PREFIX/include/$(basename "$(dirname "$FFTW_STATIC")")"
|
||||
fi
|
||||
|
||||
if [ ! -f "$SRC" ]; then
|
||||
echo "Error: cavacore.c not found at $SRC"
|
||||
echo "Ensure the cava submodule is initialized: git submodule update --init"
|
||||
exit 1
|
||||
echo "Error: cavacore.c not found at $SRC"
|
||||
echo "The cava source is vendored under cava/ (from github.com/karlstav/cava, MIT)."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
OUT="$OUT_DIR/libcavacore.$LIB_EXT"
|
||||
@@ -59,21 +81,21 @@ echo " FFTW3: $FFTW_STATIC"
|
||||
echo " Output: $OUT"
|
||||
|
||||
cc -O2 \
|
||||
$SHARED_FLAG \
|
||||
$INSTALL_NAME \
|
||||
-fPIC \
|
||||
-I"$FFTW_INCLUDE" \
|
||||
-I"$ROOT/cava" \
|
||||
-o "$OUT" \
|
||||
"$SRC" \
|
||||
"$FFTW_STATIC" \
|
||||
-lm
|
||||
$SHARED_FLAG \
|
||||
$INSTALL_NAME \
|
||||
-fPIC \
|
||||
-I"$FFTW_INCLUDE" \
|
||||
-I"$ROOT/cava" \
|
||||
-o "$OUT" \
|
||||
"$SRC" \
|
||||
"$FFTW_STATIC" \
|
||||
-lm
|
||||
|
||||
echo "Built: $OUT"
|
||||
|
||||
# Verify exported symbols
|
||||
if [ "$OS" = "Darwin" ]; then
|
||||
echo ""
|
||||
echo "Exported symbols:"
|
||||
nm -gU "$OUT" | grep "cava_"
|
||||
echo ""
|
||||
echo "Exported symbols:"
|
||||
nm -gU "$OUT" | grep "cava_"
|
||||
fi
|
||||
|
||||
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-tap 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-tap self-updates within the hour (Formula"
|
||||
echo " URLs + sha256s); brew upgrade podtui afterwards."
|
||||
@@ -26,6 +26,8 @@
|
||||
* bun scripts/tui-harness.tsx type "<text>"
|
||||
* bun scripts/tui-harness.tsx wait <ms>
|
||||
* bun scripts/tui-harness.tsx resize <w> <h>
|
||||
* bun scripts/tui-harness.tsx mouse <x> <y> <down|up|click>
|
||||
* bun scripts/tui-harness.tsx mdrag <x1> <y1> <x2> <y2> # border/seek drag
|
||||
* bun scripts/tui-harness.tsx frame # re-render, no new action
|
||||
* bun scripts/tui-harness.tsx state [all|nav|audio|feed|app]
|
||||
* bun scripts/tui-harness.tsx actions # print action log
|
||||
@@ -79,7 +81,9 @@ type Action =
|
||||
| { t: "enter" | "escape" | "tab" | "space" | "backspace"; mods?: Mod[] }
|
||||
| { t: "type"; s: string }
|
||||
| { t: "wait"; ms: number }
|
||||
| { t: "resize"; w: number; h: number };
|
||||
| { t: "resize"; w: number; h: number }
|
||||
| { t: "mouse"; kind: "down" | "up" | "click"; x: number; y: number }
|
||||
| { t: "mdrag"; x1: number; y1: number; x2: number; y2: number };
|
||||
|
||||
function loadActions(): Action[] {
|
||||
try {
|
||||
@@ -205,7 +209,7 @@ function parseFlags(rest: string[]): {
|
||||
} else if (a === "--from") {
|
||||
flags.from = rest[++i];
|
||||
} else {
|
||||
flags[a.slice(2)] = rest[++i] ?? true;
|
||||
throw new Error(`unknown flag: ${a}`);
|
||||
}
|
||||
} else {
|
||||
positional.push(a);
|
||||
@@ -222,52 +226,88 @@ function parseMods(positional: string[]): Mod[] {
|
||||
return mods;
|
||||
}
|
||||
|
||||
function buildAction(cmd: string, positional: string[]): Action | null {
|
||||
// Per-command builders. Leading positional tokens that name a modifier
|
||||
// (ctrl/shift/...) are stripped as mods; the rest is the command's data.
|
||||
const modsOrUndefined = (positional: string[]): Mod[] | undefined => {
|
||||
const mods = parseMods(positional);
|
||||
const first = positional[0];
|
||||
switch (cmd) {
|
||||
case "key":
|
||||
if (!first) throw new Error("key requires a <key> argument");
|
||||
return { t: "key", k: first, mods: mods.length ? mods : undefined };
|
||||
case "arrow":
|
||||
if (!first || !["up", "down", "left", "right"].includes(first))
|
||||
throw new Error("arrow requires up|down|left|right");
|
||||
return {
|
||||
t: "arrow",
|
||||
d: first as any,
|
||||
mods: mods.length ? mods : undefined,
|
||||
};
|
||||
case "enter":
|
||||
case "escape":
|
||||
case "tab":
|
||||
case "space":
|
||||
case "backspace":
|
||||
return { t: cmd, mods: mods.length ? mods : undefined };
|
||||
case "type":
|
||||
if (first === undefined) throw new Error("type requires <text>");
|
||||
// Re-join the rest in case text had spaces; positional[0] already is first token,
|
||||
// caller should quote. We join all positional as the text.
|
||||
return { t: "type", s: positional.join(" ") };
|
||||
case "wait":
|
||||
if (!first) throw new Error("wait requires <ms>");
|
||||
return { t: "wait", ms: parseInt(first, 10) || 0 };
|
||||
case "resize":
|
||||
if (!first || !positional[1]) throw new Error("resize requires <w> <h>");
|
||||
return {
|
||||
t: "resize",
|
||||
w: parseInt(first, 10) || 100,
|
||||
h: parseInt(positional[1], 10) || 30,
|
||||
};
|
||||
case "frame":
|
||||
case "state":
|
||||
case "reset":
|
||||
case "actions":
|
||||
case "init":
|
||||
case "seed":
|
||||
return null;
|
||||
default:
|
||||
throw new Error(`unknown command: ${cmd}`);
|
||||
}
|
||||
return mods.length ? mods : undefined;
|
||||
};
|
||||
|
||||
const BUILDERS: Record<string, (positional: string[]) => Action> = {
|
||||
key: (p) => {
|
||||
if (!p[0]) throw new Error("key requires a <key> argument");
|
||||
return { t: "key", k: p[0], mods: modsOrUndefined(p) };
|
||||
},
|
||||
arrow: (p) => {
|
||||
if (!p[0] || !["up", "down", "left", "right"].includes(p[0]))
|
||||
throw new Error("arrow requires up|down|left|right");
|
||||
return {
|
||||
t: "arrow",
|
||||
d: p[0] as "up" | "down" | "left" | "right",
|
||||
mods: modsOrUndefined(p),
|
||||
};
|
||||
},
|
||||
enter: (p) => ({ t: "enter", mods: modsOrUndefined(p) }),
|
||||
escape: (p) => ({ t: "escape", mods: modsOrUndefined(p) }),
|
||||
tab: (p) => ({ t: "tab", mods: modsOrUndefined(p) }),
|
||||
space: (p) => ({ t: "space", mods: modsOrUndefined(p) }),
|
||||
backspace: (p) => ({ t: "backspace", mods: modsOrUndefined(p) }),
|
||||
type: (p) => {
|
||||
if (p[0] === undefined) throw new Error("type requires <text>");
|
||||
// Re-join the rest in case text had spaces; p[0] already is first token,
|
||||
// caller should quote. We join all positional as the text.
|
||||
return { t: "type", s: p.join(" ") };
|
||||
},
|
||||
wait: (p) => {
|
||||
if (!p[0]) throw new Error("wait requires <ms>");
|
||||
return { t: "wait", ms: parseInt(p[0], 10) || 0 };
|
||||
},
|
||||
|
||||
resize: (p) => {
|
||||
if (!p[0] || !p[1]) throw new Error("resize requires <w> <h>");
|
||||
return {
|
||||
t: "resize",
|
||||
w: parseInt(p[0], 10) || 0,
|
||||
h: parseInt(p[1], 10) || 0,
|
||||
};
|
||||
},
|
||||
mouse: (p) => {
|
||||
if (!p[0] || !p[1] || !p[2]) throw new Error("mouse requires <x> <y> <down|up|click>");
|
||||
return {
|
||||
t: "mouse",
|
||||
kind: p[2] as "down" | "up" | "click",
|
||||
x: parseInt(p[0], 10),
|
||||
y: parseInt(p[1], 10),
|
||||
};
|
||||
},
|
||||
mdrag: (p) => {
|
||||
if (p.length < 4) throw new Error("mdrag requires <x1> <y1> <x2> <y2>");
|
||||
return {
|
||||
t: "mdrag",
|
||||
x1: parseInt(p[0], 10),
|
||||
y1: parseInt(p[1], 10),
|
||||
x2: parseInt(p[2], 10),
|
||||
y2: parseInt(p[3], 10),
|
||||
};
|
||||
},
|
||||
};
|
||||
|
||||
function buildAction(cmd: string, positional: string[]): Action | null {
|
||||
const builder = BUILDERS[cmd];
|
||||
if (builder) return builder(positional);
|
||||
// Local-only commands return early in main before this is reached; keep
|
||||
// the null contract so the public behavior is unchanged.
|
||||
if (
|
||||
cmd === "frame" ||
|
||||
cmd === "state" ||
|
||||
cmd === "reset" ||
|
||||
cmd === "actions" ||
|
||||
cmd === "init" ||
|
||||
cmd === "seed"
|
||||
)
|
||||
return null;
|
||||
// Single table-miss error for any unknown command.
|
||||
throw new Error(`unknown command: ${cmd}`);
|
||||
}
|
||||
|
||||
// ── Execute one action against a mounted setup ──────────────────────────────
|
||||
@@ -308,8 +348,13 @@ async function execAction(setup: any, a: Action): Promise<void> {
|
||||
case "wait":
|
||||
await new Promise((r) => setTimeout(r, a.ms));
|
||||
break;
|
||||
case "resize":
|
||||
setup.resize(a.w, a.h);
|
||||
case "mouse":
|
||||
if (a.kind === "click") await setup.mockMouse.click(a.x, a.y);
|
||||
else if (a.kind === "down") await setup.mockMouse.pressDown(a.x, a.y);
|
||||
else await setup.mockMouse.release(a.x, a.y);
|
||||
break;
|
||||
case "mdrag":
|
||||
await setup.mockMouse.drag(a.x1, a.y1, a.x2, a.y2);
|
||||
break;
|
||||
}
|
||||
await setup.renderOnce();
|
||||
@@ -317,26 +362,53 @@ async function execAction(setup: any, a: Action): Promise<void> {
|
||||
await new Promise((r) => setTimeout(r, 40));
|
||||
}
|
||||
|
||||
// ── Main ───────────────────────────────────────────────────────────────────
|
||||
async function main() {
|
||||
activateSandbox();
|
||||
captureIssues();
|
||||
// ── Mount, snapshot & output (extracted from main) ─────────────────────────
|
||||
// A line is "visually empty" if it's either fully blank OR contains only
|
||||
// box-drawing chars + whitespace (i.e. empty-pane interior padding like
|
||||
// "│ │"). Runs of these collapse to a single `…N` marker so an empty
|
||||
// 24-row pane costs 1 line, not 18.
|
||||
const BOX_CHARS = "│┌┐└─┤├┬┴┼┐┘┌└┤├┬┴┼┌┐└┘─│┤├┬┴┼";
|
||||
const isVisuallyEmpty = (l: string): boolean =>
|
||||
l === "" || [...l].every((ch) => ch === " " || BOX_CHARS.includes(ch));
|
||||
|
||||
const argv = process.argv.slice(2);
|
||||
const cmd = argv[0] ?? "frame";
|
||||
const { flags, positional } = parseFlags(argv.slice(1));
|
||||
function trimFrame(plainFrame: string): string {
|
||||
const lines = plainFrame
|
||||
.replace(/\n+$/, "")
|
||||
.split("\n")
|
||||
.map((l) => l.replace(/\s+$/, ""));
|
||||
while (lines.length && isVisuallyEmpty(lines[lines.length - 1]))
|
||||
lines.pop();
|
||||
const out: string[] = [];
|
||||
let blank = 0;
|
||||
const flushBlanks = () => {
|
||||
if (blank >= 3) out.push(` …${blank} empty`);
|
||||
else for (let i = 0; i < blank; i++) out.push("");
|
||||
blank = 0;
|
||||
};
|
||||
for (const l of lines) {
|
||||
if (isVisuallyEmpty(l)) {
|
||||
blank++;
|
||||
} else {
|
||||
flushBlanks();
|
||||
out.push(l);
|
||||
}
|
||||
}
|
||||
flushBlanks();
|
||||
return out.join("\n");
|
||||
}
|
||||
|
||||
// Local-only commands that don't mount.
|
||||
// Local-only commands that don't mount. Returns true if handled (main returns).
|
||||
function runLocal(cmd: string, flags: Record<string, string | boolean>): boolean {
|
||||
if (cmd === "reset") {
|
||||
saveActions([]);
|
||||
console.log("✔ actions log cleared.");
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
if (cmd === "actions") {
|
||||
const a = loadActions();
|
||||
console.log(`Action log (${a.length}):`);
|
||||
console.log(JSON.stringify(a, null, 2));
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
if (cmd === "seed") {
|
||||
const from = String(
|
||||
@@ -349,9 +421,29 @@ async function main() {
|
||||
const dest = join(process.env.XDG_CONFIG_HOME!, "podtui");
|
||||
cpSync(from, dest, { recursive: true });
|
||||
console.log(`✔ seeded sandbox config from ${from} → ${dest}`);
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
type FrameCapture = {
|
||||
lines: { spans: Span[] }[];
|
||||
cols: number;
|
||||
rows: number;
|
||||
cursor: [number, number];
|
||||
};
|
||||
|
||||
async function mountApp(
|
||||
flags: Record<string, string | boolean>,
|
||||
cmd: string,
|
||||
positional: string[],
|
||||
): Promise<{
|
||||
setup: any;
|
||||
spans: FrameCapture;
|
||||
plainFrame: string;
|
||||
audioControls: any;
|
||||
actions: Action[];
|
||||
}> {
|
||||
// Size settings.
|
||||
let width = 100;
|
||||
let height = 30;
|
||||
@@ -436,16 +528,9 @@ async function main() {
|
||||
}
|
||||
if (newAction) {
|
||||
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.
|
||||
delete process.env.PODTUI_AUDIO_BACKEND;
|
||||
await audioControls.switchBackend("mpv").catch(() => {});
|
||||
if (
|
||||
!audioControls.backendName() ||
|
||||
audioControls.backendName() === "none"
|
||||
) {
|
||||
await audioControls.switchBackend("afplay").catch(() => {});
|
||||
}
|
||||
}
|
||||
actions.push(newAction);
|
||||
saveActions(actions);
|
||||
@@ -455,12 +540,7 @@ async function main() {
|
||||
// Final settle + capture.
|
||||
await setup.renderOnce();
|
||||
await new Promise((r) => setTimeout(r, 60));
|
||||
const spans = setup.captureSpans() as {
|
||||
lines: { spans: Span[] }[];
|
||||
cols: number;
|
||||
rows: number;
|
||||
cursor: [number, number];
|
||||
};
|
||||
const spans = setup.captureSpans() as FrameCapture;
|
||||
const plainFrame = setup.captureCharFrame();
|
||||
|
||||
// Dump structured spans + plain frame.
|
||||
@@ -469,6 +549,10 @@ async function main() {
|
||||
writeFileSync(FRAME_TXT, plainFrame);
|
||||
} catch {}
|
||||
|
||||
return { setup, spans, plainFrame, audioControls, actions };
|
||||
}
|
||||
|
||||
async function snapshotState(audioControls: any): Promise<Record<string, unknown>> {
|
||||
// Store state snapshot.
|
||||
const state: Record<string, unknown> = {};
|
||||
try {
|
||||
@@ -511,9 +595,7 @@ async function main() {
|
||||
const feeds = fs_.feeds ? fs_.feeds() : [];
|
||||
state.feed = {
|
||||
count: feeds?.length ?? 0,
|
||||
sel: fs_.selectedFeedId ? fs_.selectedFeedId() : null,
|
||||
loading: fs_.isLoadingFeeds ? fs_.isLoadingFeeds() : null,
|
||||
titles: (feeds ?? []).slice(0, 8).map((f: any) => f?.podcast?.title),
|
||||
};
|
||||
} catch (e) {
|
||||
state.feed = "ERR: " + String(e);
|
||||
@@ -521,54 +603,31 @@ async function main() {
|
||||
try {
|
||||
writeFileSync(STATE_JSON, JSON.stringify(state));
|
||||
} catch {}
|
||||
return state;
|
||||
}
|
||||
|
||||
// ── Output ──────────────────────────────────────────────────────────────
|
||||
function emitOutput(p: {
|
||||
spans: FrameCapture;
|
||||
plainFrame: string;
|
||||
state: Record<string, unknown>;
|
||||
actions: Action[];
|
||||
cmd: string;
|
||||
flags: Record<string, string | boolean>;
|
||||
positional: string[];
|
||||
}): void {
|
||||
// Compact by default: trimmed frame, one-line state per section, no styles
|
||||
// block, no boilerplate footer. Use --styles / --verbose to opt back in.
|
||||
const verbose = !!flags.verbose;
|
||||
const scope = cmd === "state" ? String(positional[0] || "all") : "all";
|
||||
|
||||
// A line is "visually empty" if it's either fully blank OR contains only
|
||||
// box-drawing chars + whitespace (i.e. empty-pane interior padding like
|
||||
// "│ │"). Runs of these collapse to a single `…N` marker so an empty
|
||||
// 24-row pane costs 1 line, not 18.
|
||||
const BOX_CHARS = "│┌┐└─┤├┬┴┼┐┘┌└┤├┬┴┼┌┐└┘─│┤├┬┴┼";
|
||||
const isVisuallyEmpty = (l: string): boolean =>
|
||||
l === "" || [...l].every((ch) => ch === " " || BOX_CHARS.includes(ch));
|
||||
const frameTrimmed = (() => {
|
||||
const lines = plainFrame
|
||||
.replace(/\n+$/, "")
|
||||
.split("\n")
|
||||
.map((l) => l.replace(/\s+$/, ""));
|
||||
while (lines.length && isVisuallyEmpty(lines[lines.length - 1]))
|
||||
lines.pop();
|
||||
const out: string[] = [];
|
||||
let blank = 0;
|
||||
const flushBlanks = () => {
|
||||
if (blank >= 3) out.push(` …${blank} empty`);
|
||||
else for (let i = 0; i < blank; i++) out.push("");
|
||||
blank = 0;
|
||||
};
|
||||
for (const l of lines) {
|
||||
if (isVisuallyEmpty(l)) {
|
||||
blank++;
|
||||
} else {
|
||||
flushBlanks();
|
||||
out.push(l);
|
||||
}
|
||||
}
|
||||
flushBlanks();
|
||||
return out.join("\n");
|
||||
})();
|
||||
const verbose = !!p.flags.verbose;
|
||||
const scope = p.cmd === "state" ? String(p.positional[0] || "all") : "all";
|
||||
|
||||
console.log(
|
||||
`FRAME ${spans.cols}x${spans.rows} cur=${spans.cursor[0]},${spans.cursor[1]} acts=${actions.length} ${cmd}`,
|
||||
`FRAME ${p.spans.cols}x${p.spans.rows} cur=${p.spans.cursor[0]},${p.spans.cursor[1]} acts=${p.actions.length} ${p.cmd}`,
|
||||
);
|
||||
console.log(frameTrimmed);
|
||||
console.log(trimFrame(p.plainFrame));
|
||||
|
||||
// ── distinct styles: opt-in only (--styles OR --verbose) ──
|
||||
if (scope === "all" && (flags.styles || verbose)) {
|
||||
const styles = distinctStyles(spans);
|
||||
if (scope === "all" && (p.flags.styles || verbose)) {
|
||||
const styles = distinctStyles(p.spans);
|
||||
if (styles.length) {
|
||||
console.log("-- styles (top 20) --");
|
||||
for (const s of styles) console.log(` ${s.tag} ×${s.n} “${s.sample}”`);
|
||||
@@ -579,9 +638,9 @@ async function main() {
|
||||
const want = (k: string) => scope === "all" || scope === k;
|
||||
const compact = (obj: unknown): string =>
|
||||
verbose ? JSON.stringify(obj, null, 2) : JSON.stringify(obj);
|
||||
if (want("nav")) console.log("nav " + compact(state.nav));
|
||||
if (want("audio")) console.log("audio " + compact(state.audio));
|
||||
if (want("feed")) console.log("feed " + compact(state.feed));
|
||||
if (want("nav")) console.log("nav " + compact(p.state.nav));
|
||||
if (want("audio")) console.log("audio " + compact(p.state.audio));
|
||||
if (want("feed")) console.log("feed " + compact(p.state.feed));
|
||||
if (want("app")) console.log("app (not dumped in v1)");
|
||||
|
||||
// ── issues: terse ──
|
||||
@@ -593,12 +652,14 @@ async function main() {
|
||||
}
|
||||
|
||||
// Footer is identical every run — only print on init or --verbose.
|
||||
if (cmd === "init" || verbose) {
|
||||
if (p.cmd === "init" || verbose) {
|
||||
console.log(
|
||||
`(spans ${FRAME_JSON} | frame ${FRAME_TXT} | state ${STATE_JSON})`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
async function teardown(setup: any, audioControls: any): Promise<void> {
|
||||
// Tear down child processes (audio backend) before exit to avoid orphans.
|
||||
try {
|
||||
if (audioControls?.stop) await audioControls.stop().catch(() => {});
|
||||
@@ -613,6 +674,32 @@ async function main() {
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
// ── Main ───────────────────────────────────────────────────────────────────
|
||||
async function main() {
|
||||
activateSandbox();
|
||||
captureIssues();
|
||||
|
||||
const argv = process.argv.slice(2);
|
||||
const cmd = argv[0] ?? "frame";
|
||||
const { flags, positional } = parseFlags(argv.slice(1));
|
||||
|
||||
// Local-only commands that don't mount.
|
||||
if (runLocal(cmd, flags)) return;
|
||||
|
||||
const m = await mountApp(flags, cmd, positional);
|
||||
const state = await snapshotState(m.audioControls);
|
||||
emitOutput({
|
||||
spans: m.spans,
|
||||
plainFrame: m.plainFrame,
|
||||
state,
|
||||
actions: m.actions,
|
||||
cmd,
|
||||
flags,
|
||||
positional,
|
||||
});
|
||||
await teardown(m.setup, m.audioControls);
|
||||
}
|
||||
|
||||
main().catch((err) => {
|
||||
console.error("HARNESS FAILED:", err?.stack || err);
|
||||
process.exit(1);
|
||||
|
||||
10
src/App.tsx
@@ -1,6 +1,5 @@
|
||||
import { ErrorBoundary } from "solid-js";
|
||||
import { useSelectionHandler, useRenderer } from "@opentui/solid";
|
||||
import { useAuthStore } from "@/stores/auth";
|
||||
import { useAudio } from "@/hooks/useAudio";
|
||||
import { useMultimediaKeys } from "@/hooks/useMultimediaKeys";
|
||||
import { Clipboard } from "@/utils/clipboard";
|
||||
@@ -19,23 +18,21 @@ const DEBUG = import.meta.env.DEBUG;
|
||||
|
||||
export function App() {
|
||||
const nav = useNavigation();
|
||||
const auth = useAuthStore();
|
||||
const audio = useAudio();
|
||||
const toast = useToast();
|
||||
const renderer = useRenderer();
|
||||
const themeContext = useTheme();
|
||||
const theme = themeContext.theme;
|
||||
const keybind = useKeybinds();
|
||||
|
||||
// Multimedia keys (physical play/seek keys) still feed the audio backend
|
||||
// regardless of the on-screen yazi keybinds.
|
||||
// Multimedia keys (physical play/volume/speed keys) still feed the audio
|
||||
// backend regardless of the on-screen yazi keybinds. Seek lives on the
|
||||
// keybind router (< / > = shift+, / shift+.), so arrows stay on navigation.
|
||||
useMultimediaKeys({
|
||||
playerFocused: () =>
|
||||
nav.activeTab() === TABS.PLAYER && nav.mode() !== NavMode.NORMAL
|
||||
? true
|
||||
: false,
|
||||
inputFocused: () => nav.inputFocused(),
|
||||
hasEpisode: () => !!audio.currentEpisode(),
|
||||
});
|
||||
|
||||
// Mouse text-selection → clipboard (unchanged from the old shell).
|
||||
@@ -52,6 +49,7 @@ export function App() {
|
||||
});
|
||||
|
||||
const backgroundColor = () =>
|
||||
themeContext.transparentBackground() ||
|
||||
themeContext.selected === "system"
|
||||
? "transparent"
|
||||
: themeContext.theme.surface;
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
import type { Feed } from "../types/feed"
|
||||
import type { Episode } from "../types/episode"
|
||||
import type { Podcast } from "../types/podcast"
|
||||
import type { PodcastSource } from "../types/source"
|
||||
import { parseRSSFeed } from "@/api/rss-parser"
|
||||
import { handleAPISource, handleCustomSource, handleRSSSource } from "@/api/source-handler"
|
||||
|
||||
export const fetchEpisodes = async (feedUrl: string): Promise<Episode[]> => {
|
||||
try {
|
||||
const response = await fetch(feedUrl)
|
||||
if (!response.ok) return []
|
||||
const xml = await response.text()
|
||||
return parseRSSFeed(xml, feedUrl).episodes
|
||||
} catch {
|
||||
return []
|
||||
}
|
||||
}
|
||||
|
||||
export const fetchFeeds = async (
|
||||
sourceIds: string[],
|
||||
sources: PodcastSource[]
|
||||
): Promise<Feed[]> => {
|
||||
const active = sources.filter((source) => sourceIds.includes(source.id))
|
||||
const feeds: Feed[] = []
|
||||
|
||||
await Promise.all(
|
||||
active.map(async (source) => {
|
||||
try {
|
||||
if (source.type === "rss") {
|
||||
const rssFeeds = await handleRSSSource(source)
|
||||
feeds.push(...rssFeeds)
|
||||
} else if (source.type === "api") {
|
||||
const apiFeeds = await handleAPISource(source, "")
|
||||
feeds.push(...apiFeeds)
|
||||
} else {
|
||||
const customFeeds = await handleCustomSource(source, "")
|
||||
feeds.push(...customFeeds)
|
||||
}
|
||||
} catch {
|
||||
// ignore individual source errors
|
||||
}
|
||||
})
|
||||
)
|
||||
|
||||
return feeds
|
||||
}
|
||||
|
||||
export const searchPodcasts = async (
|
||||
query: string,
|
||||
sources: PodcastSource[]
|
||||
): Promise<Podcast[]> => {
|
||||
const results: Podcast[] = []
|
||||
await Promise.all(
|
||||
sources.map(async (source) => {
|
||||
try {
|
||||
if (source.type === "rss") {
|
||||
const feeds = await handleRSSSource(source)
|
||||
results.push(...feeds.map((feed: Feed) => feed.podcast))
|
||||
} else if (source.type === "api") {
|
||||
const feeds = await handleAPISource(source, query)
|
||||
results.push(...feeds.map((feed: Feed) => feed.podcast))
|
||||
} else {
|
||||
const feeds = await handleCustomSource(source, query)
|
||||
results.push(...feeds.map((feed: Feed) => feed.podcast))
|
||||
}
|
||||
} catch {
|
||||
// ignore errors
|
||||
}
|
||||
})
|
||||
)
|
||||
|
||||
return results
|
||||
}
|
||||
@@ -74,6 +74,114 @@ const parseEpisodeType = (raw: string): EpisodeType | undefined => {
|
||||
return undefined
|
||||
}
|
||||
|
||||
/** FNV-1a 32-bit hash. Deterministic across processes and Bun versions
|
||||
* (unlike Bun.hash) — used to derive stable episode ids from audio URLs so
|
||||
* a feed's episode ids never change between refreshes. */
|
||||
const fnv1a = (input: string): number => {
|
||||
let hash = 0x811c9dc5
|
||||
for (let i = 0; i < input.length; i++) {
|
||||
hash ^= input.charCodeAt(i)
|
||||
hash = Math.imul(hash, 0x01000193)
|
||||
}
|
||||
return hash >>> 0
|
||||
}
|
||||
|
||||
/**
|
||||
* Stable per-episode identity. The old positional id (`feedUrl#index`) was
|
||||
* invalidated by ANY feed change: a new episode or a pruned one shifted
|
||||
* every episode's index, so progress/downloads saved under `feedUrl#5`
|
||||
* attached to whatever episode now sat at index 5 — new episodes resumed
|
||||
* minutes in. Identity derives from stable content instead:
|
||||
* 1. `<guid>` — the canonical per-episode identifier (required by Apple
|
||||
* Podcasts; nearly universal).
|
||||
* 2. The enclosure URL, hashed to keep the id compact (hosts serve
|
||||
* permanent per-episode URLs; guids can be absent in hand-rolled feeds).
|
||||
* 3. Positional index as a last resort: no guid AND no audio URL means
|
||||
* the episode cannot be played, so nothing persistent keys off it.
|
||||
*/
|
||||
const stableEpisodeId = (
|
||||
feedUrl: string,
|
||||
item: string,
|
||||
audioUrl: string,
|
||||
index: number,
|
||||
): string => {
|
||||
const guid = getTagValue(item, "guid")
|
||||
if (guid) return `${feedUrl}#guid:${guid}`
|
||||
if (audioUrl) return `${feedUrl}#url:${fnv1a(audioUrl).toString(36)}`
|
||||
return `${feedUrl}#${index}`
|
||||
}
|
||||
|
||||
/** Extract the `<item>` blocks from an RSS document. Matches items directly
|
||||
* on the full XML string — scoping to <channel> first is a redundant 5MB
|
||||
* regex pass that doubles parse cost with no practical benefit (well-formed
|
||||
* RSS has no items outside <channel>). */
|
||||
export const getRSSItems = (xml: string): string[] => {
|
||||
return xml.match(/<item[\s\S]*?<\/item>/gi) ?? []
|
||||
}
|
||||
|
||||
/** Channel-level artwork: `<itunes:image href>` (podcasts) or RSS 2.0
|
||||
* `<image><url>`. Works on the full XML — channel-level tags precede
|
||||
* <item> blocks in RSS, so the first match is the channel image. */
|
||||
export const parseChannelCoverUrl = (xml: string): string | undefined => {
|
||||
const itunesHref = getAttr(xml, "itunes:image", "href")
|
||||
if (itunesHref) return itunesHref
|
||||
const url = getTagValue(xml, "image").match(/<url>([\s\S]*?)<\/url>/i)?.[1]
|
||||
return url?.trim() || undefined
|
||||
}
|
||||
|
||||
/** Parse a single `<item>` into an Episode. Exported so the feed store can
|
||||
* parse large feeds in bounded chunks (yielding to the event loop between
|
||||
* chunks) instead of one synchronous block. */
|
||||
export const parseRSSItem = (item: string, feedUrl: string, index: number): Episode => {
|
||||
const epTitle = cleanField(getTagValue(item, "title")) || `Episode ${index + 1}`
|
||||
const epDescription = cleanField(getTagValue(item, "description"))
|
||||
const pubDate = new Date(getTagValue(item, "pubDate") || Date.now())
|
||||
|
||||
const enclosure = item.match(/<enclosure[^>]*url=["']([^"']+)["'][^>]*>/i)
|
||||
const audioUrl = enclosure?.[1] ?? ""
|
||||
const fileSizeStr = getAttr(item, "enclosure", "length")
|
||||
const fileSize = fileSizeStr ? parseInt(fileSizeStr, 10) : undefined
|
||||
const mimeType = getAttr(item, "enclosure", "type") || undefined
|
||||
|
||||
const durationRaw = getTagValue(item, "itunes:duration")
|
||||
const duration = parseDuration(durationRaw)
|
||||
|
||||
const episodeNumRaw = getTagValue(item, "itunes:episode")
|
||||
const episodeNumber = episodeNumRaw ? parseInt(episodeNumRaw, 10) : undefined
|
||||
const seasonNumRaw = getTagValue(item, "itunes:season")
|
||||
const seasonNumber = seasonNumRaw ? parseInt(seasonNumRaw, 10) : undefined
|
||||
|
||||
const episodeType = parseEpisodeType(getTagValue(item, "itunes:episodeType"))
|
||||
const explicitRaw = getTagValue(item, "itunes:explicit").toLowerCase()
|
||||
const explicit = explicitRaw === "yes" || explicitRaw === "true" ? true : undefined
|
||||
|
||||
// Episode image (itunes:image has href attribute)
|
||||
const imageUrl = getAttr(item, "itunes:image", "href") || undefined
|
||||
|
||||
const ep: Episode = {
|
||||
id: stableEpisodeId(feedUrl, item, audioUrl, index),
|
||||
podcastId: feedUrl,
|
||||
title: epTitle,
|
||||
description: epDescription,
|
||||
audioUrl,
|
||||
duration,
|
||||
pubDate,
|
||||
}
|
||||
|
||||
if (episodeNumber !== undefined && !isNaN(episodeNumber)) ep.episodeNumber = episodeNumber
|
||||
if (seasonNumber !== undefined && !isNaN(seasonNumber)) ep.seasonNumber = seasonNumber
|
||||
if (episodeType) ep.episodeType = episodeType
|
||||
if (explicit !== undefined) ep.explicit = explicit
|
||||
if (imageUrl) ep.imageUrl = imageUrl
|
||||
if (fileSize !== undefined && !isNaN(fileSize) && fileSize > 0) ep.fileSize = fileSize
|
||||
if (mimeType) ep.mimeType = mimeType
|
||||
|
||||
return ep
|
||||
}
|
||||
|
||||
/** Parse a full RSS document (channel metadata + all episodes). The sync
|
||||
* whole-feed variant — callers that parse potentially huge feeds on a UI
|
||||
* thread should prefer the store's chunked incremental parse instead. */
|
||||
export const parseRSSFeed = (xml: string, feedUrl: string): Podcast & { episodes: Episode[] } => {
|
||||
const channel = xml.match(/<channel[\s\S]*?<\/channel>/i)?.[0] ?? xml
|
||||
const title = cleanField(getTagValue(channel, "title")) || "Untitled Podcast"
|
||||
@@ -81,58 +189,8 @@ export const parseRSSFeed = (xml: string, feedUrl: string): Podcast & { episodes
|
||||
const author = decodeEntities(getTagValue(channel, "itunes:author"))
|
||||
const lastUpdated = new Date()
|
||||
|
||||
const items = channel.match(/<item[\s\S]*?<\/item>/gi) ?? []
|
||||
const episodes = items.map((item, index) => {
|
||||
const epTitle = cleanField(getTagValue(item, "title")) || `Episode ${index + 1}`
|
||||
const epDescription = cleanField(getTagValue(item, "description"))
|
||||
const pubDate = new Date(getTagValue(item, "pubDate") || Date.now())
|
||||
|
||||
// Audio URL + file size + MIME type from <enclosure>
|
||||
const enclosure = item.match(/<enclosure[^>]*url=["']([^"']+)["'][^>]*>/i)
|
||||
const audioUrl = enclosure?.[1] ?? ""
|
||||
const fileSizeStr = getAttr(item, "enclosure", "length")
|
||||
const fileSize = fileSizeStr ? parseInt(fileSizeStr, 10) : undefined
|
||||
const mimeType = getAttr(item, "enclosure", "type") || undefined
|
||||
|
||||
// Duration from <itunes:duration>
|
||||
const durationRaw = getTagValue(item, "itunes:duration")
|
||||
const duration = parseDuration(durationRaw)
|
||||
|
||||
// Episode & season numbers
|
||||
const episodeNumRaw = getTagValue(item, "itunes:episode")
|
||||
const episodeNumber = episodeNumRaw ? parseInt(episodeNumRaw, 10) : undefined
|
||||
const seasonNumRaw = getTagValue(item, "itunes:season")
|
||||
const seasonNumber = seasonNumRaw ? parseInt(seasonNumRaw, 10) : undefined
|
||||
|
||||
// Episode type & explicit
|
||||
const episodeType = parseEpisodeType(getTagValue(item, "itunes:episodeType"))
|
||||
const explicitRaw = getTagValue(item, "itunes:explicit").toLowerCase()
|
||||
const explicit = explicitRaw === "yes" || explicitRaw === "true" ? true : undefined
|
||||
|
||||
// Episode image (itunes:image has href attribute)
|
||||
const imageUrl = getAttr(item, "itunes:image", "href") || undefined
|
||||
|
||||
const ep: Episode = {
|
||||
id: `${feedUrl}#${index}`,
|
||||
podcastId: feedUrl,
|
||||
title: epTitle,
|
||||
description: epDescription,
|
||||
audioUrl,
|
||||
duration,
|
||||
pubDate,
|
||||
}
|
||||
|
||||
// Only set optional fields if present
|
||||
if (episodeNumber !== undefined && !isNaN(episodeNumber)) ep.episodeNumber = episodeNumber
|
||||
if (seasonNumber !== undefined && !isNaN(seasonNumber)) ep.seasonNumber = seasonNumber
|
||||
if (episodeType) ep.episodeType = episodeType
|
||||
if (explicit !== undefined) ep.explicit = explicit
|
||||
if (imageUrl) ep.imageUrl = imageUrl
|
||||
if (fileSize !== undefined && !isNaN(fileSize) && fileSize > 0) ep.fileSize = fileSize
|
||||
if (mimeType) ep.mimeType = mimeType
|
||||
|
||||
return ep
|
||||
})
|
||||
const items = getRSSItems(xml)
|
||||
const episodes = items.map((item, index) => parseRSSItem(item, feedUrl, index))
|
||||
|
||||
return {
|
||||
id: feedUrl,
|
||||
@@ -142,6 +200,7 @@ export const parseRSSFeed = (xml: string, feedUrl: string): Podcast & { episodes
|
||||
feedUrl,
|
||||
lastUpdated,
|
||||
isSubscribed: true,
|
||||
coverUrl: parseChannelCoverUrl(channel),
|
||||
episodes,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,94 +0,0 @@
|
||||
import { FeedVisibility } from "../types/feed"
|
||||
import type { Feed } from "../types/feed"
|
||||
import type { PodcastSource } from "../types/source"
|
||||
import type { Podcast } from "../types/podcast"
|
||||
import { parseRSSFeed } from "./rss-parser"
|
||||
|
||||
const buildFeedFromPodcast = (podcast: Podcast, sourceId: string): Feed => {
|
||||
return {
|
||||
id: `${sourceId}-${podcast.id}`,
|
||||
podcast,
|
||||
episodes: [],
|
||||
visibility: FeedVisibility.PUBLIC,
|
||||
sourceId,
|
||||
lastUpdated: new Date(),
|
||||
isPinned: false,
|
||||
}
|
||||
}
|
||||
|
||||
export const handleRSSSource = async (source: PodcastSource): Promise<Feed[]> => {
|
||||
if (!source.baseUrl) return []
|
||||
const response = await fetch(source.baseUrl)
|
||||
if (!response.ok) return []
|
||||
const xml = await response.text()
|
||||
const parsed = parseRSSFeed(xml, source.baseUrl)
|
||||
return [
|
||||
{
|
||||
id: `${source.id}-${parsed.feedUrl}`,
|
||||
podcast: {
|
||||
id: parsed.id,
|
||||
title: parsed.title,
|
||||
description: parsed.description,
|
||||
feedUrl: parsed.feedUrl,
|
||||
author: parsed.author,
|
||||
categories: parsed.categories,
|
||||
lastUpdated: parsed.lastUpdated,
|
||||
isSubscribed: true,
|
||||
},
|
||||
episodes: parsed.episodes,
|
||||
visibility: FeedVisibility.PUBLIC,
|
||||
sourceId: source.id,
|
||||
lastUpdated: parsed.lastUpdated,
|
||||
isPinned: false,
|
||||
},
|
||||
]
|
||||
}
|
||||
|
||||
export const handleAPISource = async (
|
||||
source: PodcastSource,
|
||||
query: string
|
||||
): Promise<Feed[]> => {
|
||||
const url = new URL(source.baseUrl || "https://itunes.apple.com/search")
|
||||
url.searchParams.set("term", query || "podcast")
|
||||
url.searchParams.set("media", "podcast")
|
||||
url.searchParams.set("entity", "podcast")
|
||||
url.searchParams.set("country", source.country || "US")
|
||||
url.searchParams.set("lang", source.language || "en_us")
|
||||
|
||||
const response = await fetch(url.toString())
|
||||
if (!response.ok) return []
|
||||
const data = (await response.json()) as { results?: Array<{ collectionId?: number; collectionName?: string; feedUrl?: string; artistName?: string }> }
|
||||
const results = data.results ?? []
|
||||
|
||||
return results
|
||||
.filter((item) => item.collectionName && item.feedUrl)
|
||||
.map((item) => {
|
||||
const podcast: Podcast = {
|
||||
id: item.collectionId ? `itunes-${item.collectionId}` : `${source.id}-${item.collectionName}`,
|
||||
title: item.collectionName || "Untitled Podcast",
|
||||
description: item.collectionName || "",
|
||||
feedUrl: item.feedUrl || "",
|
||||
author: item.artistName,
|
||||
lastUpdated: new Date(),
|
||||
isSubscribed: false,
|
||||
}
|
||||
return buildFeedFromPodcast(podcast, source.id)
|
||||
})
|
||||
}
|
||||
|
||||
export const handleCustomSource = async (
|
||||
source: PodcastSource,
|
||||
query: string
|
||||
): Promise<Feed[]> => {
|
||||
if (!query) return []
|
||||
const podcast: Podcast = {
|
||||
id: `${source.id}-${query.toLowerCase().replace(/\s+/g, "-")}`,
|
||||
title: `${query} Highlights`,
|
||||
description: `Curated results for ${query}`,
|
||||
feedUrl: source.baseUrl || "",
|
||||
author: source.name,
|
||||
lastUpdated: new Date(),
|
||||
isSubscribed: false,
|
||||
}
|
||||
return [buildFeedFromPodcast(podcast, source.id)]
|
||||
}
|
||||
@@ -1,180 +0,0 @@
|
||||
/**
|
||||
* Code validation component for PodTUI
|
||||
* 8-character alphanumeric code input for sync authentication
|
||||
*/
|
||||
|
||||
import { createSignal } from "solid-js";
|
||||
import { useAuthStore } from "@/stores/auth";
|
||||
import { AUTH_CONFIG } from "@/config/auth";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
|
||||
interface CodeValidationProps {
|
||||
focused?: boolean;
|
||||
onBack?: () => void;
|
||||
}
|
||||
|
||||
type FocusField = "code" | "submit" | "back";
|
||||
|
||||
export function CodeValidation(props: CodeValidationProps) {
|
||||
const auth = useAuthStore();
|
||||
const { theme } = useTheme();
|
||||
const [code, setCode] = createSignal("");
|
||||
const [focusField, setFocusField] = createSignal<FocusField>("code");
|
||||
const [codeError, setCodeError] = createSignal<string | null>(null);
|
||||
|
||||
const fields: FocusField[] = ["code", "submit", "back"];
|
||||
|
||||
/** Format code as user types (uppercase, alphanumeric only) */
|
||||
const handleCodeInput = (value: string) => {
|
||||
const formatted = value.toUpperCase().replace(/[^A-Z0-9]/g, "");
|
||||
// Limit to max length
|
||||
const limited = formatted.slice(0, AUTH_CONFIG.codeValidation.codeLength);
|
||||
setCode(limited);
|
||||
|
||||
// Clear error when typing
|
||||
if (codeError()) {
|
||||
setCodeError(null);
|
||||
}
|
||||
};
|
||||
|
||||
const validateCode = (value: string): boolean => {
|
||||
if (!value) {
|
||||
setCodeError("Code is required");
|
||||
return false;
|
||||
}
|
||||
if (value.length !== AUTH_CONFIG.codeValidation.codeLength) {
|
||||
setCodeError(
|
||||
`Code must be ${AUTH_CONFIG.codeValidation.codeLength} characters`,
|
||||
);
|
||||
return false;
|
||||
}
|
||||
if (!AUTH_CONFIG.codeValidation.allowedChars.test(value)) {
|
||||
setCodeError("Code must contain only letters and numbers");
|
||||
return false;
|
||||
}
|
||||
setCodeError(null);
|
||||
return true;
|
||||
};
|
||||
|
||||
const handleSubmit = async () => {
|
||||
if (!validateCode(code())) {
|
||||
return;
|
||||
}
|
||||
|
||||
const success = await auth.validateCode(code());
|
||||
if (!success && auth.error) {
|
||||
setCodeError(auth.error.message);
|
||||
}
|
||||
};
|
||||
|
||||
const handleKeyPress = (key: { name: string; shift?: boolean }) => {
|
||||
if (key.name === "tab") {
|
||||
const currentIndex = fields.indexOf(focusField());
|
||||
const nextIndex = key.shift
|
||||
? (currentIndex - 1 + fields.length) % fields.length
|
||||
: (currentIndex + 1) % fields.length;
|
||||
setFocusField(fields[nextIndex]);
|
||||
} else if (key.name === "return" || key.name === "tab") {
|
||||
if (focusField() === "submit") {
|
||||
handleSubmit();
|
||||
} else if (focusField() === "back" && props.onBack) {
|
||||
props.onBack();
|
||||
}
|
||||
} else if (key.name === "escape" && props.onBack) {
|
||||
props.onBack();
|
||||
}
|
||||
};
|
||||
|
||||
const codeProgress = () => {
|
||||
const len = code().length;
|
||||
const max = AUTH_CONFIG.codeValidation.codeLength;
|
||||
return `${len}/${max}`;
|
||||
};
|
||||
|
||||
const codeDisplay = () => {
|
||||
const current = code();
|
||||
const max = AUTH_CONFIG.codeValidation.codeLength;
|
||||
const filled = current.split("");
|
||||
const empty = Array(max - filled.length).fill("_");
|
||||
return [...filled, ...empty].join(" ");
|
||||
};
|
||||
|
||||
return (
|
||||
<box flexDirection="column" border padding={2} gap={1} borderColor={theme.border}>
|
||||
<text fg={theme.text}>
|
||||
<strong>Enter Sync Code</strong>
|
||||
</text>
|
||||
|
||||
<box height={1} />
|
||||
|
||||
<text fg={theme.textMuted}>
|
||||
Enter your 8-character sync code to link your account.
|
||||
</text>
|
||||
<text fg={theme.textMuted}>You can get this code from the web portal.</text>
|
||||
|
||||
<box height={1} />
|
||||
|
||||
{/* Code display */}
|
||||
<box flexDirection="column" gap={0}>
|
||||
<text fg={focusField() === "code" ? theme.primary : undefined}>
|
||||
Code ({codeProgress()}):
|
||||
</text>
|
||||
|
||||
<box border padding={1} borderColor={theme.border}>
|
||||
<text
|
||||
fg={
|
||||
code().length === AUTH_CONFIG.codeValidation.codeLength
|
||||
? theme.success
|
||||
: theme.warning
|
||||
}
|
||||
>
|
||||
{codeDisplay()}
|
||||
</text>
|
||||
</box>
|
||||
|
||||
{/* Hidden input for actual typing */}
|
||||
<input
|
||||
value={code()}
|
||||
onInput={handleCodeInput}
|
||||
placeholder=""
|
||||
focused={props.focused && focusField() === "code"}
|
||||
width={30}
|
||||
/>
|
||||
|
||||
{codeError() && <text fg={theme.error}>{codeError()}</text>}
|
||||
</box>
|
||||
|
||||
<box height={1} />
|
||||
|
||||
{/* Action buttons */}
|
||||
<box flexDirection="row" gap={2}>
|
||||
<box
|
||||
border
|
||||
padding={1}
|
||||
backgroundColor={focusField() === "submit" ? theme.backgroundElement : undefined}
|
||||
>
|
||||
<text fg={focusField() === "submit" ? theme.primary : undefined}>
|
||||
{auth.isLoading ? "Validating..." : "[Enter] Validate Code"}
|
||||
</text>
|
||||
</box>
|
||||
|
||||
<box
|
||||
border
|
||||
padding={1}
|
||||
backgroundColor={focusField() === "back" ? theme.backgroundElement : undefined}
|
||||
>
|
||||
<text fg={focusField() === "back" ? theme.warning : theme.textMuted}>
|
||||
[Esc] Back to Login
|
||||
</text>
|
||||
</box>
|
||||
</box>
|
||||
|
||||
{/* Auth error message */}
|
||||
{auth.error && <text fg={theme.error}>{auth.error.message}</text>}
|
||||
|
||||
<box height={1} />
|
||||
|
||||
<text fg={theme.textMuted}>Tab to navigate, Enter to select, Esc to go back</text>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
257
src/components/EpisodeList.tsx
Normal file
@@ -0,0 +1,257 @@
|
||||
/**
|
||||
* Shared list-row and preview components for the Feed and My Shows pages.
|
||||
*
|
||||
* Both pages render the same episode rows (marker + title, optional subtitle
|
||||
* line, date/duration/selection/download meta line), "[Fetch More]" rows, and
|
||||
* hovered-episode / fetch-more preview panes; the pages differ only in the
|
||||
* props they pass (subtitle line, hint text, manual-mode wording). Extracted
|
||||
* so the previously 3-4-level-nested render blocks run as flat named
|
||||
* components.
|
||||
*
|
||||
* Anything that can change at runtime arrives as a signal getter: Solid
|
||||
* components do not re-render, so only props that are called inside the
|
||||
* component's own JSX stay reactive (focus, selection, download state).
|
||||
*/
|
||||
|
||||
import { Show } from "solid-js";
|
||||
import { format } from "date-fns";
|
||||
import type { RGBA } from "@opentui/core";
|
||||
import { useTerminalDimensions } from "@opentui/solid";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
import { useScrollIntoView } from "@/hooks/useScrollIntoView";
|
||||
import { NF_ICONS } from "@/utils/nerd-fonts";
|
||||
import { useHeldFlag } from "@/hooks/useHeldFlag";
|
||||
import { LoadingIndicator } from "@/components/LoadingIndicator";
|
||||
import type { Episode } from "@/types/episode";
|
||||
|
||||
// ── formatting helpers ──────────────────────────────────────────────────────
|
||||
export const formatDate = (d: Date) => format(d, "MMM d, yyyy");
|
||||
|
||||
export const formatDuration = (s: number) => {
|
||||
const mins = Math.floor(s / 60);
|
||||
const hrs = Math.floor(mins / 60);
|
||||
return hrs > 0 ? `${hrs}h ${mins % 60}m` : `${mins}m`;
|
||||
};
|
||||
|
||||
// ── EpisodeRow ──────────────────────────────────────────────────────────────
|
||||
export function EpisodeRow(props: {
|
||||
/** The episode this row renders. */
|
||||
episode: Episode;
|
||||
/** Optional second line under the title (podcast/show name). */
|
||||
subtitle?: () => string | undefined;
|
||||
/** For index signal (row position). */
|
||||
index: () => number;
|
||||
/** Focused row index in this list (-1 while the Fetch More row is
|
||||
* focused, so no episode row draws the cursor). */
|
||||
focused: () => number;
|
||||
/** Whether the current pane has keyboard focus. */
|
||||
active: () => boolean;
|
||||
/** Whether this episode is selection-marked. */
|
||||
selected: () => boolean;
|
||||
downloadLabel: () => string;
|
||||
downloadColor: () => RGBA;
|
||||
marker: () => string;
|
||||
onMouseDown: () => void;
|
||||
}) {
|
||||
const { theme } = useTheme();
|
||||
const muted = () => theme.muted || theme.text;
|
||||
const ref = useScrollIntoView(() => props.index() === props.focused());
|
||||
const isFocused = () => props.index() === props.focused();
|
||||
const bg = () =>
|
||||
isFocused() && props.active()
|
||||
? theme.primary
|
||||
: isFocused()
|
||||
? theme.border
|
||||
: undefined;
|
||||
const fg = () =>
|
||||
isFocused() && props.active()
|
||||
? theme.surface
|
||||
: isFocused()
|
||||
? theme.selectedListItemText ?? theme.text
|
||||
: theme.text;
|
||||
return (
|
||||
<box
|
||||
ref={ref}
|
||||
flexDirection="column"
|
||||
gap={0}
|
||||
paddingRight={1}
|
||||
backgroundColor={bg()}
|
||||
onMouseDown={props.onMouseDown}
|
||||
>
|
||||
<box flexDirection="row" gap={1}>
|
||||
<text flexShrink={0} fg={fg()}>
|
||||
{isFocused() ? props.marker() : " "}
|
||||
</text>
|
||||
<text wrapMode="none" truncate fg={fg()}>
|
||||
{props.episode.episodeNumber ? `#${props.episode.episodeNumber} ` : ""}
|
||||
{props.episode.title}
|
||||
</text>
|
||||
</box>
|
||||
{/* podcast name on its own row — readable at a glance; the 50%
|
||||
current pane fits it in full for typical names, and truncate
|
||||
keeps the row one line tall either way */}
|
||||
<Show when={props.subtitle?.()}>
|
||||
<box paddingLeft={2}>
|
||||
<text
|
||||
wrapMode="none"
|
||||
truncate
|
||||
fg={isFocused() ? theme.surface : theme.textSecondary}
|
||||
>
|
||||
{props.subtitle?.()}
|
||||
</text>
|
||||
</box>
|
||||
</Show>
|
||||
<box flexDirection="row" gap={2} paddingLeft={2}>
|
||||
<text flexShrink={0} fg={isFocused() ? theme.surface : theme.info}>
|
||||
{formatDate(props.episode.pubDate)}
|
||||
</text>
|
||||
<text flexShrink={0} fg={isFocused() ? theme.surface : muted()}>
|
||||
{formatDuration(props.episode.duration)}
|
||||
</text>
|
||||
<Show when={props.selected()}>
|
||||
<text flexShrink={0} fg={theme.warning}>
|
||||
●
|
||||
</text>
|
||||
</Show>
|
||||
<Show when={props.downloadLabel()}>
|
||||
<text flexShrink={0} fg={props.downloadColor()}>
|
||||
{props.downloadLabel()}
|
||||
</text>
|
||||
</Show>
|
||||
</box>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
// ── FetchMoreRow ────────────────────────────────────────────────────────────
|
||||
export function FetchMoreRow(props: {
|
||||
/** Row index of the Fetch More button within the list. */
|
||||
index: () => number;
|
||||
/** Focused row index. */
|
||||
focused: () => number;
|
||||
/** True while the Fetch More row itself is focused. */
|
||||
onMore: () => boolean;
|
||||
/** Whether the current pane has keyboard focus. */
|
||||
active: () => boolean;
|
||||
isLoadingMore: () => boolean;
|
||||
nerd: boolean;
|
||||
marker: () => string;
|
||||
onMouseDown: () => void;
|
||||
}) {
|
||||
const { theme } = useTheme();
|
||||
// Hold the spinner past the raw load signal: a warm-cache load can
|
||||
// begin and end between two renderer frames, and without the hold the
|
||||
// [Fetch More] → spinner swap paints zero frames.
|
||||
const loading = useHeldFlag(props.isLoadingMore);
|
||||
const ref = useScrollIntoView(props.onMore);
|
||||
const bg = () =>
|
||||
props.index() === props.focused() && props.active()
|
||||
? theme.primary
|
||||
: props.index() === props.focused()
|
||||
? theme.border
|
||||
: undefined;
|
||||
const fg = () =>
|
||||
props.index() === props.focused() && props.active()
|
||||
? theme.surface
|
||||
: props.index() === props.focused()
|
||||
? theme.selectedListItemText ?? theme.text
|
||||
: theme.text;
|
||||
return (
|
||||
<box
|
||||
ref={ref}
|
||||
flexDirection="row"
|
||||
gap={1}
|
||||
paddingRight={1}
|
||||
backgroundColor={bg()}
|
||||
onMouseDown={props.onMouseDown}
|
||||
>
|
||||
<text fg={fg()}>{props.onMore() ? props.marker() : " "}</text>
|
||||
{props.nerd && (
|
||||
<text fg={fg()}>{NF_ICONS.more}</text>
|
||||
)}
|
||||
<Show
|
||||
when={!loading()}
|
||||
fallback={<LoadingIndicator label="Fetching…" />}
|
||||
>
|
||||
<text fg={fg()}>[Fetch More]</text>
|
||||
</Show>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
// ── EpisodePreview ──────────────────────────────────────────────────────────
|
||||
export function EpisodePreview(props: {
|
||||
episode: () => Episode;
|
||||
/** Optional line under the meta row (podcast/show name). */
|
||||
subtitle?: () => string | undefined;
|
||||
author: () => string | undefined;
|
||||
downloadLabel: () => string;
|
||||
downloadColor: () => RGBA;
|
||||
/** Page-specific action-hint line. */
|
||||
hint: () => string;
|
||||
}) {
|
||||
const { theme } = useTheme();
|
||||
const muted = () => theme.muted || theme.text;
|
||||
const dims = useTerminalDimensions();
|
||||
return (
|
||||
<box flexDirection="column" gap={1} padding={1}>
|
||||
<text fg={theme.textPrimary ?? theme.text}>
|
||||
<strong>
|
||||
{props.episode().episodeNumber ? `#${props.episode().episodeNumber} ` : ""}
|
||||
{props.episode().title}
|
||||
</strong>
|
||||
</text>
|
||||
<box flexDirection="row" gap={2}>
|
||||
<text fg={theme.info}>{formatDate(props.episode().pubDate)}</text>
|
||||
<text fg={muted()}>{formatDuration(props.episode().duration)}</text>
|
||||
<Show when={props.downloadLabel()}>
|
||||
<text fg={props.downloadColor()}>{props.downloadLabel()}</text>
|
||||
</Show>
|
||||
</box>
|
||||
<Show when={props.subtitle?.()}>
|
||||
<text fg={muted()}>{props.subtitle?.()}</text>
|
||||
</Show>
|
||||
<Show when={props.author()}>
|
||||
<text fg={muted()}>by {props.author()}</text>
|
||||
</Show>
|
||||
<box height={1} />
|
||||
<Show
|
||||
when={props.episode().description}
|
||||
fallback={<text fg={theme.textSecondary}>No description available.</text>}
|
||||
>
|
||||
<scrollbox maxHeight={Math.floor(dims().height * 0.3)}>
|
||||
<text fg={theme.textSecondary}>{props.episode().description}</text>
|
||||
</scrollbox>
|
||||
</Show>
|
||||
<box height={1} />
|
||||
<text fg={muted()}>{props.hint()}</text>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
// ── FetchMorePreview ────────────────────────────────────────────────────────
|
||||
export function FetchMorePreview(props: {
|
||||
isLoadingMore: () => boolean;
|
||||
/** Manual-mode explanation line ("across all feeds" vs "for this show"). */
|
||||
manualText: () => string;
|
||||
}) {
|
||||
const { theme } = useTheme();
|
||||
const muted = () => theme.muted || theme.text;
|
||||
// Same minimum-spinning window as FetchMoreRow: keep the "Loading…"
|
||||
// line up across the (sub-frame) cached load burst.
|
||||
const loading = useHeldFlag(props.isLoadingMore);
|
||||
return (
|
||||
<box flexDirection="column" gap={1} padding={1}>
|
||||
<text fg={theme.textPrimary ?? theme.text}>
|
||||
<strong>[Fetch More]</strong>
|
||||
</text>
|
||||
<text fg={muted()}>
|
||||
{loading()
|
||||
? "Loading the next batch of episodes…"
|
||||
: props.manualText()}
|
||||
</text>
|
||||
<box height={1} />
|
||||
<text fg={muted()}>enter: load more · h back</text>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
39
src/components/GlobalActivityIndicator.tsx
Normal file
@@ -0,0 +1,39 @@
|
||||
import { Show } from "solid-js";
|
||||
import { useFeedStore } from "@/stores/feed";
|
||||
import { useSearchStore } from "@/stores/search";
|
||||
import { useDownloadStore } from "@/stores/download";
|
||||
import { useActivityStore } from "@/stores/activity";
|
||||
import { LoadingIndicator } from "@/components/LoadingIndicator";
|
||||
import { useHeldFlag } from "@/hooks/useHeldFlag";
|
||||
|
||||
/**
|
||||
* GlobalActivityIndicator — one global top-right signal that ANY feed
|
||||
* refresh, fetch-more, subscribe fetch, search, or download is in flight.
|
||||
* Per-page spinners are unchanged; this overlays the content row and status
|
||||
* bar as a single app-wide "something is happening" indicator.
|
||||
*/
|
||||
export function GlobalActivityIndicator() {
|
||||
const feedStore = useFeedStore();
|
||||
const searchStore = useSearchStore();
|
||||
const downloadStore = useDownloadStore();
|
||||
const activity = useActivityStore();
|
||||
// Fetch-more loads can begin and end between two renderer frames (warm
|
||||
// cache); hold the feed-more contribution so the indicator paints.
|
||||
const isLoadingMoreHeld = useHeldFlag(() => feedStore.isLoadingMore());
|
||||
|
||||
/** True while any tracked activity is in flight */
|
||||
const isActive = () =>
|
||||
feedStore.isLoadingFeeds() ||
|
||||
isLoadingMoreHeld() ||
|
||||
searchStore.isSearching() ||
|
||||
downloadStore.getActiveCount() + downloadStore.getQueue().length > 0 ||
|
||||
activity.isActive();
|
||||
|
||||
return (
|
||||
<Show when={isActive()}>
|
||||
<box position="absolute" top={0} right={0} paddingRight={1}>
|
||||
<LoadingIndicator />
|
||||
</box>
|
||||
</Show>
|
||||
);
|
||||
}
|
||||
@@ -1,24 +1,30 @@
|
||||
import { createSignal, createMemo, onCleanup } from "solid-js";
|
||||
import { createSignal, createMemo, Show, onCleanup } from "solid-js";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
|
||||
const spinnerChars = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
|
||||
|
||||
//TODO: Watch for actual loading state (fetching feeds)
|
||||
export function LoadingIndicator() {
|
||||
const { theme } = useTheme();
|
||||
const [index, setIndex] = createSignal(0);
|
||||
/**
|
||||
* Animated braille spinner with an optional label (e.g. "Refreshing…").
|
||||
* The spinner is rendered in the theme primary color; the label in muted.
|
||||
*/
|
||||
export function LoadingIndicator(props: { label?: string }) {
|
||||
const { theme } = useTheme();
|
||||
const [index, setIndex] = createSignal(0);
|
||||
|
||||
const interval = setInterval(() => {
|
||||
setIndex((i) => (i + 1) % spinnerChars.length);
|
||||
}, 65);
|
||||
const interval = setInterval(() => {
|
||||
setIndex((i) => (i + 1) % spinnerChars.length);
|
||||
}, 65);
|
||||
|
||||
onCleanup(() => clearInterval(interval));
|
||||
onCleanup(() => clearInterval(interval));
|
||||
|
||||
const currentChar = createMemo(() => spinnerChars[index()]);
|
||||
const currentChar = createMemo(() => spinnerChars[index()]);
|
||||
|
||||
return (
|
||||
<box flexDirection="row" justifyContent="flex-end" alignItems="flex-start">
|
||||
<text fg={theme.primary} content={currentChar()} />
|
||||
</box>
|
||||
);
|
||||
return (
|
||||
<box flexDirection="row" gap={1} alignItems="flex-start">
|
||||
<text fg={theme.primary} content={currentChar()} />
|
||||
<Show when={props.label}>
|
||||
<text fg={theme.muted || theme.text} content={props.label} />
|
||||
</Show>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
)
|
||||
}
|
||||
336
src/components/PaneRow.tsx
Normal file
@@ -0,0 +1,336 @@
|
||||
/**
|
||||
* PaneRow — the shared parent | current | preview 3-pane layout primitive.
|
||||
*
|
||||
* Implements yazi's resizable `mgr.ratio` contract: the two borders of the
|
||||
* CENTER (current) column are draggable and resize the neighboring panes.
|
||||
* Split positions live in the shared pane-layout store (`@/stores/pane-layout`)
|
||||
* as fractions of the row width; this component resolves them to pixel
|
||||
* columns, gives each column an explicit width (so the grab zones sit
|
||||
* exactly on the drawn borders), and renders two 3-column invisible grab
|
||||
* zones over the borders.
|
||||
*
|
||||
* Column semantics (per the yazi depth model):
|
||||
* parent — the previous-depth list. Renders a muted `—` placeholder and
|
||||
* keeps a minimum 15-col slot. Borderless.
|
||||
* current — the current-depth list. The only focusable content column; the
|
||||
* ONLY bordered column — left/right edges only, always muted.
|
||||
* preview — detail of the hovered item in `current`. Borderless.
|
||||
*
|
||||
* The primitive is purely structural: callers pass their own JSX per column
|
||||
* (static elements or accessors) plus the current-column title. Theme colors
|
||||
* are resolved internally via `useTheme()`. Only the current column's
|
||||
* `<scrollbox>` receives `focused`, so scroll focus follows the cursor.
|
||||
*
|
||||
* Example:
|
||||
* <PaneRow
|
||||
* parent={parentList}
|
||||
* current={currentList}
|
||||
* preview={detail}
|
||||
* currentLabel="List · 42"
|
||||
* focused={isActive}
|
||||
* />
|
||||
*/
|
||||
|
||||
import { createMemo, createSignal, Show } from "solid-js";
|
||||
import type { JSX } from "solid-js";
|
||||
import { useTerminalDimensions } from "@opentui/solid";
|
||||
import type { RGBA, BorderSides } from "@opentui/core";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
import {
|
||||
MIN_PANE_WIDTH,
|
||||
splitPixels,
|
||||
usePaneLayout,
|
||||
} from "@/stores/pane-layout";
|
||||
|
||||
// ── Types ───────────────────────────────────────────────────────────────────
|
||||
type PaneContent = JSX.Element | (() => JSX.Element);
|
||||
type PaneLabel = string | (() => string);
|
||||
|
||||
export type PaneRowProps = {
|
||||
/** Parent column content (previous-depth list, or null for a muted
|
||||
* placeholder — a minimum slot is always preserved). */
|
||||
parent?: PaneContent;
|
||||
/** Current column content (the focused list). */
|
||||
current?: PaneContent;
|
||||
/** Preview column content (detail of the hovered item). Omit/undefined
|
||||
* together with `panes={2}` to render a 2-pane parent|current row. */
|
||||
preview?: PaneContent;
|
||||
/** Title of the current column — rendered once, top-left in the parent
|
||||
* pane's header slot (the per-pane Up/Detail headers are gone). */
|
||||
currentLabel?: PaneLabel;
|
||||
/** Whether the current column's `<scrollbox>` receives scroll focus. Defaults to
|
||||
* true; pass `false` (or a signal) when the row is inactive. Does NOT change
|
||||
* border colors — the current column's border is always muted. */
|
||||
focused?: boolean | (() => boolean);
|
||||
/** Number of visible columns. `3` (default) = parent|current|preview;
|
||||
* `2` = parent|current (preview omitted, current grows to fill). */
|
||||
panes?: 2 | 3;
|
||||
/** Which sides of the current column's border render. Defaults to
|
||||
* `["left", "right"]` (the standard focused-list frame). */
|
||||
currentBorder?: boolean | BorderSides[];
|
||||
};
|
||||
|
||||
// ── Helpers ─────────────────────────────────────────────────────────────────
|
||||
function resolveLabel(v: PaneLabel | undefined): string {
|
||||
if (v == null) return "";
|
||||
return typeof v === "function" ? v() : v;
|
||||
}
|
||||
|
||||
/** Normalize a PaneContent (static JSX or accessor) into a reactive accessor.
|
||||
* We deliberately avoid Solid's `children()` helper: it flattens accessor
|
||||
* children into a stable resolved-nodes array and won't re-resolve on a
|
||||
* truthy→truthy root swap (e.g. the current pane switching between a
|
||||
* depth-1 list fragment and a depth-2 editor), freezing the previous
|
||||
* subtree. Instead the raw accessor feeds a reactive `{ expr ?? <Placeholder/> }`
|
||||
* expression — a tracked `insert` effect that disposes the old subtree and
|
||||
* mounts the new whenever the accessor returns a different element identity. */
|
||||
function normalizeContent(
|
||||
v: PaneContent | undefined,
|
||||
): () => JSX.Element | undefined {
|
||||
if (v == null) return () => undefined;
|
||||
return typeof v === "function" ? (v as () => JSX.Element) : () => v;
|
||||
}
|
||||
|
||||
function Placeholder(props: { color: () => RGBA }) {
|
||||
return (
|
||||
<box padding={1}>
|
||||
<text fg={props.color()}>—</text>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
// ── Pane column ─────────────────────────────────────────────────────────────
|
||||
function Pane(props: {
|
||||
width: number;
|
||||
label: () => string;
|
||||
content: () => JSX.Element | undefined;
|
||||
border: boolean | BorderSides[];
|
||||
scrollFocused: () => boolean;
|
||||
}) {
|
||||
const themeContext = useTheme();
|
||||
const theme = themeContext.theme;
|
||||
const muted = () => theme.muted ?? theme.textMuted ?? theme.text;
|
||||
|
||||
// Memoize the scroll-focus accessor result so the prop expression below
|
||||
// stays reactive when the underlying signal (e.g. `focused`) changes.
|
||||
const scrollFocused = createMemo(() => props.scrollFocused());
|
||||
|
||||
return (
|
||||
<box
|
||||
flexDirection="column"
|
||||
width={props.width}
|
||||
flexShrink={0}
|
||||
height="100%"
|
||||
>
|
||||
{/* ── title row: rendered only when the pane carries a label ────────── */}
|
||||
<Show when={props.label() !== ""}>
|
||||
<box
|
||||
height={1}
|
||||
paddingLeft={1}
|
||||
backgroundColor={
|
||||
themeContext.transparentBackground()
|
||||
? "transparent"
|
||||
: theme.background
|
||||
}
|
||||
>
|
||||
<text fg={theme.textSecondary}>{props.label()}</text>
|
||||
</box>
|
||||
</Show>
|
||||
{/* ── scrollbox; border always muted (focused or not) ──────────────── */}
|
||||
<scrollbox
|
||||
height="100%"
|
||||
focused={scrollFocused()}
|
||||
border={props.border}
|
||||
// Only supply colors when a border is requested — opentui flips a
|
||||
// borderless box to bordered when borderColor/focusedBorderColor
|
||||
// are passed, which would frame the parent/preview panes too.
|
||||
borderColor={props.border === false ? undefined : theme.border}
|
||||
focusedBorderColor={
|
||||
props.border === false ? undefined : theme.border
|
||||
}
|
||||
backgroundColor={
|
||||
themeContext.transparentBackground()
|
||||
? "transparent"
|
||||
: theme.background
|
||||
}
|
||||
>
|
||||
{props.content() ?? <Placeholder color={muted} />}
|
||||
</scrollbox>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
/** A 3-column invisible grab zone centered on one border of the current
|
||||
* pane: the border column plus one column of help padding on each side,
|
||||
* so the thin border is easy to target with a mouse. `onBegin` is called
|
||||
* on mousedown with the cursor's x; the row records that grab offset so
|
||||
* the border stays glued to the cursor while dragging. On hover or while
|
||||
* dragging it overdraws just the border column with a full-height accent
|
||||
* `│` line (a bordered box would render as a blocky rectangle instead).
|
||||
* The two padding columns are transparent; the hit grid is rect-based, so
|
||||
* they capture clicks too — they must never overlap interactive content. */
|
||||
function Splitter(props: {
|
||||
/** Column of the border itself. The strip spans `left - 1` .. `left + 1`
|
||||
* (the border plus one help-padded column each side); the highlight
|
||||
* renders at `left`. */
|
||||
left: number;
|
||||
active: boolean;
|
||||
onBegin: (x: number) => void;
|
||||
}) {
|
||||
const { theme } = useTheme();
|
||||
const dims = useTerminalDimensions();
|
||||
const [hovered, setHovered] = createSignal(false);
|
||||
const highlighted = () => props.active || hovered();
|
||||
return (
|
||||
<box
|
||||
position="absolute"
|
||||
left={props.left - 1}
|
||||
top={0}
|
||||
width={3}
|
||||
height="100%"
|
||||
onMouseDown={(e) => {
|
||||
e.preventDefault?.();
|
||||
props.onBegin(e.x);
|
||||
}}
|
||||
onMouseOver={() => setHovered(true)}
|
||||
onMouseOut={() => setHovered(false)}
|
||||
>
|
||||
<Show when={highlighted()}>
|
||||
{/* Draw the accent edge down the full pane height; the box clips
|
||||
* any excess rows below the row's bottom edge. */}
|
||||
<text fg={theme.primary} selectable={false}>
|
||||
{" │\n".repeat(dims().height)}
|
||||
</text>
|
||||
</Show>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
// ── Row primitive ───────────────────────────────────────────────────────────
|
||||
export function PaneRow(props: PaneRowProps) {
|
||||
/** true → the current column's scrollbox is focused (scroll follows cursor). */
|
||||
const focused = createMemo(() => {
|
||||
const f = props.focused;
|
||||
return typeof f === "function" ? f() : (f ?? true);
|
||||
});
|
||||
|
||||
// Normalize static JSX and accessor children into reactive accessors
|
||||
// (see normalizeContent for why we avoid Solid's `children()` helper).
|
||||
const parentContent = normalizeContent(props.parent);
|
||||
const currentContent = normalizeContent(props.current);
|
||||
const previewContent = normalizeContent(props.preview);
|
||||
|
||||
// The single title: the CURRENT column's label, rendered in the parent
|
||||
// pane's header slot (top-left). Current/preview panes have no headers.
|
||||
const currentLabel = createMemo(() => resolveLabel(props.currentLabel));
|
||||
|
||||
// 2-pane mode (parent|current) grows the current column to fill the
|
||||
// preview slot. Defaults to 3 (parent|current|preview).
|
||||
const panes = createMemo(() => props.panes ?? 3);
|
||||
const currentBorder = createMemo<boolean | BorderSides[]>(
|
||||
() => props.currentBorder ?? ["left", "right"],
|
||||
);
|
||||
|
||||
// Shared split state + terminal width drive explicit column widths so the
|
||||
// drag strips sit exactly on the drawn borders.
|
||||
const layout = usePaneLayout();
|
||||
const dims = useTerminalDimensions();
|
||||
const width = () => dims().width;
|
||||
const pixels = createMemo(() => splitPixels(width(), layout.splits()));
|
||||
const hasRoom = () =>
|
||||
width() >=
|
||||
MIN_PANE_WIDTH.parent + MIN_PANE_WIDTH.current + MIN_PANE_WIDTH.preview;
|
||||
|
||||
// Column widths in pixels (sum to the row width).
|
||||
const parentWidth = () => pixels().leftPx;
|
||||
const currentWidth = () =>
|
||||
panes() === 2
|
||||
? width() - pixels().leftPx
|
||||
: pixels().rightPx - pixels().leftPx;
|
||||
const previewWidth = () => width() - pixels().rightPx;
|
||||
|
||||
// ── Drag state ──────────────────────────────────────────────────────────
|
||||
// onMouseDown on a Splitter records which border is being dragged and
|
||||
// the cursor's grab offset from that border's column; the row then
|
||||
// lives-updates the split from the drag x (minus the offset, so the
|
||||
// border stays glued to the cursor) and commits on release.
|
||||
const [activeSplit, setActiveSplit] = createSignal<"left" | "right" | null>(
|
||||
null,
|
||||
);
|
||||
// Column of the border a strip centers on (the current pane's edge).
|
||||
const borderCol = (which: "left" | "right") =>
|
||||
which === "left" ? pixels().leftPx : pixels().rightPx - 1;
|
||||
// Cursor x relative to the grabbed border column. Set on mousedown and
|
||||
// subtracted from every drag x so the border tracks the cursor rather
|
||||
// than jumping to it.
|
||||
let grabOffset = 0;
|
||||
const beginDrag = (which: "left" | "right") => (x: number) => {
|
||||
grabOffset = x - borderCol(which);
|
||||
setActiveSplit(which);
|
||||
};
|
||||
const handleDrag = (e: { x: number }) => {
|
||||
const which = activeSplit();
|
||||
if (!which) return;
|
||||
if (which === "left") layout.setLeft(e.x - grabOffset, width());
|
||||
else layout.setRight(e.x - grabOffset, width());
|
||||
};
|
||||
const handleDragEnd = () => {
|
||||
if (activeSplit()) layout.commit();
|
||||
setActiveSplit(null);
|
||||
grabOffset = 0;
|
||||
};
|
||||
|
||||
return (
|
||||
<box
|
||||
flexDirection="row"
|
||||
width="100%"
|
||||
height="100%"
|
||||
flexGrow={1}
|
||||
onMouseDrag={handleDrag}
|
||||
onMouseDragEnd={handleDragEnd}
|
||||
onMouseUp={handleDragEnd}
|
||||
>
|
||||
{/* ── parent — previous-depth list; title row top-left ─────────────── */}
|
||||
<Pane
|
||||
width={parentWidth()}
|
||||
label={currentLabel}
|
||||
content={parentContent}
|
||||
border={false}
|
||||
scrollFocused={() => false}
|
||||
/>
|
||||
{/* ── current — the focused list; left/right borders only ─────────── */}
|
||||
<Pane
|
||||
width={currentWidth()}
|
||||
label={() => ""}
|
||||
content={currentContent}
|
||||
border={currentBorder()}
|
||||
scrollFocused={() => focused()}
|
||||
/>
|
||||
{/* ── preview (optional) — hovered-item detail; no border ─────────── */}
|
||||
<Show when={panes() === 3}>
|
||||
<Pane
|
||||
width={previewWidth()}
|
||||
label={() => ""}
|
||||
content={previewContent}
|
||||
border={false}
|
||||
scrollFocused={() => false}
|
||||
/>
|
||||
</Show>
|
||||
{/* ── drag handles over the current pane's borders ───────────────── */}
|
||||
<Show when={hasRoom()}>
|
||||
<Splitter
|
||||
left={borderCol("left")}
|
||||
active={activeSplit() === "left"}
|
||||
onBegin={beginDrag("left")}
|
||||
/>
|
||||
<Show when={panes() === 3}>
|
||||
<Splitter
|
||||
left={borderCol("right")}
|
||||
active={activeSplit() === "right"}
|
||||
onBegin={beginDrag("right")}
|
||||
/>
|
||||
</Show>
|
||||
</Show>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
@@ -20,7 +20,8 @@ export const SelectableBox: ParentComponent<
|
||||
backgroundColor={
|
||||
props.selected()
|
||||
? theme.primary
|
||||
: themeContext.selected === "system"
|
||||
: themeContext.transparentBackground() ||
|
||||
themeContext.selected === "system"
|
||||
? "transparent"
|
||||
: themeContext.theme.surface
|
||||
}
|
||||
|
||||
@@ -11,31 +11,24 @@
|
||||
* event bus. There is no sidebar pane.
|
||||
*/
|
||||
|
||||
import { createSignal, Show, For } from "solid-js";
|
||||
import { useKeyboard } from "@opentui/solid";
|
||||
import { createEffect, createSignal, onCleanup, Show, For } from "solid-js";
|
||||
import { useKeyboard, useRenderer, useTerminalDimensions } from "@opentui/solid";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
import { useKeybinds, type KeybindActionName } from "@/context/KeybindContext";
|
||||
import { useNavigation, NavMode } from "@/context/NavigationContext";
|
||||
import { useAudio } from "@/hooks/useAudio";
|
||||
import { useAudioNavStore, AudioSource } from "@/stores/audio-nav";
|
||||
import { useAudioNavStore } from "@/stores/audio-nav";
|
||||
import { useFeedStore } from "@/stores/feed";
|
||||
import type { Episode } from "@/types/episode";
|
||||
import { useAppStore } from "@/stores/app";
|
||||
import { useToast } from "@/ui/toast";
|
||||
import { emit } from "@/utils/event-bus";
|
||||
import { emit, on } from "@/utils/event-bus";
|
||||
import { feedForEpisode } from "@/utils/feed-resolve";
|
||||
import { LayerGraph } from "@/utils/layer-graph";
|
||||
import { TABS, TabPaneCount } from "@/utils/navigation";
|
||||
import { TABS } from "@/utils/navigation";
|
||||
import { createDispatcher } from "@/utils/dispatch";
|
||||
import { TabListPane } from "@/components/TabPanel";
|
||||
import { YaziPaneRow } from "@/components/YaziPaneRow";
|
||||
|
||||
const TAB_LABEL: Record<TABS, string> = {
|
||||
[TABS.FEED]: "Feed",
|
||||
[TABS.MYSHOWS]: "My Shows",
|
||||
[TABS.DISCOVER]: "Discover",
|
||||
[TABS.SEARCH]: "Search",
|
||||
[TABS.PLAYER]: "Player",
|
||||
[TABS.SETTINGS]: "Settings",
|
||||
};
|
||||
import { PaneRow } from "@/components/PaneRow";
|
||||
import { GlobalActivityIndicator } from "@/components/GlobalActivityIndicator";
|
||||
|
||||
export function Shell() {
|
||||
const theme = useTheme();
|
||||
@@ -43,12 +36,25 @@ export function Shell() {
|
||||
const nav = useNavigation();
|
||||
const k = useKeybinds();
|
||||
const audio = useAudio();
|
||||
const renderer = useRenderer();
|
||||
const audioNav = useAudioNavStore();
|
||||
const toast = useToast();
|
||||
const feedStore = useFeedStore();
|
||||
|
||||
const [showHelp, setShowHelp] = createSignal(false);
|
||||
|
||||
// ── Auto jump to Player on podcast start ───────────────────────────────────
|
||||
// Honor the `autoJumpToPlayer` preference: when a NEW episode starts (see
|
||||
// "player.started" — distinct from "player.play", which also fires on
|
||||
// resume), switch to the Player tab and drop into its content pane.
|
||||
on("player.started", () => {
|
||||
const app = useAppStore();
|
||||
if (app.state().preferences.autoJumpToPlayer) {
|
||||
nav.setActiveTab(TABS.PLAYER);
|
||||
nav.enterTabContent(); // PLAYER is a depth-tab — enter its content.
|
||||
}
|
||||
});
|
||||
|
||||
/** Play the episode adjacent (offset ±1) to the currently-playing one,
|
||||
* within its feed's episode list. Updates audio-nav context accordingly. */
|
||||
function advanceEpisode(offset: number) {
|
||||
@@ -84,74 +90,60 @@ export function Shell() {
|
||||
}
|
||||
|
||||
// ── Command bar dispatch ────────────────────────────────────────────────────
|
||||
const COMMANDS: Record<string, (arg: string) => void> = {
|
||||
quit: () => process.exit(0),
|
||||
exit: () => process.exit(0),
|
||||
q: () => process.exit(0),
|
||||
refresh: () =>
|
||||
emit("nav.action", {
|
||||
action: "refresh",
|
||||
tab: nav.activeTab(),
|
||||
pane: nav.activePane(),
|
||||
mode: nav.mode(),
|
||||
}),
|
||||
r: () =>
|
||||
emit("nav.action", {
|
||||
action: "refresh",
|
||||
tab: nav.activeTab(),
|
||||
pane: nav.activePane(),
|
||||
mode: nav.mode(),
|
||||
}),
|
||||
play: () => audio.togglePlayback().catch(() => {}),
|
||||
pause: () => audio.togglePlayback().catch(() => {}),
|
||||
p: () => audio.togglePlayback().catch(() => {}),
|
||||
next: () => advanceEpisode(1),
|
||||
n: () => advanceEpisode(1),
|
||||
prev: () => advanceEpisode(-1),
|
||||
seek: (arg) => {
|
||||
const n = Number(arg) || 0;
|
||||
audio.seek(n).catch(() => {});
|
||||
},
|
||||
feed: () => nav.setActiveTab(TABS.FEED),
|
||||
f: () => nav.setActiveTab(TABS.FEED),
|
||||
shows: () => nav.setActiveTab(TABS.MYSHOWS),
|
||||
myshows: () => nav.setActiveTab(TABS.MYSHOWS),
|
||||
discover: () => nav.setActiveTab(TABS.DISCOVER),
|
||||
d: () => nav.setActiveTab(TABS.DISCOVER),
|
||||
search: () => nav.setActiveTab(TABS.SEARCH),
|
||||
player: () => nav.setActiveTab(TABS.PLAYER),
|
||||
settings: () => nav.setActiveTab(TABS.SETTINGS),
|
||||
set: () => nav.setActiveTab(TABS.SETTINGS),
|
||||
help: () => setShowHelp((v) => !v),
|
||||
h: () => setShowHelp((v) => !v),
|
||||
};
|
||||
|
||||
function runCommand(raw: string) {
|
||||
const cmd = raw.trim();
|
||||
if (!cmd) return;
|
||||
const name = cmd.split(/\s+/)[0].toLowerCase();
|
||||
const arg = cmd.slice(name.length).trim();
|
||||
switch (name) {
|
||||
case "q":
|
||||
case "quit":
|
||||
case "exit":
|
||||
return process.exit(0);
|
||||
case "refresh":
|
||||
case "r":
|
||||
emit("nav.action", {
|
||||
action: "refresh",
|
||||
tab: nav.activeTab(),
|
||||
pane: nav.activePane(),
|
||||
mode: nav.mode(),
|
||||
});
|
||||
break;
|
||||
case "play":
|
||||
case "pause":
|
||||
case "p":
|
||||
audio.togglePlayback().catch(() => {});
|
||||
break;
|
||||
case "next":
|
||||
case "n":
|
||||
advanceEpisode(1);
|
||||
break;
|
||||
case "prev":
|
||||
advanceEpisode(-1);
|
||||
break;
|
||||
case "seek": {
|
||||
const n = Number(arg) || 0;
|
||||
audio.seek(n).catch(() => {});
|
||||
break;
|
||||
}
|
||||
case "feed":
|
||||
case "f":
|
||||
nav.setActiveTab(TABS.FEED);
|
||||
break;
|
||||
case "shows":
|
||||
case "myshows":
|
||||
nav.setActiveTab(TABS.MYSHOWS);
|
||||
break;
|
||||
case "discover":
|
||||
case "d":
|
||||
nav.setActiveTab(TABS.DISCOVER);
|
||||
break;
|
||||
case "search":
|
||||
nav.setActiveTab(TABS.SEARCH);
|
||||
break;
|
||||
case "player":
|
||||
nav.setActiveTab(TABS.PLAYER);
|
||||
break;
|
||||
case "settings":
|
||||
case "set":
|
||||
nav.setActiveTab(TABS.SETTINGS);
|
||||
break;
|
||||
case "help":
|
||||
case "h":
|
||||
setShowHelp((v) => !v);
|
||||
break;
|
||||
default:
|
||||
nav.setCommandError(`unknown command: ${name}`);
|
||||
// re-enter command mode so the user sees the error + can correct
|
||||
nav.enterCommand();
|
||||
nav.setCommandBuffer(cmd);
|
||||
}
|
||||
const unknownCommand = () => {
|
||||
nav.setCommandError(`unknown command: ${name}`);
|
||||
// re-enter command mode so the user sees the error + can correct
|
||||
nav.enterCommand();
|
||||
nav.setCommandBuffer(cmd);
|
||||
};
|
||||
(COMMANDS[name] ?? unknownCommand)(arg);
|
||||
}
|
||||
|
||||
// ── Command-mode key handling ───────────────────────────────────────────────
|
||||
@@ -178,7 +170,6 @@ export function Shell() {
|
||||
nav.backspaceCommand();
|
||||
return;
|
||||
}
|
||||
// printable char
|
||||
if (evt.name && evt.name.length === 1 && !evt.ctrl && !evt.meta) {
|
||||
evt.preventDefault();
|
||||
nav.appendCommand(evt.name);
|
||||
@@ -200,8 +191,21 @@ export function Shell() {
|
||||
|
||||
useKeyboard(
|
||||
(evt: any) => {
|
||||
// Input fields (search boxes, dialogs) own their keys.
|
||||
if (nav.inputFocused() && nav.mode() !== NavMode.COMMAND) return;
|
||||
// Input fields (search boxes, dialogs) own their keys — except Escape,
|
||||
// which defocuses the input so j/k/h navigation resumes (search: h back
|
||||
// to the tab root, j/k to move the recent-searches list).
|
||||
if (nav.inputFocused() && nav.mode() !== NavMode.COMMAND) {
|
||||
if (evt.name === "escape") {
|
||||
evt.preventDefault();
|
||||
nav.setInputFocused(false);
|
||||
// Actually blur the focused renderable too — setting the flag alone
|
||||
// leaves the opentui input owning keys, so nav keys would still be
|
||||
// typed into it. Blurring fires our useInputFocusNav BLURRED handler
|
||||
// (and re-blurs the SearchPage input via its `focused` prop).
|
||||
renderer.currentFocusedRenderable?.blur();
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (nav.mode() === NavMode.COMMAND) {
|
||||
handleCommandKey(evt);
|
||||
return;
|
||||
@@ -213,11 +217,16 @@ export function Shell() {
|
||||
);
|
||||
|
||||
// ── Status bar fragments ──────────────────────────────────────────────────
|
||||
const nowPlaying = () => {
|
||||
// Now-playing text carries the podcast name (custom name when set) when
|
||||
// the episode's feed is resolvable, mirroring advanceEpisode's lookup.
|
||||
const nowPlayingText = () => {
|
||||
const ep = audio.currentEpisode();
|
||||
if (!ep) return null;
|
||||
const title = ep.title.length > 40 ? ep.title.slice(0, 38) + "…" : ep.title;
|
||||
return `♪ ${title}`;
|
||||
const feeds = feedStore.getFilteredFeeds();
|
||||
const feed = feedForEpisode(feeds, ep);
|
||||
return feed
|
||||
? `♪ ${feed.customName || feed.podcast.title} — ${ep.title}`
|
||||
: `♪ ${ep.title}`;
|
||||
};
|
||||
const modeLabel = () =>
|
||||
nav.mode() === NavMode.NORMAL ? "" : `-- ${nav.mode()} --`;
|
||||
@@ -227,13 +236,77 @@ export function Shell() {
|
||||
.map((s) => s.key)
|
||||
.join(" ");
|
||||
|
||||
// ── Now-playing marquee ────────────────────────────────────────────────────
|
||||
// The now-playing segment takes the full remaining status-bar width and
|
||||
// marquee-scrolls when its text overflows; when it fits (or the bar is too
|
||||
// narrow to show anything) it renders statically. Each pass scrolls at
|
||||
// SCROLL_STEP_MS per char, then holds at the start for SCROLL_HOLD_MS
|
||||
// before scrolling again.
|
||||
const dims = useTerminalDimensions();
|
||||
const GAP = 3;
|
||||
const SCROLL_STEP_MS = 150;
|
||||
const SCROLL_HOLD_MS = 10_000;
|
||||
const [scrollOffset, setScrollOffset] = createSignal(0);
|
||||
const leftFixed = () =>
|
||||
modeLabel().length +
|
||||
(nav.selectedIds().length > 0
|
||||
? 4 + String(nav.selectedIds().length).length
|
||||
: 0);
|
||||
const rightFixed = () => k.pending().map((p) => p.key).join(" ").length + 3;
|
||||
const availableWidth = () =>
|
||||
Math.max(0, dims().width - leftFixed() - rightFixed() - 2);
|
||||
const visible = () => {
|
||||
const text = nowPlayingText();
|
||||
const avail = availableWidth();
|
||||
if (!text || avail <= 0) return "";
|
||||
if (text.length <= avail) return text;
|
||||
// Double the text with a gap so the wrap is seamless: the window
|
||||
// slides over text + gap + text without ever hitting the tail.
|
||||
return (text + " ".repeat(GAP) + text).slice(
|
||||
scrollOffset(),
|
||||
scrollOffset() + avail,
|
||||
);
|
||||
};
|
||||
createEffect(() => {
|
||||
const text = nowPlayingText();
|
||||
const avail = availableWidth();
|
||||
setScrollOffset(0);
|
||||
if (!text || avail <= 0 || text.length <= avail) return;
|
||||
const cycle = text.length + GAP - avail;
|
||||
// Hold at the start position for SCROLL_HOLD_MS, scroll one pass,
|
||||
// then hold again before the next pass.
|
||||
let holdId: ReturnType<typeof setTimeout> | null = null;
|
||||
let scrollId: ReturnType<typeof setInterval> | null = null;
|
||||
const startHold = () => {
|
||||
setScrollOffset(0);
|
||||
holdId = setTimeout(() => {
|
||||
scrollId = setInterval(() => {
|
||||
const next = scrollOffset() + 1;
|
||||
if (next >= cycle) {
|
||||
clearInterval(scrollId!);
|
||||
startHold();
|
||||
} else {
|
||||
setScrollOffset(next);
|
||||
}
|
||||
}, SCROLL_STEP_MS);
|
||||
}, SCROLL_HOLD_MS);
|
||||
};
|
||||
startHold();
|
||||
onCleanup(() => {
|
||||
if (holdId) clearTimeout(holdId);
|
||||
if (scrollId) clearInterval(scrollId);
|
||||
});
|
||||
});
|
||||
|
||||
return (
|
||||
<box
|
||||
flexDirection="column"
|
||||
width="100%"
|
||||
height="100%"
|
||||
backgroundColor={t.surface}
|
||||
>
|
||||
flexDirection="column"
|
||||
width="100%"
|
||||
height="100%"
|
||||
backgroundColor={
|
||||
theme.transparentBackground() ? "transparent" : t.surface
|
||||
}
|
||||
>
|
||||
{/* ── Middle row: tab list (pane 0) + active tab content (panes 1..n) ─ */}
|
||||
<box flexDirection="row" flexGrow={1} width="100%">
|
||||
<Show
|
||||
@@ -245,7 +318,7 @@ export function Shell() {
|
||||
}
|
||||
>
|
||||
{/* app root: the tab list is the CURRENT pane, nothing in UP */}
|
||||
<YaziPaneRow
|
||||
<PaneRow
|
||||
parent={
|
||||
<box padding={1}>
|
||||
<text fg={t.textMuted}>—</text>
|
||||
@@ -257,9 +330,7 @@ export function Shell() {
|
||||
<text fg={t.textMuted}>j/k move · l/Enter open a tab</text>
|
||||
</box>
|
||||
}
|
||||
parentLabel="Up"
|
||||
currentLabel="Tabs"
|
||||
previewLabel=""
|
||||
focused
|
||||
/>
|
||||
</Show>
|
||||
@@ -269,7 +340,11 @@ export function Shell() {
|
||||
flexDirection="row"
|
||||
height={1}
|
||||
width="100%"
|
||||
backgroundColor={t.backgroundPanel ?? t.background}
|
||||
backgroundColor={
|
||||
theme.transparentBackground()
|
||||
? "transparent"
|
||||
: (t.backgroundPanel ?? t.background)
|
||||
}
|
||||
>
|
||||
<Show
|
||||
when={nav.mode() === NavMode.COMMAND}
|
||||
@@ -278,26 +353,19 @@ export function Shell() {
|
||||
<text fg={t.accent} paddingLeft={1}>
|
||||
{modeLabel()}
|
||||
</text>
|
||||
<text fg={t.textMuted} paddingLeft={1}>
|
||||
{nav.atRootTab()
|
||||
? "Tabs · root"
|
||||
: `${TAB_LABEL[nav.activeTab()]} · ${
|
||||
nav.isDepthTab()
|
||||
? `depth ${nav.currentDepth()}`
|
||||
: `pane ${nav.activePane()}/${TabPaneCount[nav.activeTab()]}`
|
||||
}`}
|
||||
</text>
|
||||
<Show when={nav.selectedIds().length > 0}>
|
||||
<text fg={t.warning} paddingLeft={1}>
|
||||
● {nav.selectedIds().length}
|
||||
</text>
|
||||
</Show>
|
||||
<Show when={nowPlaying()}>
|
||||
<text fg={t.primary} paddingLeft={1}>
|
||||
{nowPlaying()}
|
||||
</text>
|
||||
<Show when={nowPlayingText()}>
|
||||
<box flexGrow={1} paddingLeft={1}>
|
||||
{/* content prop (not a text child): the babel-preset-solid JSX
|
||||
* transform HTML-escapes static string children (`<` → `<`),
|
||||
* which opentui renders verbatim; content bypasses that. */}
|
||||
<text fg={t.primary} content={visible()} />
|
||||
</box>
|
||||
</Show>
|
||||
<box flexGrow={1} />
|
||||
<text fg={t.textMuted} paddingRight={1}>
|
||||
{pendingLabel()}
|
||||
</text>
|
||||
@@ -327,6 +395,8 @@ export function Shell() {
|
||||
theme={t as any}
|
||||
/>
|
||||
</Show>
|
||||
{/* ── Global activity indicator (top-right overlay) ─────────────────────── */}
|
||||
<GlobalActivityIndicator />
|
||||
</box>
|
||||
);
|
||||
}
|
||||
@@ -378,6 +448,7 @@ function helpSections(k: ReturnType<typeof useKeybinds>) {
|
||||
["enter", "open"],
|
||||
["r", "refresh"],
|
||||
["s", "search"],
|
||||
[p("search-scope-toggle"), "shows/episodes"],
|
||||
["f", "filter"],
|
||||
[",", "sort"],
|
||||
[".", "hidden"],
|
||||
@@ -451,17 +522,5 @@ function k_match_escape(evt: any): boolean {
|
||||
);
|
||||
}
|
||||
|
||||
/** Exposed so App can route an externally-triggered "play episode" (e.g. from
|
||||
* search) into the player tab. */
|
||||
export function playEpisodeAndSwitch(
|
||||
nav: ReturnType<typeof useNavigation>,
|
||||
audio: ReturnType<typeof useAudio>,
|
||||
episode: import("@/types/episode").Episode,
|
||||
) {
|
||||
audio.play(episode);
|
||||
nav.setActiveTab(TABS.PLAYER);
|
||||
useAudioNavStore().setSource(AudioSource.FEED);
|
||||
}
|
||||
|
||||
// Re-export Episode type for callers building pane trees.
|
||||
export type { Episode };
|
||||
export type { Episode } from "@/types/episode";
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
import { For } from "solid-js";
|
||||
import { shortcuts } from "@/config/shortcuts";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
|
||||
/** Yazi-style keybind reference. The Shell has its own overlay; this component
|
||||
* is kept for embedding inside Settings or other surfaces. */
|
||||
export function ShortcutHelp() {
|
||||
const { theme } = useTheme();
|
||||
return (
|
||||
<box
|
||||
border
|
||||
title="Shortcuts"
|
||||
style={{ flexDirection: "column", padding: 1 }}
|
||||
>
|
||||
<box style={{ flexDirection: "column" }}>
|
||||
<For each={shortcuts}>
|
||||
{(s) => (
|
||||
<box style={{ flexDirection: "row" }} gap={2}>
|
||||
<text fg={theme.accent}>{s.keys}</text>
|
||||
<text fg={theme.text}>{s.action}</text>
|
||||
</box>
|
||||
)}
|
||||
</For>
|
||||
</box>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
import { TABS, TabsCount } from "@/utils/navigation";
|
||||
import { For } from "solid-js";
|
||||
import { SelectableBox, SelectableText } from "@/components/Selectable";
|
||||
import { useNavigation } from "@/context/NavigationContext";
|
||||
|
||||
export const tabs: TabDefinition[] = [
|
||||
{ id: TABS.FEED, label: "Feed" },
|
||||
{ id: TABS.MYSHOWS, label: "My Shows" },
|
||||
{ id: TABS.DISCOVER, label: "Discover" },
|
||||
{ id: TABS.SEARCH, label: "Search" },
|
||||
{ id: TABS.PLAYER, label: "Player" },
|
||||
{ id: TABS.SETTINGS, label: "Settings" },
|
||||
];
|
||||
|
||||
export function TabNavigation() {
|
||||
const { theme } = useTheme();
|
||||
const { activeTab, setActiveTab, activeDepth } = useNavigation();
|
||||
return (
|
||||
<box
|
||||
border
|
||||
borderColor={activeDepth() !== 0 ? theme.border : theme.accent}
|
||||
backgroundColor={"transparent"}
|
||||
style={{
|
||||
flexDirection: "column",
|
||||
width: 12,
|
||||
height: TabsCount * 3 + 2,
|
||||
}}
|
||||
>
|
||||
<For each={tabs}>
|
||||
{(tab) => (
|
||||
<SelectableBox
|
||||
border
|
||||
height={3}
|
||||
selected={() => tab.id == activeTab()}
|
||||
onMouseDown={() => setActiveTab(tab.id)}
|
||||
>
|
||||
<SelectableText
|
||||
selected={() => tab.id == activeTab()}
|
||||
primary
|
||||
alignSelf="center"
|
||||
>
|
||||
{tab.label}
|
||||
</SelectableText>
|
||||
</SelectableBox>
|
||||
)}
|
||||
</For>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
export type TabDefinition = {
|
||||
id: TABS;
|
||||
label: string;
|
||||
};
|
||||
@@ -2,77 +2,122 @@
|
||||
* TabListPane — the tab list as a pane you can drop into the UP | CURRENT |
|
||||
* PREVIEW flow (replaces the old fixed chrome tab column).
|
||||
*
|
||||
* Renders one row per tab (digit + label): the ACTIVE tab gets a ● marker and
|
||||
* accent fg; the CURSOR row (the one j/k hovers) gets the primary highlight.
|
||||
* `focused` only matters to the surrounding frame (the CURRENT column draws
|
||||
* its own accent ring in YaziPaneRow); when rendered as the muted UP/parent
|
||||
* column (`muted`), the cursor highlight is suppressed and only the active ●
|
||||
* shows, so it reads as the read-only parent listing.
|
||||
* Renders one row per tab (digit + label) using the same selection UI every
|
||||
* other yazi pane uses: the CURSOR row (the one j/k hovers) gets a `❯` marker
|
||||
* and the focus background (`theme.primary` when this pane is the CURRENT
|
||||
* column, `theme.border` when it is the muted UP/parent column). The ACTIVE
|
||||
* tab (the one whose content is open) always carries a `●` marker in accent so
|
||||
* it stays readable in both positions.
|
||||
*
|
||||
* `muted` marks the parent-column rendering: the highlight is dimmed (border
|
||||
* bg, text fg) rather than suppressed, so the Up pane still shows the cursor
|
||||
* and active tab — matching how every other pane's parent column renders its
|
||||
* focused row.
|
||||
*/
|
||||
|
||||
import { For } from "solid-js";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
import { useNavigation } from "@/context/NavigationContext";
|
||||
import { useScrollIntoView } from "@/hooks/useScrollIntoView";
|
||||
import { useSelectionMarker } from "@/hooks/useSelectionMarker";
|
||||
import { TABS } from "@/utils/navigation";
|
||||
import { NF_ICONS, supportsNerdFonts } from "@/utils/nerd-fonts";
|
||||
|
||||
const TAB_LABEL: Record<TABS, string> = {
|
||||
[TABS.FEED]: "Feed",
|
||||
[TABS.MYSHOWS]: "My Shows",
|
||||
[TABS.DISCOVER]: "Discover",
|
||||
[TABS.SEARCH]: "Search",
|
||||
[TABS.PLAYER]: "Player",
|
||||
[TABS.SETTINGS]: "Settings",
|
||||
[TABS.FEED]: "Feed",
|
||||
[TABS.MYSHOWS]: "My Shows",
|
||||
[TABS.DISCOVER]: "Discover",
|
||||
[TABS.SEARCH]: "Search",
|
||||
[TABS.PLAYER]: "Player",
|
||||
[TABS.SETTINGS]: "Settings",
|
||||
};
|
||||
|
||||
/** Nerd Font glyph per tab (rendered only when the terminal supports them). */
|
||||
const TAB_ICON: Record<TABS, string> = {
|
||||
[TABS.FEED]: NF_ICONS.feed,
|
||||
[TABS.MYSHOWS]: NF_ICONS.shows,
|
||||
[TABS.DISCOVER]: NF_ICONS.discover,
|
||||
[TABS.SEARCH]: NF_ICONS.search,
|
||||
[TABS.PLAYER]: NF_ICONS.player,
|
||||
[TABS.SETTINGS]: NF_ICONS.settings,
|
||||
};
|
||||
|
||||
/** Numeric TABS values, in declaration order (1..TabsCount). */
|
||||
const TAB_ORDER = Object.values(TABS).filter(
|
||||
(v): v is TABS => typeof v === "number",
|
||||
(v): v is TABS => typeof v === "number",
|
||||
) as TABS[];
|
||||
|
||||
export function TabListPane(props: { muted?: boolean }) {
|
||||
const { theme } = useTheme();
|
||||
const nav = useNavigation();
|
||||
// Static: detection never changes mid-session.
|
||||
const nerd = supportsNerdFonts();
|
||||
const { theme } = useTheme();
|
||||
const nav = useNavigation();
|
||||
const marker = useSelectionMarker();
|
||||
|
||||
const cursor = () => nav.tabCursor();
|
||||
const active = () => nav.activeTab();
|
||||
const muted = () => props.muted ?? false;
|
||||
const cursor = () => nav.tabCursor();
|
||||
const activeTab = () => nav.activeTab();
|
||||
/** `active=true` when this pane is the CURRENT column (Shell root);
|
||||
* `false` when it is the muted UP/parent column (pages' parent pane). */
|
||||
const active = () => !props.muted;
|
||||
|
||||
return (
|
||||
<For each={TAB_ORDER}>
|
||||
{(tab) => {
|
||||
const isCursor = () => cursor() === tab && !muted();
|
||||
const isActive = () => active() === tab;
|
||||
const fg = () =>
|
||||
isCursor()
|
||||
? theme.textSelectedPrimary
|
||||
: isActive()
|
||||
? theme.accent
|
||||
: theme.text;
|
||||
return (
|
||||
<box
|
||||
width="100%"
|
||||
height={1}
|
||||
flexDirection="row"
|
||||
backgroundColor={isCursor() ? theme.primary : "transparent"}
|
||||
>
|
||||
<text
|
||||
width={2}
|
||||
fg={isCursor() ? theme.textSelectedPrimary : "transparent"}
|
||||
>
|
||||
{isActive() ? "●" : " "}
|
||||
</text>
|
||||
<text
|
||||
width={2}
|
||||
fg={isCursor() ? theme.textSelectedPrimary : theme.textMuted}
|
||||
>
|
||||
{tab}
|
||||
</text>
|
||||
<text fg={fg()} paddingLeft={1}>
|
||||
{TAB_LABEL[tab]}
|
||||
</text>
|
||||
</box>
|
||||
);
|
||||
}}
|
||||
</For>
|
||||
);
|
||||
// Same focus-bg / focus-fg contract every other pane uses.
|
||||
const focusBg = (t: TABS) =>
|
||||
t === cursor() && active()
|
||||
? theme.primary
|
||||
: t === cursor()
|
||||
? theme.border
|
||||
: undefined;
|
||||
const focusFg = (t: TABS) =>
|
||||
t === cursor() && active()
|
||||
? theme.surface
|
||||
: t === cursor()
|
||||
? theme.selectedListItemText ?? theme.text
|
||||
: theme.text;
|
||||
|
||||
return (
|
||||
<For each={TAB_ORDER}>
|
||||
{(tab) => {
|
||||
const isCursor = () => cursor() === tab;
|
||||
const isActive = () => activeTab() === tab;
|
||||
// The active tab is only accented in the Up/parent position — when this
|
||||
// pane is CURRENT, the cursor highlight is the only highlight.
|
||||
const labelFg = () =>
|
||||
isCursor()
|
||||
? focusFg(tab)
|
||||
: isActive() && !active()
|
||||
? theme.accent
|
||||
: theme.text;
|
||||
const ref = useScrollIntoView(isCursor);
|
||||
return (
|
||||
<box
|
||||
ref={ref}
|
||||
width="100%"
|
||||
height={1}
|
||||
flexDirection="row"
|
||||
paddingRight={1}
|
||||
backgroundColor={focusBg(tab)}
|
||||
onMouseDown={() => {
|
||||
// Click = hover + open, the yazi "open" of the row
|
||||
// (switches to the tab and enters its content), the same
|
||||
// as l/Enter. Restores mouse support the tab-strip
|
||||
// refactor dropped.
|
||||
nav.setTabCursor(tab);
|
||||
nav.activateTabCursor();
|
||||
}}
|
||||
>
|
||||
{/* ── selection marker (j/k cursor) ─────────────────────────── */}
|
||||
<text fg={focusFg(tab)}>{isCursor() ? marker() : " "}</text>
|
||||
{nerd && (
|
||||
<text fg={focusFg(tab)} paddingRight={1}>
|
||||
{TAB_ICON[tab]}
|
||||
</text>
|
||||
)}
|
||||
<text fg={labelFg()} paddingLeft={1}>
|
||||
{TAB_LABEL[tab]}
|
||||
</text>
|
||||
</box>
|
||||
);
|
||||
}}
|
||||
</For>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,190 +0,0 @@
|
||||
/**
|
||||
* YaziPaneRow — the shared parent | current | preview 3-pane layout primitive.
|
||||
*
|
||||
* Implements yazi's `mgr.ratio = [1, 3, 3]` contract: three bordered columns
|
||||
* grow at 1/7 : 3/7 : 3/7 of the row width via Yoga `flexGrow`, so every list
|
||||
* tab renders an identical, layout-stable shell. Columns use `flexBasis={0}`
|
||||
* so the ratio is exact regardless of content width — a column's content can
|
||||
* never stretch its slot.
|
||||
*
|
||||
* Column semantics (per the yazi depth model):
|
||||
* parent — the previous-depth list. Renders a muted `—` placeholder and
|
||||
* KEEPS its 1/7 slot when blank (never collapses to width 0).
|
||||
* current — the current-depth list. The only focusable content column; it
|
||||
* carries the accent focus ring when `focused` is truthy.
|
||||
* preview — detail of the hovered item in `current`; always muted border.
|
||||
*
|
||||
* The primitive is purely structural: callers pass their own JSX per column
|
||||
* (static elements or accessors) plus header labels. Theme colors are resolved
|
||||
* internally via `useTheme()`. Only the current column's `<scrollbox>` receives
|
||||
* `focused`, so scroll focus follows the cursor (j/k stay in the current pane).
|
||||
*
|
||||
* Example:
|
||||
* <YaziPaneRow
|
||||
* parent={parentList}
|
||||
* current={currentList}
|
||||
* preview={detail}
|
||||
* parentLabel="Up"
|
||||
* currentLabel="List · 42"
|
||||
* previewLabel="Detail"
|
||||
* focused={isActive}
|
||||
* />
|
||||
*/
|
||||
|
||||
import { createMemo } from "solid-js";
|
||||
import type { JSX } from "solid-js";
|
||||
import type { RGBA } from "@opentui/core";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
import { PANE_RATIO } from "@/utils/navigation";
|
||||
|
||||
// ── Types ───────────────────────────────────────────────────────────────────
|
||||
type PaneContent = JSX.Element | (() => JSX.Element);
|
||||
type PaneLabel = string | (() => string);
|
||||
|
||||
export type YaziPaneRowProps = {
|
||||
/** Parent column content (previous-depth list, or null for a muted
|
||||
* placeholder — the 1/7 slot is always preserved). */
|
||||
parent?: PaneContent;
|
||||
/** Current column content (the focused list). */
|
||||
current?: PaneContent;
|
||||
/** Preview column content (detail of the hovered item). */
|
||||
preview?: PaneContent;
|
||||
parentLabel?: PaneLabel;
|
||||
currentLabel?: PaneLabel;
|
||||
previewLabel?: PaneLabel;
|
||||
/** Whether the current column carries the accent focus ring. Defaults to
|
||||
* true; pass `false` (or a signal) when the row is inactive. Parent and
|
||||
* preview columns always render muted borders. */
|
||||
focused?: boolean | (() => boolean);
|
||||
};
|
||||
|
||||
// ── Helpers ─────────────────────────────────────────────────────────────────
|
||||
function resolveLabel(v: PaneLabel | undefined): string {
|
||||
if (v == null) return "";
|
||||
return typeof v === "function" ? v() : v;
|
||||
}
|
||||
|
||||
/** Normalize a PaneContent (static JSX or accessor) into a reactive accessor.
|
||||
* We deliberately do NOT use Solid's `children()` helper here: that helper
|
||||
* flattens accessor children into a stable resolved-nodes array and is the
|
||||
* wrong tool for content whose ROOT swaps at runtime (e.g. the current pane
|
||||
* switching between a depth-1 list fragment and a depth-2 editor — both
|
||||
* truthy JSX roots). `children()` would not re-resolve on a truthy<@->truthy
|
||||
* root swap, freezing the previous subtree in place. Instead we hand the
|
||||
* raw accessor to a reactive `{ expr ?? <Placeholder/> }` expression below,
|
||||
* which Solid compiles into a tracked `insert` effect that disposes the old
|
||||
* subtree and mounts the new whenever the accessor returns a different
|
||||
* element identity. */
|
||||
function normalizeContent(
|
||||
v: PaneContent | undefined,
|
||||
): () => JSX.Element | undefined {
|
||||
if (v == null) return () => undefined;
|
||||
return typeof v === "function" ? (v as () => JSX.Element) : () => v;
|
||||
}
|
||||
|
||||
function Placeholder(props: { color: () => RGBA }) {
|
||||
return (
|
||||
<box padding={1}>
|
||||
<text fg={props.color()}>—</text>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
// ── Pane column ─────────────────────────────────────────────────────────────
|
||||
function YaziPane(props: {
|
||||
grow: number;
|
||||
label: () => string;
|
||||
content: () => JSX.Element | undefined;
|
||||
borderColor: () => RGBA;
|
||||
scrollFocused: () => boolean;
|
||||
}) {
|
||||
const { theme } = useTheme();
|
||||
const muted = () => theme.muted ?? theme.textMuted ?? theme.text;
|
||||
|
||||
// Memoize accessor results so the prop expressions below stay reactive
|
||||
// when the underlying signals (e.g. `focused`) change.
|
||||
const borderColor = createMemo(() => props.borderColor());
|
||||
const scrollFocused = createMemo(() => props.scrollFocused());
|
||||
|
||||
return (
|
||||
<box flexDirection="column" flexGrow={props.grow} flexBasis={0} height="100%">
|
||||
{/* ── slim header label row ─────────────────────────────────────────── */}
|
||||
<box height={1} paddingLeft={1} backgroundColor={theme.background}>
|
||||
<text fg={theme.textSecondary}>{props.label()}</text>
|
||||
</box>
|
||||
{/* ── bordered scrollbox ────────────────────────────────────────────── */}
|
||||
<scrollbox
|
||||
height="100%"
|
||||
focused={scrollFocused()}
|
||||
border
|
||||
borderColor={borderColor()}
|
||||
backgroundColor={theme.background}
|
||||
>
|
||||
{/*
|
||||
* Render the content accessor directly via a reactive expression.
|
||||
* `{ accessor() ?? <Placeholder/> }` compiles to a Solid `insert`
|
||||
* effect that re-runs whenever the accessor's tracked signals
|
||||
* change (e.g. `depth()` swapping the root from a list fragment to
|
||||
* an editor). Solid disposes the previously-rendered subtree and
|
||||
* mounts the new element identity. `null`/`undefined` falls back
|
||||
* to the muted placeholder so the parent pane keeps its 1/7 slot
|
||||
* visibly blank at depth 0. This is the correct tool for root
|
||||
* swapping — unlike Solid's `children()` / `<Show>`-children,
|
||||
* which only react to truthiness flips, not truthy<@->truthy root
|
||||
* identity changes.
|
||||
*/}
|
||||
{props.content() ?? <Placeholder color={muted} />}
|
||||
</scrollbox>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
// ── Row primitive ───────────────────────────────────────────────────────────
|
||||
export function YaziPaneRow(props: YaziPaneRowProps) {
|
||||
const { theme } = useTheme();
|
||||
|
||||
/** true → the current column gets the accent focus ring. */
|
||||
const focused = createMemo(() => {
|
||||
const f = props.focused;
|
||||
return typeof f === "function" ? f() : f ?? true;
|
||||
});
|
||||
|
||||
// Normalize static JSX and accessor children into reactive accessors
|
||||
// (see normalizeContent for why we avoid Solid's `children()` helper).
|
||||
const parentContent = normalizeContent(props.parent);
|
||||
const currentContent = normalizeContent(props.current);
|
||||
const previewContent = normalizeContent(props.preview);
|
||||
|
||||
const parentLabel = createMemo(() => resolveLabel(props.parentLabel));
|
||||
const currentLabel = createMemo(() => resolveLabel(props.currentLabel));
|
||||
const previewLabel = createMemo(() => resolveLabel(props.previewLabel));
|
||||
|
||||
return (
|
||||
<box flexDirection="row" flexGrow={1} width="100%" height="100%">
|
||||
{/* ── parent (1/7) — previous-depth list; always muted ─────────────── */}
|
||||
<YaziPane
|
||||
grow={PANE_RATIO.parent}
|
||||
label={parentLabel}
|
||||
content={parentContent}
|
||||
borderColor={() => theme.border}
|
||||
scrollFocused={() => false}
|
||||
/>
|
||||
{/* ── current (3/7) — the focused list; accent ring when focused ───── */}
|
||||
<YaziPane
|
||||
grow={PANE_RATIO.current}
|
||||
label={currentLabel}
|
||||
content={currentContent}
|
||||
borderColor={() => (focused() ? theme.accent : theme.border)}
|
||||
scrollFocused={() => focused()}
|
||||
/>
|
||||
{/* ── preview (3/7) — hovered-item detail; always muted ────────────── */}
|
||||
<YaziPane
|
||||
grow={PANE_RATIO.preview}
|
||||
label={previewLabel}
|
||||
content={previewContent}
|
||||
borderColor={() => theme.border}
|
||||
scrollFocused={() => false}
|
||||
/>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
@@ -1,75 +0,0 @@
|
||||
/**
|
||||
* Authentication configuration for PodTUI
|
||||
* Authentication is DISABLED by default - users can opt-in
|
||||
*/
|
||||
|
||||
import { OAuthProvider, type OAuthProviderConfig } from "../types/auth"
|
||||
|
||||
/** Default auth enabled state - DISABLED by default */
|
||||
export const DEFAULT_AUTH_ENABLED = false
|
||||
|
||||
/** Authentication configuration */
|
||||
export const AUTH_CONFIG = {
|
||||
/** Whether auth is enabled by default */
|
||||
defaultEnabled: DEFAULT_AUTH_ENABLED,
|
||||
|
||||
/** Code validation settings */
|
||||
codeValidation: {
|
||||
/** Code length (8 characters) */
|
||||
codeLength: 8,
|
||||
/** Allowed characters (alphanumeric) */
|
||||
allowedChars: /^[A-Z0-9]+$/,
|
||||
/** Code expiration time in minutes */
|
||||
expirationMinutes: 15,
|
||||
},
|
||||
|
||||
/** Password requirements */
|
||||
password: {
|
||||
minLength: 8,
|
||||
requireUppercase: false,
|
||||
requireLowercase: false,
|
||||
requireNumber: false,
|
||||
requireSpecial: false,
|
||||
},
|
||||
|
||||
/** Email validation */
|
||||
email: {
|
||||
pattern: /^[^\s@]+@[^\s@]+\.[^\s@]+$/,
|
||||
},
|
||||
|
||||
/** Local storage keys */
|
||||
storage: {
|
||||
authState: "podtui_auth_state",
|
||||
user: "podtui_user",
|
||||
lastLogin: "podtui_last_login",
|
||||
},
|
||||
} as const
|
||||
|
||||
/** OAuth provider configurations */
|
||||
export const OAUTH_PROVIDERS: OAuthProviderConfig[] = [
|
||||
{
|
||||
id: OAuthProvider.GOOGLE,
|
||||
name: "Google",
|
||||
enabled: false, // Not feasible in terminal
|
||||
description: "Sign in with Google (requires browser redirect)",
|
||||
},
|
||||
{
|
||||
id: OAuthProvider.APPLE,
|
||||
name: "Apple",
|
||||
enabled: false, // Not feasible in terminal
|
||||
description: "Sign in with Apple (requires browser redirect)",
|
||||
},
|
||||
]
|
||||
|
||||
/** Terminal OAuth limitation message */
|
||||
export const OAUTH_LIMITATION_MESSAGE = `
|
||||
OAuth authentication (Google, Apple) is not directly available in terminal applications.
|
||||
|
||||
To use OAuth:
|
||||
1. Visit the web portal in your browser
|
||||
2. Sign in with your preferred provider
|
||||
3. Generate a sync code
|
||||
4. Enter the code here to link your account
|
||||
|
||||
Alternatively, use email/password authentication or file-based sync.
|
||||
`.trim()
|
||||
@@ -11,7 +11,8 @@
|
||||
//
|
||||
// Yazi heritage: j/k move, h/l swipe between panes, Enter open, Space select,
|
||||
// v visual mode, gg/G top/bottom, [ ] switch tabs, 1-6 goto tab,
|
||||
// : command bar, q quit, ~ help. Audio transport kept on shifted keys / ctrl.
|
||||
// : / q command palette (q + Enter quits there), Q quick quit, ~ help.
|
||||
// Audio transport kept on shifted keys / ctrl.
|
||||
|
||||
// ── Movement (within a pane) ─────────────────────────────────────────────
|
||||
"move-down": ["j", "down"],
|
||||
@@ -50,17 +51,29 @@
|
||||
"tab-goto-5": ["5"],
|
||||
"tab-goto-6": ["6"],
|
||||
|
||||
// ── Command bar & help & quit ────────────────────────────────────────────
|
||||
"command": [":"],
|
||||
"quit": ["q", "ctrl-c"],
|
||||
// ── Command palette & help & quit ────────────────────────────────────────
|
||||
// q opens the command palette (neovim-style: type q + Enter to quit there).
|
||||
// Q (shift+q) is the instant quick quit. ctrl-c also quits.
|
||||
"command": [":", "q"],
|
||||
"quit": ["Q", "ctrl-c"],
|
||||
"help": ["~", "f1"],
|
||||
|
||||
// ── List operations (yazi: s search, f filter, , sort, . hidden, r refresh)
|
||||
"search": ["s"],
|
||||
"filter": ["f"],
|
||||
"search": ["s"],
|
||||
// tab toggles the Search page between show and episode scope (re-runs the
|
||||
// current query when viewing results)
|
||||
"search-scope-toggle": ["tab"],
|
||||
"filter": ["f"],
|
||||
"sort": [","],
|
||||
"toggle-hidden": ["."],
|
||||
"refresh": ["r"],
|
||||
"subscribe": ["a"], // subscribe focused show in place (Discover/Search)
|
||||
"unsubscribe": ["x"], // unsubscribe focused show in My Shows
|
||||
|
||||
// ── Downloads & auto-download whitelist ───────────────────────────────────
|
||||
"download": ["d"], // download the focused episode (detail pane)
|
||||
"delete-download": ["D"], // delete the focused episode's download (if any)
|
||||
"whitelist-toggle": ["w"], // add/remove the focused show from the auto-download whitelist (My Shows)
|
||||
|
||||
// ── Audio transport (preserved) ──────────────────────────────────────────
|
||||
// Kept on shifted single keys so they never collide with the yazi core
|
||||
@@ -68,6 +81,6 @@
|
||||
"audio-toggle": ["P"], // play / pause (shift+p)
|
||||
"audio-next": ["N"], // next episode (shift+n)
|
||||
"audio-prev": ["B"], // prev episode (shift+b)
|
||||
"audio-seek-forward": ["shift-."], // seek forward (shift+.)
|
||||
"audio-seek-backward": ["shift-,"] // seek backward (shift+,)
|
||||
"audio-seek-forward": ["shift-."], // seek forward (> = shift+.)
|
||||
"audio-seek-backward": ["shift-,"] // seek backward (< = shift+,)
|
||||
}
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
/**
|
||||
* Yazi-style keybind reference (mirrors src/config/keybinds.jsonc).
|
||||
* Shown in help overlays; the canonical source remains keybinds.jsonc.
|
||||
* Edit that file (or ~/.config/podtui/keybinds.jsonc) to remap.
|
||||
*/
|
||||
export const shortcuts = [
|
||||
{ keys: "j / k", action: "Move down / up (within pane)" },
|
||||
{ keys: "h / l", action: "Swipe to prev / next pane" },
|
||||
{ keys: "J / K", action: "Jump 5 lines down / up" },
|
||||
{ keys: "ctrl-d / u", action: "Half page down / up" },
|
||||
{ keys: "g g / G", action: "Go to top / bottom of list" },
|
||||
{ keys: "1-6", action: "Go to tab 1-6" },
|
||||
{ keys: "[ / ]", action: "Previous / next tab" },
|
||||
{ keys: "Enter", action: "Open / activate focused item" },
|
||||
{ keys: "Space", action: "Toggle selection on item" },
|
||||
{ keys: "v", action: "Enter visual (range) select mode" },
|
||||
{ keys: "ctrl-a / ctrl-r", action: "Select all / invert selection" },
|
||||
{ keys: "Esc", action: "Clear selection / exit visual / cancel" },
|
||||
{ keys: ":", action: "Open command bar (:quit :refresh :play …)" },
|
||||
{ keys: "r / s / f", action: "Refresh / search / filter" },
|
||||
{ keys: ", / .", action: "Sort / toggle hidden" },
|
||||
{ keys: "P / N / B", action: "Play-pause / next / prev episode" },
|
||||
{ keys: "< / >", action: "Seek backward / forward 10s" },
|
||||
{ keys: "~ / F1", action: "Help" },
|
||||
{ keys: "q", action: "Quit" },
|
||||
] as const;
|
||||
@@ -1,12 +0,0 @@
|
||||
export const syncFormats = {
|
||||
json: {
|
||||
version: "1.0",
|
||||
extension: ".json",
|
||||
},
|
||||
xml: {
|
||||
version: "1.0",
|
||||
extension: ".xml",
|
||||
},
|
||||
}
|
||||
|
||||
export const supportedSyncVersions = [syncFormats.json.version, syncFormats.xml.version]
|
||||
@@ -63,28 +63,21 @@ export type KeybindActionName =
|
||||
| "quit"
|
||||
| "help"
|
||||
| "search"
|
||||
| "search-scope-toggle"
|
||||
| "filter"
|
||||
| "sort"
|
||||
| "toggle-hidden"
|
||||
| "refresh"
|
||||
| "subscribe"
|
||||
| "unsubscribe"
|
||||
| "download"
|
||||
| "delete-download"
|
||||
| "whitelist-toggle"
|
||||
| "audio-toggle"
|
||||
| "audio-next"
|
||||
| "audio-prev"
|
||||
| "audio-seek-forward"
|
||||
| "audio-seek-backward"
|
||||
// legacy compat (kept so older callers don't crash)
|
||||
| "select"
|
||||
| "leader"
|
||||
| "inverseModifier"
|
||||
| "cycle"
|
||||
| "dive"
|
||||
| "out"
|
||||
| "up"
|
||||
| "down"
|
||||
| "left"
|
||||
| "right"
|
||||
| "audio-pause"
|
||||
| "audio-play";
|
||||
| "audio-seek-backward";
|
||||
|
||||
/** Resolved config: action -> list of alternative stroke-sequences. */
|
||||
export type KeybindsResolved = Partial<Record<KeybindActionName, KeybindSpec>>;
|
||||
@@ -145,7 +138,7 @@ export function parseBindingSpec(spec: KeybindSpec | undefined): Stroke[][] {
|
||||
}
|
||||
|
||||
/** Build a Stroke from a keyboard event (opentui shape: name + ctrl/shift/meta). */
|
||||
export function strokeFromEvent(evt: {
|
||||
function strokeFromEvent(evt: {
|
||||
name: string;
|
||||
ctrl?: boolean;
|
||||
meta?: boolean;
|
||||
@@ -153,7 +146,7 @@ export function strokeFromEvent(evt: {
|
||||
}): Stroke {
|
||||
// Uppercase letter events from opentui arrive as name="q" + shift; normalize.
|
||||
return {
|
||||
key: (evt.name ?? "").toLowerCase(),
|
||||
key: evt.name.toLowerCase(),
|
||||
ctrl: !!evt.ctrl,
|
||||
shift: !!evt.shift,
|
||||
meta: !!evt.meta,
|
||||
@@ -170,7 +163,7 @@ function strokeEq(a: Stroke, b: Stroke): boolean {
|
||||
}
|
||||
|
||||
/** A human label for a stroke, for the status bar / help. */
|
||||
export function strokeLabel(s: Stroke): string {
|
||||
function strokeLabel(s: Stroke): string {
|
||||
let out = "";
|
||||
if (s.ctrl) out += "C-";
|
||||
if (s.meta) out += "M-";
|
||||
@@ -179,7 +172,7 @@ export function strokeLabel(s: Stroke): string {
|
||||
return out;
|
||||
}
|
||||
|
||||
export function sequenceLabel(seq: Stroke[]): string {
|
||||
function sequenceLabel(seq: Stroke[]): string {
|
||||
return seq.map(strokeLabel).join(" ");
|
||||
}
|
||||
|
||||
@@ -337,17 +330,6 @@ export const { use: useKeybinds, provider: KeybindProvider } =
|
||||
return best;
|
||||
}
|
||||
|
||||
// `isInverting` kept for legacy callers; yazi model has no inverse mod,
|
||||
// so it always reports false. Migrated callers should use tryMatch().
|
||||
function isInverting(_evt: {
|
||||
name: string;
|
||||
ctrl?: boolean;
|
||||
meta?: boolean;
|
||||
shift?: boolean;
|
||||
}): boolean {
|
||||
return false;
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
load().catch(() => {});
|
||||
});
|
||||
@@ -365,7 +347,6 @@ export const { use: useKeybinds, provider: KeybindProvider } =
|
||||
pending,
|
||||
match,
|
||||
tryMatch,
|
||||
isInverting,
|
||||
print,
|
||||
save,
|
||||
load,
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { execFileSync } from "node:child_process";
|
||||
import { createEffect, createMemo, onMount, onCleanup } from "solid-js";
|
||||
import { createStore, produce } from "solid-js/store";
|
||||
import { useRenderer } from "@opentui/solid";
|
||||
@@ -9,7 +10,9 @@ import {
|
||||
generateSyntax,
|
||||
generateSubtleSyntax,
|
||||
} from "../utils/syntax-highlighter";
|
||||
import { resolveTerminalTheme, loadThemes } from "../utils/theme";
|
||||
import { resolveTerminalTheme } from "../utils/theme";
|
||||
import { getCustomThemes } from "../utils/custom-themes";
|
||||
import { detectModeFromBackground } from "../utils/system-theme";
|
||||
import { createSimpleContext } from "./helper";
|
||||
import {
|
||||
setupThemeSignalHandler,
|
||||
@@ -84,6 +87,8 @@ export type ThemeResolved = {
|
||||
muted?: RGBA;
|
||||
surface?: RGBA;
|
||||
selectedListItemText?: RGBA;
|
||||
/** Theme declares a transparent (terminal-bg-visible) background. */
|
||||
transparent?: boolean;
|
||||
layerBackgrounds?: {
|
||||
layer0: RGBA;
|
||||
layer1: RGBA;
|
||||
@@ -94,6 +99,69 @@ export type ThemeResolved = {
|
||||
thinkingOpacity?: number;
|
||||
};
|
||||
|
||||
/**
|
||||
* A TerminalColors with no values — used to keep the "system" theme rendering
|
||||
* with default ANSI colors + the detected dark/light mode when the terminal
|
||||
* cannot answer OSC queries (e.g. inside tmux without OSC forwarding).
|
||||
*/
|
||||
const EMPTY_TERMINAL_COLORS: TerminalColors = {
|
||||
palette: Array.from({ length: 16 }, () => null),
|
||||
defaultForeground: null,
|
||||
defaultBackground: null,
|
||||
cursorColor: null,
|
||||
mouseForeground: null,
|
||||
mouseBackground: null,
|
||||
tekForeground: null,
|
||||
tekBackground: null,
|
||||
highlightBackground: null,
|
||||
highlightForeground: null,
|
||||
};
|
||||
|
||||
/** Cached macOS appearance (dark/light), independent of the terminal. */
|
||||
let cachedOsMode: "dark" | "light" | null = null;
|
||||
|
||||
/**
|
||||
* How often to re-query the terminal for theme changes (OSC 10/11/12).
|
||||
* Terminals only answer these queries — they never push a color change —
|
||||
* so detection is a slow poll. 60 s keeps CPU cost unmeasurable while
|
||||
* still tracking theme flips within a reasonable delay.
|
||||
*/
|
||||
const SYSTEM_THEME_POLL_MS = 60_000;
|
||||
|
||||
/**
|
||||
* Detect the terminal's dark/light mode.
|
||||
*
|
||||
* Priority:
|
||||
* 1. The terminal's real background color (OSC 11 response) — terminal-specific.
|
||||
* 2. The macOS appearance via `defaults read -g AppleInterfaceStyle` — works
|
||||
* even inside tmux, where OSC queries are usually not forwarded.
|
||||
* An unset value means light mode (macOS defaults to light).
|
||||
* 3. null → keep whatever mode is currently active.
|
||||
*/
|
||||
function detectSystemMode(
|
||||
colors: TerminalColors | null,
|
||||
): "dark" | "light" | null {
|
||||
const fromBg = detectModeFromBackground(colors?.defaultBackground);
|
||||
if (fromBg) return fromBg;
|
||||
|
||||
if (process.platform === "darwin" && cachedOsMode === null) {
|
||||
let style: string | null = null;
|
||||
try {
|
||||
style = execFileSync("defaults", ["read", "-g", "AppleInterfaceStyle"], {
|
||||
encoding: "utf8",
|
||||
timeout: 2000,
|
||||
})
|
||||
.trim()
|
||||
.toLowerCase();
|
||||
} catch {
|
||||
// Unset → light appearance (macOS default).
|
||||
}
|
||||
cachedOsMode = style?.includes("dark") ? "dark" : "light";
|
||||
}
|
||||
|
||||
return cachedOsMode;
|
||||
}
|
||||
|
||||
/**
|
||||
* Theme context using the createSimpleContext pattern.
|
||||
*
|
||||
@@ -116,7 +184,7 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
|
||||
|
||||
function init() {
|
||||
resolveSystemTheme();
|
||||
loadThemes()
|
||||
getCustomThemes()
|
||||
.then((custom) => {
|
||||
setStore(
|
||||
produce((draft) => {
|
||||
@@ -128,7 +196,6 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
|
||||
setStore("active", "catppuccin");
|
||||
})
|
||||
.finally(() => {
|
||||
// Only set ready if not waiting for system theme
|
||||
if (store.active !== "system") {
|
||||
setStore("ready", true);
|
||||
}
|
||||
@@ -156,7 +223,12 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
|
||||
});
|
||||
}
|
||||
|
||||
async function resolveSystemTheme() {
|
||||
/**
|
||||
* Query the terminal's colors via OSC (palette + default fg/bg), with a
|
||||
* legacy-tmux fallback for servers < 3.6 that don't forward OSC replies.
|
||||
* Returns null when the terminal cannot answer.
|
||||
*/
|
||||
async function queryTerminalColors(): Promise<TerminalColors | null> {
|
||||
if (process.env.TMUX) {
|
||||
await waitForCapabilities();
|
||||
}
|
||||
@@ -195,6 +267,22 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
|
||||
}
|
||||
}
|
||||
|
||||
return colors;
|
||||
}
|
||||
|
||||
async function resolveSystemTheme() {
|
||||
const colors = await queryTerminalColors();
|
||||
|
||||
// ── dark/light mode detection ─────────────────────────────────────────
|
||||
// The provider starts with a hardcoded mode (e.g. "dark"); detect the
|
||||
// real one from the terminal's background color (OSC 11) or, when that
|
||||
// is unavailable (tmux without OSC forwarding), the OS appearance.
|
||||
const detectedMode = detectSystemMode(colors);
|
||||
if (detectedMode && detectedMode !== store.mode) {
|
||||
setStore("mode", detectedMode);
|
||||
emitThemeModeChanged(detectedMode);
|
||||
}
|
||||
|
||||
const hasPalette = Boolean(
|
||||
colors?.palette?.some((value) => Boolean(value)),
|
||||
);
|
||||
@@ -203,13 +291,14 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
|
||||
);
|
||||
|
||||
if (!hasPalette && !hasDefaultColors) {
|
||||
// No system colors available, fall back to default
|
||||
// This happens when the terminal doesn't support OSC palette queries
|
||||
// (e.g., running inside tmux, or on unsupported terminals)
|
||||
// No system colors available — the terminal can't answer OSC queries
|
||||
// (e.g. inside tmux, or unsupported terminals). Keep the "system"
|
||||
// theme anyway: the detected dark/light mode plus default ANSI colors
|
||||
// still produce a usable, mode-correct palette.
|
||||
if (store.active === "system") {
|
||||
setStore(
|
||||
produce((draft) => {
|
||||
draft.active = "catppuccin";
|
||||
draft.system = colors ?? EMPTY_TERMINAL_COLORS;
|
||||
draft.ready = true;
|
||||
}),
|
||||
);
|
||||
@@ -229,8 +318,55 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Poll for terminal theme changes: re-query OSC colors, update the
|
||||
* system palette when it differs, and re-detect dark/light mode.
|
||||
* Runs on a slow timer (see SYSTEM_THEME_POLL_MS); most polls change
|
||||
* nothing and only pay the idle query round-trip.
|
||||
*/
|
||||
async function pollSystemTheme() {
|
||||
if (!store.ready) return;
|
||||
const colors = await queryTerminalColors();
|
||||
if (!colors) return;
|
||||
|
||||
const current = store.system;
|
||||
const changed =
|
||||
!current ||
|
||||
current.defaultBackground !== colors.defaultBackground ||
|
||||
current.defaultForeground !== colors.defaultForeground ||
|
||||
current.palette.join(",") !== colors.palette.join(",");
|
||||
|
||||
if (changed) {
|
||||
setStore(
|
||||
produce((draft) => {
|
||||
draft.system = colors;
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
// Refresh the OS-appearance fallback only when the terminal cannot
|
||||
// report a background (e.g. tmux without OSC forwarding), so the
|
||||
// common path never spawns a subprocess.
|
||||
if (process.platform === "darwin" && !colors.defaultBackground) {
|
||||
cachedOsMode = null;
|
||||
}
|
||||
const detectedMode = detectSystemMode(colors);
|
||||
if (detectedMode && detectedMode !== store.mode) {
|
||||
setStore("mode", detectedMode);
|
||||
emitThemeModeChanged(detectedMode);
|
||||
}
|
||||
}
|
||||
|
||||
onMount(init);
|
||||
|
||||
// Poll the terminal for theme changes (see pollSystemTheme). Registered
|
||||
// once per provider init — SIGUSR2 re-runs the inner `init`, not this
|
||||
// closure, so the timer cannot stack.
|
||||
const pollTimer = setInterval(() => {
|
||||
void pollSystemTheme();
|
||||
}, SYSTEM_THEME_POLL_MS);
|
||||
onCleanup(() => clearInterval(pollTimer));
|
||||
|
||||
// Setup SIGUSR2 signal handler for dynamic theme reload
|
||||
// This allows external tools to trigger a theme refresh by sending:
|
||||
// `kill -USR2 <pid>`
|
||||
@@ -293,6 +429,15 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
|
||||
mode() {
|
||||
return store.mode;
|
||||
},
|
||||
/** Whether the app background should be transparent (no solid fill):
|
||||
* either the global preference is on, or the selected theme declares
|
||||
* transparency (e.g. the system theme). */
|
||||
transparentBackground() {
|
||||
return (
|
||||
appStore.state().settings.transparentBackground ||
|
||||
values().transparent === true
|
||||
);
|
||||
},
|
||||
setMode(mode: "dark" | "light") {
|
||||
setStore("mode", mode);
|
||||
emitThemeModeChanged(mode);
|
||||
|
||||
@@ -13,36 +13,33 @@
|
||||
*
|
||||
* parent | current | preview
|
||||
*
|
||||
* Layout ratios (1/7 : 3/7 : 3/7 in the final remake) live in
|
||||
* `@/utils/navigation` (PANE_RATIO). This module owns only the *focusable*
|
||||
* nav model — which column is focused and where its list cursor lives. The
|
||||
* parent/preview columns are always derived, never focused.
|
||||
* Pane sizes are user-resizable (draggable borders in `PaneRow`).
|
||||
* This module owns only the *focusable* nav model — which column is focused
|
||||
* and where its list cursor lives. The parent/preview columns are always
|
||||
* derived, never focused.
|
||||
*
|
||||
* Two pane models coexist under a single TAB list:
|
||||
* The tab list is the app's ROOT and participates in the same pane flow as
|
||||
* any other pane. View renders at most three panes, `UP | CURRENT | PREVIEW`:
|
||||
*
|
||||
* • The tab list is the flow's leading pane (TAB_PANE = 0) — a normal,
|
||||
* focusable pane at the left of every tab's content, just like in yazi.
|
||||
* Starting focus lives here; tab switches made from here keep focus here.
|
||||
* When it is focused, j/k moves the tab cursor (`tabCursor`) and
|
||||
* `l`/Enter opens the hovered tab into its content. Swiping left past
|
||||
* it goes out of the panes (inert — there is no pane beyond it).
|
||||
* • At launch the tab list is the CURRENT pane, with nothing in UP (`atRootTab`).
|
||||
* • Opening a tab (j/k to hover, `l`/Enter) slides it into the UP/parent pane;
|
||||
* that tab's content becomes CURRENT and its hovered item PREVIEW
|
||||
* (`enterTabContent`).
|
||||
* • Drilling deeper (`l`/Enter in content) pushes frames; once past the tab's
|
||||
* own root the UP/CURRENT/PREVIEW columns are all content, and the tab drops
|
||||
* OUT of the 3-pane view.
|
||||
* • `popDepth`/`h` walks back up: at content depth 0 `h` returns to the tab
|
||||
* root (`backToTabRoot`, the tab becomes CURRENT again); `h` at the root
|
||||
* stays (out of the panes — no-op).
|
||||
*
|
||||
* • Depth-stack tabs (Feed, MyShows, Discover, Settings) expose exactly ONE
|
||||
* focusable content pane — the current column (DEPTH_CENTER_PANE = 1). The
|
||||
* parent column renders the previous depth's list (blank at depth 0); the
|
||||
* preview column renders the hovered item. `l`/Enter drills in (push a
|
||||
* frame); `h` pops a depth. Depth is unbounded. At depth 0 `h` moves focus
|
||||
* to the tab list (TAB_PANE).
|
||||
* Depth-stack tabs (Feed, MyShows, Discover, Search, Player, Settings):
|
||||
* ONE focusable content pane — the current column (DEPTH_CENTER_PANE = 1);
|
||||
* the parent/preview are derived. Search drills query→results; Player is a
|
||||
* single now-playing pane under the tab list (2-pane, no preview). Every
|
||||
* tab returns to the root via `h` at depth 0 (`backToTabRoot`).
|
||||
*
|
||||
* • Fixed-pane tabs (Search = input/results/detail, Player = single) keep the
|
||||
* indexed pane model — `focusedIndex(pane)` + `swipe` — moving between the
|
||||
* parent/current/preview columns with `h`/`l`, clamped to
|
||||
* [1, paneCount]; `h` on the first content pane (1) moves focus to the tab
|
||||
* list; `h` on the tab list stays out-of-panear (inert).
|
||||
*
|
||||
* Tabs switch via the tab list (j/k), digit keys `1`-`6`, and `[`/`]`.
|
||||
* Focus on the tab list persists across a tab switch; from there `l`/Enter
|
||||
* drops into the active tab's content (panes 1..N).
|
||||
* Tabs switch via the tab list (j/k + l/Enter), digit keys `1`-`6`, and
|
||||
* `[`/`]`, each re-syncing the tab cursor (`tabCursor`).
|
||||
*/
|
||||
import { createSignal, batch } from "solid-js";
|
||||
import { TABS, TabsCount, DEPTH_TABS, rootFrameFor } from "@/utils/navigation";
|
||||
@@ -55,10 +52,9 @@ export enum NavMode {
|
||||
}
|
||||
|
||||
/** The current content pane of the active tab, i.e. the focusable column
|
||||
* (index 1) for depth-tabs, and the default landing pane for fixed-pane
|
||||
* tabs. Content panes occupy 1..n; the tab list is pane 0. A tab switch made
|
||||
* while focused on content resets `activePane` to this pane (unless already
|
||||
* on the tab list). */
|
||||
* (index 1) for every depth-tab. Content panes occupy 1..n; the tab list is
|
||||
* pane 0. A tab switch made while focused on content resets `activePane` to
|
||||
* this pane (unless already on the tab list). */
|
||||
export const DEPTH_CENTER_PANE = 1 as PaneId;
|
||||
|
||||
/** The tab list — the leading pane (pane 0) of the tab flow, rendered to the
|
||||
@@ -67,13 +63,6 @@ export const DEPTH_CENTER_PANE = 1 as PaneId;
|
||||
* swiping left past the first content pane returns to it. Swiping left again
|
||||
* — beyond it — goes out of the panes (no-op). While it is focused, j/k
|
||||
* moves the tab cursor and `l`/Enter opens the hovered tab's content. */
|
||||
/** Content pane slots for fixed-pane tabs (Search). Values are the global
|
||||
* pane indices (content starts at 1). */
|
||||
export enum PaneSlot {
|
||||
PARENT = 1, // Search: input
|
||||
CURRENT = 2, // Search: results
|
||||
PREVIEW = 3, // Search: detail
|
||||
}
|
||||
|
||||
export type PaneId = number; // 0 = tab list; 1..n = the active tab's content panes
|
||||
|
||||
@@ -110,11 +99,11 @@ export function createNavigation() {
|
||||
// or a direct tab switch (digits / [ ]) re-syncs it. So the panel behaves
|
||||
// just like any other yazi list: j/k move the cursor, Enter/l open.
|
||||
const [tabCursorSignal, setTabCursor] = createSignal<TABS>(TABS.FEED);
|
||||
// App focus starts on the tab list (the app root). `activePane` drives the
|
||||
// fixed-pane pages (Search/Player) and each page's content focus ring;
|
||||
// depth-tab focus is instead described by the per-tab depth stack plus the
|
||||
// `atRootTab` flag (the tab sits as the CURRENT pane when at the root, and
|
||||
// slides into the UP/parent pane once content is opened).
|
||||
// App focus starts on the tab list (the app root). `activePane` is always
|
||||
// DEPTH_CENTER_PANE for the active depth-tab; the per-tab depth stack plus
|
||||
// the `atRootTab` flag describe where focus sits (the tab is the CURRENT
|
||||
// pane when at the root, and slides into the UP/parent pane once content is
|
||||
// opened).
|
||||
const [activePane, setActivePane] = createSignal<PaneId>(DEPTH_CENTER_PANE);
|
||||
// Whether focus is on the tab-list root view — the tab is the CURRENT pane
|
||||
// with nothing above it. Opening a tab moves it to UP; deeper goes back out.
|
||||
@@ -128,9 +117,9 @@ export function createNavigation() {
|
||||
{ [TABS.FEED]: [rootFrameFor(TABS.FEED)] },
|
||||
);
|
||||
|
||||
// per-pane focused index (for j/k movement in fixed-pane tabs). Keyed
|
||||
// by `${tab}:${pane}`. Depth-tabs read/write the top frame's `focus`
|
||||
// for pane 0 (DEPTH_CENTER_PANE) instead.
|
||||
// per-pane focused index map (unused by depth-tabs, which read/write the
|
||||
// top frame's focus for DEPTH_CENTER_PANE; kept for any future fixed-pane
|
||||
// pages). Keyed by `${tab}:${pane}`.
|
||||
const [paneIndices, setPaneIndices] = createSignal<Record<string, number>>(
|
||||
{},
|
||||
);
|
||||
@@ -143,7 +132,7 @@ export function createNavigation() {
|
||||
const [commandBuffer, setCommandBuffer] = createSignal("");
|
||||
const [commandError, setCommandError] = createSignal<string | null>(null);
|
||||
|
||||
/** Depth stack for a tab (empty for fixed-pane tabs). */
|
||||
/** Depth stack for a tab (always non-empty — every tab is a depth-tab). */
|
||||
const depthStackFor = (tab: TABS = activeTab()) => stacks()[tab] ?? [];
|
||||
|
||||
const ensureStack = (tab: TABS) => {
|
||||
@@ -159,21 +148,17 @@ export function createNavigation() {
|
||||
* no-op (server build). Routing every tab change through this helper
|
||||
* keeps the behavior identical under both runtimes.
|
||||
*
|
||||
* - when switching to a special (fixed-pane) tab from the tab root, leave the
|
||||
* root — those tabs render only their content, never the tab-list view.
|
||||
* - keep focus on the tab root if it is focused (depth-tab switch),
|
||||
* otherwise recenter on the active tab's current/center pane
|
||||
* - a depth-tab switch from the root keeps the root (the tab list stays
|
||||
* CURRENT); switches made from inside content drop into the new tab's
|
||||
* current/center pane.
|
||||
* - clear mode/command/visual/count state */
|
||||
const applyTabSwitch = (tab: TABS) => {
|
||||
ensureStack(tab);
|
||||
batch(() => {
|
||||
// A depth-tab switch from the root keeps the root; switching to a
|
||||
// special (fixed-pane) tab always leaves it. Switches made from
|
||||
// inside content drop into the new tab's content pane.
|
||||
if (atRootTabSignal() && !DEPTH_TABS.has(tab)) {
|
||||
setAtTabRoot(false);
|
||||
}
|
||||
if (!atRootTabSignal()) {
|
||||
if (atRootTabSignal()) {
|
||||
// a depth-tab switch from the root keeps the root (focus stays on
|
||||
// the tab list); only entering content (enterTabContent) leaves it.
|
||||
} else {
|
||||
setActivePane(DEPTH_CENTER_PANE);
|
||||
}
|
||||
setMode(NavMode.NORMAL);
|
||||
@@ -256,23 +241,14 @@ export function createNavigation() {
|
||||
// ── pane focus ──────────────────────────────────────────────────────────
|
||||
const setPane = (pane: PaneId) => setActivePane(pane);
|
||||
|
||||
/** Move focus to the adjacent content pane (fixed-pane tabs only). `dir` =
|
||||
* -1 (left, toward parent) or +1 (right, toward preview). Clamped to
|
||||
* [0, paneCount-1]. The root panel transition (from content pane 0 to
|
||||
* (1..TabPaneCount) is handled by the dispatcher, not here. */
|
||||
const swipe = (dir: -1 | 1, paneCount: number) => {
|
||||
setActivePane((p) => {
|
||||
const n = Math.max(1, Math.min(paneCount, p + dir));
|
||||
return n;
|
||||
});
|
||||
};
|
||||
// (no fixed-pane swipe — every tab is a depth-tab; h/l drill/pop instead.)
|
||||
|
||||
// ── tab root (the app's outermost pane) ──────────────────────────────────
|
||||
/** True while focus is on the tab list as the CURRENT pane — the app root,
|
||||
* with nothing above it. Only depth-tabs (Feed/MyShows/Discover/Settings)
|
||||
* participate; Search & Player are special and always show their content. */
|
||||
const atRootTab = (): boolean =>
|
||||
atRootTabSignal() && DEPTH_TABS.has(activeTab());
|
||||
* with nothing above it. Applies to every tab: a depth-tab switch from
|
||||
* the root keeps it; entering content (`enterTabContent`) clears it; `h`
|
||||
* at content depth 0 regains it via `backToTabRoot`. */
|
||||
const atRootTab = (): boolean => atRootTabSignal();
|
||||
|
||||
/** Open the active tab's content: the tab slides from CURRENT into the
|
||||
* UP/parent pane and focus lands on the content's current pane. */
|
||||
@@ -291,6 +267,9 @@ export function createNavigation() {
|
||||
/** The tab the root's cursor is hovering (independent of activeTab). */
|
||||
const tabCursor = (): TABS => tabCursorSignal();
|
||||
|
||||
/** Directly set the root's tab cursor (e.g. a mouse click on a tab row). */
|
||||
const setTabCursorTo = (tab: TABS) => setTabCursor(tab);
|
||||
|
||||
/** Move the root's cursor to the adjacent tab (clamped, no wrap). */
|
||||
const moveTabCursor = (dir: -1 | 1) => {
|
||||
setTabCursor((c) => Math.max(1, Math.min(TabsCount, c + dir)) as TABS);
|
||||
@@ -306,9 +285,9 @@ export function createNavigation() {
|
||||
// ── per-pane focus index ────────────────────────────────────────────────
|
||||
const paneKey = (pane: PaneId = activePane()) => `${activeTab()}:${pane}`;
|
||||
|
||||
/** For depth-tabs, pane 0 (the center/current pane) reads/writes
|
||||
* the top frame's focus. Other panes and fixed-pane tabs use the
|
||||
* per-pane index map. */
|
||||
/** For depth-tabs (every tab), pane 1 (DEPTH_CENTER_PANE) reads/writes
|
||||
* the top frame's focus. Other panes fall back to the per-pane index
|
||||
* map (unused by current pages). */
|
||||
const focusedIndex = (pane: PaneId = activePane()): number => {
|
||||
if (isDepthTab() && pane === DEPTH_CENTER_PANE) {
|
||||
return topFrame()?.focus ?? 0;
|
||||
@@ -493,11 +472,11 @@ export function createNavigation() {
|
||||
enterTabContent,
|
||||
backToTabRoot,
|
||||
tabCursor,
|
||||
setTabCursor: setTabCursorTo,
|
||||
moveTabCursor,
|
||||
activateTabCursor,
|
||||
// pane focus
|
||||
setActivePane: setPane,
|
||||
swipe,
|
||||
// focus index
|
||||
focusedIndex,
|
||||
setFocusedIndex,
|
||||
@@ -513,11 +492,7 @@ export function createNavigation() {
|
||||
exitVisual,
|
||||
// modes
|
||||
setActiveTabSignal: setActiveTab,
|
||||
setActiveDepth: setPane, // legacy alias
|
||||
activeDepth: activePane, // legacy alias
|
||||
setInputFocused,
|
||||
nextPane: () => {}, // legacy noop; swipe() replaces this
|
||||
prevPane: () => {},
|
||||
setMode,
|
||||
enterCommand,
|
||||
enterInput,
|
||||
|
||||
85
src/effects/feed-refresh.ts
Normal file
@@ -0,0 +1,85 @@
|
||||
/**
|
||||
* Feed-refresh batch as an Effect program.
|
||||
*
|
||||
* Replaces the hand-rolled worker pool (mapWithConcurrency) + per-feed
|
||||
* fetch/apply plumbing in stores/feed.ts with Effect's structured
|
||||
* concurrency:
|
||||
* - `Effect.forEach(..., { concurrency })` bounds in-flight fetches to
|
||||
* `concurrency` (starts exactly that many fibers; each completion pulls
|
||||
* the next feed — identical semantics to the old shared-counter pool).
|
||||
* - `Effect.timeout` bounds each feed's fetch to `timeoutMs`. It runs
|
||||
* through the `Clock` service, so under `TestContext` the TestClock
|
||||
* drives it deterministically (no real 20s wait in tests).
|
||||
* - Failures are folded to a null result: a failed or timed-out feed is
|
||||
* left untouched instead of failing the batch.
|
||||
* - The apply callback runs inside each feed's own fiber, so a feed's
|
||||
* refreshed episodes land AS ITS OWN FETCH COMPLETES — the
|
||||
* per-feed-apply-as-it-lands contract, no Promise.all barrier.
|
||||
*
|
||||
* The store boundary (stores/feed.ts) supplies the real fetch and apply
|
||||
* closures and runs the program with Effect.runPromise.
|
||||
*/
|
||||
|
||||
import { Duration, Effect } from "effect"
|
||||
import type { Episode } from "../types/episode"
|
||||
import type { Feed } from "../types/feed"
|
||||
|
||||
/** Result of fetching one feed's RSS. `episodes: null` means the fetch
|
||||
* failed or timed out — callers must leave that feed untouched. */
|
||||
export interface RefreshFetchResult {
|
||||
episodes: Episode[] | null
|
||||
coverUrl: string | undefined
|
||||
}
|
||||
|
||||
/** Result guaranteed to have parsed episodes (the apply path only). */
|
||||
export interface RefreshSuccess {
|
||||
episodes: Episode[]
|
||||
coverUrl: string | undefined
|
||||
}
|
||||
|
||||
export interface RefreshBatchOptions {
|
||||
/** Max simultaneous in-flight fetches. */
|
||||
concurrency: number
|
||||
/** Per-feed fetch timeout in milliseconds. */
|
||||
timeoutMs: number
|
||||
}
|
||||
|
||||
/** Fold any failure (network error, timeout, rejection) to a null result so
|
||||
* one bad feed can never fail the batch. */
|
||||
const failedResult: RefreshFetchResult = { episodes: null, coverUrl: undefined }
|
||||
|
||||
/** Fetch one feed with a timeout, applying its result as its own fetch
|
||||
* lands. A failed or timed-out fetch yields null — the feed is untouched. */
|
||||
const refreshOne = (
|
||||
feed: Feed,
|
||||
fetchOne: (feed: Feed) => Promise<RefreshFetchResult>,
|
||||
applyOne: (feed: Feed, result: RefreshSuccess) => void,
|
||||
timeoutMs: number,
|
||||
): Effect.Effect<void> =>
|
||||
Effect.tryPromise(() => fetchOne(feed)).pipe(
|
||||
Effect.timeout(Duration.millis(timeoutMs)),
|
||||
Effect.catchAll(() => Effect.succeed(failedResult)),
|
||||
Effect.flatMap((result) => {
|
||||
if (result.episodes === null) return Effect.void
|
||||
// Capture the narrowed array before the closure — TS drops the
|
||||
// `episodes !== null` narrowing inside Effect.sync's callback.
|
||||
const episodes = result.episodes
|
||||
return Effect.sync(() => applyOne(feed, { episodes, coverUrl: result.coverUrl }))
|
||||
}),
|
||||
)
|
||||
|
||||
/** Refresh every feed with bounded concurrency. Each feed's refreshed
|
||||
* episodes are applied as its own fetch lands (no barrier); a failed or
|
||||
* timed-out feed is left untouched. The program never fails — failures
|
||||
* are folded to per-feed no-ops. */
|
||||
export const refreshFeedsBatch = (
|
||||
feeds: readonly Feed[],
|
||||
fetchOne: (feed: Feed) => Promise<RefreshFetchResult>,
|
||||
applyOne: (feed: Feed, result: RefreshSuccess) => void,
|
||||
options: RefreshBatchOptions,
|
||||
): Effect.Effect<void> =>
|
||||
Effect.forEach(
|
||||
feeds,
|
||||
(feed) => refreshOne(feed, fetchOne, applyOne, options.timeoutMs),
|
||||
{ concurrency: options.concurrency, discard: true },
|
||||
)
|
||||
@@ -1,8 +1,12 @@
|
||||
/**
|
||||
* Reactive SolidJS hook wrapping the AudioBackend.
|
||||
* Reactive SolidJS hook over the module-level audio engine.
|
||||
*
|
||||
* Provides signals for playback state and methods for controlling
|
||||
* audio. Integrates with the event bus and app store.
|
||||
* Wraps utils/audio-engine: every useAudio() call shares ONE engine (all
|
||||
* playback logic, the 150ms poll, session restore, and the event-bus
|
||||
* commands live there). This hook keeps only what is tied to the Solid
|
||||
* lifecycle — the ref-counted last-owner dispose and the process-exit
|
||||
* teardown — and re-exposes the two controls the engine deliberately omits
|
||||
* (availablePlayers, switchBackend).
|
||||
*
|
||||
* Usage:
|
||||
* ```tsx
|
||||
@@ -12,517 +16,140 @@
|
||||
* ```
|
||||
*/
|
||||
|
||||
import { createSignal, onCleanup } from "solid-js"
|
||||
import { onCleanup } from "solid-js";
|
||||
import {
|
||||
createAudioBackend,
|
||||
detectPlayers,
|
||||
type AudioBackend,
|
||||
type BackendName,
|
||||
type DetectedPlayer,
|
||||
} from "../utils/audio-player"
|
||||
import { emit, on } from "../utils/event-bus"
|
||||
import { useAppStore } from "../stores/app"
|
||||
import { useProgressStore } from "../stores/progress"
|
||||
import { useMediaRegistry } from "../utils/media-registry"
|
||||
import type { Episode } from "../types/episode"
|
||||
import type { Feed } from "../types/feed"
|
||||
import { useAudioNavStore, AudioSource } from "../stores/audio-nav"
|
||||
import { useFeedStore } from "../stores/feed"
|
||||
availablePlayers,
|
||||
currentEpisode,
|
||||
speed,
|
||||
setSpeed,
|
||||
volume,
|
||||
setVolume,
|
||||
} from "../utils/audio-signals";
|
||||
import { useAppStore } from "../stores/app";
|
||||
import { useMediaRegistry } from "../utils/media-registry";
|
||||
import { saveLastPlayerSync } from "../utils/app-persistence";
|
||||
import type { BackendName, DetectedPlayer } from "../utils/audio-player";
|
||||
import {
|
||||
createAudioEngine,
|
||||
ensureEngineBackend,
|
||||
disposeEngineBackend,
|
||||
stopEnginePolling,
|
||||
getEngineBackend,
|
||||
switchBackend,
|
||||
restoreLastSession,
|
||||
type AudioEngine,
|
||||
} from "../utils/audio-engine";
|
||||
|
||||
export interface AudioControls {
|
||||
// Signals (reactive getters)
|
||||
isPlaying: () => boolean
|
||||
position: () => number
|
||||
duration: () => number
|
||||
volume: () => number
|
||||
speed: () => number
|
||||
backendName: () => BackendName
|
||||
error: () => string | null
|
||||
currentEpisode: () => Episode | null
|
||||
availablePlayers: () => DetectedPlayer[]
|
||||
// Re-exported so the session-restore test can pull it from this module.
|
||||
export { restoreLastSession };
|
||||
|
||||
// Actions
|
||||
play: (episode: Episode) => Promise<void>
|
||||
pause: () => Promise<void>
|
||||
resume: () => Promise<void>
|
||||
togglePlayback: () => Promise<void>
|
||||
stop: () => Promise<void>
|
||||
seek: (seconds: number) => Promise<void>
|
||||
seekRelative: (delta: number) => Promise<void>
|
||||
setVolume: (volume: number) => Promise<void>
|
||||
setSpeed: (speed: number) => Promise<void>
|
||||
switchBackend: (name: BackendName) => Promise<void>
|
||||
prev: () => Promise<void>
|
||||
next: () => Promise<void>
|
||||
}
|
||||
// useAudio() surface: the engine plus the two controls it doesn't expose.
|
||||
export type AudioControls = AudioEngine & {
|
||||
availablePlayers: () => DetectedPlayer[];
|
||||
switchBackend: (name: BackendName) => Promise<void>;
|
||||
};
|
||||
|
||||
// Singleton state — shared across all components that call useAudio()
|
||||
let backend: AudioBackend | null = null
|
||||
let pollTimer: ReturnType<typeof setInterval> | null = null
|
||||
let refCount = 0
|
||||
let pollCount = 0 // Counts poll ticks for throttling progress saves
|
||||
const engine = createAudioEngine();
|
||||
|
||||
const [isPlaying, setIsPlaying] = createSignal(false)
|
||||
const [position, setPosition] = createSignal(0)
|
||||
const [duration, setDuration] = createSignal(0)
|
||||
const [volume, setVolume] = createSignal(0.7)
|
||||
const [speed, setSpeed] = createSignal(1)
|
||||
const [backendName, setBackendName] = createSignal<BackendName>("none")
|
||||
const [error, setError] = createSignal<string | null>(null)
|
||||
const [currentEpisode, setCurrentEpisode] = createSignal<Episode | null>(null)
|
||||
const [availablePlayers, setAvailablePlayers] = createSignal<DetectedPlayer[]>([])
|
||||
// Singleton ref count — how many live useAudio() owners there are. The engine
|
||||
// is shared; the last owner to unmount disposes the backend.
|
||||
let refCount = 0;
|
||||
|
||||
function ensureBackend(): AudioBackend {
|
||||
if (!backend) {
|
||||
const detected = detectPlayers()
|
||||
setAvailablePlayers(detected)
|
||||
backend = createAudioBackend()
|
||||
setBackendName(backend.name)
|
||||
}
|
||||
return backend
|
||||
}
|
||||
|
||||
function startPolling(): void {
|
||||
stopPolling()
|
||||
pollCount = 0
|
||||
pollTimer = setInterval(async () => {
|
||||
if (!backend || !isPlaying()) return
|
||||
try {
|
||||
const pos = await backend.getPosition()
|
||||
const dur = await backend.getDuration()
|
||||
setPosition(pos)
|
||||
if (dur > 0) setDuration(dur)
|
||||
|
||||
// Save progress every ~5 seconds (10 ticks * 500ms)
|
||||
pollCount++
|
||||
if (pollCount % 10 === 0) {
|
||||
const ep = currentEpisode()
|
||||
if (ep) {
|
||||
const progressStore = useProgressStore()
|
||||
progressStore.update(ep.id, pos, dur > 0 ? dur : duration(), speed())
|
||||
|
||||
// Update platform media position
|
||||
const media = useMediaRegistry()
|
||||
media.setPosition(pos)
|
||||
}
|
||||
}
|
||||
|
||||
// Check if backend stopped playing (track ended)
|
||||
if (!backend.isPlaying() && isPlaying()) {
|
||||
setIsPlaying(false)
|
||||
stopPolling()
|
||||
// Save final position on track end
|
||||
const ep = currentEpisode()
|
||||
if (ep) {
|
||||
const progressStore = useProgressStore()
|
||||
progressStore.update(ep.id, pos, dur > 0 ? dur : duration(), speed())
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
// Backend may have been disposed
|
||||
}
|
||||
}, 500)
|
||||
}
|
||||
|
||||
function stopPolling(): void {
|
||||
if (pollTimer) {
|
||||
clearInterval(pollTimer)
|
||||
pollTimer = null
|
||||
}
|
||||
}
|
||||
|
||||
async function play(episode: Episode): Promise<void> {
|
||||
const b = ensureBackend()
|
||||
setError(null)
|
||||
|
||||
if (!episode.audioUrl) {
|
||||
setError("No audio URL for this episode")
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
const appStore = useAppStore()
|
||||
const progressStore = useProgressStore()
|
||||
const storeSpeed = appStore.state().settings.playbackSpeed
|
||||
const vol = volume()
|
||||
const spd = storeSpeed || speed()
|
||||
|
||||
// Resume from saved progress if available and not completed
|
||||
const savedProgress = progressStore.get(episode.id)
|
||||
let startPos = 0
|
||||
if (savedProgress && !progressStore.isCompleted(episode.id)) {
|
||||
startPos = savedProgress.position
|
||||
}
|
||||
|
||||
await b.play(episode.audioUrl, {
|
||||
volume: vol,
|
||||
speed: spd,
|
||||
startPosition: startPos > 0 ? startPos : undefined,
|
||||
})
|
||||
|
||||
setCurrentEpisode(episode)
|
||||
setIsPlaying(true)
|
||||
setPosition(startPos)
|
||||
setSpeed(spd)
|
||||
if (episode.duration) setDuration(episode.duration)
|
||||
|
||||
// Register with platform media controls
|
||||
const media = useMediaRegistry()
|
||||
media.setNowPlaying({
|
||||
title: episode.title,
|
||||
artist: episode.podcastId,
|
||||
duration: episode.duration,
|
||||
})
|
||||
media.setPlaybackState(true)
|
||||
if (startPos > 0) media.setPosition(startPos)
|
||||
|
||||
startPolling()
|
||||
emit("player.play", { episodeId: episode.id })
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : "Playback failed")
|
||||
setIsPlaying(false)
|
||||
}
|
||||
}
|
||||
|
||||
async function pause(): Promise<void> {
|
||||
if (!backend) return
|
||||
try {
|
||||
await backend.pause()
|
||||
setIsPlaying(false)
|
||||
stopPolling()
|
||||
const ep = currentEpisode()
|
||||
if (ep) {
|
||||
// Save progress on pause
|
||||
const progressStore = useProgressStore()
|
||||
progressStore.update(ep.id, position(), duration(), speed())
|
||||
emit("player.pause", { episodeId: ep.id })
|
||||
|
||||
// Update platform media controls
|
||||
const media = useMediaRegistry()
|
||||
media.setPlaybackState(false)
|
||||
media.setPosition(position())
|
||||
}
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : "Pause failed")
|
||||
}
|
||||
}
|
||||
|
||||
async function resume(): Promise<void> {
|
||||
if (!backend) return
|
||||
try {
|
||||
await backend.resume()
|
||||
setIsPlaying(true)
|
||||
startPolling()
|
||||
const ep = currentEpisode()
|
||||
if (ep) {
|
||||
emit("player.play", { episodeId: ep.id })
|
||||
const media = useMediaRegistry()
|
||||
media.setPlaybackState(true)
|
||||
}
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : "Resume failed")
|
||||
}
|
||||
}
|
||||
|
||||
async function togglePlayback(): Promise<void> {
|
||||
if (isPlaying()) {
|
||||
await pause()
|
||||
} else if (currentEpisode()) {
|
||||
await resume()
|
||||
}
|
||||
}
|
||||
|
||||
async function stop(): Promise<void> {
|
||||
if (!backend) return
|
||||
try {
|
||||
// Save progress before stopping
|
||||
const ep = currentEpisode()
|
||||
if (ep) {
|
||||
const progressStore = useProgressStore()
|
||||
progressStore.update(ep.id, position(), duration(), speed())
|
||||
}
|
||||
await backend.stop()
|
||||
setIsPlaying(false)
|
||||
setPosition(0)
|
||||
setCurrentEpisode(null)
|
||||
stopPolling()
|
||||
emit("player.stop", {})
|
||||
|
||||
// Clear platform media controls
|
||||
const media = useMediaRegistry()
|
||||
media.clearNowPlaying()
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : "Stop failed")
|
||||
}
|
||||
}
|
||||
|
||||
async function seek(seconds: number): Promise<void> {
|
||||
if (!backend) return
|
||||
const clamped = Math.max(0, Math.min(seconds, duration()))
|
||||
try {
|
||||
await backend.seek(clamped)
|
||||
setPosition(clamped)
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : "Seek failed")
|
||||
}
|
||||
}
|
||||
|
||||
async function seekRelative(delta: number): Promise<void> {
|
||||
await seek(position() + delta)
|
||||
}
|
||||
|
||||
async function doSetVolume(vol: number): Promise<void> {
|
||||
const clamped = Math.max(0, Math.min(1, vol))
|
||||
if (backend) {
|
||||
try {
|
||||
await backend.setVolume(clamped)
|
||||
} catch {
|
||||
// Some backends can't change volume at runtime
|
||||
}
|
||||
}
|
||||
setVolume(clamped)
|
||||
}
|
||||
|
||||
async function doSetSpeed(spd: number): Promise<void> {
|
||||
const clamped = Math.max(0.25, Math.min(3, spd))
|
||||
if (backend) {
|
||||
try {
|
||||
await backend.setSpeed(clamped)
|
||||
} catch {
|
||||
// Some backends can't change speed at runtime
|
||||
}
|
||||
}
|
||||
setSpeed(clamped)
|
||||
|
||||
// Sync back to app store
|
||||
try {
|
||||
const appStore = useAppStore()
|
||||
appStore.updateSettings({ playbackSpeed: clamped })
|
||||
} catch {
|
||||
// Store may not be available
|
||||
}
|
||||
}
|
||||
|
||||
async function switchBackend(name: BackendName): Promise<void> {
|
||||
const wasPlaying = isPlaying()
|
||||
const ep = currentEpisode()
|
||||
const pos = position()
|
||||
const vol = volume()
|
||||
const spd = speed()
|
||||
|
||||
// Stop current backend
|
||||
if (backend) {
|
||||
stopPolling()
|
||||
backend.dispose()
|
||||
backend = null
|
||||
}
|
||||
|
||||
// Create new backend
|
||||
backend = createAudioBackend(name)
|
||||
setBackendName(backend.name)
|
||||
setAvailablePlayers(detectPlayers())
|
||||
|
||||
// Resume playback if we were playing
|
||||
if (wasPlaying && ep && ep.audioUrl) {
|
||||
try {
|
||||
await backend.play(ep.audioUrl, {
|
||||
startPosition: pos,
|
||||
volume: vol,
|
||||
speed: spd,
|
||||
})
|
||||
setIsPlaying(true)
|
||||
startPolling()
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : "Backend switch failed")
|
||||
setIsPlaying(false)
|
||||
}
|
||||
}
|
||||
// ── Process-exit teardown ─────────────────────────────────────────────
|
||||
// `q` (the quit action) calls `process.exit(0)`, which bypasses Solid's
|
||||
// onCleanup — where `backend.dispose()` would otherwise kill the spawned
|
||||
// player (mpv). Without this hook those child processes
|
||||
// survive the host and keep playing audio after the TUI has quit. The
|
||||
// `exit` event fires synchronously on `process.exit(N)`; the signal
|
||||
// handlers cover Ctrl-C / kill, which otherwise terminate without running
|
||||
// `exit` listeners.
|
||||
let exitTeardownRegistered = false;
|
||||
function registerExitTeardown(): void {
|
||||
if (exitTeardownRegistered) return;
|
||||
exitTeardownRegistered = true;
|
||||
const teardown = (): void => {
|
||||
stopEnginePolling();
|
||||
// Persist "what's loaded in the player right now" synchronously —
|
||||
// process.exit(0) runs this handler synchronously and an async write
|
||||
// would never land. The next launch restores this episode paused.
|
||||
try {
|
||||
const ep = currentEpisode();
|
||||
if (ep) {
|
||||
saveLastPlayerSync({ episodeId: ep.id, timestamp: new Date() });
|
||||
}
|
||||
} catch {
|
||||
/* best-effort at exit */
|
||||
}
|
||||
try {
|
||||
getEngineBackend()?.dispose();
|
||||
} catch {
|
||||
/* best-effort at exit */
|
||||
}
|
||||
try {
|
||||
useMediaRegistry().clearNowPlaying();
|
||||
} catch {
|
||||
/* best-effort at exit */
|
||||
}
|
||||
};
|
||||
process.on("exit", teardown);
|
||||
for (const sig of ["SIGINT", "SIGTERM", "SIGHUP"] as const) {
|
||||
process.on(sig, () => {
|
||||
teardown();
|
||||
process.exit(0);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Reactive audio controls hook.
|
||||
*
|
||||
* Returns a singleton — all components share the same playback state.
|
||||
* Registers event bus listeners and cleans them up with onCleanup.
|
||||
* Returns the shared audio engine wrapped with the two extra controls, so
|
||||
* all components observe the same playback state. The first useAudio()
|
||||
* owner creates the backend, runs the one-time boot (volume/speed sync +
|
||||
* session restore) and registers the process-exit teardown; the last
|
||||
* owner disposes the backend.
|
||||
*/
|
||||
export function useAudio(): AudioControls {
|
||||
// Initialize backend on first use
|
||||
ensureBackend()
|
||||
const engine = createAudioEngine();
|
||||
ensureEngineBackend();
|
||||
registerExitTeardown();
|
||||
|
||||
// Sync initial speed from app store
|
||||
if (refCount === 0) {
|
||||
try {
|
||||
const appStore = useAppStore()
|
||||
const storeSpeed = appStore.state().settings.playbackSpeed
|
||||
if (storeSpeed && storeSpeed !== speed()) {
|
||||
setSpeed(storeSpeed)
|
||||
}
|
||||
} catch {
|
||||
// Store may not be available yet
|
||||
}
|
||||
}
|
||||
// First owner: sync speed/volume from the persisted settings and restore
|
||||
// the last player session once (loaded, not playing). Raw signal
|
||||
// accessors are used here on purpose — this is boot-only, not a user
|
||||
// volume/speed change, so it must not re-persist to the app store.
|
||||
if (refCount === 0) {
|
||||
const appStore = useAppStore();
|
||||
const storeSpeed = appStore.state().settings.playbackSpeed;
|
||||
if (storeSpeed && storeSpeed !== speed()) {
|
||||
setSpeed(storeSpeed);
|
||||
}
|
||||
|
||||
refCount++
|
||||
// Volume re-syncs once settings finish loading (async config read)
|
||||
// so a level persisted last session is applied at boot.
|
||||
appStore
|
||||
.whenReady()
|
||||
.then(() => {
|
||||
const storeVolume = appStore.state().settings.volume;
|
||||
if (storeVolume !== undefined && storeVolume !== volume()) {
|
||||
setVolume(storeVolume);
|
||||
}
|
||||
})
|
||||
.catch(() => {});
|
||||
|
||||
// Listen for event bus commands (e.g. from other components)
|
||||
const unsubPlay = on("player.play", async (data) => {
|
||||
// External play requests — currently just tracks episodeId.
|
||||
// Episode lookup would require feed store integration.
|
||||
})
|
||||
// Restore the last player session once at boot (loaded, not playing).
|
||||
restoreLastSession().catch(() => {});
|
||||
}
|
||||
|
||||
const unsubStop = on("player.stop", async () => {
|
||||
if (backend && isPlaying()) {
|
||||
await backend.stop()
|
||||
setIsPlaying(false)
|
||||
setPosition(0)
|
||||
setCurrentEpisode(null)
|
||||
stopPolling()
|
||||
}
|
||||
})
|
||||
refCount++;
|
||||
|
||||
// Listen for global multimedia key events (from useMultimediaKeys)
|
||||
const unsubMediaToggle = on("media.toggle", async () => {
|
||||
await togglePlayback()
|
||||
})
|
||||
onCleanup(() => {
|
||||
refCount--;
|
||||
if (refCount <= 0) {
|
||||
disposeEngineBackend();
|
||||
refCount = 0;
|
||||
}
|
||||
});
|
||||
|
||||
const unsubMediaVolUp = on("media.volumeUp", async () => {
|
||||
await doSetVolume(Math.min(1, Number((volume() + 0.05).toFixed(2))))
|
||||
})
|
||||
|
||||
const unsubMediaVolDown = on("media.volumeDown", async () => {
|
||||
await doSetVolume(Math.max(0, Number((volume() - 0.05).toFixed(2))))
|
||||
})
|
||||
|
||||
const unsubMediaSeekFwd = on("media.seekForward", async () => {
|
||||
await seekRelative(10)
|
||||
})
|
||||
|
||||
const unsubMediaSeekBack = on("media.seekBackward", async () => {
|
||||
await seekRelative(-10)
|
||||
})
|
||||
|
||||
const unsubMediaSpeed = on("media.speedCycle", async () => {
|
||||
const next = speed() >= 2 ? 0.5 : Number((speed() + 0.25).toFixed(2))
|
||||
await doSetSpeed(next)
|
||||
})
|
||||
|
||||
const audioNav = useAudioNavStore();
|
||||
const feedStore = useFeedStore();
|
||||
|
||||
async function prev(): Promise<void> {
|
||||
const current = currentEpisode();
|
||||
if (!current) return;
|
||||
|
||||
const currentPos = position();
|
||||
const currentDur = duration();
|
||||
|
||||
const NAV_START_THRESHOLD = 30;
|
||||
|
||||
if (currentPos > NAV_START_THRESHOLD && currentDur > 0) {
|
||||
await seek(NAV_START_THRESHOLD);
|
||||
} else {
|
||||
const source = audioNav.getSource();
|
||||
let episodes: Array<{ episode: Episode; feed: Feed }> = [];
|
||||
|
||||
if (source === AudioSource.FEED) {
|
||||
episodes = feedStore.getAllEpisodesChronological();
|
||||
} else if (source === AudioSource.MY_SHOWS) {
|
||||
const podcastId = audioNav.getPodcastId();
|
||||
if (!podcastId) return;
|
||||
|
||||
const feed = feedStore.getFilteredFeeds().find(f => f.podcast.id === podcastId);
|
||||
if (!feed) return;
|
||||
|
||||
episodes = feed.episodes.map(ep => ({ episode: ep, feed }));
|
||||
}
|
||||
|
||||
const currentIndex = audioNav.getCurrentIndex();
|
||||
const newIndex = Math.max(0, currentIndex - 1);
|
||||
|
||||
if (newIndex < episodes.length && episodes[newIndex]) {
|
||||
const { episode } = episodes[newIndex];
|
||||
await play(episode);
|
||||
audioNav.prev(newIndex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function next(): Promise<void> {
|
||||
const current = currentEpisode();
|
||||
if (!current) return;
|
||||
|
||||
const source = audioNav.getSource();
|
||||
let episodes: Array<{ episode: Episode; feed: Feed }> = [];
|
||||
|
||||
if (source === AudioSource.FEED) {
|
||||
episodes = feedStore.getAllEpisodesChronological();
|
||||
} else if (source === AudioSource.MY_SHOWS) {
|
||||
const podcastId = audioNav.getPodcastId();
|
||||
if (!podcastId) return;
|
||||
|
||||
const feed = feedStore.getFilteredFeeds().find(f => f.podcast.id === podcastId);
|
||||
if (!feed) return;
|
||||
|
||||
episodes = feed.episodes.map(ep => ({ episode: ep, feed }));
|
||||
}
|
||||
|
||||
const currentIndex = audioNav.getCurrentIndex();
|
||||
const newIndex = Math.min(episodes.length - 1, currentIndex + 1);
|
||||
|
||||
if (newIndex >= 0 && episodes[newIndex]) {
|
||||
const { episode } = episodes[newIndex];
|
||||
await play(episode);
|
||||
audioNav.next(newIndex);
|
||||
}
|
||||
}
|
||||
|
||||
onCleanup(() => {
|
||||
refCount--
|
||||
unsubPlay()
|
||||
unsubStop()
|
||||
unsubMediaToggle()
|
||||
unsubMediaVolUp()
|
||||
unsubMediaVolDown()
|
||||
unsubMediaSeekFwd()
|
||||
unsubMediaSeekBack()
|
||||
unsubMediaSpeed()
|
||||
|
||||
if (refCount <= 0) {
|
||||
stopPolling()
|
||||
if (backend) {
|
||||
backend.dispose()
|
||||
backend = null
|
||||
}
|
||||
// Clear media registry on full teardown
|
||||
const media = useMediaRegistry()
|
||||
media.clearNowPlaying()
|
||||
|
||||
refCount = 0
|
||||
}
|
||||
})
|
||||
|
||||
return {
|
||||
isPlaying,
|
||||
position,
|
||||
duration,
|
||||
volume,
|
||||
speed,
|
||||
backendName,
|
||||
error,
|
||||
currentEpisode,
|
||||
availablePlayers,
|
||||
|
||||
play,
|
||||
pause,
|
||||
resume,
|
||||
togglePlayback,
|
||||
stop,
|
||||
seek,
|
||||
seekRelative,
|
||||
setVolume: doSetVolume,
|
||||
setSpeed: doSetSpeed,
|
||||
switchBackend,
|
||||
prev,
|
||||
next,
|
||||
}
|
||||
return { ...engine, availablePlayers, switchBackend };
|
||||
}
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
import { createSignal, onCleanup } from "solid-js"
|
||||
|
||||
type CacheOptions<T> = {
|
||||
fetcher: () => Promise<T>
|
||||
intervalMs?: number
|
||||
}
|
||||
|
||||
export const useCachedData = <T,>(options: CacheOptions<T>) => {
|
||||
const [data, setData] = createSignal<T | null>(null)
|
||||
const [loading, setLoading] = createSignal(false)
|
||||
const [error, setError] = createSignal<string | null>(null)
|
||||
|
||||
const refresh = async () => {
|
||||
setLoading(true)
|
||||
setError(null)
|
||||
try {
|
||||
const value = await options.fetcher()
|
||||
setData(() => value)
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : "Failed to load data")
|
||||
} finally {
|
||||
setLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
refresh()
|
||||
|
||||
if (options.intervalMs) {
|
||||
const interval = setInterval(refresh, options.intervalMs)
|
||||
onCleanup(() => clearInterval(interval))
|
||||
}
|
||||
|
||||
return { data, loading, error, refresh }
|
||||
}
|
||||
46
src/hooks/useHeldFlag.ts
Normal file
@@ -0,0 +1,46 @@
|
||||
/**
|
||||
* useHeldFlag — keep a boolean true for a minimum time after it falls.
|
||||
*
|
||||
* A warm-cache fetch-more load begins and ends between two renderer
|
||||
* frames: the raw `isLoadingMore` signal flips true→false without a
|
||||
* single paint, so the "[Fetch More]" → spinner swap never appears and
|
||||
* the press looks like a no-op. Components rendering a spinner for such
|
||||
* bursts read through this hook instead of the raw signal — the spinner
|
||||
* stays up (and animating) for at least `minMs` after the load ends,
|
||||
* guaranteeing several painted frames.
|
||||
*
|
||||
* Deliberately a display-layer concern: the store's own `isLoadingMore`
|
||||
* keeps its exact load-window semantics (guards, tests) and only the
|
||||
* rendered indicators are held.
|
||||
*/
|
||||
import { createSignal, createEffect, onCleanup } from "solid-js";
|
||||
|
||||
export function useHeldFlag(
|
||||
source: () => boolean,
|
||||
minMs = 250,
|
||||
): () => boolean {
|
||||
const [held, setHeld] = createSignal(false);
|
||||
let timer: ReturnType<typeof setTimeout> | null = null;
|
||||
const clearTimer = () => {
|
||||
if (timer) {
|
||||
clearTimeout(timer);
|
||||
timer = null;
|
||||
}
|
||||
};
|
||||
|
||||
createEffect(() => {
|
||||
if (source()) {
|
||||
// (Re)rising edge: show immediately; a pending fall from an
|
||||
// earlier burst is cancelled.
|
||||
clearTimer();
|
||||
if (!held()) setHeld(true);
|
||||
} else if (held()) {
|
||||
// Falling edge: hold the flag up for the remaining window.
|
||||
clearTimer();
|
||||
timer = setTimeout(() => setHeld(false), minMs);
|
||||
}
|
||||
});
|
||||
|
||||
onCleanup(clearTimer);
|
||||
return held;
|
||||
}
|
||||
65
src/hooks/useInputFocusNav.ts
Normal file
@@ -0,0 +1,65 @@
|
||||
/**
|
||||
* useInputFocusNav — returns a `ref` callback for an `<input>` (or any
|
||||
* focusable renderable) that holds the navigation store's `inputFocused`
|
||||
* flag true while the renderable has focus.
|
||||
*
|
||||
* Why: the Shell keyboard router (see `components/Shell.tsx`) yields keys to
|
||||
* whatever is focused only when `nav.inputFocused()` is true; otherwise it
|
||||
* dispatches navigation keybinds (j/k/h/…). Forms rendered inside the
|
||||
* depth-stack (e.g. the Settings "Add Source" RSS form) don't drive that
|
||||
* flag, so typing into them *also* fired the navigation keybinds. Wiring the
|
||||
* flag to each input's real focus/blur state fixes that.
|
||||
*
|
||||
* A module-level counter guards the blur→focus ordering gap that occurs when
|
||||
* tabbing between two inputs in the same form (the old input blurs before the
|
||||
* new one focuses) so the flag never flickers off mid-handoff.
|
||||
*/
|
||||
|
||||
import { onCleanup } from "solid-js";
|
||||
import { RenderableEvents } from "@opentui/core";
|
||||
import { useNavigation } from "@/context/NavigationContext";
|
||||
|
||||
// Inputs (managed by this hook) currently holding focus.
|
||||
let focusedCount = 0;
|
||||
|
||||
export function useInputFocusNav() {
|
||||
const nav = useNavigation();
|
||||
let current: any | undefined;
|
||||
|
||||
const onFocused = () => {
|
||||
focusedCount++;
|
||||
nav.setInputFocused(true);
|
||||
};
|
||||
const onBlurred = () => {
|
||||
focusedCount = Math.max(0, focusedCount - 1);
|
||||
if (focusedCount === 0) nav.setInputFocused(false);
|
||||
};
|
||||
|
||||
const detach = (el: any) => {
|
||||
el.off(RenderableEvents.FOCUSED, onFocused);
|
||||
el.off(RenderableEvents.BLURRED, onBlurred);
|
||||
// Treat a focused element being torn down as a blur so the counter
|
||||
// doesn't leak and leave inputFocused stuck on.
|
||||
if (el.focused) onBlurred();
|
||||
};
|
||||
|
||||
const ref = (el: any) => {
|
||||
if (current && current !== el) detach(current);
|
||||
current = el;
|
||||
if (el) {
|
||||
el.on(RenderableEvents.FOCUSED, onFocused);
|
||||
el.on(RenderableEvents.BLURRED, onBlurred);
|
||||
// If the renderable is already focused when attached, count it.
|
||||
if (el.focused) onFocused();
|
||||
}
|
||||
};
|
||||
|
||||
onCleanup(() => {
|
||||
if (current) {
|
||||
detach(current);
|
||||
current = undefined;
|
||||
}
|
||||
});
|
||||
|
||||
return ref;
|
||||
}
|
||||
@@ -1,47 +1,30 @@
|
||||
/**
|
||||
* Global multimedia key handler hook.
|
||||
*
|
||||
* Captures media-related key events (play/pause, volume, seek, speed)
|
||||
* Captures media-related key events (play/pause, volume, speed)
|
||||
* regardless of which component is focused. Uses the event bus to
|
||||
* decouple key detection from audio control logic.
|
||||
*
|
||||
* Keys are only handled when an episode is loaded (or for play/pause,
|
||||
* always). This prevents accidental volume/seek changes when there's
|
||||
* nothing playing.
|
||||
* Volume and speed are app-level settings — adjustable with or without
|
||||
* an episode loaded (they apply to the next playback and persist). Seek
|
||||
* is NOT handled here: it lives on the yazi keybind router (`<` / `>` =
|
||||
* shift+, / shift+.), so the arrow keys stay free for navigation.
|
||||
*/
|
||||
|
||||
import { useKeyboard } from "@opentui/solid"
|
||||
import { emit } from "../utils/event-bus"
|
||||
import { useKeyboard } from "@opentui/solid";
|
||||
import { emit } from "../utils/event-bus";
|
||||
|
||||
export type MediaKeyAction =
|
||||
| "media.toggle"
|
||||
| "media.volumeUp"
|
||||
| "media.volumeDown"
|
||||
| "media.seekForward"
|
||||
| "media.seekBackward"
|
||||
| "media.speedCycle"
|
||||
|
||||
/** Key-to-action mappings for multimedia controls */
|
||||
const MEDIA_KEY_MAP: Record<string, MediaKeyAction> = {
|
||||
// Common terminal media keys — these overlap with Player.tsx local
|
||||
// bindings, but Player guards on `props.focused` so the global
|
||||
// handler fires independently when the player tab is *not* active.
|
||||
//
|
||||
// When Player IS focused both handlers fire, but since the audio
|
||||
// actions are idempotent (toggle = toggle, seek = additive) having
|
||||
// them called twice for the same keypress is avoided by the event
|
||||
// bus approach — the audio hook only processes event-bus events, and
|
||||
// Player.tsx calls audio methods directly. We therefore guard with
|
||||
// a "playerFocused" flag passed via options.
|
||||
}
|
||||
| "media.toggle"
|
||||
| "media.volumeUp"
|
||||
| "media.volumeDown"
|
||||
| "media.speedCycle";
|
||||
|
||||
export interface MultimediaKeysOptions {
|
||||
/** When true, skip handling (Player.tsx handles keys locally) */
|
||||
playerFocused?: () => boolean
|
||||
/** When true, skip handling (text input has focus) */
|
||||
inputFocused?: () => boolean
|
||||
/** Whether an episode is currently loaded */
|
||||
hasEpisode?: () => boolean
|
||||
/** When true, skip handling (Player.tsx handles keys locally) */
|
||||
playerFocused?: () => boolean;
|
||||
/** When true, skip handling (text input has focus) */
|
||||
inputFocused?: () => boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -49,50 +32,39 @@ export interface MultimediaKeysOptions {
|
||||
* event bus. Call once at the app level (e.g. in App.tsx).
|
||||
*/
|
||||
export function useMultimediaKeys(options: MultimediaKeysOptions = {}) {
|
||||
useKeyboard((key) => {
|
||||
// Don't intercept when a text input owns the keyboard
|
||||
if (options.inputFocused?.()) return
|
||||
useKeyboard((key) => {
|
||||
// Don't intercept when a text input owns the keyboard
|
||||
if (options.inputFocused?.()) return;
|
||||
|
||||
// Don't intercept when Player component handles its own keys
|
||||
if (options.playerFocused?.()) return
|
||||
// Don't intercept when Player component handles its own keys
|
||||
if (options.playerFocused?.()) return;
|
||||
|
||||
// Ctrl/Meta combos are app-level shortcuts, not media keys
|
||||
if (key.ctrl || key.meta) return
|
||||
// Ctrl/Meta combos are app-level shortcuts, not media keys
|
||||
if (key.ctrl || key.meta) return;
|
||||
|
||||
switch (key.name) {
|
||||
case "space":
|
||||
// Toggle play/pause — always valid (may start a loaded episode)
|
||||
emit("media.toggle", {})
|
||||
break
|
||||
switch (key.name) {
|
||||
case "space":
|
||||
// Toggle play/pause — always valid (may start a loaded episode)
|
||||
emit("media.toggle", {});
|
||||
break;
|
||||
|
||||
case "up":
|
||||
if (!options.hasEpisode?.()) return
|
||||
emit("media.volumeUp", {})
|
||||
break
|
||||
case "up":
|
||||
emit("media.volumeUp", {});
|
||||
break;
|
||||
|
||||
case "down":
|
||||
if (!options.hasEpisode?.()) return
|
||||
emit("media.volumeDown", {})
|
||||
break
|
||||
case "down":
|
||||
emit("media.volumeDown", {});
|
||||
break;
|
||||
|
||||
case "left":
|
||||
if (!options.hasEpisode?.()) return
|
||||
emit("media.seekBackward", {})
|
||||
break
|
||||
case "s":
|
||||
// Speed is shift+s (S) so plain `s` stays free for search.
|
||||
if (!key.shift) return;
|
||||
emit("media.speedCycle", {});
|
||||
break;
|
||||
|
||||
case "right":
|
||||
if (!options.hasEpisode?.()) return
|
||||
emit("media.seekForward", {})
|
||||
break
|
||||
|
||||
case "s":
|
||||
if (!options.hasEpisode?.()) return
|
||||
emit("media.speedCycle", {})
|
||||
break
|
||||
|
||||
default:
|
||||
// Not a media key — do nothing
|
||||
break
|
||||
}
|
||||
})
|
||||
default:
|
||||
// Not a media key — do nothing
|
||||
break;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
115
src/hooks/useScrollIntoView.ts
Normal file
@@ -0,0 +1,115 @@
|
||||
/**
|
||||
* useScrollIntoView — keeps the ref'd row visible inside its enclosing
|
||||
* `<scrollbox>` whenever the focus accessor is true.
|
||||
*
|
||||
* OpenTUI's `ScrollBoxRenderable` has built-in *keyboard* scrolling but does
|
||||
* NOT auto-scroll to follow a programmatically-focused child (the app moves
|
||||
* its own cursor via the yazi nav store, so the scrollbox never sees a key
|
||||
* for row movement). Every scrollable panel therefore drifts out of view the
|
||||
* moment the cursor crosses the viewport edge.
|
||||
*
|
||||
* Attach the returned `ref` callback to the element that represents the
|
||||
* focused row of a scrollable list and call the hook with a `when()` that is
|
||||
* true for exactly that row (e.g. `() => index() === focus()`). Whenever the
|
||||
* accessor flips true, the nearest ScrollBoxRenderable is scrolled just enough
|
||||
* to bring the element back into the viewport — a "nearest-edge" scroll:
|
||||
* • scroll up only if the row's top is clipped above the viewport,
|
||||
* • scroll down only if the row's bottom is clipped below the viewport,
|
||||
* never snapping more than necessary (matches yazi list behaviour).
|
||||
*
|
||||
* Timing: for ordinary cursor movement (j/k) the list layout does not change
|
||||
* — only background colour and the cursor glyph flip — so the focused row's
|
||||
* Yoga-computed position is already valid when this effect fires, and the
|
||||
* scroll is applied synchronously. On first mount / content population the
|
||||
* layout for the new rows has not yet been computed, so the hook polls on a
|
||||
* short timer until layout resolves (bounded so it can never loop forever).
|
||||
*/
|
||||
import { createEffect, onCleanup } from "solid-js";
|
||||
|
||||
/** Walk up the renderable parent chain to the nearest ScrollBoxRenderable,
|
||||
* identified by its `viewport` + `content` + numeric `scrollTop`. */
|
||||
function findScrollBox(node: any): any | null {
|
||||
let p: any = node?.parent;
|
||||
while (p) {
|
||||
if (p.viewport && p.content && typeof p.scrollTop === "number") return p;
|
||||
p = p.parent;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/** Maximum number of retries while waiting for Yoga layout to populate the
|
||||
* row/viewport dimensions (handles the first-mount frame). */
|
||||
const MAX_RETRIES = 12;
|
||||
const RETRY_MS = 16;
|
||||
|
||||
export function useScrollIntoView(when: () => boolean) {
|
||||
let el: any = null;
|
||||
let timer: ReturnType<typeof setTimeout> | null = null;
|
||||
const ref = (node: any) => {
|
||||
el = node;
|
||||
};
|
||||
|
||||
const clearTimer = () => {
|
||||
if (timer) {
|
||||
clearTimeout(timer);
|
||||
timer = null;
|
||||
}
|
||||
};
|
||||
|
||||
/** Compute the target scrollTop that brings `el` into the viewport of its
|
||||
* enclosing scrollbox, or `null` if no scroll is possible / needed yet.
|
||||
* Returns the decision so the caller knows whether to poll again. */
|
||||
const compute = (): { scroll: number | null; ready: boolean } => {
|
||||
const node = el;
|
||||
if (!node) return { scroll: null, ready: false };
|
||||
const sb = findScrollBox(node);
|
||||
if (!sb) return { scroll: null, ready: false };
|
||||
const vp = sb.viewport;
|
||||
const top: number = sb.scrollTop ?? 0;
|
||||
const vpH: number = vp?.height ?? 0;
|
||||
// The scrollbar's onChange sets `content.translateY = -scrollTop`, so
|
||||
// the child's cumulative `.y` already includes `-scrollTop`; subtracting
|
||||
// the viewport's stable `.y` and re-adding `scrollTop` recovers the
|
||||
// row's layout-space offset within the content (scroll-independent).
|
||||
const childTop: number = node.y ?? 0;
|
||||
const childH: number = node.height ?? 0;
|
||||
if (!vpH || !childH) return { scroll: null, ready: false };
|
||||
|
||||
const offset = childTop - (vp.y ?? 0) + top;
|
||||
let target = top;
|
||||
if (offset < top) target = offset;
|
||||
else if (offset + childH > top + vpH) target = offset + childH - vpH;
|
||||
const max = Math.max(0, (sb.scrollHeight ?? 0) - vpH);
|
||||
if (target > max) target = max;
|
||||
if (target < 0) target = 0;
|
||||
target = Math.round(target);
|
||||
if (target === Math.round(top)) return { scroll: null, ready: true };
|
||||
return { scroll: target, ready: true };
|
||||
};
|
||||
|
||||
const tryScroll = (retriesLeft: number) => {
|
||||
const { scroll, ready } = compute();
|
||||
if (!ready) {
|
||||
if (retriesLeft > 0)
|
||||
timer = setTimeout(() => tryScroll(retriesLeft - 1), RETRY_MS);
|
||||
return;
|
||||
}
|
||||
if (scroll != null) {
|
||||
const sb = findScrollBox(el);
|
||||
if (sb) sb.scrollTo(scroll);
|
||||
}
|
||||
clearTimer();
|
||||
};
|
||||
|
||||
createEffect(() => {
|
||||
if (!when()) return;
|
||||
clearTimer();
|
||||
tryScroll(MAX_RETRIES);
|
||||
});
|
||||
|
||||
onCleanup(() => {
|
||||
clearTimer();
|
||||
});
|
||||
|
||||
return ref;
|
||||
}
|
||||
16
src/hooks/useSelectionMarker.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
/**
|
||||
* useSelectionMarker — reactive accessor for the row-selection marker glyph.
|
||||
*
|
||||
* When the `showSelectionMarker` setting is on, the focused row of every list
|
||||
* renders `❯`; when off (the default), it renders a space so column alignment
|
||||
* is preserved. Every list pane in the app reads the marker through this hook
|
||||
* so the setting applies consistently everywhere.
|
||||
*/
|
||||
|
||||
import { useAppStore } from "@/stores/app";
|
||||
|
||||
export function useSelectionMarker(): () => string {
|
||||
const app = useAppStore();
|
||||
return () =>
|
||||
app.state().settings.showSelectionMarker ? "❯" : " ";
|
||||
}
|
||||
75
src/hooks/useStableListFocus.ts
Normal file
@@ -0,0 +1,75 @@
|
||||
/**
|
||||
* useStableListFocus — keep the cursor on the SAME row (by id), not the same
|
||||
* index, when a lazy load inserts rows around it.
|
||||
*
|
||||
* The nav store keeps one integer focus per depth frame. That is correct
|
||||
* for j/k (each press moves exactly one row) but wrong when the LIST
|
||||
* changes underneath the cursor: a fetch-more press appends revealed
|
||||
* episodes ABOVE the "[Fetch More]" row (every feed's deeper history is
|
||||
* older than the union's tail), so the button's index shifts down and an
|
||||
* index-stable cursor silently lands on another row. In the Feed tab the
|
||||
* union can even gain rows in the MIDDLE (a revealed episode of one show
|
||||
* sorts newer than another show's already-visible deep rows), moving the
|
||||
* focused episode itself.
|
||||
*
|
||||
* Usage: pages call this hook with a stable row-id accessor (episode id,
|
||||
* show id, or the FETCH_MORE_ROW_ID sentinel for the button row) plus
|
||||
* read/write access to the nav frame focus. Whenever the row count
|
||||
* changes, the cursor is re-anchored onto the previously focused row:
|
||||
* • still present → cursor follows that row (index may change)
|
||||
* • gone (removed) → keep the current, clamped index
|
||||
*
|
||||
* The id snapshot is taken on EVERY change of focus or rows (not just
|
||||
* count changes), so selection by mouse and j/k both re-anchor correctly.
|
||||
*/
|
||||
import { createEffect, on, untrack } from "solid-js";
|
||||
|
||||
/** Sentinel id for the "[Fetch More]" row — never collides with real ids. */
|
||||
export const FETCH_MORE_ROW_ID = "__fetch-more__";
|
||||
|
||||
export function useStableListFocus(deps: {
|
||||
/** Total row count of the list this pane shows. */
|
||||
count: () => number;
|
||||
/** Stable id of the row at `index` (undefined for out-of-range). */
|
||||
getItemId: (index: number) => string | undefined;
|
||||
/** Current focused row index of this pane. */
|
||||
getFocus: () => number;
|
||||
/** Write the focused row index of this pane. */
|
||||
setFocus: (index: number) => void;
|
||||
}): void {
|
||||
/** Focused row id at the time of the last snapshot. */
|
||||
let focusedId: string | undefined;
|
||||
|
||||
// Snapshot the focused row's id whenever focus or rows change. Reading
|
||||
// the list here would also re-run on unrelated row-content changes, so
|
||||
// only the id resolution is untracked.
|
||||
createEffect(() => {
|
||||
const idx = deps.getFocus();
|
||||
untrack(() => {
|
||||
focusedId = deps.getItemId(idx);
|
||||
});
|
||||
});
|
||||
|
||||
// Re-anchor after the row count changes (deferred: never on first run —
|
||||
// initial focus placement is the page's job).
|
||||
createEffect(
|
||||
on(
|
||||
deps.count,
|
||||
(count) => {
|
||||
if (focusedId === undefined) return;
|
||||
let next: number | null = null;
|
||||
for (let i = 0; i < count; i++) {
|
||||
if (deps.getItemId(i) === focusedId) {
|
||||
next = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
// Row gone (removed): leave the clamped index alone — the
|
||||
// page's own ensureFocus handles bounds.
|
||||
if (next === null) return;
|
||||
if (next !== deps.getFocus()) deps.setFocus(next);
|
||||
},
|
||||
{ defer: true },
|
||||
),
|
||||
);
|
||||
}
|
||||
455
src/index.tsx
@@ -1,225 +1,272 @@
|
||||
const VERSION = "0.1.0";
|
||||
import { onCleanup } from "solid-js";
|
||||
import { setupTerminalRecovery } from "./utils/terminal-recovery";
|
||||
import { installNestedScrollBehavior } from "./utils/nested-scroll";
|
||||
import type { Feed } from "./types/feed"
|
||||
import type { Episode } from "./types/episode"
|
||||
|
||||
const VERSION = "0.9.2";
|
||||
|
||||
interface CliArgs {
|
||||
version: boolean;
|
||||
query: string | null;
|
||||
play: string | null;
|
||||
version: boolean;
|
||||
query: string | null;
|
||||
play: string | null;
|
||||
}
|
||||
|
||||
function parseArgs(): CliArgs {
|
||||
const args = process.argv.slice(2);
|
||||
const result: CliArgs = {
|
||||
version: false,
|
||||
query: null,
|
||||
play: null,
|
||||
};
|
||||
const args = process.argv.slice(2);
|
||||
const result: CliArgs = {
|
||||
version: false,
|
||||
query: null,
|
||||
play: null,
|
||||
};
|
||||
|
||||
for (let i = 0; i < args.length; i++) {
|
||||
const arg = args[i];
|
||||
if (arg === "--version" || arg === "-v") {
|
||||
result.version = true;
|
||||
} else if (arg === "--query" || arg === "-q") {
|
||||
result.query = args[i + 1] || "";
|
||||
i++;
|
||||
} else if (arg === "--play" || arg === "-p") {
|
||||
result.play = args[i + 1] || "";
|
||||
i++;
|
||||
}
|
||||
}
|
||||
for (let i = 0; i < args.length; i++) {
|
||||
const arg = args[i];
|
||||
if (arg === "--version" || arg === "-v") {
|
||||
result.version = true;
|
||||
} else if (arg === "--query" || arg === "-q") {
|
||||
result.query = args[i + 1] || "";
|
||||
i++;
|
||||
} else if (arg === "--play" || arg === "-p") {
|
||||
result.play = args[i + 1] || "";
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
return result;
|
||||
}
|
||||
|
||||
const cliArgs = parseArgs();
|
||||
|
||||
if (cliArgs.version) {
|
||||
console.log(`PodTUI version ${VERSION}`);
|
||||
process.exit(0);
|
||||
console.log(`PodTUI version ${VERSION}`);
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
// ── CLI handlers ──────────────────────────────────────────────────────
|
||||
|
||||
function findLatestEpisode(
|
||||
feeds: Feed[],
|
||||
): { feed: Feed; episode: Episode } | null {
|
||||
let latest: { feed: Feed; episode: Episode } | null = null
|
||||
let latestDate = 0
|
||||
|
||||
for (const feed of feeds) {
|
||||
if (feed.episodes.length === 0) continue
|
||||
const ep = feed.episodes[0]
|
||||
const epDate =
|
||||
ep.pubDate instanceof Date ? ep.pubDate.getTime() : Number(ep.pubDate)
|
||||
if (epDate > latestDate) {
|
||||
latestDate = epDate
|
||||
latest = { feed, episode: ep }
|
||||
}
|
||||
}
|
||||
|
||||
return latest
|
||||
}
|
||||
|
||||
/** Search feeds by title and print matching shows */
|
||||
function handleQuery(feeds: Feed[], query: string): void {
|
||||
const normalizedQuery = query.toLowerCase()
|
||||
|
||||
const matches = feeds.filter((feed) => {
|
||||
const title = feed.podcast.title.toLowerCase()
|
||||
return title.includes(normalizedQuery)
|
||||
})
|
||||
|
||||
if (matches.length === 0) {
|
||||
console.log(`No shows found matching: ${query}`)
|
||||
if (feeds.length > 0) {
|
||||
console.log("\nAvailable shows:")
|
||||
feeds.slice(0, 5).forEach((feed) => {
|
||||
console.log(` - ${feed.podcast.title}`)
|
||||
})
|
||||
if (feeds.length > 5) {
|
||||
console.log(` ... and ${feeds.length - 5} more`)
|
||||
}
|
||||
}
|
||||
process.exit(0)
|
||||
}
|
||||
|
||||
if (matches.length === 1) {
|
||||
const feed = matches[0]
|
||||
console.log(`\n${feed.podcast.title}`)
|
||||
if (feed.podcast.description) {
|
||||
console.log(
|
||||
feed.podcast.description.substring(0, 200) +
|
||||
(feed.podcast.description.length > 200 ? "..." : ""),
|
||||
)
|
||||
}
|
||||
console.log(`\nRecent episodes (${Math.min(5, feed.episodes.length)}):`)
|
||||
feed.episodes.slice(0, 5).forEach((ep, idx) => {
|
||||
const date =
|
||||
ep.pubDate instanceof Date
|
||||
? ep.pubDate.toLocaleDateString()
|
||||
: String(ep.pubDate)
|
||||
console.log(` ${idx + 1}. ${ep.title} (${date})`)
|
||||
})
|
||||
process.exit(0)
|
||||
}
|
||||
|
||||
console.log(`\nClosest matches for "${query}":`)
|
||||
matches.slice(0, 5).forEach((feed, idx) => {
|
||||
console.log(` ${idx + 1}. ${feed.podcast.title}`)
|
||||
})
|
||||
process.exit(0)
|
||||
}
|
||||
|
||||
/** Resolve and play an episode from `arg` (title path or "latest") */
|
||||
async function handlePlay(feeds: Feed[], arg: string): Promise<void> {
|
||||
const normalizedArg = arg.toLowerCase()
|
||||
|
||||
let feedResult: Feed | null = null
|
||||
let episodeResult: Episode | null = null
|
||||
|
||||
if (normalizedArg === "latest") {
|
||||
const latest = findLatestEpisode(feeds)
|
||||
if (latest) {
|
||||
feedResult = latest.feed
|
||||
episodeResult = latest.episode
|
||||
}
|
||||
} else {
|
||||
const parts = normalizedArg.split("/")
|
||||
const showQuery = parts[0]
|
||||
const episodeQuery = parts[1]
|
||||
|
||||
const matchingFeeds = feeds.filter((feed) =>
|
||||
feed.podcast.title.toLowerCase().includes(showQuery),
|
||||
)
|
||||
|
||||
if (matchingFeeds.length === 0) {
|
||||
console.log(`No show found matching: ${showQuery}`)
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
const feed = matchingFeeds[0]
|
||||
|
||||
if (!episodeQuery) {
|
||||
if (feed.episodes.length > 0) {
|
||||
feedResult = feed
|
||||
episodeResult = feed.episodes[0]
|
||||
} else {
|
||||
console.log(`No episodes available for: ${feed.podcast.title}`)
|
||||
process.exit(1)
|
||||
}
|
||||
} else if (episodeQuery === "latest") {
|
||||
feedResult = feed
|
||||
episodeResult = feed.episodes[0]
|
||||
} else {
|
||||
const matchingEpisode = feed.episodes.find((ep) =>
|
||||
ep.title.toLowerCase().includes(episodeQuery),
|
||||
)
|
||||
|
||||
if (matchingEpisode) {
|
||||
feedResult = feed
|
||||
episodeResult = matchingEpisode
|
||||
} else {
|
||||
console.log(`Episode not found: ${episodeQuery}`)
|
||||
console.log(`Available episodes for ${feed.podcast.title}:`)
|
||||
feed.episodes.slice(0, 5).forEach((ep, idx) => {
|
||||
console.log(` ${idx + 1}. ${ep.title}`)
|
||||
})
|
||||
process.exit(1)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!feedResult || !episodeResult) {
|
||||
console.log("Could not find episode to play")
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
console.log(`\nPlaying: ${episodeResult.title}`)
|
||||
console.log(`Show: ${feedResult.podcast.title}`)
|
||||
|
||||
try {
|
||||
const { createAudioBackend } = await import("./utils/audio-player")
|
||||
const { fetchCoverArt } = await import("./utils/cover-art")
|
||||
const backend = createAudioBackend()
|
||||
if (episodeResult.audioUrl) {
|
||||
// Stage the podcast cover so the system Now Playing shows
|
||||
// artwork (mpv --cover-art-files), like the UI path does. Falls
|
||||
// back to the episode's own image when the feed has no channel
|
||||
// cover (URL-added feeds).
|
||||
const coverUrl =
|
||||
feedResult.podcast.coverUrl ?? episodeResult.imageUrl;
|
||||
const coverArtPath = coverUrl
|
||||
? await fetchCoverArt(coverUrl)
|
||||
: null
|
||||
await backend.play(episodeResult.audioUrl, {
|
||||
mediaTitle: episodeResult.title,
|
||||
coverArtPath: coverArtPath ?? undefined,
|
||||
})
|
||||
console.log("Playback started (use the UI to control)")
|
||||
} else {
|
||||
console.log("No audio URL available for this episode")
|
||||
process.exit(1)
|
||||
}
|
||||
} catch (err) {
|
||||
console.error("Playback error:", err)
|
||||
process.exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
if (cliArgs.query !== null || cliArgs.play !== null) {
|
||||
import("./utils/feeds-persistence").then(async ({ loadFeedsFromFile }) => {
|
||||
const feeds = await loadFeedsFromFile();
|
||||
import("./utils/feeds-persistence")
|
||||
.then(async ({ loadFeedsFromFile }) => {
|
||||
const feeds = await loadFeedsFromFile();
|
||||
|
||||
if (cliArgs.query !== null) {
|
||||
const query = cliArgs.query;
|
||||
const normalizedQuery = query.toLowerCase();
|
||||
if (cliArgs.query !== null) {
|
||||
handleQuery(feeds, cliArgs.query)
|
||||
}
|
||||
|
||||
const matches = feeds.filter((feed) => {
|
||||
const title = feed.podcast.title.toLowerCase();
|
||||
return title.includes(normalizedQuery);
|
||||
});
|
||||
|
||||
if (matches.length === 0) {
|
||||
console.log(`No shows found matching: ${query}`);
|
||||
if (feeds.length > 0) {
|
||||
console.log("\nAvailable shows:");
|
||||
feeds.slice(0, 5).forEach((feed) => {
|
||||
console.log(` - ${feed.podcast.title}`);
|
||||
});
|
||||
if (feeds.length > 5) {
|
||||
console.log(` ... and ${feeds.length - 5} more`);
|
||||
}
|
||||
}
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
if (matches.length === 1) {
|
||||
const feed = matches[0];
|
||||
console.log(`\n${feed.podcast.title}`);
|
||||
if (feed.podcast.description) {
|
||||
console.log(feed.podcast.description.substring(0, 200) + (feed.podcast.description.length > 200 ? "..." : ""));
|
||||
}
|
||||
console.log(`\nRecent episodes (${Math.min(5, feed.episodes.length)}):`);
|
||||
feed.episodes.slice(0, 5).forEach((ep, idx) => {
|
||||
const date = ep.pubDate instanceof Date ? ep.pubDate.toLocaleDateString() : String(ep.pubDate);
|
||||
console.log(` ${idx + 1}. ${ep.title} (${date})`);
|
||||
});
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
console.log(`\nClosest matches for "${query}":`);
|
||||
matches.slice(0, 5).forEach((feed, idx) => {
|
||||
console.log(` ${idx + 1}. ${feed.podcast.title}`);
|
||||
});
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
if (cliArgs.play !== null) {
|
||||
const playArg = cliArgs.play;
|
||||
const normalizedArg = playArg.toLowerCase();
|
||||
|
||||
let feedResult: typeof feeds[0] | null = null;
|
||||
let episodeResult: typeof feeds[0]["episodes"][0] | null = null;
|
||||
|
||||
if (normalizedArg === "latest") {
|
||||
let latestFeed: typeof feeds[0] | null = null;
|
||||
let latestEpisode: typeof feeds[0]["episodes"][0] | null = null;
|
||||
let latestDate = 0;
|
||||
|
||||
for (const feed of feeds) {
|
||||
if (feed.episodes.length > 0) {
|
||||
const ep = feed.episodes[0];
|
||||
const epDate = ep.pubDate instanceof Date ? ep.pubDate.getTime() : Number(ep.pubDate);
|
||||
if (epDate > latestDate) {
|
||||
latestDate = epDate;
|
||||
latestFeed = feed;
|
||||
latestEpisode = ep;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
feedResult = latestFeed;
|
||||
episodeResult = latestEpisode;
|
||||
} else {
|
||||
const parts = normalizedArg.split("/");
|
||||
const showQuery = parts[0];
|
||||
const episodeQuery = parts[1];
|
||||
|
||||
const matchingFeeds = feeds.filter((feed) =>
|
||||
feed.podcast.title.toLowerCase().includes(showQuery)
|
||||
);
|
||||
|
||||
if (matchingFeeds.length === 0) {
|
||||
console.log(`No show found matching: ${showQuery}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const feed = matchingFeeds[0];
|
||||
|
||||
if (!episodeQuery) {
|
||||
if (feed.episodes.length > 0) {
|
||||
feedResult = feed;
|
||||
episodeResult = feed.episodes[0];
|
||||
} else {
|
||||
console.log(`No episodes available for: ${feed.podcast.title}`);
|
||||
process.exit(1);
|
||||
}
|
||||
} else if (episodeQuery === "latest") {
|
||||
feedResult = feed;
|
||||
episodeResult = feed.episodes[0];
|
||||
} else {
|
||||
const matchingEpisode = feed.episodes.find((ep) =>
|
||||
ep.title.toLowerCase().includes(episodeQuery)
|
||||
);
|
||||
|
||||
if (matchingEpisode) {
|
||||
feedResult = feed;
|
||||
episodeResult = matchingEpisode;
|
||||
} else {
|
||||
console.log(`Episode not found: ${episodeQuery}`);
|
||||
console.log(`Available episodes for ${feed.podcast.title}:`);
|
||||
feed.episodes.slice(0, 5).forEach((ep, idx) => {
|
||||
console.log(` ${idx + 1}. ${ep.title}`);
|
||||
});
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!feedResult || !episodeResult) {
|
||||
console.log("Could not find episode to play");
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
console.log(`\nPlaying: ${episodeResult.title}`);
|
||||
console.log(`Show: ${feedResult.podcast.title}`);
|
||||
|
||||
try {
|
||||
const { createAudioBackend } = await import("./utils/audio-player");
|
||||
const backend = createAudioBackend();
|
||||
if (episodeResult.audioUrl) {
|
||||
await backend.play(episodeResult.audioUrl);
|
||||
console.log("Playback started (use the UI to control)");
|
||||
} else {
|
||||
console.log("No audio URL available for this episode");
|
||||
process.exit(1);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error("Playback error:", err);
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
}).catch((err) => {
|
||||
console.error("Error:", err);
|
||||
process.exit(1);
|
||||
});
|
||||
if (cliArgs.play !== null) {
|
||||
await handlePlay(feeds, cliArgs.play)
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
console.error("Error:", err);
|
||||
process.exit(1);
|
||||
});
|
||||
} else {
|
||||
import("@opentui/solid").then(async ({ render, useRenderer }) => {
|
||||
const { App } = await import("./App");
|
||||
const { ThemeProvider } = await import("./context/ThemeContext");
|
||||
const toast = await import("./ui/toast");
|
||||
const { KeybindProvider } = await import("./context/KeybindContext");
|
||||
const { NavigationProvider } = await import("./context/NavigationContext");
|
||||
const { DialogProvider } = await import("./ui/dialog");
|
||||
const { CommandProvider } = await import("./ui/command");
|
||||
import("@opentui/solid").then(async ({ render, useRenderer }) => {
|
||||
const { App } = await import("./App");
|
||||
const { ThemeProvider } = await import("./context/ThemeContext");
|
||||
const toast = await import("./ui/toast");
|
||||
const { KeybindProvider } = await import("./context/KeybindContext");
|
||||
const { NavigationProvider } = await import("./context/NavigationContext");
|
||||
const { DialogProvider } = await import("./ui/dialog");
|
||||
const { CommandProvider } = await import("./ui/command");
|
||||
// Nested scroll sections favor the innermost one under the cursor.
|
||||
installNestedScrollBehavior();
|
||||
|
||||
function RendererSetup(props: { children: unknown }) {
|
||||
const renderer = useRenderer();
|
||||
renderer.disableStdoutInterception();
|
||||
return props.children;
|
||||
}
|
||||
function RendererSetup(props: { children: unknown }) {
|
||||
const renderer = useRenderer();
|
||||
renderer.disableStdoutInterception();
|
||||
onCleanup(setupTerminalRecovery(renderer));
|
||||
return props.children;
|
||||
}
|
||||
|
||||
render(
|
||||
() => (
|
||||
<RendererSetup>
|
||||
<toast.ToastProvider>
|
||||
<ThemeProvider mode="dark">
|
||||
<KeybindProvider>
|
||||
<NavigationProvider>
|
||||
<DialogProvider>
|
||||
<CommandProvider>
|
||||
<App />
|
||||
<toast.Toast />
|
||||
</CommandProvider>
|
||||
</DialogProvider>
|
||||
</NavigationProvider>
|
||||
</KeybindProvider>
|
||||
</ThemeProvider>
|
||||
</toast.ToastProvider>
|
||||
</RendererSetup>
|
||||
),
|
||||
{ useThread: false },
|
||||
);
|
||||
});
|
||||
render(
|
||||
() => (
|
||||
<RendererSetup>
|
||||
<toast.ToastProvider>
|
||||
<ThemeProvider mode="dark">
|
||||
<KeybindProvider>
|
||||
<NavigationProvider>
|
||||
<DialogProvider>
|
||||
<CommandProvider>
|
||||
<App />
|
||||
<toast.Toast />
|
||||
</CommandProvider>
|
||||
</DialogProvider>
|
||||
</NavigationProvider>
|
||||
</KeybindProvider>
|
||||
</ThemeProvider>
|
||||
</toast.ToastProvider>
|
||||
</RendererSetup>
|
||||
),
|
||||
{ useThread: false },
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -2,21 +2,31 @@
|
||||
* DiscoverPage — yazi depth-stack view of discoverable podcasts.
|
||||
*
|
||||
* depth 0 (current) — category list. Parent pane shows the muted
|
||||
* placeholder (1/7 slot kept).
|
||||
* placeholder (1/5 slot kept).
|
||||
* depth 1 (current) — podcast results for the drilled category. Parent
|
||||
* pane = the categories list.
|
||||
* preview — detail of the hovered item (category summary, or
|
||||
* podcast detail + subscribe action).
|
||||
* depth 2 (current) — episodes of the drilled show, fetched on demand
|
||||
* WITHOUT subscribing. Parent pane = the results list.
|
||||
* preview — detail of the hovered item (category summary,
|
||||
* podcast detail, or episode detail).
|
||||
*
|
||||
* Renders entirely through `<YaziPaneRow>`; no bespoke 3-column flexbox JSX
|
||||
* remains. `l`/Enter drills in (category → results) or subscribes (on a
|
||||
* podcast); `h` pops a depth (noop at 0). j/k move only within the current
|
||||
* column. Moving through categories at depth 0 updates the store's selected
|
||||
* category so the preview follows.
|
||||
* Renders entirely through `<PaneRow>`; no bespoke 3-column flexbox JSX
|
||||
* remains. `l`/Enter drills in (category → results → episodes); `a`
|
||||
* subscribes the focused show (enter/l never subscribe — they open the
|
||||
* episode list); `h` pops a depth (noop at 0). j/k move only within the
|
||||
* current column. Moving through categories at depth 0 updates the store's
|
||||
* selected category so the preview follows.
|
||||
*/
|
||||
|
||||
import { createMemo, For, Show, onMount, onCleanup } from "solid-js";
|
||||
import { useDiscoverStore, DISCOVER_CATEGORIES } from "@/stores/discover";
|
||||
import { useFeedStore } from "@/stores/feed";
|
||||
import { useDownloadStore } from "@/stores/download";
|
||||
import { useAudio } from "@/hooks/useAudio";
|
||||
import { useAudioNavStore, AudioSource } from "@/stores/audio-nav";
|
||||
import { DownloadStatus } from "@/types/episode";
|
||||
import type { Episode } from "@/types/episode";
|
||||
import type { Podcast } from "@/types/podcast";
|
||||
import { format } from "date-fns";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
import {
|
||||
@@ -27,17 +37,29 @@ import {
|
||||
type DepthFrame,
|
||||
} from "@/context/NavigationContext";
|
||||
import { on, off } from "@/utils/event-bus";
|
||||
import { supportsNerdFonts } from "@/utils/nerd-fonts";
|
||||
import type { KeybindActionName } from "@/context/KeybindContext";
|
||||
import { YaziPaneRow } from "@/components/YaziPaneRow";
|
||||
import { PaneRow } from "@/components/PaneRow";
|
||||
import { TabListPane } from "@/components/TabPanel";
|
||||
import { LoadingIndicator } from "@/components/LoadingIndicator";
|
||||
import { EpisodeRow, EpisodePreview } from "@/components/EpisodeList";
|
||||
import { useScrollIntoView } from "@/hooks/useScrollIntoView";
|
||||
import { useSelectionMarker } from "@/hooks/useSelectionMarker";
|
||||
|
||||
export const DiscoverPaneCount = 1;
|
||||
|
||||
function DiscoverPage() {
|
||||
// Static: detection never changes mid-session.
|
||||
const nerd = supportsNerdFonts();
|
||||
const discoverStore = useDiscoverStore();
|
||||
const feedStore = useFeedStore();
|
||||
const downloadStore = useDownloadStore();
|
||||
const audio = useAudio();
|
||||
const audioNav = useAudioNavStore();
|
||||
const { theme } = useTheme();
|
||||
const muted = () => theme.muted || theme.text;
|
||||
const nav = useNavigation();
|
||||
const marker = useSelectionMarker();
|
||||
|
||||
const stack = nav.depthStack;
|
||||
const depth = nav.currentDepth;
|
||||
@@ -54,27 +76,99 @@ function DiscoverPage() {
|
||||
podcasts().length === 0 ? 0 : Math.min(focus(1), podcasts().length - 1);
|
||||
const focusedPodcast = createMemo(() => podcasts()[focusedPodIdx()]);
|
||||
|
||||
// depth-2 frame ctx = the drilled podcast id (episode preview, no
|
||||
// subscription). Episodes come from the discover store's session cache.
|
||||
const drilledPodcastId = (): string => stack()[2]?.ctx ?? "";
|
||||
const drilledPodcast = (): Podcast | undefined =>
|
||||
podcasts().find((p) => p.id === drilledPodcastId());
|
||||
const episodes = createMemo<Episode[]>(() => {
|
||||
if (depth() < 2) return [];
|
||||
return discoverStore.episodesForPodcast(drilledPodcastId());
|
||||
});
|
||||
const episodesLoading = () =>
|
||||
depth() >= 2 && discoverStore.isLoadingEpisodesFor(drilledPodcastId());
|
||||
const episodesError = () =>
|
||||
depth() >= 2 ? discoverStore.previewError(drilledPodcastId()) : undefined;
|
||||
const focusedEpIdx = () =>
|
||||
episodes().length === 0 ? 0 : Math.min(focus(2), episodes().length - 1);
|
||||
const focusedEpisode = () => episodes()[focusedEpIdx()];
|
||||
|
||||
const curLen = () =>
|
||||
depth() === 0 ? categories().length : podcasts().length;
|
||||
depth() === 0
|
||||
? categories().length
|
||||
: depth() === 1
|
||||
? podcasts().length
|
||||
: episodes().length;
|
||||
|
||||
const ensureFocus = () => {
|
||||
if (categories().length > 0 && focus(0) >= categories().length)
|
||||
nav.setDepthFocus(categories().length - 1, 0);
|
||||
if (podcasts().length > 0 && focus(1) >= podcasts().length)
|
||||
nav.setDepthFocus(podcasts().length - 1, 1);
|
||||
if (episodes().length > 0 && focus(2) >= episodes().length)
|
||||
nav.setDepthFocus(episodes().length - 1, 2);
|
||||
};
|
||||
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(() => {
|
||||
nav.registerResolver(`${nav.activeTab()}:${DEPTH_CENTER_PANE}`, (i) => {
|
||||
if (depth() === 0) return categories()[i]?.id;
|
||||
return podcasts()[i]?.id;
|
||||
if (depth() === 1) return podcasts()[i]?.id;
|
||||
return episodes()[i]?.id;
|
||||
});
|
||||
});
|
||||
|
||||
// ── helpers ────────────────────────────────────────────────────────────────
|
||||
const formatDate = (d: Date) => format(d, "MMM d, yyyy");
|
||||
|
||||
/** The subscribed feed backing a podcast, if any (matched by directory id
|
||||
* or feed URL — a Discover show may already be subscribed). */
|
||||
const feedForPodcast = (p: Podcast) =>
|
||||
feedStore.feeds().find(
|
||||
(f) =>
|
||||
f.podcast.id === p.id ||
|
||||
(!!p.feedUrl && f.podcast.feedUrl === p.feedUrl),
|
||||
);
|
||||
|
||||
const downloadLabel = (id: string) => {
|
||||
switch (downloadStore.getDownloadStatus(id)) {
|
||||
case DownloadStatus.QUEUED:
|
||||
return "[Q]";
|
||||
case DownloadStatus.DOWNLOADING:
|
||||
return `[${downloadStore.getDownloadProgress(id)}%]`;
|
||||
case DownloadStatus.COMPLETED:
|
||||
return "[DL]";
|
||||
case DownloadStatus.FAILED:
|
||||
return "[ERR]";
|
||||
default:
|
||||
return "";
|
||||
}
|
||||
};
|
||||
const downloadColor = (id: string) => {
|
||||
switch (downloadStore.getDownloadStatus(id)) {
|
||||
case DownloadStatus.QUEUED:
|
||||
return theme.warning;
|
||||
case DownloadStatus.DOWNLOADING:
|
||||
return theme.primary;
|
||||
case DownloadStatus.COMPLETED:
|
||||
return theme.success;
|
||||
case DownloadStatus.FAILED:
|
||||
return theme.error;
|
||||
default:
|
||||
return muted();
|
||||
}
|
||||
};
|
||||
const playEpisode = (ep: Episode) => {
|
||||
audio.play(ep).catch(() => {});
|
||||
audioNav.setSource(AudioSource.SEARCH, drilledPodcast()?.id);
|
||||
};
|
||||
|
||||
// ── drill / open ───────────────────────────────────────────────────────────
|
||||
function open() {
|
||||
if (depth() === 0) {
|
||||
@@ -85,9 +179,19 @@ function DiscoverPage() {
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
return;
|
||||
}
|
||||
if (depth() >= 1) {
|
||||
if (depth() === 1) {
|
||||
const pod = focusedPodcast();
|
||||
if (pod) discoverStore.toggleSubscription(pod.id);
|
||||
if (!pod) return;
|
||||
// Drill into the show's episode list WITHOUT subscribing — `l`,
|
||||
// right, and Enter open the episodes; `a` is the subscribe key.
|
||||
discoverStore.openEpisodes(pod).catch(() => {});
|
||||
nav.pushDepth({ kind: "episodes", ctx: pod.id, focus: 0 } as DepthFrame);
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
return;
|
||||
}
|
||||
if (depth() >= 2) {
|
||||
const ep = focusedEpisode();
|
||||
if (ep) playEpisode(ep);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -103,12 +207,59 @@ function DiscoverPage() {
|
||||
"goto-bottom": () => nav.gotoIndex(curLen() - 1, curLen()),
|
||||
open: () => open(),
|
||||
"toggle-select": () => {
|
||||
if (depth() >= 1) {
|
||||
if (depth() === 1) {
|
||||
const pod = focusedPodcast();
|
||||
if (pod) nav.toggleSelected(pod.id);
|
||||
}
|
||||
if (depth() >= 2) {
|
||||
const ep = focusedEpisode();
|
||||
if (ep) nav.toggleSelected(ep.id);
|
||||
}
|
||||
},
|
||||
download: () => {
|
||||
if (depth() !== 2) return;
|
||||
const pod = drilledPodcast();
|
||||
const ep = focusedEpisode();
|
||||
if (!pod || !ep) return;
|
||||
// Under its subscribed feed when already subscribed, otherwise as
|
||||
// an "unsubscribed show" download (mirrors Search).
|
||||
const feed = feedForPodcast(pod);
|
||||
if (feed) downloadStore.startDownload(ep, feed.id);
|
||||
else downloadStore.startUnsubscribedDownload(ep, pod);
|
||||
},
|
||||
"delete-download": () => {
|
||||
if (depth() !== 2) return;
|
||||
const ep = focusedEpisode();
|
||||
if (!ep) return;
|
||||
const id = ep.id;
|
||||
if (downloadStore.getDownloadStatus(id) === DownloadStatus.NONE) return;
|
||||
downloadStore.cancelDownload(id);
|
||||
downloadStore.removeDownload(id).catch(() => {});
|
||||
},
|
||||
// `a`/`x` — the dedicated subscribe/unsubscribe keys (enter/l now open
|
||||
// the episode list, so subscribing moved off open).
|
||||
subscribe: () => {
|
||||
if (depth() === 1) {
|
||||
const pod = focusedPodcast();
|
||||
if (pod && !pod.isSubscribed) discoverStore.subscribe(pod.id);
|
||||
return;
|
||||
}
|
||||
if (depth() >= 2) {
|
||||
const pod = drilledPodcast();
|
||||
if (pod && !pod.isSubscribed) discoverStore.subscribe(pod.id);
|
||||
}
|
||||
},
|
||||
unsubscribe: () => {
|
||||
if (depth() !== 1) return;
|
||||
const pod = focusedPodcast();
|
||||
if (pod?.isSubscribed) discoverStore.unsubscribe(pod.id);
|
||||
},
|
||||
refresh: () => {
|
||||
if (depth() >= 2) {
|
||||
const pod = drilledPodcast();
|
||||
if (pod) discoverStore.refreshEpisodes(pod).catch(() => {});
|
||||
return;
|
||||
}
|
||||
discoverStore.refresh().catch(() => {});
|
||||
},
|
||||
};
|
||||
@@ -140,38 +291,87 @@ function DiscoverPage() {
|
||||
const focusBg = (i: number, lf: number, active: boolean) =>
|
||||
i === lf && active ? theme.primary : i === lf ? theme.border : undefined;
|
||||
const focusFg = (i: number, lf: number, active: boolean) =>
|
||||
i === lf && active ? theme.surface : theme.text;
|
||||
i === lf && active
|
||||
? theme.surface
|
||||
: i === lf
|
||||
? theme.selectedListItemText ?? theme.text
|
||||
: theme.text;
|
||||
|
||||
const currentLabel = () =>
|
||||
depth() === 0
|
||||
? "Categories"
|
||||
: `${focusedCategory()?.name ?? "Discover"} · ${podcasts().length}`;
|
||||
: depth() === 1
|
||||
? `${focusedCategory()?.name ?? "Discover"} · ${podcasts().length}`
|
||||
: `${drilledPodcast()?.title ?? "Episodes"} · ${episodes().length}`;
|
||||
|
||||
// ── parent pane: previous-depth list (muted/blank at depth 0) ─────────────
|
||||
// ── parent pane: previous-depth list (muted/blank at depth 0) ──────────
|
||||
// Stable <Show> gate (not a ternary root swap) so the parent list
|
||||
// mounts/unmounts cleanly on depth change.
|
||||
// Sibling <Show> blocks per depth (the known-good opentui disposal
|
||||
// pattern, mirrors Settings): a STABLE fragment root whose inner <Show>
|
||||
// children toggle on depth change, so the old subtree is disposed instead
|
||||
// of left orphaned next to the new one (single <Show with fallback> and
|
||||
// ternary root swaps both leak the previous root).
|
||||
const parentContent = () => (
|
||||
<Show when={depth() >= 1} fallback={<TabListPane muted />}>
|
||||
<For each={categories()}>
|
||||
{(cat, index) => (
|
||||
<box
|
||||
flexDirection="row"
|
||||
gap={1}
|
||||
paddingLeft={1}
|
||||
paddingRight={1}
|
||||
backgroundColor={focusBg(index(), nav.depthFocus(0), false)}
|
||||
>
|
||||
<text fg={focusFg(index(), nav.depthFocus(0), false)}>
|
||||
{index() === nav.depthFocus(0) ? "❯" : " "}
|
||||
</text>
|
||||
<text fg={focusFg(index(), nav.depthFocus(0), false)}>
|
||||
{cat.name}
|
||||
</text>
|
||||
</box>
|
||||
)}
|
||||
</For>
|
||||
</Show>
|
||||
<>
|
||||
<Show when={depth() === 0}>
|
||||
<TabListPane muted />
|
||||
</Show>
|
||||
<Show when={depth() === 1}>
|
||||
<For each={categories()}>
|
||||
{(cat, index) => {
|
||||
const lf = () => nav.depthFocus(0);
|
||||
const ref = useScrollIntoView(() => index() === lf());
|
||||
return (
|
||||
<box
|
||||
ref={ref}
|
||||
flexDirection="row"
|
||||
gap={1}
|
||||
paddingRight={1}
|
||||
backgroundColor={focusBg(index(), lf(), false)}
|
||||
>
|
||||
<text fg={focusFg(index(), nav.depthFocus(0), false)}>
|
||||
{index() === nav.depthFocus(0) ? marker() : " "}
|
||||
</text>
|
||||
{nerd && (
|
||||
<text fg={focusFg(index(), nav.depthFocus(0), false)}>
|
||||
{cat.icon}
|
||||
</text>
|
||||
)}
|
||||
<text fg={focusFg(index(), nav.depthFocus(0), false)}>
|
||||
{cat.name}
|
||||
</text>
|
||||
</box>
|
||||
);
|
||||
}}
|
||||
</For>
|
||||
</Show>
|
||||
<Show when={depth() >= 2}>
|
||||
<For each={podcasts()}>
|
||||
{(podcast, index) => {
|
||||
const lf = () => nav.depthFocus(1);
|
||||
const ref = useScrollIntoView(() => index() === lf());
|
||||
return (
|
||||
<box
|
||||
ref={ref}
|
||||
flexDirection="row"
|
||||
gap={1}
|
||||
paddingRight={1}
|
||||
backgroundColor={focusBg(index(), lf(), false)}
|
||||
>
|
||||
<text fg={focusFg(index(), lf(), false)}>
|
||||
{index() === lf() ? marker() : " "}
|
||||
</text>
|
||||
<text wrapMode="none" truncate fg={focusFg(index(), lf(), false)}>
|
||||
{podcast.title}
|
||||
</text>
|
||||
<Show when={podcast.isSubscribed}>
|
||||
<text flexShrink={0} fg={muted()}>[+]</text>
|
||||
</Show>
|
||||
</box>
|
||||
);
|
||||
}}
|
||||
</For>
|
||||
</Show>
|
||||
</>
|
||||
);
|
||||
|
||||
// ── current pane ───────────────────────────────────────────────────────────
|
||||
@@ -181,76 +381,86 @@ function DiscoverPage() {
|
||||
<Show when={depth() === 0}>
|
||||
<For each={categories()}>
|
||||
{(cat, index) => {
|
||||
const lf = focusedCatIdx();
|
||||
const selected = () => cat.id === discoverStore.selectedCategory();
|
||||
const lf = () => focusedCatIdx();
|
||||
const ref = useScrollIntoView(() => index() === lf());
|
||||
return (
|
||||
<box
|
||||
ref={ref}
|
||||
flexDirection="row"
|
||||
gap={1}
|
||||
paddingLeft={1}
|
||||
paddingRight={1}
|
||||
backgroundColor={focusBg(index(), lf, isActive())}
|
||||
backgroundColor={focusBg(index(), lf(), isActive())}
|
||||
onMouseDown={() => {
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
nav.setDepthFocus(index(), 0);
|
||||
discoverStore.setSelectedCategory(cat.id);
|
||||
}}
|
||||
>
|
||||
<text fg={focusFg(index(), lf, isActive())}>
|
||||
{index() === lf ? "❯" : " "}
|
||||
<text fg={focusFg(index(), lf(), isActive())}>
|
||||
{index() === lf() ? marker() : " "}
|
||||
</text>
|
||||
<text fg={focusFg(index(), lf, isActive())}>{cat.name}</text>
|
||||
<Show when={selected()}>
|
||||
<text fg={index() === lf ? theme.surface : theme.accent}>
|
||||
*
|
||||
{nerd && (
|
||||
<text fg={focusFg(index(), lf(), isActive())}>
|
||||
{cat.icon}
|
||||
</text>
|
||||
</Show>
|
||||
)}
|
||||
<text fg={focusFg(index(), lf(), isActive())}>{cat.name}</text>
|
||||
</box>
|
||||
);
|
||||
}}
|
||||
</For>
|
||||
</Show>
|
||||
{/* depth ≥1: results */}
|
||||
<Show when={depth() >= 1}>
|
||||
<Show when={depth() === 1}>
|
||||
<Show
|
||||
when={podcasts().length > 0}
|
||||
fallback={
|
||||
<box padding={1}>
|
||||
<text fg={muted()}>No podcasts found. :refresh</text>
|
||||
<Show
|
||||
when={discoverStore.isLoading()}
|
||||
fallback={
|
||||
<text fg={muted()}>No podcasts found. :refresh</text>
|
||||
}
|
||||
>
|
||||
<LoadingIndicator label="Discovering…" />
|
||||
</Show>
|
||||
</box>
|
||||
}
|
||||
>
|
||||
<For each={podcasts()}>
|
||||
{(podcast, index) => {
|
||||
const lf = focusedPodIdx();
|
||||
const lf = () => focusedPodIdx();
|
||||
const ref = useScrollIntoView(() => index() === lf());
|
||||
return (
|
||||
<box
|
||||
ref={ref}
|
||||
flexDirection="column"
|
||||
gap={0}
|
||||
paddingLeft={1}
|
||||
paddingRight={1}
|
||||
backgroundColor={focusBg(index(), lf, isActive())}
|
||||
backgroundColor={focusBg(index(), lf(), isActive())}
|
||||
onMouseDown={() => {
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
nav.setDepthFocus(index(), 1);
|
||||
}}
|
||||
>
|
||||
<box flexDirection="row" gap={1}>
|
||||
<text fg={focusFg(index(), lf, isActive())}>
|
||||
{index() === lf ? "❯" : " "}
|
||||
<text fg={focusFg(index(), lf(), isActive())}>
|
||||
{index() === lf() ? marker() : " "}
|
||||
</text>
|
||||
<text fg={focusFg(index(), lf, isActive())}>
|
||||
<text fg={focusFg(index(), lf(), isActive())}>
|
||||
{podcast.title}
|
||||
</text>
|
||||
<Show when={podcast.isSubscribed}>
|
||||
<text fg={index() === lf ? theme.surface : theme.success}>
|
||||
<text
|
||||
fg={index() === lf() ? theme.surface : theme.success}
|
||||
>
|
||||
[+]
|
||||
</text>
|
||||
</Show>
|
||||
</box>
|
||||
<Show when={podcast.author}>
|
||||
<text
|
||||
fg={index() === lf ? theme.surface : muted()}
|
||||
fg={index() === lf() ? theme.surface : muted()}
|
||||
paddingLeft={2}
|
||||
>
|
||||
by {podcast.author}
|
||||
@@ -260,6 +470,59 @@ function DiscoverPage() {
|
||||
);
|
||||
}}
|
||||
</For>
|
||||
<Show when={discoverStore.isLoading()}>
|
||||
<box paddingLeft={2} paddingTop={1}>
|
||||
<LoadingIndicator />
|
||||
</box>
|
||||
</Show>
|
||||
</Show>
|
||||
</Show>
|
||||
{/* depth ≥2: episodes of the drilled show (preview, no subscription) */}
|
||||
<Show when={depth() >= 2}>
|
||||
<Show when={episodesLoading()}>
|
||||
<box padding={1}>
|
||||
<LoadingIndicator label="Loading episodes…" />
|
||||
</box>
|
||||
</Show>
|
||||
<Show when={episodesError() && !episodesLoading()}>
|
||||
<box padding={1}>
|
||||
<text fg={theme.error}>{episodesError()}</text>
|
||||
<box height={1} />
|
||||
<text fg={muted()}>r: retry · h: back</text>
|
||||
</box>
|
||||
</Show>
|
||||
<Show
|
||||
when={
|
||||
!episodesLoading() && !episodesError() && episodes().length === 0
|
||||
}
|
||||
>
|
||||
<box padding={1}>
|
||||
<text fg={muted()}>No episodes found. :refresh</text>
|
||||
</box>
|
||||
</Show>
|
||||
<Show
|
||||
when={
|
||||
!episodesLoading() && !episodesError() && episodes().length > 0
|
||||
}
|
||||
>
|
||||
<For each={episodes()}>
|
||||
{(ep, index) => (
|
||||
<EpisodeRow
|
||||
episode={ep}
|
||||
index={index}
|
||||
focused={focusedEpIdx}
|
||||
active={isActive}
|
||||
selected={() => nav.isSelected(ep.id)}
|
||||
downloadLabel={() => downloadLabel(ep.id)}
|
||||
downloadColor={() => downloadColor(ep.id)}
|
||||
marker={marker}
|
||||
onMouseDown={() => {
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
nav.setDepthFocus(index(), 2);
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</For>
|
||||
</Show>
|
||||
</Show>
|
||||
</>
|
||||
@@ -268,7 +531,7 @@ function DiscoverPage() {
|
||||
// ── preview pane ───────────────────────────────────────────────────────────
|
||||
const previewContent = () =>
|
||||
depth() === 0 ? (
|
||||
// depth 0 preview: hovered category
|
||||
// depth 0 preview: shows for the hovered category
|
||||
<Show
|
||||
when={focusedCategory()}
|
||||
fallback={
|
||||
@@ -278,21 +541,40 @@ function DiscoverPage() {
|
||||
}
|
||||
>
|
||||
{(cat) => (
|
||||
<box flexDirection="column" gap={1} padding={1}>
|
||||
<box flexDirection="column" gap={0} padding={1}>
|
||||
<text fg={theme.textPrimary ?? theme.text}>
|
||||
<strong>{cat().name}</strong>
|
||||
</text>
|
||||
<text fg={theme.textSecondary}>
|
||||
{(cat() as any).description ??
|
||||
`Browse top podcasts in ${cat().name}.`}
|
||||
</text>
|
||||
<Show when={(cat() as any).description}>
|
||||
<text fg={theme.textSecondary}>{(cat() as any).description}</text>
|
||||
</Show>
|
||||
<box height={1} />
|
||||
<text fg={muted()}>enter/l: open · h: back</text>
|
||||
<Show
|
||||
when={podcasts().length > 0}
|
||||
fallback={
|
||||
<text fg={muted()}>
|
||||
No shows in this category yet. :refresh
|
||||
</text>
|
||||
}
|
||||
>
|
||||
<For each={podcasts()}>
|
||||
{(pod) => (
|
||||
<box flexDirection="column" gap={0}>
|
||||
<text fg={theme.text}>{pod.title}</text>
|
||||
<Show when={pod.author}>
|
||||
<text fg={muted()} paddingLeft={2}>
|
||||
by {pod.author}
|
||||
</text>
|
||||
</Show>
|
||||
</box>
|
||||
)}
|
||||
</For>
|
||||
</Show>
|
||||
</box>
|
||||
)}
|
||||
</Show>
|
||||
) : (
|
||||
// depth ≥1 preview: hovered podcast + subscribe
|
||||
) : depth() === 1 ? (
|
||||
// depth 1 preview: hovered podcast + episode-list hint
|
||||
<Show
|
||||
when={focusedPodcast()}
|
||||
fallback={
|
||||
@@ -310,10 +592,10 @@ function DiscoverPage() {
|
||||
<text fg={muted()}>by {pod().author}</text>
|
||||
</Show>
|
||||
<Show when={pod().isSubscribed}>
|
||||
<text fg={theme.success}>✓ Subscribed</text>
|
||||
<text fg={theme.success}>✓ Subscribed · x: unsubscribe</text>
|
||||
</Show>
|
||||
<Show when={!pod().isSubscribed}>
|
||||
<text fg={theme.primary}>[+] Subscribe (enter)</text>
|
||||
<text fg={theme.primary}>a: subscribe</text>
|
||||
</Show>
|
||||
<box height={1} />
|
||||
<text fg={theme.textSecondary}>
|
||||
@@ -332,20 +614,75 @@ function DiscoverPage() {
|
||||
</Show>
|
||||
<text fg={muted()}>Updated: {formatDate(pod().lastUpdated)}</text>
|
||||
<box height={1} />
|
||||
<text fg={muted()}>enter: subscribe · h: back · r: refresh</text>
|
||||
<text fg={muted()}>enter/l: episodes · h: back · r: refresh</text>
|
||||
</box>
|
||||
)}
|
||||
</Show>
|
||||
) : (
|
||||
// depth ≥2 preview: hovered episode (or loading/error/empty)
|
||||
<>
|
||||
<Show when={episodesLoading()}>
|
||||
<box padding={1}>
|
||||
<LoadingIndicator label="Loading episodes…" />
|
||||
</box>
|
||||
</Show>
|
||||
<Show when={episodesError() && !episodesLoading()}>
|
||||
<box padding={1}>
|
||||
<text fg={theme.error}>{episodesError()}</text>
|
||||
<box height={1} />
|
||||
<text fg={muted()}>r: retry · h: back</text>
|
||||
</box>
|
||||
</Show>
|
||||
<Show
|
||||
when={
|
||||
!episodesLoading() && !episodesError() && episodes().length === 0
|
||||
}
|
||||
>
|
||||
<box padding={1}>
|
||||
<text fg={muted()}>No episodes found.</text>
|
||||
</box>
|
||||
</Show>
|
||||
<Show
|
||||
when={
|
||||
!episodesLoading() &&
|
||||
!episodesError() &&
|
||||
episodes().length > 0 &&
|
||||
focusedEpisode()
|
||||
}
|
||||
fallback={
|
||||
<box padding={1}>
|
||||
<text fg={muted()}>No episode focused</text>
|
||||
</box>
|
||||
}
|
||||
>
|
||||
{(ep) => (
|
||||
<EpisodePreview
|
||||
episode={() => ep()}
|
||||
author={() => drilledPodcast()?.author}
|
||||
downloadLabel={() => downloadLabel(ep().id)}
|
||||
downloadColor={() => downloadColor(ep().id)}
|
||||
hint={() =>
|
||||
`enter: play · d: download${
|
||||
downloadStore.getDownloadStatus(ep().id) !==
|
||||
DownloadStatus.NONE
|
||||
? " · D: delete"
|
||||
: ""
|
||||
}${
|
||||
drilledPodcast()?.isSubscribed ? "" : " · a: subscribe"
|
||||
} · h: back`
|
||||
}
|
||||
/>
|
||||
)}
|
||||
</Show>
|
||||
</>
|
||||
);
|
||||
|
||||
return (
|
||||
<YaziPaneRow
|
||||
<PaneRow
|
||||
parent={parentContent}
|
||||
current={currentContent}
|
||||
preview={previewContent}
|
||||
parentLabel={() => (depth() >= 1 ? "Categories" : "Up")}
|
||||
currentLabel={currentLabel}
|
||||
previewLabel="Detail"
|
||||
focused={isActive}
|
||||
/>
|
||||
);
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
/**
|
||||
* PodcastCard component - Reusable card for displaying podcast info
|
||||
*/
|
||||
|
||||
import { Show, For } from "solid-js";
|
||||
import type { Podcast } from "@/types/podcast";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
import { SelectableBox, SelectableText } from "@/components/Selectable";
|
||||
|
||||
type PodcastCardProps = {
|
||||
podcast: Podcast;
|
||||
selected: boolean;
|
||||
compact?: boolean;
|
||||
onSelect?: () => void;
|
||||
onSubscribe?: () => void;
|
||||
};
|
||||
|
||||
export function PodcastCard(props: PodcastCardProps) {
|
||||
const { theme } = useTheme();
|
||||
const handleSubscribeClick = () => {
|
||||
props.onSubscribe?.();
|
||||
};
|
||||
|
||||
return (
|
||||
<SelectableBox
|
||||
selected={() => props.selected}
|
||||
flexDirection="column"
|
||||
padding={1}
|
||||
onMouseDown={props.onSelect}
|
||||
>
|
||||
<box flexDirection="row" gap={2} alignItems="center">
|
||||
<SelectableText selected={() => props.selected} primary>
|
||||
<strong>{props.podcast.title}</strong>
|
||||
</SelectableText>
|
||||
|
||||
<Show when={props.podcast.isSubscribed}>
|
||||
<text fg={theme.success}>[+]</text>
|
||||
</Show>
|
||||
</box>
|
||||
|
||||
{/* Author */}
|
||||
<Show when={props.podcast.author && !props.compact}>
|
||||
<SelectableText
|
||||
selected={() => props.selected}
|
||||
tertiary
|
||||
>
|
||||
by {props.podcast.author}
|
||||
</SelectableText>
|
||||
</Show>
|
||||
|
||||
{/* Description */}
|
||||
<Show when={props.podcast.description && !props.compact}>
|
||||
<SelectableText
|
||||
selected={() => props.selected}
|
||||
tertiary
|
||||
>
|
||||
{props.podcast.description!.length > 80
|
||||
? props.podcast.description!.slice(0, 80) + "..."
|
||||
: props.podcast.description}
|
||||
</SelectableText>
|
||||
</Show>
|
||||
|
||||
{/**<box
|
||||
flexDirection="row"
|
||||
justifyContent="space-between"
|
||||
marginTop={props.compact ? 0 : 1}
|
||||
/>**/}
|
||||
<box flexDirection="row" gap={1}>
|
||||
<Show when={(props.podcast.categories ?? []).length > 0}>
|
||||
<For each={(props.podcast.categories ?? []).slice(0, 2)}>
|
||||
{(cat) => <text fg={theme.warning}>[{cat}]</text>}
|
||||
</For>
|
||||
</Show>
|
||||
</box>
|
||||
|
||||
<Show when={props.selected}>
|
||||
<box onMouseDown={handleSubscribeClick}>
|
||||
<text fg={props.podcast.isSubscribed ? theme.error : theme.success}>
|
||||
{props.podcast.isSubscribed ? "[Unsubscribe]" : "[Subscribe]"}
|
||||
</text>
|
||||
</box>
|
||||
</Show>
|
||||
</SelectableBox>
|
||||
);
|
||||
}
|
||||
@@ -1,194 +0,0 @@
|
||||
/**
|
||||
* Feed detail view component for PodTUI
|
||||
* Shows podcast info and episode list
|
||||
*/
|
||||
|
||||
import { createSignal, For, Show } from "solid-js";
|
||||
import { useKeyboard } from "@opentui/solid";
|
||||
import type { Feed } from "@/types/feed";
|
||||
import type { Episode } from "@/types/episode";
|
||||
import { format } from "date-fns";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
import { SelectableBox, SelectableText } from "@/components/Selectable";
|
||||
|
||||
interface FeedDetailProps {
|
||||
feed: Feed;
|
||||
focused?: boolean;
|
||||
onBack?: () => void;
|
||||
onPlayEpisode?: (episode: Episode) => void;
|
||||
}
|
||||
|
||||
export function FeedDetail(props: FeedDetailProps) {
|
||||
const { theme } = useTheme();
|
||||
const [selectedIndex, setSelectedIndex] = createSignal(0);
|
||||
const [showInfo, setShowInfo] = createSignal(true);
|
||||
|
||||
const episodes = () => {
|
||||
// Sort episodes by publication date (newest first)
|
||||
return [...props.feed.episodes].sort(
|
||||
(a, b) => b.pubDate.getTime() - a.pubDate.getTime(),
|
||||
);
|
||||
};
|
||||
|
||||
const formatDuration = (seconds: number): string => {
|
||||
const mins = Math.floor(seconds / 60);
|
||||
const hrs = Math.floor(mins / 60);
|
||||
if (hrs > 0) {
|
||||
return `${hrs}h ${mins % 60}m`;
|
||||
}
|
||||
return `${mins}m`;
|
||||
};
|
||||
|
||||
const formatDate = (date: Date): string => {
|
||||
return format(date, "MMM d, yyyy");
|
||||
};
|
||||
|
||||
const handleKeyPress = (key: { name: string }) => {
|
||||
const eps = episodes();
|
||||
|
||||
if (key.name === "escape" && props.onBack) {
|
||||
props.onBack();
|
||||
return;
|
||||
}
|
||||
|
||||
if (key.name === "i") {
|
||||
setShowInfo((v) => !v);
|
||||
return;
|
||||
}
|
||||
|
||||
if (key.name === "v") {
|
||||
props.feed.podcast.onToggleVisibility?.(props.feed.id);
|
||||
return;
|
||||
}
|
||||
|
||||
if (key.name === "up" || key.name === "k") {
|
||||
setSelectedIndex((i) => Math.max(0, i - 1));
|
||||
} else if (key.name === "down" || key.name === "j") {
|
||||
setSelectedIndex((i) => Math.min(eps.length - 1, i + 1));
|
||||
} else if (key.name === "return") {
|
||||
const episode = eps[selectedIndex()];
|
||||
if (episode && props.onPlayEpisode) {
|
||||
props.onPlayEpisode(episode);
|
||||
}
|
||||
} else if (key.name === "home" || key.name === "g") {
|
||||
setSelectedIndex(0);
|
||||
} else if (key.name === "end") {
|
||||
setSelectedIndex(eps.length - 1);
|
||||
} else if (key.name === "pageup") {
|
||||
setSelectedIndex((i) => Math.max(0, i - 10));
|
||||
} else if (key.name === "pagedown") {
|
||||
setSelectedIndex((i) => Math.min(eps.length - 1, i + 10));
|
||||
}
|
||||
};
|
||||
|
||||
useKeyboard((key) => {
|
||||
if (!props.focused) return;
|
||||
handleKeyPress(key);
|
||||
});
|
||||
|
||||
return (
|
||||
<box flexDirection="column" gap={1}>
|
||||
{/* Header with back button */}
|
||||
<box flexDirection="row" justifyContent="space-between">
|
||||
<box border padding={0} onMouseDown={props.onBack} borderColor={theme.border}>
|
||||
<SelectableText selected={() => false} primary>[Esc] Back</SelectableText>
|
||||
</box>
|
||||
<box border padding={0} onMouseDown={() => setShowInfo((v) => !v)} borderColor={theme.border}>
|
||||
<SelectableText selected={() => false} primary>[i] {showInfo() ? "Hide" : "Show"} Info</SelectableText>
|
||||
</box>
|
||||
<box border padding={0} onMouseDown={() => props.feed.podcast.onToggleVisibility?.(props.feed.id)} borderColor={theme.border}>
|
||||
<SelectableText selected={() => false} primary>[v] Toggle Visibility</SelectableText>
|
||||
</box>
|
||||
</box>
|
||||
|
||||
{/* Podcast info section */}
|
||||
<Show when={showInfo()}>
|
||||
<box border padding={1} flexDirection="column" gap={0} borderColor={theme.border}>
|
||||
<SelectableText selected={() => false} primary>
|
||||
<strong>{props.feed.customName || props.feed.podcast.title}</strong>
|
||||
</SelectableText>
|
||||
{props.feed.podcast.author && (
|
||||
<box flexDirection="row" gap={1}>
|
||||
<SelectableText selected={() => false} tertiary>by</SelectableText>
|
||||
<SelectableText selected={() => false} primary>{props.feed.podcast.author}</SelectableText>
|
||||
</box>
|
||||
)}
|
||||
<box height={1} />
|
||||
<SelectableText selected={() => false} tertiary>
|
||||
{props.feed.podcast.description?.slice(0, 200)}
|
||||
{(props.feed.podcast.description?.length || 0) > 200 ? "..." : ""}
|
||||
</SelectableText>
|
||||
<box height={1} />
|
||||
<box flexDirection="row" gap={2}>
|
||||
<box flexDirection="row" gap={1}>
|
||||
<SelectableText selected={() => false} tertiary>Episodes:</SelectableText>
|
||||
<SelectableText selected={() => false} tertiary>{props.feed.episodes.length}</SelectableText>
|
||||
</box>
|
||||
<box flexDirection="row" gap={1}>
|
||||
<SelectableText selected={() => false} tertiary>Updated:</SelectableText>
|
||||
<SelectableText selected={() => false} tertiary>{formatDate(props.feed.lastUpdated)}</SelectableText>
|
||||
</box>
|
||||
<SelectableText selected={() => false} tertiary>
|
||||
{props.feed.visibility === "public" ? "[Public]" : "[Private]"}
|
||||
</SelectableText>
|
||||
{props.feed.isPinned && <SelectableText selected={() => false} tertiary>[Pinned]</SelectableText>}
|
||||
</box>
|
||||
<box flexDirection="row" gap={1}>
|
||||
<SelectableText selected={() => false} tertiary>[v] Toggle Visibility</SelectableText>
|
||||
</box>
|
||||
</box>
|
||||
</Show>
|
||||
|
||||
{/* Episodes header */}
|
||||
<box flexDirection="row" justifyContent="space-between">
|
||||
<SelectableText selected={() => false} primary>
|
||||
<strong>Episodes</strong>
|
||||
</SelectableText>
|
||||
<SelectableText selected={() => false} tertiary>({episodes().length} total)</SelectableText>
|
||||
</box>
|
||||
|
||||
{/* Episode list */}
|
||||
<scrollbox height={showInfo() ? 10 : 15} focused={props.focused}>
|
||||
<For each={episodes()}>
|
||||
{(episode, index) => (
|
||||
<SelectableBox
|
||||
selected={() => index() === selectedIndex()}
|
||||
flexDirection="column"
|
||||
gap={0}
|
||||
padding={1}
|
||||
onMouseDown={() => {
|
||||
setSelectedIndex(index());
|
||||
if (props.onPlayEpisode) {
|
||||
props.onPlayEpisode(episode);
|
||||
}
|
||||
}}
|
||||
>
|
||||
<SelectableText
|
||||
selected={() => index() === selectedIndex()}
|
||||
primary
|
||||
>
|
||||
{index() === selectedIndex() ? ">" : " "}
|
||||
</SelectableText>
|
||||
<SelectableText
|
||||
selected={() => index() === selectedIndex()}
|
||||
primary
|
||||
>
|
||||
{episode.episodeNumber ? `#${episode.episodeNumber} - ` : ""}
|
||||
{episode.title}
|
||||
</SelectableText>
|
||||
<box flexDirection="row" gap={2} paddingLeft={2}>
|
||||
<SelectableText selected={() => index() === selectedIndex()} tertiary>{formatDate(episode.pubDate)}</SelectableText>
|
||||
<SelectableText selected={() => index() === selectedIndex()} tertiary>{formatDuration(episode.duration)}</SelectableText>
|
||||
</box>
|
||||
</SelectableBox>
|
||||
)}
|
||||
</For>
|
||||
</scrollbox>
|
||||
|
||||
{/* Help text */}
|
||||
<text fg={theme.textMuted}>
|
||||
j/k to navigate, Enter to play, i to toggle info, Esc to go back
|
||||
</text>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
@@ -1,207 +0,0 @@
|
||||
/**
|
||||
* Feed filter component for PodTUI
|
||||
* Toggle and filter options for feed list
|
||||
*/
|
||||
|
||||
import { createSignal } from "solid-js";
|
||||
import { FeedVisibility, FeedSortField } from "@/types/feed";
|
||||
import type { FeedFilter } from "@/types/feed";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
|
||||
interface FeedFilterProps {
|
||||
filter: FeedFilter;
|
||||
focused?: boolean;
|
||||
onFilterChange: (filter: FeedFilter) => void;
|
||||
}
|
||||
|
||||
type FilterField = "visibility" | "sort" | "pinned" | "private" | "search";
|
||||
|
||||
export function FeedFilterComponent(props: FeedFilterProps) {
|
||||
const { theme } = useTheme();
|
||||
const [focusField, setFocusField] = createSignal<FilterField>("visibility");
|
||||
const [searchValue, setSearchValue] = createSignal(
|
||||
props.filter.searchQuery || "",
|
||||
);
|
||||
|
||||
const fields: FilterField[] = ["visibility", "sort", "pinned", "private", "search"];
|
||||
|
||||
const handleKeyPress = (key: { name: string; shift?: boolean }) => {
|
||||
if (key.name === "tab") {
|
||||
const currentIndex = fields.indexOf(focusField());
|
||||
const nextIndex = key.shift
|
||||
? (currentIndex - 1 + fields.length) % fields.length
|
||||
: (currentIndex + 1) % fields.length;
|
||||
setFocusField(fields[nextIndex]);
|
||||
} else if (key.name === "return") {
|
||||
if (focusField() === "visibility") {
|
||||
cycleVisibility();
|
||||
} else if (focusField() === "sort") {
|
||||
cycleSort();
|
||||
} else if (focusField() === "pinned") {
|
||||
togglePinned();
|
||||
} else if (focusField() === "private") {
|
||||
togglePrivate();
|
||||
}
|
||||
} else if (key.name === "space") {
|
||||
if (focusField() === "pinned") {
|
||||
togglePinned();
|
||||
} else if (focusField() === "private") {
|
||||
togglePrivate();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const cycleVisibility = () => {
|
||||
const current = props.filter.visibility;
|
||||
let next: FeedVisibility | "all";
|
||||
if (current === "all") next = FeedVisibility.PUBLIC;
|
||||
else if (current === FeedVisibility.PUBLIC) next = FeedVisibility.PRIVATE;
|
||||
else next = "all";
|
||||
props.onFilterChange({ ...props.filter, visibility: next });
|
||||
};
|
||||
|
||||
const cycleSort = () => {
|
||||
const sortOptions: FeedSortField[] = [
|
||||
FeedSortField.UPDATED,
|
||||
FeedSortField.TITLE,
|
||||
FeedSortField.EPISODE_COUNT,
|
||||
FeedSortField.LATEST_EPISODE,
|
||||
];
|
||||
const currentIndex = sortOptions.indexOf(
|
||||
props.filter.sortBy as FeedSortField,
|
||||
);
|
||||
const nextIndex = (currentIndex + 1) % sortOptions.length;
|
||||
props.onFilterChange({ ...props.filter, sortBy: sortOptions[nextIndex] });
|
||||
};
|
||||
|
||||
const togglePinned = () => {
|
||||
props.onFilterChange({
|
||||
...props.filter,
|
||||
pinnedOnly: !props.filter.pinnedOnly,
|
||||
});
|
||||
};
|
||||
|
||||
const togglePrivate = () => {
|
||||
props.onFilterChange({
|
||||
...props.filter,
|
||||
showPrivate: !props.filter.showPrivate,
|
||||
});
|
||||
};
|
||||
|
||||
const handleSearchInput = (value: string) => {
|
||||
setSearchValue(value);
|
||||
props.onFilterChange({ ...props.filter, searchQuery: value });
|
||||
};
|
||||
|
||||
const visibilityLabel = () => {
|
||||
const vis = props.filter.visibility;
|
||||
if (vis === "all") return "All";
|
||||
if (vis === "public") return "Public";
|
||||
return "Private";
|
||||
};
|
||||
|
||||
const visibilityColor = () => {
|
||||
const vis = props.filter.visibility;
|
||||
if (vis === "public") return theme.success;
|
||||
if (vis === "private") return theme.warning;
|
||||
return theme.text;
|
||||
};
|
||||
|
||||
const sortLabel = () => {
|
||||
const sort = props.filter.sortBy;
|
||||
switch (sort) {
|
||||
case "title":
|
||||
return "Title";
|
||||
case "episodeCount":
|
||||
return "Episodes";
|
||||
case "latestEpisode":
|
||||
return "Latest";
|
||||
case "updated":
|
||||
default:
|
||||
return "Updated";
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<box flexDirection="column" border padding={1} gap={1} borderColor={theme.border}>
|
||||
<text fg={theme.text}>
|
||||
<strong>Filter Feeds</strong>
|
||||
</text>
|
||||
|
||||
<box flexDirection="row" gap={2} flexWrap="wrap">
|
||||
{/* Visibility filter */}
|
||||
<box
|
||||
border
|
||||
padding={0}
|
||||
backgroundColor={focusField() === "visibility" ? theme.backgroundElement : undefined}
|
||||
borderColor={theme.border}
|
||||
>
|
||||
<box flexDirection="row" gap={1}>
|
||||
<text fg={focusField() === "visibility" ? theme.primary : theme.textMuted}>
|
||||
Show:
|
||||
</text>
|
||||
<text fg={visibilityColor()}>{visibilityLabel()}</text>
|
||||
</box>
|
||||
</box>
|
||||
|
||||
{/* Sort filter */}
|
||||
<box
|
||||
border
|
||||
padding={0}
|
||||
backgroundColor={focusField() === "sort" ? theme.backgroundElement : undefined}
|
||||
>
|
||||
<box flexDirection="row" gap={1}>
|
||||
<text fg={focusField() === "sort" ? theme.primary : theme.textMuted}>Sort:</text>
|
||||
<text fg={theme.text}>{sortLabel()}</text>
|
||||
</box>
|
||||
</box>
|
||||
|
||||
{/* Pinned filter */}
|
||||
<box
|
||||
border
|
||||
padding={0}
|
||||
backgroundColor={focusField() === "pinned" ? theme.backgroundElement : undefined}
|
||||
>
|
||||
<box flexDirection="row" gap={1}>
|
||||
<text fg={focusField() === "pinned" ? theme.primary : theme.textMuted}>
|
||||
Pinned:
|
||||
</text>
|
||||
<text fg={props.filter.pinnedOnly ? theme.warning : theme.textMuted}>
|
||||
{props.filter.pinnedOnly ? "Yes" : "No"}
|
||||
</text>
|
||||
</box>
|
||||
</box>
|
||||
|
||||
{/* Private filter */}
|
||||
<box
|
||||
border
|
||||
padding={0}
|
||||
backgroundColor={focusField() === "private" ? theme.backgroundElement : undefined}
|
||||
>
|
||||
<box flexDirection="row" gap={1}>
|
||||
<text fg={focusField() === "private" ? theme.primary : theme.textMuted}>
|
||||
Private:
|
||||
</text>
|
||||
<text fg={props.filter.showPrivate ? theme.warning : theme.textMuted}>
|
||||
{props.filter.showPrivate ? "Yes" : "No"}
|
||||
</text>
|
||||
</box>
|
||||
</box>
|
||||
</box>
|
||||
|
||||
{/* Search box */}
|
||||
<box flexDirection="row" gap={1}>
|
||||
<text fg={focusField() === "search" ? theme.primary : theme.textMuted}>Search:</text>
|
||||
<input
|
||||
value={searchValue()}
|
||||
onInput={handleSearchInput}
|
||||
placeholder="Filter by name..."
|
||||
focused={props.focused && focusField() === "search"}
|
||||
width={25}
|
||||
/>
|
||||
</box>
|
||||
|
||||
<text fg={theme.textMuted}>Tab to navigate, Enter/Space to toggle</text>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
@@ -1,154 +0,0 @@
|
||||
/**
|
||||
* Feed item component for PodTUI
|
||||
* Displays a single feed/podcast in the list
|
||||
*/
|
||||
|
||||
import type { Feed, FeedVisibility } from "@/types/feed";
|
||||
import { format } from "date-fns";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
import { SelectableBox, SelectableText } from "@/components/Selectable";
|
||||
|
||||
interface FeedItemProps {
|
||||
feed: Feed;
|
||||
isSelected: boolean;
|
||||
showEpisodeCount?: boolean;
|
||||
showLastUpdated?: boolean;
|
||||
compact?: boolean;
|
||||
}
|
||||
|
||||
export function FeedItem(props: FeedItemProps) {
|
||||
const formatDate = (date: Date): string => {
|
||||
return format(date, "MMM d");
|
||||
};
|
||||
|
||||
const episodeCount = () => props.feed.episodes.length;
|
||||
const unplayedCount = () => {
|
||||
// This would be calculated based on episode status
|
||||
return props.feed.episodes.length;
|
||||
};
|
||||
|
||||
const visibilityIcon = () => {
|
||||
return props.feed.visibility === "public" ? "[P]" : "[*]";
|
||||
};
|
||||
|
||||
const visibilityColor = () => {
|
||||
return props.feed.visibility === "public" ? theme.success : theme.warning;
|
||||
};
|
||||
|
||||
const pinnedIndicator = () => {
|
||||
return props.feed.isPinned ? "*" : " ";
|
||||
};
|
||||
|
||||
const { theme } = useTheme();
|
||||
|
||||
if (props.compact) {
|
||||
// Compact single-line view
|
||||
return (
|
||||
<SelectableBox
|
||||
selected={() => props.isSelected}
|
||||
flexDirection="row"
|
||||
gap={1}
|
||||
paddingLeft={1}
|
||||
paddingRight={1}
|
||||
onMouseDown={() => {}}
|
||||
>
|
||||
<SelectableText
|
||||
selected={() => props.isSelected}
|
||||
primary
|
||||
>
|
||||
{props.isSelected ? ">" : " "}
|
||||
</SelectableText>
|
||||
<SelectableText
|
||||
selected={() => props.isSelected}
|
||||
tertiary
|
||||
>
|
||||
{visibilityIcon()}
|
||||
</SelectableText>
|
||||
<SelectableText
|
||||
selected={() => props.isSelected}
|
||||
primary
|
||||
>
|
||||
{props.feed.customName || props.feed.podcast.title}
|
||||
</SelectableText>
|
||||
{props.showEpisodeCount && (
|
||||
<SelectableText
|
||||
selected={() => props.isSelected}
|
||||
tertiary
|
||||
>
|
||||
({episodeCount()})
|
||||
</SelectableText>
|
||||
)}
|
||||
</SelectableBox>
|
||||
);
|
||||
}
|
||||
|
||||
// Full view with details
|
||||
return (
|
||||
<SelectableBox
|
||||
selected={() => props.isSelected}
|
||||
flexDirection="column"
|
||||
gap={0}
|
||||
padding={1}
|
||||
onMouseDown={() => {}}
|
||||
>
|
||||
{/* Title row */}
|
||||
<box flexDirection="row" gap={1}>
|
||||
<SelectableText
|
||||
selected={() => props.isSelected}
|
||||
primary
|
||||
>
|
||||
{props.isSelected ? ">" : " "}
|
||||
</SelectableText>
|
||||
<SelectableText
|
||||
selected={() => props.isSelected}
|
||||
tertiary
|
||||
>
|
||||
{visibilityIcon()}
|
||||
</SelectableText>
|
||||
<SelectableText
|
||||
selected={() => props.isSelected}
|
||||
secondary
|
||||
>
|
||||
{pinnedIndicator()}
|
||||
</SelectableText>
|
||||
<SelectableText
|
||||
selected={() => props.isSelected}
|
||||
primary
|
||||
>
|
||||
<strong>{props.feed.customName || props.feed.podcast.title}</strong>
|
||||
</SelectableText>
|
||||
</box>
|
||||
|
||||
<box flexDirection="row" gap={2} paddingLeft={4}>
|
||||
{props.showEpisodeCount && (
|
||||
<SelectableText
|
||||
selected={() => props.isSelected}
|
||||
tertiary
|
||||
>
|
||||
{episodeCount()} episodes ({unplayedCount()} new)
|
||||
</SelectableText>
|
||||
)}
|
||||
{props.showLastUpdated && (
|
||||
<SelectableText
|
||||
selected={() => props.isSelected}
|
||||
tertiary
|
||||
>
|
||||
Updated: {formatDate(props.feed.lastUpdated)}
|
||||
</SelectableText>
|
||||
)}
|
||||
</box>
|
||||
|
||||
{props.feed.podcast.description && (
|
||||
<SelectableText
|
||||
selected={() => props.isSelected}
|
||||
paddingLeft={4}
|
||||
paddingTop={0}
|
||||
tertiary
|
||||
>
|
||||
{props.feed.podcast.description.slice(0, 60)}
|
||||
{props.feed.podcast.description.length > 60 ? "..." : ""}
|
||||
</SelectableText>
|
||||
)}
|
||||
</SelectableBox>
|
||||
);
|
||||
}
|
||||
@@ -1,198 +0,0 @@
|
||||
/**
|
||||
* Feed list component for PodTUI
|
||||
* Scrollable list of feeds with keyboard navigation and mouse support
|
||||
*/
|
||||
|
||||
import { createSignal, For, Show } from "solid-js";
|
||||
import { useKeyboard } from "@opentui/solid";
|
||||
import { FeedItem } from "./FeedItem";
|
||||
import { useFeedStore } from "@/stores/feed";
|
||||
import { FeedVisibility, FeedSortField } from "@/types/feed";
|
||||
import type { Feed } from "@/types/feed";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
|
||||
interface FeedListProps {
|
||||
focused?: boolean;
|
||||
compact?: boolean;
|
||||
showEpisodeCount?: boolean;
|
||||
showLastUpdated?: boolean;
|
||||
onSelectFeed?: (feed: Feed) => void;
|
||||
onOpenFeed?: (feed: Feed) => void;
|
||||
onFocusChange?: (focused: boolean) => void;
|
||||
}
|
||||
|
||||
export function FeedList(props: FeedListProps) {
|
||||
const { theme } = useTheme();
|
||||
const feedStore = useFeedStore();
|
||||
const [selectedIndex, setSelectedIndex] = createSignal(0);
|
||||
|
||||
const filteredFeeds = () => feedStore.getFilteredFeeds();
|
||||
|
||||
const handleKeyPress = (key: { name: string }) => {
|
||||
if (key.name === "escape") {
|
||||
props.onFocusChange?.(false);
|
||||
return;
|
||||
}
|
||||
const feeds = filteredFeeds();
|
||||
|
||||
if (key.name === "up" || key.name === "k") {
|
||||
setSelectedIndex((i) => Math.max(0, i - 1));
|
||||
} else if (key.name === "down" || key.name === "j") {
|
||||
setSelectedIndex((i) => Math.min(feeds.length - 1, i + 1));
|
||||
} else if (key.name === "return") {
|
||||
const feed = feeds[selectedIndex()];
|
||||
if (feed && props.onOpenFeed) {
|
||||
props.onOpenFeed(feed);
|
||||
}
|
||||
} else if (key.name === "home" || key.name === "g") {
|
||||
setSelectedIndex(0);
|
||||
} else if (key.name === "end") {
|
||||
setSelectedIndex(feeds.length - 1);
|
||||
} else if (key.name === "pageup") {
|
||||
setSelectedIndex((i) => Math.max(0, i - 5));
|
||||
} else if (key.name === "pagedown") {
|
||||
setSelectedIndex((i) => Math.min(feeds.length - 1, i + 5));
|
||||
} else if (key.name === "p") {
|
||||
// Toggle pin on selected feed
|
||||
const feed = feeds[selectedIndex()];
|
||||
if (feed) {
|
||||
feedStore.togglePinned(feed.id);
|
||||
}
|
||||
} else if (key.name === "v") {
|
||||
// Toggle visibility on selected feed
|
||||
const feed = feeds[selectedIndex()];
|
||||
if (feed) {
|
||||
const newVisibility = feed.visibility === FeedVisibility.PUBLIC ? FeedVisibility.PRIVATE : FeedVisibility.PUBLIC;
|
||||
feedStore.updateFeed(feed.id, { visibility: newVisibility });
|
||||
}
|
||||
} else if (key.name === "f") {
|
||||
// Cycle visibility filter
|
||||
cycleVisibilityFilter();
|
||||
} else if (key.name === "s") {
|
||||
// Cycle sort
|
||||
cycleSortField();
|
||||
}
|
||||
|
||||
// Notify selection change
|
||||
const selectedFeed = feeds[selectedIndex()];
|
||||
if (selectedFeed && props.onSelectFeed) {
|
||||
props.onSelectFeed(selectedFeed);
|
||||
}
|
||||
};
|
||||
|
||||
useKeyboard((key) => {
|
||||
if (!props.focused) return;
|
||||
handleKeyPress(key);
|
||||
});
|
||||
|
||||
const cycleVisibilityFilter = () => {
|
||||
const current = feedStore.filter().visibility;
|
||||
let next: FeedVisibility | "all";
|
||||
if (current === "all") next = FeedVisibility.PUBLIC;
|
||||
else if (current === FeedVisibility.PUBLIC) next = FeedVisibility.PRIVATE;
|
||||
else next = "all";
|
||||
feedStore.setFilter({ ...feedStore.filter(), visibility: next });
|
||||
};
|
||||
|
||||
const cycleSortField = () => {
|
||||
const sortOptions: FeedSortField[] = [
|
||||
FeedSortField.UPDATED,
|
||||
FeedSortField.TITLE,
|
||||
FeedSortField.EPISODE_COUNT,
|
||||
FeedSortField.LATEST_EPISODE,
|
||||
];
|
||||
const current = feedStore.filter().sortBy as FeedSortField;
|
||||
const idx = sortOptions.indexOf(current);
|
||||
const next = sortOptions[(idx + 1) % sortOptions.length];
|
||||
feedStore.setFilter({ ...feedStore.filter(), sortBy: next });
|
||||
};
|
||||
|
||||
const visibilityLabel = () => {
|
||||
const vis = feedStore.filter().visibility;
|
||||
if (vis === "all") return "All";
|
||||
if (vis === "public") return "Public";
|
||||
return "Private";
|
||||
};
|
||||
|
||||
const sortLabel = () => {
|
||||
const sort = feedStore.filter().sortBy;
|
||||
switch (sort) {
|
||||
case "title":
|
||||
return "Title";
|
||||
case "episodeCount":
|
||||
return "Episodes";
|
||||
case "latestEpisode":
|
||||
return "Latest";
|
||||
default:
|
||||
return "Updated";
|
||||
}
|
||||
};
|
||||
|
||||
const handleFeedClick = (feed: Feed, index: number) => {
|
||||
setSelectedIndex(index);
|
||||
if (props.onSelectFeed) {
|
||||
props.onSelectFeed(feed);
|
||||
}
|
||||
};
|
||||
|
||||
const handleFeedDoubleClick = (feed: Feed) => {
|
||||
if (props.onOpenFeed) {
|
||||
props.onOpenFeed(feed);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<box flexDirection="column" gap={1}>
|
||||
{/* Header with filter controls */}
|
||||
<box flexDirection="row" justifyContent="space-between" paddingBottom={0}>
|
||||
<text fg={theme.text}>
|
||||
<strong>My Feeds</strong>
|
||||
</text>
|
||||
<text fg={theme.textMuted}>({filteredFeeds().length} feeds)</text>
|
||||
<box flexDirection="row" gap={1}>
|
||||
<box border padding={0} onMouseDown={cycleVisibilityFilter} borderColor={theme.border}>
|
||||
<text fg={theme.primary}>[f] {visibilityLabel()}</text>
|
||||
</box>
|
||||
<box border padding={0} onMouseDown={cycleSortField} borderColor={theme.border}>
|
||||
<text fg={theme.primary}>[s] {sortLabel()}</text>
|
||||
</box>
|
||||
</box>
|
||||
</box>
|
||||
|
||||
{/* Feed list in scrollbox */}
|
||||
<Show
|
||||
when={filteredFeeds().length > 0}
|
||||
fallback={
|
||||
<box border padding={2} borderColor={theme.border}>
|
||||
<text fg={theme.textMuted}>
|
||||
No feeds found. Add podcasts from the Discover or Search tabs.
|
||||
</text>
|
||||
</box>
|
||||
}
|
||||
>
|
||||
<scrollbox height={15} focused={props.focused}>
|
||||
<For each={filteredFeeds()}>
|
||||
{(feed, index) => (
|
||||
<box onMouseDown={() => handleFeedClick(feed, index())}>
|
||||
<FeedItem
|
||||
feed={feed}
|
||||
isSelected={index() === selectedIndex()}
|
||||
compact={props.compact}
|
||||
showEpisodeCount={props.showEpisodeCount ?? true}
|
||||
showLastUpdated={props.showLastUpdated ?? true}
|
||||
/>
|
||||
</box>
|
||||
)}
|
||||
</For>
|
||||
</scrollbox>
|
||||
</Show>
|
||||
|
||||
{/* Navigation help */}
|
||||
<box paddingTop={0}>
|
||||
<text fg={theme.textMuted}>
|
||||
Enter open | Esc up | j/k navigate | p pin | f filter | s sort
|
||||
</text>
|
||||
</box>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
@@ -1,25 +1,26 @@
|
||||
/**
|
||||
* FeedPage — yazi depth-stack view of episodes across subscribed shows.
|
||||
* FeedPage — flat chronological list of episodes across all subscribed feeds.
|
||||
*
|
||||
* depth 0 (current) — subscribed feeds list (containers); index 0 is a
|
||||
* virtual "All Feeds". Parent pane shows the muted
|
||||
* placeholder (1/7 slot kept).
|
||||
* depth 1 (current) — flat episodes list for the drilled feed (reverse
|
||||
* chronological). Parent pane = the feeds list (prev).
|
||||
* preview — detail of the hovered item in the current column.
|
||||
* depth 0 (current) — every episode from every feed, newest-first (the
|
||||
* combined view the old "All Feeds" virtual row used to
|
||||
* drill into). Parent pane shows the muted tab list.
|
||||
* preview — detail of the hovered episode.
|
||||
*
|
||||
* Renders entirely through `<YaziPaneRow>` (the shared parent|current|preview
|
||||
* primitive); no bespoke 3-column flexbox JSX remains. `l`/Enter drills in
|
||||
* (push); `h` pops a depth (noop at 0). j/k move only within the current
|
||||
* column. The Shell router drives everything over `nav.action`; this page
|
||||
* only handles list/preview data.
|
||||
* This page does NOT drill: the previous depth-1 "episodes of one feed" panel
|
||||
* duplicated My Shows (shows → episodes). Per design, the Feed tab now just
|
||||
* shows the full flat episodes list immediately.
|
||||
*
|
||||
* Renders entirely through `<PaneRow>` (the shared parent|current|preview
|
||||
* primitive). `l`/Enter plays the focused episode; `h` pops back to the tab
|
||||
* root. j/k move only within the current column. The Shell router drives
|
||||
* everything over `nav.action`; this page only handles list/preview data.
|
||||
*/
|
||||
|
||||
import { createMemo, For, Show, onMount, onCleanup } from "solid-js";
|
||||
import { createMemo, createEffect, For, Show, onMount, onCleanup } from "solid-js";
|
||||
import { useFeedStore } from "@/stores/feed";
|
||||
import { useDownloadStore } from "@/stores/download";
|
||||
import { prefetchCoverArt } from "@/utils/cover-art";
|
||||
import { DownloadStatus } from "@/types/episode";
|
||||
import { format } from "date-fns";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
import { useAudioNavStore, AudioSource } from "@/stores/audio-nav";
|
||||
import {
|
||||
@@ -27,23 +28,35 @@ import {
|
||||
NavMode,
|
||||
DEPTH_CENTER_PANE,
|
||||
type PaneId,
|
||||
type DepthFrame,
|
||||
} from "@/context/NavigationContext";
|
||||
import { useAudio } from "@/hooks/useAudio";
|
||||
import { on, off } from "@/utils/event-bus";
|
||||
import { supportsNerdFonts } from "@/utils/nerd-fonts";
|
||||
import type { KeybindActionName } from "@/context/KeybindContext";
|
||||
import type { Episode } from "@/types/episode";
|
||||
import type { Feed } from "@/types/feed";
|
||||
import {
|
||||
EpisodeRow,
|
||||
FetchMoreRow,
|
||||
EpisodePreview,
|
||||
FetchMorePreview,
|
||||
} from "@/components/EpisodeList";
|
||||
import { LoadingIndicator } from "@/components/LoadingIndicator";
|
||||
import { YaziPaneRow } from "@/components/YaziPaneRow";
|
||||
import { PaneRow } from "@/components/PaneRow";
|
||||
import { TabListPane } from "@/components/TabPanel";
|
||||
import { useSelectionMarker } from "@/hooks/useSelectionMarker";
|
||||
import {
|
||||
useStableListFocus,
|
||||
FETCH_MORE_ROW_ID,
|
||||
} from "@/hooks/useStableListFocus";
|
||||
|
||||
export const FeedPaneCount = 1;
|
||||
|
||||
type FeedListItem = { kind: "all" } | { kind: "feed"; feed: Feed };
|
||||
type EpItem = { episode: Episode; feed: Feed };
|
||||
|
||||
function FeedPage() {
|
||||
// Static: detection never changes mid-session.
|
||||
const nerd = supportsNerdFonts();
|
||||
const feedStore = useFeedStore();
|
||||
const downloadStore = useDownloadStore();
|
||||
const audioNav = useAudioNavStore();
|
||||
@@ -51,67 +64,104 @@ function FeedPage() {
|
||||
const { theme } = useTheme();
|
||||
const muted = () => theme.muted || theme.text;
|
||||
const nav = useNavigation();
|
||||
const marker = useSelectionMarker();
|
||||
|
||||
const stack = nav.depthStack;
|
||||
const depth = nav.currentDepth;
|
||||
const focus = (d: number = depth()) => nav.depthFocus(d);
|
||||
// ── flat episode list (depth 0 — the only depth Feed has) ────────────────
|
||||
const episodes = createMemo<EpItem[]>(
|
||||
() => feedStore.getAllEpisodesChronological() as EpItem[],
|
||||
);
|
||||
|
||||
// ── feeds list (depth 0) ─────────────────────────────────────────────────
|
||||
const feedList = createMemo<FeedListItem[]>(() => {
|
||||
const all: FeedListItem[] = [{ kind: "all" }];
|
||||
for (const f of feedStore.getFilteredFeeds())
|
||||
all.push({ kind: "feed", feed: f });
|
||||
return all;
|
||||
// ── Cover warm-up ────────────────────────────────────────────────────────
|
||||
// Prefetch covers for episodes around the focus (plus the top of the
|
||||
// list) so plays land on a warm cache: cover-art-files only applies at
|
||||
// file load, and there is no working runtime fallback. Single-flight +
|
||||
// cache short-circuit keep repeat runs cheap (hits resolve immediately).
|
||||
createEffect(() => {
|
||||
const list = episodes();
|
||||
const focusIdx = focusedEpIdx();
|
||||
const start = Math.max(0, focusIdx - 10);
|
||||
const end = Math.min(list.length, focusIdx + 11);
|
||||
for (let i = start; i < end; i++) {
|
||||
const item = list[i];
|
||||
if (item?.feed.podcast.coverUrl) prefetchCoverArt(item.feed.podcast.coverUrl);
|
||||
}
|
||||
});
|
||||
const focusedFeedIdx = () =>
|
||||
feedList().length === 0 ? 0 : Math.min(focus(0), feedList().length - 1);
|
||||
const focusedFeedItem = (): FeedListItem | undefined =>
|
||||
feedList()[focusedFeedIdx()];
|
||||
|
||||
// ── episodes list (depth 1) — derived from the depth-1 frame's ctx ───────
|
||||
const drilledFeedId = (): string => stack()[1]?.ctx ?? "all";
|
||||
const episodes = createMemo<EpItem[]>(() => {
|
||||
if (depth() < 1) return [];
|
||||
const id = drilledFeedId();
|
||||
if (id === "all")
|
||||
return feedStore.getAllEpisodesChronological() as EpItem[];
|
||||
const f = feedStore.getFilteredFeeds().find((x) => x.podcast.id === id);
|
||||
if (!f) return [];
|
||||
return [...f.episodes]
|
||||
.sort((a, b) => b.pubDate.getTime() - a.pubDate.getTime())
|
||||
.map((episode) => ({ episode, feed: f }));
|
||||
});
|
||||
// ── Fetch More ───────────────────────────────────────────────────────────
|
||||
// A "[Fetch More]" row at the bottom of the list advances every feed's
|
||||
// loaded window by 50 episodes. Enter on the row to load the next batch.
|
||||
const showFetchMore = () => feedStore.hasMoreAcrossAll();
|
||||
const rowCount = () => episodes().length + (showFetchMore() ? 1 : 0);
|
||||
const focus = () => nav.depthFocus(0);
|
||||
const focusedRow = () =>
|
||||
rowCount() === 0 ? 0 : Math.min(focus(), rowCount() - 1);
|
||||
const focusedOnMore = () =>
|
||||
showFetchMore() && focusedRow() === episodes().length;
|
||||
// -1 while the Fetch More row is focused so no episode row renders the
|
||||
// cursor/highlight (the button is the focused row, not the last episode).
|
||||
const focusedEpIdx = () =>
|
||||
episodes().length === 0 ? 0 : Math.min(focus(1), episodes().length - 1);
|
||||
const focusedItem = (): EpItem | undefined => episodes()[focusedEpIdx()];
|
||||
focusedOnMore()
|
||||
? -1
|
||||
: Math.min(focusedRow(), Math.max(episodes().length - 1, 0));
|
||||
const focusedItem = (): EpItem | undefined =>
|
||||
focusedOnMore() ? undefined : episodes()[focusedEpIdx()];
|
||||
const curLen = () => rowCount();
|
||||
|
||||
const curLen = () => (depth() === 0 ? feedList().length : episodes().length);
|
||||
// ── Focus stability across lazy loads ─────────────────────────────────────
|
||||
// The nav cursor is a plain row index; fetch-more inserts revealed
|
||||
// episodes above the [Fetch More] row (and, in the chronological union,
|
||||
// can splice rows into the middle), which silently moves an index-stable
|
||||
// cursor onto a different episode or off the button. Re-anchor the cursor
|
||||
// onto the focused row's ID after any row-count change — the user stays
|
||||
// on the exact episode (or the button) they were on before the load.
|
||||
useStableListFocus({
|
||||
count: rowCount,
|
||||
getItemId: (i) =>
|
||||
i === episodes().length
|
||||
? FETCH_MORE_ROW_ID
|
||||
: episodes()[i]?.episode.id,
|
||||
getFocus: () => nav.depthFocus(0),
|
||||
setFocus: (i) => nav.setDepthFocus(i, 0),
|
||||
});
|
||||
|
||||
// ── Render window ────────────────────────────────────────────────────────
|
||||
// The union grows to thousands of episodes after repeated fetch-more
|
||||
// presses; rendering every row per frame froze the UI. Render only a
|
||||
// bounded slice around the focus (real indexes preserved) — the scrollbox
|
||||
// still keeps the focused row in view. Spacers above/below the window
|
||||
// restore the full content height so the scrollbar tracks the real list.
|
||||
// Each EpisodeRow is 3 lines tall (title, subtitle, date).
|
||||
const LIST_WINDOW = 30;
|
||||
const ROW_HEIGHT = 3;
|
||||
const listWindow = createMemo<[number, number]>(() => {
|
||||
const len = episodes().length;
|
||||
// Focusing the Fetch More button keeps the window anchored at the
|
||||
// last episode — no jump when the focus crosses onto the button.
|
||||
const f = focusedOnMore() ? len - 1 : focusedEpIdx();
|
||||
return [
|
||||
Math.max(0, f - LIST_WINDOW),
|
||||
Math.min(len, f + LIST_WINDOW + 1),
|
||||
];
|
||||
});
|
||||
const visibleEpisodes = createMemo(() => {
|
||||
const [start, end] = listWindow();
|
||||
return episodes().slice(start, end);
|
||||
});
|
||||
|
||||
const ensureFocus = () => {
|
||||
if (depth() === 0 && feedList().length > 0 && focus(0) >= feedList().length)
|
||||
nav.setDepthFocus(feedList().length - 1, 0);
|
||||
if (depth() >= 1 && episodes().length > 0 && focus(1) >= episodes().length)
|
||||
nav.setDepthFocus(episodes().length - 1, 1);
|
||||
if (rowCount() > 0 && focus() >= rowCount())
|
||||
nav.setDepthFocus(rowCount() - 1, 0);
|
||||
};
|
||||
onMount(ensureFocus);
|
||||
|
||||
onMount(() => {
|
||||
nav.registerResolver(`${nav.activeTab()}:${DEPTH_CENTER_PANE}`, (i) => {
|
||||
if (depth() === 0) {
|
||||
const it = feedList()[i];
|
||||
return it?.kind === "feed" ? it.feed.podcast.id : "all";
|
||||
}
|
||||
return episodes()[i]?.episode.id;
|
||||
});
|
||||
nav.registerResolver(
|
||||
`${nav.activeTab()}:${DEPTH_CENTER_PANE}`,
|
||||
(i) => episodes()[i]?.episode.id,
|
||||
);
|
||||
});
|
||||
|
||||
// ── helpers ────────────────────────────────────────────────────────────────
|
||||
const formatDate = (d: Date) => format(d, "MMM d, yyyy");
|
||||
const formatDuration = (s: number) => {
|
||||
const mins = Math.floor(s / 60);
|
||||
const hrs = Math.floor(mins / 60);
|
||||
return hrs > 0 ? `${hrs}h ${mins % 60}m` : `${mins}m`;
|
||||
};
|
||||
const downloadLabel = (id: string) => {
|
||||
switch (downloadStore.getDownloadStatus(id)) {
|
||||
case DownloadStatus.QUEUED:
|
||||
@@ -146,19 +196,13 @@ function FeedPage() {
|
||||
audioNav.setSource(AudioSource.FEED);
|
||||
};
|
||||
|
||||
// ── drill / open ───────────────────────────────────────────────────────────
|
||||
// ── open ───────────────────────────────────────────────────────────────────
|
||||
function open() {
|
||||
if (depth() === 0) {
|
||||
const item = focusedFeedItem();
|
||||
if (!item) return;
|
||||
const ctx = item.kind === "all" ? "all" : item.feed.podcast.id;
|
||||
nav.pushDepth({ kind: "episodes", ctx, focus: 0 } as DepthFrame);
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
if (focusedOnMore()) {
|
||||
feedStore.loadMoreAllFeeds().catch(() => {});
|
||||
return;
|
||||
}
|
||||
if (depth() >= 1) {
|
||||
playEpisode(focusedItem());
|
||||
}
|
||||
playEpisode(focusedItem());
|
||||
}
|
||||
|
||||
// ── nav.action handler ────────────────────────────────────────────────────
|
||||
@@ -173,16 +217,23 @@ function FeedPage() {
|
||||
"goto-bottom": () => nav.gotoIndex(curLen() - 1, curLen()),
|
||||
open: () => open(),
|
||||
"toggle-select": () => {
|
||||
if (depth() >= 1) {
|
||||
const item = focusedItem();
|
||||
if (item) nav.toggleSelected(item.episode.id);
|
||||
}
|
||||
const item = focusedItem();
|
||||
if (item) nav.toggleSelected(item.episode.id);
|
||||
},
|
||||
download: () => {
|
||||
const item = focusedItem();
|
||||
if (item) downloadStore.startDownload(item.episode, item.feed.id);
|
||||
},
|
||||
"delete-download": () => {
|
||||
const item = focusedItem();
|
||||
if (!item) return;
|
||||
const id = item.episode.id;
|
||||
if (downloadStore.getDownloadStatus(id) === DownloadStatus.NONE) return;
|
||||
downloadStore.cancelDownload(id);
|
||||
downloadStore.removeDownload(id).catch(() => {});
|
||||
},
|
||||
refresh: () => {
|
||||
const item = focusedFeedItem();
|
||||
if (item?.kind === "feed")
|
||||
feedStore.refreshFeed(item.feed.id).catch(() => {});
|
||||
else feedStore.refreshAllFeeds().catch(() => {});
|
||||
feedStore.refreshAllFeeds().catch(() => {});
|
||||
},
|
||||
};
|
||||
function step(delta: number) {
|
||||
@@ -205,277 +256,131 @@ function FeedPage() {
|
||||
|
||||
// ── render ──────────────────────────────────────────────────────────────────
|
||||
const isActive = () => nav.activePane() === DEPTH_CENTER_PANE;
|
||||
// Row highlight within a list. `active=true` only for the current pane.
|
||||
const focusBg = (i: number, listFocus: number, active: boolean) =>
|
||||
i === listFocus && active
|
||||
? theme.primary
|
||||
: i === listFocus
|
||||
? theme.border
|
||||
: undefined;
|
||||
const focusFg = (i: number, listFocus: number, active: boolean) =>
|
||||
i === listFocus && active ? theme.surface : theme.text;
|
||||
|
||||
const feedLabel = (item: FeedListItem) =>
|
||||
item.kind === "all"
|
||||
? "All Feeds"
|
||||
: item.feed.customName || item.feed.podcast.title;
|
||||
const feedCount = (item: FeedListItem) =>
|
||||
item.kind === "all"
|
||||
? feedStore.getAllEpisodesChronological().length
|
||||
: item.feed.episodes.length;
|
||||
const currentLabel = () => `Feed · ${episodes().length}`;
|
||||
|
||||
const currentLabel = () =>
|
||||
depth() === 0
|
||||
? `Feeds · ${feedList().length - 1}`
|
||||
: `${(() => {
|
||||
const fi = focusedFeedItem();
|
||||
return fi?.kind === "feed"
|
||||
? fi.feed.customName || fi.feed.podcast.title
|
||||
: "All Episodes";
|
||||
})()} · ${episodes().length}`;
|
||||
// ── parent pane: muted tab list (no parent list — Feed is one depth) ──────
|
||||
const parentContent = () => <TabListPane muted />;
|
||||
|
||||
// ── parent pane: previous-depth list (muted/blank at depth 0) ──────────
|
||||
// Wrap in a stable <Show> (the sibling-Show pattern) so the parent list
|
||||
// mounts/unmounts cleanly on depth change instead of swapping roots.
|
||||
const parentContent = () => (
|
||||
<Show when={depth() >= 1} fallback={<TabListPane muted />}>
|
||||
<For each={feedList()}>
|
||||
{(item, index) => {
|
||||
const lf = nav.depthFocus(0);
|
||||
return (
|
||||
<box
|
||||
flexDirection="row"
|
||||
gap={1}
|
||||
paddingLeft={1}
|
||||
paddingRight={1}
|
||||
backgroundColor={focusBg(index(), lf, false)}
|
||||
>
|
||||
<text fg={focusFg(index(), lf, false)}>
|
||||
{index() === lf ? "❯" : " "}
|
||||
</text>
|
||||
<text fg={focusFg(index(), lf, false)}>{feedLabel(item)}</text>
|
||||
<text fg={muted()}>({feedCount(item)})</text>
|
||||
</box>
|
||||
);
|
||||
}}
|
||||
</For>
|
||||
</Show>
|
||||
);
|
||||
|
||||
// ── current pane: the current-depth list (the only focusable column) ──────
|
||||
// ── current pane: the flat episodes list (the only focusable column) ──────
|
||||
const currentContent = () => (
|
||||
<>
|
||||
{/* depth 0: feeds — stable sibling <Show> so the swap disposes cleanly */}
|
||||
<Show when={depth() === 0}>
|
||||
<Show
|
||||
when={feedList().length > 1}
|
||||
fallback={
|
||||
<box padding={1}>
|
||||
<Show
|
||||
when={episodes().length > 0}
|
||||
fallback={
|
||||
<box padding={1} alignItems="center">
|
||||
<Show
|
||||
when={feedStore.isLoadingFeeds()}
|
||||
fallback={
|
||||
<text fg={muted()}>
|
||||
No feeds. Subscribe from Discover/Search.
|
||||
</text>
|
||||
</box>
|
||||
}
|
||||
>
|
||||
<For each={feedList()}>
|
||||
{(item, index) => {
|
||||
const fi = focusedFeedIdx();
|
||||
return (
|
||||
<box
|
||||
flexDirection="row"
|
||||
gap={1}
|
||||
paddingLeft={1}
|
||||
paddingRight={1}
|
||||
backgroundColor={focusBg(index(), fi, isActive())}
|
||||
onMouseDown={() => {
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
nav.setDepthFocus(index(), 0);
|
||||
}}
|
||||
>
|
||||
<text fg={focusFg(index(), fi, isActive())}>
|
||||
{index() === fi ? "❯" : " "}
|
||||
</text>
|
||||
<text fg={focusFg(index(), fi, isActive())}>
|
||||
{feedLabel(item)}
|
||||
</text>
|
||||
<text fg={index() === fi ? theme.surface : muted()}>
|
||||
({feedCount(item)})
|
||||
</text>
|
||||
</box>
|
||||
);
|
||||
}}
|
||||
</For>
|
||||
</Show>
|
||||
}
|
||||
>
|
||||
<LoadingIndicator />
|
||||
</Show>
|
||||
</box>
|
||||
}
|
||||
>
|
||||
{/* Spacers keep the scrollbox content at the FULL list height so
|
||||
the scrollbar reflects the real list, not the render window. */}
|
||||
<Show when={listWindow()[0] > 0}>
|
||||
<box height={listWindow()[0] * ROW_HEIGHT} />
|
||||
</Show>
|
||||
<Show when={depth() >= 1}>
|
||||
{/* depth ≥1: episodes */}
|
||||
<For each={visibleEpisodes()}>
|
||||
{(item, index) => (
|
||||
<EpisodeRow
|
||||
episode={item.episode}
|
||||
subtitle={() => item.feed.customName || item.feed.podcast.title}
|
||||
index={() => listWindow()[0] + index()}
|
||||
focused={focusedEpIdx}
|
||||
active={isActive}
|
||||
selected={() => nav.isSelected(item.episode.id)}
|
||||
downloadLabel={() => downloadLabel(item.episode.id)}
|
||||
downloadColor={() => downloadColor(item.episode.id)}
|
||||
marker={marker}
|
||||
onMouseDown={() => {
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
nav.setDepthFocus(listWindow()[0] + index(), 0);
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</For>
|
||||
<Show when={episodes().length - listWindow()[1] > 0}>
|
||||
<box height={(episodes().length - listWindow()[1]) * ROW_HEIGHT} />
|
||||
</Show>
|
||||
<Show when={showFetchMore()}>
|
||||
<FetchMoreRow
|
||||
index={() => episodes().length}
|
||||
focused={focusedRow}
|
||||
onMore={focusedOnMore}
|
||||
active={isActive}
|
||||
isLoadingMore={() => feedStore.isLoadingMore()}
|
||||
nerd={nerd}
|
||||
marker={marker}
|
||||
onMouseDown={() => {
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
nav.setDepthFocus(episodes().length, 0);
|
||||
}}
|
||||
/>
|
||||
</Show>
|
||||
<Show when={feedStore.isLoadingFeeds()}>
|
||||
<box alignItems="center" paddingTop={1}>
|
||||
<LoadingIndicator />
|
||||
</box>
|
||||
</Show>
|
||||
</Show>
|
||||
);
|
||||
|
||||
// ── preview pane: hovered-episode detail (or the Fetch More row) ──────────
|
||||
const episodeHint = (item: EpItem) =>
|
||||
`enter: play · d: download${
|
||||
downloadStore.getDownloadStatus(item.episode.id) !== DownloadStatus.NONE
|
||||
? " · D: delete"
|
||||
: ""
|
||||
} · space: select · h back`;
|
||||
|
||||
const previewContent = () => (
|
||||
<>
|
||||
<Show when={focusedOnMore()}>
|
||||
<FetchMorePreview
|
||||
isLoadingMore={() => feedStore.isLoadingMore()}
|
||||
manualText={() =>
|
||||
"Load the next batch of older episodes across all feeds (Enter)."
|
||||
}
|
||||
/>
|
||||
</Show>
|
||||
<Show when={!focusedOnMore()}>
|
||||
<Show
|
||||
when={episodes().length > 0}
|
||||
when={focusedItem()}
|
||||
fallback={
|
||||
<box padding={1}>
|
||||
<text fg={muted()}>No episodes. :refresh</text>
|
||||
<text fg={muted()}>No episode focused</text>
|
||||
</box>
|
||||
}
|
||||
>
|
||||
<For each={episodes()}>
|
||||
{(item, index) => {
|
||||
const fi = focusedEpIdx();
|
||||
return (
|
||||
<box
|
||||
flexDirection="column"
|
||||
gap={0}
|
||||
paddingLeft={1}
|
||||
paddingRight={1}
|
||||
backgroundColor={focusBg(index(), fi, isActive())}
|
||||
onMouseDown={() => {
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
nav.setDepthFocus(index(), 1);
|
||||
}}
|
||||
>
|
||||
<box flexDirection="row" gap={1}>
|
||||
<text fg={focusFg(index(), fi, isActive())}>
|
||||
{index() === fi ? "❯" : " "}
|
||||
</text>
|
||||
<text fg={focusFg(index(), fi, isActive())}>
|
||||
{item.episode.episodeNumber
|
||||
? `#${item.episode.episodeNumber} `
|
||||
: ""}
|
||||
{item.episode.title}
|
||||
</text>
|
||||
</box>
|
||||
<box flexDirection="row" gap={2} paddingLeft={2}>
|
||||
<text fg={index() === fi ? theme.surface : theme.info}>
|
||||
{formatDate(item.episode.pubDate)}
|
||||
</text>
|
||||
<text fg={index() === fi ? theme.surface : muted()}>
|
||||
{formatDuration(item.episode.duration)}
|
||||
</text>
|
||||
<text fg={index() === fi ? theme.surface : muted()}>
|
||||
{item.feed.customName || item.feed.podcast.title}
|
||||
</text>
|
||||
<Show when={nav.isSelected(item.episode.id)}>
|
||||
<text fg={theme.warning}>●</text>
|
||||
</Show>
|
||||
<Show when={downloadLabel(item.episode.id)}>
|
||||
<text fg={downloadColor(item.episode.id)}>
|
||||
{downloadLabel(item.episode.id)}
|
||||
</text>
|
||||
</Show>
|
||||
</box>
|
||||
</box>
|
||||
);
|
||||
}}
|
||||
</For>
|
||||
<Show when={feedStore.isLoadingFeeds()}>
|
||||
<box paddingLeft={2} paddingTop={1}>
|
||||
<LoadingIndicator />
|
||||
</box>
|
||||
</Show>
|
||||
{(item) => (
|
||||
<EpisodePreview
|
||||
episode={() => item().episode}
|
||||
subtitle={() =>
|
||||
item().feed.customName || item().feed.podcast.title
|
||||
}
|
||||
author={() => item().feed.podcast.author}
|
||||
downloadLabel={() => downloadLabel(item().episode.id)}
|
||||
downloadColor={() => downloadColor(item().episode.id)}
|
||||
hint={() => episodeHint(item())}
|
||||
/>
|
||||
)}
|
||||
</Show>
|
||||
</Show>
|
||||
</>
|
||||
);
|
||||
|
||||
// ── preview pane: hovered-item detail ──────────────────────────────────────
|
||||
const previewContent = () =>
|
||||
depth() === 0 ? (
|
||||
// depth 0 preview: hovered feed
|
||||
<Show
|
||||
when={focusedFeedItem()}
|
||||
fallback={
|
||||
<box padding={1}>
|
||||
<text fg={muted()}>No feed focused</text>
|
||||
</box>
|
||||
}
|
||||
>
|
||||
{(item) => {
|
||||
const it = item();
|
||||
return (
|
||||
<box flexDirection="column" gap={1} padding={1}>
|
||||
<text fg={theme.textPrimary ?? theme.text}>
|
||||
<strong>{feedLabel(it)}</strong>
|
||||
</text>
|
||||
<text fg={muted()}>
|
||||
{it.kind === "feed"
|
||||
? `by ${it.feed.podcast.author ?? "unknown"}`
|
||||
: ""}
|
||||
</text>
|
||||
<text fg={theme.textSecondary}>
|
||||
{it.kind === "all"
|
||||
? `${feedCount(it)} episodes across all feeds`
|
||||
: `${feedCount(it)} episodes`}
|
||||
</text>
|
||||
<text fg={muted()}>
|
||||
{it.kind === "feed"
|
||||
? (it.feed.podcast.description?.slice(0, 400) ??
|
||||
"No description.")
|
||||
: "Drill in to see episodes across every feed."}
|
||||
</text>
|
||||
<box height={1} />
|
||||
<text fg={muted()}>enter/l: open · h: back</text>
|
||||
</box>
|
||||
);
|
||||
}}
|
||||
</Show>
|
||||
) : (
|
||||
// depth ≥1 preview: hovered episode
|
||||
<Show
|
||||
when={focusedItem()}
|
||||
fallback={
|
||||
<box padding={1}>
|
||||
<text fg={muted()}>No episode focused</text>
|
||||
</box>
|
||||
}
|
||||
>
|
||||
{(item) => {
|
||||
const it = item();
|
||||
return (
|
||||
<box flexDirection="column" gap={1} padding={1}>
|
||||
<text fg={theme.textPrimary ?? theme.text}>
|
||||
<strong>
|
||||
{it.episode.episodeNumber
|
||||
? `#${it.episode.episodeNumber} `
|
||||
: ""}
|
||||
{it.episode.title}
|
||||
</strong>
|
||||
</text>
|
||||
<box flexDirection="row" gap={2}>
|
||||
<text fg={theme.info}>{formatDate(it.episode.pubDate)}</text>
|
||||
<text fg={muted()}>{formatDuration(it.episode.duration)}</text>
|
||||
<Show when={downloadLabel(it.episode.id)}>
|
||||
<text fg={downloadColor(it.episode.id)}>
|
||||
{downloadLabel(it.episode.id)}
|
||||
</text>
|
||||
</Show>
|
||||
</box>
|
||||
<text fg={muted()}>
|
||||
{it.feed.customName || it.feed.podcast.title}
|
||||
</text>
|
||||
<Show when={it.feed.podcast.author}>
|
||||
<text fg={muted()}>by {it.feed.podcast.author}</text>
|
||||
</Show>
|
||||
<box height={1} />
|
||||
<text fg={theme.textSecondary}>
|
||||
{it.episode.description?.slice(0, 400) ??
|
||||
"No description available."}
|
||||
{(it.episode.description?.length ?? 0) > 400 ? "…" : ""}
|
||||
</text>
|
||||
<box height={1} />
|
||||
<text fg={muted()}>enter: play · space: select · h: back</text>
|
||||
</box>
|
||||
);
|
||||
}}
|
||||
</Show>
|
||||
);
|
||||
|
||||
return (
|
||||
<YaziPaneRow
|
||||
<PaneRow
|
||||
parent={parentContent}
|
||||
current={currentContent}
|
||||
preview={previewContent}
|
||||
parentLabel={() => (depth() >= 1 ? "Feeds" : "Up")}
|
||||
currentLabel={currentLabel}
|
||||
previewLabel="Detail"
|
||||
focused={isActive}
|
||||
/>
|
||||
);
|
||||
|
||||
@@ -2,20 +2,25 @@
|
||||
* MyShowsPage — yazi depth-stack view of subscribed shows.
|
||||
*
|
||||
* depth 0 (current) — subscribed shows. Parent pane shows the muted
|
||||
* placeholder (1/7 slot kept).
|
||||
* placeholder (1/5 slot kept).
|
||||
* depth 1 (current) — episodes of the drilled show. Parent pane = shows.
|
||||
* preview — detail of the hovered item in the current column.
|
||||
*
|
||||
* Renders entirely through `<YaziPaneRow>`; no bespoke 3-column flexbox JSX
|
||||
* Depth 0's shows list and depth 1's episode list both end with a
|
||||
* "[Fetch More]" row that loads the next batch of episodes — depth 0 for
|
||||
* every subscribed show, depth 1 for the drilled show.
|
||||
*
|
||||
* Renders entirely through `<PaneRow>`; no bespoke 3-column flexbox JSX
|
||||
* remains. `l`/Enter drills in (show → episodes); `h` pops a depth (noop at
|
||||
* 0). j/k move only within the current column.
|
||||
*/
|
||||
|
||||
import { createMemo, For, Show, onMount, onCleanup } from "solid-js";
|
||||
import type { RGBA } from "@opentui/core";
|
||||
import { useFeedStore } from "@/stores/feed";
|
||||
import { useDownloadStore } from "@/stores/download";
|
||||
import { useAppStore } from "@/stores/app";
|
||||
import { DownloadStatus } from "@/types/episode";
|
||||
import { format } from "date-fns";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
import { useAudioNavStore, AudioSource } from "@/stores/audio-nav";
|
||||
import {
|
||||
@@ -27,23 +32,236 @@ import {
|
||||
} from "@/context/NavigationContext";
|
||||
import { useAudio } from "@/hooks/useAudio";
|
||||
import { on, off } from "@/utils/event-bus";
|
||||
import { supportsNerdFonts } from "@/utils/nerd-fonts";
|
||||
import type { KeybindActionName } from "@/context/KeybindContext";
|
||||
import type { Episode } from "@/types/episode";
|
||||
import type { Episode, DownloadedEpisode } from "@/types/episode";
|
||||
import type { Feed } from "@/types/feed";
|
||||
import { LoadingIndicator } from "@/components/LoadingIndicator";
|
||||
import { YaziPaneRow } from "@/components/YaziPaneRow";
|
||||
import {
|
||||
EpisodeRow,
|
||||
FetchMoreRow,
|
||||
EpisodePreview,
|
||||
FetchMorePreview,
|
||||
formatDate,
|
||||
} from "@/components/EpisodeList";
|
||||
import { PaneRow } from "@/components/PaneRow";
|
||||
import { TabListPane } from "@/components/TabPanel";
|
||||
import { useScrollIntoView } from "@/hooks/useScrollIntoView";
|
||||
import { useSelectionMarker } from "@/hooks/useSelectionMarker";
|
||||
import {
|
||||
useStableListFocus,
|
||||
FETCH_MORE_ROW_ID,
|
||||
} from "@/hooks/useStableListFocus";
|
||||
|
||||
// ── render components ────────────────────────────────────────────────────────
|
||||
// Depth-0 rows (subscribed shows, unsubscribed-show downloads) and their
|
||||
// preview panes are My Shows-specific; episode rows/previews are shared with
|
||||
// the Feed page (see EpisodeList.tsx).
|
||||
|
||||
/** A subscribed-show row (depth 0). */
|
||||
function ShowRow(props: {
|
||||
feed: Feed;
|
||||
title: string;
|
||||
index: () => number;
|
||||
focused: () => number;
|
||||
active: () => boolean;
|
||||
marker: () => string;
|
||||
wlScope: () => boolean;
|
||||
wlInList: () => boolean;
|
||||
onMouseDown: () => void;
|
||||
}) {
|
||||
const { theme } = useTheme();
|
||||
const muted = () => theme.muted || theme.text;
|
||||
const ref = useScrollIntoView(() => props.index() === props.focused());
|
||||
const isFocused = () => props.index() === props.focused();
|
||||
const bg = () =>
|
||||
isFocused() && props.active()
|
||||
? theme.primary
|
||||
: isFocused()
|
||||
? theme.border
|
||||
: undefined;
|
||||
const fg = () =>
|
||||
isFocused() && props.active()
|
||||
? theme.surface
|
||||
: isFocused()
|
||||
? theme.selectedListItemText ?? theme.text
|
||||
: theme.text;
|
||||
return (
|
||||
<box
|
||||
ref={ref}
|
||||
flexDirection="row"
|
||||
gap={1}
|
||||
paddingRight={1}
|
||||
backgroundColor={bg()}
|
||||
onMouseDown={props.onMouseDown}
|
||||
>
|
||||
<text flexShrink={0} fg={fg()}>
|
||||
{isFocused() ? props.marker() : " "}
|
||||
</text>
|
||||
{/* Long titles truncate with middle-ellipsis instead of wrapping —
|
||||
a wrapped title grows the row to 2+ lines and shifts every row
|
||||
below (see EpisodeList for the same guard). The episode-count
|
||||
and watchlist cells are flexShrink=0 so they never shrink or
|
||||
wrap; the flexible title takes the remaining width. */}
|
||||
<text wrapMode="none" truncate fg={fg()}>
|
||||
{props.title}
|
||||
</text>
|
||||
<text flexShrink={0} fg={isFocused() ? theme.surface : muted()}>
|
||||
({props.feed.episodes.length})
|
||||
</text>
|
||||
<Show when={props.wlScope()}>
|
||||
<text
|
||||
flexShrink={0}
|
||||
fg={
|
||||
isFocused()
|
||||
? theme.surface
|
||||
: props.wlInList()
|
||||
? theme.warning
|
||||
: muted()
|
||||
}
|
||||
>
|
||||
{props.wlInList() ? "●" : "○"}
|
||||
</text>
|
||||
</Show>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
/** An unsubscribed-show download row (depth 0, below the shows list). */
|
||||
function UnsubscribedRow(props: {
|
||||
d: DownloadedEpisode;
|
||||
index: () => number;
|
||||
focused: () => number;
|
||||
active: () => boolean;
|
||||
marker: () => string;
|
||||
downloadLabel: () => string;
|
||||
downloadColor: () => RGBA;
|
||||
onMouseDown: () => void;
|
||||
}) {
|
||||
const { theme } = useTheme();
|
||||
const ref = useScrollIntoView(() => props.index() === props.focused());
|
||||
const isFocused = () => props.index() === props.focused();
|
||||
const bg = () =>
|
||||
isFocused() && props.active()
|
||||
? theme.primary
|
||||
: isFocused()
|
||||
? theme.border
|
||||
: undefined;
|
||||
const fg = () =>
|
||||
isFocused() && props.active()
|
||||
? theme.surface
|
||||
: isFocused()
|
||||
? theme.selectedListItemText ?? theme.text
|
||||
: theme.text;
|
||||
return (
|
||||
<box
|
||||
ref={ref}
|
||||
flexDirection="column"
|
||||
gap={0}
|
||||
paddingRight={1}
|
||||
backgroundColor={bg()}
|
||||
onMouseDown={props.onMouseDown}
|
||||
>
|
||||
<box flexDirection="row" gap={1}>
|
||||
<text flexShrink={0} fg={fg()}>
|
||||
{isFocused() ? props.marker() : " "}
|
||||
</text>
|
||||
<text wrapMode="none" truncate fg={fg()}>
|
||||
{props.d.episodeTitle ?? props.d.episodeId}
|
||||
</text>
|
||||
<Show when={props.downloadLabel()}>
|
||||
<text flexShrink={0} fg={props.downloadColor()}>
|
||||
{props.downloadLabel()}
|
||||
</text>
|
||||
</Show>
|
||||
</box>
|
||||
<box paddingLeft={2}>
|
||||
<text
|
||||
wrapMode="none"
|
||||
truncate
|
||||
fg={isFocused() ? theme.surface : theme.textSecondary}
|
||||
>
|
||||
{props.d.podcastTitle ?? props.d.feedId}
|
||||
</text>
|
||||
</box>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
/** Depth-0 preview: the hovered subscribed show. */
|
||||
function ShowPreview(props: {
|
||||
show: () => Feed;
|
||||
title: () => string;
|
||||
hint: () => string;
|
||||
}) {
|
||||
const { theme } = useTheme();
|
||||
const muted = () => theme.muted || theme.text;
|
||||
const show = props.show;
|
||||
return (
|
||||
<box flexDirection="column" gap={1} padding={1}>
|
||||
<text fg={theme.textPrimary ?? theme.text}>
|
||||
<strong>{props.title()}</strong>
|
||||
</text>
|
||||
<Show when={show().podcast.author}>
|
||||
<text fg={muted()}>by {show().podcast.author}</text>
|
||||
</Show>
|
||||
<text fg={theme.textSecondary}>{show().episodes.length} episodes</text>
|
||||
<text fg={muted()}>
|
||||
{show().podcast.description?.slice(0, 400) ?? "No description."}
|
||||
</text>
|
||||
<box height={1} />
|
||||
<text fg={muted()}>{props.hint()}</text>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
/** Depth-0 preview: the hovered unsubscribed-show download. */
|
||||
function UnsubscribedPreview(props: {
|
||||
d: () => DownloadedEpisode;
|
||||
downloadLabel: () => string;
|
||||
downloadColor: () => RGBA;
|
||||
}) {
|
||||
const { theme } = useTheme();
|
||||
const muted = () => theme.muted || theme.text;
|
||||
const d = props.d;
|
||||
return (
|
||||
<box flexDirection="column" gap={1} padding={1}>
|
||||
<text fg={theme.textPrimary ?? theme.text}>
|
||||
<strong>{d().episodeTitle ?? d().episodeId}</strong>
|
||||
</text>
|
||||
<text fg={theme.textSecondary}>{d().podcastTitle ?? d().feedId}</text>
|
||||
<box flexDirection="row" gap={2}>
|
||||
<Show when={d().pubDate}>
|
||||
<text fg={theme.info}>{formatDate(new Date(d().pubDate!))}</text>
|
||||
</Show>
|
||||
<Show when={props.downloadLabel()}>
|
||||
<text fg={props.downloadColor()}>
|
||||
{props.downloadLabel()}
|
||||
</text>
|
||||
</Show>
|
||||
</box>
|
||||
<text fg={muted()}>
|
||||
Downloaded from episode search — the show is not subscribed.
|
||||
</text>
|
||||
<box height={1} />
|
||||
<text fg={muted()}>enter: play · D: delete download · h: back</text>
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||
export const MyShowsPaneCount = 1;
|
||||
|
||||
export function MyShowsPage() {
|
||||
// Static: detection never changes mid-session.
|
||||
const nerd = supportsNerdFonts();
|
||||
const feedStore = useFeedStore();
|
||||
const downloadStore = useDownloadStore();
|
||||
const app = useAppStore();
|
||||
const audioNav = useAudioNavStore();
|
||||
const audio = useAudio();
|
||||
const { theme } = useTheme();
|
||||
const muted = () => theme.muted || theme.text;
|
||||
const nav = useNavigation();
|
||||
const marker = useSelectionMarker();
|
||||
|
||||
const stack = nav.depthStack;
|
||||
const depth = nav.currentDepth;
|
||||
@@ -51,9 +269,42 @@ export function MyShowsPage() {
|
||||
|
||||
const shows = () => feedStore.getFilteredFeeds();
|
||||
|
||||
// Downloads of shows that are NOT subscribed (made from episode search) —
|
||||
// listed as their own section under the shows list. Reads feeds() so an
|
||||
// entry drops out the moment the user subscribes to its show.
|
||||
const unsubs = () => downloadStore.getUnsubscribedDownloads();
|
||||
|
||||
/** True while some subscribed show has more episodes to load — shows the
|
||||
* depth-0 "[Fetch More]" row. */
|
||||
const showLoadMore = () => feedStore.hasMoreAcrossAll();
|
||||
const depth0Count = () =>
|
||||
shows().length + unsubs().length + (showLoadMore() ? 1 : 0);
|
||||
const focusedRow0 = () =>
|
||||
depth0Count() === 0 ? 0 : Math.min(focus(0), depth0Count() - 1);
|
||||
/** True while the depth-0 cursor sits on the "[Fetch More]" row. */
|
||||
const focusedOnMore0 = () =>
|
||||
showLoadMore() && focusedRow0() === shows().length + unsubs().length;
|
||||
const focusedShowIdx = () =>
|
||||
shows().length === 0 ? 0 : Math.min(focus(0), shows().length - 1);
|
||||
const selectedShow = (): Feed | undefined => shows()[focusedShowIdx()];
|
||||
focusedOnMore0()
|
||||
? -1
|
||||
: Math.min(focusedRow0(), Math.max(shows().length - 1, 0));
|
||||
/** True when the depth-0 cursor sits on an unsubscribed-show download
|
||||
* row (past the shows list). */
|
||||
const focusedOnUnsub = () =>
|
||||
!focusedOnMore0() &&
|
||||
depth() === 0 &&
|
||||
focusedRow0() >= shows().length &&
|
||||
unsubs().length > 0;
|
||||
const focusedUnsub = (): DownloadedEpisode | undefined => {
|
||||
if (!focusedOnUnsub()) return undefined;
|
||||
return unsubs()[
|
||||
Math.min(focusedRow0() - shows().length, unsubs().length - 1)
|
||||
];
|
||||
};
|
||||
const selectedShow = (): Feed | undefined => {
|
||||
if (focusedOnUnsub() || focusedOnMore0()) return undefined;
|
||||
return shows()[focusedShowIdx()];
|
||||
};
|
||||
|
||||
// depth-1 frame ctx = the drilled feed id
|
||||
const drilledShowId = (): string => stack()[1]?.ctx ?? "";
|
||||
@@ -66,34 +317,99 @@ export function MyShowsPage() {
|
||||
(a, b) => b.pubDate.getTime() - a.pubDate.getTime(),
|
||||
);
|
||||
});
|
||||
// ── Fetch More ───────────────────────────────────────────────────────────
|
||||
// A "[Fetch More]" row at the bottom of a drilled show's episode list
|
||||
// advances that show's loaded window by 50 episodes — the per-show
|
||||
// counterpart to the Feed page's row (which loads every feed).
|
||||
const showFetchMore = () =>
|
||||
depth() >= 1 &&
|
||||
!!drilledShowId() &&
|
||||
feedStore.hasMoreEpisodes(drilledShowId());
|
||||
const rowCount = () => episodes().length + (showFetchMore() ? 1 : 0);
|
||||
const focusedRow = () =>
|
||||
rowCount() === 0 ? 0 : Math.min(focus(1), rowCount() - 1);
|
||||
const focusedOnMore = () =>
|
||||
showFetchMore() && focusedRow() === episodes().length;
|
||||
// -1 while the Fetch More row is focused so no episode row renders the
|
||||
// cursor/highlight (the button is the focused row, not the last episode).
|
||||
const focusedEpIdx = () =>
|
||||
episodes().length === 0 ? 0 : Math.min(focus(1), episodes().length - 1);
|
||||
const focusedEpisode = () => episodes()[focusedEpIdx()];
|
||||
focusedOnMore()
|
||||
? -1
|
||||
: Math.min(focusedRow(), Math.max(episodes().length - 1, 0));
|
||||
const focusedEpisode = () =>
|
||||
focusedOnMore() ? undefined : episodes()[focusedEpIdx()];
|
||||
|
||||
const curLen = () => (depth() === 0 ? shows().length : episodes().length);
|
||||
// ── Render window ────────────────────────────────────────────────────────
|
||||
// The drilled show's list grows deep after repeated fetch-more presses;
|
||||
// rendering every row per frame froze the UI. Render only a bounded slice
|
||||
// around the focus (real indexes preserved) — the scrollbox still keeps
|
||||
// the focused row in view. Spacers above/below the window restore the
|
||||
// full content height so the scrollbar tracks the real list.
|
||||
// Each episode row is 2 lines tall (title, date) — no subtitle here.
|
||||
const LIST_WINDOW = 30;
|
||||
const ROW_HEIGHT = 2;
|
||||
const listWindow = createMemo<[number, number]>(() => {
|
||||
const len = episodes().length;
|
||||
// Focusing the Fetch More button keeps the window anchored at the
|
||||
// last episode — no jump when the focus crosses onto the button.
|
||||
const f = focusedOnMore() ? len - 1 : focusedEpIdx();
|
||||
return [
|
||||
Math.max(0, f - LIST_WINDOW),
|
||||
Math.min(len, f + LIST_WINDOW + 1),
|
||||
];
|
||||
});
|
||||
const visibleEpisodes = createMemo(() => {
|
||||
const [start, end] = listWindow();
|
||||
return episodes().slice(start, end);
|
||||
});
|
||||
|
||||
const curLen = () => (depth() === 0 ? depth0Count() : rowCount());
|
||||
|
||||
// ── Focus stability across lazy loads ─────────────────────────────────────
|
||||
// The nav cursor is a plain row index; fetch-more inserts revealed
|
||||
// episodes above the [Fetch More] row, silently moving an index-stable
|
||||
// cursor onto a different episode or off the button. Re-anchor the cursor
|
||||
// onto the focused row's ID after any row-count change, at both depths
|
||||
// (the shows list shifts when subscriptions or unsubscribed downloads
|
||||
// change; the episode list shifts on fetch-more).
|
||||
useStableListFocus({
|
||||
count: curLen,
|
||||
getItemId: (i) => {
|
||||
if (depth() === 0) {
|
||||
const showsLen = shows().length;
|
||||
const unsubsLen = unsubs().length;
|
||||
if (i < showsLen) return shows()[i]?.id;
|
||||
if (i < showsLen + unsubsLen)
|
||||
return unsubs()[i - showsLen]?.episodeId;
|
||||
return FETCH_MORE_ROW_ID;
|
||||
}
|
||||
return i === episodes().length
|
||||
? FETCH_MORE_ROW_ID
|
||||
: episodes()[i]?.id;
|
||||
},
|
||||
getFocus: () => focus(depth()),
|
||||
setFocus: (i) => nav.setDepthFocus(i, depth()),
|
||||
});
|
||||
|
||||
const ensureFocus = () => {
|
||||
if (shows().length > 0 && focus(0) >= shows().length)
|
||||
nav.setDepthFocus(shows().length - 1, 0);
|
||||
if (depth() >= 1 && episodes().length > 0 && focus(1) >= episodes().length)
|
||||
nav.setDepthFocus(episodes().length - 1, 1);
|
||||
if (depth() === 0 && depth0Count() > 0 && focus(0) >= depth0Count())
|
||||
nav.setDepthFocus(depth0Count() - 1, 0);
|
||||
if (depth() >= 1 && rowCount() > 0 && focus(1) >= rowCount())
|
||||
nav.setDepthFocus(rowCount() - 1, 1);
|
||||
};
|
||||
onMount(ensureFocus);
|
||||
|
||||
onMount(() => {
|
||||
nav.registerResolver(`${nav.activeTab()}:${DEPTH_CENTER_PANE}`, (i) => {
|
||||
if (depth() === 0) return shows()[i]?.id;
|
||||
if (depth() === 0) {
|
||||
if (i < shows().length) return shows()[i]?.id;
|
||||
return unsubs()[i - shows().length]?.episodeId;
|
||||
}
|
||||
return episodes()[i]?.id;
|
||||
});
|
||||
});
|
||||
|
||||
// ── helpers ─────────────────────────────────────────────────────────────────
|
||||
const formatDate = (d: Date) => format(d, "MMM d, yyyy");
|
||||
const formatDuration = (s: number) => {
|
||||
const mins = Math.floor(s / 60);
|
||||
const hrs = Math.floor(mins / 60);
|
||||
return hrs > 0 ? `${hrs}h ${mins % 60}m` : `${mins}m`;
|
||||
};
|
||||
const downloadLabel = (id: string) => {
|
||||
switch (downloadStore.getDownloadStatus(id)) {
|
||||
case DownloadStatus.QUEUED:
|
||||
@@ -127,9 +443,35 @@ export function MyShowsPage() {
|
||||
audioNav.setSource(AudioSource.MY_SHOWS, selectedShow()?.podcast.id);
|
||||
};
|
||||
|
||||
/** Stream an unsubscribed-show download. The record carries only what was
|
||||
* persisted at download time, so a minimal Episode is reconstructed. */
|
||||
const playUnsubscribedDownload = (d: DownloadedEpisode) => {
|
||||
audio
|
||||
.play({
|
||||
id: d.episodeId,
|
||||
podcastId: d.feedId,
|
||||
title: d.episodeTitle ?? d.episodeId,
|
||||
description: "",
|
||||
audioUrl: d.audioUrl ?? "",
|
||||
duration: 0,
|
||||
pubDate: d.pubDate ? new Date(d.pubDate) : new Date(),
|
||||
})
|
||||
.catch(() => {});
|
||||
audioNav.setSource(AudioSource.SEARCH, d.feedId);
|
||||
};
|
||||
|
||||
// ── drill / open ───────────────────────────────────────────────────────────
|
||||
function open() {
|
||||
if (depth() === 0) {
|
||||
if (focusedOnMore0()) {
|
||||
feedStore.loadMoreAllFeeds().catch(() => {});
|
||||
return;
|
||||
}
|
||||
const d = focusedUnsub();
|
||||
if (d) {
|
||||
playUnsubscribedDownload(d);
|
||||
return;
|
||||
}
|
||||
const show = selectedShow();
|
||||
if (!show) return;
|
||||
nav.pushDepth({ kind: "episodes", ctx: show.id, focus: 0 } as DepthFrame);
|
||||
@@ -138,6 +480,10 @@ export function MyShowsPage() {
|
||||
return;
|
||||
}
|
||||
if (depth() >= 1) {
|
||||
if (focusedOnMore()) {
|
||||
feedStore.loadMoreEpisodes(drilledShowId()).catch(() => {});
|
||||
return;
|
||||
}
|
||||
const ep = focusedEpisode();
|
||||
if (ep) playEpisode(ep);
|
||||
}
|
||||
@@ -160,10 +506,55 @@ export function MyShowsPage() {
|
||||
if (ep) nav.toggleSelected(ep.id);
|
||||
}
|
||||
},
|
||||
download: () => {
|
||||
if (depth() < 1) return;
|
||||
const ep = focusedEpisode();
|
||||
if (ep) downloadStore.startDownload(ep, drilledShowId());
|
||||
},
|
||||
"delete-download": () => {
|
||||
if (depth() === 0) {
|
||||
const d = focusedUnsub();
|
||||
if (d) {
|
||||
downloadStore.cancelDownload(d.episodeId);
|
||||
downloadStore.removeDownload(d.episodeId).catch(() => {});
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (depth() < 1) return;
|
||||
const ep = focusedEpisode();
|
||||
if (!ep) return;
|
||||
const id = ep.id;
|
||||
if (downloadStore.getDownloadStatus(id) === DownloadStatus.NONE) return;
|
||||
downloadStore.cancelDownload(id);
|
||||
downloadStore.removeDownload(id).catch(() => {});
|
||||
},
|
||||
"whitelist-toggle": () => {
|
||||
const prefs = app.state().preferences;
|
||||
if (prefs.autoDownloadScope !== "whitelist") return;
|
||||
// depth 0: the focused show; depth ≥1: the drilled show.
|
||||
const id = depth() >= 1 ? drilledShowId() : selectedShow()?.id;
|
||||
if (!id) return;
|
||||
const cur = prefs.autoDownloadWhitelist ?? [];
|
||||
const next = cur.includes(id)
|
||||
? cur.filter((x) => x !== id)
|
||||
: [...cur, id];
|
||||
app.updatePreferences({ autoDownloadWhitelist: next });
|
||||
feedStore.runAutoDownload();
|
||||
},
|
||||
refresh: () => {
|
||||
const show = selectedShow();
|
||||
if (show) feedStore.refreshFeed(show.id).catch(() => {});
|
||||
},
|
||||
unsubscribe: () => {
|
||||
if (depth() !== 0) return;
|
||||
const show = selectedShow();
|
||||
if (show) {
|
||||
// unsubscribe = remove feed + purge its downloaded files
|
||||
feedStore.removeFeed(show.id);
|
||||
downloadStore.removeDownloadsForFeed(show.id).catch(() => {});
|
||||
ensureFocus();
|
||||
}
|
||||
},
|
||||
};
|
||||
function step(delta: number) {
|
||||
nav.move(delta, curLen());
|
||||
@@ -185,39 +576,48 @@ export function MyShowsPage() {
|
||||
|
||||
// ── render ──────────────────────────────────────────────────────────────────
|
||||
const isActive = () => nav.activePane() === DEPTH_CENTER_PANE;
|
||||
const focusBg = (i: number, lf: number, active: boolean) =>
|
||||
i === lf && active ? theme.primary : i === lf ? theme.border : undefined;
|
||||
const focusFg = (i: number, lf: number, active: boolean) =>
|
||||
i === lf && active ? theme.surface : theme.text;
|
||||
const showTitle = (f: Feed) => f.customName || f.podcast.title;
|
||||
|
||||
const currentLabel = () =>
|
||||
depth() === 0
|
||||
? `Shows (${shows().length})`
|
||||
? `Shows (${shows().length})${
|
||||
unsubs().length > 0 ? ` · Unsub DL (${unsubs().length})` : ""
|
||||
}`
|
||||
: `${selectedShow() ? showTitle(selectedShow()!) : "Episodes"} · ${episodes().length}`;
|
||||
|
||||
// ── parent pane: previous-depth list (muted/blank at depth 0) ─────────────
|
||||
// ── parent pane: previous-depth list (muted/blank at depth 0) ──────────
|
||||
// Stable <Show> gate (not a ternary root swap) so the parent list
|
||||
// mounts/unmounts cleanly on depth change.
|
||||
const parentContent = () => (
|
||||
<Show when={depth() >= 1} fallback={<TabListPane muted />}>
|
||||
<For each={shows()}>
|
||||
{(feed, index) => {
|
||||
const lf = nav.depthFocus(0);
|
||||
const lf = () => nav.depthFocus(0);
|
||||
const ref = useScrollIntoView(() => index() === lf());
|
||||
const focused = () => index() === lf();
|
||||
const fg = () =>
|
||||
focused()
|
||||
? theme.selectedListItemText ?? theme.text
|
||||
: theme.text;
|
||||
return (
|
||||
<box
|
||||
ref={ref}
|
||||
flexDirection="row"
|
||||
gap={1}
|
||||
paddingLeft={1}
|
||||
paddingRight={1}
|
||||
backgroundColor={focusBg(index(), lf, false)}
|
||||
backgroundColor={focused() ? theme.border : undefined}
|
||||
>
|
||||
<text fg={focusFg(index(), lf, false)}>
|
||||
{index() === lf ? "❯" : " "}
|
||||
<text flexShrink={0} fg={fg()}>
|
||||
{focused() ? marker() : " "}
|
||||
</text>
|
||||
{/* 20%-wide parent pane truncates hard — same
|
||||
middle-ellipsis guard as the depth-0 rows. */}
|
||||
<text wrapMode="none" truncate fg={fg()}>
|
||||
{showTitle(feed)}
|
||||
</text>
|
||||
<text flexShrink={0} fg={muted()}>
|
||||
({feed.episodes.length})
|
||||
</text>
|
||||
<text fg={focusFg(index(), lf, false)}>{showTitle(feed)}</text>
|
||||
<text fg={muted()}>({feed.episodes.length})</text>
|
||||
</box>
|
||||
);
|
||||
}}
|
||||
@@ -231,7 +631,7 @@ export function MyShowsPage() {
|
||||
{/* depth 0: shows — stable sibling <Show> so the swap disposes cleanly */}
|
||||
<Show when={depth() === 0}>
|
||||
<Show
|
||||
when={shows().length > 0}
|
||||
when={depth0Count() > 0}
|
||||
fallback={
|
||||
<box padding={1}>
|
||||
<text fg={muted()}>
|
||||
@@ -241,35 +641,70 @@ export function MyShowsPage() {
|
||||
}
|
||||
>
|
||||
<For each={shows()}>
|
||||
{(feed, index) => {
|
||||
const lf = focusedShowIdx();
|
||||
return (
|
||||
<box
|
||||
flexDirection="row"
|
||||
gap={1}
|
||||
paddingLeft={1}
|
||||
paddingRight={1}
|
||||
backgroundColor={focusBg(index(), lf, isActive())}
|
||||
{(feed, index) => (
|
||||
<ShowRow
|
||||
feed={feed}
|
||||
title={showTitle(feed)}
|
||||
index={index}
|
||||
focused={focusedShowIdx}
|
||||
active={isActive}
|
||||
marker={marker}
|
||||
wlScope={() =>
|
||||
app.state().preferences.autoDownloadScope === "whitelist"
|
||||
}
|
||||
wlInList={() =>
|
||||
(app.state().preferences.autoDownloadWhitelist ?? []).includes(
|
||||
feed.id,
|
||||
)
|
||||
}
|
||||
onMouseDown={() => {
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
nav.setDepthFocus(index(), 0);
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</For>
|
||||
<Show when={unsubs().length > 0}>
|
||||
<box paddingLeft={1} paddingTop={1}>
|
||||
<text fg={theme.textSecondary}>
|
||||
Unsubscribed Show Downloads
|
||||
</text>
|
||||
</box>
|
||||
<For each={unsubs()}>
|
||||
{(d, index) => (
|
||||
<UnsubscribedRow
|
||||
d={d}
|
||||
index={() => shows().length + index()}
|
||||
focused={focusedRow0}
|
||||
active={isActive}
|
||||
marker={marker}
|
||||
downloadLabel={() => downloadLabel(d.episodeId)}
|
||||
downloadColor={() => downloadColor(d.episodeId)}
|
||||
onMouseDown={() => {
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
nav.setDepthFocus(index(), 0);
|
||||
nav.setDepthFocus(shows().length + index(), 0);
|
||||
}}
|
||||
>
|
||||
<text fg={focusFg(index(), lf, isActive())}>
|
||||
{index() === lf ? "❯" : " "}
|
||||
</text>
|
||||
<text fg={focusFg(index(), lf, isActive())}>
|
||||
{showTitle(feed)}
|
||||
</text>
|
||||
<text fg={index() === lf ? theme.surface : muted()}>
|
||||
({feed.episodes.length})
|
||||
</text>
|
||||
</box>
|
||||
);
|
||||
/>
|
||||
)}
|
||||
</For>
|
||||
</Show>
|
||||
<Show when={showLoadMore()}>
|
||||
<FetchMoreRow
|
||||
index={() => shows().length + unsubs().length}
|
||||
focused={focusedRow0}
|
||||
onMore={focusedOnMore0}
|
||||
active={isActive}
|
||||
isLoadingMore={() => feedStore.isLoadingMore()}
|
||||
nerd={nerd}
|
||||
marker={marker}
|
||||
onMouseDown={() => {
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
nav.setDepthFocus(shows().length + unsubs().length, 0);
|
||||
}}
|
||||
</For>
|
||||
/>
|
||||
</Show>
|
||||
</Show>
|
||||
</Show>
|
||||
{/* depth ≥1: episodes */}
|
||||
<Show when={depth() >= 1}>
|
||||
<Show
|
||||
@@ -280,54 +715,47 @@ export function MyShowsPage() {
|
||||
</box>
|
||||
}
|
||||
>
|
||||
<For each={episodes()}>
|
||||
{(ep, index) => {
|
||||
const lf = focusedEpIdx();
|
||||
return (
|
||||
<box
|
||||
flexDirection="column"
|
||||
gap={0}
|
||||
paddingLeft={1}
|
||||
paddingRight={1}
|
||||
backgroundColor={focusBg(index(), lf, isActive())}
|
||||
onMouseDown={() => {
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
nav.setDepthFocus(index(), 1);
|
||||
}}
|
||||
>
|
||||
<box flexDirection="row" gap={1}>
|
||||
<text fg={focusFg(index(), lf, isActive())}>
|
||||
{index() === lf ? "❯" : " "}
|
||||
</text>
|
||||
<text fg={focusFg(index(), lf, isActive())}>
|
||||
{ep.episodeNumber ? `#${ep.episodeNumber} ` : ""}
|
||||
{ep.title}
|
||||
</text>
|
||||
</box>
|
||||
<box flexDirection="row" gap={2} paddingLeft={2}>
|
||||
<text fg={index() === lf ? theme.surface : theme.info}>
|
||||
{formatDate(ep.pubDate)}
|
||||
</text>
|
||||
<text fg={index() === lf ? theme.surface : muted()}>
|
||||
{formatDuration(ep.duration)}
|
||||
</text>
|
||||
<Show when={nav.isSelected(ep.id)}>
|
||||
<text fg={theme.warning}>●</text>
|
||||
</Show>
|
||||
<Show when={downloadLabel(ep.id)}>
|
||||
<text fg={downloadColor(ep.id)}>
|
||||
{downloadLabel(ep.id)}
|
||||
</text>
|
||||
</Show>
|
||||
</box>
|
||||
</box>
|
||||
);
|
||||
}}
|
||||
{/* Spacers keep the scrollbox content at the FULL list
|
||||
height so the scrollbar reflects the real list, not the
|
||||
render window. */}
|
||||
<Show when={listWindow()[0] > 0}>
|
||||
<box height={listWindow()[0] * ROW_HEIGHT} />
|
||||
</Show>
|
||||
<For each={visibleEpisodes()}>
|
||||
{(ep, index) => (
|
||||
<EpisodeRow
|
||||
episode={ep}
|
||||
index={() => listWindow()[0] + index()}
|
||||
focused={focusedEpIdx}
|
||||
active={isActive}
|
||||
selected={() => nav.isSelected(ep.id)}
|
||||
downloadLabel={() => downloadLabel(ep.id)}
|
||||
downloadColor={() => downloadColor(ep.id)}
|
||||
marker={marker}
|
||||
onMouseDown={() => {
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
nav.setDepthFocus(listWindow()[0] + index(), 1);
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</For>
|
||||
<Show when={feedStore.isLoadingMore()}>
|
||||
<box paddingLeft={2} paddingTop={1}>
|
||||
<LoadingIndicator />
|
||||
</box>
|
||||
<Show when={episodes().length - listWindow()[1] > 0}>
|
||||
<box height={(episodes().length - listWindow()[1]) * ROW_HEIGHT} />
|
||||
</Show>
|
||||
<Show when={showFetchMore()}>
|
||||
<FetchMoreRow
|
||||
index={() => episodes().length}
|
||||
focused={focusedRow}
|
||||
onMore={focusedOnMore}
|
||||
active={isActive}
|
||||
isLoadingMore={() => feedStore.isLoadingMore()}
|
||||
nerd={nerd}
|
||||
marker={marker}
|
||||
onMouseDown={() => {
|
||||
nav.setActivePane(DEPTH_CENTER_PANE);
|
||||
nav.setDepthFocus(episodes().length, 1);
|
||||
}}
|
||||
/>
|
||||
</Show>
|
||||
</Show>
|
||||
</Show>
|
||||
@@ -335,86 +763,115 @@ export function MyShowsPage() {
|
||||
);
|
||||
|
||||
// ── preview pane ───────────────────────────────────────────────────────────
|
||||
const episodeHint = (epId: string) =>
|
||||
`enter: play · d: download${
|
||||
downloadStore.getDownloadStatus(epId) !== DownloadStatus.NONE
|
||||
? " · D: delete"
|
||||
: ""
|
||||
}${
|
||||
app.state().preferences.autoDownloadScope === "whitelist"
|
||||
? (app.state().preferences.autoDownloadWhitelist ?? []).includes(
|
||||
drilledShowId(),
|
||||
)
|
||||
? " · w: un-whitelist"
|
||||
: " · w: whitelist"
|
||||
: ""
|
||||
} · space: select · h: back`;
|
||||
|
||||
const showHint = (show: Feed) =>
|
||||
`enter/l: open · h: back · x: unsubscribe${
|
||||
app.state().preferences.autoDownloadScope === "whitelist"
|
||||
? (app.state().preferences.autoDownloadWhitelist ?? []).includes(show.id)
|
||||
? " · w: un-whitelist"
|
||||
: " · w: whitelist"
|
||||
: ""
|
||||
}`;
|
||||
|
||||
const previewContent = () =>
|
||||
depth() === 0 ? (
|
||||
// depth 0 preview: hovered show
|
||||
<Show
|
||||
when={selectedShow()}
|
||||
fallback={
|
||||
<box padding={1}>
|
||||
<text fg={muted()}>No show focused</text>
|
||||
</box>
|
||||
}
|
||||
>
|
||||
{(show) => (
|
||||
<box flexDirection="column" gap={1} padding={1}>
|
||||
<text fg={theme.textPrimary ?? theme.text}>
|
||||
<strong>{showTitle(show())}</strong>
|
||||
</text>
|
||||
<Show when={show().podcast.author}>
|
||||
<text fg={muted()}>by {show().podcast.author}</text>
|
||||
</Show>
|
||||
<text fg={theme.textSecondary}>
|
||||
{show().episodes.length} episodes
|
||||
</text>
|
||||
<text fg={muted()}>
|
||||
{show().podcast.description?.slice(0, 400) ?? "No description."}
|
||||
</text>
|
||||
<box height={1} />
|
||||
<text fg={muted()}>enter/l: open · h: back</text>
|
||||
</box>
|
||||
)}
|
||||
// depth 0 preview: hovered "[Fetch More]" row, else the
|
||||
// unsubscribed-show download, else the hovered show.
|
||||
<>
|
||||
<Show when={focusedOnMore0()}>
|
||||
<FetchMorePreview
|
||||
isLoadingMore={() => feedStore.isLoadingMore()}
|
||||
manualText={() =>
|
||||
"Load the next batch of older episodes across all subscribed shows (Enter)."
|
||||
}
|
||||
/>
|
||||
</Show>
|
||||
) : (
|
||||
// depth ≥1 preview: hovered episode
|
||||
<Show
|
||||
when={focusedEpisode()}
|
||||
fallback={
|
||||
<box padding={1}>
|
||||
<text fg={muted()}>No episode focused</text>
|
||||
</box>
|
||||
}
|
||||
>
|
||||
{(ep) => (
|
||||
<box flexDirection="column" gap={1} padding={1}>
|
||||
<text fg={theme.textPrimary ?? theme.text}>
|
||||
<strong>
|
||||
{ep().episodeNumber ? `#${ep().episodeNumber} ` : ""}
|
||||
{ep().title}
|
||||
</strong>
|
||||
</text>
|
||||
<box flexDirection="row" gap={2}>
|
||||
<text fg={theme.info}>{formatDate(ep().pubDate)}</text>
|
||||
<text fg={muted()}>{formatDuration(ep().duration)}</text>
|
||||
<Show when={downloadLabel(ep().id)}>
|
||||
<text fg={downloadColor(ep().id)}>
|
||||
{downloadLabel(ep().id)}
|
||||
</text>
|
||||
</Show>
|
||||
</box>
|
||||
<Show when={selectedShow()?.podcast.author}>
|
||||
<text fg={muted()}>by {selectedShow()!.podcast.author}</text>
|
||||
<Show when={!focusedOnMore0()}>
|
||||
<Show
|
||||
when={focusedUnsub()}
|
||||
fallback={
|
||||
<Show
|
||||
when={selectedShow()}
|
||||
fallback={
|
||||
<box padding={1}>
|
||||
<text fg={muted()}>No show focused</text>
|
||||
</box>
|
||||
}
|
||||
>
|
||||
{(show) => (
|
||||
<ShowPreview
|
||||
show={() => show()}
|
||||
title={() => showTitle(show())}
|
||||
hint={() => showHint(show())}
|
||||
/>
|
||||
)}
|
||||
</Show>
|
||||
<box height={1} />
|
||||
<text fg={theme.textSecondary}>
|
||||
{ep().description?.slice(0, 400) ?? "No description available."}
|
||||
{(ep().description?.length ?? 0) > 400 ? "…" : ""}
|
||||
</text>
|
||||
<box height={1} />
|
||||
<text fg={muted()}>enter: play · space: select · h: back</text>
|
||||
</box>
|
||||
)}
|
||||
}
|
||||
>
|
||||
{(d) => (
|
||||
<UnsubscribedPreview
|
||||
d={() => d()}
|
||||
downloadLabel={() => downloadLabel(d().episodeId)}
|
||||
downloadColor={() => downloadColor(d().episodeId)}
|
||||
/>
|
||||
)}
|
||||
</Show>
|
||||
</Show>
|
||||
</>
|
||||
) : (
|
||||
// depth ≥1 preview: hovered episode (or the Fetch More row)
|
||||
<>
|
||||
<Show when={focusedOnMore()}>
|
||||
<FetchMorePreview
|
||||
isLoadingMore={() => feedStore.isLoadingMore()}
|
||||
manualText={() =>
|
||||
"Load the next batch of older episodes for this show (Enter)."
|
||||
}
|
||||
/>
|
||||
</Show>
|
||||
<Show when={!focusedOnMore()}>
|
||||
<Show
|
||||
when={focusedEpisode()}
|
||||
fallback={
|
||||
<box padding={1}>
|
||||
<text fg={muted()}>No episode focused</text>
|
||||
</box>
|
||||
}
|
||||
>
|
||||
{(ep) => (
|
||||
<EpisodePreview
|
||||
episode={() => ep()}
|
||||
author={() => selectedShow()?.podcast.author}
|
||||
downloadLabel={() => downloadLabel(ep().id)}
|
||||
downloadColor={() => downloadColor(ep().id)}
|
||||
hint={() => episodeHint(ep().id)}
|
||||
/>
|
||||
)}
|
||||
</Show>
|
||||
</Show>
|
||||
</>
|
||||
);
|
||||
|
||||
return (
|
||||
<YaziPaneRow
|
||||
<PaneRow
|
||||
parent={parentContent}
|
||||
current={currentContent}
|
||||
preview={previewContent}
|
||||
parentLabel={() => (depth() >= 1 ? "Shows" : "Up")}
|
||||
currentLabel={currentLabel}
|
||||
previewLabel="Detail"
|
||||
focused={isActive}
|
||||
/>
|
||||
);
|
||||
|
||||
@@ -1,64 +1,96 @@
|
||||
import type { BackendName } from "../utils/audio-player"
|
||||
import { useTheme } from "@/context/ThemeContext"
|
||||
import type { BackendName } from "@/utils/audio-player";
|
||||
import { useTheme } from "@/context/ThemeContext";
|
||||
|
||||
type PlaybackControlsProps = {
|
||||
isPlaying: boolean
|
||||
volume: number
|
||||
speed: number
|
||||
backendName?: BackendName
|
||||
hasAudioUrl?: boolean
|
||||
onToggle: () => void
|
||||
onPrev: () => void
|
||||
onNext: () => void
|
||||
onVolumeChange: (value: number) => void
|
||||
onSpeedChange: (value: number) => void
|
||||
}
|
||||
|
||||
const BACKEND_LABELS: Record<BackendName, string> = {
|
||||
mpv: "mpv",
|
||||
ffplay: "ffplay",
|
||||
afplay: "afplay",
|
||||
system: "system",
|
||||
none: "none",
|
||||
}
|
||||
isPlaying: boolean;
|
||||
volume: number;
|
||||
speed: number;
|
||||
backendName?: BackendName;
|
||||
hasAudioUrl?: boolean;
|
||||
onToggle: () => void;
|
||||
onPrev: () => void;
|
||||
onNext: () => void;
|
||||
onVolumeChange: (value: number) => void;
|
||||
onSpeedChange: (value: number) => void;
|
||||
};
|
||||
|
||||
export function PlaybackControls(props: PlaybackControlsProps) {
|
||||
const { theme } = useTheme();
|
||||
return (
|
||||
<box flexDirection="row" gap={1} alignItems="center" border padding={1} borderColor={theme.border}>
|
||||
<box border padding={0} onMouseDown={props.onPrev} borderColor={theme.border}>
|
||||
<text fg={theme.primary}>[Prev]</text>
|
||||
</box>
|
||||
<box border padding={0} onMouseDown={props.onToggle} borderColor={theme.border}>
|
||||
<text fg={theme.primary}>{props.isPlaying ? "[Pause]" : "[Play]"}</text>
|
||||
</box>
|
||||
<box border padding={0} onMouseDown={props.onNext} borderColor={theme.border}>
|
||||
<text fg={theme.primary}>[Next]</text>
|
||||
</box>
|
||||
<box flexDirection="row" gap={1} marginLeft={2}>
|
||||
<text fg={theme.textMuted}>Vol</text>
|
||||
<text fg={theme.text}>{Math.round(props.volume * 100)}%</text>
|
||||
</box>
|
||||
<box flexDirection="row" gap={1} marginLeft={2}>
|
||||
<text fg={theme.textMuted}>Speed</text>
|
||||
<text fg={theme.text}>{props.speed}x</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>
|
||||
)
|
||||
const { theme } = useTheme();
|
||||
return (
|
||||
<box
|
||||
flexDirection="row"
|
||||
flexWrap="wrap"
|
||||
gap={1}
|
||||
alignItems="center"
|
||||
justifyContent="center"
|
||||
border
|
||||
padding={1}
|
||||
borderColor={theme.border}
|
||||
>
|
||||
{/* transport buttons — wrap as a unit, centered on their own line */}
|
||||
<box flexDirection="row" gap={1} alignItems="center" flexShrink={0}>
|
||||
<box
|
||||
border
|
||||
padding={0}
|
||||
onMouseDown={props.onPrev}
|
||||
borderColor={theme.border}
|
||||
>
|
||||
<text fg={theme.primary} wrapMode="none">[Prev]</text>
|
||||
</box>
|
||||
<box
|
||||
border
|
||||
padding={0}
|
||||
onMouseDown={props.onToggle}
|
||||
borderColor={theme.border}
|
||||
>
|
||||
<text fg={theme.primary} wrapMode="none">{props.isPlaying ? "[Pause]" : "[Play]"}</text>
|
||||
</box>
|
||||
<box
|
||||
border
|
||||
padding={0}
|
||||
onMouseDown={props.onNext}
|
||||
borderColor={theme.border}
|
||||
>
|
||||
<text fg={theme.primary} wrapMode="none">[Next]</text>
|
||||
</box>
|
||||
</box>
|
||||
{/* status group — always follows the buttons; wrap point is here */}
|
||||
<box
|
||||
flexDirection="row"
|
||||
gap={1}
|
||||
alignItems="center"
|
||||
marginLeft={2}
|
||||
flexShrink={0}
|
||||
>
|
||||
<text fg={theme.textMuted}>Vol</text>
|
||||
<text fg={theme.text}>{Math.round(props.volume * 100)}%</text>
|
||||
<text fg={theme.textMuted}>↑↓</text>
|
||||
<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>
|
||||
</box>
|
||||
{/* audio warnings — wrap to their own (3rd) line when the row is tight */}
|
||||
{(props.backendName === "none" || props.hasAudioUrl === false) && (
|
||||
<box
|
||||
flexDirection="row"
|
||||
gap={1}
|
||||
alignItems="center"
|
||||
flexShrink={0}
|
||||
>
|
||||
{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>
|
||||
)}
|
||||
</box>
|
||||
);
|
||||
}
|
||||
|
||||