Miroirs/pinnacle
1
0
Fork 0
mirror of https://github.com/pinnacle-comp/pinnacle.git synced 2024-11-16 07:48:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Expand ~ in SOCKET_DIR

Browse source
This commit is contained in:
Ottatop 2023-08-07 19:06:10 -05:00
parent a1d9c2445a
commit 4c25f4702e
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -22,6 +22,7 @@ futures-lite = { version = "1.13.0" }
async-process = { version = "1.7.0" }
itertools = { version = "0.11.0" }
x11rb = { version = "0.12.0", default-features = false, features = ["composite"], optional = true }
shellexpand = "3.1.0"
[features]
default = ["egl", "winit", "udev", "xwayland"]

16
src/api.rs
View file

@ -97,20 +97,30 @@ impl PinnacleSocketSource {
));
}
let socket_path = socket_path.join("pinnacle_socket");
let Some(socket_path) = socket_path
.join("pinnacle_socket")
.to_str()
.map(|st| st.to_string())
else {
tracing::error!("Socket path {socket_path:?} had invalid Unicode");
return Err(io::Error::new(io::ErrorKind::Other, "socket path had invalid unicode"));
};
let socket_path = shellexpand::tilde(&socket_path).to_string();
let socket_path = Path::new(&socket_path);
// TODO: use anyhow
if let Ok(exists) = socket_path.try_exists() {
if exists {
if let Err(err) = std::fs::remove_file(&socket_path) {
if let Err(err) = std::fs::remove_file(socket_path) {
tracing::error!("Failed to remove old socket: {err}");
return Err(err);
}
}
}
let listener = match UnixListener::bind(&socket_path) {
let listener = match UnixListener::bind(socket_path) {
Ok(listener) => {
tracing::info!("Bound to socket at {socket_path:?}");
listener