Commit 7f77734

rmptui7f77734

Release rmptui v0.1.7

Author: krolyxon
Date: 2026-10-15 22:09 +0530
Parent: 529e5bd
Commit: 7f777344b5984f98bcfdb339d689fbe81673b905

+3626 −1800

23 files changed

Browse files Patch

−Context 3+

A .github/copilot-instructions.md +30 −0
M CHANGELOG.md +20 −0
M Cargo.lock +642 −196
M Cargo.toml +17 −11
M README.md +227 −55
A install.sh +86 −0
M src/app.rs +373 −329
M src/browser.rs +78 −101
A src/config.rs +669 −0
M src/connection.rs +700 −160
D src/event_handler/event.rs +0 −79
M src/event_handler/handler.rs +435 −290
M src/event_handler/mod.rs +0 −5
D src/event_handler/new_pl_keys.rs +0 −47
D src/event_handler/pl_append_keys.rs +0 −115
D src/event_handler/pl_rename_keys.rs +0 −43
D src/event_handler/search_keys.rs +0 −110
M src/lib.rs +10 −19
M src/list.rs +4 −18
M src/main.rs +155 −32
M src/tui.rs +8 −8
M src/ui.rs +166 −171
M src/utils.rs +6 −11

A .github/copilot-instructions.md View

M CHANGELOG.md View

M Cargo.lock View

M Cargo.toml View

M README.md View

A install.sh View

M src/app.rs View

M src/browser.rs View

A src/config.rs View

M src/connection.rs View

D src/event_handler/event.rs View

M src/event_handler/handler.rs View

M src/event_handler/mod.rs View

D src/event_handler/new_pl_keys.rs View

D src/event_handler/pl_append_keys.rs View

D src/event_handler/pl_rename_keys.rs View

D src/event_handler/search_keys.rs View

M src/lib.rs View

M src/list.rs View

M src/main.rs View

M src/tui.rs View

M src/ui.rs View

M src/utils.rs View

	@@ -0,0 +1,30 @@
1	+	# Copilot instructions for rmptui
2	+
3	+	## Build, test, and lint
4	+
5	+	- `cargo build` — compile the application.
6	+	- `cargo run` — run against MPD at `127.0.0.1:6600` by default.
7	+	- `cargo fmt --check` — check Rust formatting; use `cargo fmt` to format.
8	+	- `cargo test` — run all unit tests.
9	+	- `cargo test connection::tests::parses_quoted_mpd_values_and_escapes` — run one named test. Replace the filter with a test name or module path to target another test.
10	+	- `cargo clippy --all-targets -- -D warnings` — lint all targets and treat warnings as errors.
11	+
12	+	## Architecture
13	+
14	+	- `src/main.rs` owns the Tokio runtime, reads `MPD_HOST`/`MPD_PORT`, initializes the terminal, and selects between terminal input, redraw ticks, and MPD change notifications. A separate `MpdClient` connection blocks on MPD `idle`, then sends a fresh `MpdSnapshot` to the UI; the app's command connection stays available for user actions.
15	+	- `src/config.rs` loads or creates the TOML configuration at `$CONFIG_HOME/rmptui/config.toml`, falling back to `$XDG_CONFIG_HOME` and then `~/.config`. The config contains MPD and playback settings plus configurable keybindings; `MPD_HOST` and `MPD_PORT` override its connection defaults.
16	+	- `src/connection.rs` implements MPD's line-oriented text protocol over Tokio TCP, including command quoting, response/error parsing, and conversion of MPD responses into app models. Keep protocol I/O asynchronous. The client processes a command's complete response before issuing another command on that connection.
17	+	- `src/app.rs` owns UI/application state and coordinates queue, browser, and playlist operations. `src/browser.rs` represents rows as `BrowserEntry::Directory` or `BrowserEntry::Song`, keeping song metadata with its row. Browser paths are MPD library-relative paths, not local filesystem paths.
18	+	- `src/event_handler/handler.rs` maps Crossterm events to application operations. `src/ui.rs` renders the current app state with Ratatui; it should not perform MPD I/O. `src/tui.rs` owns terminal mode setup, drawing, and restoration.
19	+	- `src/list.rs` contains shared list cursor behavior. `src/utils.rs` provides the audio-extension check used by the browser and directory operations.
20	+
21	+	## Repository conventions
22	+
23	+	- Keep the MPD protocol models and wire-format parsing in `connection.rs`; UI and application code should use those models rather than parse raw MPD responses.
24	+	- Use the crate-level `AppResult<T>` for errors crossing module boundaries. Avoid duplicating state that can be derived from the MPD status or other canonical model data.
25	+	- Keep configuration defaults and validation in `config.rs`, and read tunable behavior from `App.config` rather than adding new hard-coded runtime values. Route keyboard actions through `App.config.keybindings`; keep README controls and the generated defaults in sync. Text typed into search/name fields is content, not a keybinding, except for configured input-editing actions.
26	+	- Pass MPD library paths as protocol arguments. The MPD command writer quotes and escapes each argument, so do not construct raw command strings from user-provided names or paths.
27	+	- Preserve async boundaries through event handling and app operations; do not introduce blocking socket reads, polling threads, or synchronous terminal polling.
28	+	- Browser `/` search retains all positive-scoring fuzzy matches in result order. `Enter` returns to normal navigation while retaining browser results; `n` and `N` cycle them. Starting a new search or changing directories resets those results.
29	+	- When changing key behavior or features, keep the controls documented in `README.md` consistent with `event_handler/handler.rs`.
30	+	- `AppResult<T>` is `Send + Sync` because application errors cross Tokio task boundaries.

		@@ -1,3 +1,23 @@
	1	+	## rmptui-v0.1.7
	2	+
	3	+	- Replace the outdated MPD crate with an asynchronous native MPD TCP protocol
	4	+	client and `idle`-based server updates.
	5	+	- Preserve and improve browser search with fuzzy result cycling using `n`/`N`,
	6	+	and render directory names across the full browser row.
	7	+	- Add a first-run TOML configuration for MPD connection details, playback
	8	+	adjustments, and configurable keybindings, with documented defaults and
	9	+	environment-variable overrides.
	10	+	- Add playlist management in the Playlists view: focus playlist contents,
	11	+	load playlists, play individual tracks, remove/reorder songs, and rename or
	12	+	delete playlists.
	13	+	- Add a local install/uninstall script for the release executable.
	14	+	- Remove dmenu support and document the async architecture, configuration,
	15	+	keybindings, installation, and playlist controls.
	16	+	- Refactor application state and browser entries, remove unused helpers, and
	17	+	improve terminal restoration and MPD address handling.
	18	+	- Add and update tests for MPD protocol commands, configuration, search,
	19	+	browser rendering, and address formatting.
	20	+
1	21		## rmptui-v0.1.6
2	22		- Add songs to new playlist feature
3	23		- Code refactoring

		@@ -1,22 +1,28 @@
1	1		[package]
2	2		name = "rmptui"
3	3		authors = ["krolyxon"]
4		−	description = """
5		−	a fast and minimal tui mpd client
6		−	"""
	4	+	description = "A fast and minimal terminal MPD client"
7	5		readme = "README.md"
8	6		version = "0.1.6"
9	7		edition = "2021"
	8	+	license = "AGPL-3.0-only"
10	9		repository = "https://github.com/krolyxon/rmptui"
11		−	keywords = ["rmptui", "mpd", "music", "cli", "tui", "client"]
12		−
13		−	# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
	10	+	keywords = ["mpd", "music", "cli", "tui", "client"]
14	11
15	12		[dependencies]
16		−	mpd = "0.1.0"
17		−	simple-dmenu = "0.1.0"
18		−	ratatui = { version = "0.26.2", default-features = false, features = [
19		−	'crossterm',
	13	+	ratatui = { version = "0.30.2", default-features = false, features = [
	14	+	"crossterm_0_29",
20	15		] }
21		−	crossterm = "0.27.0"
	16	+	crossterm = { version = "0.29.0", features = ["event-stream"] }
22	17		rust-fuzzy-search = "0.1.1"
	18	+	futures-util = "0.3.34"
	19	+	serde = { version = "1.0.229", features = ["derive"] }
	20	+	toml = "1.1.8"
	21	+	tokio = { version = "1.53.3", features = [
	22	+	"macros",
	23	+	"rt-multi-thread",
	24	+	"net",
	25	+	"io-util",
	26	+	"time",
	27	+	"sync",
	28	+	] }

	@@ -0,0 +1,86 @@
1	+	#!/bin/sh
2	+
3	+	set -eu
4	+
5	+	BIN_DIR=/usr/local/bin
6	+	ACTION=install
7	+
8	+	usage() {
9	+	cat <<'EOF'
10	+	Build and install rmptui from this checkout, or uninstall it.
11	+
12	+	Usage:
13	+	./install.sh [--bin-dir DIR]
14	+	./install.sh --uninstall [--bin-dir DIR]
15	+
16	+	Options:
17	+	--bin-dir DIR Install/remove rmptui in DIR (default: /usr/local/bin)
18	+	--uninstall Remove the installed rmptui executable
19	+	-h, --help Show this help
20	+	EOF
21	+	}
22	+
23	+	fail() {
24	+	printf 'install.sh: %s\n' "$1" >&2
25	+	exit 1
26	+	}
27	+
28	+	while [ "$#" -gt 0 ]; do
29	+	case "$1" in
30	+	--bin-dir)
31	+	[ "$#" -ge 2 ] \|\| fail "--bin-dir requires a directory"
32	+	[ -n "$2" ] \|\| fail "--bin-dir cannot be empty"
33	+	BIN_DIR=$2
34	+	shift 2
35	+	;;
36	+	--uninstall)
37	+	[ "$ACTION" = install ] \|\| fail "--uninstall cannot be specified more than once"
38	+	ACTION=uninstall
39	+	shift
40	+	;;
41	+	-h\|--help)
42	+	usage
43	+	exit 0
44	+	;;
45	+	*)
46	+	fail "unknown option: $1 (use --help for usage)"
47	+	;;
48	+	esac
49	+	done
50	+
51	+	run_privileged() {
52	+	if [ "$(id -u)" -eq 0 ]; then
53	+	"$@"
54	+	elif command -v sudo >/dev/null 2>&1; then
55	+	sudo "$@"
56	+	else
57	+	fail "sudo is required to write to $BIN_DIR; install sudo or run this script as root"
58	+	fi
59	+	}
60	+
61	+	SCRIPT_DIR=$(CDPATH= cd "$(dirname "$0")" && pwd)
62	+	DESTINATION=$BIN_DIR/rmptui
63	+
64	+	if [ "$ACTION" = uninstall ]; then
65	+	if [ ! -e "$DESTINATION" ]; then
66	+	printf 'rmptui is not installed at %s\n' "$DESTINATION"
67	+	exit 0
68	+	fi
69	+	run_privileged rm -f "$DESTINATION"
70	+	printf 'Removed %s\n' "$DESTINATION"
71	+	exit 0
72	+	fi
73	+
74	+	if ! command -v cargo >/dev/null 2>&1; then
75	+	fail "Cargo was not found. Install Rust and Cargo from https://rustup.rs/ and try again."
76	+	fi
77	+
78	+	printf 'Building rmptui from %s\n' "$SCRIPT_DIR"
79	+	cargo build --release --locked --manifest-path "$SCRIPT_DIR/Cargo.toml"
80	+
81	+	EXECUTABLE=$SCRIPT_DIR/target/release/rmptui
82	+	[ -x "$EXECUTABLE" ] \|\| fail "build succeeded but executable was not found at $EXECUTABLE"
83	+
84	+	run_privileged install -d "$BIN_DIR"
85	+	run_privileged install -m 0755 "$EXECUTABLE" "$DESTINATION"
86	+	printf 'Installed rmptui to %s\n' "$DESTINATION"

		@@ -1,6 +1 @@
