Compare commits

...
2 Commits
Author SHA1 Message Date
Ansho Rei d4de15acd8 feat: keep several logins and switch between them
config.toml now holds a list of [[server]] logins and the active one.
The single-login file of earlier versions loads as the only entry.

Settings lists the servers first: confirm switches, the queue button
pressed twice removes, and Add server opens the login form, which can
now be cancelled. Removing the last login returns to the login screen.

A switch saves the queue of the server being left, stops the player and
restores the other server's saved queue paused. Player events sent
before the stop are dropped by an epoch, and cover loads started for the
old server by a generation, so nothing of one server shows on the other.
Covers are cached on disk per server, keyed like the saved queue.

The shoulder triggers wrap around the sections, which puts Settings one
press from the first section.
2026-11-04 18:23:30 +01:00
Ansho Rei 0bcba21f1a feat: control playback through MPRIS
Remus owns org.mpris.MediaPlayer2.remus on the session bus and serves
the root and player interfaces: play, pause, play-pause, stop, next,
previous and quit, with the playback status, track metadata, position
and volume. Desktops route media keys to the active MPRIS player, and
headphone buttons arrive as media keys, so this is how they reach remus.

Reading the headphones' input devices directly was ruled out: keyboard
type devices, AVRCP included, are root:input, and only gamepads are
opened up to the logged-in user. Seeking is not offered (CanSeek false).

