Show supported features and audio backend in --version #1312
Conversation
| ) | ||
| } | ||
|
|
||
| pub fn get_enabled_backends() -> Vec<&'static str> { |
There was a problem hiding this comment.
This should be basically the same as BACKEND_VALUES defined a little below, maybe we can use that instead?
| pub fn get_enabled_features() -> Vec<&'static str> { | ||
| let mut features = Vec::new(); | ||
|
|
||
| #[cfg(feature = "dbus_mpris")] | ||
| features.push("MPRIS"); | ||
|
|
||
| #[cfg(feature = "dbus_keyring")] | ||
| features.push("keyring"); | ||
|
|
||
| features | ||
| } |
There was a problem hiding this comment.
I think I would also prefer the
&[
#[cfg(feature = "dbus_mpris")]
"MPRIS",
// ...
]style here, but not that important.
| #[structopt( | ||
| about = "A Spotify daemon", | ||
| about = &**ABOUT_INFO, // Use double dereference to get `&str` |
There was a problem hiding this comment.
Instead of replacing about, I think there is also version, which is probably more what we want? Or was there a specific reason why you went for about?
| impl Default for CliConfig { | ||
| fn default() -> Self { | ||
| CliConfig { | ||
| config_path: None, | ||
| no_daemon: false, | ||
| verbose: false, | ||
| pid: None, | ||
| shared_config: SharedConfigValues::default(), | ||
| } | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
Doesn't this exactly do, what #[derive(Default)] would do as well?
| // Handle --version explicitly | ||
| if std::env::args().any(|arg| arg == "--version") { | ||
| println!("{}", &**ABOUT_INFO); | ||
| return Ok(()); | ||
| } |
There was a problem hiding this comment.
If we specify version = &**ABOUT_INFO instead, this would probably also not be necessary.
| let backends = get_enabled_backends(); | ||
|
|
||
| let features_str = if features.is_empty() { | ||
| "No features enabled".to_string() |
There was a problem hiding this comment.
| "No features enabled".to_string() | |
| "none".to_string() |
would probably also be sufficient.
| @@ -36,6 +36,7 @@ librespot-connect = { version = "0.4" } | |||
| toml = "0.7" | |||
| color-eyre = "0.6" | |||
| directories = "5.0.1" | |||
| once_cell = "1.20.2" | |||
There was a problem hiding this comment.
In theory, since recently, the standard library also has support for those Lazy cells e.g. with std::cell::LazyCell. But to make use of that, we would need a MSRV bump, so this would also be fine for now! Whatever suits you best. :)
I'm gonna take a look the next few days to see if I can fix it |
Fixes #1255