diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 404034e0..0cf9a4e9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -68,7 +68,7 @@ jobs: cargo llvm-cov --all-features --codecov --ignore-filename-regex ".cargo|.*_test\.rs" > ./codecov.json - name: Upload coverage to Codecov if: matrix.os == 'ubuntu-latest' - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: verbose: true fail_ci_if_error: true diff --git a/libplatune/player/src/http_stream_reader.rs b/libplatune/player/src/http_stream_reader.rs index 44775399..6631a692 100644 --- a/libplatune/player/src/http_stream_reader.rs +++ b/libplatune/player/src/http_stream_reader.rs @@ -22,12 +22,15 @@ impl HttpStreamReader { pub async fn new(url: String) -> Result { let mut client_builder = Client::builder(); if url.starts_with("https://") { - let mtls_cert = env::var("PLATUNE_MTLS_CLIENT_CERT_PATH"); - let mtls_key = env::var("PLATUNE_MTLS_CLIENT_KEY_PATH"); - if let (Ok(mtls_cert), Ok(mtls_key)) = (mtls_cert, mtls_key) { - let mut cert = fs::read(mtls_cert).wrap_err_with(|| "mtls cert path invalid")?; - let mut key = fs::read(mtls_key).wrap_err_with(|| "mtls key path invalid")?; + let mtls_cert_path = env::var("PLATUNE_MTLS_CLIENT_CERT_PATH"); + let mtls_key_path = env::var("PLATUNE_MTLS_CLIENT_KEY_PATH"); + if let (Ok(mtls_cert_path), Ok(mtls_key_path)) = (mtls_cert_path, mtls_key_path) { + info!("Using cert paths: {mtls_cert_path} {mtls_key_path}"); + let mut cert = + fs::read(mtls_cert_path).wrap_err_with(|| "mtls cert path invalid")?; + let mut key = fs::read(mtls_key_path).wrap_err_with(|| "mtls key path invalid")?; cert.append(&mut key); + client_builder = client_builder.identity(Identity::from_pem(&cert)?); } } diff --git a/platune-cli/internal/statusbar/event_loop.go b/platune-cli/internal/statusbar/event_loop.go index fcffe34c..b05fa0af 100644 --- a/platune-cli/internal/statusbar/event_loop.go +++ b/platune-cli/internal/statusbar/event_loop.go @@ -15,10 +15,10 @@ var ( defaultStyle = lipgloss.NewStyle().Background(lipgloss.Color("8")) infoIconStyle = defaultStyle.Copy().Foreground(lipgloss.Color("14")) textStyle = defaultStyle.Copy().Foreground(lipgloss.Color("15")) - separator = defaultStyle.Copy().Foreground(lipgloss.Color("7")).Render("  ") - songIcon = "ﱘ" - albumIcon = "" - artistIcon = "ﴁ" + separator = defaultStyle.Copy().Foreground(lipgloss.Color("7")).Render(" ⸽ ") + songIcon = "" + albumIcon = "󰀥" + artistIcon = "" spacer = textStyle.Render(" ") ) diff --git a/platuned/server/src/cert_gen.rs b/platuned/server/src/cert_gen.rs index 2e403c31..64bd31b3 100644 --- a/platuned/server/src/cert_gen.rs +++ b/platuned/server/src/cert_gen.rs @@ -7,6 +7,7 @@ use rcgen::{ }; use time::OffsetDateTime; use tonic::transport::{Identity, ServerTlsConfig}; +use tracing::info; use uuid::Uuid; pub(crate) struct TlsConfig { @@ -49,6 +50,8 @@ pub(crate) async fn get_tls_config(path: &Path) -> Result { - let ipc_path = ServerId(path).into_ipc_path()?; + let ipc_path = ServerId(path).into_ipc_path()?; info!("Running IPC server on {}", ipc_path.display()); builder .serve_with_incoming_shutdown(IpcStream::get_async_stream(ipc_path)?, async { diff --git a/platuned/server/src/services/management.rs b/platuned/server/src/services/management.rs index 8f849683..fded6a22 100644 --- a/platuned/server/src/services/management.rs +++ b/platuned/server/src/services/management.rs @@ -123,6 +123,7 @@ async fn get_connection_type( if !global_addr.ends_with('/') { global_addr.push('/'); } + info!("Using global file URL {global_addr}"); return Ok(ConnectionType::Remote { folders, local_addr: global_addr,