The Flatpak gets --own-name for the bus name.
2026-11-04 17:57:32 +01:00
12 changed files with 910 additions and 50 deletions
+14
View File
@@ -2,6 +2,20 @@
One section per version, newest first.
## v0.8.0 (2026-11-04)
### Features
- Remus keeps several logins and switches between them from Settings, where the servers are listed first. Add server opens the login form, and Cancel goes back. Each server keeps its own queue: switching away stops it, and switching back brings it back paused where it was. A server is removed by pressing the queue button twice on its row.
- The shoulder triggers wrap around the sidebar, so Settings is one press back from Recently added.
- An existing login is kept as the first of the list, with nothing to re-enter.
## v0.7.0 (2026-11-04)
### Features
- Remus is an MPRIS player, so media keys, headphone buttons and the desktop's media controls can play, pause and skip, and the desktop shows the track that is playing. Headphone buttons work wherever the system passes them to MPRIS, as KDE does in Desktop Mode.
## v0.6.8 (2026-11-04)
### Features
Generated
+1 -1
View File
@@ -4385,7 +4385,7 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
[[package]]
name = "remus"
version = "0.6.8"
version = "0.8.0"
dependencies = [
"anyhow",
"directories",
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "remus"
version = "0.6.8"
version = "0.8.0"
edition = "2024"
license = "MIT"
@@ -20,6 +20,8 @@
</supports>
<content_rating type="oars-1.1"/>
<releases>
<release version="0.8.0" date="2026-11-04"/>
<release version="0.7.0" date="2026-11-04"/>
<release version="0.6.8" date="2026-11-04"/>
<release version="0.6.7" date="2026-11-04"/>
<release version="0.6.6" date="2026-11-04"/>
+3
View File
@@ -18,6 +18,9 @@ finish-args:
# Keeps the screensaver off while music plays, the way Chromium and
# Electron apps do. The XDG portal route needs no permission.
- --talk-name=org.freedesktop.ScreenSaver
# MPRIS, through which the desktop's media keys and headphone buttons
# reach the player.
- --own-name=org.mpris.MediaPlayer2.remus
build-options:
append-path: /usr/lib/sdk/rust-stable/bin
+347 -37
View File
@@ -16,8 +16,9 @@ use slint::{Color, ComponentHandle, Image, ModelRc, Rgb8Pixel, SharedPixelBuffer
use tokio::runtime::Handle;
use tokio::sync::Semaphore;
use crate::config::{self, Config, Settings};
use crate::config::{self, Config, Logins, Settings};
use crate::inhibit::Inhibitor;
use crate::mpris::{self, Mpris};
use crate::palette::{Lab, Palette, Role, Tone};
use crate::player::{Player, PlayerEvent};
use crate::prompts::{self, Control, Family, Prompts};
@@ -134,6 +135,9 @@ enum Setting {
ShowHintBar,
/// The version, listed while the hint bar that normally shows it is off.
Version,
/// A saved login, by index into `Logins::servers`.
Server(usize),
AddServer,
}
/// How long the UI takes to change from one palette to the next.
@@ -217,7 +221,12 @@ struct Covers {
pending: HashSet<CoverKey>,
failed: HashSet<CoverKey>,
limit: Arc<Semaphore>,
/// Per server, under `root`, since ids are only unique within a server.
dir: Option<PathBuf>,
root: Option<PathBuf>,
/// Bumped on a server switch, so a load started for the old server is
/// dropped when it lands instead of filling the new server's cache.
generation: u64,
}
pub struct App {
@@ -227,6 +236,15 @@ pub struct App {
player: Option<Player>,
/// Keeps the screensaver off while music plays. Taken at shutdown.
inhibitor: Option<Inhibitor>,
/// Media keys, headphone buttons and the desktop's media controls.
mpris: Mpris,
/// Every saved login and the one being browsed.
logins: Logins,
/// Bumped when the player is stopped for a server switch; player events
/// sent before that are dropped.
player_epoch: Arc<std::sync::atomic::AtomicU64>,
/// A server row whose remove button was pressed once, and when.
remove_armed: Option<(usize, Instant)>,
screen: Screen,
area: Area,
section: usize,
@@ -297,12 +315,19 @@ impl App {
log::warn!("cover cache disabled, cannot create {}: {e}", d.display());
}
let inhibitor = Inhibitor::spawn(&rt);
let mpris = Mpris::spawn(&rt, |c| {
let _ = slint::invoke_from_event_loop(move || with_app(move |app| app.mpris_command(c)));
});
App {
ui,
rt,
client: None,
player: None,
inhibitor: Some(inhibitor),
mpris,
logins: Logins::default(),
player_epoch: Arc::default(),
remove_armed: None,
screen: Screen::Login,
area: Area::Content,
section: 0,
@@ -319,7 +344,9 @@ impl App {
pending: HashSet::new(),
failed: HashSet::new(),
limit: Arc::new(Semaphore::new(6)),
dir,
dir: None,
root: dir,
generation: 0,
},
queue: Vec::new(),
current: None,
@@ -359,8 +386,18 @@ impl App {
let labels: Vec<SharedString> = SECTIONS.iter().map(|s| s.label().into()).collect();
self.ui.set_sections(ModelRc::new(VecModel::from(labels)));
match Player::spawn(|ev| {
let _ = slint::invoke_from_event_loop(move || with_app(move |app| app.player_event(ev)));
let epoch = self.player_epoch.clone();
match Player::spawn(move |ev| {
// Stamped when sent, so an event still on its way when the
// server is switched is recognised as the old server's.
let sent = epoch.load(std::sync::atomic::Ordering::Relaxed);
let _ = slint::invoke_from_event_loop(move || {
with_app(move |app| {
if app.player_epoch.load(std::sync::atomic::Ordering::Relaxed) == sent {
app.player_event(ev);
}
})
});
}) {
Ok(p) => self.player = Some(p),
Err(e) => {
@@ -371,15 +408,20 @@ impl App {
self.apply_volume();
match config::load() {
Ok(Some(cfg)) => {
log::info!("using saved login for {} on {}", cfg.username, cfg.url);
self.ui.set_login_server(cfg.url.clone().into());
self.ui.set_login_username(cfg.username.clone().into());
self.enter_browse(cfg.client());
}
Ok(None) => {
log::info!("no saved login, showing the login screen");
self.show_login();
Ok(logins) => {
self.logins = logins;
match self.logins.active().cloned() {
Some(cfg) => {
log::info!("using saved login for {} on {}", cfg.username, cfg.url);
self.ui.set_login_server(cfg.url.clone().into());
self.ui.set_login_username(cfg.username.clone().into());
self.enter_browse(cfg.client());
}
None => {
log::info!("no saved login, showing the login screen");
self.show_login();
}
}
}
Err(e) => {
log::error!("could not read the saved login: {e:#}");
@@ -407,9 +449,33 @@ impl App {
fn show_login(&mut self) {
self.screen = Screen::Login;
self.ui.set_screen(Screen::Login);
// Adding a server from inside the app: the bottom button goes back.
self.ui.set_login_can_cancel(self.client.is_some());
self.set_login_focus(0);
}
/// The login form, empty, for one more server.
fn add_server(&mut self) {
self.ui.set_login_server("".into());
self.ui.set_login_username("".into());
self.ui.set_login_password("".into());
self.ui.set_login_error("".into());
self.show_login();
}
/// Leaves the login form for the server that was being browsed.
fn cancel_login(&mut self) {
if self.client.is_none() {
return;
}
self.ui.set_login_password("".into());
self.ui.set_login_error("".into());
self.screen = Screen::Browse;
self.ui.set_screen(Screen::Browse);
let area = self.area;
self.set_area(area);
}
fn set_login_focus(&mut self, i: i32) {
self.login_focus = i.clamp(0, 4);
self.ui.set_login_focus(self.login_focus);
@@ -422,8 +488,10 @@ impl App {
Action::Up | Action::SectionPrev => self.set_login_focus(self.login_focus - 1),
Action::Down | Action::SectionNext => self.set_login_focus(self.login_focus + 1),
Action::Activate if self.login_focus < 2 => self.set_login_focus(self.login_focus + 1),
Action::Activate if self.login_focus == 4 && self.client.is_some() => self.cancel_login(),
Action::Activate if self.login_focus == 4 => self.action(Action::Quit),
Action::Activate => self.login_submit(),
Action::Back => self.cancel_login(),
_ => {}
}
}
@@ -456,10 +524,9 @@ impl App {
match r {
Ok(client) => {
app.ui.set_login_password("".into());
if let Err(e) = config::save(&Config::from_client(&client)) {
app.toast(format!("Could not save settings: {e:#}"));
}
app.enter_browse(client);
app.logins.add(Config::from_client(&client));
app.save_logins();
app.switch_server(client);
}
Err(e) => app.ui.set_login_error(login_error(&e).into()),
}
@@ -471,9 +538,20 @@ impl App {
let host = client.base().split("://").nth(1).unwrap_or(client.base()).to_string();
self.ui
.set_server_label(format!("{} on {}", client.user(), host).into());
// Keyed like the saved queue, by user and full address.
let key = sanitize(&format!("{}@{}", client.user(), client.base()));
self.covers.dir = self.covers.root.as_ref().map(|r| r.join(key));
if let Some(d) = &self.covers.dir
&& let Err(e) = std::fs::create_dir_all(d)
{
log::warn!("cover cache disabled, cannot create {}: {e}", d.display());
self.covers.dir = None;
}
self.client = Some(client);
self.covers.generation += 1;
self.covers.images.clear();
self.covers.tones.clear();
self.covers.prints.clear();
self.covers.pending.clear();
self.covers.failed.clear();
for stack in &mut self.stacks {
@@ -489,6 +567,107 @@ impl App {
}
}
/// Browses `client`'s server. The server being left keeps its queue on
/// disk and stops; the new one's saved queue comes back paused, so a
/// switch never starts music by itself.
fn switch_server(&mut self, client: Client) {
if self.client.is_some() {
self.save_queue();
self.stop_player();
self.queue.clear();
self.current = None;
self.queue_sel = 0;
self.position = 0.0;
self.duration = 0.0;
self.paused = false;
self.held = false;
self.scrobbled = false;
self.now_playing_due = false;
self.restoring = None;
self.art_shown = None;
self.flip_timer.stop();
self.ui.set_np_flip_out(false);
}
log::info!("browsing {} on {}", client.user(), client.base());
self.enter_browse(client);
self.render_player();
self.sync_queue(true);
self.sync_inhibit();
}
/// Stops playback for good, dropping whatever the player still has on
/// its way about the old queue.
fn stop_player(&self) {
if let Some(p) = &self.player {
p.stop();
}
self.player_epoch.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
}
fn save_logins(&mut self) {
if let Err(e) = config::save(&self.logins) {
self.toast(format!("Could not save the logins: {e:#}"));
}
}
fn select_server(&mut self, i: usize) {
if i == self.logins.active {
return;
}
let Some(cfg) = self.logins.servers.get(i).cloned() else {
return;
};
self.logins.active = i;
self.save_logins();
self.switch_server(cfg.client());
self.toast(format!("Switched to {}", cfg.label()));
}
/// The first press arms, a second within a few seconds removes.
fn remove_server(&mut self, i: usize) {
let Some(cfg) = self.logins.servers.get(i).cloned() else {
return;
};
let armed = self
.remove_armed
.is_some_and(|(j, at)| j == i && at.elapsed() < Duration::from_secs(4));
if !armed {
self.remove_armed = Some((i, Instant::now()));
self.toast(format!("Press again to remove {}", cfg.label()));
return;
}
self.remove_armed = None;
let was_active = i == self.logins.active;
self.logins.remove(i);
self.save_logins();
self.toast(format!("Removed {}", cfg.label()));
if !was_active {
self.refresh_settings();
return;
}
match self.logins.active().cloned() {
Some(next) => self.switch_server(next.client()),
None => {
// Nothing left to browse: stop, keep the queue on disk.
self.save_queue();
self.stop_player();
self.queue.clear();
self.current = None;
self.client = None;
self.render_player();
self.add_server();
}
}
}
/// The section that `delta` steps away, wrapping around, so Settings is
/// one press back from the first section.
fn section_step(&self, delta: isize) -> usize {
let n = SECTIONS.len() as isize;
let from = self.section.min(SECTIONS.len() - 1) as isize;
(from + delta).rem_euclid(n) as usize
}
// ---------------------------------------------------------------- input
/// A key pressed in the window.
@@ -595,8 +774,10 @@ impl App {
}
match self.area {
Area::Sidebar => match a {
Action::Up | Action::SectionPrev => self.select_section(self.section.saturating_sub(1)),
Action::Down | Action::SectionNext => self.select_section((self.section + 1).min(SECTIONS.len() - 1)),
Action::Up => self.select_section(self.section.saturating_sub(1)),
Action::Down => self.select_section((self.section + 1).min(SECTIONS.len() - 1)),
Action::SectionPrev => self.select_section(self.section_step(-1)),
Action::SectionNext => self.select_section(self.section_step(1)),
Action::Activate if SECTIONS[self.section] == Section::Random => {
self.reload_root();
self.enter_content();
@@ -613,9 +794,12 @@ impl App {
}
Action::Activate => self.activate(),
Action::Back => self.back(),
Action::Queue => self.enqueue_selected(),
Action::SectionNext => self.select_section((self.section + 1).min(SECTIONS.len() - 1)),
Action::SectionPrev => self.select_section(self.section.saturating_sub(1)),
Action::Queue => match self.selected_setting() {
Some(Setting::Server(i)) => self.remove_server(i),
_ => self.enqueue_selected(),
},
Action::SectionNext => self.select_section(self.section_step(1)),
Action::SectionPrev => self.select_section(self.section_step(-1)),
_ => {}
},
Area::Search => match a {
@@ -629,8 +813,8 @@ impl App {
self.run_search(q);
}
Action::Back | Action::Left => self.set_area(Area::Sidebar),
Action::SectionNext => self.select_section((self.section + 1).min(SECTIONS.len() - 1)),
Action::SectionPrev => self.select_section(self.section.saturating_sub(1)),
Action::SectionNext => self.select_section(self.section_step(1)),
Action::SectionPrev => self.select_section(self.section_step(-1)),
_ => {}
},
}
@@ -903,6 +1087,14 @@ impl App {
}
}
fn selected_setting(&self) -> Option<Setting> {
let page = self.current_page()?;
match page.entries.get(page.sel)?.target {
Target::Setting(s) => Some(s),
_ => None,
}
}
/// The range setting under the selection, which left and right adjust.
fn selected_range_setting(&self) -> Option<Setting> {
let page = self.current_page()?;
@@ -918,6 +1110,8 @@ impl App {
match setting {
Setting::AlbumArtColours => self.settings.album_art_colours = !self.settings.album_art_colours,
Setting::ShowHintBar => self.settings.show_hint_bar = !self.settings.show_hint_bar,
Setting::Server(i) => return self.select_server(i),
Setting::AddServer => return self.add_server(),
// A range: left and right change it, confirm does nothing.
Setting::CoverBackdrop | Setting::Version => return,
}
@@ -934,7 +1128,11 @@ impl App {
}
self.settings.cover_backdrop = v;
}
Setting::AlbumArtColours | Setting::ShowHintBar | Setting::Version => return,
Setting::AlbumArtColours
| Setting::ShowHintBar
| Setting::Version
| Setting::Server(_)
| Setting::AddServer => return,
}
self.settings_changed();
}
@@ -944,19 +1142,28 @@ impl App {
if let Err(e) = config::save_settings(&self.settings) {
self.toast(format!("Could not save settings: {e:#}"));
}
let entries = settings_data(&self.settings).entries;
let index = SECTIONS.iter().position(|s| *s == Section::Settings).unwrap_or(0);
if let Some(page) = self.stacks[index].first_mut() {
page.entries = entries;
if self.section == index {
self.sync_items(true);
}
}
self.refresh_settings();
self.render_backdrop();
self.ui.set_show_hint_bar(self.settings.show_hint_bar);
self.update_theme();
}
/// Redraws the Settings rows, keeping the selection in range.
fn refresh_settings(&mut self) {
let entries = settings_data(&self.settings, &self.logins).entries;
let index = SECTIONS.iter().position(|s| *s == Section::Settings).unwrap_or(0);
if let Some(page) = self.stacks[index].first_mut() {
page.sel = page.sel.min(entries.len().saturating_sub(1));
page.entries = entries;
if self.section == index {
let sel = page.sel;
self.ui.set_selected(sel as i32);
self.sync_items(true);
self.render_hints();
}
}
}
fn render_backdrop(&self) {
let (opacity, left, right) = backdrop_look(self.settings.cover_backdrop);
self.ui.set_np_backdrop_opacity(opacity);
@@ -1001,6 +1208,7 @@ impl App {
}
self.ui.set_volume(self.settings.volume as i32);
self.ui.set_muted(self.settings.muted);
self.sync_mpris();
}
fn show_volume(&mut self) {
@@ -1127,7 +1335,7 @@ impl App {
fn load(&mut self, page_id: u64, source: Source) {
if matches!(source, Source::Section(Section::Settings)) {
let data = settings_data(&self.settings);
let data = settings_data(&self.settings, &self.logins);
self.page_loaded(page_id, Ok(data), true);
return;
}
@@ -1455,12 +1663,17 @@ impl App {
};
match self.screen {
Screen::Login => {
let adding = self.client.is_some();
let label = match self.login_focus {
0 | 1 => "Next",
4 if adding => "Cancel",
4 => "Exit",
_ => "Connect",
};
h(Control::Activate, label);
if adding {
h(Control::Back, "Cancel");
}
}
Screen::Browse => match self.area {
Area::Sidebar => {
@@ -1483,6 +1696,13 @@ impl App {
Some(Target::Song(_)) => h(Control::Activate, "Play"),
Some(Target::Setting(Setting::CoverBackdrop)) => h(Control::Seek, "Adjust"),
Some(Target::Setting(Setting::Version)) => {}
Some(Target::Setting(Setting::Server(i))) => {
if *i != self.logins.active {
h(Control::Activate, "Switch");
}
h(Control::Queue, "Remove");
}
Some(Target::Setting(Setting::AddServer)) => h(Control::Activate, "Add"),
Some(Target::Setting(_)) => h(Control::Activate, "Change"),
Some(_) => h(Control::Activate, "Open"),
None if self.current_page().is_some_and(|p| p.error.is_some()) => {
@@ -1579,6 +1799,7 @@ impl App {
.as_ref()
.map(|d| d.join(format!("{}_{px}", sanitize(id))));
let id = id.to_string();
let generation = self.covers.generation;
self.spawn(
async move {
let _permit = limit.acquire_owned().await?;
@@ -1596,7 +1817,11 @@ impl App {
let decoded = tokio::task::spawn_blocking(move || decode_cover(&bytes, px)).await??;
Ok(decoded)
},
move |app, r| app.cover_loaded(key, r),
move |app, r| {
if app.covers.generation == generation {
app.cover_loaded(key, r);
}
},
);
None
}
@@ -1821,6 +2046,54 @@ impl App {
}
}
self.sync_inhibit();
self.sync_mpris();
}
/// Tells MPRIS clients what is playing.
fn sync_mpris(&self) {
let track = self.current.and_then(|i| self.queue.get(i).map(|s| (i, s)));
let status = match track {
None => mpris::Status::Stopped,
Some(_) if self.paused || self.held => mpris::Status::Paused,
Some(_) => mpris::Status::Playing,
};
let volume = if self.settings.muted {
0.0
} else {
self.settings.volume as f64 / 100.0
};
self.mpris.update(mpris::NowPlaying {
status,
track: track.map(|(index, s)| mpris::Track {
index,
title: s.title.clone(),
artist: s.artist.clone(),
album: s.album.clone(),
seconds: s.duration,
}),
volume,
});
}
/// A media key, headphone button or desktop control, through MPRIS.
fn mpris_command(&mut self, c: mpris::Command) {
let playing = self.current.is_some() && !self.paused && !self.held;
let action = match c {
mpris::Command::PlayPause => Action::PlayPause,
mpris::Command::Play if !playing => Action::PlayPause,
mpris::Command::Pause | mpris::Command::Stop if playing => Action::PlayPause,
mpris::Command::Next => Action::Next,
mpris::Command::Previous => Action::Prev,
mpris::Command::Quit => Action::Quit,
_ => return,
};
log::debug!("MPRIS {c:?}");
// Not on the login screen: nothing is loaded there.
if action == Action::Quit {
self.action(action);
} else if self.screen != Screen::Login {
self.global_action(action);
}
}
/// Inhibits only while sound is coming out: a restored queue is loaded
@@ -1927,6 +2200,7 @@ impl App {
self.ui.set_np_progress(progress as f32);
self.ui.set_np_position(fmt_time(self.position).into());
self.ui.set_np_duration(fmt_time(self.duration).into());
self.mpris.set_position(self.position);
}
fn render_player(&mut self) {
@@ -1954,6 +2228,7 @@ impl App {
}
}
self.render_progress();
self.sync_mpris();
self.update_theme();
}
@@ -2227,8 +2502,41 @@ fn song_entry(s: &Song, index: usize) -> Entry {
}
}
fn settings_data(s: &Settings) -> PageData {
fn settings_data(s: &Settings, logins: &Logins) -> PageData {
let on_off = |on: bool| if on { "On" } else { "Off" }.to_string();
let mut servers: Vec<Entry> = logins
.servers
.iter()
.enumerate()
.map(|(i, cfg)| Entry {
title: cfg.label(),
subtitle: if i == logins.active {
"Browsing now".to_string()
} else {
"Saved login".to_string()
},
detail: if i == logins.active {
"Active".to_string()
} else {
String::new()
},
number: String::new(),
cover: None,
round: false,
show_art: false,
target: Target::Setting(Setting::Server(i)),
})
.collect();
servers.push(Entry {
title: "Add server".to_string(),
subtitle: "Log in to another Subsonic server, keeping this one".to_string(),
detail: String::new(),
number: String::new(),
cover: None,
round: false,
show_art: false,
target: Target::Setting(Setting::AddServer),
});
let mut data = PageData {
entries: vec![
Entry {
@@ -2268,6 +2576,8 @@ fn settings_data(s: &Settings) -> PageData {
],
..Default::default()
};
// Servers first, so switching is the shortest reach in Settings.
data.entries.splice(0..0, servers);
// The bar is where the version normally shows.
if !s.show_hint_bar {
data.entries.push(Entry {
@@ -2512,7 +2822,7 @@ mod tests {
show_hint_bar,
..Settings::default()
};
settings_data(&s)
settings_data(&s, &Logins::default())
.entries
.iter()
.any(|e| e.target == Target::Setting(Setting::Version))
+159 -9
View File
@@ -69,21 +69,104 @@ pub fn state_dir() -> Option<PathBuf> {
dirs().map(|d| d.state_dir().unwrap_or(d.data_dir()).to_path_buf())
}
pub fn load() -> Result<Option<Config>> {
let Some(path) = config_path() else { return Ok(None) };
impl Config {
/// Names the server and user, as the sidebar shows them.
pub fn label(&self) -> String {
let host = self.url.split("://").nth(1).unwrap_or(&self.url);
format!("{} on {}", self.username, host.trim_end_matches('/'))
}
fn same_login(&self, other: &Config) -> bool {
self.url == other.url && self.username == other.username
}
}
/// Every saved login, and which one is browsed.
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
pub struct Logins {
/// Index into `servers`.
#[serde(default)]
pub active: usize,
/// `[[server]]` tables in the file.
#[serde(rename = "server", default)]
pub servers: Vec<Config>,
}
impl Logins {
pub fn active(&self) -> Option<&Config> {
self.servers.get(self.active)
}
/// Adds a login, or refreshes the saved one for the same server and user,
/// and makes it the active one.
pub fn add(&mut self, cfg: Config) {
match self.servers.iter().position(|s| s.same_login(&cfg)) {
Some(i) => {
self.servers[i] = cfg;
self.active = i;
}
None => {
self.servers.push(cfg);
self.active = self.servers.len() - 1;
}
}
}
/// Removes a login. The active one stays the same server where it can;
/// removing it makes the first remaining login active.
pub fn remove(&mut self, i: usize) {
if i >= self.servers.len() {
return;
}
self.servers.remove(i);
if i < self.active {
self.active -= 1;
} else if i == self.active {
self.active = 0;
}
}
}
/// The single login of earlier versions, or the list. Tried in that order:
/// every field of the list has a default, so it would take an old file as an
/// empty list, while the old shape needs `url` and `username` at the top.
#[derive(Deserialize)]
#[serde(untagged)]
enum Stored {
One(Config),
List(Logins),
}
fn parse_logins(text: &str) -> Result<Logins> {
Ok(match toml::from_str::<Stored>(text)? {
Stored::List(mut l) => {
if l.active >= l.servers.len() {
l.active = 0;
}
l
}
Stored::One(c) => Logins {
active: 0,
servers: vec![c],
},
})
}
pub fn load() -> Result<Logins> {
let Some(path) = config_path() else {
return Ok(Logins::default());
};
match fs::read_to_string(&path) {
Ok(text) => Ok(Some(
toml::from_str(&text).with_context(|| format!("parsing {}", path.display()))?,
)),
Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(None),
Ok(text) => parse_logins(&text).with_context(|| format!("parsing {}", path.display())),
Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(Logins::default()),
Err(e) => Err(e).with_context(|| format!("reading {}", path.display())),
}
}
pub fn save(cfg: &Config) -> Result<()> {
pub fn save(logins: &Logins) -> Result<()> {
let path = config_path().context("no config directory")?;
write_atomic(&path, &toml::to_string(cfg)?)?;
log::info!("saved login to {}", path.display());
write_atomic(&path, &toml::to_string(logins)?)?;
log::info!("saved {} login(s) to {}", logins.servers.len(), path.display());
Ok(())
}
@@ -212,6 +295,73 @@ mod tests {
assert!(!text.contains("salt") && !text.contains("token"), "{text}");
}
fn login(url: &str, user: &str, auth: Auth) -> Config {
Config::from_client(&Client::new(url, user, auth))
}
#[test]
fn a_single_login_file_loads_as_the_only_login() {
let old = "url = \"https://h\"\nusername = \"u\"\nsalt = \"s\"\ntoken = \"t\"\n";
let l = parse_logins(old).unwrap();
assert_eq!(l.servers.len(), 1);
assert_eq!(l.active, 0);
assert_eq!(l.active().unwrap().username, "u");
let old = "url = \"https://h\"\nusername = \"u\"\npassword = \"p\"\n";
let l = parse_logins(old).unwrap();
assert_eq!(*l.active().unwrap().client().auth(), Auth::Password("p".into()));
}
#[test]
fn the_login_list_round_trips_with_both_auth_methods() {
let mut l = Logins::default();
l.add(login(
"https://a",
"u",
Auth::Token {
salt: "s".into(),
token: "t".into(),
},
));
l.add(login("https://b", "v", Auth::Password("p".into())));
let text = toml::to_string(&l).unwrap();
assert!(text.contains("[[server]]"), "{text}");
let back = parse_logins(&text).unwrap();
assert_eq!(back, l);
assert_eq!(back.active, 1);
}
#[test]
fn adding_the_same_login_again_replaces_it() {
let mut l = Logins::default();
l.add(login("https://a", "u", Auth::Password("old".into())));
l.add(login("https://b", "u", Auth::Password("p".into())));
l.add(login("https://a", "u", Auth::Password("new".into())));
assert_eq!(l.servers.len(), 2);
assert_eq!(l.active, 0);
assert_eq!(*l.servers[0].client().auth(), Auth::Password("new".into()));
}
#[test]
fn removing_keeps_the_active_server_where_it_can() {
let mut l = Logins::default();
for host in ["https://a", "https://b", "https://c"] {
l.add(login(host, "u", Auth::Password("p".into())));
}
l.active = 2;
l.remove(0);
assert_eq!(l.active().unwrap().url, "https://c");
l.remove(1);
assert_eq!(l.active().unwrap().url, "https://b");
l.remove(0);
assert!(l.active().is_none());
}
#[test]
fn an_out_of_range_active_index_falls_back_to_the_first() {
let text = "active = 5\n[[server]]\nurl = \"https://a\"\nusername = \"u\"\npassword = \"p\"\n";
assert_eq!(parse_logins(text).unwrap().active, 0);
}
#[test]
fn settings_default_when_fields_are_missing() {
let s: Settings = toml::from_str("").unwrap();
+1
View File
@@ -88,6 +88,7 @@ fn step(ui: slint::Weak<AppWindow>, steps: Vec<String>, i: usize) {
"next" => Action::Next,
"play-pause" => Action::PlayPause,
"section-next" => Action::SectionNext,
"section-prev" => Action::SectionPrev,
"now-playing" => Action::NowPlaying,
"search" => Action::Search,
"quit" => Action::Quit,
+1
View File
@@ -5,6 +5,7 @@ mod config;
mod devscript;
mod inhibit;
mod input;
mod mpris;
mod palette;
mod player;
mod prompts;
+368
View File
@@ -0,0 +1,368 @@
//! MPRIS on the session bus, so the desktop's media controls and media keys
//! can drive playback. Headphone buttons arrive this way too: the desktop
//! turns the key events of a headset or a Bluetooth AVRCP device into calls
//! on the active MPRIS player. Reading those devices directly is not an
//! option, since keyboard-like input devices are root:input and only
//! gamepads are opened up to the logged-in user.
//!
//! A bus that cannot be reached, or a name already taken by another remus,
//! is logged once and otherwise ignored.
use std::collections::HashMap;
use std::sync::Arc;
use std::sync::atomic::{AtomicI64, Ordering};
use anyhow::Result;
use tokio::runtime::Handle;
use tokio::sync::watch;
use zbus::interface;
use zbus::zvariant::{ObjectPath, OwnedValue, Value};
const BUS_NAME: &str = "org.mpris.MediaPlayer2.remus";
const PATH: &str = "/org/mpris/MediaPlayer2";
const DESKTOP_ENTRY: &str = "me.anshorei.Fettleshed.Remus";
/// What a client asked for.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum Command {
PlayPause,
Play,
Pause,
Stop,
Next,
Previous,
Quit,
}
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
pub enum Status {
#[default]
Stopped,
Paused,
Playing,
}
impl Status {
fn as_str(self) -> &'static str {
match self {
Status::Stopped => "Stopped",
Status::Paused => "Paused",
Status::Playing => "Playing",
}
}
}
#[derive(Clone, Debug, Default, PartialEq)]
pub struct Track {
/// Position in the queue, which makes the track id.
pub index: usize,
pub title: String,
pub artist: Option<String>,
pub album: Option<String>,
pub seconds: Option<u32>,
}
#[derive(Clone, Debug, Default, PartialEq)]
pub struct NowPlaying {
pub status: Status,
pub track: Option<Track>,
/// 0 to 1, already muted to 0.
pub volume: f64,
}
pub struct Mpris {
state: watch::Sender<NowPlaying>,
position: Arc<AtomicI64>,
}
impl Mpris {
pub fn spawn(rt: &Handle, on_command: impl Fn(Command) + Send + Sync + 'static) -> Mpris {
let (state, rx) = watch::channel(NowPlaying::default());
let position = Arc::new(AtomicI64::new(0));
let pos = position.clone();
let on_command: Arc<dyn Fn(Command) + Send + Sync> = Arc::new(on_command);
rt.spawn(async move {
if let Err(e) = run(rx, pos, on_command).await {
log::warn!("MPRIS unavailable, media keys will not reach remus: {e:#}");
}
});
Mpris { state, position }
}
/// Publishes what is playing. Clients hear only about what changed.
pub fn update(&self, now: NowPlaying) {
self.state.send_if_modified(|s| {
let changed = *s != now;
*s = now;
changed
});
}
/// Clients read the position when they want it; it sends no signal.
pub fn set_position(&self, seconds: f64) {
self.position.store((seconds * 1e6) as i64, Ordering::Relaxed);
}
}
async fn run(
mut rx: watch::Receiver<NowPlaying>,
position: Arc<AtomicI64>,
on_command: Arc<dyn Fn(Command) + Send + Sync>,
) -> Result<()> {
let player = Player {
now: rx.borrow().clone(),
position,
on_command: on_command.clone(),
};
let conn = zbus::connection::Builder::session()?
.name(BUS_NAME)?
.serve_at(PATH, Root { on_command })?
.serve_at(PATH, player)?
.build()
.await?;
log::info!("MPRIS player registered as {BUS_NAME}");
let iface = conn.object_server().interface::<_, Player>(PATH).await?;
while rx.changed().await.is_ok() {
let now = rx.borrow_and_update().clone();
let mut p = iface.get_mut().await;
let status = p.now.status != now.status;
let track = p.now.track != now.track;
let volume = p.now.volume != now.volume;
p.now = now;
let emitter = iface.signal_emitter();
if status {
p.playback_status_changed(emitter).await?;
}
if track {
p.metadata_changed(emitter).await?;
p.can_play_changed(emitter).await?;
p.can_pause_changed(emitter).await?;
p.can_go_next_changed(emitter).await?;
p.can_go_previous_changed(emitter).await?;
}
if volume {
p.volume_changed(emitter).await?;
}
}
Ok(())
}
struct Root {
on_command: Arc<dyn Fn(Command) + Send + Sync>,
}
#[interface(name = "org.mpris.MediaPlayer2")]
impl Root {
fn raise(&self) {}
fn quit(&self) {
(self.on_command)(Command::Quit);
}
#[zbus(property)]
fn can_quit(&self) -> bool {
true
}
#[zbus(property)]
fn can_raise(&self) -> bool {
false
}
#[zbus(property)]
fn has_track_list(&self) -> bool {
false
}
#[zbus(property)]
fn identity(&self) -> &str {
"Remus"
}
#[zbus(property)]
fn desktop_entry(&self) -> &str {
DESKTOP_ENTRY
}
#[zbus(property)]
fn supported_uri_schemes(&self) -> Vec<String> {
Vec::new()
}
#[zbus(property)]
fn supported_mime_types(&self) -> Vec<String> {
Vec::new()
}
}
struct Player {
now: NowPlaying,
position: Arc<AtomicI64>,
on_command: Arc<dyn Fn(Command) + Send + Sync>,
}
#[interface(name = "org.mpris.MediaPlayer2.Player")]
impl Player {
fn play_pause(&self) {
(self.on_command)(Command::PlayPause);
}
fn play(&self) {
(self.on_command)(Command::Play);
}
fn pause(&self) {
(self.on_command)(Command::Pause);
}
fn stop(&self) {
(self.on_command)(Command::Stop);
}
fn next(&self) {
(self.on_command)(Command::Next);
}
fn previous(&self) {
(self.on_command)(Command::Previous);
}
// CanSeek is false, so clients do not call these; they are part of the
// interface all the same.
fn seek(&self, _offset: i64) {}
fn set_position(&self, _track_id: ObjectPath<'_>, _position: i64) {}
fn open_uri(&self, _uri: &str) {}
#[zbus(property)]
fn playback_status(&self) -> &str {
self.now.status.as_str()
}
#[zbus(property)]
fn rate(&self) -> f64 {
1.0
}
#[zbus(property)]
fn minimum_rate(&self) -> f64 {
1.0
}
#[zbus(property)]
fn maximum_rate(&self) -> f64 {
1.0
}
#[zbus(property)]
fn metadata(&self) -> HashMap<String, OwnedValue> {
metadata(self.now.track.as_ref())
}
#[zbus(property)]
fn volume(&self) -> f64 {
self.now.volume
}
#[zbus(property(emits_changed_signal = "false"))]
fn position(&self) -> i64 {
self.position.load(Ordering::Relaxed)
}
#[zbus(property)]
fn can_go_next(&self) -> bool {
self.now.track.is_some()
}
#[zbus(property)]
fn can_go_previous(&self) -> bool {
self.now.track.is_some()
}
#[zbus(property)]
fn can_play(&self) -> bool {
self.now.track.is_some()
}
#[zbus(property)]
fn can_pause(&self) -> bool {
self.now.track.is_some()
}
#[zbus(property)]
fn can_seek(&self) -> bool {
false
}
#[zbus(property(emits_changed_signal = "const"))]
fn can_control(&self) -> bool {
true
}
}
/// The MPRIS metadata map for a track, empty when nothing is loaded.
fn metadata(track: Option<&Track>) -> HashMap<String, OwnedValue> {
let mut m = HashMap::new();
let Some(t) = track else {
let none = ObjectPath::from_static_str_unchecked("/org/mpris/MediaPlayer2/TrackList/NoTrack");
insert(&mut m, "mpris:trackid", Value::from(none));
return m;
};
// Outside /org/mpris, which the spec reserves.
let id = format!("/me/anshorei/Fettleshed/Remus/track/{}", t.index);
if let Ok(path) = ObjectPath::try_from(id) {
insert(&mut m, "mpris:trackid", Value::from(path));
}
insert(&mut m, "xesam:title", Value::from(t.title.clone()));
if let Some(a) = &t.artist {
insert(&mut m, "xesam:artist", Value::from(vec![a.clone()]));
}
if let Some(a) = &t.album {
insert(&mut m, "xesam:album", Value::from(a.clone()));
}
if let Some(s) = t.seconds {
insert(&mut m, "mpris:length", Value::from(s as i64 * 1_000_000));
}
m
}
fn insert(m: &mut HashMap<String, OwnedValue>, key: &str, value: Value<'_>) {
if let Ok(v) = OwnedValue::try_from(value) {
m.insert(key.to_string(), v);
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn metadata_without_a_track_says_so() {
let m = metadata(None);
assert_eq!(m.len(), 1);
let id: ObjectPath = m["mpris:trackid"].clone().try_into().unwrap();
assert_eq!(id.as_str(), "/org/mpris/MediaPlayer2/TrackList/NoTrack");
}
#[test]
fn metadata_carries_the_track() {
let t = Track {
index: 3,
title: "Feijão".into(),
artist: Some("Dr. Quandary".into()),
album: None,
seconds: Some(218),
};
let m = metadata(Some(&t));
let title: String = m["xesam:title"].clone().try_into().unwrap();
assert_eq!(title, "Feijão");
let artists: Vec<String> = m["xesam:artist"].clone().try_into().unwrap();
assert_eq!(artists, ["Dr. Quandary"]);
let length: i64 = m["mpris:length"].clone().try_into().unwrap();
assert_eq!(length, 218_000_000);
assert!(!m.contains_key("xesam:album"));
let id: ObjectPath = m["mpris:trackid"].clone().try_into().unwrap();
assert_eq!(id.as_str(), "/me/anshorei/Fettleshed/Remus/track/3");
}
}
+7
View File
@@ -143,6 +143,13 @@ impl Player {
start(&self.playbin, &url);
}
/// Stops playback and forgets the queue, as when switching server. Going
/// to Null flushes the bus, so nothing from the old track reports later.
pub fn stop(&self) {
*lock(&self.queue) = Queue::default();
let _ = self.playbin.set_state(gst::State::Null);
}
pub fn toggle_pause(&self) {
// Toggles where the pipeline is heading, so play pressed while a
// paused track is still loading is not lost.
+6 -2
View File
@@ -841,6 +841,8 @@ component LoginView inherits Rectangle {
in property <int> focus-index;
in property <string> error;
in property <bool> busy;
// Adding a server from inside the app: the bottom button goes back.
in property <bool> can-cancel;
callback submit;
callback exit;
callback field-clicked(int);
@@ -920,7 +922,7 @@ component LoginView inherits Rectangle {
border-width: 2px * Theme.s;
border-color: root.focus-index == 4 ? Theme.focus : Theme.line;
Text {
text: "Exit";
text: root.can-cancel ? "Cancel" : "Exit";
font-size: 17px * Theme.s;
color: root.focus-index == 4 ? Theme.text : Theme.muted;
}
@@ -1144,6 +1146,7 @@ export component AppWindow inherits Window {
in property <int> login-focus;
in property <string> login-error;
in property <bool> login-busy;
in property <bool> login-can-cancel;
// Browse
in property <[string]> sections;
@@ -1267,7 +1270,8 @@ export component AppWindow inherits Window {
error: root.login-error;
busy: root.login-busy;
submit => { root.login-submit(); }
exit => { root.action(Action.quit); }
can-cancel: root.login-can-cancel;
exit => { root.action(root.login-can-cancel ? Action.back : Action.quit); }
field-clicked(i) => { root.login-field-clicked(i); }
}