github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #865 from kingosticks/feature/log-build-profile

Browse source 
Add build profile to displayed version info
This commit is contained in:
Roderick van Domburg 2021-10-14 20:53:04 +02:00 committed by GitHub
commit b125659e12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
### Changed
- Include build profile in the displayed version information
### Fixed ### Fixed
- [connect] Partly fix behavior after last track of an album/playlist - [connect] Partly fix behavior after last track of an album/playlist

26
src/main.rs
View file

@ -160,14 +160,20 @@ pub fn parse_file_size(input: &str) -> Result<u64, ParseFileSizeError> {
Ok((num * base.pow(exponent) as f64) as u64) Ok((num * base.pow(exponent) as f64) as u64)
} }
fn print_version() { fn get_version_string() -> String {
println!( #[cfg(debug_assertions)]
"librespot {semver} {sha} (Built on {build_date}, Build ID: {build_id})", const BUILD_PROFILE: &str = "debug";
#[cfg(not(debug_assertions))]
const BUILD_PROFILE: &str = "release";
format!(
"librespot {semver} {sha} (Built on {build_date}, Build ID: {build_id}, Profile: {build_profile})",
semver = version::SEMVER, semver = version::SEMVER,
sha = version::SHA_SHORT, sha = version::SHA_SHORT,
build_date = version::BUILD_DATE, build_date = version::BUILD_DATE,
build_id = version::BUILD_ID build_id = version::BUILD_ID,
); build_profile = BUILD_PROFILE
)
} }
struct Setup { struct Setup {
@ -438,20 +444,14 @@ fn get_setup(args: &[String]) -> Setup {
} }
if matches.opt_present(VERSION) { if matches.opt_present(VERSION) {
print_version(); println!("{}", get_version_string());
exit(0); exit(0);
} }
let verbose = matches.opt_present(VERBOSE); let verbose = matches.opt_present(VERBOSE);
setup_logging(verbose); setup_logging(verbose);
info!( info!("{}", get_version_string());
"librespot {semver} {sha} (Built on {build_date}, Build ID: {build_id})",
semver = version::SEMVER,
sha = version::SHA_SHORT,
build_date = version::BUILD_DATE,
build_id = version::BUILD_ID
);
let backend_name = matches.opt_str(BACKEND); let backend_name = matches.opt_str(BACKEND);
if backend_name == Some("?".into()) { if backend_name == Some("?".into()) {