Compare commits
No commits in common. "main" and "v0.1.8" have entirely different histories.
36 changed files with 1861 additions and 2603 deletions
75
.drone.yml
75
.drone.yml
|
|
@ -7,36 +7,11 @@ platform:
|
||||||
arch: amd64
|
arch: amd64
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: restore-cache-with-filesystem
|
|
||||||
image: meltwater/drone-cache
|
|
||||||
pull: true
|
|
||||||
settings:
|
|
||||||
backend: "filesystem"
|
|
||||||
restore: true
|
|
||||||
cache_key: "volume"
|
|
||||||
mount:
|
|
||||||
- target
|
|
||||||
- /usr/local/cargo/env
|
|
||||||
volumes:
|
|
||||||
- name: cache
|
|
||||||
path: /tmp/cache
|
|
||||||
|
|
||||||
- name: lint
|
|
||||||
image: rust:latest
|
|
||||||
commands:
|
|
||||||
- rustup component add rustfmt clippy
|
|
||||||
- cargo fmt --check
|
|
||||||
- cargo clippy
|
|
||||||
depends_on:
|
|
||||||
- restore-cache-with-filesystem
|
|
||||||
|
|
||||||
- name: build-x86_64-unknown-linux-gnu
|
- name: build-x86_64-unknown-linux-gnu
|
||||||
image: rust:latest
|
image: rust:latest
|
||||||
commands:
|
commands:
|
||||||
- cargo build --release
|
- cargo build --release
|
||||||
- strip target/release/empede
|
- strip target/release/empede
|
||||||
depends_on:
|
|
||||||
- restore-cache-with-filesystem
|
|
||||||
|
|
||||||
- name: build-aarch64-unknown-linux-gnu
|
- name: build-aarch64-unknown-linux-gnu
|
||||||
image: rust:latest
|
image: rust:latest
|
||||||
|
|
@ -48,8 +23,6 @@ steps:
|
||||||
- aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/empede
|
- aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/empede
|
||||||
when:
|
when:
|
||||||
event: tag
|
event: tag
|
||||||
depends_on:
|
|
||||||
- restore-cache-with-filesystem
|
|
||||||
|
|
||||||
- name: build-x86_64-pc-windows-gnu
|
- name: build-x86_64-pc-windows-gnu
|
||||||
image: rust:latest
|
image: rust:latest
|
||||||
|
|
@ -60,8 +33,6 @@ steps:
|
||||||
- x86_64-w64-mingw32-strip target/x86_64-pc-windows-gnu/release/empede.exe
|
- x86_64-w64-mingw32-strip target/x86_64-pc-windows-gnu/release/empede.exe
|
||||||
when:
|
when:
|
||||||
event: tag
|
event: tag
|
||||||
depends_on:
|
|
||||||
- restore-cache-with-filesystem
|
|
||||||
|
|
||||||
- name: package
|
- name: package
|
||||||
image: alpine
|
image: alpine
|
||||||
|
|
@ -69,19 +40,19 @@ steps:
|
||||||
- apk add --no-cache tar gzip zip
|
- apk add --no-cache tar gzip zip
|
||||||
|
|
||||||
# x86_64-unknown-linux-gnu
|
# x86_64-unknown-linux-gnu
|
||||||
- mkdir empede-x86_64-unknown-linux-gnu-${DRONE_TAG}
|
- mkdir empede-x86_64-unknown-linux-gnu
|
||||||
- cp -r target/release/empede static/ README.md empede-x86_64-unknown-linux-gnu-${DRONE_TAG}/
|
- cp -r target/release/empede static/ README.md empede-x86_64-unknown-linux-gnu
|
||||||
- tar czf empede-x86_64-unknown-linux-gnu-${DRONE_TAG}.tar.gz empede-x86_64-unknown-linux-gnu-${DRONE_TAG}/
|
- tar czf empede-x86_64-unknown-linux-gnu.tar.gz empede-x86_64-unknown-linux-gnu/
|
||||||
|
|
||||||
# aarch64-unknown-linux-gnu
|
# aarch64-unknown-linux-gnu
|
||||||
- mkdir empede-aarch64-unknown-linux-gnu-${DRONE_TAG}
|
- mkdir empede-aarch64-unknown-linux-gnu
|
||||||
- cp -r target/aarch64-unknown-linux-gnu/release/empede static/ README.md empede-aarch64-unknown-linux-gnu-${DRONE_TAG}/
|
- cp -r target/aarch64-unknown-linux-gnu/release/empede static/ README.md empede-aarch64-unknown-linux-gnu
|
||||||
- tar czf empede-aarch64-unknown-linux-gnu-${DRONE_TAG}.tar.gz empede-aarch64-unknown-linux-gnu-${DRONE_TAG}/
|
- tar czf empede-aarch64-unknown-linux-gnu.tar.gz empede-aarch64-unknown-linux-gnu/
|
||||||
|
|
||||||
# x86_64-pc-windows-gnu
|
# x86_64-pc-windows-gnu
|
||||||
- mkdir empede-x86_64-pc-windows-gnu-${DRONE_TAG}
|
- mkdir empede-x86_64-pc-windows-gnu
|
||||||
- cp -r target/x86_64-pc-windows-gnu/release/empede.exe static/ README.md empede-x86_64-pc-windows-gnu-${DRONE_TAG}/
|
- cp -r target/x86_64-pc-windows-gnu/release/empede.exe static/ README.md empede-x86_64-pc-windows-gnu
|
||||||
- zip -r empede-x86_64-pc-windows-gnu-${DRONE_TAG}.zip empede-x86_64-pc-windows-gnu-${DRONE_TAG}/
|
- zip -r empede-x86_64-pc-windows-gnu.zip empede-x86_64-pc-windows-gnu/
|
||||||
depends_on:
|
depends_on:
|
||||||
- build-aarch64-unknown-linux-gnu
|
- build-aarch64-unknown-linux-gnu
|
||||||
- build-x86_64-unknown-linux-gnu
|
- build-x86_64-unknown-linux-gnu
|
||||||
|
|
@ -96,34 +67,12 @@ steps:
|
||||||
from_secret: GITEA_TOKEN
|
from_secret: GITEA_TOKEN
|
||||||
base_url: https://git.sijman.nl
|
base_url: https://git.sijman.nl
|
||||||
files:
|
files:
|
||||||
- empede-aarch64-unknown-linux-gnu-${DRONE_TAG}.tar.gz
|
- empede-aarch64-unknown-linux-gnu.tar.gz
|
||||||
- empede-x86_64-unknown-linux-gnu-${DRONE_TAG}.tar.gz
|
- empede-x86_64-unknown-linux-gnu.tar.gz
|
||||||
- empede-x86_64-pc-windows-gnu-${DRONE_TAG}.zip
|
- empede-x86_64-pc-windows-gnu.zip
|
||||||
depends_on:
|
depends_on:
|
||||||
- package
|
- package
|
||||||
when:
|
when:
|
||||||
event: tag
|
event: tag
|
||||||
|
|
||||||
- name: rebuild-cache-with-filesystem
|
|
||||||
image: meltwater/drone-cache
|
|
||||||
pull: true
|
|
||||||
settings:
|
|
||||||
backend: "filesystem"
|
|
||||||
rebuild: true
|
|
||||||
cache_key: "volume"
|
|
||||||
mount:
|
|
||||||
- target
|
|
||||||
- /usr/local/cargo/env
|
|
||||||
volumes:
|
|
||||||
- name: cache
|
|
||||||
path: /tmp/cache
|
|
||||||
depends_on:
|
|
||||||
- build-aarch64-unknown-linux-gnu
|
|
||||||
- build-x86_64-unknown-linux-gnu
|
|
||||||
- build-x86_64-pc-windows-gnu
|
|
||||||
- lint
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
- name: cache
|
|
||||||
host:
|
|
||||||
path: /var/lib/cache
|
|
||||||
1
.envrc
1
.envrc
|
|
@ -1 +0,0 @@
|
||||||
use flake
|
|
||||||
33
.github/ISSUE_TEMPLATE/bug_report.md
vendored
33
.github/ISSUE_TEMPLATE/bug_report.md
vendored
|
|
@ -1,33 +0,0 @@
|
||||||
---
|
|
||||||
name: Bug report
|
|
||||||
about: Create a report to help us improve
|
|
||||||
title: ''
|
|
||||||
labels: bug
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Describe the bug**
|
|
||||||
A clear and concise description of what the bug is.
|
|
||||||
|
|
||||||
**To Reproduce**
|
|
||||||
Steps to reproduce the behavior:
|
|
||||||
1. Go to '...'
|
|
||||||
2. Click on '....'
|
|
||||||
3. Scroll down to '....'
|
|
||||||
4. See error
|
|
||||||
|
|
||||||
**Expected behavior**
|
|
||||||
A clear and concise description of what you expected to happen.
|
|
||||||
|
|
||||||
**Screenshots**
|
|
||||||
If applicable, add screenshots to help explain your problem.
|
|
||||||
|
|
||||||
**Version information (please complete the following information):**
|
|
||||||
- OS: [e.g. NixOS 23.11]
|
|
||||||
- Browser [e.g. firefox, chrome]
|
|
||||||
- Empede version [e.g. v0.2.1]
|
|
||||||
- MPD version [e.g. 0.23.15]
|
|
||||||
|
|
||||||
**Additional context**
|
|
||||||
Add any other context about the problem here.
|
|
||||||
20
.github/ISSUE_TEMPLATE/feature_request.md
vendored
20
.github/ISSUE_TEMPLATE/feature_request.md
vendored
|
|
@ -1,20 +0,0 @@
|
||||||
---
|
|
||||||
name: Feature request
|
|
||||||
about: Suggest an idea for this project
|
|
||||||
title: ''
|
|
||||||
labels: ''
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Is your feature request related to a problem? Please describe.**
|
|
||||||
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
|
||||||
|
|
||||||
**Describe the solution you'd like**
|
|
||||||
A clear and concise description of what you want to happen.
|
|
||||||
|
|
||||||
**Describe alternatives you've considered**
|
|
||||||
A clear and concise description of any alternative solutions or features you've considered.
|
|
||||||
|
|
||||||
**Additional context**
|
|
||||||
Add any other context or screenshots about the feature request here.
|
|
||||||
7
.github/dependabot.yml
vendored
7
.github/dependabot.yml
vendored
|
|
@ -1,7 +0,0 @@
|
||||||
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
|
|
||||||
version: 2
|
|
||||||
updates:
|
|
||||||
- package-ecosystem: "cargo"
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: "daily"
|
|
||||||
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,4 +1,2 @@
|
||||||
/target
|
/target
|
||||||
|
/release
|
||||||
# nix
|
|
||||||
/result
|
|
||||||
|
|
|
||||||
|
|
@ -1,128 +0,0 @@
|
||||||
# Contributor Covenant Code of Conduct
|
|
||||||
|
|
||||||
## Our Pledge
|
|
||||||
|
|
||||||
We as members, contributors, and leaders pledge to make participation in our
|
|
||||||
community a harassment-free experience for everyone, regardless of age, body
|
|
||||||
size, visible or invisible disability, ethnicity, sex characteristics, gender
|
|
||||||
identity and expression, level of experience, education, socio-economic status,
|
|
||||||
nationality, personal appearance, race, religion, or sexual identity
|
|
||||||
and orientation.
|
|
||||||
|
|
||||||
We pledge to act and interact in ways that contribute to an open, welcoming,
|
|
||||||
diverse, inclusive, and healthy community.
|
|
||||||
|
|
||||||
## Our Standards
|
|
||||||
|
|
||||||
Examples of behavior that contributes to a positive environment for our
|
|
||||||
community include:
|
|
||||||
|
|
||||||
* Demonstrating empathy and kindness toward other people
|
|
||||||
* Being respectful of differing opinions, viewpoints, and experiences
|
|
||||||
* Giving and gracefully accepting constructive feedback
|
|
||||||
* Accepting responsibility and apologizing to those affected by our mistakes,
|
|
||||||
and learning from the experience
|
|
||||||
* Focusing on what is best not just for us as individuals, but for the
|
|
||||||
overall community
|
|
||||||
|
|
||||||
Examples of unacceptable behavior include:
|
|
||||||
|
|
||||||
* The use of sexualized language or imagery, and sexual attention or
|
|
||||||
advances of any kind
|
|
||||||
* Trolling, insulting or derogatory comments, and personal or political attacks
|
|
||||||
* Public or private harassment
|
|
||||||
* Publishing others' private information, such as a physical or email
|
|
||||||
address, without their explicit permission
|
|
||||||
* Other conduct which could reasonably be considered inappropriate in a
|
|
||||||
professional setting
|
|
||||||
|
|
||||||
## Enforcement Responsibilities
|
|
||||||
|
|
||||||
Community leaders are responsible for clarifying and enforcing our standards of
|
|
||||||
acceptable behavior and will take appropriate and fair corrective action in
|
|
||||||
response to any behavior that they deem inappropriate, threatening, offensive,
|
|
||||||
or harmful.
|
|
||||||
|
|
||||||
Community leaders have the right and responsibility to remove, edit, or reject
|
|
||||||
comments, commits, code, wiki edits, issues, and other contributions that are
|
|
||||||
not aligned to this Code of Conduct, and will communicate reasons for moderation
|
|
||||||
decisions when appropriate.
|
|
||||||
|
|
||||||
## Scope
|
|
||||||
|
|
||||||
This Code of Conduct applies within all community spaces, and also applies when
|
|
||||||
an individual is officially representing the community in public spaces.
|
|
||||||
Examples of representing our community include using an official e-mail address,
|
|
||||||
posting via an official social media account, or acting as an appointed
|
|
||||||
representative at an online or offline event.
|
|
||||||
|
|
||||||
## Enforcement
|
|
||||||
|
|
||||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
|
||||||
reported to the community leaders responsible for enforcement at
|
|
||||||
coc@vijf.life.
|
|
||||||
All complaints will be reviewed and investigated promptly and fairly.
|
|
||||||
|
|
||||||
All community leaders are obligated to respect the privacy and security of the
|
|
||||||
reporter of any incident.
|
|
||||||
|
|
||||||
## Enforcement Guidelines
|
|
||||||
|
|
||||||
Community leaders will follow these Community Impact Guidelines in determining
|
|
||||||
the consequences for any action they deem in violation of this Code of Conduct:
|
|
||||||
|
|
||||||
### 1. Correction
|
|
||||||
|
|
||||||
**Community Impact**: Use of inappropriate language or other behavior deemed
|
|
||||||
unprofessional or unwelcome in the community.
|
|
||||||
|
|
||||||
**Consequence**: A private, written warning from community leaders, providing
|
|
||||||
clarity around the nature of the violation and an explanation of why the
|
|
||||||
behavior was inappropriate. A public apology may be requested.
|
|
||||||
|
|
||||||
### 2. Warning
|
|
||||||
|
|
||||||
**Community Impact**: A violation through a single incident or series
|
|
||||||
of actions.
|
|
||||||
|
|
||||||
**Consequence**: A warning with consequences for continued behavior. No
|
|
||||||
interaction with the people involved, including unsolicited interaction with
|
|
||||||
those enforcing the Code of Conduct, for a specified period of time. This
|
|
||||||
includes avoiding interactions in community spaces as well as external channels
|
|
||||||
like social media. Violating these terms may lead to a temporary or
|
|
||||||
permanent ban.
|
|
||||||
|
|
||||||
### 3. Temporary Ban
|
|
||||||
|
|
||||||
**Community Impact**: A serious violation of community standards, including
|
|
||||||
sustained inappropriate behavior.
|
|
||||||
|
|
||||||
**Consequence**: A temporary ban from any sort of interaction or public
|
|
||||||
communication with the community for a specified period of time. No public or
|
|
||||||
private interaction with the people involved, including unsolicited interaction
|
|
||||||
with those enforcing the Code of Conduct, is allowed during this period.
|
|
||||||
Violating these terms may lead to a permanent ban.
|
|
||||||
|
|
||||||
### 4. Permanent Ban
|
|
||||||
|
|
||||||
**Community Impact**: Demonstrating a pattern of violation of community
|
|
||||||
standards, including sustained inappropriate behavior, harassment of an
|
|
||||||
individual, or aggression toward or disparagement of classes of individuals.
|
|
||||||
|
|
||||||
**Consequence**: A permanent ban from any sort of public interaction within
|
|
||||||
the community.
|
|
||||||
|
|
||||||
## Attribution
|
|
||||||
|
|
||||||
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
|
|
||||||
version 2.0, available at
|
|
||||||
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
|
|
||||||
|
|
||||||
Community Impact Guidelines were inspired by [Mozilla's code of conduct
|
|
||||||
enforcement ladder](https://github.com/mozilla/diversity).
|
|
||||||
|
|
||||||
[homepage]: https://www.contributor-covenant.org
|
|
||||||
|
|
||||||
For answers to common questions about this code of conduct, see the FAQ at
|
|
||||||
https://www.contributor-covenant.org/faq. Translations are available at
|
|
||||||
https://www.contributor-covenant.org/translations.
|
|
||||||
2367
Cargo.lock
generated
2367
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
24
Cargo.toml
24
Cargo.toml
|
|
@ -1,25 +1,21 @@
|
||||||
[package]
|
[package]
|
||||||
name = "empede"
|
name = "empede"
|
||||||
description = "A web client for MPD"
|
description = "A web client for MPD"
|
||||||
version = "0.2.3"
|
version = "0.1.8"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
repository = "https://github.com/vijfhoek/empede"
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = "1.0.70"
|
anyhow = "1.0.70"
|
||||||
askama = { version = "0.12.0", default-features = false, features = ["serde-json"] }
|
askama = { version = "0.12.0", default-features = false }
|
||||||
infer = { version = "0.15.0", default-features = false }
|
askama_tide = "0.15.0"
|
||||||
|
async-std = { version = "1.12.0", features = ["attributes"] }
|
||||||
|
infer = { version = "0.13.0", default-features = false }
|
||||||
|
mpdrs = "0.1.0"
|
||||||
percent-encoding = "2.2.0"
|
percent-encoding = "2.2.0"
|
||||||
serde = { version = "1.0.160", features = ["derive"] }
|
serde = { version = "1.0.160", features = ["derive"] }
|
||||||
serde_qs = "0.12.0"
|
serde_qs = "0.12.0"
|
||||||
askama_actix = "0.14.0"
|
tide = "0.16.0"
|
||||||
tokio = { version = "1.35.1", features = ["full"] }
|
tide-tracing = "0.0.12"
|
||||||
actix-web = "4.4.0"
|
tracing = { version = "0.1.37", default-features = false, features = ["std"] }
|
||||||
thiserror = "1.0.51"
|
tracing-subscriber = { version = "0.3.17", default-features = false, features = ["std", "fmt"] }
|
||||||
actix-files = "0.6.2"
|
|
||||||
actix-web-lab = "0.20.1"
|
|
||||||
tokio-stream = "0.1.14"
|
|
||||||
futures = "0.3.29"
|
|
||||||
async-stream = "0.3.5"
|
|
||||||
env_logger = "0.10.1"
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
FROM rust:alpine AS builder
|
FROM rust:1.69-alpine as builder
|
||||||
WORKDIR /usr/src/empede
|
WORKDIR /usr/src/empede
|
||||||
RUN apk add --no-cache build-base
|
RUN apk add --no-cache build-base
|
||||||
COPY ./src ./src
|
COPY ./src ./src
|
||||||
COPY ./templates ./templates
|
COPY ./templates ./templates
|
||||||
COPY ./Cargo.toml ./Cargo.lock ./
|
COPY ./Cargo.* ./
|
||||||
RUN cargo install --path .
|
RUN cargo install --path .
|
||||||
|
|
||||||
FROM alpine:latest
|
FROM alpine:latest
|
||||||
|
|
|
||||||
19
README.md
19
README.md
|
|
@ -1,8 +1,8 @@
|
||||||
# Empede
|
# Empede
|
||||||
|
|
||||||
[](https://ci.sijman.nl/_/empede)
|
|
||||||
[](https://quay.io/repository/vijfhoek/empede)
|
|
||||||
[](https://crates.io/crates/empede)
|
|
||||||
|
|
||||||
**A web client for MPD.**
|
**A web client for MPD.**
|
||||||
|
|
||||||
|
|
@ -11,12 +11,11 @@
|
||||||
## Configuration
|
## Configuration
|
||||||
Empede is configured using environment variables:
|
Empede is configured using environment variables:
|
||||||
|
|
||||||
| Name | Default | Description |
|
| Name | Default | Description |
|
||||||
| ---------------- | ------------ | --------------------------------- |
|
| --------------- | ------------ | --------------------------------- |
|
||||||
| **MPD_HOST** | localhost | MPD server host |
|
| **MPD_HOST** | localhost | MPD server host |
|
||||||
| **MPD_PORT** | 6600 | MPD server port |
|
| **MPD_PORT** | 6600 | MPD server port |
|
||||||
| **MPD_PASSWORD** | | MPD server password |
|
| **EMPEDE_BIND** | 0.0.0.0:8080 | Address for Empede to bind to |
|
||||||
| **EMPEDE_BIND** | 0.0.0.0:8080 | Address for Empede to bind to |
|
|
||||||
|
|
||||||
## Running
|
## Running
|
||||||
### Linux
|
### Linux
|
||||||
|
|
@ -26,7 +25,7 @@ Empede is configured using environment variables:
|
||||||
|
|
||||||
### Windows
|
### Windows
|
||||||
1. Download and extract the [latest release](https://git.sijman.nl/_/empede/releases)
|
1. Download and extract the [latest release](https://git.sijman.nl/_/empede/releases)
|
||||||
3. Run `.\empede.exe` in a PowerShell (To specify a host and port, first set the `$env:MPD_HOST` and `$env:MPD_PORT` variables)
|
3. Run `.\empede` in a PowerShell (To specify a host and port, first set the `$env:MPD_HOST` and `$env:MPD_PORT` variables)
|
||||||
3. Go to http://localhost:8080
|
3. Go to http://localhost:8080
|
||||||
|
|
||||||
### Building from source
|
### Building from source
|
||||||
|
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
(import (
|
|
||||||
fetchTarball {
|
|
||||||
url = "https://github.com/edolstra/flake-compat/archive/99f1c2157fba4bfe6211a321fd0ee43199025dbf.tar.gz";
|
|
||||||
sha256 = "0x2jn3vrawwv9xp15674wjz9pixwjyj3j771izayl962zziivbx2"; }
|
|
||||||
) {
|
|
||||||
src = ./.;
|
|
||||||
}).defaultNix
|
|
||||||
95
flake.lock
95
flake.lock
|
|
@ -1,95 +0,0 @@
|
||||||
{
|
|
||||||
"nodes": {
|
|
||||||
"naersk": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1679567394,
|
|
||||||
"narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "naersk",
|
|
||||||
"rev": "88cd22380154a2c36799fe8098888f0f59861a15",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"ref": "master",
|
|
||||||
"repo": "naersk",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1683353485,
|
|
||||||
"narHash": "sha256-Skp5El3egmoXPiINWjnoW0ktVfB7PR/xc4F4bhD+BJY=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "caf436a52b25164b71e0d48b671127ac2e2a5b75",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "nixpkgs",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1683353485,
|
|
||||||
"narHash": "sha256-Skp5El3egmoXPiINWjnoW0ktVfB7PR/xc4F4bhD+BJY=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "caf436a52b25164b71e0d48b671127ac2e2a5b75",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixpkgs-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
|
||||||
"inputs": {
|
|
||||||
"naersk": "naersk",
|
|
||||||
"nixpkgs": "nixpkgs_2",
|
|
||||||
"utils": "utils"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"utils": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681202837,
|
|
||||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": "root",
|
|
||||||
"version": 7
|
|
||||||
}
|
|
||||||
21
flake.nix
21
flake.nix
|
|
@ -1,21 +0,0 @@
|
||||||
{
|
|
||||||
inputs = {
|
|
||||||
naersk.url = "github:nix-community/naersk/master";
|
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
|
||||||
utils.url = "github:numtide/flake-utils";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = { self, nixpkgs, utils, naersk }:
|
|
||||||
utils.lib.eachDefaultSystem (system:
|
|
||||||
let
|
|
||||||
pkgs = import nixpkgs { inherit system; };
|
|
||||||
naersk-lib = pkgs.callPackage naersk { };
|
|
||||||
in
|
|
||||||
{
|
|
||||||
defaultPackage = naersk-lib.buildPackage ./.;
|
|
||||||
devShell = with pkgs; mkShell {
|
|
||||||
buildInputs = [ cargo rustc rustfmt pre-commit rustPackages.clippy ];
|
|
||||||
RUST_SRC_PATH = rustPlatform.rustLibSrc;
|
|
||||||
};
|
|
||||||
});
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 135 KiB |
|
|
@ -1,7 +0,0 @@
|
||||||
(import (
|
|
||||||
fetchTarball {
|
|
||||||
url = "https://github.com/edolstra/flake-compat/archive/99f1c2157fba4bfe6211a321fd0ee43199025dbf.tar.gz";
|
|
||||||
sha256 = "0x2jn3vrawwv9xp15674wjz9pixwjyj3j771izayl962zziivbx2"; }
|
|
||||||
) {
|
|
||||||
src = ./.;
|
|
||||||
}).shellNix
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
#[macro_export]
|
|
||||||
macro_rules! crate_version {
|
|
||||||
() => {
|
|
||||||
env!("CARGO_PKG_VERSION")
|
|
||||||
};
|
|
||||||
}
|
|
||||||
235
src/main.rs
235
src/main.rs
|
|
@ -1,43 +1,208 @@
|
||||||
use actix_web::{middleware::Logger, web, App, HttpServer};
|
use std::path::Path;
|
||||||
|
|
||||||
|
use askama::Template;
|
||||||
|
use percent_encoding::percent_decode_str;
|
||||||
|
use serde::Deserialize;
|
||||||
|
|
||||||
mod crate_version;
|
|
||||||
mod mpd;
|
mod mpd;
|
||||||
mod routes;
|
|
||||||
|
|
||||||
#[actix_web::main]
|
#[derive(Template)]
|
||||||
async fn main() -> std::io::Result<()> {
|
#[template(path = "index.html")]
|
||||||
let bind = std::env::var("EMPEDE_BIND").unwrap_or("0.0.0.0:8080".into());
|
struct IndexTemplate;
|
||||||
let (host, port) = bind.split_once(':').unwrap();
|
|
||||||
|
|
||||||
env_logger::init_from_env(env_logger::Env::new().default_filter_or("info"));
|
#[derive(Deserialize, Default)]
|
||||||
|
#[serde(default)]
|
||||||
|
struct IndexQuery {
|
||||||
|
path: String,
|
||||||
|
}
|
||||||
|
|
||||||
HttpServer::new(|| {
|
async fn get_index(_req: tide::Request<()>) -> tide::Result {
|
||||||
App::new().wrap(Logger::default()).service(
|
Ok(askama_tide::into_response(&IndexTemplate))
|
||||||
web::scope("")
|
}
|
||||||
.service(routes::index::get_index)
|
|
||||||
.service(routes::player::get_player)
|
#[derive(Template)]
|
||||||
.service(routes::browser::get_browser)
|
#[template(path = "queue.html")]
|
||||||
.service(routes::art::get_art)
|
struct QueueTemplate {
|
||||||
.service(routes::sse::idle)
|
queue: Vec<mpd::QueueItem>,
|
||||||
.service(routes::queue::get_queue)
|
}
|
||||||
.service(routes::queue::post_queue)
|
|
||||||
.service(routes::queue::delete_queue)
|
async fn get_queue(_req: tide::Request<()>) -> tide::Result {
|
||||||
.service(routes::queue::post_queue_move)
|
let queue = mpd::playlist()?;
|
||||||
.service(routes::controls::post_play)
|
let template = QueueTemplate { queue };
|
||||||
.service(routes::controls::post_pause)
|
Ok(template.into())
|
||||||
.service(routes::controls::post_previous)
|
}
|
||||||
.service(routes::controls::post_next)
|
|
||||||
.service(routes::controls::post_consume)
|
#[derive(Template)]
|
||||||
.service(routes::controls::post_random)
|
#[template(path = "player.html")]
|
||||||
.service(routes::controls::post_repeat)
|
struct PlayerTemplate {
|
||||||
.service(routes::controls::post_single)
|
song: Option<mpdrs::Song>,
|
||||||
.service(routes::controls::post_shuffle)
|
name: Option<String>,
|
||||||
.service(actix_files::Files::new("/static", "./static")),
|
state: mpdrs::State,
|
||||||
)
|
elapsed: f32,
|
||||||
})
|
duration: f32,
|
||||||
.bind((host, port.parse().unwrap()))?
|
}
|
||||||
.run()
|
|
||||||
.await?;
|
async fn get_player(_req: tide::Request<()>) -> tide::Result {
|
||||||
|
let mut mpd = mpd::connect()?;
|
||||||
|
let song = mpd.currentsong()?;
|
||||||
|
let status = mpd.status()?;
|
||||||
|
|
||||||
|
let elapsed = status.elapsed.map(|d| d.as_secs_f32()).unwrap_or(0.0);
|
||||||
|
let duration = status.duration.map(|d| d.as_secs_f32()).unwrap_or(0.0);
|
||||||
|
|
||||||
|
let mut template = PlayerTemplate {
|
||||||
|
song: song.clone(),
|
||||||
|
name: None,
|
||||||
|
state: status.state,
|
||||||
|
elapsed,
|
||||||
|
duration,
|
||||||
|
};
|
||||||
|
|
||||||
|
if let Some(song) = song {
|
||||||
|
let name = song.title.unwrap_or(song.file);
|
||||||
|
template.name = Some(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(template.into())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Template)]
|
||||||
|
#[template(path = "browser.html")]
|
||||||
|
struct BrowserTemplate {
|
||||||
|
path: Vec<String>,
|
||||||
|
entries: Vec<mpd::Entry>,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn get_browser(req: tide::Request<()>) -> tide::Result {
|
||||||
|
let query: IndexQuery = req.query()?;
|
||||||
|
let path = percent_decode_str(&query.path).decode_utf8_lossy();
|
||||||
|
let entries = mpd::ls(&path)?;
|
||||||
|
|
||||||
|
let template = BrowserTemplate {
|
||||||
|
path: Path::new(&*path)
|
||||||
|
.iter()
|
||||||
|
.map(|s| s.to_string_lossy().to_string())
|
||||||
|
.collect(),
|
||||||
|
entries,
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(template.into())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct PostQueueQuery {
|
||||||
|
path: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn post_queue(req: tide::Request<()>) -> tide::Result {
|
||||||
|
let query: PostQueueQuery = req.query()?;
|
||||||
|
let path = percent_decode_str(&query.path).decode_utf8_lossy();
|
||||||
|
mpd::connect()?.add(&path)?;
|
||||||
|
Ok("".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn delete_queue(_req: tide::Request<()>) -> tide::Result {
|
||||||
|
mpd::connect()?.clear()?;
|
||||||
|
Ok("".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn post_play(_req: tide::Request<()>) -> tide::Result {
|
||||||
|
mpd::connect()?.play()?;
|
||||||
|
Ok("".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn post_pause(_req: tide::Request<()>) -> tide::Result {
|
||||||
|
mpd::connect()?.pause(true)?;
|
||||||
|
Ok("".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn post_previous(_req: tide::Request<()>) -> tide::Result {
|
||||||
|
mpd::connect()?.prev()?;
|
||||||
|
Ok("".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn post_next(_req: tide::Request<()>) -> tide::Result {
|
||||||
|
mpd::connect()?.next()?;
|
||||||
|
Ok("".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize, Debug)]
|
||||||
|
struct UpdateQueueBody {
|
||||||
|
from: u32,
|
||||||
|
to: u32,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn post_queue_move(mut req: tide::Request<()>) -> tide::Result {
|
||||||
|
let body: UpdateQueueBody = req.body_json().await?;
|
||||||
|
let mut mpd = mpd::connect()?;
|
||||||
|
mpd.move_range(
|
||||||
|
mpdrs::song::Range(Some(body.from), Some(body.from + 1)),
|
||||||
|
body.to as usize,
|
||||||
|
)?;
|
||||||
|
Ok("".into())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn get_art(req: tide::Request<()>) -> tide::Result {
|
||||||
|
let query: IndexQuery = req.query()?;
|
||||||
|
let path = percent_decode_str(&query.path).decode_utf8_lossy();
|
||||||
|
let resp = if let Ok(art) = mpd::connect()?.albumart(&path) {
|
||||||
|
let mime = infer::get(&art)
|
||||||
|
.map(|k| k.mime_type())
|
||||||
|
.unwrap_or("application/octet-stream");
|
||||||
|
|
||||||
|
tide::Response::builder(tide::StatusCode::Ok)
|
||||||
|
.body(art)
|
||||||
|
.content_type(mime)
|
||||||
|
.header("cache-control", "max-age=3600")
|
||||||
|
} else {
|
||||||
|
tide::Response::builder(tide::StatusCode::NotFound)
|
||||||
|
};
|
||||||
|
Ok(resp.into())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn sse(_req: tide::Request<()>, sender: tide::sse::Sender) -> tide::Result<()> {
|
||||||
|
// Update everything on connect
|
||||||
|
sender.send("playlist", "", None).await?;
|
||||||
|
sender.send("player", "", None).await?;
|
||||||
|
|
||||||
|
loop {
|
||||||
|
let systems = mpd::idle(&["playlist", "player", "database"]).await?;
|
||||||
|
for system in systems {
|
||||||
|
sender.send(&system, "", None).await?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[async_std::main]
|
||||||
|
async fn main() -> tide::Result<()> {
|
||||||
|
tracing_subscriber::fmt()
|
||||||
|
.with_max_level(tracing::Level::INFO)
|
||||||
|
.init();
|
||||||
|
|
||||||
|
let mut app = tide::new();
|
||||||
|
app.with(tide_tracing::TraceMiddleware::new());
|
||||||
|
|
||||||
|
app.at("/").get(get_index);
|
||||||
|
app.at("/queue").get(get_queue);
|
||||||
|
app.at("/player").get(get_player);
|
||||||
|
app.at("/art").get(get_art);
|
||||||
|
app.at("/browser").get(get_browser);
|
||||||
|
|
||||||
|
app.at("/sse").get(tide::sse::endpoint(sse));
|
||||||
|
|
||||||
|
app.at("/queue").post(post_queue);
|
||||||
|
app.at("/queue").delete(delete_queue);
|
||||||
|
app.at("/queue/move").post(post_queue_move);
|
||||||
|
|
||||||
|
app.at("/play").post(post_play);
|
||||||
|
app.at("/pause").post(post_pause);
|
||||||
|
app.at("/previous").post(post_previous);
|
||||||
|
app.at("/next").post(post_next);
|
||||||
|
|
||||||
|
app.at("/static").serve_dir("static/")?;
|
||||||
|
|
||||||
|
let bind = std::env::var("EMPEDE_BIND").unwrap_or("0.0.0.0:8080".to_string());
|
||||||
|
app.listen(bind).await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
|
||||||
424
src/mpd.rs
424
src/mpd.rs
|
|
@ -1,31 +1,82 @@
|
||||||
use std::collections::HashMap;
|
use std::borrow::Cow;
|
||||||
|
|
||||||
use anyhow::anyhow;
|
use anyhow::anyhow;
|
||||||
use tokio::{
|
use async_std::{
|
||||||
io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufStream},
|
io::{prelude::BufReadExt, BufReader, WriteExt},
|
||||||
net::TcpStream,
|
net::TcpStream,
|
||||||
sync::{Mutex, MutexGuard, OnceCell},
|
|
||||||
};
|
};
|
||||||
|
use mpdrs::lsinfo::LsInfoResponse;
|
||||||
|
|
||||||
pub fn host() -> String {
|
pub(crate) fn host() -> String {
|
||||||
let host = std::env::var("MPD_HOST").unwrap_or("localhost".to_string());
|
let host = std::env::var("MPD_HOST").unwrap_or("localhost".to_string());
|
||||||
let port = std::env::var("MPD_PORT").unwrap_or("6600".to_string());
|
let port = std::env::var("MPD_PORT").unwrap_or("6600".to_string());
|
||||||
format!("{host}:{port}")
|
format!("{host}:{port}")
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct QueueItem {
|
pub(crate) fn connect() -> Result<mpdrs::Client, mpdrs::error::Error> {
|
||||||
pub id: u32,
|
mpdrs::Client::connect(host())
|
||||||
pub position: i32,
|
|
||||||
pub file: String,
|
|
||||||
pub title: String,
|
|
||||||
pub artist: Option<String>,
|
|
||||||
pub playing: bool,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
pub(crate) fn ls(path: &str) -> anyhow::Result<Vec<Entry>> {
|
||||||
pub enum Entry {
|
let info = connect()?.lsinfo(path)?;
|
||||||
|
|
||||||
|
fn filename(path: &str) -> Cow<str> {
|
||||||
|
std::path::Path::new(path)
|
||||||
|
.file_name()
|
||||||
|
.map(|x| x.to_string_lossy())
|
||||||
|
.unwrap_or(Cow::Borrowed("n/a"))
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(info
|
||||||
|
.iter()
|
||||||
|
.map(|e| match e {
|
||||||
|
LsInfoResponse::Song(song) => Entry::Song {
|
||||||
|
name: song.title.as_ref().unwrap_or(&song.file).clone(),
|
||||||
|
artist: song.artist.clone().unwrap_or(String::new()),
|
||||||
|
path: song.file.clone(),
|
||||||
|
},
|
||||||
|
|
||||||
|
LsInfoResponse::Directory { path, .. } => Entry::Directory {
|
||||||
|
name: filename(path).to_string(),
|
||||||
|
path: path.to_string(),
|
||||||
|
},
|
||||||
|
|
||||||
|
LsInfoResponse::Playlist { path, .. } => Entry::Playlist {
|
||||||
|
name: filename(path).to_string(),
|
||||||
|
path: path.to_string(),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) struct QueueItem {
|
||||||
|
pub(crate) file: String,
|
||||||
|
pub(crate) title: String,
|
||||||
|
pub(crate) artist: Option<String>,
|
||||||
|
pub(crate) playing: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn playlist() -> anyhow::Result<Vec<QueueItem>> {
|
||||||
|
let mut client = connect()?;
|
||||||
|
|
||||||
|
let current = client.status()?.song;
|
||||||
|
|
||||||
|
let queue = client
|
||||||
|
.queue()?
|
||||||
|
.into_iter()
|
||||||
|
.map(|song| QueueItem {
|
||||||
|
file: song.file.clone(),
|
||||||
|
title: song.title.as_ref().unwrap_or(&song.file).clone(),
|
||||||
|
artist: song.artist.clone(),
|
||||||
|
playing: current == song.place,
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
Ok(queue)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) enum Entry {
|
||||||
Song {
|
Song {
|
||||||
track: Option<i32>,
|
|
||||||
name: String,
|
name: String,
|
||||||
artist: String,
|
artist: String,
|
||||||
path: String,
|
path: String,
|
||||||
|
|
@ -40,332 +91,31 @@ pub enum Entry {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
pub(crate) async fn idle(systems: &[&str]) -> anyhow::Result<Vec<String>> {
|
||||||
pub struct Mpd {
|
let mut stream = TcpStream::connect(host()).await?;
|
||||||
bufstream: Option<BufStream<TcpStream>>,
|
let mut reader = BufReader::new(stream.clone());
|
||||||
}
|
|
||||||
|
|
||||||
pub static INSTANCE: OnceCell<Mutex<Mpd>> = OnceCell::const_new();
|
// skip OK MPD line
|
||||||
|
// TODO check if it is indeed OK
|
||||||
|
let mut buffer = String::new();
|
||||||
|
reader.read_line(&mut buffer).await?;
|
||||||
|
|
||||||
pub async fn get_instance() -> MutexGuard<'static, Mpd> {
|
let systems = systems.join(" ");
|
||||||
INSTANCE
|
let command = format!("idle {systems}\n");
|
||||||
.get_or_init(|| async {
|
stream.write_all(command.as_bytes()).await?;
|
||||||
let mut mpd = Mpd::new();
|
|
||||||
mpd.connect().await.unwrap();
|
|
||||||
Mutex::from(mpd)
|
|
||||||
})
|
|
||||||
.await
|
|
||||||
.lock()
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn command(command: &str) -> anyhow::Result<CommandResult> {
|
let mut updated = vec![];
|
||||||
get_instance().await.command(command).await
|
loop {
|
||||||
}
|
buffer.clear();
|
||||||
|
reader.read_line(&mut buffer).await?;
|
||||||
pub struct CommandResult {
|
if buffer == "OK\n" {
|
||||||
properties: Vec<(String, String)>,
|
break Ok(updated);
|
||||||
binary: Option<Vec<u8>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl CommandResult {
|
|
||||||
pub fn new(properties: Vec<(String, String)>) -> Self {
|
|
||||||
Self {
|
|
||||||
properties,
|
|
||||||
binary: None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn new_binary(properties: Vec<(String, String)>, binary: Vec<u8>) -> Self {
|
|
||||||
Self {
|
|
||||||
properties,
|
|
||||||
binary: Some(binary),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn into_hashmap(self) -> HashMap<String, String> {
|
|
||||||
self.properties.into_iter().collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn into_hashmaps(self, split_at: &[&str]) -> Vec<HashMap<String, String>> {
|
|
||||||
let mut output = Vec::new();
|
|
||||||
let mut current = None;
|
|
||||||
|
|
||||||
for (key, value) in self.properties {
|
|
||||||
if split_at.contains(&key.as_str()) {
|
|
||||||
if let Some(current) = current {
|
|
||||||
output.push(current);
|
|
||||||
}
|
|
||||||
current = Some(HashMap::new());
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(current) = current.as_mut() {
|
|
||||||
current.insert(key, value);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(current) = current {
|
let (_, changed) = buffer
|
||||||
output.push(current);
|
.trim_end()
|
||||||
}
|
.split_once(": ")
|
||||||
|
.ok_or(anyhow!("unexpected response from MPD"))?;
|
||||||
output
|
updated.push(changed.to_string());
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Mpd {
|
|
||||||
pub fn escape_str(s: &str) -> String {
|
|
||||||
s.replace('\"', "\\\"").replace('\'', "\\'")
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn new() -> Self {
|
|
||||||
Self { bufstream: None }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn connect(&mut self) -> anyhow::Result<()> {
|
|
||||||
let stream = TcpStream::connect(host()).await?;
|
|
||||||
let mut bufstream = BufStream::new(stream);
|
|
||||||
|
|
||||||
// skip OK MPD line
|
|
||||||
// TODO check if it is indeed OK
|
|
||||||
let mut buffer = String::new();
|
|
||||||
bufstream.read_line(&mut buffer).await?;
|
|
||||||
|
|
||||||
let password = std::env::var("MPD_PASSWORD").unwrap_or_default();
|
|
||||||
if !password.is_empty() {
|
|
||||||
let password = Self::escape_str(&password);
|
|
||||||
bufstream
|
|
||||||
.write_all(format!("password \"{password}\"\n").as_bytes())
|
|
||||||
.await?;
|
|
||||||
bufstream.flush().await?;
|
|
||||||
bufstream.read_line(&mut buffer).await?;
|
|
||||||
}
|
|
||||||
|
|
||||||
bufstream
|
|
||||||
.write_all("binarylimit 1048576\n".as_bytes())
|
|
||||||
.await?;
|
|
||||||
bufstream.flush().await?;
|
|
||||||
bufstream.read_line(&mut buffer).await?;
|
|
||||||
|
|
||||||
self.bufstream = Some(bufstream);
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn read_binary_data(&mut self, size: usize) -> anyhow::Result<Vec<u8>> {
|
|
||||||
let mut binary = vec![0u8; size];
|
|
||||||
self.bufstream
|
|
||||||
.as_mut()
|
|
||||||
.unwrap()
|
|
||||||
.read_exact(&mut binary)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let mut buffer = String::new();
|
|
||||||
|
|
||||||
// Skip the newline after the binary data
|
|
||||||
self.bufstream
|
|
||||||
.as_mut()
|
|
||||||
.unwrap()
|
|
||||||
.read_line(&mut buffer)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
// Skip the "OK" after the binary data
|
|
||||||
// TODO Check if actually OK
|
|
||||||
self.bufstream
|
|
||||||
.as_mut()
|
|
||||||
.unwrap()
|
|
||||||
.read_line(&mut buffer)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
Ok(binary)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn command(&mut self, command: &str) -> anyhow::Result<CommandResult> {
|
|
||||||
let mut properties = Vec::new();
|
|
||||||
|
|
||||||
'retry: loop {
|
|
||||||
self.bufstream
|
|
||||||
.as_mut()
|
|
||||||
.unwrap()
|
|
||||||
.write_all(format!("{command}\n").as_bytes())
|
|
||||||
.await?;
|
|
||||||
self.bufstream.as_mut().unwrap().flush().await?;
|
|
||||||
|
|
||||||
let mut buffer = String::new();
|
|
||||||
break 'retry (loop {
|
|
||||||
buffer.clear();
|
|
||||||
self.bufstream
|
|
||||||
.as_mut()
|
|
||||||
.unwrap()
|
|
||||||
.read_line(&mut buffer)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
if let Some((key, value)) = buffer.split_once(": ") {
|
|
||||||
let value = value.trim_end();
|
|
||||||
properties.push((key.to_string(), value.to_string()));
|
|
||||||
|
|
||||||
if key == "binary" {
|
|
||||||
let binary = self.read_binary_data(value.parse()?).await?;
|
|
||||||
break Ok(CommandResult::new_binary(properties, binary));
|
|
||||||
}
|
|
||||||
} else if buffer.starts_with("OK") {
|
|
||||||
break Ok(CommandResult::new(properties));
|
|
||||||
} else if buffer.starts_with("ACK") {
|
|
||||||
break Err(anyhow!(buffer));
|
|
||||||
} else {
|
|
||||||
println!("Unexpected MPD response '{buffer}'");
|
|
||||||
self.connect().await.unwrap();
|
|
||||||
continue 'retry;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn command_binary(&mut self, command: &str) -> anyhow::Result<CommandResult> {
|
|
||||||
let mut buffer = Vec::new();
|
|
||||||
|
|
||||||
loop {
|
|
||||||
let command = format!("{} {}", command, buffer.len());
|
|
||||||
let result = self.command(&command).await?;
|
|
||||||
|
|
||||||
if let Some(mut binary) = result.binary {
|
|
||||||
if !binary.is_empty() {
|
|
||||||
buffer.append(&mut binary);
|
|
||||||
} else {
|
|
||||||
return Ok(CommandResult::new_binary(result.properties, buffer));
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return Ok(CommandResult::new(result.properties));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn clear(&mut self) -> anyhow::Result<()> {
|
|
||||||
self.command("clear").await?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn add(&mut self, path: &str) -> anyhow::Result<()> {
|
|
||||||
let path = Self::escape_str(path);
|
|
||||||
self.command(&format!("add \"{path}\"")).await?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn add_position(&mut self, path: &str, position: &str) -> anyhow::Result<()> {
|
|
||||||
let path = Self::escape_str(path);
|
|
||||||
let position = Self::escape_str(position);
|
|
||||||
self.command(&format!(r#"add "{path}" "{position}""#))
|
|
||||||
.await?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn play(&mut self, position: Option<&str>) -> anyhow::Result<()> {
|
|
||||||
let command = match position {
|
|
||||||
Some(position) => format!(r#"play "{position}""#),
|
|
||||||
None => "play".into(),
|
|
||||||
};
|
|
||||||
self.command(&command).await?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn idle(&mut self, systems: &[&str]) -> anyhow::Result<Vec<String>> {
|
|
||||||
let systems = systems.join(" ");
|
|
||||||
let result = self.command(&format!("idle {systems}")).await?;
|
|
||||||
let changed = result
|
|
||||||
.properties
|
|
||||||
.iter()
|
|
||||||
.filter(|(key, _)| key == "changed")
|
|
||||||
.map(|(_, value)| value.clone())
|
|
||||||
.collect();
|
|
||||||
Ok(changed)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn albumart(&mut self, path: &str) -> anyhow::Result<Vec<u8>> {
|
|
||||||
let path = Self::escape_str(path);
|
|
||||||
let result = self
|
|
||||||
.command_binary(&format!(r#"albumart "{path}""#))
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
match result.binary {
|
|
||||||
Some(binary) => Ok(binary),
|
|
||||||
None => Err(anyhow!("no album art")),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn readpicture(&mut self, path: &str) -> anyhow::Result<Vec<u8>> {
|
|
||||||
let path = Self::escape_str(path);
|
|
||||||
let result = self
|
|
||||||
.command_binary(&format!(r#"readpicture "{path}""#))
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
match result.binary {
|
|
||||||
Some(binary) => Ok(binary),
|
|
||||||
None => Err(anyhow!("no album art")),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[allow(clippy::manual_map)]
|
|
||||||
pub async fn ls(&mut self, path: &str) -> anyhow::Result<Vec<Entry>> {
|
|
||||||
fn get_filename(path: &str) -> String {
|
|
||||||
std::path::Path::new(path)
|
|
||||||
.file_name()
|
|
||||||
.map(|x| x.to_string_lossy().to_string())
|
|
||||||
.unwrap_or("n/a".to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
let path = Self::escape_str(path);
|
|
||||||
let result = self
|
|
||||||
.command(&format!(r#"lsinfo "{path}""#))
|
|
||||||
.await?
|
|
||||||
.into_hashmaps(&["file", "directory", "playlist"]);
|
|
||||||
|
|
||||||
let files = result
|
|
||||||
.iter()
|
|
||||||
.flat_map(|prop| {
|
|
||||||
if let Some(file) = prop.get("file") {
|
|
||||||
Some(Entry::Song {
|
|
||||||
track: prop.get("Track").and_then(|track| track.parse().ok()),
|
|
||||||
name: prop.get("Title").unwrap_or(&get_filename(file)).clone(),
|
|
||||||
artist: prop.get("Artist").unwrap_or(&String::new()).clone(),
|
|
||||||
path: file.to_string(),
|
|
||||||
})
|
|
||||||
} else if let Some(file) = prop.get("directory") {
|
|
||||||
Some(Entry::Directory {
|
|
||||||
name: get_filename(file),
|
|
||||||
path: file.to_string(),
|
|
||||||
})
|
|
||||||
} else if let Some(file) = prop.get("playlist") {
|
|
||||||
Some(Entry::Playlist {
|
|
||||||
name: get_filename(file),
|
|
||||||
path: file.to_string(),
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
Ok(files)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn playlist(&mut self) -> anyhow::Result<Vec<QueueItem>> {
|
|
||||||
let status = self.command("status").await?.into_hashmap();
|
|
||||||
let current_songid = status.get("songid");
|
|
||||||
|
|
||||||
let playlistinfo = self.command("playlistinfo").await?;
|
|
||||||
let queue = playlistinfo.into_hashmaps(&["file"]);
|
|
||||||
|
|
||||||
let queue = queue
|
|
||||||
.iter()
|
|
||||||
.map(|song| QueueItem {
|
|
||||||
id: song["Id"].parse().unwrap(),
|
|
||||||
position: song["Pos"].parse().unwrap(),
|
|
||||||
file: song["file"].clone(),
|
|
||||||
title: song.get("Title").unwrap_or(&song["file"]).clone(),
|
|
||||||
artist: song.get("Artist").cloned(),
|
|
||||||
playing: current_songid == song.get("Id"),
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
Ok(queue)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
use crate::mpd;
|
|
||||||
use actix_web::{
|
|
||||||
get,
|
|
||||||
http::header::{self, CacheDirective},
|
|
||||||
web, HttpResponse, Responder,
|
|
||||||
};
|
|
||||||
use percent_encoding::percent_decode_str;
|
|
||||||
use serde::Deserialize;
|
|
||||||
|
|
||||||
#[derive(Deserialize, Default)]
|
|
||||||
#[serde(default)]
|
|
||||||
struct ArtQuery {
|
|
||||||
path: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[get("/art")]
|
|
||||||
pub async fn get_art(query: web::Query<ArtQuery>) -> impl Responder {
|
|
||||||
let path = percent_decode_str(&query.path).decode_utf8_lossy();
|
|
||||||
let mut mpd = mpd::get_instance().await;
|
|
||||||
|
|
||||||
if let Ok(art) = mpd.albumart(&path).await {
|
|
||||||
let mime = infer::get(&art)
|
|
||||||
.map(|k| k.mime_type())
|
|
||||||
.unwrap_or("application/octet-stream");
|
|
||||||
|
|
||||||
HttpResponse::Ok()
|
|
||||||
.content_type(mime)
|
|
||||||
.append_header(header::CacheControl(vec![CacheDirective::MaxAge(3600)]))
|
|
||||||
.body(art)
|
|
||||||
} else if let Ok(art) = mpd.readpicture(&path).await {
|
|
||||||
let mime = infer::get(&art)
|
|
||||||
.map(|k| k.mime_type())
|
|
||||||
.unwrap_or("application/octet-stream");
|
|
||||||
|
|
||||||
HttpResponse::Ok()
|
|
||||||
.content_type(mime)
|
|
||||||
.append_header(header::CacheControl(vec![CacheDirective::MaxAge(3600)]))
|
|
||||||
.body(art)
|
|
||||||
} else {
|
|
||||||
HttpResponse::NotFound().finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
use crate::mpd;
|
|
||||||
use actix_web::{get, web, Responder};
|
|
||||||
use askama::Template;
|
|
||||||
use percent_encoding::percent_decode_str;
|
|
||||||
use serde::Deserialize;
|
|
||||||
use std::path::Path;
|
|
||||||
|
|
||||||
#[derive(Template)]
|
|
||||||
#[template(path = "browser.html")]
|
|
||||||
struct BrowserTemplate {
|
|
||||||
path: Vec<String>,
|
|
||||||
entries: Vec<mpd::Entry>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize, Default)]
|
|
||||||
#[serde(default)]
|
|
||||||
struct BrowserQuery {
|
|
||||||
path: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[get("/browser")]
|
|
||||||
pub async fn get_browser(query: web::Query<BrowserQuery>) -> impl Responder {
|
|
||||||
let path = percent_decode_str(&query.path).decode_utf8_lossy();
|
|
||||||
let mut mpd = mpd::get_instance().await;
|
|
||||||
let entries = mpd.ls(&path).await.unwrap();
|
|
||||||
|
|
||||||
BrowserTemplate {
|
|
||||||
path: Path::new(&*path)
|
|
||||||
.iter()
|
|
||||||
.map(|s| s.to_string_lossy().to_string())
|
|
||||||
.collect(),
|
|
||||||
entries,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,76 +0,0 @@
|
||||||
use actix_web::{post, web, HttpResponse, Responder};
|
|
||||||
use serde::Deserialize;
|
|
||||||
|
|
||||||
use crate::mpd;
|
|
||||||
|
|
||||||
async fn toggle_setting(setting: &str) -> anyhow::Result<()> {
|
|
||||||
let mut mpd = mpd::get_instance().await;
|
|
||||||
|
|
||||||
let status = mpd.command("status").await?.into_hashmap();
|
|
||||||
let value = status[setting] == "1";
|
|
||||||
|
|
||||||
mpd.command(&format!("{} {}", setting, if value { 0 } else { 1 }))
|
|
||||||
.await?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
struct PostPlayQuery {
|
|
||||||
#[serde(default)]
|
|
||||||
position: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[post("/play")]
|
|
||||||
pub async fn post_play(query: web::Query<PostPlayQuery>) -> impl Responder {
|
|
||||||
let mut mpd = mpd::get_instance().await;
|
|
||||||
mpd.play(query.position.as_deref()).await.unwrap();
|
|
||||||
HttpResponse::NoContent()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[post("/pause")]
|
|
||||||
pub async fn post_pause() -> impl Responder {
|
|
||||||
mpd::command("pause 1").await.unwrap();
|
|
||||||
HttpResponse::NoContent()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[post("/previous")]
|
|
||||||
pub async fn post_previous() -> impl Responder {
|
|
||||||
mpd::command("previous").await.unwrap();
|
|
||||||
HttpResponse::NoContent()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[post("/next")]
|
|
||||||
pub async fn post_next() -> impl Responder {
|
|
||||||
mpd::command("next").await.unwrap();
|
|
||||||
HttpResponse::NoContent()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[post("/consume")]
|
|
||||||
pub async fn post_consume() -> impl Responder {
|
|
||||||
toggle_setting("consume").await.unwrap();
|
|
||||||
HttpResponse::NoContent()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[post("/random")]
|
|
||||||
pub async fn post_random() -> impl Responder {
|
|
||||||
toggle_setting("random").await.unwrap();
|
|
||||||
HttpResponse::NoContent()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[post("/repeat")]
|
|
||||||
pub async fn post_repeat() -> impl Responder {
|
|
||||||
toggle_setting("repeat").await.unwrap();
|
|
||||||
HttpResponse::NoContent()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[post("/shuffle")]
|
|
||||||
pub async fn post_shuffle() -> impl Responder {
|
|
||||||
mpd::command("shuffle").await.unwrap();
|
|
||||||
HttpResponse::NoContent()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[post("/single")]
|
|
||||||
pub async fn post_single() -> impl Responder {
|
|
||||||
toggle_setting("single").await.unwrap();
|
|
||||||
HttpResponse::NoContent()
|
|
||||||
}
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
use crate::crate_version;
|
|
||||||
use actix_web::{get, Responder};
|
|
||||||
use askama::Template;
|
|
||||||
use serde::Deserialize;
|
|
||||||
|
|
||||||
#[derive(Template)]
|
|
||||||
#[template(path = "index.html")]
|
|
||||||
struct IndexTemplate;
|
|
||||||
|
|
||||||
#[derive(Deserialize, Default)]
|
|
||||||
#[serde(default)]
|
|
||||||
struct IndexQuery {
|
|
||||||
path: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[get("/")]
|
|
||||||
pub async fn get_index() -> impl Responder {
|
|
||||||
IndexTemplate
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
pub mod art;
|
|
||||||
pub mod browser;
|
|
||||||
pub mod controls;
|
|
||||||
pub mod index;
|
|
||||||
pub mod player;
|
|
||||||
pub mod queue;
|
|
||||||
pub mod sse;
|
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
use crate::mpd;
|
|
||||||
use actix_web::{get, Responder};
|
|
||||||
use askama::Template;
|
|
||||||
use std::collections::HashMap;
|
|
||||||
|
|
||||||
#[derive(Template)]
|
|
||||||
#[template(path = "player.html")]
|
|
||||||
struct PlayerTemplate {
|
|
||||||
song: Option<HashMap<String, String>>,
|
|
||||||
name: Option<String>,
|
|
||||||
state: String,
|
|
||||||
consume: bool,
|
|
||||||
random: bool,
|
|
||||||
repeat: bool,
|
|
||||||
single: bool,
|
|
||||||
elapsed: f32,
|
|
||||||
duration: f32,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[get("/player")]
|
|
||||||
pub async fn get_player() -> impl Responder {
|
|
||||||
let mut mpd = mpd::get_instance().await;
|
|
||||||
let song = mpd.command("currentsong").await.unwrap().into_hashmap();
|
|
||||||
let status = mpd.command("status").await.unwrap().into_hashmap();
|
|
||||||
|
|
||||||
let elapsed = status
|
|
||||||
.get("elapsed")
|
|
||||||
.and_then(|e| e.parse().ok())
|
|
||||||
.unwrap_or(0.0);
|
|
||||||
let duration = status
|
|
||||||
.get("duration")
|
|
||||||
.and_then(|e| e.parse().ok())
|
|
||||||
.unwrap_or(1.0);
|
|
||||||
|
|
||||||
let mut template = PlayerTemplate {
|
|
||||||
song: if song.is_empty() {
|
|
||||||
None
|
|
||||||
} else {
|
|
||||||
Some(song.clone())
|
|
||||||
},
|
|
||||||
name: None,
|
|
||||||
state: status["state"].clone(),
|
|
||||||
consume: status["consume"] == "1",
|
|
||||||
random: status["random"] == "1",
|
|
||||||
repeat: status["repeat"] == "1",
|
|
||||||
single: status["single"] == "1",
|
|
||||||
elapsed,
|
|
||||||
duration,
|
|
||||||
};
|
|
||||||
|
|
||||||
if !song.is_empty() {
|
|
||||||
let name = song.get("Title").unwrap_or(&song["file"]).to_string();
|
|
||||||
template.name = Some(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
template
|
|
||||||
}
|
|
||||||
|
|
@ -1,84 +0,0 @@
|
||||||
use crate::mpd;
|
|
||||||
use actix_web::{delete, get, post, web, HttpResponse, Responder};
|
|
||||||
use askama::Template;
|
|
||||||
use percent_encoding::percent_decode_str;
|
|
||||||
use serde::Deserialize;
|
|
||||||
|
|
||||||
#[derive(Template)]
|
|
||||||
#[template(path = "queue.html")]
|
|
||||||
struct QueueTemplate {
|
|
||||||
queue: Vec<mpd::QueueItem>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[get("/queue")]
|
|
||||||
pub async fn get_queue() -> impl Responder {
|
|
||||||
let mut mpd = mpd::get_instance().await;
|
|
||||||
let queue = mpd.playlist().await.unwrap();
|
|
||||||
QueueTemplate { queue }
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
struct PostQueueQuery {
|
|
||||||
path: String,
|
|
||||||
#[serde(default)]
|
|
||||||
replace: bool,
|
|
||||||
#[serde(default)]
|
|
||||||
next: bool,
|
|
||||||
#[serde(default)]
|
|
||||||
play: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[post("/queue")]
|
|
||||||
pub async fn post_queue(query: web::Query<PostQueueQuery>) -> impl Responder {
|
|
||||||
let path = percent_decode_str(&query.path).decode_utf8_lossy();
|
|
||||||
let mut mpd = mpd::get_instance().await;
|
|
||||||
|
|
||||||
if query.replace {
|
|
||||||
mpd.clear().await.unwrap();
|
|
||||||
}
|
|
||||||
|
|
||||||
if query.next {
|
|
||||||
mpd.add_position(&path, "+0").await.unwrap();
|
|
||||||
} else {
|
|
||||||
mpd.add(&path).await.unwrap();
|
|
||||||
}
|
|
||||||
|
|
||||||
if query.play {
|
|
||||||
mpd.play(None).await.unwrap();
|
|
||||||
}
|
|
||||||
|
|
||||||
HttpResponse::NoContent()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
struct DeleteQueueQuery {
|
|
||||||
#[serde(default)]
|
|
||||||
id: Option<u32>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[delete("/queue")]
|
|
||||||
pub async fn delete_queue(query: web::Query<DeleteQueueQuery>) -> impl Responder {
|
|
||||||
let mut mpd = mpd::get_instance().await;
|
|
||||||
if let Some(id) = query.id {
|
|
||||||
mpd.command(&format!("deleteid {id}")).await.unwrap();
|
|
||||||
} else {
|
|
||||||
mpd.command("clear").await.unwrap();
|
|
||||||
}
|
|
||||||
|
|
||||||
HttpResponse::NoContent()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize, Debug)]
|
|
||||||
struct UpdateQueueBody {
|
|
||||||
from: u32,
|
|
||||||
to: u32,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[post("/queue/move")]
|
|
||||||
pub async fn post_queue_move(body: web::Json<UpdateQueueBody>) -> impl Responder {
|
|
||||||
let mut mpd = mpd::get_instance().await;
|
|
||||||
mpd.command(&format!("move {} {}", body.from, body.to))
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
HttpResponse::NoContent()
|
|
||||||
}
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
use std::time::Duration;
|
|
||||||
|
|
||||||
use actix_web::{get, Responder};
|
|
||||||
use actix_web_lab::sse;
|
|
||||||
|
|
||||||
use crate::mpd::Mpd;
|
|
||||||
|
|
||||||
#[get("/idle")]
|
|
||||||
pub async fn idle() -> impl Responder {
|
|
||||||
let mut mpd = Mpd::new();
|
|
||||||
mpd.connect().await.unwrap();
|
|
||||||
|
|
||||||
const SYSTEMS: &[&str] = &["playlist", "player", "database", "options"];
|
|
||||||
|
|
||||||
let (tx, rx) = tokio::sync::mpsc::channel(10);
|
|
||||||
for system in SYSTEMS {
|
|
||||||
_ = tx
|
|
||||||
.send(sse::Data::new("").event(system.to_owned()).into())
|
|
||||||
.await;
|
|
||||||
}
|
|
||||||
|
|
||||||
actix_web::rt::spawn(async move {
|
|
||||||
loop {
|
|
||||||
let systems = mpd.idle(SYSTEMS).await.unwrap();
|
|
||||||
|
|
||||||
for system in systems {
|
|
||||||
_ = tx.send(sse::Data::new("").event(system).into()).await;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
sse::Sse::from_infallible_receiver(rx).with_retry_duration(Duration::from_secs(10))
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.4 KiB |
135
static/style.css
135
static/style.css
|
|
@ -24,28 +24,14 @@ body {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
body > div {
|
||||||
|
padding: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
button {
|
button {
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
border: none;
|
border: none;
|
||||||
color: inherit;
|
color: inherit;
|
||||||
font-weight: bold;
|
|
||||||
display: flex;
|
|
||||||
line-height: 24px;
|
|
||||||
cursor: pointer;
|
|
||||||
padding: 0.25rem 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
button:hover {
|
|
||||||
background-color: rgba(255, 255, 255, 0.1);
|
|
||||||
border-radius: 0.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
button .material-symbols-outlined {
|
|
||||||
margin-right: 0.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.active {
|
|
||||||
color: #99f;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.browser {
|
.browser {
|
||||||
|
|
@ -76,96 +62,65 @@ ul {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.player > .queue {
|
|
||||||
flex: 1;
|
|
||||||
display: flex;
|
|
||||||
flex-flow: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
.queue-header {
|
.queue-header {
|
||||||
margin-top: 1.0rem;
|
margin-top: 1.0rem;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.queue-next {
|
.queue-next {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
.queue-clear {
|
||||||
|
font-weight: bold;
|
||||||
|
display: flex;
|
||||||
|
line-height: 24px;
|
||||||
|
}
|
||||||
|
.queue-clear .material-symbols-outlined {
|
||||||
|
margin-right: 0.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
.queue {
|
.queue {
|
||||||
margin-top: 0.5rem;
|
margin-top: 0.5rem;
|
||||||
overflow: auto;
|
|
||||||
scroll-behavior: smooth;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.queue ul li {
|
.queue li {
|
||||||
padding: 0 0.5rem;
|
padding: 0 0.5rem;
|
||||||
border-radius: .25rem;
|
border-radius: .25rem;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
cursor: grab;
|
|
||||||
}
|
|
||||||
.queue ul li:hover {
|
|
||||||
background-color: #223;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.queue ul li.playing {
|
.queue li.playing {
|
||||||
background-color: #334;
|
background-color: #334;
|
||||||
}
|
}
|
||||||
@media (prefers-contrast: more) {
|
@media (prefers-contrast: more) {
|
||||||
.queue ul li.playing {
|
.queue li.playing {
|
||||||
background-color: black;
|
background-color: black;
|
||||||
border: 2px solid white;
|
border: 2px solid white;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.queue ul .metadata {
|
.queue .metadata {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
.queue .song__name {
|
||||||
.queue ul .metadata * {
|
|
||||||
-webkit-line-clamp: 1;
|
|
||||||
line-clamp: 1;
|
|
||||||
-webkit-box-orient: vertical;
|
|
||||||
}
|
|
||||||
|
|
||||||
.queue ul .song__name {
|
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
display: -webkit-box;
|
display: -webkit-box;
|
||||||
}
|
-webkit-line-clamp: 2; /* number of lines to show */
|
||||||
|
line-clamp: 2;
|
||||||
.queue ul li:not(:hover) .remove {
|
-webkit-box-orient: vertical;
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.queue .remove button {
|
|
||||||
padding: 0.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.browser .header {
|
|
||||||
display: flex;
|
|
||||||
flex-flow: column;
|
|
||||||
background-color: #334;
|
|
||||||
border-radius: 0.25rem;
|
|
||||||
padding: 0.75rem 0.5rem;
|
|
||||||
margin: 16px 16px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.browser .buttons {
|
|
||||||
display: flex;
|
|
||||||
flex-flow: row;
|
|
||||||
margin-top: 0.25rem;
|
|
||||||
}
|
|
||||||
.browser .buttons button {
|
|
||||||
margin-right: 0.5rem;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ul.breadcrumb {
|
ul.breadcrumb {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
margin-bottom: 1rem;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
list-style: none;
|
list-style: none;
|
||||||
margin-left: 0.5rem;
|
background-color: #334;
|
||||||
|
border-radius: .25rem;
|
||||||
|
padding: .75rem 1rem;
|
||||||
|
margin: 16px 16px 0;
|
||||||
}
|
}
|
||||||
@media (prefers-contrast: more) {
|
@media (prefers-contrast: more) {
|
||||||
ul.breadcrumb {
|
ul.breadcrumb {
|
||||||
|
|
@ -194,7 +149,7 @@ ul.dir li {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
padding: 0.5rem 0.5rem;
|
padding: 0.5rem 0.5rem;
|
||||||
border-radius: 0.25rem;
|
border-radius: 0.25rem;
|
||||||
min-height: 3rem;
|
min-height: 4rem;
|
||||||
|
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
@ -215,24 +170,14 @@ ul.dir li .material-symbols-outlined {
|
||||||
|
|
||||||
.albumart {
|
.albumart {
|
||||||
border-radius: 0.25rem;
|
border-radius: 0.25rem;
|
||||||
|
background-color: #445;
|
||||||
width: 48px;
|
width: 48px;
|
||||||
height: 48px;
|
height: 48px;
|
||||||
background: #445 url(/static/placeholder.webp);
|
|
||||||
background-size: contain;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.albumart a {
|
.albumart a {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
.albumart img {
|
|
||||||
visibility: hidden;
|
|
||||||
border-radius: 0.25rem;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
object-fit: cover;
|
|
||||||
}
|
|
||||||
|
|
||||||
.queue .albumart {
|
.queue .albumart {
|
||||||
margin: 0.75rem;
|
margin: 0.75rem;
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
|
|
@ -242,15 +187,15 @@ ul.dir li .material-symbols-outlined {
|
||||||
margin-right: 0.75rem;
|
margin-right: 0.75rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.track {
|
.albumart img {
|
||||||
margin-right: 0.75rem;
|
border-radius: 0.25rem;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
object-fit: cover;
|
||||||
}
|
}
|
||||||
|
|
||||||
.player {
|
.player {
|
||||||
width: 25rem;
|
width: 25rem;
|
||||||
padding: 1rem 1rem 0;
|
|
||||||
display: flex;
|
|
||||||
flex-flow: column;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.player .nowplaying {
|
.player .nowplaying {
|
||||||
|
|
@ -259,7 +204,7 @@ ul.dir li .material-symbols-outlined {
|
||||||
flex-flow: column;
|
flex-flow: column;
|
||||||
background-color: #334;
|
background-color: #334;
|
||||||
border-radius: 0.25rem;
|
border-radius: 0.25rem;
|
||||||
height: 13.0rem;
|
height: 10.0rem;
|
||||||
}
|
}
|
||||||
@media (prefers-contrast: more) {
|
@media (prefers-contrast: more) {
|
||||||
.player .nowplaying {
|
.player .nowplaying {
|
||||||
|
|
@ -279,23 +224,15 @@ ul.dir li .material-symbols-outlined {
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.player .controls,
|
.player .controls {
|
||||||
.player .settings {
|
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-around;
|
justify-content: space-around;
|
||||||
padding: 0 0.5rem 0.25rem;
|
padding: 0 0.5rem 1.0rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.player .settings {
|
.player .control {
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.player .controls button {
|
|
||||||
font-size: 40px;
|
font-size: 40px;
|
||||||
}
|
}
|
||||||
.player .settings button {
|
|
||||||
font-size: 25px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.player .current {
|
.player .current {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
|
||||||
4
static/vendor/Sortable.min.js
vendored
4
static/vendor/Sortable.min.js
vendored
File diff suppressed because one or more lines are too long
209
static/vendor/htmx-sse.js
vendored
209
static/vendor/htmx-sse.js
vendored
|
|
@ -5,7 +5,7 @@ This extension adds support for Server Sent Events to htmx. See /www/extensions
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
(function() {
|
(function(){
|
||||||
|
|
||||||
/** @type {import("../htmx").HtmxInternalApi} */
|
/** @type {import("../htmx").HtmxInternalApi} */
|
||||||
var api;
|
var api;
|
||||||
|
|
@ -39,19 +39,17 @@ This extension adds support for Server Sent Events to htmx. See /www/extensions
|
||||||
|
|
||||||
switch (name) {
|
switch (name) {
|
||||||
|
|
||||||
case "htmx:beforeCleanupElement":
|
// Try to remove remove an EventSource when elements are removed
|
||||||
var internalData = api.getInternalData(evt.target)
|
case "htmx:beforeCleanupElement":
|
||||||
// Try to remove remove an EventSource when elements are removed
|
var internalData = api.getInternalData(evt.target)
|
||||||
if (internalData.sseEventSource) {
|
if (internalData.sseEventSource) {
|
||||||
internalData.sseEventSource.close();
|
internalData.sseEventSource.close();
|
||||||
}
|
}
|
||||||
|
return;
|
||||||
|
|
||||||
return;
|
// Try to create EventSources when elements are processed
|
||||||
|
case "htmx:afterProcessNode":
|
||||||
// Try to create EventSources when elements are processed
|
createEventSourceOnElement(evt.target);
|
||||||
case "htmx:afterProcessNode":
|
|
||||||
ensureEventSourceOnElement(evt.target);
|
|
||||||
registerSSE(evt.target);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -68,8 +66,8 @@ This extension adds support for Server Sent Events to htmx. See /www/extensions
|
||||||
* @param {string} url
|
* @param {string} url
|
||||||
* @returns EventSource
|
* @returns EventSource
|
||||||
*/
|
*/
|
||||||
function createEventSource(url) {
|
function createEventSource(url) {
|
||||||
return new EventSource(url, { withCredentials: true });
|
return new EventSource(url, {withCredentials:true});
|
||||||
}
|
}
|
||||||
|
|
||||||
function splitOnWhitespace(trigger) {
|
function splitOnWhitespace(trigger) {
|
||||||
|
|
@ -92,7 +90,7 @@ This extension adds support for Server Sent Events to htmx. See /www/extensions
|
||||||
function getLegacySSESwaps(elt) {
|
function getLegacySSESwaps(elt) {
|
||||||
var legacySSEValue = api.getAttributeValue(elt, "hx-sse");
|
var legacySSEValue = api.getAttributeValue(elt, "hx-sse");
|
||||||
var returnArr = [];
|
var returnArr = [];
|
||||||
if (legacySSEValue != null) {
|
if (legacySSEValue) {
|
||||||
var values = splitOnWhitespace(legacySSEValue);
|
var values = splitOnWhitespace(legacySSEValue);
|
||||||
for (var i = 0; i < values.length; i++) {
|
for (var i = 0; i < values.length; i++) {
|
||||||
var value = values[i].split(/:(.+)/);
|
var value = values[i].split(/:(.+)/);
|
||||||
|
|
@ -105,23 +103,62 @@ This extension adds support for Server Sent Events to htmx. See /www/extensions
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* registerSSE looks for attributes that can contain sse events, right
|
* createEventSourceOnElement creates a new EventSource connection on the provided element.
|
||||||
* now hx-trigger and sse-swap and adds listeners based on these attributes too
|
* If a usable EventSource already exists, then it is returned. If not, then a new EventSource
|
||||||
* the closest event source
|
* is created and stored in the element's internalData.
|
||||||
*
|
|
||||||
* @param {HTMLElement} elt
|
* @param {HTMLElement} elt
|
||||||
|
* @param {number} retryCount
|
||||||
|
* @returns {EventSource | null}
|
||||||
*/
|
*/
|
||||||
function registerSSE(elt) {
|
function createEventSourceOnElement(elt, retryCount) {
|
||||||
// Find closest existing event source
|
|
||||||
var sourceElement = api.getClosestMatch(elt, hasEventSource);
|
if (elt == null) {
|
||||||
if (sourceElement == null) {
|
return null;
|
||||||
// api.triggerErrorEvent(elt, "htmx:noSSESourceError")
|
|
||||||
return null; // no eventsource in parentage, orphaned element
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set internalData and source
|
var internalData = api.getInternalData(elt);
|
||||||
var internalData = api.getInternalData(sourceElement);
|
|
||||||
var source = internalData.sseEventSource;
|
// get URL from element's attribute
|
||||||
|
var sseURL = api.getAttributeValue(elt, "sse-connect");
|
||||||
|
|
||||||
|
|
||||||
|
if (sseURL == undefined) {
|
||||||
|
var legacyURL = getLegacySSEURL(elt)
|
||||||
|
if (legacyURL) {
|
||||||
|
sseURL = legacyURL;
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Connect to the EventSource
|
||||||
|
var source = htmx.createEventSource(sseURL);
|
||||||
|
internalData.sseEventSource = source;
|
||||||
|
|
||||||
|
// Create event handlers
|
||||||
|
source.onerror = function (err) {
|
||||||
|
|
||||||
|
// Log an error event
|
||||||
|
api.triggerErrorEvent(elt, "htmx:sseError", {error:err, source:source});
|
||||||
|
|
||||||
|
// If parent no longer exists in the document, then clean up this EventSource
|
||||||
|
if (maybeCloseSSESource(elt)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Otherwise, try to reconnect the EventSource
|
||||||
|
if (source.readyState === EventSource.CLOSED) {
|
||||||
|
retryCount = retryCount || 0;
|
||||||
|
var timeout = Math.random() * (2 ^ retryCount) * 500;
|
||||||
|
window.setTimeout(function() {
|
||||||
|
createEventSourceOnElement(elt, Math.min(7, retryCount+1));
|
||||||
|
}, timeout);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
source.onopen = function (evt) {
|
||||||
|
api.triggerEvent(elt, "htmx::sseOpen", {source: source});
|
||||||
|
}
|
||||||
|
|
||||||
// Add message handlers for every `sse-swap` attribute
|
// Add message handlers for every `sse-swap` attribute
|
||||||
queryAttributeOnThisOrChildren(elt, "sse-swap").forEach(function(child) {
|
queryAttributeOnThisOrChildren(elt, "sse-swap").forEach(function(child) {
|
||||||
|
|
@ -133,18 +170,14 @@ This extension adds support for Server Sent Events to htmx. See /www/extensions
|
||||||
var sseEventNames = getLegacySSESwaps(child);
|
var sseEventNames = getLegacySSESwaps(child);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (var i = 0; i < sseEventNames.length; i++) {
|
for (var i = 0 ; i < sseEventNames.length ; i++) {
|
||||||
var sseEventName = sseEventNames[i].trim();
|
var sseEventName = sseEventNames[i].trim();
|
||||||
var listener = function(event) {
|
var listener = function(event) {
|
||||||
|
|
||||||
// If the source is missing then close SSE
|
// If the parent is missing then close SSE and remove listener
|
||||||
if (maybeCloseSSESource(sourceElement)) {
|
if (maybeCloseSSESource(elt)) {
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If the body no longer contains the element, remove the listener
|
|
||||||
if (!api.bodyContains(child)) {
|
|
||||||
source.removeEventListener(sseEventName, listener);
|
source.removeEventListener(sseEventName, listener);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// swap the response into the DOM and trigger a notification
|
// swap the response into the DOM and trigger a notification
|
||||||
|
|
@ -153,7 +186,7 @@ This extension adds support for Server Sent Events to htmx. See /www/extensions
|
||||||
};
|
};
|
||||||
|
|
||||||
// Register the new listener
|
// Register the new listener
|
||||||
api.getInternalData(child).sseEventListener = listener;
|
api.getInternalData(elt).sseEventListener = listener;
|
||||||
source.addEventListener(sseEventName, listener);
|
source.addEventListener(sseEventName, listener);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -171,87 +204,25 @@ This extension adds support for Server Sent Events to htmx. See /www/extensions
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// remove the sse: prefix from here on out
|
var listener = function(event) {
|
||||||
sseEventName = sseEventName.substr(4);
|
|
||||||
|
|
||||||
var listener = function() {
|
// If parent is missing, then close SSE and remove listener
|
||||||
if (maybeCloseSSESource(sourceElement)) {
|
if (maybeCloseSSESource(elt)) {
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!api.bodyContains(child)) {
|
|
||||||
source.removeEventListener(sseEventName, listener);
|
source.removeEventListener(sseEventName, listener);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Trigger events to be handled by the rest of htmx
|
||||||
|
htmx.trigger(child, sseEventName, event);
|
||||||
|
htmx.trigger(child, "htmx:sseMessage", event);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Register the new listener
|
||||||
|
api.getInternalData(elt).sseEventListener = listener;
|
||||||
|
source.addEventListener(sseEventName.slice(4), listener);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* ensureEventSourceOnElement creates a new EventSource connection on the provided element.
|
|
||||||
* If a usable EventSource already exists, then it is returned. If not, then a new EventSource
|
|
||||||
* is created and stored in the element's internalData.
|
|
||||||
* @param {HTMLElement} elt
|
|
||||||
* @param {number} retryCount
|
|
||||||
* @returns {EventSource | null}
|
|
||||||
*/
|
|
||||||
function ensureEventSourceOnElement(elt, retryCount) {
|
|
||||||
|
|
||||||
if (elt == null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// handle extension source creation attribute
|
|
||||||
queryAttributeOnThisOrChildren(elt, "sse-connect").forEach(function(child) {
|
|
||||||
var sseURL = api.getAttributeValue(child, "sse-connect");
|
|
||||||
if (sseURL == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ensureEventSource(child, sseURL, retryCount);
|
|
||||||
});
|
|
||||||
|
|
||||||
// handle legacy sse, remove for HTMX2
|
|
||||||
queryAttributeOnThisOrChildren(elt, "hx-sse").forEach(function(child) {
|
|
||||||
var sseURL = getLegacySSEURL(child);
|
|
||||||
if (sseURL == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ensureEventSource(child, sseURL, retryCount);
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
function ensureEventSource(elt, url, retryCount) {
|
|
||||||
var source = htmx.createEventSource(url);
|
|
||||||
|
|
||||||
source.onerror = function(err) {
|
|
||||||
|
|
||||||
// Log an error event
|
|
||||||
api.triggerErrorEvent(elt, "htmx:sseError", { error: err, source: source });
|
|
||||||
|
|
||||||
// If parent no longer exists in the document, then clean up this EventSource
|
|
||||||
if (maybeCloseSSESource(elt)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Otherwise, try to reconnect the EventSource
|
|
||||||
if (source.readyState === EventSource.CLOSED) {
|
|
||||||
retryCount = retryCount || 0;
|
|
||||||
var timeout = Math.random() * (2 ^ retryCount) * 500;
|
|
||||||
window.setTimeout(function() {
|
|
||||||
ensureEventSourceOnElement(elt, Math.min(7, retryCount + 1));
|
|
||||||
}, timeout);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
source.onopen = function(evt) {
|
|
||||||
api.triggerEvent(elt, "htmx:sseOpen", { source: source });
|
|
||||||
}
|
|
||||||
|
|
||||||
api.getInternalData(elt).sseEventSource = source;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* maybeCloseSSESource confirms that the parent element still exists.
|
* maybeCloseSSESource confirms that the parent element still exists.
|
||||||
* If not, then any associated SSE source is closed and the function returns true.
|
* If not, then any associated SSE source is closed and the function returns true.
|
||||||
|
|
@ -282,12 +253,12 @@ This extension adds support for Server Sent Events to htmx. See /www/extensions
|
||||||
var result = [];
|
var result = [];
|
||||||
|
|
||||||
// If the parent element also contains the requested attribute, then add it to the results too.
|
// If the parent element also contains the requested attribute, then add it to the results too.
|
||||||
if (api.hasAttribute(elt, attributeName)) {
|
if (api.hasAttribute(elt, attributeName) || api.hasAttribute(elt, "hx-sse")) {
|
||||||
result.push(elt);
|
result.push(elt);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Search all child nodes that match the requested attribute
|
// Search all child nodes that match the requested attribute
|
||||||
elt.querySelectorAll("[" + attributeName + "], [data-" + attributeName + "]").forEach(function(node) {
|
elt.querySelectorAll("[" + attributeName + "], [data-" + attributeName + "], [hx-sse], [data-hx-sse]").forEach(function(node) {
|
||||||
result.push(node);
|
result.push(node);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -310,7 +281,7 @@ This extension adds support for Server Sent Events to htmx. See /www/extensions
|
||||||
|
|
||||||
api.selectAndSwap(swapSpec.swapStyle, target, elt, content, settleInfo);
|
api.selectAndSwap(swapSpec.swapStyle, target, elt, content, settleInfo);
|
||||||
|
|
||||||
settleInfo.elts.forEach(function(elt) {
|
settleInfo.elts.forEach(function (elt) {
|
||||||
if (elt.classList) {
|
if (elt.classList) {
|
||||||
elt.classList.add(htmx.config.settlingClass);
|
elt.classList.add(htmx.config.settlingClass);
|
||||||
}
|
}
|
||||||
|
|
@ -335,11 +306,11 @@ This extension adds support for Server Sent Events to htmx. See /www/extensions
|
||||||
function doSettle(settleInfo) {
|
function doSettle(settleInfo) {
|
||||||
|
|
||||||
return function() {
|
return function() {
|
||||||
settleInfo.tasks.forEach(function(task) {
|
settleInfo.tasks.forEach(function (task) {
|
||||||
task.call();
|
task.call();
|
||||||
});
|
});
|
||||||
|
|
||||||
settleInfo.elts.forEach(function(elt) {
|
settleInfo.elts.forEach(function (elt) {
|
||||||
if (elt.classList) {
|
if (elt.classList) {
|
||||||
elt.classList.remove(htmx.config.settlingClass);
|
elt.classList.remove(htmx.config.settlingClass);
|
||||||
}
|
}
|
||||||
|
|
@ -348,8 +319,4 @@ This extension adds support for Server Sent Events to htmx. See /www/extensions
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function hasEventSource(node) {
|
|
||||||
return api.getInternalData(node).sseEventSource != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
})();
|
})();
|
||||||
2
static/vendor/htmx.min.js
vendored
2
static/vendor/htmx.min.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -1,56 +1,38 @@
|
||||||
{# #}
|
{# #}
|
||||||
<div class="header">
|
<ul class="breadcrumb">
|
||||||
<ul class="breadcrumb">
|
<li>
|
||||||
<li>
|
<a
|
||||||
<a
|
href="/"
|
||||||
href="/"
|
hx-replace-url="/"
|
||||||
hx-replace-url="/"
|
hx-get="/browser"
|
||||||
hx-get="/browser"
|
hx-vals='{"path": ""}'
|
||||||
hx-vals='{"path": ""}'
|
hx-target=".browser"
|
||||||
hx-target=".browser"
|
>Root</a>
|
||||||
>Root</a>
|
</li>
|
||||||
</li>
|
{% for (i, component) in path.iter().enumerate() %}
|
||||||
{% for (i, component) in path.iter().enumerate() %}
|
<li>
|
||||||
<li>
|
{% if i == path.len() - 1 %}
|
||||||
{% if i == path.len() - 1 %}
|
{{ component }}
|
||||||
{{ component }}
|
{% else %}
|
||||||
{% else %}
|
<a
|
||||||
<a
|
{% let encoded = path[..i + 1].join("/")|urlencode %}
|
||||||
{% let encoded = path[..i + 1].join("/")|urlencode %}
|
href="/?path={{ encoded }}"
|
||||||
href="/?path={{ encoded }}"
|
hx-replace-url="/?path={{ encoded }}"
|
||||||
hx-replace-url="/?path={{ encoded }}"
|
hx-get="/browser"
|
||||||
hx-get="/browser"
|
hx-vals='{"path": "{{ encoded }}"}'
|
||||||
hx-vals='{"path": "{{ encoded }}"}'
|
hx-target=".browser"
|
||||||
hx-target=".browser"
|
>{{ component }}</a>
|
||||||
>{{ component }}</a>
|
{% endif %}
|
||||||
{% endif %}
|
</li>
|
||||||
</li>
|
{% endfor %}
|
||||||
{% endfor %}
|
</ul>
|
||||||
</ul>
|
|
||||||
|
|
||||||
<div class="buttons">
|
|
||||||
{% let encoded = path.join("/")|urlencode %}
|
|
||||||
<button hx-delete="/queue" hx-swap="none" hx-post="/queue?path={{ encoded }}">
|
|
||||||
<span class="material-symbols-outlined">playlist_add</span>
|
|
||||||
Queue all
|
|
||||||
</button>
|
|
||||||
<button hx-delete="/queue" hx-swap="none" hx-post="/queue?path={{ encoded }}&replace=true&play=true">
|
|
||||||
<span class="material-symbols-outlined">playlist_play</span>
|
|
||||||
Play all
|
|
||||||
</button>
|
|
||||||
<button hx-delete="/queue" hx-swap="none" hx-post="/queue?path={{ encoded }}&next=true">
|
|
||||||
<span class="material-symbols-outlined">playlist_add</span>
|
|
||||||
Play next
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<ul class="dir" hx-boost="true" tabindex="-1">
|
<ul class="dir" hx-boost="true" tabindex="-1">
|
||||||
{% for entry in entries %}
|
{% for entry in entries %}
|
||||||
{% match entry %}
|
{% match entry %}
|
||||||
{% when mpd::Entry::Song with { track, name, path, artist } %}
|
{% when mpd::Entry::Song with { name, path, artist } %}
|
||||||
<li
|
<li
|
||||||
hx-post="/queue?path={{ path|urlencode }}"
|
hx-post="/queue?path={{path}}"
|
||||||
hx-trigger="click,keyup[key=='Enter']"
|
hx-trigger="click,keyup[key=='Enter']"
|
||||||
hx-swap="none"
|
hx-swap="none"
|
||||||
role="button"
|
role="button"
|
||||||
|
|
@ -58,17 +40,8 @@
|
||||||
>
|
>
|
||||||
<span class="material-symbols-outlined" title="Song">music_note</span>
|
<span class="material-symbols-outlined" title="Song">music_note</span>
|
||||||
<div class="albumart">
|
<div class="albumart">
|
||||||
<img
|
<img src="/art?path={{path}}" onerror="this.style.visibility = 'hidden'">
|
||||||
src="/art?path={{ path|urlencode }}"
|
|
||||||
onload="this.style.visibility = 'visible'"
|
|
||||||
alt="Album art"
|
|
||||||
>
|
|
||||||
</div>
|
</div>
|
||||||
{% if let Some(track) = track %}
|
|
||||||
<div class="track">
|
|
||||||
{{ track }}.
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
<div class="song">
|
<div class="song">
|
||||||
<div class="song__name">{{ name }}</div>
|
<div class="song__name">{{ name }}</div>
|
||||||
<div class="song__artist">{{ artist }}</div>
|
<div class="song__artist">{{ artist }}</div>
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,6 @@
|
||||||
<head>
|
<head>
|
||||||
<title>Empede</title>
|
<title>Empede</title>
|
||||||
|
|
||||||
<!-- Empede version: {{ crate_version!() }} -->
|
|
||||||
|
|
||||||
<!-- Source: https://github.com/bigskysoftware/htmx -->
|
<!-- Source: https://github.com/bigskysoftware/htmx -->
|
||||||
<script src="/static/vendor/htmx.min.js"></script>
|
<script src="/static/vendor/htmx.min.js"></script>
|
||||||
<script src="/static/vendor/htmx-sse.js"></script>
|
<script src="/static/vendor/htmx-sse.js"></script>
|
||||||
|
|
@ -24,7 +22,7 @@
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body hx-ext="sse" sse-connect="/idle">
|
<body hx-ext="sse" sse-connect="/sse">
|
||||||
<div
|
<div
|
||||||
class="browser"
|
class="browser"
|
||||||
hx-trigger="load,sse:database"
|
hx-trigger="load,sse:database"
|
||||||
|
|
@ -33,21 +31,8 @@
|
||||||
></div>
|
></div>
|
||||||
|
|
||||||
<div class="player">
|
<div class="player">
|
||||||
<div class="nowplaying" hx-trigger="sse:player,sse:options" hx-get="/player"></div>
|
<div hx-trigger="sse:player" hx-get="/player"></div>
|
||||||
|
<div hx-trigger="sse:playlist,sse:player" hx-get="/queue"></div>
|
||||||
<div class="queue-header">
|
|
||||||
<div class="queue-next">Next in queue</div>
|
|
||||||
<button hx-delete="/queue" hx-swap="none">
|
|
||||||
<span class="material-symbols-outlined">playlist_remove</span>
|
|
||||||
Clear
|
|
||||||
</button>
|
|
||||||
<button hx-post="/shuffle" hx-swap="none">
|
|
||||||
<span class="material-symbols-outlined">shuffle</span>
|
|
||||||
Shuffle
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="queue" hx-trigger="sse:playlist,sse:player" hx-get="/queue"></div>
|
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -1,98 +1,70 @@
|
||||||
{# #}
|
{# #}
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
|
|
||||||
<div class="current">
|
<div class="nowplaying">
|
||||||
{% if let Some(song) = song %}
|
<div class="current">
|
||||||
<div class="albumart">
|
{% if let Some(song) = song %}
|
||||||
<a href="/art?path={{ song["file"]|urlencode }}" target="_blank">
|
<div class="albumart">
|
||||||
<img
|
<a href="/art?path={{ song.file|urlencode }}" target="_blank">
|
||||||
src="/art?path={{ song["file"]|urlencode }}"
|
<img
|
||||||
onload="this.style.visibility = 'visible'"
|
src="/art?path={{ song.file|urlencode }}"
|
||||||
alt="Album art"
|
onerror="this.style.opacity = 0"
|
||||||
>
|
alt="Album art"
|
||||||
</a>
|
title="Album art"
|
||||||
</div>
|
>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="metadata">
|
<div class="metadata">
|
||||||
{% if let Some(name) = name %}
|
{% if let Some(name) = name %}
|
||||||
<div class="song__name" title="Song name">{{ name }}</div>
|
<div class="song__name" title="Song name">{{ name }}</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if let Some(artist) = song.get("Artist") %}
|
{% if let Some(artist) = song.artist %}
|
||||||
<div class="song__artist" title="Artist">{{ artist }}</div>
|
<div class="song__artist" title="Artist">{{ artist }}</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
{% else %}
|
||||||
|
<div class="metadata idle">
|
||||||
|
Nothing playing right now
|
||||||
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% else %}
|
|
||||||
<div class="metadata idle">
|
<div class="controls" hx-swap="none" hx-trigger="click,keyUp[key=='Enter']">
|
||||||
Nothing playing right now
|
<button
|
||||||
|
hx-post="/previous"
|
||||||
|
class="control material-symbols-outlined" role="button" title="Previous track"
|
||||||
|
>skip_previous</button>
|
||||||
|
|
||||||
|
{% if state == mpdrs::State::Play %}
|
||||||
|
<button
|
||||||
|
hx-post="/pause"
|
||||||
|
class="control material-symbols-outlined" role="button" title="Pause"
|
||||||
|
>pause</button>
|
||||||
|
{% else %}
|
||||||
|
<button
|
||||||
|
hx-post="/play"
|
||||||
|
class="control material-symbols-outlined" role="button" title="Play"
|
||||||
|
>play_arrow</button>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<button
|
||||||
|
hx-post="/next"
|
||||||
|
class="control material-symbols-outlined" role="button" title="Next track"
|
||||||
|
>skip_next</button>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
|
||||||
|
<div class="progress" style="width: {{ elapsed / duration * 100.0 }}%"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="controls" hx-swap="none" hx-trigger="click,keyUp[key=='Enter']">
|
|
||||||
<button
|
|
||||||
hx-post="/previous"
|
|
||||||
class="control material-symbols-outlined" role="button" title="Previous track"
|
|
||||||
>skip_previous</button>
|
|
||||||
|
|
||||||
{% if state == "play" %}
|
|
||||||
<button
|
|
||||||
hx-post="/pause"
|
|
||||||
class="control material-symbols-outlined" role="button" title="Pause"
|
|
||||||
>pause</button>
|
|
||||||
{% else %}
|
|
||||||
<button
|
|
||||||
hx-post="/play"
|
|
||||||
class="control material-symbols-outlined" role="button" title="Play"
|
|
||||||
>play_arrow</button>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<button
|
|
||||||
hx-post="/next"
|
|
||||||
class="control material-symbols-outlined" role="button" title="Next track"
|
|
||||||
>skip_next</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="settings" hx-swap="none" hx-trigger="click,keyUp[key=='Enter']">
|
|
||||||
<button
|
|
||||||
hx-post="/consume"
|
|
||||||
class="control material-symbols-outlined {% if consume %}active{% endif %}"
|
|
||||||
role="button" title="Consume"
|
|
||||||
style="font-size: 32px"
|
|
||||||
>delete_sweep</button>
|
|
||||||
|
|
||||||
<button
|
|
||||||
hx-post="/random"
|
|
||||||
class="control material-symbols-outlined {% if random %}active{% endif %}"
|
|
||||||
role="button" title="Shuffle"
|
|
||||||
>shuffle</button>
|
|
||||||
|
|
||||||
<button
|
|
||||||
hx-post="/repeat"
|
|
||||||
class="control material-symbols-outlined {% if repeat %}active{% endif %}"
|
|
||||||
role="button" title="Repeat"
|
|
||||||
>repeat</button>
|
|
||||||
|
|
||||||
<button
|
|
||||||
hx-post="/single"
|
|
||||||
class="control material-symbols-outlined {% if single %}active{% endif %}"
|
|
||||||
role="button" title="Single"
|
|
||||||
>filter_1</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="progress" style="width: {{ elapsed / duration * 100.0 }}%"></div>
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
{% if let Some(name) = name %}
|
{% if let Some(name) = name %}
|
||||||
{% if state == "play" %}
|
document.title = "{{ name }} - Empede";
|
||||||
document.title = "▶ " + {{ name|json|safe }} + " - Empede";
|
|
||||||
{% else %}
|
|
||||||
document.title = "⏸ " + {{ name|json|safe }} + " - Empede";
|
|
||||||
{% endif %}
|
|
||||||
{% else %}
|
{% else %}
|
||||||
document.title = "Empede";
|
document.title = "Empede";
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if state == "play" %}
|
{% if state == mpdrs::State::Play %}
|
||||||
progressBar = document.querySelector(".nowplaying .progress");
|
progressBar = document.querySelector(".nowplaying .progress");
|
||||||
elapsed = {{ elapsed }};
|
elapsed = {{ elapsed }};
|
||||||
duration = {{ duration }};
|
duration = {{ duration }};
|
||||||
|
|
|
||||||
|
|
@ -1,19 +1,23 @@
|
||||||
{# Template #}
|
{# Template #}
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
|
|
||||||
<ul>
|
<div class="queue-header">
|
||||||
|
<div class="queue-next">Next in queue</div>
|
||||||
|
<button class="queue-clear" role="button" hx-delete="/queue">
|
||||||
|
<span class="material-symbols-outlined">playlist_remove</span>
|
||||||
|
Clear
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<ul class="queue">
|
||||||
{% for item in queue %}
|
{% for item in queue %}
|
||||||
<li
|
<li {% if item.playing %}class="playing"{% endif %}>
|
||||||
{% if item.playing %}class="playing"{% endif %}
|
|
||||||
hx-post="/play?position={{ item.position|urlencode }}"
|
|
||||||
hx-trigger="click,keyup[key='Enter']"
|
|
||||||
hx-swap="none"
|
|
||||||
>
|
|
||||||
<div class="albumart">
|
<div class="albumart">
|
||||||
<img
|
<img
|
||||||
src="/art?path={{ item.file|urlencode }}"
|
src="/art?path={{ item.file|urlencode }}"
|
||||||
onload="this.style.visibility = 'visible'"
|
onerror="this.style.opacity = 0"
|
||||||
alt="Album art"
|
alt="Album art"
|
||||||
|
title="Album art"
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<div class="metadata">
|
<div class="metadata">
|
||||||
|
|
@ -22,28 +26,17 @@
|
||||||
<div class="song__artist" title="Artist">{{ artist }}</div>
|
<div class="song__artist" title="Artist">{{ artist }}</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
<div class="remove">
|
|
||||||
<button class="material-symbols-outlined" title="Remove" hx-delete="/queue?id={{ item.id }}">close</button>
|
|
||||||
</div>
|
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
htmx.onLoad(() => {
|
htmx.onLoad(() => {
|
||||||
const scrollCurrentSongIntoView = () => {
|
|
||||||
const hoveredSong = document.querySelector(".queue li:hover");
|
|
||||||
if (hoveredSong === null) {
|
|
||||||
const currentSong = document.querySelector(".queue li.playing");
|
|
||||||
currentSong?.scrollIntoView({ block: "nearest" });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const isReduced = window
|
const isReduced = window
|
||||||
.matchMedia("(prefers-reduced-motion: reduce)")
|
.matchMedia("(prefers-reduced-motion: reduce)")
|
||||||
.matches;
|
.matches;
|
||||||
|
|
||||||
new Sortable(document.querySelector(".queue ul"), {
|
new Sortable(document.querySelector(".queue"), {
|
||||||
animation: isReduced ? 0 : 100,
|
animation: isReduced ? 0 : 100,
|
||||||
onEnd: (event) => fetch("/queue/move", {
|
onEnd: (event) => fetch("/queue/move", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
|
|
@ -51,7 +44,5 @@ htmx.onLoad(() => {
|
||||||
body: JSON.stringify({from: event.oldIndex, to: event.newIndex}),
|
body: JSON.stringify({from: event.oldIndex, to: event.newIndex}),
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
|
||||||
scrollCurrentSongIntoView();
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
Loading…
Reference in a new issue