1		−	pub mod event;
2	1		pub mod handler;
3		−	pub mod search_keys;
4		−	pub mod pl_rename_keys;
5		−	pub mod pl_append_keys;
6		−	pub mod new_pl_keys;

		@@ -1,59 +1,231 @@
1		−	## rmptui - A MPD client in Rust
	1	+	# rmptui
	2	+
2	3		![LOC](https://tokei.rs/b1/github/krolyxon/rmptui?category=code)
3	4		![Release](https://img.shields.io/github/v/release/krolyxon/rmptui?color=%23c694ff)
4	5		[![GitHub Downloads](https://img.shields.io/github/downloads/krolyxon/rmptui/total.svg?label=GitHub%20downloads)](https://github.com/krolyxon/rmptui/releases)
5	6
6		−	rmptui is a minimal tui mpd client made with rust.
7		−
8		−	## rmptui in action
9		−	![](https://raw.githubusercontent.com/krolyxon/rmptui/master/assets/ss.png)
10		−
11		−	### Keys
12		−	\| Key \| Action \|
13		−	\| --- \| --- \|
14		−	\| `q`/`Ctr+C` \| Quit \|
15		−	\| `p` \| Toggle pause \|
16		−	\| `+`/`=` \| Increase volume \|
17		−	\| `-` \| Decrease volume \|
18		−	\| `m` \| Toggle Mute \|
19		−	\| `D` \| Get dmenu prompt \|
20		−	\| `j`/`Down` \| Scroll down \|
21		−	\| `k`/`Up` \| Scroll up \|
22		−	\| `J` \| Swap highlighted song with next one \|
23		−	\| `K` \| Swap highlighted song with previous one \|
24		−	\| `l`/`Right` \| Add song to playlist or go inside the directory \|
25		−	\| `h`/`Left` \| Go back to previous directory \|
26		−	\| `Tab` \| Cycle through tabs \|
27		−	\| `1` \| Go to queue \|
28		−	\| `2` \| Go to directory browser \|
29		−	\| `3` \| Go to playlists view \|
30		−	\| `Enter`/`l`/`Right` \| Add song/playlist to current playlist \|
31		−	\| `a` \| Append the song to current playing queue \|
32		−	\| `Space` \| Delete the highlighted song from queue \|
33		−	\| `f` \| Go forwards \|
34		−	\| `b` \| Go backwards \|
35		−	\| `>` \| Play next song from queue \|
36		−	\| `<` \| Play previous song from queue \|
37		−	\| `U` \| Update the MPD database \|
38		−	\| `r` \| Toggle repeat \|
39		−	\| `z` \| Toggle random \|
40		−	\| `/` \| Search \|
41		−	\| `R` \| Rename Playlist \|
42		−	\| `g` \| Go to top of list \|
43		−	\| `G` \| Go to bottom of list \|
44		−
45		−	### Prerequisites
46		−	- [MPD](https://wiki.archlinux.org/title/Music_Player_Daemon) installed and configured.
47		−	- [dmenu](https://tools.suckless.org/dmenu/) (optional)
48		−
49		−	### TODO
50		−	- [x] fix performance issues
51		−	- [x] improvements on queue control
52		−	- [x] add to playlists
53		−	- [x] search for songs
54		−	- [x] Human readable time format
55		−	- [x] metadata based tree view
56		−	- [x] view playlist
57		−	- [x] change playlist name
58		−	- [x] add to new playlist
59		−	- [ ] add lyrics fetcher
	7	+	A fast, keyboard-driven MPD client for your terminal.
	8	+
	9	+	rmptui is a lightweight music player interface for [Music Player Daemon
	10	+	(MPD)](https://www.musicpd.org/). Browse your library, manage the play queue,
	11	+	work with playlists, and control playback without leaving the terminal.
	12	+
	13	+	![rmptui screenshot](https://raw.githubusercontent.com/krolyxon/rmptui/master/assets/ss.png)
	14	+
	15	+	## Highlights
	16	+
	17	+	- Three focused views: browse your music library, control the current queue,
	18	+	and inspect saved playlists.
	19	+	- Metadata at a glance: see artist, track, title, album, and duration in
	20	+	the browser and queue.
	21	+	- Fuzzy, repeatable search: search the current view with `/`; in the song
	22	+	browser, keep the query and cycle matching folders and songs with `n` and
	23	+	`N`.
	24	+	- Playlist tools: load playlists, add selected tracks or folders to a
	25	+	playlist, create playlists, and rename them.
	26	+	- Queue control: play, remove, reorder, and append tracks.
	27	+	- Responsive MPD updates: the client uses MPD's asynchronous `idle`
	28	+	notifications instead of regularly polling the server.
	29	+	- Direct MPD connection: speaks MPD's standard text protocol over
	30	+	asynchronous TCP; no `mpd` crate or WebSocket proxy is required.
	31	+
	32	+	## Requirements
	33	+
	34	+	- A running MPD server with its music library configured.
	35	+	- Rust and Cargo to build from source.
	36	+
	37	+	## Install
	38	+
	39	+	From a local checkout, run the installer to build the release executable and
	40	+	copy it to `/usr/local/bin/rmptui`:
	41	+
	42	+	```sh
	43	+	./install.sh
	44	+	```
	45	+
	46	+	The script uses `sudo` for the system-directory operations when needed. It
	47	+	requires Rust and Cargo to build from source. To use a different binary
	48	+	directory or uninstall rmptui:
	49	+
	50	+	```sh
	51	+	./install.sh --bin-dir "$HOME/.local/bin"
	52	+	./install.sh --uninstall
	53	+	```
	54	+
	55	+	Uninstall from a custom directory with
	56	+	`./install.sh --uninstall --bin-dir "$HOME/.local/bin"`. Run
	57	+	`./install.sh --help` for usage.
	58	+
	59	+	## Build from source
	60	+
	61	+	```sh
	62	+	git clone https://github.com/krolyxon/rmptui.git
	63	+	cd rmptui
	64	+	cargo run --release
	65	+	```
	66	+
	67	+	To build and run without installing, use `cargo run --release`.
	68	+
	69	+	On first launch, rmptui creates a default configuration file at
	70	+	`$CONFIG_HOME/rmptui/config.toml`. If `CONFIG_HOME` is not set, it uses
	71	+	`$XDG_CONFIG_HOME/rmptui/config.toml`, then `~/.config/rmptui/config.toml`.
	72	+	Edit the file and restart rmptui to apply changes:
	73	+
	74	+	```toml
	75	+	[mpd]
	76	+	host = "127.0.0.1"
	77	+	port = 6600
	78	+	password = "" # Set this only if your MPD server requires a password.
	79	+
	80	+	[playback]
	81	+	seek_seconds = 2
	82	+	volume_step = 2
	83	+
	84	+	[keybindings]
	85	+	quit = ["q", "Ctrl+c"]
	86	+	clear_queue = ["c", "C"]
	87	+	toggle_pause = ["p"]
	88	+	pause = ["s"]
	89	+	toggle_repeat = ["r"]
	90	+	toggle_random = ["z"]
	91	+	open_playlist_menu = ["a"]
	92	+	seek_forward = ["f"]
	93	+	seek_backward = ["b"]
	94	+	cycle_tabs = ["Tab"]
	95	+	select_queue = ["1"]
	96	+	select_browser = ["2"]
	97	+	select_playlists = ["3"]
	98	+	next_track = [">"]
	99	+	previous_track = ["<"]
	100	+	volume_up = ["=", "+"]
	101	+	volume_down = ["-"]
	102	+	toggle_mute = ["m"]
	103	+	update_database = ["U"]
	104	+	search = ["/"]
	105	+	toggle_selected_item = ["Space"]
	106	+	search_next = ["n"]
	107	+	search_previous = ["N"]
	108	+	move_down = ["j", "Down"]
	109	+	move_up = ["k", "Up"]
	110	+	activate = ["Enter", "l", "Right"]
	111	+	go_back = ["h", "Left"]
	112	+	go_to_top = ["g"]
	113	+	go_to_bottom = ["G"]
	114	+	queue_delete = ["d"]
	115	+	queue_move_down = ["J"]
	116	+	queue_move_up = ["K"]
	117	+	playlist_rename = ["R"]
	118	+	playlist_focus_contents = ["Right", "l"]
	119	+	playlist_focus_list = ["Left", "h"]
	120	+	playlist_delete_song = ["d"]
	121	+	playlist_move_song_down = ["J"]
	122	+	playlist_move_song_up = ["K"]
	123	+	playlist_delete = ["D"]
	124	+	playlist_load = ["Space", "Enter"]
	125	+	popup_close = ["q", "Esc"]
	126	+	popup_select = ["Enter"]
	127	+	input_cancel = ["Esc"]
	128	+	input_backspace = ["Backspace"]
	129	+	input_cursor_left = ["Left"]
	130	+	input_cursor_right = ["Right"]
	131	+	input_submit = ["Enter"]
	132	+	```
	133	+
	134	+	Every listed action is configurable in `[keybindings]`; each value is an array
	135	+	so actions can have multiple aliases. Remove an alias or set an action to `[]`
	136	+	to disable it. A key can be a single character or a named key such as `Enter`,
	137	+	`Esc`, `Tab`, `Space`, `Up`, `Down`, `Left`, `Right`, or `Backspace`. Add
	138	+	modifiers with `Ctrl+`, `Alt+`, or `Shift+`, for example `Ctrl+x` or
	139	+	`Alt+Enter`. Bindings are matched in the current UI context, so avoid assigning
	140	+	the same key to different actions that can be active in the same context.
	141	+	Characters typed into search and playlist-name fields remain text unless
	142	+	configured as an input action.
	143	+
	144	+	`playback.seek_seconds` sets the `seek_forward`/`seek_backward` distance, and
	145	+	`playback.volume_step` sets the `volume_up`/`volume_down` amount. Supported
	146	+	audio formats remain built in. The config stores an MPD password as plain text;
	147	+	newly created config files are restricted to the current user.
	148	+
	149	+	The MPD connection settings can also be overridden with environment variables:
	150	+
	151	+	\| Variable \| Default \| Description \|
	152	+	\| --- \| --- \| --- \|
	153	+	\| `MPD_HOST` \| Config file \| MPD hostname or address. Use `password@host` to set both host and password. \|
	154	+	\| `MPD_PORT` \| Config file \| MPD port; an explicit port in `MPD_HOST` takes precedence. \|
	155	+
	156	+	For example:
	157	+
	158	+	```sh
	159	+	MPD_HOST=192.168.1.20 MPD_PORT=6600 ./target/release/rmptui
	160	+	```
	161	+
	162	+	Or, for a password-protected local server:
	163	+
	164	+	```sh
	165	+	MPD_HOST='secret@localhost' ./target/release/rmptui
	166	+	```
	167	+
	168	+	## Controls
	169	+
	170	+	The keys below are the defaults; edit the `[keybindings]` table above to change
	171	+	them.
	172	+
	173	+	### Navigation
	174	+
	175	+	\| Key \| Action \|
	176	+	\| --- \| --- \|
	177	+	\| `Tab` \| Cycle between Queue, Browser, and Playlists \|
	178	+	\| `1` / `2` / `3` \| Open Queue / Browser / Playlists \|
	179	+	\| `j` / `Down` \| Move selection down \|
	180	+	\| `k` / `Up` \| Move selection up \|
	181	+	\| `g` / `G` \| Jump to the top / bottom of the current list \|
	182	+	\| `Enter` / `l` / `Right` \| Activate the selected item \|
	183	+	\| `h` / `Left` \| Go to the parent directory in the browser \|
	184	+	\| `q` / `Ctrl+C` \| Quit \|
	185	+
	186	+	### Search
	187	+
	188	+	1. Press `/` and type a query.
	189	+	2. In the browser, press `Enter` to keep the query and return to the list.
	190	+	3. Press `n` for the next fuzzy match or `N` for the previous match. Results
	191	+	wrap around when you reach either end.
	192	+	4. Press `/` to start a new search, or `Esc` to cancel search input.
	193	+
	194	+	Search matches the names shown in the current view. Browser search includes
	195	+	both folders and songs.
	196	+
	197	+	### Playback and queue
	198	+
	199	+	\| Key \| Action \|
	200	+	\| --- \| --- \|
	201	+	\| `p` \| Toggle play/pause \|
	202	+	\| `s` \| Pause \|
	203	+	\| `>` / `<` \| Play next / previous track \|
	204	+	\| `f` / `b` \| Seek forward / backward by two seconds \|
	205	+	\| `+` / `=` / `-` \| Increase / decrease volume \|
	206	+	\| `m` \| Toggle mute \|
	207	+	\| `r` / `z` \| Toggle repeat / random \|
	208	+	\| `d` \| Remove the selected queue item \|
	209	+	\| `Space` \| Remove a queue item; toggle a browser song in the queue \|
	210	+	\| `J` / `K` \| Move the selected queue item down / up \|
	211	+	\| `c` \| Clear the queue \|
	212	+	\| `a` \| Open the add-to-playlist menu \|
	213	+	\| `U` \| Rescan the MPD music database \|
	214	+
	215	+	### Playlists
	216	+
	217	+	The Playlists view has a playlist pane and a contents pane. Select a playlist
	218	+	with `j`/`k` and press `Space` or `Enter` to load it into the queue and start
	219	+	playback. Press `Right` or `l` to focus its songs and `Left` or `h` to return
	220	+	to the playlist pane. In the contents pane, `j`/`k` selects a song, `Enter`
	221	+	plays it, `d` removes it from the saved playlist, and `J`/`K` moves it
	222	+	down/up. `D` deletes the selected saved playlist. `R` renames a playlist.
	223	+
	224	+	Press `a` to open the add-to-playlist menu; choose Current Playlist, **New
	225	+	Playlist**, or a saved playlist. When creating a playlist, type its name and
	226	+	press `Enter` to save. Playlist contents update after each edit.
	227	+
	228	+	## License
	229	+
	230	+	rmptui is distributed under the
	231	+	[GNU Affero General Public License v3.0](LICENSE).

		@@ -1,137 +1,114 @@
1	1		use std::path::Path;
2	2
3		−	use mpd::Song;
	3	+	use crate::{
	4	+	connection::{Connection, Song},
	5	+	utils::is_audio_file,
	6	+	AppResult,
	7	+	};
4	8
5		−	use crate::{app::AppResult, connection::Connection, utils::FileExtension};
6		−
7		−	#[derive(Debug)]
8		−	/// struct for working with directory browser tab in rmptui
	9	+	#[derive(Debug, Default)]
9	10		pub struct FileBrowser {
10		−	pub filetree: Vec<(String, String)>,
	11	+	pub entries: Vec<BrowserEntry>,
11	12		pub selected: usize,
12	13		pub prev_selected: usize,
13	14		pub path: String,
14		−	pub prev_path: String,
15		−	pub songs: Vec<Song>,
	15	+	}
	16	+
	17	+	#[derive(Clone, Debug, PartialEq, Eq)]
	18	+	pub enum BrowserEntry {
	19	+	Directory(String),
	20	+	Song(Song),
	21	+	}
	22	+
	23	+	impl BrowserEntry {
	24	+	pub fn name(&self) -> &str {
	25	+	match self {
	26	+	Self::Directory(name) => name,
	27	+	Self::Song(song) => Path::new(&song.file)
	28	+	.file_name()
	29	+	.and_then(\|name\| name.to_str())
	30	+	.unwrap_or(&song.file),
	31	+	}
	32	+	}
16	33		}
17	34
18	35		impl FileBrowser {
19		−	pub fn new() -> FileBrowser {
20		−	FileBrowser {
21		−	filetree: Vec::new(),
22		−	selected: 0,
23		−	prev_selected: 0,
	36	+	pub fn new() -> Self {
	37	+	Self {
24	38		path: ".".to_string(),
25		−	prev_path: ".".to_string(),
26		−	songs: vec![],
	39	+	..Self::default()
27	40		}
28	41		}
29	42
30		−	pub fn update_directory(&mut self, conn: &mut Connection) -> AppResult<()> {
31		−	self.filetree.clear();
32		−	let mut file_vec: Vec<(String, String)> = vec![];
33		−	let mut dir_vec: Vec<(String, String)> = vec![];
34		−	for (t, f) in conn.conn.listfiles(self.path.as_str())?.into_iter() {
35		−	if t == "directory" && !f.starts_with('.') {
36		−	dir_vec.push((t, f));
37		−	} else if t == "file"
38		−	&& Path::new(&f).has_extension(&[
39		−	"mp3", "ogg", "flac", "m4a", "wav", "aac", "opus", "ape", "wma", "mpc", "aiff",
40		−	"dff", "mp2", "mka",
41		−	])
	43	+	pub async fn update_directory(&mut self, conn: &mut Connection) -> AppResult<()> {
	44	+	let query_path = self.path.trim_start_matches("./").trim_matches('/');
	45	+	let (directories, songs) = conn.client.ls_info(query_path).await?;
	46	+	let mut entries = Vec::new();
	47	+	for directory in directories {
	48	+	if let Some(name) = Path::new(&directory)
	49	+	.file_name()
	50	+	.and_then(\|name\| name.to_str())
42	51		{
43		−	file_vec.push((t, f));
	52	+	if !name.starts_with('.') {
	53	+	entries.push(BrowserEntry::Directory(name.to_string()));
	54	+	}
44	55		}
45	56		}
46	57
47		−	// dir_vec.sort_by(\|a, b\| a.1.cmp(&b.1));
48		−	dir_vec.sort_by(\|a, b\| {
49		−	let num_a = a.1.parse::<u32>().unwrap_or(u32::MAX);
50		−	let num_b = b.1.parse::<u32>().unwrap_or(u32::MAX);
51		−	num_a
52		−	.cmp(&num_b)
53		−	.then_with(\|\| a.1.to_lowercase().cmp(&b.1.to_lowercase()))
54		−	});
55		−
56		−	file_vec.sort_by(\|a, b\| {
57		−	let num_a = a.1.parse::<u32>().unwrap_or(u32::MAX);
58		−	let num_b = b.1.parse::<u32>().unwrap_or(u32::MAX);
59		−	num_a
60		−	.cmp(&num_b)
61		−	.then_with(\|\| a.1.to_lowercase().cmp(&b.1.to_lowercase()))
62		−	});
63		−
64		−	dir_vec.extend(file_vec);
65		−	self.filetree = dir_vec;
66		−
67		−	// Add metadata
68		−	self.songs.clear();
69		−	for (t, song) in self.filetree.iter() {
70		−	if t == "file" {
71		−	let v = conn
72		−	.conn
73		−	.lsinfo(Song {
74		−	file: (self.path.clone() + "/" + song)
75		−	.strip_prefix("./")
76		−	.unwrap_or("")
77		−	.to_string(),
78		−	..Default::default()
79		−	})
80		−	.unwrap_or_else(\|_\| {
81		−	vec![Song {
82		−	file: "Not a song".to_string(),
83		−	..Default::default()
84		−	}]
85		−	});
86		−
87		−	self.songs.push(v.first().unwrap().clone());
88		−	} else {
89		−	let v = Song {
90		−	file: "".to_string(),
91		−	..Default::default()
92		−	};
93		−
94		−	self.songs.push(v);
	58	+	for song in songs {
	59	+	let Some(name) = Path::new(&song.file)
	60	+	.file_name()
	61	+	.and_then(\|name\| name.to_str())
	62	+	else {
	63	+	continue;
	64	+	};
	65	+	if is_audio_file(name) {
	66	+	entries.push(BrowserEntry::Song(song));
95	67		}
96	68		}
97	69
	70	+	entries.sort_by(\|a, b\| {
	71	+	let kind_order = \|entry: &BrowserEntry\| match entry {
	72	+	BrowserEntry::Directory(_) => 0,
	73	+	BrowserEntry::Song(_) => 1,
	74	+	};
	75	+	kind_order(a).cmp(&kind_order(b)).then_with(\|\| {
	76	+	let name_a = a.name();
	77	+	let name_b = b.name();
	78	+	let number_a = name_a.parse::<u32>().unwrap_or(u32::MAX);
	79	+	let number_b = name_b.parse::<u32>().unwrap_or(u32::MAX);
	80	+	number_a
	81	+	.cmp(&number_b)
	82	+	.then_with(\|\| name_a.to_lowercase().cmp(&name_b.to_lowercase()))
	83	+	})
	84	+	});
	85	+
	86	+	self.entries = entries;
	87	+	self.selected = self.selected.min(self.entries.len().saturating_sub(1));
98	88		Ok(())
99	89		}
100	90
101		−	// Go to next item in filetree
102	91		pub fn next(&mut self) {
103		−	if self.selected < self.filetree.len() - 1 {
	92	+	if self.selected < self.entries.len().saturating_sub(1) {
104	93		self.selected += 1;
105	94		}
106	95		}
107	96
108		−	/// Go to previous item in filetree
109	97		pub fn prev(&mut self) {
110		−	if self.selected != 0 {
111		−	self.selected -= 1;
112		−	}
	98	+	self.selected = self.selected.saturating_sub(1);
113	99		}
114	100
115		−	/// handles going back event
116		−	pub fn handle_go_back(&mut self, conn: &mut Connection) -> AppResult<()> {
117		−	if self.prev_path != "." {
118		−	let r = self.path.rfind('/');
119		−	if let Some(r) = r {
120		−	self.path = self.path.as_str()[..r].to_string();
121		−	self.update_directory(conn)?;
122		−	}
123		−	} else {
124		−	self.path.clone_from(&self.prev_path);
125		−	self.update_directory(conn)?;
	101	+	pub async fn handle_go_back(&mut self, conn: &mut Connection) -> AppResult<()> {
	102	+	if self.path != "." {
	103	+	self.path = Path::new(&self.path)
	104	+	.parent()
	105	+	.and_then(Path::to_str)
	106	+	.filter(\|path\| !path.is_empty())
	107	+	.unwrap_or(".")
	108	+	.to_string();
	109	+	self.update_directory(conn).await?;
126	110		}
127		−
128		−	self.selected = self.prev_selected;
	111	+	self.selected = self.prev_selected.min(self.entries.len().saturating_sub(1));
129	112		Ok(())
130	113		}
131	114		}
132		−
133		−	impl Default for FileBrowser {
134		−	fn default() -> Self {
135		−	Self::new()
136		−	}
137		−	}

	@@ -1,79 +0,0 @@
1	−	use crate::app::AppResult;
2	−	use crossterm::event::{self, Event as CrosstermEvent, KeyEvent, MouseEvent};
3	−	use std::sync::mpsc;
4	−	use std::thread;
5	−	use std::time::{Duration, Instant};
6	−
7	−	/// Terminal events.
8	−	#[derive(Clone, Copy, Debug)]
9	−	pub enum Event {
10	−	/// Terminal tick.
11	−	Tick,
12	−	/// Key press.
13	−	Key(KeyEvent),
14	−	/// Mouse click/scroll.
15	−	Mouse(MouseEvent),
16	−	/// Terminal resize.
17	−	Resize(u16, u16),
18	−	}
19	−
20	−	/// Terminal event handler.
21	−	#[allow(dead_code)]
22	−	#[derive(Debug)]
23	−	pub struct EventHandler {
24	−	/// Event sender channel.
25	−	sender: mpsc::Sender<Event>,
26	−	/// Event receiver channel.
27	−	receiver: mpsc::Receiver<Event>,
28	−	/// Event handler thread.
29	−	handler: thread::JoinHandle<()>,
30	−	}
31	−
32	−	impl EventHandler {
33	−	/// Constructs a new instance of [`EventHandler`].
34	−	pub fn new(tick_rate: u64) -> Self {
35	−	let tick_rate = Duration::from_millis(tick_rate);
36	−	let (sender, receiver) = mpsc::channel();
37	−	let handler = {
38	−	let sender = sender.clone();
39	−	thread::spawn(move \|\| {
40	−	let mut last_tick = Instant::now();
41	−	loop {
42	−	let timeout = tick_rate
43	−	.checked_sub(last_tick.elapsed())
44	−	.unwrap_or(tick_rate);
45	−
46	−	if event::poll(timeout).expect("failed to poll new events") {
47	−	match event::read().expect("unable to read event") {
48	−	CrosstermEvent::Key(e) => sender.send(Event::Key(e)),
49	−	CrosstermEvent::Mouse(e) => sender.send(Event::Mouse(e)),
50	−	CrosstermEvent::Resize(w, h) => sender.send(Event::Resize(w, h)),
51	−	CrosstermEvent::FocusGained => Ok(()),
52	−	CrosstermEvent::FocusLost => Ok(()),
53	−	CrosstermEvent::Paste(_) => unimplemented!(),
54	−	}
55	−	.expect("failed to send terminal event")
56	−	}
57	−
58	−	if last_tick.elapsed() >= tick_rate {
59	−	sender.send(Event::Tick).expect("failed to send tick event");
60	−	last_tick = Instant::now();
61	−	}
62	−	}
63	−	})
64	−	};
65	−	Self {
66	−	sender,
67	−	receiver,
68	−	handler,
69	−	}
70	−	}
71	−
72	−	/// Receive the next event from the handler thread.
73	−	///
74	−	/// This function will always block the current thread if
75	−	/// there is no data available and it's possible for more data to be sent.
76	−	pub fn next(&self) -> AppResult<Event> {
77	−	Ok(self.receiver.recv()?)
78	−	}
79	−	}

	@@ -1,47 +0,0 @@
1	−	use crate::{
2	−	app::{App, AppResult},
3	−	ui::InputMode,
4	−	};
5	−	use crossterm::event::{KeyCode, KeyEvent};
6	−
7	−	pub fn handle_new_pl_keys(key_event: KeyEvent, app: &mut App) -> AppResult<()> {
8	−	match key_event.code {
9	−	KeyCode::Esc => {
10	−	app.pl_new_pl_input.clear();
11	−	app.reset_cursor();
12	−	app.inputmode = InputMode::Normal;
13	−	}
14	−	KeyCode::Char(to_insert) => {
15	−	app.enter_char(to_insert);
16	−	}
17	−	KeyCode::Enter => {
18	−	let pl_name = &app.pl_new_pl_input;
19	−
20	−	for song in app.pl_new_pl_songs_buffer.iter() {
21	−	app.conn.conn.pl_push(pl_name, song)?;
22	−	}
23	−	app.pl_new_pl_input.clear();
24	−
25	−	app.pl_list.list = App::get_playlist(&mut app.conn.conn)?;
26	−	app.append_list = App::get_append_list(&mut app.conn.conn)?;
27	−
28	−	app.reset_cursor();
29	−	app.inputmode = InputMode::Normal;
30	−	}
31	−
32	−	KeyCode::Backspace => {
33	−	app.delete_char();
34	−	}
35	−
36	−	KeyCode::Left => {
37	−	app.move_cursor_left();
38	−	}
39	−
40	−	KeyCode::Right => {
41	−	app.move_cursor_right();
42	−	}
43	−
44	−	_ => {}
45	−	}
46	−	Ok(())
47	−	}

	@@ -1,115 +0,0 @@
1	−	use crate::app::{App, AppResult, SelectedTab};
2	−	use crate::ui::InputMode;
3	−	use crate::utils::FileExtension;
4	−	use crossterm::event::{KeyCode, KeyEvent};
5	−	use std::path::Path;
6	−
7	−	pub fn hande_pl_append_keys(key_event: KeyEvent, app: &mut App) -> AppResult<()> {
8	−	match key_event.code {
9	−	KeyCode::Char('q') \| KeyCode::Esc => {
10	−	app.playlist_popup = false;
11	−	}
12	−
13	−	KeyCode::Char('j') \| KeyCode::Down => app.append_list.next(),
14	−	KeyCode::Char('k') \| KeyCode::Up => app.append_list.prev(),
15	−
16	−	KeyCode::Enter => {
17	−	// name of highlighted playlist in append list
18	−	let pl_name = &app.append_list.get_item_at_current_index();
19	−
20	−	match app.selected_tab {
21	−	SelectedTab::Queue => {
22	−	// Just exit out the menu if no item is selected in the Queue
23	−	if app.queue_list.list.is_empty() {
24	−	app.playlist_popup = false;
25	−	return Ok(());
26	−	}
27	−
28	−	if let Ok(songs) = app.conn.conn.songs(app.queue_list.index as u32) {
29	−	let option_song = songs.first();
30	−	if let Some(song) = option_song {
31	−	if *pl_name == "Current Playlist" {
32	−	app.conn.conn.push(song)?;
33	−	app.update_queue();
34	−	} else if *pl_name == "New Playlist" {
35	−	app.pl_new_pl_songs_buffer.clear();
36	−	app.pl_new_pl_songs_buffer.push(song.clone());
37	−	app.inputmode = InputMode::NewPlaylist;
38	−	} else {
39	−	app.conn.add_to_playlist(pl_name, song)?;
40	−	}
41	−	}
42	−	}
43	−	}
44	−
45	−	SelectedTab::DirectoryBrowser => {
46	−	let (t, f) = app.browser.filetree.get(app.browser.selected).unwrap();
47	−	if t == "file" {
48	−	let short_path = f;
49	−	if let Some(full_path) = app.conn.get_full_path(short_path) {
50	−	let song = app.conn.get_song_with_only_filename(full_path);
51	−
52	−	if *pl_name == "Current Playlist" {
53	−	app.conn.conn.push(&song)?;
54	−	app.update_queue();
55	−	} else if *pl_name == "New Playlist" {
56	−	app.pl_new_pl_songs_buffer.clear();
57	−	app.pl_new_pl_songs_buffer.push(song.clone());
58	−	app.inputmode = InputMode::NewPlaylist;
59	−	} else {
60	−	app.conn.add_to_playlist(pl_name, &song)?;
61	−	}
62	−	}
63	−	} else if t == "directory" {
64	−	let file = format!("{}/{}", app.browser.path, f);
65	−	app.pl_new_pl_songs_buffer.clear();
66	−	for (t, f) in app.conn.conn.listfiles(&file)?.iter() {
67	−	// dir_vec.push((t, f));
68	−	if t == "file"
69	−	&& Path::new(&f).has_extension(&[
70	−	"mp3", "ogg", "flac", "m4a", "wav", "aac", "opus", "ape",
71	−	"wma", "mpc", "aiff", "dff", "mp2", "mka",
72	−	])
73	−	{
74	−	let full_path = app.conn.get_full_path(f).unwrap_or_default();
75	−	let song = app.conn.get_song_with_only_filename(full_path);
76	−	if *pl_name == "Current Playlist" {
77	−	app.conn.conn.push(&song)?;
78	−	} else if *pl_name == "New Playlist" {
79	−	app.pl_new_pl_songs_buffer.push(song.clone());
80	−	app.inputmode = InputMode::NewPlaylist;
81	−	} else {
82	−	app.conn.add_to_playlist(pl_name, &song)?;
83	−	}
84	−	}
85	−	}
86	−	}
87	−	}
88	−
89	−	SelectedTab::Playlists => {
90	−	let playlist_name = app.pl_list.get_item_at_current_index();
91	−	if *pl_name == "Current Playlist" {
92	−	app.conn.load_playlist(playlist_name)?;
93	−	app.update_queue();
94	−	} else if *pl_name == "New Playlist" {
95	−	app.inputmode = InputMode::NewPlaylist;
96	−	} else {
97	−	let songs = app.conn.conn.playlist(playlist_name)?;
98	−	for song in songs {
99	−	// We ignore the Err() since there could be songs in playlists, which do not exist in the db anymore.
100	−	// So instead of panicking, we just ignore if the song does not exists
101	−	app.conn.add_to_playlist(pl_name, &song).unwrap_or(());
102	−	}
103	−	}
104	−	}
105	−	}
106	−
107	−	// hide the playlist popup
108	−	app.playlist_popup = false;
109	−	app.append_list.index = 0;
110	−	}
111	−	_ => {}
112	−	}
113	−
114	−	Ok(())
115	−	}

	@@ -1,43 +0,0 @@
1	−	use crate::{
2	−	app::{App, AppResult},
3	−	ui::InputMode,
4	−	};
5	−	use crossterm::event::{KeyCode, KeyEvent};
6	−
7	−	pub fn handle_pl_rename_keys(key_event: KeyEvent, app: &mut App) -> AppResult<()> {
8	−	match key_event.code {
9	−	KeyCode::Esc => {
10	−	app.pl_newname_input.clear();
11	−	app.reset_cursor();
12	−	app.inputmode = InputMode::Normal;
13	−	}
14	−	KeyCode::Char(to_insert) => {
15	−	app.enter_char(to_insert);
16	−	}
17	−	KeyCode::Enter => {
18	−	app.conn.conn.pl_rename(
19	−	app.pl_list.get_item_at_current_index(),
20	−	&app.pl_newname_input,
21	−	)?;
22	−	app.pl_list.list = App::get_playlist(&mut app.conn.conn)?;
23	−	app.pl_newname_input.clear();
24	−	app.reset_cursor();
25	−	app.inputmode = InputMode::Normal;
26	−	}
27	−
28	−	KeyCode::Backspace => {
29	−	app.delete_char();
30	−	}
31	−
32	−	KeyCode::Left => {
33	−	app.move_cursor_left();
34	−	}
35	−
36	−	KeyCode::Right => {
37	−	app.move_cursor_right();
38	−	}
39	−
40	−	_ => {}
41	−	}
42	−	Ok(())
43	−	}

	@@ -1,110 +0,0 @@
1	−	use crate::{
2	−	app::{App, AppResult, SelectedTab},
3	−	ui::InputMode,
4	−	};
5	−	use crossterm::event::{KeyCode, KeyEvent};
6	−	use rust_fuzzy_search::{self, fuzzy_search_sorted};
7	−
8	−	pub fn handle_search_keys(key_event: KeyEvent, app: &mut App) -> AppResult<()> {
9	−	match app.selected_tab {
10	−	SelectedTab::DirectoryBrowser => {
11	−	let list: Vec<&str> = app
12	−	.browser
13	−	.filetree
14	−	.iter()
15	−	.map(\|(_, f)\| f.as_str())
16	−	.collect::<Vec<&str>>();
17	−
18	−	let res: Vec<(&str, f32)> = fuzzy_search_sorted(&app.search_input, &list);
19	−	let res = res.iter().map(\|(x, _)\| *x).collect::<Vec<&str>>();
20	−
21	−	for (i, (_, item)) in app.browser.filetree.iter().enumerate() {
22	−	if item.contains(res.first().unwrap()) {
23	−	app.browser.selected = i;
24	−	}
25	−	}
26	−	}
27	−
28	−	SelectedTab::Queue => {
29	−	let list: Vec<&str> = app
30	−	.queue_list
31	−	.list
32	−	.iter()
33	−	.map(\|f\| f.file.as_str())
34	−	.collect::<Vec<&str>>();
35	−	let res: Vec<(&str, f32)> = fuzzy_search_sorted(&app.search_input, &list);
36	−	let res = res.iter().map(\|(x, _)\| *x).collect::<Vec<&str>>();
37	−
38	−	for (i, item) in app.queue_list.list.iter().enumerate() {
39	−	if item.file.contains(res.first().unwrap()) {
40	−	app.queue_list.index = i;
41	−	}
42	−	}
43	−	}
44	−
45	−	SelectedTab::Playlists => {
46	−	let list: Vec<&str> = app
47	−	.pl_list
48	−	.list
49	−	.iter()
50	−	.map(\|f\| f.as_str())
51	−	.collect::<Vec<&str>>();
52	−	let res: Vec<(&str, f32)> = fuzzy_search_sorted(&app.search_input, &list);
53	−	let res = res.iter().map(\|(x, _)\| *x).collect::<Vec<&str>>();
54	−
55	−	for (i, item) in app.pl_list.list.iter().enumerate() {
56	−	if item.contains(res.first().unwrap()) {
57	−	app.pl_list.index = i;
58	−	}
59	−	}
60	−	}
61	−	}
62	−
63	−	// Keybind for searching
64	−	//
65	−	// Keybinds for when the search prompt is visible
66	−	match key_event.code {
67	−	KeyCode::Esc => {
68	−	app.inputmode = InputMode::Normal;
69	−	}
70	−	KeyCode::Char(to_insert) => {
71	−	app.enter_char(to_insert);
72	−	}
73	−	KeyCode::Enter => {
74	−	let list: Vec<&str> = app
75	−	.browser
76	−	.filetree
77	−	.iter()
78	−	.map(\|(_, f)\| f.as_str())
79	−	.collect::<Vec<&str>>();
80	−
81	−	let res: Vec<(&str, f32)> = fuzzy_search_sorted(&app.search_input, &list);
82	−	let (res, _) = res.first().unwrap();
83	−
84	−	for (i, (_, item)) in app.browser.filetree.iter().enumerate() {
85	−	if item.contains(res) {
86	−	app.browser.selected = i;
87	−	}
88	−	}
89	−
90	−	app.search_input.clear();
91	−	app.reset_cursor();
92	−	app.inputmode = InputMode::Normal;
93	−	}
94	−
95	−	KeyCode::Backspace => {
96	−	app.delete_char();
97	−	}
98	−
99	−	KeyCode::Left => {
100	−	app.move_cursor_left();
101	−	}
102	−
103	−	KeyCode::Right => {
104	−	app.move_cursor_right();
105	−	}
106	−
107	−	_ => {}
108	−	}
109	−	Ok(())
110	−	}

		@@ -1,23 +1,14 @@
1		−	/// Handle mpd connection
2		−	pub mod connection;
3		−
4		−	/// Widget renderer
5		−	pub mod ui;
6		−
7		−	/// Terminal user Interface
8		−	pub mod tui;
	1	+	//! An asynchronous terminal client for Music Player Daemon.
9	2
10		−	/// Content list
11		−	pub mod list;
12		−
13		−	/// File Browser
	3	+	pub mod app;
14	4		pub mod browser;
15		−
16		−	/// Event Handler/ keymaps
	5	+	pub mod config;
	6	+	pub mod connection;
17	7		pub mod event_handler;
18		−
19		−	/// Application
20		−	pub mod app;
21		−
22		−	/// Utilities
	8	+	pub mod list;
	9	+	pub mod tui;
	10	+	pub mod ui;
23	11		pub mod utils;
	12	+
	13	+	/// The application's error type.
	14	+	pub type AppResult<T> = Result<T, Box<dyn std::error::Error + Send + Sync>>;

		@@ -6,34 +6,20 @@ pub struct ContentList<T> {
6	6
7	7		impl<T> ContentList<T> {
8	8		pub fn new() -> Self {
9		−	ContentList {
	9	+	Self {
10	10		list: Vec::new(),
11	11		index: 0,
12	12		}
13	13		}
14	14
15		−	// Go to next item in list
16	15		pub fn next(&mut self) {
17		−	let len = self.list.len();
18		−	if len != 0 && self.index < len - 1 {
19		−	self.index += 1;
	16	+	if let Some(last) = self.list.len().checked_sub(1) {
	17	+	self.index = self.index.saturating_add(1).min(last);
20	18		}
21	19		}
22	20
23		−	/// Go to previous item in list
24	21		pub fn prev(&mut self) {
25		−	if self.index != 0 {
26		−	self.index -= 1;
27		−	}
28		−	}
29		−
30		−	pub fn reset_index(&mut self) {
31		−	self.index = 0;
32		−	}
33		−
34		−	/// Returns the self.list[self.index] item
35		−	pub fn get_item_at_current_index(&mut self) -> &T {
36		−	self.list.get(self.index).unwrap()
	22	+	self.index = self.index.saturating_sub(1);
37	23		}
38	24		}
39	25

		@@ -1,44 +1,167 @@
	1	+	use std::{env, io, net::Ipv6Addr, str::FromStr, time::Duration};
	2	+
	3	+	use crossterm::event::{Event as CrosstermEvent, EventStream, KeyEventKind};
	4	+	use futures_util::StreamExt;
1	5		use ratatui::prelude::*;
2		−	use rmptui::app::App;
3		−	use rmptui::app::AppResult;
4		−	use rmptui::event_handler::event::Event;
5		−	use rmptui::event_handler::event::EventHandler;
6		−	use rmptui::event_handler::handler;
7		−	use rmptui::tui;
8		−	use std::env;
9		−	use std::io;
10		−
11		−	fn main() -> AppResult<()> {
12		−	// Connection
13		−	let env_host = env::var("MPD_HOST").unwrap_or_else(\|_\| "127.0.0.1".to_string());
14		−	let env_port = env::var("MPD_PORT").unwrap_or_else(\|_\| "6600".to_string());
15		−	let url = format!("{}:{}", env_host, env_port);
16		−	let mut app = App::builder(&url)?;
17		−
18		−	// UI
	6	+	use rmptui::{
	7	+	app::App,
	8	+	config::Config,
	9	+	connection::{MpdClient, MpdSnapshot},
	10	+	event_handler::handler,
	11	+	tui, AppResult,
	12	+	};
	13	+	use tokio::{sync::mpsc, time};
	14	+
	15	+	#[tokio::main]
	16	+	async fn main() -> AppResult<()> {
	17	+	let (config, config_path) = Config::load_or_create()?;
	18	+	eprintln!("Using configuration: {}", config_path.display());
	19	+
	20	+	let configured_host = env::var("MPD_HOST").unwrap_or_else(\|_\| config.mpd.host.clone());
	21	+	let (host, password) = configured_host
	22	+	.split_once('@')
	23	+	.map(\|(password, host)\| (host, Some(password.to_string())))
	24	+	.unwrap_or_else(\|\| {
	25	+	(
	26	+	configured_host.as_str(),
	27	+	(!config.mpd.password.is_empty()).then(\|\| config.mpd.password.clone()),
	28	+	)
	29	+	});
	30	+	if host.is_empty() {
	31	+	return Err(io::Error::new(io::ErrorKind::InvalidInput, "MPD host cannot be empty").into());
	32	+	}
	33	+	let port = env::var("MPD_PORT")
	34	+	.map(\|port\| {
	35	+	port.parse::<u16>().map_err(\|error\| {
	36	+	io::Error::new(
	37	+	std::io::ErrorKind::InvalidInput,
	38	+	format!("invalid MPD_PORT value `{port}`: {error}"),
	39	+	)
	40	+	})
	41	+	})
	42	+	.unwrap_or(Ok(config.mpd.port))?;
	43	+	if port == 0 {
	44	+	return Err(io::Error::new(
	45	+	std::io::ErrorKind::InvalidInput,
	46	+	"MPD port must be between 1 and 65535",
	47	+	)
	48	+	.into());
	49	+	}
	50	+	let address = mpd_address(host, port);
	51	+	let mut app = App::new(&address, password.as_deref(), config).await?;
	52	+
19	53		let backend = CrosstermBackend::new(io::stderr());
20	54		let terminal = Terminal::new(backend)?;
21		−	let events = EventHandler::new(1000);
22		−	let mut tui = tui::Tui::new(terminal, events);
	55	+	let mut tui = tui::Tui::new(terminal);
23	56		tui.init()?;
24	57
25		−	// initial directory read
26		−	app.browser.update_directory(&mut app.conn)?;
	58	+	let (updates_tx, mut updates_rx) = mpsc::channel(16);
	59	+	let watcher_address = address.clone();
	60	+	let watcher_password = password.clone();
	61	+	let watcher =
	62	+	tokio::spawn(async move { watch_mpd(watcher_address, watcher_password, updates_tx).await });
	63	+	let mut terminal_events = EventStream::new();
	64	+	let mut redraw = time::interval(Duration::from_millis(50));
	65	+	redraw.set_missed_tick_behavior(time::MissedTickBehavior::Skip);
27	66
28		−	// initially set the queue's highlighted item to the current playing item
29		−	if let Ok(item) = app.conn.conn.currentsong() {
30		−	app.queue_list.index = item.unwrap_or_default().place.unwrap_or_default().pos as usize;
	67	+	let run_result: AppResult<()> = async {
	68	+	while app.running {
	69	+	tui.draw(&mut app)?;
	70	+	tokio::select! {
	71	+	event = terminal_events.next() => {
	72	+	match event {
	73	+	Some(Ok(CrosstermEvent::Key(key)))
	74	+	if key.kind != KeyEventKind::Release =>
	75	+	{
	76	+	handler::handle_key_events(key, &mut app).await?;
	77	+	}
	78	+	Some(Ok(CrosstermEvent::Key(_))) => {}
	79	+	Some(Ok(CrosstermEvent::Mouse(mouse))) => {
	80	+	handler::handle_mouse_events(mouse, &mut app).await?;
	81	+	}
	82	+	Some(Ok(CrosstermEvent::Resize(_, _)))
	83	+	\| Some(Ok(CrosstermEvent::FocusGained))
	84	+	\| Some(Ok(CrosstermEvent::FocusLost))
	85	+	\| Some(Ok(CrosstermEvent::Paste(_))) => {}
	86	+	Some(Err(error)) => {
	87	+	return Err(Box::new(error) as Box<dyn std::error::Error + Send + Sync>);
	88	+	}
	89	+	None => {
	90	+	return Err(std::io::Error::other("terminal event stream ended").into());
	91	+	}
	92	+	}
	93	+	}
	94	+	_ = redraw.tick() => {}
	95	+	snapshot = updates_rx.recv() => {
	96	+	match snapshot {
	97	+	Some(snapshot) => app.apply_snapshot(snapshot).await?,
	98	+	None => {
	99	+	return Err(std::io::Error::other(
	100	+	"MPD change watcher stopped unexpectedly",
	101	+	)
	102	+	.into());
	103	+	}
	104	+	}
	105	+	}
	106	+	}
	107	+	}
	108	+	Ok(())
31	109		}
	110	+	.await;
32	111
33		−	while app.running {
34		−	tui.draw(&mut app)?;
35		−	match tui.events.next()? {
36		−	Event::Tick => app.tick()?,
37		−	Event::Key(key_event) => handler::handle_key_events(key_event, &mut app)?,
38		−	Event::Mouse(mouse_event) => handler::handle_mouse_events(mouse_event, &mut app)?,
39		−	Event::Resize(_, _) => {}
	112	+	watcher.abort();
	113	+	let exit_result = tui.exit();
	114	+	run_result?;
	115	+	exit_result?;
	116	+	Ok(())
	117	+	}
	118	+
	119	+	async fn watch_mpd(
	120	+	address: String,
	121	+	password: Option<String>,
	122	+	updates: mpsc::Sender<MpdSnapshot>,
	123	+	) -> AppResult<()> {
	124	+	let mut client = MpdClient::connect(&address, password.as_deref()).await?;
	125	+	loop {
	126	+	client.idle().await?;
	127	+	let snapshot = client.snapshot().await?;
	128	+	if updates.send(snapshot).await.is_err() {
	129	+	return Ok(());
40	130		}
41	131		}
	132	+	}
42	133
43		−	Ok(())
	134	+	fn mpd_address(host: &str, port: u16) -> String {
	135	+	if host.starts_with('[') && host.contains("]:") {
	136	+	host.to_string()
	137	+	} else if let Some(ipv6) = host
	138	+	.strip_prefix('[')
	139	+	.and_then(\|host\| host.strip_suffix(']'))
	140	+	.filter(\|host\| Ipv6Addr::from_str(host).is_ok())
	141	+	{
	142	+	format!("[{ipv6}]:{port}")
	143	+	} else if host.contains(':') && Ipv6Addr::from_str(host).is_ok() {
	144	+	format!("[{host}]:{port}")
	145	+	} else if host
	146	+	.rsplit_once(':')
	147	+	.is_some_and(\|(_, suffix)\| suffix.parse::<u16>().is_ok())
	148	+	{
	149	+	host.to_string()
	150	+	} else {
	151	+	format!("{host}:{port}")
	152	+	}
	153	+	}
	154	+
	155	+	#[cfg(test)]
	156	+	mod tests {
	157	+	use super::mpd_address;
	158	+
	159	+	#[test]
	160	+	fn formats_mpd_host_addresses() {
	161	+	assert_eq!(mpd_address("localhost", 6600), "localhost:6600");
	162	+	assert_eq!(mpd_address("localhost:6601", 6600), "localhost:6601");
	163	+	assert_eq!(mpd_address("[::1]", 6600), "[::1]:6600");
	164	+	assert_eq!(mpd_address("[::1]:6601", 6600), "[::1]:6601");
	165	+	assert_eq!(mpd_address("::1", 6600), "[::1]:6600");
	166	+	}
44	167		}

		@@ -1,94 +1,98 @@
1	1		# This file is automatically @generated by Cargo.
2	2		# It is not intended for manual editing.
3		−	version = 3
4		−
5		−	[[package]]
6		−	name = "ahash"
7		−	version = "0.8.11"
8		−	source = "registry+https://github.com/rust-lang/crates.io-index"
9		−	checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
10		−	dependencies = [
11		−	"cfg-if",
12		−	"once_cell",
13		−	"version_check",
14		−	"zerocopy",
15		−	]
	3	+	version = 4
16	4
17	5		[[package]]
18	6		name = "allocator-api2"
19		−	version = "0.2.18"
	7	+	version = "0.2.21"
20	8		source = "registry+https://github.com/rust-lang/crates.io-index"
21		−	checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
	9	+	checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
22	10
23	11		[[package]]
24		−	name = "autocfg"
25		−	version = "1.2.0"
	12	+	name = "approx"
	13	+	version = "0.5.1"
26	14		source = "registry+https://github.com/rust-lang/crates.io-index"
27		−	checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
	15	+	checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
	16	+	dependencies = [
	17	+	"num-traits",
	18	+	]
28	19
29	20		[[package]]
30		−	name = "bitflags"

		@@ -1,121 +1,130 @@
1		−	use std::{path::Path, time::Duration};
2		−
3		−	use crate::browser::FileBrowser;
4		−	use crate::connection::Connection;
5		−	use crate::list::ContentList;
6		−	use crate::ui::InputMode;
7		−	use crate::utils::FileExtension;
8		−	use mpd::{Client, Song};
	1	+	use std::time::Duration;
	2	+
	3	+	use crate::{
	4	+	browser::{BrowserEntry, FileBrowser},
	5	+	config::Config,
	6	+	connection::{Connection, MpdSnapshot, Song},
	7	+	list::ContentList,
	8	+	ui::InputMode,
	9	+	utils::is_audio_file,
	10	+	AppResult,
	11	+	};
9	12		use ratatui::widgets::{ListState, TableState};
10	13
11		−	// Application result type
12		−	pub type AppResult<T> = std::result::Result<T, Box<dyn std::error::Error>>;
13		−
14		−	/// Application
15	14		#[derive(Debug)]
16	15		pub struct App {
17		−	pub running: bool, // Check if app is running
18		−	pub conn: Connection, // Connection
19		−	pub browser: FileBrowser, // Directory browser
20		−	pub queue_list: ContentList<Song>, // Stores the current playing queue
21		−	pub pl_list: ContentList<String>, // Stores list of playlists
22		−	pub selected_tab: SelectedTab, // Used to switch between tabs
23		−
24		−	// Search
25		−	pub inputmode: InputMode, // Defines input mode, Normal or Search
26		−	pub search_input: String, // Stores the userinput to be searched
27		−	pub search_cursor_pos: usize, // Stores the cursor position for searching
28		−

	@@ -0,0 +1,669 @@
1	+	use std::{
2	+	collections::BTreeMap,
3	+	env,
4	+	error::Error,
5	+	fs::{self, OpenOptions},
6	+	io::{self, Write},
7	+	path::PathBuf,
8	+	};
9	+
10	+	use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
11	+	use serde::{Deserialize, Serialize};
12	+
13	+	use crate::AppResult;
14	+
15	+	#[derive(Clone, Debug, Default, Deserialize, Serialize)]
16	+	#[serde(default)]
17	+	pub struct Config {
18	+	pub mpd: MpdConfig,
19	+	pub playback: PlaybackConfig,
20	+	pub keybindings: Keybindings,
21	+	}
22	+
23	+	#[derive(Clone, Debug, Deserialize, Serialize)]
24	+	#[serde(default)]
25	+	pub struct MpdConfig {
26	+	pub host: String,
27	+	pub port: u16,
28	+	pub password: String,
29	+	}
30	+
31	+	impl Default for MpdConfig {
32	+	fn default() -> Self {
33	+	Self {
34	+	host: "127.0.0.1".to_string(),
35	+	port: 6600,
36	+	password: String::new(),
37	+	}
38	+	}
39	+	}

		@@ -1,235 +1,775 @@
1		−	use crate::app::AppResult;
2		−	use crate::utils::is_installed;
3		−	use mpd::song::Song;
4		−	use mpd::{Client, State};
5		−	use simple_dmenu::dmenu;
6		−	use std::time::Duration;
7		−
8		−	/// Defines the current status of volume (Muted or UnMuted)
9		−	#[derive(Debug)]
	1	+	use std::{
	2	+	collections::HashMap,
	3	+	error::Error,
	4	+	fmt,
	5	+	time::{Duration, Instant},
	6	+	};
	7	+
	8	+	use tokio::{
	9	+	io::{AsyncBufReadExt, AsyncWriteExt, BufReader},
	10	+	net::TcpStream,
	11	+	};
	12	+
	13	+	use crate::AppResult;
	14	+
	15	+	#[derive(Clone, Debug, Default, PartialEq, Eq)]
	16	+	pub struct Song {
	17	+	pub file: String,
	18	+	pub title: Option<String>,
	19	+	pub artist: Option<String>,
	20	+	pub tags: Vec<(String, String)>,
	21	+	pub duration: Option<Duration>,
	22	+	pub place: Option<Place>,
	23	+	}
	24	+
	25	+	#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
	26	+	pub struct Place {
	27	+	pub pos: u32,
	28	+	}
	29	+
	30	+	#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]

		@@ -1,32 +1,32 @@
1		−	use std::io;
2	1		use crate::ui;
3	2		use crossterm::event::{DisableMouseCapture, EnableMouseCapture};
4	3		use crossterm::terminal::{self, *};
	4	+	use std::io;
5	5		use std::panic;
6	6
7		−	use crate::app::{App, AppResult};
8		−	use crate::event_handler::event::EventHandler;
	7	+	use crate::{app::App, AppResult};
9	8
10	9		pub type CrosstermTerminal = ratatui::Terminal<ratatui::backend::CrosstermBackend<std::io::Stderr>>;
11	10
12	11		#[derive(Debug)]
13	12		pub struct Tui {
14	13		terminal: CrosstermTerminal,
15		−	pub events: EventHandler,
16	14		}
17	15
18	16		impl Tui {
19		−	pub fn new(terminal: CrosstermTerminal, events: EventHandler) -> Self {
20		−	Self { terminal, events }
	17	+	pub fn new(terminal: CrosstermTerminal) -> Self {
	18	+	Self { terminal }
21	19		}
22	20
23	21		pub fn init(&mut self) -> AppResult<()> {
24	22		terminal::enable_raw_mode()?;
25		−	crossterm::execute!(io::stdout(), EnterAlternateScreen, EnableMouseCapture)?;
	23	+	crossterm::execute!(io::stderr(), EnterAlternateScreen, EnableMouseCapture)?;
26	24
27	25		let panic_hook = panic::take_hook();
28	26		panic::set_hook(Box::new(move \|panic\| {
29		−	Self::reset().expect("failed to reset the terminal");
	27	+	if let Err(error) = Self::reset() {
	28	+	eprintln!("failed to reset the terminal: {error}");
	29	+	}
30	30		panic_hook(panic);
31	31		}));
32	32		Ok(())

		@@ -1,15 +1,13 @@
1	1		use std::time::Duration;
2	2
3	3		use crate::{
4		−	app::{App, SelectedTab},
5		−	connection::VolumeStatus,
6		−	};
7		−	use ratatui::{
8		−	prelude::*,
9		−	widgets::{block::Title, *},
	4	+	app::{App, PlaylistFocus, SelectedTab},
	5	+	browser::BrowserEntry,
	6	+	connection::{PlaybackState, Song, VolumeStatus},
10	7		};
	8	+	use ratatui::{prelude::, widgets::};
11	9
12		−	#[derive(Debug, PartialEq)]
	10	+	#[derive(Debug, PartialEq, Clone, Copy)]
13	11		pub enum InputMode {
14	12		Editing,
15	13		Normal,
		@@ -17,13 +15,49 @@ pub enum InputMode {
17	15		NewPlaylist,
18	16		}
19	17
	18	+	fn song_row(song: &Song, playing: bool, queued: bool) -> Row<'static> {
	19	+	let mut artist = song.artist.clone().unwrap_or_default();
	20	+	let track = tag_value(song, "Track");
	21	+	let title = song.title.clone().unwrap_or_else(\|\| song.file.clone());
	22	+	let album = tag_value(song, "Album");
	23	+	let time = App::format_time(song.duration.unwrap_or(Duration::ZERO));
	24	+
	25	+	if playing {
	26	+	artist.insert_str(0, "> ");
	27	+	}
	28	+	let row = Row::new(vec![
	29	+	Cell::from(artist.cyan()),
	30	+	Cell::from(if playing {
	31	+	format!(" {track}").green()
	32	+	} else {
	33	+	track.green()
	34	+	}),
	35	+	Cell::from(if playing { format!(" {title}") } else { title }),
	36	+	Cell::from(album.cyan()),
	37	+	Cell::from(time.magenta()),
	38	+	]);
	39	+	if queued {
	40	+	row.bold()
	41	+	} else {
	42	+	row
	43	+	}
	44	+	}
	45	+
	46	+	fn tag_value(song: &Song, name: &str) -> String {
	47	+	song.tags
	48	+	.iter()
	49	+	.find(\|(tag, _)\| tag.eq_ignore_ascii_case(name))
	50	+	.map(\|(_, value)\| value.clone())
	51	+	.unwrap_or_default()
	52	+	}
	53	+
20	54		/// Renders the user interface widgets
21	55		pub fn render(app: &mut App, frame: &mut Frame) {
22	56		// Layout
23	57		let layout = Layout::default()
24	58		.direction(Direction::Vertical)
25	59		.constraints(vec![Constraint::Percentage(93), Constraint::Min(3)])
26		−	.split(frame.size());
	60	+	.split(frame.area());
27	61
28	62		match app.selected_tab {
29	63		SelectedTab::Queue => draw_queue(frame, app, layout[0]),
		@@ -55,57 +89,15 @@ pub fn render(app: &mut App, frame: &mut Frame) {
55	89		fn draw_directory_browser(frame: &mut Frame, app: &mut App, size: Rect) {
56	90		let total_songs = app.conn.stats.songs.to_string();
57	91
58		−	let rows = app.browser.filetree.iter().enumerate().map(\|(i, (t, s))\| {
59		−	if t == "file" {
60		−	let song = app.browser.songs.get(i).unwrap().clone();
61		−
62		−	// metadata
63		−	let title = song.clone().title.unwrap_or_else(\|\| song.clone().file);
64		−	let artist = song.clone().artist.unwrap_or_default().cyan();
65		−	let album = song
66		−	.tags
67		−	.iter()
68		−	.filter(\|(x, _)\| x == "Album")
69		−	.map(\|(_, l)\| l.clone())
70		−	.collect::<Vec<String>>()
71		−	.join("");
72		−
73		−	let track = song
74		−	.tags
75		−	.iter()
76		−	.filter(\|(x, _)\| x == "Track")
77		−	.map(\|(_, l)\| l.clone())
78		−	.collect::<Vec<String>>()
79		−	.join("");
80		−
81		−	let time =
82		−	App::format_time(song.clone().duration.unwrap_or_else(\|\| Duration::new(0, 0)));
83		−
84		−	let mut status: bool = false;
85		−	for sn in app.queue_list.list.iter() {
86		−	let file = sn.file.split('/').last().unwrap_or_default();
87		−	if file.eq(s) {
88		−	status = true;
89		−	}
90		−	}
91		−
92		−	let row = Row::new(vec![
93		−	Cell::from(artist),
94		−	Cell::from(track.green()),
95		−	Cell::from(title),
96		−	Cell::from(album.cyan()),
97		−	Cell::from(time.to_string().magenta()),
98		−	]);
99		−
100		−	if status {
101		−	row.bold()
102		−	} else {
103		−	row
104		−	}
105		−	} else {
106		−	let row = Row::new(vec![Cell::from(format!("[{}]", *s))]);
107		−	row
	92	+	let rows = app.browser.entries.iter().map(\|entry\| match entry {
	93	+	BrowserEntry::Song(song) => {
	94	+	let queued =
	95	+	app.queue_list.list.iter().any(\|queued\| {
	96	+	queued.file.rsplit('/').next().unwrap_or_default() == entry.name()
	97	+	});
	98	+	song_row(song, false, queued)
108	99		}
	100	+	BrowserEntry::Directory(name) => directory_row(name),
109	101		});
110	102
111	103		let header = ["Artist", "Track", "Title", "Album", "Time"]
		@@ -126,23 +118,21 @@ fn draw_directory_browser(frame: &mut Frame, app: &mut App, size: Rect) {
126	118		)
127	119		.block(
128	120		Block::default()
129		−	.title(format!("Song Browser: {}", app.browser.path.clone()).bold())
	121	+	.title(format!("Song Browser: {}", app.browser.path).bold())
130	122		.title(
131		−	Title::from(format!("Total Songs: {}", total_songs).green())
	123	+	Line::from(format!("Total Songs: {}", total_songs).green())
132	124		.alignment(Alignment::Center),
133	125		)
134	126		.title(match app.conn.volume_status {
135	127		VolumeStatus::Unmuted => {
136		−	Title::from(format!("Volume: {}%", app.conn.status.volume).green())
	128	+	Line::from(format!("Volume: {}%", app.conn.status.volume).green())
137	129		.alignment(Alignment::Right)
138	130		}
139		−	VolumeStatus::Muted(_v) => {
140		−	Title::from("Muted".red()).alignment(Alignment::Right)
141		−	}
	131	+	VolumeStatus::Muted(_v) => Line::from("Muted".red()).alignment(Alignment::Right),
142	132		})
143	133		.borders(Borders::ALL),
144	134		)
145		−	.highlight_style(
	135	+	.row_highlight_style(
146	136		Style::default()
147	137		.add_modifier(Modifier::REVERSED)
148	138		.fg(Color::Cyan)
		@@ -158,53 +148,12 @@ fn draw_directory_browser(frame: &mut Frame, app: &mut App, size: Rect) {
158	148		/// draws playing queue
159	149		fn draw_queue(frame: &mut Frame, app: &mut App, size: Rect) {
160	150		let rows = app.queue_list.list.iter().enumerate().map(\|(i, song)\| {
161		−	// metadata
162		−	let title = song.clone().title.unwrap_or_else(\|\| song.clone().file);
163		−	let artist = song.clone().artist.unwrap_or_default().cyan();
164		−	let album = song
165		−	.tags
166		−	.iter()
167		−	.filter(\|(x, _)\| x == "Album")
168		−	.map(\|(_, l)\| l.clone())
169		−	.collect::<Vec<String>>()
170		−	.join("");
171		−
172		−	let track = song
173		−	.tags
174		−	.iter()
175		−	.filter(\|(x, _)\| x == "Track")
176		−	.map(\|(_, l)\| l.clone())
177		−	.collect::<Vec<String>>()
178		−	.join("");
179		−
180		−	let time = App::format_time(song.clone().duration.unwrap_or_else(\|\| Duration::new(0, 0)));
181		−
182		−	let row = Row::new(vec![
183		−	Cell::from(artist.clone()),
184		−	Cell::from(track.clone().green()),
185		−	Cell::from(title.clone()),
186		−	Cell::from(album.clone().cyan()),
187		−	Cell::from(time.to_string().magenta()),
188		−	]);
189		−
190		−	let place = app.conn.current_song.place;
191		−	if let Some(pos) = place {
192		−	if i == pos.pos as usize {
193		−	let row = Row::new(vec![
194		−	Cell::from(format!("> {}", artist)),
195		−	Cell::from(format!(" {}", track).green()),
196		−	Cell::from(format!(" {}", title)),
197		−	Cell::from(album.cyan()),
198		−	Cell::from(time.to_string().magenta()),
199		−	]);
200		−
201		−	row
202		−	} else {
203		−	row
204		−	}
205		−	} else {
206		−	row
207		−	}
	151	+	let playing = app
	152	+	.conn
	153	+	.current_song
	154	+	.place
	155	+	.is_some_and(\|position\| i == position.pos as usize);
	156	+	song_row(song, playing, false)
208	157		});
209	158
210	159		let header = ["Artist", "Track", "Title", "Album", "Time"]
		@@ -225,22 +174,18 @@ fn draw_queue(frame: &mut Frame, app: &mut App, size: Rect) {
225	174		)
226	175		.block(
227	176		Block::default()
228		−	.title(Title::from("Play Queue".green().bold()))
229		−	.title(Title::from(
230		−	format!("({} items)", app.queue_list.list.len()).bold(),
231		−	))
	177	+	.title("Play Queue".green().bold())
	178	+	.title(format!("({} items)", app.queue_list.list.len()).bold())
232	179		.title(match app.conn.volume_status {
233	180		VolumeStatus::Unmuted => {
234		−	Title::from(format!("Volume: {}%", app.conn.status.volume).green())
	181	+	Line::from(format!("Volume: {}%", app.conn.status.volume).green())
235	182		.alignment(Alignment::Right)
236	183		}
237		−	VolumeStatus::Muted(_v) => {
238		−	Title::from("Muted".red()).alignment(Alignment::Right)
239		−	}
	184	+	VolumeStatus::Muted(_v) => Line::from("Muted".red()).alignment(Alignment::Right),
240	185		})
241	186		.borders(Borders::ALL),
242	187		)
243		−	.highlight_style(
	188	+	.row_highlight_style(
244	189		Style::default()
245	190		.add_modifier(Modifier::REVERSED)
246	191		.fg(Color::Cyan)
		@@ -258,37 +203,36 @@ fn draw_search_bar(frame: &mut Frame, app: &mut App, size: Rect) {
258	203		// Make the cursor visible and ask ratatui to put it at the specified coordinates after
259	204		// rendering
260	205		#[allow(clippy::cast_possible_truncation)]
261		−	frame.set_cursor(
	206	+	frame.set_cursor_position((
262	207		// Draw the cursor at the current position in the input field.
263	208		// This position is can be controlled via the left and right arrow key
264	209		size.x + app.search_cursor_pos as u16 + 2,
265	210		// Move one line down, from the border to the input line
266	211		size.y + 1,
267		−	);
	212	+	));
268	213
269	214		let input = Paragraph::new("/".to_string() + &app.search_input)
270	215		.style(Style::default())
271	216		.block(
272	217		Block::default()
273	218		.borders(Borders::ALL)
274		−	.title("Search Forward: ".bold().green()),
	219	+	.title("Search: Enter to keep, n/N next/previous ".bold().green()),
275	220		);
276	221		frame.render_widget(input, size);
277	222		}
278	223
279	224		/// Draws Progress Bar
280	225		fn draw_progress_bar(frame: &mut Frame, app: &mut App, size: Rect) {
281		−	// Get the current playing song
282		−	let song = app
283		−	.conn
284		−	.now_playing()
285		−	.unwrap()
286		−	.unwrap_or_else(\|\| "No Title Found".to_string());
	226	+	let song = app.conn.now_playing();
287	227
288	228		// Get the current playing state
289		−	let mut state: String = String::new();
	229	+	let mut state = String::new();
290	230		if !app.queue_list.list.is_empty() {
291		−	state.clone_from(&app.conn.state);
	231	+	state.push_str(match app.conn.status.state {
	232	+	PlaybackState::Playing => "Playing",
	233	+	PlaybackState::Paused => "Paused",
	234	+	PlaybackState::Stopped => "Stopped",
	235	+	});
292	236		state.push(':');
293	237		}
294	238
		@@ -312,11 +256,11 @@ fn draw_progress_bar(frame: &mut Frame, app: &mut App, size: Rect) {
312	256		};
313	257
314	258		// get the duration
315		−	let duration = if app.conn.total_duration.as_secs() != 0 {
	259	+	let duration = if !app.conn.status.total.is_zero() {
316	260		format!(
317	261		"[{}/{}]",
318		−	App::format_time(app.conn.elapsed),
319		−	App::format_time(app.conn.total_duration)
	262	+	App::format_time(app.conn.current_elapsed()),
	263	+	App::format_time(app.conn.status.total)
320	264		)
321	265		} else {
322	266		"".to_string()
		@@ -324,21 +268,26 @@ fn draw_progress_bar(frame: &mut Frame, app: &mut App, size: Rect) {
324	268
325	269		// Define the title
326	270		let title = Block::default()
327		−	.title(Title::from(state.red().bold()))
328		−	.title(Title::from(song.green()))
329		−	.title(Title::from(duration.cyan().bold()).alignment(Alignment::Right))
330		−	.title(Title::from(modes_bottom).position(block::Position::Bottom))
	271	+	.title(state.red().bold())
	272	+	.title(song.green())
	273	+	.title(Line::from(duration.cyan().bold()).alignment(Alignment::Right))
	274	+	.title_bottom(modes_bottom)
331	275		.borders(Borders::ALL);
332	276
333	277		let progress_bar = LineGauge::default()
334	278		.block(title.borders(Borders::ALL))
335		−	.gauge_style(
	279	+	.filled_style(
336	280		Style::default()
337	281		.fg(Color::Blue)
338		−	.bg(Color::Black)
339	282		.add_modifier(Modifier::BOLD),
340	283		)
341		−	.line_set(symbols::line::THICK)
	284	+	.unfilled_style(
	285	+	Style::default()
	286	+	.fg(Color::Black)
	287	+	.add_modifier(Modifier::BOLD),
	288	+	)
	289	+	.filled_symbol(symbols::line::THICK_HORIZONTAL)
	290	+	.unfilled_symbol(symbols::line::THICK_HORIZONTAL)
342	291		.ratio(app.conn.get_progress_ratio());
343	292
344	293		frame.render_widget(progress_bar, size);
		@@ -351,16 +300,24 @@ fn draw_playlist_viewer(frame: &mut Frame, app: &mut App, area: Rect) {
351	300		.split(area);
352	301
353	302		// Draw list of playlists
354		−	let title = Block::default().title(Title::from("Playlist".green().bold()));
355		−	let list = List::new(app.pl_list.list.clone())
356		−	.block(title.borders(Borders::ALL))
357		−	.highlight_style(
358		−	Style::new()
359		−	.fg(Color::Cyan)
360		−	.bg(Color::Black)
361		−	.add_modifier(Modifier::BOLD)
362		−	.add_modifier(Modifier::REVERSED),
363		−	)
	303	+	let list_focused = app.playlist_focus == PlaylistFocus::List;
	304	+	let title = Block::default()
	305	+	.title("Playlists".green().bold())
	306	+	.borders(Borders::ALL)
	307	+	.border_style(if list_focused {
	308	+	Style::default().fg(Color::Cyan)
	309	+	} else {
	310	+	Style::default()
	311	+	});
	312	+	let list = List::new(app.pl_list.list.iter().map(String::as_str))
	313	+	.block(title)
	314	+	.highlight_style(Style::new().fg(Color::Cyan).bg(Color::Black).add_modifier(
	315	+	if list_focused {
	316	+	Modifier::BOLD \| Modifier::REVERSED
	317	+	} else {
	318	+	Modifier::BOLD
	319	+	},
	320	+	))
364	321		.repeat_highlight_symbol(true);
365	322		app.playlists_state.select(Some(app.pl_list.index));
366	323		frame.render_stateful_widget(list, layouts[0], &mut app.playlists_state);
		@@ -370,7 +327,7 @@ fn draw_playlist_viewer(frame: &mut Frame, app: &mut App, area: Rect) {
370	327		// Handle if there are no playlists in the mpd database
371	328		if app.pl_list.list.is_empty() {
372	329		let title = Block::default()
373		−	.title(Title::from("No Playlists Found".red().bold()))
	330	+	.title("No Playlists Found".red().bold())
374	331		.title_alignment(Alignment::Center)
375	332		.borders(Borders::ALL);
376	333		frame.render_widget(Clear, area); //this clears out the background
		@@ -378,12 +335,11 @@ fn draw_playlist_viewer(frame: &mut Frame, app: &mut App, area: Rect) {
378	335		return;
379	336		}
380	337
381		−	let pl_name = app.pl_list.get_item_at_current_index();
382		−	let songs = app.conn.conn.playlist(pl_name).unwrap();
	338	+	let songs = &app.playlist_contents;
383	339		let rows = songs.iter().map(\|song\| {
384		−	let title = song.clone().title.unwrap_or_default().cyan();
385		−	let artist = song.clone().artist.unwrap_or_else(\|\| song.clone().file);
386		−	let time = App::format_time(song.clone().duration.unwrap_or_else(\|\| Duration::new(0, 0)));
	340	+	let title = song.title.as_deref().unwrap_or_default().cyan();
	341	+	let artist = song.artist.as_deref().unwrap_or(&song.file);
	342	+	let time = App::format_time(song.duration.unwrap_or(Duration::ZERO));
387	343
388	344		let row = Row::new(vec![
389	345		Cell::from(artist),
		@@ -395,33 +351,40 @@ fn draw_playlist_viewer(frame: &mut Frame, app: &mut App, area: Rect) {
395	351
396	352		let title = Block::default()
397	353		.title(format!("Content: ({} items)", songs.len()).bold())
398		−	.borders(Borders::ALL);
	354	+	.borders(Borders::ALL)
	355	+	.border_style(if app.playlist_focus == PlaylistFocus::Songs {
	356	+	Style::default().fg(Color::Cyan)
	357	+	} else {
	358	+	Style::default()
	359	+	});
399	360		let table = Table::new(
400	361		rows,
401	362		vec![
402		−	Constraint::Min(48),
403		−	Constraint::Percentage(48),
404		−	Constraint::Percentage(4),
	363	+	Constraint::Percentage(40),
	364	+	Constraint::Percentage(50),
	365	+	Constraint::Percentage(10),
405	366		],
406	367		)
407	368		.block(title)
408		−	.highlight_style(
	369	+	.row_highlight_style(
409	370		Style::default()
410	371		.add_modifier(Modifier::REVERSED)
411	372		.fg(Color::Cyan)
412	373		.bg(Color::Black),
413	374		)
414	375		.flex(layout::Flex::SpaceBetween);
415		−	frame.render_widget(table, layouts[1]);
	376	+	app.playlist_songs_state
	377	+	.select(Some(app.playlist_song_index));
	378	+	frame.render_stateful_widget(table, layouts[1], &mut app.playlist_songs_state);
416	379		}
417	380
418	381		fn draw_add_to_playlist(frame: &mut Frame, app: &mut App, area: Rect) {
419	382		let area = centered_rect(40, 50, area);
420	383		let mut state = ListState::default();
421	384		let title = Block::default()
422		−	.title(Title::from("Add Selected Item to: "))
423		−	.title(Title::from("<Esc> to Cancel".green().bold()).alignment(Alignment::Right));
424		−	let list = List::new(app.append_list.list.clone())
	385	+	.title("Add Selected Item to: ")
	386	+	.title(Line::from("<Esc> to Cancel".green().bold()).alignment(Alignment::Right));
	387	+	let list = List::new(app.append_list.list.iter().map(String::as_str))
425	388		.block(title.borders(Borders::ALL))
426	389		.highlight_style(
427	390		Style::new()
		@@ -439,13 +402,13 @@ fn draw_add_to_playlist(frame: &mut Frame, app: &mut App, area: Rect) {
439	402
440	403		fn draw_rename_playlist(frame: &mut Frame, app: &mut App, area: Rect) {
441	404		#[allow(clippy::cast_possible_truncation)]
442		−	frame.set_cursor(
	405	+	frame.set_cursor_position((
443	406		// Draw the cursor at the current position in the input field.
444	407		// This position is can be controlled via the left and right arrow key
445	408		area.x + app.pl_cursor_pos as u16 + 2,
446	409		// Move one line down, from the border to the input line
447	410		area.y + 1,
448		−	);
	411	+	));
449	412
450	413		let input = Paragraph::new("/".to_string() + &app.pl_newname_input)
451	414		.style(Style::default())
		@@ -459,13 +422,13 @@ fn draw_rename_playlist(frame: &mut Frame, app: &mut App, area: Rect) {
459	422
460	423		fn draw_new_playlist(frame: &mut Frame, app: &mut App, area: Rect) {
461	424		#[allow(clippy::cast_possible_truncation)]
462		−	frame.set_cursor(
	425	+	frame.set_cursor_position((
463	426		// Draw the cursor at the current position in the input field.
464	427		// This position is can be controlled via the left and right arrow key
465	428		area.x + app.pl_new_pl_cursor_pos as u16 + 2,
466	429		// Move one line down, from the border to the input line
467	430		area.y + 1,
468		−	);
	431	+	));
469	432
470	433		let input = Paragraph::new("/".to_string() + &app.pl_new_pl_input)
471	434		.style(Style::default())
		@@ -492,3 +455,35 @@ fn centered_rect(percent_x: u16, percent_y: u16, r: Rect) -> Rect {
492	455		])
493	456		.split(popup_layout[1])[1]
494	457		}
	458	+
	459	+	fn directory_row(name: &str) -> Row<'static> {
	460	+	Row::new(vec![Cell::from(format!("[{name}]")).column_span(5)])
	461	+	}
	462	+
	463	+	#[cfg(test)]
	464	+	mod tests {
	465	+	use super::*;
	466	+
	467	+	#[test]
	468	+	fn directory_names_use_the_full_browser_row_width() {
	469	+	let name = "mr-robot-vol1-long-name";
	470	+	let area = Rect::new(0, 0, 80, 1);
	471	+	let mut buffer = Buffer::empty(area);
	472	+	let table = Table::new(
	473	+	[directory_row(name)],
	474	+	[
	475	+	Constraint::Length(6),
	476	+	Constraint::Length(2),
	477	+	Constraint::Length(10),
	478	+	Constraint::Length(10),
	479	+	Constraint::Length(6),
	480	+	],
	481	+	);
	482	+	Widget::render(table, area, &mut buffer);
	483	+
	484	+	let rendered = (0..area.width)
	485	+	.map(\|x\| buffer[(x, 0)].symbol())
	486	+	.collect::<String>();
	487	+	assert!(rendered.contains(&format!("[{name}]")));
	488	+	}
	489	+	}

		@@ -1,17 +1,6 @@
1		−	use std::process::Command;
2	1		use std::ffi::OsStr;
3	2		use std::path::Path;
4	3
5		−	/// Checks if given program is installed in your system
6		−	pub fn is_installed(ss: &str) -> bool {
7		−	let output = Command::new("which")
8		−	.arg(ss)
9		−	.output()
10		−	.expect("Failed to execute command");
11		−
12		−	output.status.success()
13		−	}
14		−
15	4		/// Checks if a file has a given extension
16	5		// https://stackoverflow.com/questions/72392835/check-if-a-file-is-of-a-given-type
17	6		pub trait FileExtension {
		@@ -30,3 +19,9 @@ impl<P: AsRef<Path>> FileExtension for P {
30	19		}
31	20		}
32	21
	22	+	pub fn is_audio_file(path: &str) -> bool {
	23	+	Path::new(path).has_extension(&[
	24	+	"mp3", "ogg", "flac", "m4a", "wav", "aac", "opus", "ape", "wma", "mpc", "aiff", "dff",
	25	+	"mp2", "mka",
	26	+	])
	27	+	}

rmptui/7f77734

Release rmptui v0.1.7

rmptui7f77734